propagate from branch 'im.pidgin.pidgin' (head f9599fe0199c86262cea569a5dfb4081df23691d)cpw.malu.xmpp.google_refactor

            to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 93935229617363d8fdaf50a9a350c93f0987f66c)

480 files changed, 94577 insertions, 46628 deletions

diff --git a/.mtn-ignore b/.mtn-ignore
index c97fe43445..64147e4c4e 100644
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -54,6 +54,11 @@ 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/COPYRIGHT b/COPYRIGHT
index 541308f8f4..c7593a6223 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
@@ -118,10 +119,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
@@ -245,9 +248,11 @@ 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
@@ -294,6 +299,7 @@ Brian Macke
 Paolo Maggi
 Sulabh Mahajan
 Willian T. Mahan
+Jonathan Maltz
 Tobias Markmann
 Kris Marsh
 Fidel Martinez
@@ -328,6 +334,7 @@ Sergio Moretto
 Andrei Mozzhuhin
 Christian Muise
 MXit Lifestyle (Pty) Ltd.
+Alexander Nartov
 Richard Nelson
 Dennis Nezic
 Matthew A. Nicholson
@@ -359,11 +366,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
@@ -474,6 +483,7 @@ Sun Microsystems
 Marcus Sundberg
 Mårten Svantesson (fursten)
 Amir Szekely (kichik)
+Gábor Szuromi (kukkerman)
 Robert T.
 Greg Taeger
 Rob Taft
@@ -503,9 +513,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
@@ -530,6 +542,7 @@ Dave West
 Zac West
 Daniel Westermann-Clark
 Andrew Whewell
+Stephen Whitmore
 Simon Wilkinson
 Dan Willemsen
 Justin Williams (Jaywalker)
@@ -546,6 +559,7 @@ Pui Lam Wong
 Justin Wood
 Ximian
 Ma Xuan
+Yonas Yanfa
 Jared Yanovich
 Timmy Yee
 Li Yuan
diff --git a/ChangeLog b/ChangeLog
index e655a2c6b4..6667f8f800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,172 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.0 (??/??/????):
+version 2.7.4 (MM/DD/YYYY):
+	General:
+	* Fix search path for Tk when compiling on Debian Squeeze. (#12465)
+
+	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.
+
+	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.
+
+	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)
+
+	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)
+
+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 configre now works properly. You
-	  will no longer be forced to have intltool to configure and build.
+	* 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.
@@ -18,6 +179,8 @@ version 2.7.0 (??/??/????):
 	  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
@@ -36,14 +199,21 @@ version 2.7.0 (??/??/????):
 	  in the distant past.  (Greg McNew)
 	* Added a menu set mood globally for all mood-supporting accounts
 	  (currently XMPP and ICQ).
-	* Use standard (but small) GTK+ buttons instead of custom "X" symbol.
 	* 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 signal
-	  "drawing-buddy". (Daniele Ricci, Andrea Piccinelli)
+	* 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)
@@ -53,44 +223,78 @@ version 2.7.0 (??/??/????):
 	  Klinikowski for the work and testing put in here!)
 	* Minimum requirement for external libgadu is now also 1.9.0-rc2.
 
-	ICQ:
+	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.
-	  Previously only icons between 48x48 and 52x64 were allowed.
+	  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)
-	* 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).
 	* 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.
+	* 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 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)
diff --git a/ChangeLog.API b/ChangeLog.API
index 29598877d1..a6ca13ce38 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -1,32 +1,91 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.0 (??/??/????):
+version 2.7.4 (MM/DD/YYYY):
+
+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
-		* 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.
+		* 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
-		* media_caps to the PurpleBuddy struct
-		* buddy-caps-changed blist signal
-		* ui-caps-changed media manager signal
-		* sent-attention conversation signal
-		* got-attention conversation signal
-		* PurpleMood struct in status.h
-		* purple_certificates_import for importing multiple certificates from
-		  a single file (and corresponding import_certificates member of
-		  PurpleCertificateScheme struct)
+		* purple_xfer_get_thumbnail
+		* purple_xfer_get_thumbnail_mimetype
+		* purple_xfer_set_thumbnail
+		* purple_xfer_prepare_thumbnail
 
 	Pidgin:
 		Added:
@@ -44,7 +103,7 @@ version 2.6.6 (02/18/2010):
 		  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 paring an attribute which
+		* xmlnode_from_str now properly handles parsing an attribute which
 		  contain "<br>", which were previously transformed into a
 		  newline character (libxml2 unescapes all entities except
 		  representations of '&', and libpurple's purple_unescape_html
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index 4e016d082a..8810a066d4 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,8 +1,16 @@
-version 2.7.0 (??/??/????):
+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.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
-	* Win9x no longer supported.
+	* 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)
diff --git a/Makefile.am b/Makefile.am
index 599f87029d..1d3aafbbd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,11 +80,14 @@ appsdir = $(datadir)/applications
 apps_in_files = pidgin.desktop.in
 apps_DATA = $(apps_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
-GTK_DIR=pidgin
 endif #ENABLE_GTK
 
 endif #INSTALL_I18N
 
+if ENABLE_GTK
+GTK_DIR=pidgin
+endif
+
 if ENABLE_GNT
 GNT_DIR=finch
 endif
@@ -97,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".
@@ -133,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
diff --git a/Makefile.mingw b/Makefile.mingw
index 115119215f..514912e6d9 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -75,6 +75,8 @@ EXTERNAL_DLLS = \
 #build an expression for `find` to use to ignore the above files
 EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
 
+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)
@@ -101,11 +103,11 @@ endif
 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
+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 {} ';' \
-	 | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
+	 | 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,\},/\"/" \
@@ -119,6 +121,13 @@ generate_installer_includes: create_release_install_dir pidgin/win32/nsis/gtk-ru
 	 -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)
diff --git a/NEWS b/NEWS
index 6621ec8fb5..a31cbcb3dc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,61 @@ 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.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.
diff --git a/configure.ac b/configure.ac
index 96a30e5805..76187238a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,16 +46,16 @@ AC_PREREQ([2.50])
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [0])
+m4_define([purple_micro_version], [4])
 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], [7])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [7])
-m4_define([gnt_micro_version], [0])
+m4_define([gnt_minor_version], [8])
+m4_define([gnt_micro_version], [1])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -75,6 +75,8 @@ fi
 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
@@ -115,6 +117,9 @@ AC_PROG_INSTALL
 PKG_PROG_PKG_CONFIG
 AC_FUNC_ALLOCA
 
+dnl Check for Sun compiler
+AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -184,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
@@ -313,6 +324,8 @@ 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 #######################################################################
@@ -649,6 +662,10 @@ 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_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -667,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])
 				])
 			])
@@ -1331,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)
@@ -1791,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)],
@@ -2223,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 \
@@ -2451,7 +2477,12 @@ AC_ARG_ENABLE(pixmaps-install, AC_HELP_STRING([--disable-pixmaps-install], [disa
 
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
 
-AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+dnl #######################################################################
+dnl # Tweak status tray icon installation directory
+dnl #######################################################################
+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(ENABLE_TRAYCOMPAT, test "x$enable_traycompat" = "xyes")
 
 dnl #######################################################################
 dnl # Check for Doxygen and dot (part of GraphViz)
@@ -2622,6 +2653,7 @@ 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
@@ -2649,7 +2681,7 @@ if test "x$enable_pixmaps" = "xno" ; then
 fi
 if test "x$enable_i18n" = "xno" ; then
 	echo
-	echo Warning: You have disabled the building and intallation of translation
+	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
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 c08ef82038..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
@@ -496,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/gtkimhtml-signals.dox b/doc/gtkimhtml-signals.dox
index 621e4c6201..a2b9a87a89 100644
--- a/doc/gtkimhtml-signals.dox
+++ b/doc/gtkimhtml-signals.dox
@@ -63,7 +63,7 @@ void (*format_function_update)(GtkIMHtml *imhtml, gpointer data);
  	@signalproto
 void (*paste) (GtkIMHtml *imhtml, char *format)
 	@endsignalproto
-	@signaldef Emitted when paste from the clipboard is requested.
+	@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
diff --git a/finch/finch.c b/finch/finch.c
index 6f305091b2..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);
 
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/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/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 4256626254..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
@@ -577,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 e62a8dded9..5775f27f53 100644
--- a/finch/libgnt/configure.ac
+++ b/finch/libgnt/configure.ac
@@ -24,9 +24,9 @@ AC_PREREQ([2.50])
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [7])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [7])
+m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_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 fffff69bc8..4abeab7a77 100644
--- a/finch/libgnt/gntbox.c
+++ b/finch/libgnt/gntbox.c
@@ -422,7 +422,9 @@ gnt_box_confirm_size(GntWidget *widget, int width, int height)
 
 		gnt_widget_get_size(wid, &w, &h);
 
-		if (wid != last && !child && w > 0 && h > 0 && gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
+		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;
 		}
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 97fb32cff9..29db9a61c2 100644
--- a/finch/libgnt/gntentry.c
+++ b/finch/libgnt/gntentry.c
@@ -480,8 +480,7 @@ history_search(GntBindable *bind, GList *null)
 {
 	GntEntry *entry = GNT_ENTRY(bind);
 	GList *iter;
-	const char *current , *pos;
-	int len;
+	const char *current;
 	
 	if (entry->history->prev && entry->search->needle)
 		current = entry->search->needle;
@@ -491,13 +490,11 @@ history_search(GntBindable *bind, GList *null)
 	if (!entry->histlength || !entry->history->next || !*current)
 		return FALSE;
 
-	len = g_utf8_strlen(current, -1);
-
 	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 ((pos = strstr(str, current)))
+		if (strstr(str, current) != NULL)
 			break;
 	}
 
@@ -579,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);
@@ -986,6 +1005,10 @@ 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,
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 072f4080d7..1095a0ccab 100644
--- a/finch/libgnt/gnttree.c
+++ b/finch/libgnt/gnttree.c
@@ -1926,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 452e8253ca..1e41c363c9 100644
--- a/finch/libgnt/gntutils.c
+++ b/finch/libgnt/gntutils.c
@@ -385,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;
 
@@ -426,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);
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
index ae73559e38..7fbea9504f 100644
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -170,13 +170,11 @@ purple_mediaheaders = \
 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
 
@@ -212,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
@@ -236,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) $(addprefix media/, $(purple_mediaheaders)) $(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 >> $@
+	$(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
 
diff --git a/libpurple/account.c b/libpurple/account.c
index e7b198fba5..4d500dec94 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -513,6 +513,25 @@ migrate_yahoo_japan(PurpleAccount *account)
 }
 
 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
 parse_settings(xmlnode *node, PurpleAccount *account)
 {
 	const char *ui;
@@ -579,6 +598,9 @@ 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 to do it before the user views the
+	 * Edit Account dialog. */
+	migrate_xmpp_encryption(account);
 }
 
 static GList *
@@ -1129,7 +1151,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 +1731,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 +1804,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)
 {
@@ -2105,6 +2221,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)
 {
@@ -2510,6 +2634,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
@@ -2560,6 +2697,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 *
@@ -2901,8 +3041,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 192b239010..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.
@@ -683,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/certificate.c b/libpurple/certificate.c
index f331c7ee15..ff6337bd93 100644
--- a/libpurple/certificate.c
+++ b/libpurple/certificate.c
@@ -99,7 +99,8 @@ 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 "
@@ -714,6 +715,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);
@@ -859,6 +861,7 @@ x509_ca_lazy_init(void)
 					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",
@@ -1535,6 +1538,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/connection.c b/libpurple/connection.c
index 3287e6876b..5f7e52c240 100644
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -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/conversation.c b/libpurple/conversation.c
index 3292abb9e4..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))
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/ft.c b/libpurple/ft.c
index a62a77e6d9..d5711b28eb 100644
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -60,6 +60,10 @@ typedef struct _PurpleXferPrivData {
 
 	/* 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);
@@ -72,6 +76,10 @@ purple_xfer_priv_data_destroy(gpointer data)
 	if (priv->buffer)
 		g_byte_array_free(priv->buffer, TRUE);
 
+	g_free(priv->thumbnail_data);
+
+	g_free(priv->thumbnail_mimetype);
+
 	g_free(priv);
 }
 
@@ -266,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));
 
@@ -286,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;
@@ -448,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 */
@@ -473,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);
@@ -547,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);
@@ -699,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)
 {
@@ -1580,6 +1634,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 9c422d513c..ff3b98b5c9 100644
--- a/libpurple/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
@@ -2,17 +2,17 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
 
 EXTRA_DIST = purple.schemas.in
 
-if GCONF_SCHEMAS_INSTALL
-
 if INSTALL_I18N
 schema_in_files = purple.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
-endif #INSTALL_I18N
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 2>&1 | \
 		grep -v "^WARNING: failed to install schema" | grep -v "^Attached schema" 1>&2
 else
 install-data-local:
 endif #GCONF_SCHEMAS_INSTALL
+
+endif #INSTALL_I18N
diff --git a/libpurple/log.c b/libpurple/log.c
index 57eb87c004..e279e6406b 100644
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -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/media.c b/libpurple/media.c
index 0bf35ca310..8234a89982 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -515,7 +515,8 @@ 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);
 }
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index 30ada179f2..84b1816577 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -208,11 +208,7 @@ purple_media_backend_fs2_dispose(GObject *obj)
 	}
 
 	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);
+		g_hash_table_destroy(priv->participants);
 		priv->participants = NULL;
 	}
 
@@ -1425,7 +1421,8 @@ create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id,
 	if (!priv->sessions) {
 		purple_debug_info("backend-fs2",
 				"Creating hash table for sessions\n");
-		priv->sessions = g_hash_table_new(g_str_hash, g_str_equal);
+		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);
@@ -1461,7 +1458,7 @@ create_participant(PurpleMediaBackendFs2 *self, const gchar *name)
 		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, NULL);
+				g_str_equal, g_free, g_object_unref);
 	}
 
 	g_hash_table_insert(priv->participants, g_strdup(name), participant);
@@ -1564,6 +1561,30 @@ src_pad_added_cb(FsStream *fsstream, GstPad *srcpad,
 			(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,
@@ -1605,32 +1626,22 @@ create_stream(PurpleMediaBackendFs2 *self,
 
 	if (turn_ip && !strcmp("nice", transmitter)) {
 		GValueArray *relay_info = g_value_array_new(0);
-		GValue value;
-		gint turn_port = purple_prefs_get_int(
-				"/purple/network/turn_port");
+		gint 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) {
-			purple_debug_error("backend-fs2",
-					"Error creating relay info structure");
-			return FALSE;
+		/* 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");
 		}
 
-		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);
-
+		/* 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";
@@ -1639,6 +1650,7 @@ create_stream(PurpleMediaBackendFs2 *self,
 		g_value_set_boxed(&_params[_num_params].value,
 			relay_info);
 		g_value_array_free(relay_info);
+		_num_params++;
 	}
 
 	session = get_session(self, sess_id);
@@ -1790,7 +1802,7 @@ purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self,
 		const gchar *sess_id)
 {
 	PurpleMediaBackendFs2Private *priv;
-	gboolean ret;
+	gboolean ret = FALSE;
 
 	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), FALSE);
 
@@ -1836,15 +1848,12 @@ static GList *
 purple_media_backend_fs2_get_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id)
 {
-	PurpleMediaBackendFs2Private *priv;
 	PurpleMediaBackendFs2Session *session;
 	GList *fscodecs;
 	GList *codecs;
 
 	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND_FS2(self), NULL);
 
-	priv = PURPLE_MEDIA_BACKEND_FS2_GET_PRIVATE(self);
-
 	session = get_session(PURPLE_MEDIA_BACKEND_FS2(self), sess_id);
 
 	if (session == NULL)
@@ -2013,13 +2022,10 @@ purple_media_backend_fs2_set_output_volume(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who, double level)
 {
 #ifdef USE_VV
-	PurpleMediaBackendFs2Private *priv;
 	GList *streams;
 
 	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/output", level);
 
 	streams = get_streams(self, sess_id, who);
diff --git a/libpurple/media/backend-fs2.h b/libpurple/media/backend-fs2.h
index afd859b7e9..47fb02dac5 100644
--- a/libpurple/media/backend-fs2.h
+++ b/libpurple/media/backend-fs2.h
@@ -55,6 +55,7 @@ typedef struct _PurpleMediaBackendFs2 PurpleMediaBackendFs2;
  */
 GType purple_media_backend_fs2_get_type(void);
 
+#ifdef USE_GSTREAMER
 /*
  * Temporary function in order to be able to test while
  * integrating with PurpleMedia
@@ -71,6 +72,7 @@ void purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
 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
 
diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c
index 532f11d3dd..9eb68eca62 100644
--- a/libpurple/media/codec.c
+++ b/libpurple/media/codec.c
@@ -83,9 +83,11 @@ purple_media_codec_finalize(GObject *info)
 			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);
+			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);
 	}
 }
 
@@ -302,10 +304,10 @@ purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
 
 	g_free(param->key);
 	g_free(param->value);
-	g_free(param);
 
 	priv->optional_params =
 			g_list_remove(priv->optional_params, param);
+	g_free(param);
 }
 
 PurpleKeyValuePair *
diff --git a/libpurple/media/codec.h b/libpurple/media/codec.h
index 771bb62d22..9262698c49 100644
--- a/libpurple/media/codec.h
+++ b/libpurple/media/codec.h
@@ -121,7 +121,8 @@ guint purple_media_codec_get_channels(PurpleMediaCodec *codec);
  *
  * @param The codec to get the optional parameters from.
  *
- * @return The list of optional parameters.
+ * @return The list of optional parameters. The list is owned by the codec and
+ *         should not be freed.
  *
  * @since 2.6.0
  */
diff --git a/libpurple/network.c b/libpurple/network.c
index 893f6931a6..0ceff6509f 100644
--- a/libpurple/network.c
+++ b/libpurple/network.c
@@ -98,6 +98,7 @@ struct _PurpleNetworkListenData {
 	PurpleNetworkListenCallback cb;
 	gpointer cb_data;
 	UPnPMappingAddRemove *mapping_data;
+	int timer;
 };
 
 #ifdef HAVE_NETWORKMANAGER
@@ -373,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);
@@ -394,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;
@@ -412,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) {
@@ -436,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
@@ -451,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;
@@ -492,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),
@@ -504,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
 	{
@@ -519,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;
 
@@ -542,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;
 	}
@@ -550,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);
 }
 
diff --git a/libpurple/network.h b/libpurple/network.h
index 13f891a529..f836d88520 100644
--- a/libpurple/network.h
+++ b/libpurple/network.h
@@ -90,8 +90,8 @@ 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, this function currently only
- *       handles IPv4 addresses
+ * @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.
@@ -123,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);
@@ -138,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.
@@ -158,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.
@@ -192,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);
@@ -236,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
  *
@@ -252,16 +295,16 @@ 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 TURN server as a string representation
  *
@@ -269,14 +312,14 @@ void purple_network_set_turn_server(const gchar *turn_server);
  * @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/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/idle.c b/libpurple/plugins/idle.c
index 8d3c72e9ca..0860dafa82 100644
--- a/libpurple/plugins/idle.c
+++ b/libpurple/plugins/idle.c
@@ -110,9 +110,6 @@ idle_all_action_ok(void *ignored, PurpleRequestFields *fields)
 	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/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/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/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/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index eb72a1141d..8745ceddbe 100644
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -70,7 +70,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);
 		}
@@ -172,7 +171,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);
 
@@ -205,18 +206,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");
@@ -528,7 +523,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,                                                    /* get_account_text_table */
 	NULL,                                                    /* initiate_media */
 	NULL,                                                    /* get_media_caps */
-	NULL                                                     /* get_moods */
+	NULL,                                                    /* get_moods */
+	NULL,                                                    /* set_public_alias */
+	NULL                                                     /* get_public_alias */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index 7f1c313799..7b5496faef 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -386,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);
@@ -582,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)) {
@@ -683,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;
@@ -1184,7 +1184,7 @@ 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;
@@ -1273,7 +1273,6 @@ check_if_blocked(PurpleBuddy *pb)
 static void
 xep_iq_parse(xmlnode *packet, PurpleBuddy *pb)
 {
-	xmlnode *child;
 	PurpleAccount *account;
 	PurpleConnection *gc;
 
@@ -1283,7 +1282,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);
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index 7ef358cbea..83d094ad82 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;
@@ -202,7 +201,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
diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
index 7bc99c9563..5fe288fb3d 100644
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST = \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
+	lib/libgadu-internal.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
 	lib/protocol.h \
@@ -30,6 +31,7 @@ INTGGSOURCES = \
 	lib/http.c \
 	lib/libgadu.c \
 	lib/libgadu-config.h \
+	lib/libgadu-internal.h \
 	lib/libgadu.h \
 	lib/obsolete.c \
 	lib/protocol.h \
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 2ec6a8983d..9e36aa4c5a 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -1000,7 +1000,6 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 				       int status, const char *descr)
 {
 	gchar *from;
-	gchar *msg;
 	const char *st;
 	gchar *avatarurl;
 	PurpleUtilFetchUrlData *url_data;
@@ -1035,6 +1034,7 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 		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";
@@ -1048,11 +1048,14 @@ static void ggp_generic_status_handler(PurpleConnection *gc, uin_t uin,
 
 	purple_debug_info("gg", "st = %s\n", st);
 	//msg = charset_convert(descr, "CP1250", "UTF-8");
-	msg = g_strdup_printf("%s", descr);
-	purple_prpl_got_user_status(purple_connection_get_account(gc),
-				  from, st, "message", msg, NULL);
+	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)
@@ -1598,22 +1601,16 @@ static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 			}
 			break;
 		case GG_EVENT_NOTIFY60:
-			purple_debug_info("gg",
-				"notify60_pre: (%d) status=%d; version=%d; descr=%s\n",
-				ev->event.notify60->uin, GG_S(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;
@@ -1623,7 +1620,7 @@ static void ggp_callback_recv(gpointer _gc, gint fd, PurpleInputCondition cond)
 					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",
@@ -1734,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;
@@ -1987,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,
@@ -2509,7 +2506,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,                           /* get_account_text_table */
 	NULL,                           /* initiate_media */
 	NULL,                            /* can_do_media */
-	NULL 				/* get_moods */
+	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 63885b5d00..7e3ccd2337 100644
--- a/libpurple/protocols/gg/lib/common.c
+++ b/libpurple/protocols/gg/lib/common.c
@@ -101,7 +101,7 @@ FILE *gg_debug_file = NULL;
  * \param format Format wiadomości (zgodny z \c printf)
  * \param ap Lista argumentów (zgodna z \c printf)
  */
-static void gg_debug_common(struct gg_session *sess, int level, const char *format, va_list ap)
+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);
diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
index b382362842..1bf30aff54 100644
--- a/libpurple/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
@@ -1143,7 +1143,7 @@ static int gg_watch_fd_connected(struct gg_session *sess, struct gg_event *e)
 		case GG_NOTIFY_REPLY80:
 		{
 			struct gg_notify_reply80 *n = (void*) p;
-			int length = h->length, i = 0;
+			unsigned int length = h->length, i = 0;
 
 			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd_connected() received a notify reply\n");
 
diff --git a/libpurple/protocols/gg/lib/libgadu-internal.h b/libpurple/protocols/gg/lib/libgadu-internal.h
index 07628f5122..202f89a3b9 100644
--- a/libpurple/protocols/gg/lib/libgadu-internal.h
+++ b/libpurple/protocols/gg/lib/libgadu-internal.h
@@ -26,5 +26,6 @@
 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 313afd23fc..28d95587a6 100644
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -412,7 +412,8 @@ 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);
 
@@ -609,7 +610,7 @@ 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_session(sess, GG_DEBUG_DUMP, "// gg_send_packet(0x%.2x)", gg_fix32(h->type));
 		for (i = 0; i < tmp_length; ++i)
diff --git a/libpurple/protocols/gg/lib/libgadu.h b/libpurple/protocols/gg/lib/libgadu.h
index 8a06bb5837..7d84f736ef 100644
--- a/libpurple/protocols/gg/lib/libgadu.h
+++ b/libpurple/protocols/gg/lib/libgadu.h
@@ -117,7 +117,7 @@ typedef unsigned char   uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 
-#ifndef __CYGWIN__
+#if !defined(__CYGWIN__) && !defined(__SunOS)
 #define __int8_t_defined
 typedef   signed char    int8_t;
 typedef   signed short  int16_t;
@@ -1245,8 +1245,8 @@ struct gg_http *gg_change_passwd2(uin_t uin, const char *passwd, const char *new
 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;
-void gg_resolve_pthread_cleanup(void *arg, int kill) 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;
diff --git a/libpurple/protocols/gg/lib/resolver.c b/libpurple/protocols/gg/lib/resolver.c
index 6721f92779..ce1c270faa 100644
--- a/libpurple/protocols/gg/lib/resolver.c
+++ b/libpurple/protocols/gg/lib/resolver.c
@@ -551,9 +551,9 @@ static int gg_resolver_fork_start(int *fd, void **priv_data, const char *hostnam
 		}
 
 		if (write(pipes[1], &addr, sizeof(addr)) != sizeof(addr))
-			exit(1);
+			_exit(1);
 
-		exit(0);
+		_exit(0);
 	}
 
 	close(pipes[1]);
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 563c7ec2d2..dc6399f73a 100644
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -945,7 +945,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,                    /* get_account_text_table */
 	NULL,                    /* initiate_media */
 	NULL,					 /* get_media_caps */
-	NULL					 /* get_moods */
+	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 30b3870129..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;
 	}
diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
index 1dae3aed98..4ecbe55608 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");
@@ -293,8 +270,10 @@ static void auth_old_cb(JabberStream *js, const char *from,
 			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."));
diff --git a/libpurple/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h
index af0b468346..f798c51bbc 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);
diff --git a/libpurple/protocols/jabber/auth_cyrus.c b/libpurple/protocols/jabber/auth_cyrus.c
index 0a8cbb33c7..b022a177c4 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.
@@ -314,8 +321,11 @@ jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
 		xmlnode_set_namespace(auth, NS_XMPP_SASL);
 		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
 
-		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+		if (g_str_equal(js->user->domain, "gmail.com") ||
+				g_str_equal(js->user->domain, "googlemail.com")) {
+			xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+			xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+		}
 
 		if (clientout) {
 			if (coutlen == 0) {
@@ -330,7 +340,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 +400,7 @@ jabber_cyrus_start(JabberStream *js, xmlnode *mechanisms,
                    xmlnode **reply, char **error)
 {
 	xmlnode *mechnode;
+	JabberSaslState ret;
 
 	js->sasl_mechs = g_string_new("");
 
@@ -399,18 +409,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
-		 * or Facebook Chat's X-FACEBOOK-PLATFORM mechansim,
-		 * as we will not support them and including them 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")
-				|| g_str_equal(mech_name, "X-FACEBOOK-PLATFORM") ) {
+		if (!mech_name || !*mech_name ||
+				g_str_equal(mech_name, "EXTERNAL")) {
 			g_free(mech_name);
 			continue;
 		}
@@ -420,8 +426,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
@@ -542,6 +561,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..0effe4a48f 100644
--- a/libpurple/protocols/jabber/auth_digest_md5.c
+++ b/libpurple/protocols/jabber/auth_digest_md5.c
@@ -188,16 +188,17 @@ digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
 
 	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 +236,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 +277,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 +291,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..b05fba732f 100644
--- a/libpurple/protocols/jabber/auth_plain.c
+++ b/libpurple/protocols/jabber/auth_plain.c
@@ -40,13 +40,16 @@ static xmlnode *finish_plaintext_authentication(JabberStream *js)
 	auth = xmlnode_new("auth");
 	xmlnode_set_namespace(auth, NS_XMPP_SASL);
 
-	xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-	xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+	if (g_str_equal(js->user->domain, "gmail.com") ||
+			g_str_equal(js->user->domain, "googlemail.com")) {
+		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+		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 b19fc68ac2..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) {
@@ -541,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);
 			}
 		}
 	}
@@ -729,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.
@@ -976,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/caps.c b/libpurple/protocols/jabber/caps.c
index 60a06130eb..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);
@@ -848,9 +806,12 @@ static GList* jabber_caps_xdata_get_fields(const xmlnode *x)
 static void 
 append_escaped_string(PurpleCipherContext *context, const gchar *str)
 {
-	char *tmp = g_markup_escape_text(str, -1);
-	purple_cipher_context_append(context, (const guchar *)tmp, strlen(tmp));
-	g_free(tmp);
+	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);
 }
 
@@ -904,7 +865,7 @@ gchar *jabber_caps_calculate_hash(JabberCapsClientInfo *info, const char *hash)
 	/* 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 */
@@ -965,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;
 
@@ -989,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 6eefd9e404..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");
 	}
 
diff --git a/libpurple/protocols/jabber/chat.h b/libpurple/protocols/jabber/chat.h
index 8beae73ad8..a7717eb7ef 100644
--- a/libpurple/protocols/jabber/chat.h
+++ b/libpurple/protocols/jabber/chat.h
@@ -102,8 +102,6 @@ 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 *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 b6add42e9d..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 = jabber_calculate_data_hash(rawdata, size, "sha1");
-	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,6 +58,7 @@ 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);
 
@@ -58,6 +69,7 @@ static void
 jabber_data_delete(gpointer cbdata)
 {
 	JabberData *data = cbdata;
+
 	g_free(data->cid);
 	g_free(data->type);
 	g_free(data->data);
@@ -72,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");
@@ -110,9 +124,19 @@ jabber_data_create_from_xml(xmlnode *tag)
 	return data;
 }
 
+void
+jabber_data_destroy(JabberData *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,12 +190,18 @@ 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;
 }
@@ -250,7 +291,7 @@ jabber_data_request_cb(JabberStream *js, const char *from,
 	if (data_element && type == JABBER_IQ_RESULT) {
 		JabberData *data = jabber_data_create_from_xml(data_element);
 
-		if (!ephemeral) {
+		if (data && !ephemeral) {
 			jabber_data_associate_remote(js, from, data);
 		}
 		cb(data, alt, userdata);
@@ -259,7 +300,7 @@ jabber_data_request_cb(JabberStream *js, const char *from,
 			"Responder didn't recognize requested data\n");
 		cb(NULL, alt, userdata);
 	} else {
-		purple_debug_error("jabber", "Unknown response to data request\n");
+		purple_debug_warning("jabber", "Unknown response to data request\n");
 		cb(NULL, alt, userdata);
 	}
 
@@ -271,9 +312,17 @@ jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who,
     gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb,
     gpointer userdata)
 {
-	JabberIq *request = jabber_iq_new(js, JABBER_IQ_GET);
-	xmlnode *data_request = jabber_data_get_xml_request(cid);
-	JabberDataRequestData *data = g_new0(JabberDataRequestData, 1);
+	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;
@@ -289,14 +338,14 @@ jabber_data_request(JabberStream *js, const gchar *cid, const gchar *who,
 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);
 }
 
@@ -305,7 +354,7 @@ jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
     const gchar *cid)
 {
 	const JabberData *data = g_hash_table_lookup(remote_data_by_cid, cid);
-	purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid);
+	purple_debug_info("jabber", "lookup remote data object with cid = %s\n", cid);
 
 	if (data == NULL) {
 		gchar *jid_cid =
@@ -323,9 +372,12 @@ jabber_data_find_remote_by_cid(JabberStream *js, const gchar *who,
 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);
 }
@@ -334,7 +386,9 @@ void
 jabber_data_associate_remote(JabberStream *js, const gchar *who, JabberData *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 {
@@ -371,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 6036b6aceb..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
@@ -34,6 +37,7 @@ typedef struct {
 	char *type;
 	gsize size;
 	gpointer data;
+	gboolean ephemeral;
 } JabberData;
 
 typedef void (JabberDataRequestCallback)(JabberData *data, gchar *alt,
@@ -42,12 +46,16 @@ typedef void (JabberDataRequestCallback)(JabberData *data, gchar *alt,
 
 /* 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);
 
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 03ef6f02df..5803ca7d2d 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -606,7 +606,7 @@ jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
 
 		/* 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/ibb.c b/libpurple/protocols/jabber/ibb.c
index 4283beb93f..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"
diff --git a/libpurple/protocols/jabber/ibb.h b/libpurple/protocols/jabber/ibb.h
index 633a71cc84..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_
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 45dca17186..1b487c1312 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -73,6 +73,10 @@
 #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;
@@ -168,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);
@@ -201,19 +207,55 @@ 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(purple_ssl_is_supported()) {
+		jabber_send_raw(js,
+				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+		return TRUE;
+	}
+
+	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."));
@@ -360,8 +402,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);
@@ -402,6 +446,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;
@@ -429,9 +479,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,
@@ -442,10 +492,13 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 		g_free(text);
 	}
 
-	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
@@ -453,21 +506,36 @@ void jabber_send_raw(JabberStream *js, const char *data, int len)
 		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;
 		}
@@ -475,9 +543,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
@@ -486,7 +551,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;
 }
@@ -501,8 +573,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);
 
@@ -559,7 +630,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) {
@@ -590,24 +661,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;
@@ -643,7 +725,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;
@@ -738,8 +820,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;
@@ -842,6 +923,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;
 	}
@@ -850,6 +941,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;
 	}
@@ -878,6 +970,7 @@ 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.major = 1;
 	js->protocol_version.minor = 0;
@@ -927,7 +1020,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),
@@ -1532,7 +1625,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)
@@ -1543,6 +1637,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) {
@@ -1564,13 +1660,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;
@@ -1622,6 +1719,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;
 	}
@@ -1867,20 +1967,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);
@@ -1888,7 +2021,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)
@@ -1910,6 +2044,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";
@@ -3313,8 +3479,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))) {
@@ -3336,7 +3501,7 @@ jabber_cmd_mood(PurpleConversation *conv,
 
 	if (js->pep) {
 		/* if no argument was given, unset mood */
-		if (!args | !args[0]) {
+		if (!args || !args[0]) {
 			jabber_mood_set(js, NULL, NULL);
 		} else if (!args[1]) {
 			jabber_mood_set(js, args[0], NULL);
@@ -3616,7 +3781,7 @@ jabber_do_init(void)
 	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);
 
@@ -3675,6 +3840,11 @@ jabber_do_uninit(void)
 	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();
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 710fd33aa2..dda194af91 100644
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -80,7 +80,7 @@ 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 */
@@ -112,7 +112,7 @@ struct _JabberStream
 
 	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
@@ -122,9 +122,6 @@ struct _JabberStream
 	char *stream_id;
 	JabberStreamState state;
 
-	/* SASL authentication */
-	char *expected_rspauth;
-
 	GHashTable *buddies;
 
 	/*
@@ -209,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;
 
@@ -255,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;
@@ -304,6 +304,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);
@@ -343,12 +346,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);
diff --git a/libpurple/protocols/jabber/jingle/transport.c b/libpurple/protocols/jabber/jingle/transport.c
index 1a465bbb2a..b5d1c342e1 100644
--- a/libpurple/protocols/jabber/jingle/transport.c
+++ b/libpurple/protocols/jabber/jingle/transport.c
@@ -111,8 +111,6 @@ jingle_transport_set_property (GObject *object, guint prop_id, const GValue *val
 	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);
@@ -125,8 +123,6 @@ jingle_transport_get_property (GObject *object, guint prop_id, GValue *value, GP
 {
 	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 0de8a1854e..c128c71964 100644
--- a/libpurple/protocols/jabber/jutil.c
+++ b/libpurple/protocols/jabber/jutil.c
@@ -303,8 +303,10 @@ char *jabber_saslprep(const char *in)
 
 	c = (const guchar *)in;
 	for ( ; *c; ++c) {
-		if (*c > 0x7f ||
+		if (*c > 0x7f || /* Non-ASCII characters */
+				*c == 0x7f || /* ASCII Delete character */
 				(*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r'))
+					/* ASCII control characters */
 			return NULL;
 	}
 
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 87a59b5f53..17bbd019e4 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -127,7 +127,9 @@ 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 */
+	jabber_get_moods,  							/* get_moods */
+	NULL, /* set_public_alias */
+	NULL  /* get_public_alias */
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
@@ -251,6 +253,7 @@ init_plugin(PurplePlugin *plugin)
 {
 	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, '@');
@@ -261,13 +264,26 @@ init_plugin(PurplePlugin *plugin)
 	purple_account_user_split_set_reverse(split, FALSE);
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", 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"),
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index 82049a4064..db68b6e784 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -75,12 +75,8 @@ static void handle_chat(JabberMessage *jm)
 	jbr = jabber_buddy_find_resource(jb, jid->resource);
 
 	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(gc, jm->from, 0, PURPLE_TYPING);
@@ -142,10 +138,13 @@ static void handle_chat(JabberMessage *jm)
 		}
 
 		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);
@@ -297,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 */
@@ -310,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 */
@@ -588,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)) {
@@ -963,7 +963,7 @@ jabber_message_smileyfy_xhtml(JabberMessage *jm, const char *xhtml)
 						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);
+								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));
@@ -1240,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 243ef8e52d..12c42411c1 100644
--- a/libpurple/protocols/jabber/namespaces.h
+++ b/libpurple/protocols/jabber/namespaces.h
@@ -61,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"
 
@@ -89,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 2c0dae610f..7e6e622c58 100644
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -93,10 +93,25 @@ jabber_parser_element_start_libxml(void *user_data,
 			}
 		}
 
-		if (js->stream_id == NULL)
+		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."); 
+#endif
+		}
 	} else {
 
 		if(js->current)
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index f89db8af1b..895c417fc8 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -824,6 +824,7 @@ handle_presence_contact(JabberStream *js, JabberPresence *presence)
 		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 */
@@ -924,8 +925,9 @@ void jabber_presence_parse(JabberStream *js, xmlnode *packet)
 		goto out;
 	}
 
-	presence.chat = jabber_chat_find(js, presence.jid_from->node,
-	                                 presence.jid_from->domain);
+	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;
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index febf70bf47..b5acb7cf35 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -77,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");
 
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index 759ac0ba66..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;
@@ -1246,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");
@@ -1464,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;
 		}
@@ -1499,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 */
@@ -1511,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 */
@@ -1527,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;
@@ -1541,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);
 			}
 
@@ -1559,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;
 
@@ -1630,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)
@@ -1644,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")))
@@ -1681,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);
@@ -1731,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/xdata.c b/libpurple/protocols/jabber/xdata.c
index 64ca60586e..e681694396 100644
--- a/libpurple/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
@@ -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..f911d5b2f3 100644
--- a/libpurple/protocols/msn/Makefile.am
+++ b/libpurple/protocols/msn/Makefile.am
@@ -14,6 +14,8 @@ MSNSOURCES = \
 	contact.h\
 	dialog.c \
 	dialog.h \
+	directconn.c \
+	directconn.h \
 	error.c \
 	error.h \
 	group.c \
diff --git a/libpurple/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index 40d5ea9db8..fe75c1cb68 100644
--- a/libpurple/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
@@ -41,6 +41,7 @@ C_SRC =			cmdproc.c \
 			command.c \
 			contact.c\
 			dialog.c \
+			directconn.c \
 			error.c \
 			group.c \
 			history.c \
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c
index c1a511c551..fd01527c3b 100644
--- a/libpurple/protocols/msn/contact.c
+++ b/libpurple/protocols/msn/contact.c
@@ -527,16 +527,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 +688,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 +840,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 +890,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 +900,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) {
@@ -1564,7 +1569,7 @@ 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->member_id_on_pending_list);
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index e846d75ea1..6fb7fb72fd 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -27,479 +27,988 @@
 #include "slp.h"
 #include "slpmsg.h"
 
-/**************************************************************************
- * Directconn Specific
- **************************************************************************/
+#pragma pack(push,1)
+typedef struct {
+	guint32 session_id;
+	guint32 seq_id;
+	guint64 offset;
+	guint64 total_size;
+	guint32 length;
+	guint32 flags;
+	guint32 ack_id;
+	guint32 ack_uid;
+	guint64 ack_size;
+/*	guint8  body[1]; */
+} MsnDcContext;
+#pragma pack(pop)
+
+#define DC_PACKET_HEADER_SIZE sizeof(MsnDcContext)
+#define DC_MAX_BODY_SIZE      8*1024
+#define DC_MAX_PACKET_SIZE    (DC_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;
+
+	p = g_new0(MsnDirectConnPacket, 1);
+	p->length = length;
+	p->data = g_malloc(length);
 
-static int
-create_listener(int port)
+	return p;
+}
+
+static void
+msn_dc_destroy_packet(MsnDirectConnPacket *p)
 {
-	int fd;
-	int flags;
-	const int on = 1;
+	g_free(p->data);
+
+	if (p->msg)
+		msn_message_unref(p->msg);
 
-#if 0
-	struct addrinfo hints;
-	struct addrinfo *c, *res;
-	char port_str[5];
+	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_destroy(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 (bind(fd, (struct sockaddr *)&sockin, sizeof(struct sockaddr_in)) != 0)
-	{
-		close(fd);
-		return -1;
+	if (dc->out_queue != NULL) {
+		while (!g_queue_is_empty(dc->out_queue))
+			msn_dc_destroy_packet( g_queue_pop_head(dc->out_queue) );
+
+		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);
+}
+
+/*
+void
+msn_dc_ref(MsnDirectConn *dc)
+{
+	g_return_if_fail(dc != NULL);
 
-	return fd;
+	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;
+
+	purple_debug_info("msn", "msn_dc_fallback_to_sb %p\n", dc);
 
-	g_free(buffer);
+	g_return_if_fail(dc != NULL);
 
-	directconn->c++;
+	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_msg(slplink, p->msg);
+				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_parse_binary_header(MsnDirectConn *dc)
 {
-	guint32 t1;
-	guint16 t2;
-	guint16 t3;
-	guint16 t4;
-	guint64 t5;
+	MsnSlpHeader *h;
+	MsnDcContext *context;
+
+	g_return_if_fail(dc != NULL);
+
+	h = &dc->header;
+	/* Skip packet size */
+	context = (MsnDcContext *)(dc->in_buffer + 4);
+
+	h->session_id = GUINT32_FROM_LE(context->session_id);
+	h->id = GUINT32_FROM_LE(context->seq_id);
+	h->offset = GUINT64_FROM_LE(context->offset);
+	h->total_size = GUINT64_FROM_LE(context->total_size);
+	h->length = GUINT32_FROM_LE(context->length);
+	h->flags = GUINT32_FROM_LE(context->flags);
+	h->ack_id = GUINT32_FROM_LE(context->ack_id);
+	h->ack_sub_id = GUINT32_FROM_LE(context->ack_uid);
+	h->ack_size = GUINT64_FROM_LE(context->ack_size);
+}
 
-	g_return_if_fail(directconn != NULL);
-	g_return_if_fail(nonce      != NULL);
+static const gchar *
+msn_dc_serialize_binary_header(MsnDirectConn *dc) {
+	MsnSlpHeader *h;
+	static MsnDcContext bin_header;
 
-	sscanf (nonce, "%08X-%04hX-%04hX-%04hX-%012llX", &t1, &t2, &t3, &t4, &t5);
+	g_return_val_if_fail(dc != NULL, NULL);
 
-	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);
+	h = &dc->header;
 
-	directconn->slpheader = g_new0(MsnSlpHeader, 1);
+	bin_header.session_id = GUINT32_TO_LE(h->session_id);
+	bin_header.seq_id = GUINT32_TO_LE(h->id);
+	bin_header.offset = GUINT64_TO_LE(h->offset);
+	bin_header.total_size = GUINT64_TO_LE(h->total_size);
+	bin_header.length = GUINT32_TO_LE(h->length);
+	bin_header.flags = GUINT32_TO_LE(h->flags);
+	bin_header.ack_id = GUINT32_TO_LE(h->ack_id);
+	bin_header.ack_uid = GUINT32_TO_LE(h->ack_sub_id);
+	bin_header.ack_size = GUINT64_TO_LE(h->ack_size);
 
-	directconn->slpheader->ack_id     = t1;
-	directconn->slpheader->ack_sub_id = t2 | (t3 << 16);
-	directconn->slpheader->ack_size   = t4 | t5;
+	return (const gchar *)&bin_header;
 }
-#endif
 
-void
-msn_directconn_send_msg(MsnDirectConn *directconn, MsnMessage *msg)
+static void
+msn_dc_send_cb(gpointer data, gint fd, PurpleInputCondition cond)
 {
-	char *body;
-	size_t body_len;
+	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;
+	}
+
+	p = g_queue_peek_head(dc->out_queue);
+
+	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;
+
+			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;
 
-	body = msn_message_gen_slp_body(msg, &body_len);
+	dc->msg_pos += bytes_sent;
+	if (dc->msg_pos == p->length) {
+		if (p->sent_cb != NULL)
+			p->sent_cb(p);
 
-	msn_directconn_write(directconn, body, body_len);
+		g_queue_pop_head(dc->out_queue);
+		msn_dc_destroy_packet(p);
+
+		dc->msg_pos = -1;
+	}
 }
 
 static void
-read_cb(gpointer data, gint source, PurpleInputCondition cond)
+msn_dc_enqueue_packet(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);
+	gboolean was_empty;
 
-		return;
+	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);
 	}
+}
 
-	body_len = GUINT32_FROM_LE(body_len);
+static void
+msn_dc_send_foo(MsnDirectConn *dc)
+{
+	MsnDirectConnPacket	*p;
 
-	purple_debug_info("msn", "body_len=%" G_GSIZE_FORMAT "\n", body_len);
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_send_foo %p\n", dc);
 
-	if (body_len <= 0)
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
+	p = msn_dc_new_packet(4);
 
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
+	memcpy(p->data, "foo\0", 4);
 
-		close(directconn->fd);
+	msn_dc_enqueue_packet(dc, p);
+}
 
-		msn_directconn_destroy(directconn);
+static void
+msn_dc_send_handshake_with_nonce(MsnDirectConn *dc, MsnDirectConnPacket *p)
+{
+	const gchar *h;
 
-		return;
-	}
+	h = msn_dc_serialize_binary_header(dc);
+	memcpy(p->data, h, DC_PACKET_HEADER_SIZE);
 
-	body = g_try_malloc(body_len);
+	memcpy(p->data + offsetof(MsnDcContext, ack_id), dc->nonce, 16);
 
-	if (body != NULL)
-	{
-		/* Let's read the data. */
-		len = read(directconn->fd, body, body_len);
+	msn_dc_enqueue_packet(dc, p);
+}
 
-		purple_debug_info("msn", "len=%" G_GSIZE_FORMAT "\n", len);
-	}
-	else
-	{
-		purple_debug_error("msn", "Failed to allocate memory for read\n");
-		len = 0;
-	}
+static void
+msn_dc_send_handshake(MsnDirectConn *dc)
+{
+	MsnDirectConnPacket *p;
 
-	if (len > 0)
-	{
-		MsnMessage *msg;
+	p = msn_dc_new_packet(DC_PACKET_HEADER_SIZE);
 
-#ifdef DEBUG_DC
-		str = g_strdup_printf("%s/msntest/r%.4d.bin", g_get_home_dir(), directconn->c);
+	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;
 
-		FILE *tf = g_fopen(str, "w");
-		fwrite(body, 1, len, tf);
-		fclose(tf);
+	msn_dc_send_handshake_with_nonce(dc, p);
+}
 
-		g_free(str);
-#endif
+static void
+msn_dc_send_handshake_reply(MsnDirectConn *dc)
+{
+	MsnDirectConnPacket *p;
 
-		directconn->c++;
+	p = msn_dc_new_packet(DC_PACKET_HEADER_SIZE);
 
-		msg = msn_message_new_msnslp();
-		msn_message_parse_slp_body(msg, body, body_len);
+	dc->header.id = dc->slpcall->slplink->slp_seq_id++;
+	dc->header.length = 0;
 
-		purple_debug_info("msn", "directconn: process_msg\n");
-		msn_slplink_process_msg(directconn->slplink, msg);
-	}
-	else
-	{
-		/* ERROR */
-		purple_debug_error("msn", "error reading\n");
+	msn_dc_send_handshake_with_nonce(dc, p);
+}
 
-		if (directconn->inpa)
-			purple_input_remove(directconn->inpa);
+static gboolean
+msn_dc_verify_handshake(MsnDirectConn *dc, guint32 packet_length)
+{
+	guchar nonce[16];
+	gchar  nonce_hash[37];
+
+	if (packet_length != DC_PACKET_HEADER_SIZE)
+		return FALSE;
+
+	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnDcContext, 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;
+		}
+
+	} 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;
+}
+
+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 + DC_PACKET_HEADER_SIZE;
+	p = msn_dc_new_packet(length);
+
+	memcpy(p->data, &msg->msnslp_header, DC_PACKET_HEADER_SIZE);
+	memcpy(p->data + DC_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);
+}
+
+static int
+msn_dc_process_packet(MsnDirectConn *dc, guint32 packet_length)
+{
+	g_return_val_if_fail(dc != NULL, DC_PROCESS_ERROR);
+
+	switch (dc->state) {
+	case DC_STATE_CLOSED:
+		break;
+
+	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;
 
-		close(directconn->fd);
+	case DC_STATE_HANDSHAKE:
+		if (!msn_dc_verify_handshake(dc, packet_length))
+			return DC_PROCESS_FALLBACK;
 
-		msn_directconn_destroy(directconn);
+		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:
+		msn_slplink_process_msg(
+			dc->slplink,
+			&dc->header,
+			dc->in_buffer + 4 + DC_PACKET_HEADER_SIZE,
+			dc->header.length
+		);
+
+		/*
+		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) {
+			msn_dc_parse_binary_header(dc);
 		}
+
+		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);
+
+	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);
 
-	connect_cb(data, source, PURPLE_INPUT_READ);
+	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;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_connected_to_peer_cb %p\n", dc);
 
-	g_return_val_if_fail(directconn != NULL, FALSE);
-	g_return_val_if_fail(host       != NULL, TRUE);
-	g_return_val_if_fail(port        > 0,    FALSE);
+	g_return_if_fail(dc != NULL);
 
-	session = directconn->slplink->session;
+	dc->connect_data = NULL;
+	purple_timeout_remove(dc->connect_timeout_handle);
+	dc->connect_timeout_handle = 0;
 
-#if 0
-	if (session->http_method)
-	{
-		servconn->http_data->gateway_host = g_strdup(host);
+	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;
 
-	slplink->directconn = directconn;
+	if (dc->connect_data != NULL) {
+		purple_proxy_connect_cancel(dc->connect_data);
+		dc->connect_data = NULL;
+	}
 
-	return 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 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 (purple_debug_is_verbose())
+		purple_debug_info("msn", "msn_dc_incoming_connection_cb %p\n", dc);
+
+	g_return_if_fail(dc != NULL);
+
+	if (dc->connect_timeout_handle != 0) {
+		purple_timeout_remove(dc->connect_timeout_handle);
+		dc->connect_timeout_handle = 0;
+	}
 
-	if (directconn->inpa != 0)
-		purple_input_remove(directconn->inpa);
+	if (dc->listenfd_handle != 0) {
+		purple_input_remove(dc->listenfd_handle);
+		dc->listenfd_handle = 0;
+	}
 
-	if (directconn->fd >= 0)
-		close(directconn->fd);
+	dc->fd = accept(listenfd, NULL, 0);
 
-	if (directconn->nonce != NULL)
-		g_free(directconn->nonce);
+	purple_network_remove_port_mapping(dc->listenfd);
+	close(dc->listenfd);
+	dc->listenfd = -1;
 
-	directconn->slplink->directconn = NULL;
+	if (dc->fd != -1) {
+		msn_dc_init(dc);
+		dc->state = DC_STATE_FOO;
+	}
+}
 
-	g_free(directconn);
+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 f87c4b2153..2aae22ec69 100644
--- a/libpurple/protocols/msn/directconn.h
+++ b/libpurple/protocols/msn/directconn.h
@@ -26,36 +26,174 @@
 
 typedef struct _MsnDirectConn MsnDirectConn;
 
+#include "network.h"
+#include "proxy.h"
+#include "circbuffer.h"
+
 #include "msg.h"
 #include "slp.h"
 #include "slplink.h"
+#include "slpmsg.h"
+
+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*);
+	MsnMessage  *msg;
+};
 
 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 */
+
+	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 */
+
+	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 */
 
-	PurpleProxyConnectData *connect_data;
+	int     fd;             /**< The direct connection socket */
+	guint   recv_handle;    /**< The incoming data callback handle */
+	guint   send_handle;    /**< The outgoing data callback handle */
 
-	gboolean acked;
+	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 */
 
-	char *nonce;
+	MsnSlpHeader    header; /**< SLP header for parsing / serializing */
 
-	int fd;
+	/** The callback used for sending information to the peer about the opened socket */
+	void (*send_connection_info_msg_cb)(MsnDirectConn *);
 
-	int port;
-	int inpa;
+	gchar   *ext_ip;    /**< Our external IP address */
+	int     ext_port;   /**< Our external port */
 
-	int c;
+	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.
+ */
+void
+msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg);
+
+/*
+ * 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 */
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/msg.c b/libpurple/protocols/msn/msg.c
index 9e5f16ef4b..57c4aba706 100644
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -939,8 +939,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 +952,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 +968,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 +985,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 +1002,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,7 +1028,9 @@ 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);
 }
 
@@ -1100,7 +1117,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);
@@ -1113,59 +1131,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;
@@ -1185,6 +1208,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/msn.c b/libpurple/protocols/msn/msn.c
index c20f31886f..93e1db7337 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -195,39 +195,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;
 	PurpleAccount *account;
-	const char *alias;
+	const char *real_alias;
+	MsnTransaction *trans;
+	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));
 	}
 
-	msn_cmdproc_send(cmdproc, "PRP", "MFN %s", alias);
+	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);
+}
+
+static void
+msn_act_id(PurpleConnection *gc, const char *entry)
+{
+	msn_set_public_alias(gc, entry, NULL, NULL);
 }
 
 static void
@@ -497,7 +622,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 +633,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;
@@ -589,6 +711,14 @@ t_msn_xfer_init(PurpleXfer *xfer)
 {
 	MsnSlpLink *slplink = xfer->data;
 	msn_slplink_request_ft(slplink, xfer);
+	msn_slplink_unref(slplink);
+}
+
+static void
+t_msn_xfer_cancel_send(PurpleXfer *xfer)
+{
+	MsnSlpLink *slplink = xfer->data;
+	msn_slplink_unref(slplink);
 }
 
 static PurpleXfer*
@@ -603,9 +733,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;
 }
@@ -1950,11 +2081,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 +2199,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 +2217,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 +2603,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 +2629,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 +2689,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 +2700,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);
 }
@@ -2665,75 +2794,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,                                   /* get_media_caps */
-	NULL                                    /* get_moods */
+	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 =
@@ -2800,6 +2931,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 d989ff33eb..1e597cf13d 100644
--- a/libpurple/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
@@ -144,7 +144,10 @@ typedef enum
 #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);
 
diff --git a/libpurple/protocols/msn/msnutils.c b/libpurple/protocols/msn/msnutils.c
index c8870d5603..f86cf3c647 100644
--- a/libpurple/protocols/msn/msnutils.c
+++ b/libpurple/protocols/msn/msnutils.c
@@ -541,7 +541,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/notification.c b/libpurple/protocols/msn/notification.c
index f8a662ca6b..2f4e9ce054 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -92,7 +92,6 @@ connect_cb(MsnServConn *servconn)
 {
 	MsnCmdProc *cmdproc;
 	MsnSession *session;
-	PurpleAccount *account;
 	GString *vers;
 	const char *ver_str;
 	int i;
@@ -101,7 +100,6 @@ connect_cb(MsnServConn *servconn)
 
 	cmdproc = servconn->cmdproc;
 	session = servconn->session;
-	account = session->account;
 
 	vers = g_string_new("");
 
@@ -178,10 +176,8 @@ static void
 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
-	PurpleAccount *account;
 
 	session = cmdproc->session;
-	account = session->account;
 
 	if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
 	{
@@ -409,7 +405,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;
@@ -543,8 +539,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);
@@ -567,6 +563,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");
@@ -599,8 +596,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) {
@@ -629,8 +627,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) {
@@ -673,11 +670,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);
 	}
 
 }
@@ -983,19 +983,12 @@ 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
@@ -1003,7 +996,6 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj = NULL;
 	unsigned long clientid;
@@ -1013,7 +1005,6 @@ iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	session = cmdproc->session;
 	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[1];
 	passport = cmd->params[2];
@@ -1206,7 +1197,6 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
 	PurpleAccount *account;
-	PurpleConnection *gc;
 	MsnUser *user;
 	MsnObject *msnobj;
 	unsigned long clientid;
@@ -1215,7 +1205,6 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 
 	session = cmdproc->session;
 	account = session->account;
-	gc = purple_account_get_connection(account);
 
 	state    = cmd->params[0];
 	passport = cmd->params[1];
@@ -1299,11 +1288,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)
 	{
@@ -1323,19 +1312,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);
-			}
-		}
 	}
 }
 
@@ -1403,11 +1379,13 @@ rng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	MsnSession *session;
 	MsnSwitchBoard *swboard;
 	const char *session_id;
+	const char *auth_key;
 	char *host;
 	int port;
 
 	session = cmdproc->session;
 	session_id = cmd->params[0];
+	auth_key = cmd->params[3];
 
 	msn_parse_socket(cmd->params[1], &host, &port);
 
@@ -1417,8 +1395,8 @@ 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_auth_key(swboard, cmd->params[3]);
+	msn_switchboard_set_session_id(swboard, session_id);
+	msn_switchboard_set_auth_key(swboard, auth_key);
 	swboard->im_user = g_strdup(cmd->params[4]);
 	/* msn_switchboard_add_user(swboard, cmd->params[4]); */
 
@@ -1587,18 +1565,16 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 			 size_t len)
 {
 	MsnSession *session;
-	PurpleAccount *account;
 	MsnUser *user;
 	const char *passport;
-	char *psm_str, *str;
+	char *str;
 
 	session = cmdproc->session;
-	account = session->account;
 
 	passport = cmd->params[0];
 	user = msn_userlist_find_user(session->userlist, passport);
 	if (user == NULL) {
-		char *str = g_strndup(payload, len);
+		str = g_strndup(payload, len);
 		purple_debug_info("msn", "unknown user %s, payload is %s\n",
 			passport, str);
 		g_free(str);
@@ -1613,12 +1589,13 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 		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);
-		msn_user_set_statusline(user, psm_str);
-		g_free(psm_str);
+		str = msn_get_psm(cmd->payload,len);
+		msn_user_set_statusline(user, str);
+		g_free(str);
 
 		str = msn_get_currentmedia(cmd->payload, len);
 		parse_currentmedia(user, str);
@@ -1664,7 +1641,9 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnSession *session;
 	const char *value;
+#ifdef MSN_PARTIAL_LISTS
 	const char *clLastChange;
+#endif
 
 	session = cmdproc->session;
 
@@ -1707,9 +1686,9 @@ profile_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	if ((value = msn_message_get_attr(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);
@@ -1913,7 +1892,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)
@@ -1973,8 +1952,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);
@@ -2004,8 +1982,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);
@@ -2043,8 +2020,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);
diff --git a/libpurple/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index 96991e4952..776f10ad20 100644
--- a/libpurple/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
@@ -28,6 +28,10 @@ typedef struct _MsnNotification MsnNotification;
 
 /* MSN protocol challenge info */
 
+/* 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"
diff --git a/libpurple/protocols/msn/object.c b/libpurple/protocols/msn/object.c
index 09b40e26f7..dddbd271ea 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,6 +384,22 @@ msn_object_get_sha1(const MsnObject *obj)
 	}
 }
 
+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;
+}
+
 static MsnObject *
 msn_object_find_local(const char *sha1)
 {
diff --git a/libpurple/protocols/msn/object.h b/libpurple/protocols/msn/object.h
index 7bcab67514..d2745118f6 100644
--- a/libpurple/protocols/msn/object.h
+++ b/libpurple/protocols/msn/object.h
@@ -50,6 +50,8 @@ typedef struct
 	char *friendly;
 	char *sha1d;
 	char *sha1c;
+	char *url;
+	char *url1;
 } MsnObject;
 
 /**
@@ -155,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.
@@ -235,6 +251,24 @@ 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);
+
 void msn_object_set_local(MsnObject *obj);
 
 #endif /* MSN_OBJECT_H */
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 1517717fdd..0b763caa1c 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -57,6 +57,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);
 
@@ -131,6 +136,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 +268,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)
 {
@@ -362,6 +394,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 +442,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
diff --git a/libpurple/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index dec6353f47..27ad890b16 100644
--- a/libpurple/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
@@ -59,6 +59,8 @@ typedef enum
 
 #define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
 
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
 #include "group.h"
 #include "httpconn.h"
 #include "nexus.h"
@@ -83,6 +85,7 @@ struct _MsnSession
 	gboolean connected;
 	gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
 	int      adl_fqy; /**< A count of ADL/FQY so status is only changed once. */
+	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;
 
@@ -119,6 +122,8 @@ struct _MsnSession
 
 	GHashTable *soap_table;
 	guint soap_cleanup_handle;
+
+	GSList *url_datas; /**< PurpleUtilFetchUrlData to be cancelled on exit */
 };
 
 /**
@@ -213,7 +218,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.
diff --git a/libpurple/protocols/msn/slp.c b/libpurple/protocols/msn/slp.c
index b55e48b8e1..e7f7dc58f2 100644
--- a/libpurple/protocols/msn/slp.c
+++ b/libpurple/protocols/msn/slp.c
@@ -25,24 +25,26 @@
 #include "slp.h"
 #include "slpcall.h"
 #include "slpmsg.h"
+#include "msnutils.h"
 
 #include "object.h"
 #include "user.h"
 #include "switchboard.h"
+#include "directconn.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);
 
+typedef struct {
+	MsnSession *session;
+	const char *remote_user;
+	const char *sha1;
+} MsnFetchUserDisplayData;
+
 /**************************************************************************
  * Util
  **************************************************************************/
@@ -91,7 +93,7 @@ msn_xfer_init(PurpleXfer *xfer)
 	content = g_strdup_printf("SessionID: %lu\r\n\r\n",
 							  slpcall->session_id);
 
-	send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+	msn_slp_send_ok(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
 			content);
 
 	g_free(content);
@@ -120,7 +122,7 @@ msn_xfer_cancel(PurpleXfer *xfer)
 			content = g_strdup_printf("SessionID: %lu\r\n\r\n",
 									slpcall->session_id);
 
-			send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
+			msn_slp_send_decline(slpcall, slpcall->branch, "application/x-msnmsgr-sessionreqbody",
 						content);
 
 			g_free(content);
@@ -154,6 +156,7 @@ msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
 	slpcall->u.outgoing.len = len;
 	slpcall->u.outgoing.data = data;
 	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
+	msn_message_unref(slpcall->xfer_msg->msg);
 	return MIN(1202, len);
 }
 
@@ -198,6 +201,7 @@ 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);
 }
@@ -206,36 +210,8 @@ msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
  * 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 +228,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;
@@ -308,6 +282,190 @@ find_valid_emoticon(PurpleAccount *account, const char *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)
@@ -330,7 +488,7 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 		content = g_strdup_printf("SessionID: %lu\r\n\r\n",
 								  slpcall->session_id);
 
-		send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
+		msn_slp_send_ok(slpcall, branch, "application/x-msnmsgr-sessionreqbody",
 				content);
 
 		g_free(content);
@@ -422,6 +580,12 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 
 			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);
@@ -479,7 +643,7 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 	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);
+		msn_slp_send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
 		g_free(content);
 	}
 }
@@ -548,92 +712,105 @@ got_invite(MsnSlpCall *slpcall,
 	}
 	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
 	{
-		/* A direct connection? */
+		/* A direct connection negotiation request */
+		char *bridges;
+		char *nonce;
+		MsnDirectConnNonceType ntype;
 
-		char *listening, *nonce;
-		char *content;
+		purple_debug_info("msn", "got_invite: transreqbody received\n");
 
-		if (FALSE)
-		{
-#if 0
-			MsnDirectConn *directconn;
-			/* const char *ip_addr; */
-			char *ip_port;
-			int port;
+		/* 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);
 
-			/* ip_addr = purple_prefs_get_string("/purple/ft/public_ip"); */
-			ip_port = "5190";
-			listening = "true";
-			nonce = rand_guid();
+			return;
+		}
 
-			directconn = msn_directconn_new(slplink);
+		/* Don't do anything if we already have a direct connection */
+		if (slplink->dc != NULL)
+			return;
 
-			/* msn_directconn_parse_nonce(directconn, nonce); */
-			directconn->nonce = g_strdup(nonce);
+		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';
+			}
 
-			msn_directconn_listen(directconn);
+			dc->listen_data = purple_network_listen_range(
+				0, 0,
+				SOCK_STREAM,
+				msn_dc_listen_socket_created_cb,
+				dc
+			);
 
-			port = directconn->port;
+			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");
 
-			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");
+				dc->send_connection_info_msg_cb = msn_dc_send_ok;
+				slpcall->wait_for_socket = TRUE;
+			}
 
-			content = g_strdup_printf(
-				"Bridge: TCPv1\r\n"
-				"Listening: %s\r\n"
-				"Nonce: {%s}\r\n"
-				"\r\n",
-				listening,
-				nonce);
+		} else {
+			/*
+			 * Invalid direct connect invitation or
+			 * TCP connection is not supported.
+			 */
 		}
 
-		send_ok(slpcall, branch,
-				"application/x-msnmsgr-transrespbody", content);
-
-		g_free(content);
 		g_free(nonce);
+		g_free(bridges);
 	}
 	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
+		/* A direct connection negotiation response */
+		msn_slp_process_transresp(slpcall, content);
 	}
 }
 
@@ -646,52 +823,104 @@ got_ok(MsnSlpCall *slpcall,
 
 	if (!strcmp(type, "application/x-msnmsgr-sessionreqbody"))
 	{
-#if 0
-		if (slpcall->type == MSN_SLPCALL_DC)
-		{
-			/* First let's try a DirectConnection. */
+		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;
+		}
 
-			MsnSlpLink *slplink;
-			MsnSlpMessage *slpmsg;
-			char *header;
-			char *content;
-			char *branch;
+		if (slpcall->slplink->dc != NULL) {
+			/* If we already have an established direct connection
+			 * then just start the transfer.
+			 */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
 
-			slplink = slpcall->slplink;
+		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);
 
-			branch = rand_guid();
+		if (dc->listen_data == NULL) {
+			/* Listen socket creation failed */
+			purple_debug_info("msn", "got_ok: listening failed\n");
 
 			content = g_strdup_printf(
-				"Bridges: TRUDPv1 TCPv1\r\n"
-				"NetID: 0\r\n"
-				"Conn-Type: Direct-Connect\r\n"
+				"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 : ""
 			);
 
-			header = g_strdup_printf("INVITE MSNMSGR:%s MSNSLP/1.0",
-									 slplink->remote_user);
+		} else {
+			/* Listen socket created successfully. */
+			purple_debug_info("msn", "got_ok: listening socket created\n");
 
-			slpmsg = msn_slp_sipmsg_new(slpcall, 0, header, branch,
-										"application/x-msnmsgr-transreqbody",
-										content);
+			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",
 
-			slpmsg->info = "SLP INVITE";
-			slpmsg->text_body = TRUE;
-			msn_slplink_send_slpmsg(slplink, slpmsg);
+				nonce ? nonce : ""
+			);
+		}
 
-			g_free(header);
-			g_free(content);
+		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);
 
-			g_free(branch);
-		}
-		else
-		{
-			msn_slpcall_session_init(slpcall);
-		}
-#else
-		msn_slpcall_session_init(slpcall);
-#endif
+		msn_slplink_queue_slpmsg(slpcall->slplink, msg);
 	}
 	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
 	{
@@ -700,32 +929,28 @@ got_ok(MsnSlpCall *slpcall,
 	}
 	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
 	{
-#if 0
-		char *ip_addrs;
-		char *temp;
-		char *nonce;
-		int port;
+		msn_slp_process_transresp(slpcall, content);
+	}
+}
 
-		nonce = get_token(content, "Nonce: {", "}\r\n");
-		if (ip_addrs == NULL)
+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")
+	          || !strcmp(type, "application/x-msnmsgr-transrespbody"))) {
+		MsnDirectConn *dc = slpcall->slplink->dc;
+		if (dc) {
+			msn_dc_fallback_to_sb(dc);
 			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
+		}
 	}
+
+	slpcall->wasted = TRUE;
 }
 
 MsnSlpCall *
@@ -767,18 +992,25 @@ msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
 
 		content = get_token(body, "\r\n\r\n", NULL);
 
-		if (branch && call_id && content_type && content)
-		{
-			slpcall = msn_slpcall_new(slplink);
-			slpcall->id = call_id;
-			got_invite(slpcall, branch, content_type, content);
-		}
-		else
+		slpcall = NULL;
+		if (branch && call_id)
 		{
-			g_free(call_id);
-			slpcall = NULL;
+			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);
@@ -797,38 +1029,31 @@ msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
 
 		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))
 		{
-			/* It's not valid. Kill this off. */
-			char temp[32];
+			char *error = NULL;
 			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';
+				size_t len = c - status;
+				error = g_strndup(status, len);
 			}
 
-			purple_debug_error("msn", "Received non-OK result: %s\n", temp);
-
-			slpcall->wasted = TRUE;
+			got_error(slpcall, error, content_type, content);
+			g_free(error);
 
-			/* msn_slpcall_destroy(slpcall); */
-			return slpcall;
+		} else {
+			/* Everything's just dandy */
+			got_ok(slpcall, content_type, content);
 		}
 
-		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);
 	}
@@ -860,6 +1085,8 @@ msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnSession *session;
 	MsnSlpLink *slplink;
+	const char *data;
+	gsize len;
 
 	session = cmdproc->servconn->session;
 	slplink = msn_session_get_slplink(session, msg->remote_user);
@@ -882,7 +1109,9 @@ msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		}
 	}
 
-	msn_slplink_process_msg(slplink, msg);
+	data = msn_message_get_bin_data(msg, &len);
+
+	msn_slplink_process_msg(slplink, &msg->msnslp_header, data, len);
 }
 
 static void
@@ -931,6 +1160,8 @@ msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 	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...
@@ -1032,8 +1263,6 @@ msn_release_buddy_icon_request(MsnUserList *userlist)
 	if (userlist->buddy_icon_window > 0)
 	{
 		GQueue *queue;
-		PurpleAccount *account;
-		const char *username;
 
 		queue = userlist->buddy_icon_requests;
 
@@ -1042,9 +1271,6 @@ msn_release_buddy_icon_request(MsnUserList *userlist)
 
 		user = g_queue_pop_head(queue);
 
-		account  = userlist->session->account;
-		username = user->passport;
-
 		userlist->buddy_icon_window--;
 		request_user_display(user);
 
@@ -1116,31 +1342,21 @@ static void
 got_user_display(MsnSlpCall *slpcall,
 				 const guchar *data, gsize size)
 {
-	MsnUserList *userlist;
+	MsnSlpLink *slplink;
 	const char *info;
 	PurpleAccount *account;
 
 	g_return_if_fail(slpcall != NULL);
+	slplink = slpcall->slplink;
 
 	info = slpcall->data_info;
 	if (purple_debug_is_verbose())
-		purple_debug_info("msn", "Got User Display: %s\n", slpcall->slplink->remote_user);
+		purple_debug_info("msn", "Got User Display: %s\n", slplink->remote_user);
 
-	userlist = slpcall->slplink->session->userlist;
-	account = slpcall->slplink->session->account;
+	account = slplink->session->account;
 
-	purple_buddy_icons_set_for_user(account, slpcall->slplink->remote_user,
+	purple_buddy_icons_set_for_user(account, 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
@@ -1180,6 +1396,26 @@ end_user_display(MsnSlpCall *slpcall, MsnSession *session)
 }
 
 static void
+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_user_display(MsnUser *user)
 {
 	PurpleAccount *account;
@@ -1200,8 +1436,20 @@ 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
 	{
diff --git a/libpurple/protocols/msn/slp.h b/libpurple/protocols/msn/slp.h
index a340fbe6c7..4539adfa7f 100644
--- a/libpurple/protocols/msn/slp.h
+++ b/libpurple/protocols/msn/slp.h
@@ -51,6 +51,14 @@ typedef struct
 
 MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
 							  const char *body);
+void
+msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch,
+		const char *type, const char *content);
+
+void
+msn_slp_send_decline(MsnSlpCall *slpcall, const char *branch,
+			 const char *type, const char *content);
+
 
 void send_bye(MsnSlpCall *slpcall, const char *type);
 
diff --git a/libpurple/protocols/msn/slpcall.h b/libpurple/protocols/msn/slpcall.h
index 58da0f7e62..fb68c79952 100644
--- a/libpurple/protocols/msn/slpcall.h
+++ b/libpurple/protocols/msn/slpcall.h
@@ -64,6 +64,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);
diff --git a/libpurple/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c
index eeeed3090d..ef70203bb1 100644
--- a/libpurple/protocols/msn/slplink.c
+++ b/libpurple/protocols/msn/slplink.c
@@ -78,7 +78,7 @@ msn_slplink_new(MsnSession *session, const char *username)
 	session->slplinks =
 		g_list_append(session->slplinks, slplink);
 
-	return slplink;
+	return msn_slplink_ref(slplink);
 }
 
 void
@@ -91,15 +91,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 +123,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 +188,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 *
@@ -206,16 +264,14 @@ msn_slplink_find_slp_call_with_session_id(MsnSlpLink *slplink, long id)
 	return NULL;
 }
 
-static void
+void
 msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
 {
-#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_msg(slplink->dc, msg);
 	}
 	else
-#endif
 	{
 		if (slplink->swboard == NULL)
 		{
@@ -275,7 +331,7 @@ msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 #endif
 
 	slpmsg->msgs =
-		g_list_append(slpmsg->msgs, msg);
+		g_list_append(slpmsg->msgs, msn_message_ref(msg));
 	msn_slplink_send_msg(slplink, msg);
 
 	if ((slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||
@@ -314,6 +370,7 @@ msg_ack(MsnMessage *msg, void *data)
 		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
 		{
 			slpmsg->slpcall->xfer_msg = slpmsg;
+			msn_message_ref(msg);
 			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
 		}
 		else
@@ -333,6 +390,8 @@ msg_ack(MsnMessage *msg, void *data)
 			}
 		}
 	}
+
+	msn_message_unref(msg);
 }
 
 /* We have received the message nak. */
@@ -346,12 +405,14 @@ msg_nak(MsnMessage *msg, void *data)
 	msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
 
 	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
+	msn_message_unref(msg);
 }
 
 static void
 msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
 	MsnMessage *msg;
+	const char *passport;
 
 	slpmsg->msg = msg = msn_message_new_msnslp();
 
@@ -390,7 +451,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 
 	msg->msnslp_header.total_size = slpmsg->size;
 
-	msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user);
+	passport = purple_normalize(slplink->session->account, slplink->remote_user);
+	msn_message_set_attr(msg, "P2P-Dest", passport);
 
 	msg->ack_cb = msg_ack;
 	msg->nak_cb = msg_nak;
@@ -431,21 +493,29 @@ 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, MsnSlpHeader *header)
 {
 	MsnSlpMessage *slpmsg;
 
 	slpmsg = msn_slpmsg_new(slplink);
 
-	slpmsg->session_id = msg->msnslp_header.session_id;
-	slpmsg->size       = msg->msnslp_header.total_size;
+	slpmsg->session_id = header->session_id;
+	slpmsg->size       = 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->ack_id     = header->id;
+	slpmsg->ack_sub_id = header->ack_id;
+	slpmsg->ack_size   = header->total_size;
 	slpmsg->info = "SLP ACK";
 
+	return slpmsg;
+}
+
+static void
+msn_slplink_send_ack(MsnSlpLink *slplink, MsnSlpHeader *header)
+{
+	MsnSlpMessage *slpmsg = msn_slplink_create_ack(slplink, header);
+
 	msn_slplink_send_slpmsg(slplink, slpmsg);
 	msn_slpmsg_destroy(slpmsg);
 }
@@ -457,6 +527,9 @@ send_file_cb(MsnSlpCall *slpcall)
 	PurpleXfer *xfer;
 
 	xfer = (PurpleXfer *)slpcall->xfer;
+	if (purple_xfer_get_status(xfer) >= PURPLE_XFER_STATUS_STARTED)
+		return;
+
 	purple_xfer_ref(xfer);
 	purple_xfer_start(xfer, -1, NULL, 0);
 	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
@@ -491,38 +564,27 @@ msn_slplink_message_find(MsnSlpLink *slplink, long session_id, long id)
 }
 
 void
-msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
+msn_slplink_process_msg(MsnSlpLink *slplink, MsnSlpHeader *header, const char *data, gsize len)
 {
 	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)
+	if (header->total_size < 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;
+	offset = 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;
+		slpmsg->id = header->id;
+		slpmsg->session_id = header->session_id;
+		slpmsg->size = header->total_size;
+		slpmsg->flags = header->flags;
 
 		if (slpmsg->session_id)
 		{
@@ -567,10 +629,10 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 	}
 	else
 	{
-		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
+		slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id);
 		if (slpmsg == NULL)
 		{
-			/* Probably the transfer was canceled */
+			/* Probably the transfer was cancelled */
 			purple_debug_error("msn", "Couldn't find slpmsg\n");
 			return;
 		}
@@ -615,8 +677,7 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 		return;
 #endif
 
-	if (msg->msnslp_header.offset + msg->msnslp_header.length
-		>= msg->msnslp_header.total_size)
+	if (header->offset + header->length >= header->total_size)
 	{
 		/* All the pieces of the slpmsg have been received */
 		MsnSlpCall *slpcall;
@@ -628,32 +689,45 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
 			return;
 		}
 
-		if (!slpcall->wasted) {
-			if (slpmsg->flags == 0x100)
-			{
-				MsnDirectConn *directconn;
+		purple_debug_info("msn", "msn_slplink_process_msg: slpmsg complete\n");
 
-				directconn = slplink->directconn;
+		if (/* !slpcall->wasted && */ slpmsg->flags == 0x100)
+		{
 #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 */
+			MsnDirectConn *directconn;
 
-				msn_slplink_send_ack(slplink, msg);
+			directconn = slplink->directconn;
+			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 */
+
+			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)
+		if (!slpcall->wait_for_socket && slpcall->wasted)
 			msn_slpcall_destroy(slpcall);
 	}
 }
@@ -662,15 +736,19 @@ static gchar *
 gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
 {
 	gsize size = 0;
-	MsnFileContext header;
+	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);
@@ -686,23 +764,33 @@ gen_context(PurpleXfer *xfer, const char *file_name, const char *file_path)
 		u8 = NULL;
 	}
 
-	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);
-	header.type = GUINT32_TO_LE(1);    /* No file preview */
+	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]);
+		header->file_name[currentChar] = GUINT16_TO_LE(uni[currentChar]);
 	}
-	memset(&header.file_name[currentChar], 0x00, (MAX_FILE_NAME_LEN - currentChar) * 2);
+	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);
-	header.preview[0] = '\0';
+	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));
+	ret = purple_base64_encode((const guchar *)header, sizeof(MsnFileContext) + preview_len);
+	g_free(header);
 	return ret;
 }
 
diff --git a/libpurple/protocols/msn/slplink.h b/libpurple/protocols/msn/slplink.h
index 4059ea9216..e3b2e97de0 100644
--- a/libpurple/protocols/msn/slplink.h
+++ b/libpurple/protocols/msn/slplink.h
@@ -42,19 +42,23 @@ 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;
 };
 
+MsnSlpLink *msn_slplink_ref(MsnSlpLink *slplink);
+void msn_slplink_unref(MsnSlpLink *slplink);
+
 void msn_slplink_destroy(MsnSlpLink *slplink);
 
 /**
@@ -79,9 +83,10 @@ 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_process_msg(MsnSlpLink *slplink, MsnSlpHeader *header, const char *data, gsize len);
 void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);
 
+void msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg);
 /* Only exported for msn_xfer_write */
 void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
 
diff --git a/libpurple/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c
index 3864ae1159..4b3f96a926 100644
--- a/libpurple/protocols/msn/slpmsg.c
+++ b/libpurple/protocols/msn/slpmsg.c
@@ -67,7 +67,7 @@ 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->msgs; 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. */
@@ -78,8 +78,8 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg)
 		msg->ack_cb = NULL;
 		msg->nak_cb = NULL;
 		msg->ack_data = NULL;
+		msn_message_unref(msg);
 	}
-	g_list_free(slpmsg->msgs);
 
 	slplink->slp_msgs = g_list_remove(slplink->slp_msgs, slpmsg);
 
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/state.c b/libpurple/protocols/msn/state.c
index 319f568e4e..536a36e33d 100644
--- a/libpurple/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
@@ -260,7 +260,7 @@ msn_change_status(MsnSession *session)
 
 	if (msnobj == NULL)
 	{
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, caps);
+		msn_cmdproc_send(cmdproc, "CHG", "%s %u", state_text, caps);
 	}
 	else
 	{
@@ -268,7 +268,7 @@ msn_change_status(MsnSession *session)
 
 		msnobj_str = msn_object_to_string(msnobj);
 
-		msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state_text,
+		msn_cmdproc_send(cmdproc, "CHG", "%s %u %s", state_text,
 						 caps, purple_url_encode(msnobj_str));
 
 		g_free(msnobj_str);
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 6b255355de..5f6e37b836 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -87,8 +87,17 @@ 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;
+
+		/* Destroy only those slplinks which use the switchboard */
+		if (slplink->dc == NULL)
+			msn_slplink_destroy(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)
@@ -731,8 +740,13 @@ 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);
+		g_free(passport->data);
+		swboard->users = g_list_delete_link(swboard->users, passport);
 		swboard->current_users--;
 		if (swboard->current_users == 0)
 			msn_switchboard_destroy(swboard);
@@ -747,12 +761,8 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 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]);
@@ -764,16 +774,12 @@ 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);
@@ -937,7 +943,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) &&
diff --git a/libpurple/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index 48e896fa06..49fa34ec1e 100644
--- a/libpurple/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
@@ -57,8 +57,8 @@ typedef enum
  * 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 saves
- * makes MsnUser smaller by the size of a few pointers.
+ * (usually less than 1%).  Putting it in a separate struct makes
+ * MsnUser smaller by the size of a few pointers.
  */
 typedef struct _MsnUserExtendedInfo
 {
diff --git a/libpurple/protocols/mxit/actions.c b/libpurple/protocols/mxit/actions.c
index b92d7162d6..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 );
@@ -335,7 +263,7 @@ static void mxit_cb_action_profile( PurplePluginAction* action )
 	purple_request_field_group_add_field( group, field );
 
 	/* title */
-	field = purple_request_field_string_new( "title", _( "Job Title" ), profile->title, FALSE );
+	field = purple_request_field_string_new( "title", _( "Title" ), profile->title, FALSE );
 	purple_request_field_group_add_field( group, field );
 
 	/* first name */
@@ -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 683bbca07c..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
@@ -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);
 }
 
 
@@ -582,8 +649,8 @@ int mxit_chat_send(PurpleConnection *gc, int id, const char *message, PurpleMess
 	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 ee8eb8a9d2..2964cfc293 100644
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -91,6 +91,11 @@ 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, is_command );
@@ -142,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()
 {
@@ -200,7 +205,7 @@ static void mxit_cb_chat_created( PurpleConversation* conv, struct MXitSession*
 	if ( find_active_chat( session->active_chats, who ) )
 		return;
 
-	/* determite if this buddy is a MXit service */
+	/* determine if this buddy is a MXit service */
 	switch ( contact->type ) {
 		case MXIT_TYPE_BOT :
 		case MXIT_TYPE_CHATROOM :
@@ -349,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" ) );
@@ -418,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 );
 
@@ -470,6 +497,8 @@ static void mxit_free_buddy( PurpleBuddy* buddy )
 			g_free( contact->statusMsg );
 		if ( contact->avatarId )
 			g_free( contact->avatarId );
+		if ( contact->msg )
+			g_free( contact->msg );
 		g_free( contact );
 	}
 
@@ -531,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 );
 
@@ -551,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 = {
@@ -567,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 */
@@ -575,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] */
@@ -635,7 +688,9 @@ static PurplePluginProtocolInfo proto_info = {
 	mxit_get_text_table,	/* get_account_text_table */
 	NULL,					/* initiate_media */
 	NULL,					/* get_media_caps */
-	NULL					/* get_moods */
+	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 21bd16f2a8..915a00bd91 100644
--- a/libpurple/protocols/mxit/mxit.h
+++ b/libpurple/protocols/mxit/mxit.h
@@ -63,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"
@@ -105,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 */
@@ -151,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 b3ad20dd60..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
@@ -120,18 +137,17 @@ void mxit_show_profile( struct MXitSession* session, const char* username, struc
 		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, _( "Job 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 166f54f472..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 */
@@ -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;
 
@@ -1257,7 +1300,7 @@ static void mxit_parse_cmd_login( struct MXitSession* session, struct record** r
 	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 );
 
@@ -1266,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 );
@@ -1290,15 +1346,6 @@ static void mxit_parse_cmd_login( struct MXitSession* session, struct record** r
 		g_free( statusmsg2 );
 	}
 
-	/* 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 );
-	}
-
 	/* retrieve our MXit profile */
 	mxit_send_extprofile_request( session, NULL, ARRAY_SIZE( profilelist ), profilelist );
 }
@@ -1355,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 );
@@ -1419,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 ) {
@@ -1472,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 */
@@ -1525,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 );
 	}
 }
 
@@ -1548,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 );
@@ -1593,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 */
@@ -1616,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 );
 	}
 }
@@ -1752,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;
 
@@ -1917,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 :
@@ -1962,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 :
@@ -2020,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 :
@@ -2438,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 996a71ed38..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
@@ -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 03f88c961f..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 */
@@ -346,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 );
 }
 
 
@@ -359,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 );
@@ -388,6 +471,10 @@ void mxit_update_buddy_presence( struct MXitSession* session, const char* userna
 	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.
 
@@ -399,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 */
 	}
@@ -413,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 );
 }
 
 
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/myspace.c b/libpurple/protocols/myspace/myspace.c
index 5ee859dc0e..a1b66fd9ec 100644
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -3094,7 +3094,9 @@ static PurplePluginProtocolInfo prpl_info = {
 	msim_get_account_text_table,              /* get_account_text_table */
 	NULL,                   /* initiate_media */
 	NULL,                   /* get_media_caps */
-	NULL                    /* get_moods */
+	NULL,                   /* get_moods */
+	NULL,                   /* set_public_alias */
+	NULL                    /* get_public_alias */
 };
 
 /**
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index d54757d631..0fc04298c0 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -3530,7 +3530,9 @@ static PurplePluginProtocolInfo prpl_info = {
 	NULL,						/* get_account_text_table */
 	NULL,						/* initiate_media */
 	NULL,						/* get_media_caps */
-	NULL						/* get_moods */
+	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 6ce4663587..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,10 +1117,12 @@ static PurplePluginProtocolInfo prpl_info =
   NULL,                                /* send_attention */
   NULL,                                /* get_attention_types */
   sizeof(PurplePluginProtocolInfo),    /* struct_size */
-  NULL,				       /* get_account_text_table */
+  NULL,                                /* get_account_text_table */
   NULL,                                /* initiate_media */
   NULL,                                /* get_media_caps */
-  NULL				       /* get_moods */
+  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..4cf5e4995b 100644
--- a/libpurple/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -6,10 +6,11 @@ EXTRA_DIST = \
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
 OSCARSOURCES = \
+	authorization.c     \
 	bstream.c           \
 	clientlogin.c       \
+	encoding.c          \
 	family_admin.c      \
-	family_advert.c     \
 	family_alert.c      \
 	family_auth.c       \
 	family_bart.c       \
@@ -19,14 +20,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 +42,9 @@ OSCARSOURCES = \
 	snac.c              \
 	snactypes.h         \
 	tlv.c               \
-	util.c
+	userinfo.c          \
+	util.c              \
+	visibility.c
 
 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 1ae6bc686a..9221e5c49d 100644
--- a/libpurple/protocols/oscar/clientlogin.c
+++ b/libpurple/protocols/oscar/clientlogin.c
@@ -428,6 +428,9 @@ 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"));
@@ -515,8 +518,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"),
+					URL_CLIENT_LOGIN, error_message);
+		else
+			tmp = g_strdup_printf(_("Error requesting %s"),
+					URL_CLIENT_LOGIN);
 		purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
diff --git a/libpurple/protocols/oscar/encoding.c b/libpurple/protocols/oscar/encoding.c
new file mode 100644
index 0000000000..985f2cb295
--- /dev/null
+++ b/libpurple/protocols/oscar/encoding.c
@@ -0,0 +1,235 @@
+/*
+ * 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")) {
+		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", attempting to convert to UTF-8 anyway\n", extracted_encoding);
+		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 7efd60e520..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
diff --git a/libpurple/protocols/oscar/family_chat.c b/libpurple/protocols/oscar/family_chat.c
index 9e25b22cc3..89fa331c0c 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,139 +88,27 @@ infoupdate(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fr
 		return 1;
 	}
 
-	tlvcount = byte_stream_get16(bs);
-
 	/*
 	 * Everything else are TLVs.
 	 */
 	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 +122,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 +232,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 +321,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 a01a6e56f1..73a3aa7862 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);
-		}
-
-	} else {
+	byte_stream_put16(&data, args->featureslen);
+	byte_stream_putraw(&data, args->features, args->featureslen);
 
-		/* 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);
-		byte_stream_put16(&data, args->charsubset);
+	/* Character set */
+	byte_stream_put16(&data, args->charset);
+	/* Character subset -- we always use 0 here */
+	byte_stream_put16(&data, 0x0);
 
-		/* 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);
+	flap_connection_send_snac(od, conn, SNAC_FAMILY_ICBM, 0x0006, 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);
-
-	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);
+	ByteStream bs;
+	aim_snacid_t snacid;
+	guint32 header_size, data_size;
+	guint16 cookie2 = (guint16)g_random_int();
 
-	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);
+	purple_debug_misc("oscar", "Sending message ack to %s\n", bn);
 
-	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);
+	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);
 
-	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", "clientautoresp: setting status "
-			"message to \"%s\".\n", status_note);
-
-	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);
 }
 
 /*
@@ -2625,10 +1661,9 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 	guchar *cookie;
 	guint8 bnlen;
 	char *xml = NULL;
-	int hdrlen;
+	guint16 hdrlen;
 	int curpos;
-	int num1,num2;
-	char *desc, *title, *temp;
+	guint16 num1, num2;
 	PurpleAccount *account;
 	PurpleBuddy *buddy;
 	PurplePresence *presence;
@@ -2642,54 +1677,64 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 
 	if (channel == 0x0002)
 	{
-	 	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 %i, num2 %i\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) {
- 				/* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", (const char*) xml); */
- 					if ((desc=strstr(xml,"&lt;desc&gt;")) != NULL) {
- 						temp=strstr(xml,"&lt;/desc&gt;");
- 						temp[0]=0;
- 						desc=desc+12;
- 					}
- 					if ((title=strstr(xml,"&lt;title&gt;")) != NULL) {
- 						temp=strstr(xml,"&lt;/title&gt;");
- 						temp[0]=0;
- 						title=title+13;
- 					} else {
- 						title="";
- 					}
- 					strcpy(xml,title);
-					if (desc) {
- 						strcat(xml, " - ");
- 						strcat(xml, desc);
+		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;
+
+					/* 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)
+								g_string_append(xstatus, " - ");
+							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
+						}
 					}
- 					purple_debug_misc("oscar", "X-Status reply: %s\n", (const char*)xml);
- 					account = purple_connection_get_account(od->gc);
- 					buddy = purple_find_buddy(account, bn);
- 					presence = purple_buddy_get_presence(buddy);
- 					status = purple_presence_get_active_status(presence);
- 					purple_prpl_got_user_status(account, bn,
-  					    purple_status_get_id(status), "message", xml, NULL);
-		   		} else {
-			 		purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
+					if (xstatus->len > 0) {
+						purple_debug_misc("oscar", "X-Status reply: %s\n", xstatus->str);
+						account = purple_connection_get_account(od->gc);
+						buddy = purple_find_buddy(account, bn);
+						presence = purple_buddy_get_presence(buddy);
+						status = purple_presence_get_active_status(presence);
+						purple_prpl_got_user_status(account, bn,
+								purple_status_get_id(status),
+								"message", xstatus->str, NULL);
+					}
+					g_string_free(xstatus, TRUE);
+				} 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" );
-		 /*		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		 		ret = userfunc(od, conn, frame, channel, sn, reason); */
+			} else {
+				purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n");
+				/* if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+					ret = userfunc(od, conn, frame, channel, sn, reason); */
 			}
-		
-	 	}
+
+		}
 
 	} else if (channel == 0x0004) { /* ICQ message */
 		switch (reason) {
@@ -2754,16 +1799,10 @@ static int clientautoresp(OscarData *od, FlapConnection *conn, aim_module_t *mod
 }
 
 /*
- * 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;
@@ -2773,8 +1812,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);
@@ -2825,7 +1863,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);
 
@@ -2849,7 +1887,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);
 
@@ -2871,38 +1909,36 @@ int icq_im_xstatus_request(OscarData *od, const char *sn)
 	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 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
+
+	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";	
+	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);
 	xmllen = strlen(fmt) - 2 + strlen(account->username);
 
-	statxml = (char*) g_malloc(xmllen);
+	statxml = g_malloc(xmllen);
 	snprintf(statxml, xmllen, fmt, account->username);
 
 	aim_icbm_makecookie(cookie);
@@ -2911,38 +1947,36 @@ int icq_im_xstatus_request(OscarData *od, const char *sn)
 					  + 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_new(&plugindata, (sizeof(c_plugindata) + xmllen));
-
 	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_putstr(&plugindata, statxml);
 
 	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_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, 0x0000, snacid, &bs, TRUE);
+	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, snacid, &bs, TRUE);
 
-	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 	byte_stream_destroy(&header);
 	byte_stream_destroy(&plugindata);
@@ -2959,58 +1993,65 @@ int icq_relay_xstatus(OscarData *od, const char *sn, const guchar *cookie)
 	aim_snacid_t snacid;
 	PurpleAccount *account;
 	PurpleStatus *status;
-   const char *fmt;
-   const char *formatted_msg;
-   char *msg;
-   char *statxml;
+	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
-	};	
+		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))
+	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;
+
+	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;
-	len = strlen(fmt)-6+strlen(account->username)+strlen(title)+strlen(msg);
-	statxml = (char*) g_malloc(len);
+	if (!formatted_msg)
+		return -EINVAL;
 
-	snprintf(statxml, len, fmt, 
-		account->username, title, msg);
+	msg = purple_markup_strip_html(formatted_msg);
+	if (!msg)
+		return -EINVAL;
+
+	len = strlen(fmt) - 6 + strlen(account->username) + strlen(title) + strlen(msg);
+	statxml = g_malloc(len);
+
+	snprintf(statxml, len, fmt, account->username, title, msg);
 
 	purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
 
@@ -3021,8 +2062,8 @@ int icq_relay_xstatus(OscarData *od, const char *sn, const guchar *cookie)
 	byte_stream_put16(&bs, 0x0003);
 	byte_stream_putraw(&bs, plugindata, sizeof(plugindata));
 	byte_stream_putraw(&bs, (const guint8*)statxml, strlen(statxml));
-	
-	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, 0x0000, snacid, &bs, TRUE);
+
+	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, snacid, &bs, TRUE);
 
 	g_free(statxml);
 	g_free(msg);
@@ -3067,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 3c796a299e..92008e8319 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);
 
@@ -180,7 +207,7 @@ int aim_icq_changepasswd(OscarData *od, const char *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 int
+gotalias(OscarData *od, struct aim_icq_info *info)
+{
+	PurpleConnection *gc = od->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	gchar who[16], *utf8;
+	PurpleBuddy *b;
+
+	if (info->nick[0] && (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 {
+			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;
 }
 
 /**
  * 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 eebf72c96c..8296aaca59 100644
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -245,6 +245,10 @@ 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}},
@@ -583,7 +587,7 @@ aim_locate_getcaps(OscarData *od, ByteStream *bs, int len)
 	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;
 
@@ -617,7 +621,7 @@ aim_receive_custom_icon(OscarData *od, ByteStream *bs, int len)
 	int offset;
 	const char *result = NULL;
 
-	for (offset = 0; byte_stream_empty(bs) && (offset < len); offset += 0x10) {
+	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;
@@ -643,7 +647,7 @@ aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len)
 	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;
 
@@ -674,16 +678,13 @@ byte_stream_putcaps(ByteStream *bs, guint64 caps)
 	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;
 }
 
@@ -804,7 +805,7 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 		type = byte_stream_get16(bs);
 		length = byte_stream_get16(bs);
 		curpos = byte_stream_curpos(bs);
-		endpos = curpos + MIN(length, byte_stream_empty(bs));
+		endpos = curpos + MIN(length, byte_stream_bytes_left(bs));
 
 		if (type == 0x0001) {
 			/*
@@ -1010,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? */
@@ -1165,73 +1166,18 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 	return 0;
 }
 
-/* Apparently, this is never called.
- * If you activate it, figure out a way to know what mood to pass to
- * aim_tlvlist_add_caps() below. --rlaager */
-#if 0
-/*
- * 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, NULL);
-	}
-
-	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;
-}
-#endif
-
 /*
  * 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;
 	}
@@ -1243,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;
@@ -1251,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;
 }
 
 /*
@@ -1389,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);
 
@@ -1423,41 +1367,7 @@ aim_locate_setcaps(OscarData *od, guint64 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);
 
@@ -1469,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;
@@ -1521,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.
  *
@@ -1682,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);
 
@@ -1730,15 +1511,6 @@ locate_modfirst(OscarData *od, aim_module_t *mod)
 	return 0;
 }
 
-#if 0 //rlaager
-const char* aim_get_custom_icon_mood(gint32 no)
-{
-	if (no >= G_N_ELEMENTS(aim_custom_icons) || no < 1)
-		return NULL;
-	return aim_custom_icons[no].mood.mood;
-}
-#endif
-
 const char*
 icq_get_custom_icon_description(const char *mood)
 {
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 9b554aab0e..b566642289 100644
--- a/libpurple/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
@@ -73,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);
 }
@@ -97,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));
@@ -141,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);
 }
@@ -187,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);
 
@@ -444,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);
 }
@@ -558,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)
@@ -643,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)))
@@ -770,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
@@ -837,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);
 }
@@ -850,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);
 
 	/*
@@ -899,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;
@@ -932,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.
@@ -1077,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);
 
@@ -1094,8 +1041,6 @@ 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;
 
@@ -1108,25 +1053,54 @@ aim_parse_extstatus(OscarData *od, FlapConnection *conn, aim_module_t *mod, Flap
 	 * 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) {
+	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);
+
+			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);
-			} break;
-		case 0x0002: { /* available message */
+		} break;
+
+		case 0x0002: {
+			/* We just set an 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;
-		}
+		} break;
 	}
 
-	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 3255e0f37a..8b4dc621d4 100644
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -212,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;
@@ -222,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)
 	{
@@ -284,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);
 }
 
 /**
@@ -733,7 +733,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);
@@ -800,7 +800,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;
 	}
@@ -931,18 +931,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]);
@@ -1074,8 +1062,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 5345b25d63..3862930728 100644
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
@@ -20,11 +20,12 @@
  *
  */
 
-/* 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 =
 {
@@ -57,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 */
@@ -97,7 +98,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* get_account_text_table */
 	NULL,					/* initiate_media */
 	NULL,					/* get_media_caps */
-	NULL					/* get_moods */
+	NULL,					/* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 static PurplePluginInfo info =
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index 2972466075..f7bfecaa79 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
  */
 
@@ -63,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 */
@@ -109,6 +109,8 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* initiate_media */
 	NULL,					/* can_do_media */
 	oscar_get_purple_moods, /* get_moods */
+	NULL,					/* set_public_alias */
+	NULL					/* get_public_alias */
 };
 
 static PurplePluginInfo info =
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 d344b0991c..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(guint64 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 47891cebca..aa2d84b380 100644
--- a/libpurple/protocols/oscar/oft.c
+++ b/libpurple/protocols/oscar/oft.c
@@ -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) &&
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 078de9055a..554877e2c5 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,27 +47,12 @@
 #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 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"
-
 #define AIMHASHDATA "http://pidgin.im/aim_data.php3"
 
 #define OSCAR_CONNECT_STEPS 6
@@ -82,11 +68,11 @@ static guint64 purple_caps =
 		| OSCAR_CAPABILITY_TYPING
 		| OSCAR_CAPABILITY_ICQSERVERRELAY
 		| OSCAR_CAPABILITY_NEWCAPS
-		| OSCAR_CAPABILITY_XTRAZ;
+		| 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 features_icq[] = {0x01};
 static guint8 ck[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 struct create_room {
@@ -100,84 +86,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 */
@@ -193,7 +101,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 *, ...);
@@ -202,27 +109,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_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 *, ...);
@@ -238,10 +134,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);
@@ -256,536 +152,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(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 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)
@@ -816,255 +182,6 @@ static char *oscar_icqstatus(int state) {
 		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"));
-		}
-	}
-
-	if (presence) {
-		const char *mood;
-		const char *description;
-		status = purple_presence_get_status(presence, "mood");
-		mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
-		description = icq_get_custom_icon_description(mood);
-		if (description && *description)
-			purple_notify_user_info_add_pair(user_info, _("Mood"), _(description));
-	}
-
-	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;
@@ -1547,25 +664,13 @@ 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_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);
@@ -1580,11 +685,11 @@ 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;
 	}
 
@@ -1825,34 +930,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;
@@ -2307,18 +1384,18 @@ static int purple_parse_oncoming(OscarData *od, FlapConnection *conn, FlapFrame
 		purple_prpl_got_user_status_deactive(account, info->bn, OSCAR_STATUS_ID_MOBILE);
 	}
 
-	if (info->status != NULL && info->status[0] != '\0')
+	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);
+		message = oscar_encoding_to_utf8(info->status_encoding, info->status, info->status_len);
+	}
 
 	tmp2 = tmp = (message ? purple_markup_escape_text(message, -1) : NULL);
 
 	if (strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) == 0) {
-		if (info->itmsurl_encoding && info->itmsurl && info->itmsurl_len)
+		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);
+			itmsurl = oscar_encoding_to_utf8(info->itmsurl_encoding, info->itmsurl, info->itmsurl_len);
+		}
 
 		if (tmp2 == NULL && itmsurl != NULL)
 			/*
@@ -2424,17 +1501,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) {
@@ -2474,38 +1545,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.
@@ -2589,8 +1629,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;
@@ -2618,35 +1657,20 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 			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)
@@ -2667,8 +1691,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)
 		{
@@ -2676,7 +1699,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);
@@ -2721,29 +1744,27 @@ incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 		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.rtfmsg != NULL)
-			{
-				char *rtfmsg = NULL;
-				if (args->encoding != NULL) {
-					char *encoding = oscar_encoding_extract(args->encoding);
-					rtfmsg = oscar_encoding_to_utf8(account, encoding,
-							args->info.rtfmsg.rtfmsg, strlen(args->info.rtfmsg.rtfmsg));
-					g_free(encoding);
-				} else {
-					if (g_utf8_validate(args->info.rtfmsg.rtfmsg, strlen(args->info.rtfmsg.rtfmsg), NULL))
-						rtfmsg = g_strdup(args->info.rtfmsg.rtfmsg);
-				}
-				if (rtfmsg) {
-					serv_got_im(gc, userinfo->bn, rtfmsg, flags, time(NULL));
-					g_free(rtfmsg);
-				}
+		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)
+		} 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
 	{
@@ -2756,122 +1777,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)
@@ -2915,7 +1820,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;
@@ -2968,24 +1873,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;
@@ -3087,7 +1985,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;
@@ -3101,12 +2000,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 */
@@ -3393,67 +2303,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;
 }
 
@@ -3496,104 +2347,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;
@@ -3736,13 +2489,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);
 
@@ -3750,16 +2497,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);
 
@@ -3775,7 +2513,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;
@@ -3794,10 +2531,7 @@ 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.]"));
+	utf8 = oscar_encoding_to_utf8(charset, msg, len);
 	serv_got_chat_in(gc, ccon->id, info->bn, 0, utf8, time(NULL));
 	g_free(utf8);
 
@@ -3915,41 +2649,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_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;
@@ -3970,10 +2669,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;
 }
 
@@ -4112,16 +2807,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));
@@ -4153,206 +2846,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;
@@ -4577,8 +3070,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;
@@ -4639,8 +3132,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);
@@ -4687,7 +3179,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);
 
@@ -4720,26 +3212,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);
@@ -4789,32 +3269,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. */
@@ -4831,14 +3298,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);
 	}
@@ -4865,43 +3330,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)
 {
@@ -4913,8 +3346,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;
@@ -4958,7 +3391,13 @@ oscar_set_extendedstatus(PurpleConnection *gc)
 	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
@@ -4999,7 +3438,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)
@@ -5032,7 +3471,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)
@@ -5061,8 +3500,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);
@@ -5075,28 +3512,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
@@ -5122,21 +3558,14 @@ oscar_set_status(PurpleAccount *account, PurpleStatus *status)
 		return;
 	}
 
+	if (od->icq) {
+		/* Set visibility */
+		oscar_set_icq_permdeny(account);
+	}
+
 	/* Set the AIM-style away message for both AIM and ICQ accounts */
 	oscar_set_info_and_status(account, FALSE, NULL, TRUE, status);
-
-	/* Set the ICQ status for ICQ accounts only */
-	if (od->icq)
-		oscar_set_status_icq(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);
 }
-#endif
 
 void
 oscar_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {
@@ -5179,13 +3608,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) {
@@ -5295,8 +3724,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;
 }
 
@@ -5337,12 +3764,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);
@@ -5355,110 +3784,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;
 
-		while (cur != NULL) {
-			b = cur->data;
-			cur = g_slist_remove(cur, b);
-			purple_blist_remove_buddy(b);
+		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);
+			/* 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) {
@@ -5467,13 +3895,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) {
@@ -5482,14 +3904,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) {
@@ -5531,13 +3946,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);
@@ -5546,12 +3955,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);
@@ -5559,11 +3966,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);
@@ -5595,7 +4002,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 */
@@ -5657,7 +4070,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 */
@@ -5706,15 +4119,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);
@@ -5809,24 +4214,18 @@ static int purple_ssi_authgiven(OscarData *od, FlapConnection *conn, FlapFrame *
 
 static int purple_ssi_authrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
-	PurpleConnection *gc = od->gc;
 	va_list ap;
 	const char *bn;
-	const char *msg;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	struct name_data *data;
-	PurpleBuddy *buddy;
+	char *msg;
 
 	va_start(ap, fr);
 	bn = va_arg(ap, const char *);
-	msg = 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) {
 		purple_debug_warning("oscar", "Received auth request from %s with "
 				"empty message\n", bn);
@@ -5836,16 +4235,7 @@ static int purple_ssi_authrequest(OscarData *od, FlapConnection *conn, FlapFrame
 		msg = NULL;
 	}
 
-	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);
-
-	purple_account_request_authorization(account, bn, NULL,
-			(buddy ? purple_buddy_get_alias_only(buddy) : NULL),
-			msg, buddy != NULL, purple_auth_grant,
-			purple_auth_dontgrant_msgprompt, data);
-
+	aim_icq_getalias(od, bn, TRUE, msg);
 	return 1;
 }
 
@@ -6018,9 +4408,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;
@@ -6036,7 +4426,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"
@@ -6052,10 +4442,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);
@@ -6066,12 +4457,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);
@@ -6226,7 +4611,7 @@ char *oscar_status_text(PurpleBuddy *b)
 			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));
+			ret = oscar_util_format_string(tmp2, purple_account_get_username(account));
 			g_free(tmp1);
 			g_free(tmp2);
 		}
@@ -6243,125 +4628,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 *
@@ -6653,7 +4953,7 @@ 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));
@@ -6693,7 +4993,6 @@ oscar_get_aim_info_cb(PurpleBlistNode *node, gpointer ignore)
 
 static GList *
 oscar_buddy_menu(PurpleBuddy *buddy) {
-
 	PurpleConnection *gc;
 	OscarData *od;
 	GList *menu;
@@ -6731,6 +5030,7 @@ oscar_buddy_menu(PurpleBuddy *buddy) {
 		                           PURPLE_CALLBACK(oscar_get_icqxstatusmsg),
 		                           NULL, NULL);
 		menu = g_list_prepend(menu, act);
+		menu = g_list_prepend(menu, create_visibility_menu_item(od, bname));
 	}
 
 	if (userinfo &&
@@ -6756,15 +5056,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)
@@ -6778,7 +5069,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);
 		}
@@ -6815,7 +5106,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);
 }
 
@@ -6930,41 +5221,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 "
@@ -7179,6 +5458,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
 	{
@@ -7208,12 +5493,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;
diff --git a/libpurple/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index a20d09faea..638536e793 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 */
@@ -376,7 +202,24 @@ typedef enum
 #define OSCAR_CAPABILITY_NEWCAPS               0x0000000020000000LL
 #define OSCAR_CAPABILITY_XTRAZ                 0x0000000040000000LL
 #define OSCAR_CAPABILITY_GENERICUNKNOWN        0x0000000080000000LL
-#define OSCAR_CAPABILITY_LAST                  0x0000000100000000LL
+#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.
@@ -395,8 +238,8 @@ typedef enum
 struct _ByteStream
 {
 	guint8 *data;
-	guint32 len;
-	guint32 offset;
+	size_t len;
+	size_t offset;
 };
 
 struct _QueuedSnac
@@ -526,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;
@@ -580,10 +423,8 @@ struct _OscarData
 #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.
@@ -669,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);
 
@@ -682,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
@@ -747,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
 {
@@ -813,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 */
 
@@ -824,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.
@@ -855,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 */
@@ -967,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;
@@ -982,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 */
@@ -1003,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);
@@ -1012,38 +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 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
@@ -1116,22 +818,8 @@ 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);
@@ -1139,10 +827,6 @@ void aim_locate_dorequest(OscarData *od);
 /* 0x0002 */ int aim_locate_reqrights(OscarData *od);
 /* 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);
 
 guint64 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len);
@@ -1157,25 +841,11 @@ 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;
@@ -1191,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 */
@@ -1241,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
@@ -1276,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);
 
@@ -1297,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
 {
@@ -1396,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);
 
@@ -1545,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;
@@ -1602,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);
@@ -1615,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);
@@ -1632,18 +1223,18 @@ 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, guint64 caps);
 
@@ -1678,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;
@@ -1705,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(guint64 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 strip_html_tags);
+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..8c0a9e17d9 100644
--- a/libpurple/protocols/oscar/oscar_data.c
+++ b/libpurple/protocols/oscar/oscar_data.c
@@ -53,17 +53,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);
diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index a7af4cb62f..52433e5f99 100644
--- a/libpurple/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
@@ -77,7 +77,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);
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..75675a9fbe 100644
--- a/libpurple/protocols/oscar/rxhandlers.c
+++ b/libpurple/protocols/oscar/rxhandlers.c
@@ -95,194 +95,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 8c93f98005..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:
@@ -409,23 +400,24 @@ int aim_tlvlist_add_str(GSList **list, const guint16 type, const char *value)
  */
 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);
-	
+
 	/* adding of custom icon GUID */
-	data = icq_get_custom_icon_data(mood);
 	if (data != NULL)
 		byte_stream_putraw(&bs, data, 16);
 
-	return aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), buf);
+	return aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), bs.data);
 }
 
 /**
@@ -668,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..5762977ad6
--- /dev/null
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -0,0 +1,553 @@
+/*
+ * 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 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.
+ */
+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 */
+			message = oscar_encoding_to_utf8(userinfo->away_encoding, userinfo->away, userinfo->away_len);
+		} 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"));
+	}
+
+	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 = oscar_util_format_string(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"));
+		}
+	}
+
+	if (presence) {
+		const char *mood;
+		const char *description;
+		status = purple_presence_get_status(presence, "mood");
+		mood = purple_status_get_attr_string(status, PURPLE_MOOD_NAME);
+		description = icq_get_custom_icon_description(mood);
+		if (description && *description)
+			purple_notify_user_info_add_pair(user_info, _("Mood"), _(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, /* 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);
+		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, /* 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)) {
+		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..abec4688f8
--- /dev/null
+++ b/libpurple/protocols/oscar/visibility.c
@@ -0,0 +1,199 @@
+/*
+ * 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"
+#include "request.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);
+}
+
+typedef void (*ShowDialog)(PurplePluginAction *);
+
+struct list_remove_data
+{
+	PurplePluginAction *action;
+	ShowDialog show_dialog_again;
+	OscarData *od;
+	guint16 list_type;
+	const gchar *list_name;
+};
+
+static void
+list_remove_cb(struct list_remove_data *data, PurpleRequestFields *fields)
+{
+	ShowDialog show_dialog_again = data->show_dialog_again;
+	PurplePluginAction *action = data->action;
+	PurpleRequestField *field = purple_request_fields_get_field(fields, "list-items");
+	GList *sels = purple_request_field_list_get_selected(field);
+	for (; sels; sels = sels->next) {
+		const gchar *name = sels->data;
+		const gchar *bname = purple_request_field_list_get_data(field, name);
+
+		purple_debug_info("oscar", "Removing %s from %s\n", bname, data->list_name);
+
+		aim_ssi_del_from_private_list(data->od, bname, data->list_type);
+	}
+
+	g_free(data);
+	show_dialog_again(action);
+}
+
+static void
+list_close_cb(struct list_remove_data *data, gpointer ignored)
+{
+	g_free(data);
+}
+
+static void
+show_private_list(PurplePluginAction *action,
+		  guint16 list_type,
+		  const gchar *list_name,
+		  const gchar *list_description,
+		  const gchar *menu_action_name,
+		  ShowDialog caller)
+{
+	PurpleConnection *gc = (PurpleConnection *) action->context;
+	OscarData *od = purple_connection_get_protocol_data(gc);
+	PurpleAccount *account = purple_connection_get_account(gc);
+	GSList *buddies, *cur;
+	gchar *desc;
+	struct list_remove_data *data;
+
+	PurpleRequestField *field;
+	PurpleRequestFields *fields = purple_request_fields_new();
+	PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
+
+	purple_request_fields_add_group(fields, group);
+
+	desc = g_strdup_printf(_("You can add a buddy to this list "
+				 "by right-clicking on them and "
+				 "selecting \"%s\""), menu_action_name);
+
+	field = purple_request_field_list_new("list-items", desc);
+	g_free(desc);
+
+	purple_request_field_group_add_field(group, field);
+
+	purple_request_field_list_set_multi_select(field, TRUE);
+	purple_request_field_set_required(field, TRUE);
+
+	buddies = purple_find_buddies(account, 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)) {
+			const gchar *alias = purple_buddy_get_alias_only(buddy);
+			char *dname = alias ? g_strdup_printf("%s (%s)", bname, alias) : NULL;
+			purple_request_field_list_add(field, dname ? dname : bname, (void *)bname);
+			g_free(dname);
+		}
+	}
+
+	g_slist_free(buddies);
+
+	data = g_new0(struct list_remove_data, 1);
+	data->action = action;
+	data->show_dialog_again = caller;
+	data->od = od;
+	data->list_type = list_type;
+	data->list_name = list_name;
+
+	purple_request_fields(gc, list_name, list_description, NULL,
+			      fields,
+			      _("Close"), G_CALLBACK(list_close_cb),
+			      _("Remove"), G_CALLBACK(list_remove_cb),
+			      account, NULL, NULL,
+			      data);
+}
+
+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),
+			  oscar_show_visible_list);
+}
+
+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),
+			  oscar_show_invisible_list);
+}
+
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/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index 019ac8e41c..489bd1c525 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -224,12 +224,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);
@@ -271,7 +269,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;
@@ -279,8 +276,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);
 
@@ -390,14 +386,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);
 
@@ -416,9 +410,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]);
@@ -427,6 +423,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_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..a0bb67072a 100644
--- a/libpurple/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
@@ -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_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..1f36fa8a1b 100644
--- a/libpurple/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
@@ -725,7 +725,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 +748,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 +821,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 +845,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 +1039,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 +1112,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 44d10c5b77..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);
@@ -381,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);
@@ -620,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"));
@@ -1041,7 +1033,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,							/* get_account_text_table */
 	NULL,							/* initiate_media */
 	NULL,							/* get_media_caps */
-	NULL							/* get_moods */
+	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 be9382c938..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);
 }
diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index 6ecbe5c314..729d6cdc13 100644
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -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 2262106040..3b8686ef86 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -2117,7 +2117,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,				        /* get_account_text_table */
 	NULL,				        /* initiate_media */
 	NULL,				        /* get_media_caps */
-	NULL				        /* get_moods */
+	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/chat.c b/libpurple/protocols/silc10/chat.c
index b9c903ef51..d87598f327 100644
--- a/libpurple/protocols/silc10/chat.c
+++ b/libpurple/protocols/silc10/chat.c
@@ -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 34e72854e4..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;
 }
 
@@ -2087,7 +2110,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* get_account_text_table */
 	NULL,					/* initiate_media */
 	NULL,					/* get_media_caps */
-	NULL					/* get_moods */
+	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 7c7c3047c3..a3871e1a72 100644
--- a/libpurple/protocols/yahoo/libyahoo.c
+++ b/libpurple/protocols/yahoo/libyahoo.c
@@ -265,7 +265,9 @@ static PurplePluginProtocolInfo prpl_info =
 	yahoo_get_account_text_table,    /* get_account_text_table */
 	NULL, /* initiate_media */
 	NULL,  /* get_media_caps */
-	NULL   /* get_moods */
+	NULL,  /* get_moods */
+	NULL,  /* set_public_alias */
+	NULL   /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -325,7 +327,7 @@ 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
diff --git a/libpurple/protocols/yahoo/libyahoojp.c b/libpurple/protocols/yahoo/libyahoojp.c
index b7890a3c95..a7342f6bf9 100644
--- a/libpurple/protocols/yahoo/libyahoojp.c
+++ b/libpurple/protocols/yahoo/libyahoojp.c
@@ -161,7 +161,9 @@ static PurplePluginProtocolInfo prpl_info =
 	yahoojp_get_account_text_table,    /* get_account_text_table */
 	NULL, /* initiate_media */
 	NULL, /* get_media_caps */
-	NULL  /* get_moods */
+	NULL, /* get_moods */
+	NULL, /* set_public_alias */
+	NULL  /* get_public_alias */
 };
 
 static PurplePluginInfo info =
@@ -221,7 +223,7 @@ 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
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index aeb51e978c..a448b5a0cb 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -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;
 
@@ -551,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);
@@ -638,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;
@@ -707,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);
@@ -843,12 +841,12 @@ static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt,
 			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);
 	
@@ -1773,7 +1771,7 @@ static gchar *yahoo_auth16_get_cookie_b(gchar *headers)
 				tmp = &splits[i][14];
 				sem = strchr(tmp, ';');
 
-				if(tmp != NULL) {
+				if (sem != NULL) {
 					tmp2 = g_strndup(tmp, sem - tmp);
 					purple_debug_info("yahoo", "Got needed part of B cookie: %s\n",
 							tmp2 ? tmp2 : "(null)");
@@ -1783,26 +1781,21 @@ static gchar *yahoo_auth16_get_cookie_b(gchar *headers)
 		}
 	}
 
+	g_strfreev(splits);
 	return tmp2;
 }
 
-static void yahoo_auth16_stage2(PurpleUtilFetchUrlData *unused, gpointer user_data, const gchar *ret_data, size_t len, const gchar *error_message)
+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);
@@ -1909,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);
@@ -2022,6 +2012,8 @@ static void yahoo_auth16_stage1_cb(PurpleUtilFetchUrlData *unused, gpointer user
 			url_data = purple_util_fetch_url_request_len_with_account(
 					proxy_ssl ? account : NULL, url, TRUE, YAHOO_CLIENT_USERAGENT,
 					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);
 		}
@@ -2030,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;
@@ -2061,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);
 }
@@ -2707,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);
@@ -2739,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, "",
@@ -2762,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);
@@ -3596,14 +3594,26 @@ static void yahoo_got_pager_server(PurpleUtilFetchUrlData *url_data,
 	PurpleConnection *gc = yd->gc;
 	PurpleAccount *a = purple_connection_get_account(gc);
 	gchar **strings = NULL, *cs_server = NULL;
-	int port = 0, stringslen = 0;
+	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)");
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect: The server returned an empty response."));
+
+		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);
 
@@ -3621,17 +3631,23 @@ static void yahoo_got_pager_server(PurpleUtilFetchUrlData *url_data,
 		}
 
 		if(cs_server) { /* got an address; get on with connecting */
-			port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
-
 			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)");
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Unable to connect: The server's response did not contain "
-						"the necessary information"));
+
+			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"));
+				}
 		}
 	}
 
@@ -3644,6 +3660,8 @@ void yahoo_login(PurpleAccount *account) {
 	YahooData *yd = gc->proto_data = g_new0(YahooData, 1);
 	PurpleStatus *status = purple_account_get_active_status(account);
 	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;
 
@@ -3676,12 +3694,14 @@ void yahoo_login(PurpleAccount *account) {
 
 	/* Get the pager server.  Actually start connecting in the callback since we
 	 * must have the contents of the HTTP response to proceed. */
-	purple_util_fetch_url_request_len_with_account(
-			purple_connection_get_account(gc),
+	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, TRUE, NULL, FALSE, -1,
+			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;
 }
@@ -3742,6 +3762,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);
@@ -3785,13 +3806,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));
@@ -3886,7 +3906,6 @@ static void yahoo_game(PurpleBlistNode *node, gpointer data) {
 	PurpleBuddy *buddy;
 	PurpleConnection *gc;
 
-	YahooData *yd;
 	const char *game;
 	char *game2;
 	char *t;
@@ -3897,7 +3916,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)
@@ -4370,6 +4388,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));
 
@@ -4463,7 +4483,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));
@@ -4917,7 +4939,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;
@@ -4929,7 +4950,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;
@@ -5192,15 +5212,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 7499c68add..a6cf03cece 100644
--- a/libpurple/protocols/yahoo/libymsg.h
+++ b/libpurple/protocols/yahoo/libymsg.h
@@ -30,6 +30,7 @@
 #include "prpl.h"
 
 #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"
diff --git a/libpurple/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c
index c119b2d095..57bbb84b6b 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_global_proxy_get_info();
+
+	type = purple_proxy_info_get_type(ppi);
+
+	return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR);
 }
 
 /*
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 690f5796c9..b1f1d2aea6 100644
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
@@ -983,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;
@@ -1018,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);
@@ -1235,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."));
@@ -1253,7 +1253,7 @@ 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);
+		cookies = yahoo_get_cookies(gc);
 		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/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 2168191b1b..4a86b6ac7c 100644
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -2909,7 +2909,9 @@ static PurplePluginProtocolInfo prpl_info = {
 	NULL,					/* get_account_text_table */
 	NULL,					/* initate_media */
 	NULL,					/* get_media_caps */
-	NULL					/* get_moods */
+	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 282b3572f0..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;
 
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 4ed0def2fc..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.
  */
@@ -573,8 +580,48 @@ struct _PurplePluginProtocolInfo
 	/**
 	 * 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) \
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/request.c b/libpurple/request.c
index fe7198c799..391e993d8d 100644
--- a/libpurple/request.c
+++ b/libpurple/request.c
@@ -1317,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,
@@ -1348,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 049b043b93..2083f7936b 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -237,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 *);
@@ -1393,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
@@ -1477,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/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 1e48399821..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 \
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 530886c41e..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
 
@@ -121,6 +174,37 @@ START_TEST(test_markup_html_to_xhtml)
 }
 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
+
 START_TEST(test_mime_decode_field)
 {
 	gchar *result = purple_mime_decode_field("=?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?=");
@@ -168,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 f91a70247e..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;
 
@@ -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 7704880cce..60320c9ffe 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;
@@ -586,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);
 	}
 
@@ -1307,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); \
@@ -1332,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; \
@@ -1345,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) \
@@ -2047,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)
 {
@@ -2094,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) {
@@ -2225,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);
@@ -2245,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;
@@ -2968,22 +2872,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
@@ -3147,7 +3115,7 @@ purple_str_strip_char(char *text, char thechar)
 		if (text[i] != thechar)
 			text[j++] = text[i];
 
-	text[j++] = '\0';
+	text[j] = '\0';
 }
 
 void
@@ -3455,7 +3423,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;
@@ -3463,11 +3431,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);
 
@@ -3487,37 +3456,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)
@@ -3541,6 +3505,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
 }
 
 /**
@@ -3653,11 +3623,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);
 	}
@@ -3949,36 +3919,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())
@@ -4117,6 +4119,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);
@@ -4270,6 +4273,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) == '\"')) {
@@ -4303,7 +4308,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);
@@ -4528,12 +4533,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 */
@@ -4880,7 +4895,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;
diff --git a/libpurple/util.h b/libpurple/util.h
index 357ae7e5ea..282c4bbfcd 100644
--- a/libpurple/util.h
+++ b/libpurple/util.h
@@ -819,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);
+
 /*@}*/
 
 
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
index 979a891fff..4351f3d989 100644
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -37,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
@@ -48,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
@@ -108,6 +106,7 @@ MAKENSISOPT ?= /
 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/rules.mak b/libpurple/win32/rules.mak
index 7d1962154f..f372f2a5be 100644
--- a/libpurple/win32/rules.mak
+++ b/libpurple/win32/rules.mak
@@ -8,3 +8,6 @@
 
 %.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 89b912d5f6..e31c2f424a 100644
--- a/libpurple/win32/targets.mak
+++ b/libpurple/win32/targets.mak
@@ -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 d2740dc15f..2c2824f744 100644
--- a/libpurple/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
@@ -35,7 +35,7 @@
 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
@@ -77,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);
@@ -124,7 +131,7 @@ const char *wpurple_install_dir(void) {
 	if (!initialized) {
 		char *tmp = NULL;
 		wchar_t winstall_dir[MAXPATHLEN];
-		if (GetModuleFileNameW(NULL, winstall_dir,
+		if (GetModuleFileNameW(libpurpledll_hInstance, winstall_dir,
 				MAXPATHLEN) > 0) {
 			tmp = g_utf16_to_utf8(winstall_dir, -1,
 				NULL, NULL, NULL);
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index eeab70c4c5..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);
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..faddee0d69 100644
--- a/pidgin.spec.in
+++ b/pidgin.spec.in
@@ -241,7 +241,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 +416,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 +471,13 @@ fi
 %endif
 
 %changelog
+* 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 e962356579..56731e0cc7 100644
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -22,48 +22,15 @@ EXTRA_DIST = \
 		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/norwegian_nynorsk.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
 
@@ -75,7 +42,6 @@ SUBDIRS = pixmaps plugins
 bin_PROGRAMS = pidgin
 
 pidgin_SOURCES = \
-	eggtrayicon.c \
 	pidginstock.c \
 	gtkaccount.c \
 	gtkblist.c \
@@ -126,7 +92,6 @@ pidgin_SOURCES = \
 	pidgintooltip.c
 
 pidgin_headers = \
-	eggtrayicon.h \
 	gtkaccount.h \
 	gtkblist.h \
 	gtkblist-theme.h \
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index 03c4714355..dd4f13285f 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -33,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 \
@@ -45,8 +44,7 @@ INCLUDE_PATHS +=	\
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(PIDGIN_TOP) \
-			-L$(PIDGIN_IDLETRACK_TOP)
+			-L$(PIDGIN_TOP)
 
 ##
 ##  SOURCES, OBJECTS
@@ -121,7 +119,6 @@ PIDGIN_LIBS =	\
 		-lgthread-2.0 \
 		-lpurple \
 		-lz \
-		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
 		-lpango-1.0 \
@@ -151,7 +148,6 @@ install_shallow: $(PIDGIN_INSTALL_DIR) $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
 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' \
@@ -159,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 03f05a49a8..d18f11bbf5 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -2418,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 *
@@ -2463,49 +2466,48 @@ pidgin_accounts_request_authorization(PurpleAccount *account,
 	char *buffer;
 	PurpleConnection *gc;
 	GtkWidget *alert;
+	GdkPixbuf *prpl_icon;
+	struct auth_request *aa;
 
 	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);
-	}
+				(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  : ""));
+
+
+	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.c b/pidgin/gtkblist.c
index f139a727d2..75e0c58ebe 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -942,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);
@@ -3165,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)
 		{
@@ -3452,7 +3454,7 @@ edit_mood_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 				PurpleAccount *account = (PurpleAccount *) accounts->data;
 				PurpleConnection *gc = purple_account_get_connection(account);
 
-				if (gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
+				if (gc && gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
 					update_status_with_mood(account, mood, NULL);
 				}
 			}
@@ -3484,29 +3486,31 @@ get_global_moods(void)
 	
 	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
 		PurpleAccount *account = (PurpleAccount *) accounts->data;
-		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);
+		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));
 				}
-				g_hash_table_insert(mood_counts, (gpointer)mood->mood,
-				    GINT_TO_POINTER(mood_count + 1));
-			}
 
-			num_accounts++;
+				num_accounts++;
+			}
 		}
 	}
 
@@ -3544,8 +3548,9 @@ get_global_mood_status(void)
 	for (; accounts ; accounts = g_list_delete_link(accounts, accounts)) {
 		PurpleAccount *account = (PurpleAccount *) accounts->data;
 
-		if (purple_account_get_connection(account)->flags &
-		    PURPLE_CONNECTION_SUPPORT_MOODS) {
+		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);
@@ -3595,11 +3600,12 @@ set_mood_cb(GtkWidget *widget, PurpleAccount *account)
 		purple_request_field_list_add_selected(f, _("None"));
 
 	/* TODO: rlaager wants this sorted. */
-	/* The connection is checked for PURPLE_CONNECTION_SUPPORT_MOODS flag before
-	 * this function is called for a non-null account. So using
-	 * PURPLE_PROTOCOL_PLUGIN_HAS_FUNC isn't necessary here */
-	for (mood = account ? prpl_info->get_moods(account) : global_moods;
-	     mood->mood != NULL ; mood++) {
+	/* 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)
@@ -3647,6 +3653,9 @@ set_mood_show(void)
  ***************************************************/
 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 },
@@ -3680,7 +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>M", set_mood_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 },
@@ -3959,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) {
@@ -3970,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);
@@ -4017,7 +4024,6 @@ 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;
@@ -4028,11 +4034,9 @@ pidgin_blist_get_emblem(PurpleBlistNode *node)
 	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)) {
 			/* This emblem comes from the small emoticon set now,
@@ -4125,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;
@@ -4152,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;
@@ -4162,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) {
@@ -4584,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();
 }
@@ -7461,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;
@@ -7487,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 *
@@ -7563,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);
@@ -7625,6 +7620,9 @@ void pidgin_blist_init(void)
 	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
@@ -7740,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;
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 423d3c45fc..c4da5883a3 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -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);
@@ -557,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;
 	}
 
@@ -612,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);
 }
 
@@ -741,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));
@@ -752,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);
 	}
 
@@ -847,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;
@@ -860,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. */
@@ -1191,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),
@@ -1902,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));
 
@@ -2000,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;
@@ -2341,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;
 
@@ -2608,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;
@@ -2619,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;
 	}
@@ -2693,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);
 
@@ -2721,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
@@ -3675,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);
 
@@ -4866,12 +4855,11 @@ static void
 pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
 {
 	GtkWidget *widget = gtk_hbox_new(FALSE, 0);
-	GtkWidget *label, *entry, *close, *image;
+	GtkWidget *label, *entry, *close;
 
 	gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
 
-	image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-	close = pidgin_create_small_button(image);
+	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);
@@ -5732,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;
@@ -5822,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)));
@@ -6255,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;
@@ -6298,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);
@@ -6721,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. */
@@ -6741,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;
@@ -6956,7 +6934,6 @@ pidgin_conv_update_buddy_icon(PurpleConversation *conv)
 	int size = 0;
 
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	PurpleBuddyIcon *icon;
 
@@ -6973,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));
@@ -8619,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;
@@ -8662,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;
@@ -9231,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;
@@ -9243,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);
@@ -9450,7 +9422,6 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 	GtkWidget *tab_cont = gtkconv->tab_cont;
 	PurpleConversationType conv_type;
 	const gchar *tmp_lab;
-	GtkWidget *close_image;
 
 	conv_type = purple_conversation_get_type(conv);
 
@@ -9462,8 +9433,7 @@ pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 
 
 	/* Close button. */
-	close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-	gtkconv->close = pidgin_create_small_button(close_image);
+	gtkconv->close = pidgin_create_small_button(gtk_label_new("×"));
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 	                     _("Close conversation"), NULL);
 
@@ -9497,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 */
@@ -9624,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);
@@ -9959,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. */
@@ -9998,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/gtkdialogs.c b/pidgin/gtkdialogs.c
index f0acaa0955..d29008639b 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -143,6 +143,7 @@ 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"},
@@ -199,13 +200,14 @@ static const struct translator translators[] = {
 	{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"},
@@ -214,7 +216,7 @@ static const struct translator translators[] = {
 	{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"},
@@ -286,6 +288,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"},
@@ -428,7 +431,8 @@ pidgin_build_help_dialog(const char *title, const char *role, GString *string)
 
 	/* Insert the logo */
 	logo = gtk_image_new_from_pixbuf(pixbuf);
-	g_object_unref(G_OBJECT(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);
@@ -1284,7 +1288,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/gtkdocklet-gtk.c b/pidgin/gtkdocklet-gtk.c
index 98beb64387..ad3c290017 100644
--- a/pidgin/gtkdocklet-gtk.c
+++ b/pidgin/gtkdocklet-gtk.c
@@ -38,7 +38,13 @@ docklet_gtk_status_activated_cb(GtkStatusIcon *status_icon, gpointer user_data)
 static void
 docklet_gtk_status_clicked_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
 {
-	pidgin_docklet_clicked(button); 
+	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
@@ -75,6 +81,12 @@ docklet_gtk_status_update_icon(PurpleStatusPrimitive status, gboolean connecting
 	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
@@ -101,7 +113,8 @@ 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;
 
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/gtkft.c b/pidgin/gtkft.c
index 78adbda91f..dfc91a51a4 100644
--- a/pidgin/gtkft.c
+++ b/pidgin/gtkft.c
@@ -40,6 +40,9 @@
 #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;
@@ -109,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
@@ -156,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"));
@@ -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;
@@ -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 a65908d392..1aed5fbbf3 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -1185,8 +1185,14 @@ 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
@@ -1256,7 +1262,7 @@ 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)) {
+	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);
 
@@ -1347,6 +1353,9 @@ static gboolean imhtml_message_send(GtkIMHtml *imhtml)
 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"))
@@ -1467,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",
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index 9b44f3fe4d..2b36c9c880 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -49,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)
 {
@@ -908,6 +911,7 @@ static void send_attention_cb(GtkWidget *attention, GtkIMHtmlToolbar *toolbar)
 
 	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)
@@ -1098,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));
@@ -1191,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;
@@ -1230,8 +1242,6 @@ static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 		{PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
 		{"", NULL, NULL, NULL},
 		{PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
-		/*{PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, send_attention_cb, 
-			g_object_get_data(G_OBJECT(toolbar->imhtml), "attention"), _("Send Attention")},*/
 		{NULL, NULL, NULL, NULL}
 	};
 	int iter;
@@ -1241,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;
@@ -1251,6 +1262,7 @@ static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 	}
 	/* 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);
@@ -1262,6 +1274,15 @@ static void gtk_imhtmltoolbar_create_old_buttons(GtkIMHtmlToolbar *toolbar)
 }
 
 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));
@@ -1309,6 +1330,7 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
 	GtkWidget *sep;
+	GObject *wide_attention_button;
 	int i;
 	struct {
 		const char *label;
@@ -1379,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);
 
@@ -1411,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;
@@ -1443,6 +1471,7 @@ 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);
 
@@ -1452,29 +1481,30 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	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, 
+	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),
-	    g_object_get_data(G_OBJECT(toolbar), "attention"));
+	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(G_OBJECT(g_object_get_data(G_OBJECT(toolbar), "attention")),
-	        "notify::sensitive",
+
+	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(g_object_get_data(G_OBJECT(toolbar), "attention"),
-		FALSE);
-	
+	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);
diff --git a/pidgin/gtkmain.c b/pidgin/gtkmain.c
index e16a66ee0f..24a347151e 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,16 +535,18 @@ 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'},
@@ -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
@@ -850,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);
@@ -977,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/gtkpounce.c b/pidgin/gtkpounce.c
index 1a589d5690..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);
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index bee1ee062a..81afcd2cfb 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1042,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);
 
@@ -1067,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, TRUE, TRUE, 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, TRUE, TRUE, 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, TRUE, TRUE, 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, TRUE, TRUE, 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),
@@ -1809,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:"),
@@ -2223,6 +2205,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 */
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index 3a164470f8..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"
 
@@ -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;
@@ -659,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);
 
@@ -712,6 +749,17 @@ 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)
 {
@@ -1699,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/gtksession.c b/pidgin/gtksession.c
index 4d088d0f35..a972865c76 100644
--- a/pidgin/gtksession.c
+++ b/pidgin/gtksession.c
@@ -166,7 +166,7 @@ static gchar **session_make_command(gchar *client_id, gchar *config_dir) {
 	ret[j++] = g_strdup("--display");
 	ret[j++] = g_strdup((gchar *)gdk_display_get_name(gdk_display_get_default()));
 
-	ret[j++] = NULL;
+	ret[j] = NULL;
 
 	return ret;
 }
@@ -346,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 06a041d8a1..e59c082fd7 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -520,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,
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 38b62b926c..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);
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 82ec16648c..34b3a79d1b 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -680,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;
@@ -702,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",
@@ -784,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 {
@@ -799,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) {
@@ -1036,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);
@@ -1078,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);
@@ -2469,7 +2463,7 @@ pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len)
 					break;
 				}
 
-				if (spec->max_filesize == 0 || length < spec->max_filesize) {
+				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. */
@@ -2507,7 +2501,7 @@ pidgin_convert_buddy_icon(PurplePlugin *plugin, const char *path, size_t *len)
 		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);
+	} 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));
@@ -2611,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) {
@@ -2632,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;
@@ -2654,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);
 }
 
 /*
@@ -2771,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) {
@@ -3484,6 +3496,9 @@ void pidgin_utils_init(void)
 	                    "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\"");
 
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
index 53b05a9c1a..d7e0e8b211 100644
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -410,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);
 
@@ -715,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,
diff --git a/pidgin/minidialog.c b/pidgin/minidialog.c
index 6599123ee3..75c45d5f31 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,8 @@ 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));
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 	}
@@ -355,6 +382,13 @@ pidgin_mini_dialog_class_init(PidginMiniDialogClass *klass)
 		G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
 		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/pidginstock.h b/pidgin/pidginstock.h
index 63a8714130..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"
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index 17d9098b82..76ec21c037 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -482,6 +482,8 @@ TRAY_16_ICO = \
 		tray/16/message_4bit.ico \
 		tray/16/offline_4bit.ico
 
+TRAY_THEME =	tray/hicolor/index.theme
+
 TRAY_16 = \
 		tray/hicolor/16x16/status/pidgin-tray-away.png \
 		tray/hicolor/16x16/status/pidgin-tray-busy.png \
@@ -584,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 f4edbe83e6..05e548477b 100644
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am
@@ -14,6 +14,7 @@ SMILEYS = \
     beer.png \
     blowkiss.png \
     bomb.png \
+    bored.png \
     bowl.png \
     boy.png \
     brb.png \
@@ -27,6 +28,7 @@ SMILEYS = \
     car.png \
     cat.png \
     chicken.png \
+    chilli.png \
     cigarette.png \
     clap.png \
     clock.png \
@@ -35,6 +37,7 @@ SMILEYS = \
     clown.png \
     coffee.png \
     coins.png \
+    cold.png \
     computer.png \
     confused.png \
     console.png \
@@ -109,6 +112,7 @@ SMILEYS = \
     moneymouth.png \
     monkey.png \
     moon.png \
+    mrgreen.png \
     msn-away.png \
     msn-busy.png \
     msn_online.png \
@@ -166,6 +170,7 @@ SMILEYS = \
     star.png \
     starving.png \
     stop.png \
+    stressed.png \
     struggle.png \
     sun.png \
     hot.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 9fa98b13ba..e7c3714783 100644
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in
@@ -419,6 +419,98 @@ male-fighter2.png   o=>     O=>
 female-fighter.png  o-+     O-+
 yin-yang.png        (%)
 
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+happy.png           :)      :-)
+question.png        :-/     :-\\
+shocked.png         :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+sleepy.png          (:|
+hypnotized.png      @-)
+on-the-phone.png    :)]
+sad.png             :(      :-(
+amorous.png         :x      :-x     :X      :-X
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+glasses-nerdy.png   :-B     :-b
+quiet.png           :-$
+drool.png           =P~     =p~
+lying.png           :^O     :^o
+call-me.png         :-c
+wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
+laugh.png           :))     :-))
+bye.png             =;
+arrogant.png        [-(
+thinking.png        :-?
+waiting.png         :-w     :-W
+at-wits-end.png     ~x(     ~X(
+excited.png         :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
+neutral.png         :|      :-|
+sleeping.png        I-)     i-)     |-)
+clown.png           :o)     :O)
+doh.png             #-o     #-O
+weep.png            :-<
+go-away.png         :-h
+lashes.png          ;;)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
+silly.png           8-}
+clap.png            =D>     =d>
+mad-tongue.png      >:P     >:p
+time-out.png        :-t     :-T
+hug-left.png        >:D<    >:d<
+love-over.png       =((
+hot.png             #:-S    #:-s
+rotfl.png           =)) :-j :-J 
+loser.png           L-)     l-)
+party.png           <:-P    <:-p
+nervous.png         :-SS       :-Ss    :-sS    :-ss
+cowboy.png          <):)
+desire.png          8->
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)  :(|)
+
+# Hidden Yahoo emotes
+alien.png           =:)     >-)
+beat-up.png         b-(     B-(
+chicken.png         ~:>
+coffee.png          ~o)     ~O)
+cow.png             3:-O    3:-o
+dance.png           \\:D/   \\:d/
+rose.png            @};-
+dont-know.png       :-L     :-l
+skeleton.png        8-X     8-x
+lamp.png            *-:)
+monkey.png          :(|)
+coins.png           $-)
+peace.png           :)>-
+pig.png             :@)
+pray.png            [-o<    [-O<
+pumpkin.png         (~~)
+shame.png           [-X     [-x
+flag.png            **==
+clover.png          %%-
+musical-note.png    :-"
+giggle.png          ;))
+worship.png         ^:)^
+star.png            (*)
+waving.png          >:/
+talktohand.png      :-@
+
+# Only available after activating the Yahoo! Fighter IMVironment
+male-fighter1.png   o->     O->
+male-fighter2.png   o=>     O=>
+female-fighter.png  o-+     O-+
+yin-yang.png        (%)
+
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
@@ -428,7 +520,7 @@ confused.png	    :Z
 glasses-nerdy.png   B)
 bulgy-eyes.png	    %)
 freaked-out.png	    :E
-smile.png	    :)      :-)
+happy.png	    :)      :-)
 amorous.png	    :X
 laugh.png	    :))
 mohawk.png	    -:
@@ -451,3 +543,47 @@ kiss.png            :x
 ! 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/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/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/small/16/Makefile.am b/pidgin/pixmaps/emotes/small/16/Makefile.am
index 64ce3768db..af06ecce1b 100644
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am
@@ -5,7 +5,10 @@ MOODS = \
     cinema.png \
     disappointed.png \
     embarrassed.png \
+    grumpy.png \
+    hot.png \
     internet.png \
+    invincible.png \
     music.png \
     restroom.png \
     search.png \
@@ -22,40 +25,57 @@ SMILEYS = \
     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 \
+    drool.png \
     excited.png \
-    grin.png \
+    excruciating.png \
+    eyeroll.png \
+    girl.png \
     happy.png \
     hug-left.png \
     hug-right.png \
+    hungry.png \
     in_love.png \
     kiss.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 \
     shocked.png \
+    shut-mouth.png  \
     sick.png \
     silent.png \
     sleeping.png \
     sleepy.png \
+    star.png \
+    stressed.png \
     thinking.png \
+    thunder.png \
     tongue.png \
     tv.png \
     uhm-yeah.png \
diff --git a/pidgin/pixmaps/emotes/small/16/amorous.png b/pidgin/pixmaps/emotes/small/16/amorous.png
index 41a520b194..325124065d 100644
--- a/pidgin/pixmaps/emotes/small/16/amorous.png
+++ b/pidgin/pixmaps/emotes/small/16/amorous.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/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/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
index 404b38b494..d93f44c044 100644
--- a/pidgin/pixmaps/emotes/small/16/embarrassed.png
+++ 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
index f03bc545ff..46a2a43da3 100644
--- a/pidgin/pixmaps/emotes/small/16/excited.png
+++ 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/hot.png b/pidgin/pixmaps/emotes/small/16/hot.png
index 518ecc2274..3df80d4d78 100644
--- a/pidgin/pixmaps/emotes/small/16/hot.png
+++ 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
index bb53909c72..2feffe344d 100644
--- a/pidgin/pixmaps/emotes/small/16/hungry.png
+++ b/pidgin/pixmaps/emotes/small/16/hungry.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/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/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/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/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
index 5fb313e620..2d0cd72d80 100644
--- a/pidgin/pixmaps/emotes/small/16/sleeping.png
+++ b/pidgin/pixmaps/emotes/small/16/sleeping.png
diff --git a/pidgin/pixmaps/emotes/small/16/small.theme.in b/pidgin/pixmaps/emotes/small/16/small.theme.in
index 084c603ee0..cba32b4378 100644
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in
@@ -1,5 +1,5 @@
 _Name=Small
-_Description=Smaller versions of the default smilies
+_Description=Smaller versions of the default smileys
 Icon=wink.png
 Author=Hylke Bons
 
@@ -13,10 +13,12 @@ wink.png            ;-)     ;)
 tongue.png          :P      :p      :-P     :-p
 shocked.png         =-O     =-o
 kiss.png            :-*
+glasses-cool.png    8-)
 embarrassed.png     :-[
 crying.png          :'(     :'-(
 thinking.png        :-/     :-\\
 angel.png           O:-)    o:-)
+shut-mouth.png      :-X
 
 
 [XMPP]
@@ -29,18 +31,23 @@ 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         :|      :-|
@@ -61,6 +68,8 @@ embarrassed.png     :-[
 angel.png           O:-)
 thinking.png        :-\\    :-/
 crying.png          :'(
+shut-mouth.png      :-X
+glasses-cool.png    8-)
 
 
 # Following Windows Live Messenger 8.1
@@ -70,6 +79,7 @@ excited.png         :D      :d      :-D     :-d
 wink.png            ;)      ;-)
 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
@@ -79,21 +89,28 @@ neutral.png         :|      :-|
 devil.png           (6)
 angel.png           (A)     (a)
 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)
+eyeroll.png         8-)
 sleepy.png          |-) 
 
 # Hidden MSN emotes
@@ -106,28 +123,37 @@ console.png			(xx)    (XX)
 shocked.png         /:O      /jy       /surprised
 party.png           /8-)     /dy       /revel
 crying.png          /:<      /ll       /cry
+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
 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
 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
@@ -146,9 +172,12 @@ kiss.png            :-{} :-*
 embarrassed.png     :-[
 devil.png           ]:->
 angel.png           O:-)
+rose.png            @}->--
+shut-mouth.png      :-X     :X      :-x     :x
 thinking.png        :-\\    :-/
 beer.png            *DRINK*
 excited.png         :-D     :D
+glasses-cool.png    8-)
 amorous.png         *IN\ LOVE*
 
 
@@ -165,17 +194,21 @@ 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        :-?
 excited.png         :D      :-D     :d      :-d
 tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
 neutral.png         :|      :-|
 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
@@ -183,38 +216,48 @@ 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
@@ -222,11 +265,57 @@ musical-note.png    :-"
 excited.png  	    :D      :-D
 devil.png	    }:)
 confused.png	    :Z
+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
 
+# 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/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/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/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/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..4ef25907df 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -73,7 +73,7 @@ install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PIDGIN_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/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/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 784a5e768f..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;
 
@@ -320,6 +321,7 @@ populate_treeview(GevoAddBuddyDialog *dialog, const gchar *uri)
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 
@@ -365,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);
 
@@ -381,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;
 
@@ -402,6 +406,7 @@ search_changed_cb(GtkEntry *entry, GevoAddBuddyDialog *dialog)
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 }
@@ -546,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/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 9213328cfd..8f97a7df8f 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -111,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 b04d7ed9e1..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>
 
@@ -116,6 +125,7 @@ update_buddies_from_contact(EContact *contact)
 	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-novell", E_CONTACT_IM_GROUPWISE);
+	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
 }
 
 static void
@@ -227,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);
 		}
@@ -326,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();
 
@@ -372,7 +384,9 @@ plugin_unload(PurplePlugin *plugin)
 static void
 plugin_destroy(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_debug_shutdown();
+#endif
 }
 
 static void
@@ -575,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 d597a33601..30682f0ce1 100644
--- a/pidgin/plugins/gevolution/new_person_dialog.c
+++ b/pidgin/plugins/gevolution/new_person_dialog.c
@@ -153,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)
 		{
@@ -202,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);
 }
@@ -293,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/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/pidginrc.c b/pidgin/plugins/pidginrc.c
index b81c93664e..e2a2beb453 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -242,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);
 
@@ -273,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
 		}
 	}
 
@@ -327,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/themeedit.c b/pidgin/plugins/themeedit.c
index f87892cca7..5179fbe2a4 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);
 
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_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/xmppconsole.c b/pidgin/plugins/xmppconsole.c
index af9f5efa47..38c2eb1451 100644
--- a/pidgin/plugins/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole.c
@@ -183,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;
 
@@ -258,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;
@@ -277,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);
@@ -291,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);
 
@@ -305,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) {
@@ -334,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;
@@ -359,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);
@@ -373,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);
@@ -391,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);
@@ -407,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);
@@ -419,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);
@@ -430,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) {
@@ -486,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;
@@ -511,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);
@@ -525,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);
@@ -540,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);
@@ -552,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);
@@ -564,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);
@@ -575,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) {
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/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
index 1da98d5cdb..2e9706f0d7 100644
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -43,7 +43,6 @@
 #include "network.h"
 
 #include "resource.h"
-#include "idletrack.h"
 #include "zlib.h"
 #include "untar.h"
 
@@ -327,6 +326,7 @@ winpidgin_window_flash(GtkWindow *window, gboolean flash) {
 		info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
 	} else
 		info.dwFlags = FLASHW_STOP;
+	FlashWindowEx(&info);
 	info.dwTimeout = 0;
 
 }
@@ -376,15 +376,19 @@ 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;
 
-	proc = wpurple_find_and_loadproc("exchndl.dll", "SetLogFile");
+	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);
 
@@ -396,10 +400,6 @@ void winpidgin_init(HINSTANCE hint) {
 		g_free(locale_debug_dir);
 	}
 
-	/* IdleTracker Initialization */
-	if(!winpidgin_set_idlehooks())
-		purple_debug_error("winpidgin", "Failed to initialize idle tracker\n");
-
 	winpidgin_spell_init();
 	purple_debug_info("winpidgin", "GTK+ :%u.%u.%u\n",
 		gtk_major_version, gtk_minor_version, gtk_micro_version);
@@ -428,9 +428,6 @@ void winpidgin_cleanup(void) {
 	if(messagewin_hwnd)
 		DestroyWindow(messagewin_hwnd);
 
-	/* Idle tracker cleanup */
-	winpidgin_remove_idlehooks();
-
 }
 
 /* DLL initializer */
@@ -534,5 +531,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/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
index abe222781a..d57309f71d 100755
--- a/pidgin/win32/nsis/generate_gtk_zip.sh
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -3,8 +3,8 @@
 
 PIDGIN_BASE=$1
 
-if [ ! -e $PIDGIN_BASE/ChangeLog.win32 ]; then
-	echo `basename $0` must must have the pidgin base dir specified as a parameter.
+if [ ! -e $PIDGIN_BASE/ChangeLog ]; then
+	echo $(basename $0) must must have the pidgin base dir specified as a parameter.
 	exit 1
 fi
 
@@ -42,12 +42,18 @@ echo Bundle Version $BUNDLE_VERSION > $CONTENTS_FILE
 function download_and_extract {
 	URL=${1%%\ *}
 	NAME=${1#*\ }
-	FILE=`basename $URL`
+	FILE=$(basename $URL)
 	if [ ! -e $FILE ]; then
 		echo Downloading $NAME
-		wget $URL
+		wget $URL || return 1
 	fi
-	unzip -q $FILE -d $INSTALL_DIR
+	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
 }
 
@@ -63,9 +69,9 @@ 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`
+	LOCALE=$(basename $LOCALE_DIR)
 	if [ ! -e $PIDGIN_BASE/po/$LOCALE.po ]; then
-		echo Remove $LOCALE translation as it is missing from Pidgin
+		echo Removing $LOCALE translation as it is missing from Pidgin
 		rm -r $LOCALE_DIR
 	fi
 done
@@ -73,3 +79,5 @@ 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 50e447638d..0000000000
--- a/pidgin/win32/nsis/langmacros.nsh
+++ /dev/null
@@ -1,81 +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}
-
-  ; 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}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT DEBUG_SYMBOLS_SECTION_TITLE ${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT TRANSLATIONS_SECTION_TITLE ${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}
-
-  ; 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_SECTION_DESCRIPTION	${CUR_LANG}
-
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DEBUGSYMBOLS_ERROR		${CUR_LANG}
-  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_GTK_DOWNLOAD_ERROR		${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 89b0898c70..951643d96a 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -8,9 +8,9 @@
 ;--------------------------------
 ;Global Variables
 Var name
-Var ISSILENT
 Var STARTUP_RUN_KEY
-Var SPELLCHECK_SEL
+Var CURRENT_GTK_STATE
+Var WARNED_GTK_STATE
 
 ;--------------------------------
 ;Configuration
@@ -107,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}
@@ -121,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"
 
 ;--------------------------------
@@ -146,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
@@ -324,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
@@ -333,7 +251,7 @@ SectionEnd
 ;--------------------------------
 ;GTK+ Runtime Install Section
 
-Section $(GTK_SECTION_TITLE) SecGtk
+Section $(GTKSECTIONTITLE) SecGtk
 
   InitPluginsDir
   StrCpy $R1 "$PLUGINSDIR\gtk.zip"
@@ -350,9 +268,9 @@ Section $(GTK_SECTION_TITLE) SecGtk
   DetailPrint "Downloading GTK+ Runtime ... ($R2)"
   NSISdl::download /TIMEOUT=10000 $R2 $R1
   Pop $R0
-  StrCmp $R0 "cancel" done
+  ;StrCmp $R0 "cancel" done
   StrCmp $R0 "success" +2
-    MessageBox MB_RETRYCANCEL "$(PIDGIN_GTK_DOWNLOAD_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done
+    MessageBox MB_RETRYCANCEL "$(PIDGINGTKDOWNLOADERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
 !endif
 
@@ -371,7 +289,7 @@ SectionEnd ; end of GTK+ section
 ;--------------------------------
 ;Pidgin Install Section
 
-Section $(PIDGIN_SECTION_TITLE) SecPidgin
+Section $(PIDGINSECTIONTITLE) SecPidgin
   SectionIn 1 RO
 
   ; Check install rights..
@@ -386,6 +304,7 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin
     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"
@@ -399,6 +318,7 @@ Section $(PIDGIN_SECTION_TITLE) SecPidgin
   pidgin_hkcu:
     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"
@@ -470,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
@@ -492,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"
@@ -510,7 +430,7 @@ SectionGroupEnd
     SetOutPath "$INSTDIR"
   ${MementoSectionEnd}
 !macroend
-SectionGroup $(TRANSLATIONS_SECTION_TITLE) SecTranslations
+SectionGroup $(TRANSLATIONSSECTIONTITLE) SecTranslations
   # pidgin-translations is generated based on the contents of the locale directory
   !include "pidgin-translations.nsh"
 SectionGroupEnd
@@ -526,11 +446,11 @@ ${MementoSectionDone}
     Call InstallDict
   SectionEnd
 !macroend
-SectionGroup $(PIDGIN_SPELLCHECK_SECTION_TITLE) SecSpellCheck
+SectionGroup $(PIDGINSPELLCHECKSECTIONTITLE) SecSpellCheck
   !include "pidgin-spellcheck.nsh"
 SectionGroupEnd
 
-Section /o $(DEBUG_SYMBOLS_SECTION_TITLE) SecDebugSymbols
+Section /o $(DEBUGSYMBOLSSECTIONTITLE) SecDebugSymbols
   
   InitPluginsDir
   StrCpy $R1 "$PLUGINSDIR\dbgsym.zip"
@@ -549,7 +469,7 @@ Section /o $(DEBUG_SYMBOLS_SECTION_TITLE) SecDebugSymbols
   Pop $R0
   StrCmp $R0 "cancel" done
   StrCmp $R0 "success" +2
-    MessageBox MB_RETRYCANCEL "$(PIDGIN_DEBUGSYMBOLS_ERROR) : $R2" /SD IDCANCEL IDRETRY retry IDCANCEL done
+    MessageBox MB_RETRYCANCEL "$(PIDGINDEBUGSYMBOLSERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
 !endif
 
@@ -595,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
@@ -623,6 +543,7 @@ Section Uninstall
     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\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_-_G5.pem"
@@ -700,7 +621,6 @@ Section Uninstall
     RMDir "$INSTDIR\spellcheck\lib"
     RMDir "$INSTDIR\spellcheck"
     Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\libnspr4.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
@@ -750,11 +670,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:
@@ -764,19 +684,19 @@ SectionEnd ; end of uninstall section
 ;Descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPidgin} \
-        $(PIDGIN_SECTION_DESCRIPTION)
+        $(PIDGINSECTIONDESCRIPTION)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \
-        $(GTK_SECTION_DESCRIPTION)
+        $(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)
+        $(PIDGINSPELLCHECKSECTIONDESCRIPTION)
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -1068,7 +988,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)
@@ -1098,7 +1018,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"
@@ -1109,18 +1029,17 @@ 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"
 
   ${MementoSectionRestore}
 
@@ -1130,7 +1049,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
@@ -1156,12 +1075,6 @@ 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"
-
   ClearErrors
   ${GetOptions} "$R3" "/L=" $R1
   IfErrors +3
@@ -1222,11 +1135,14 @@ Function .onInit
     StrCpy $INSTDIR "$R2\Pidgin"
 
   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
 
-;LogSet on
   Pop $R3
   Pop $R2
   Pop $R1
@@ -1262,9 +1178,11 @@ Function preWelcomePage
 !endif
 
   Call DoWeNeedGtk
-  Pop $R0
-  IntCmp $R0 1 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 done
   gtk_not_mandatory:
@@ -1276,13 +1194,35 @@ Function preWelcomePage
   Pop $R0
 FunctionEnd
 
+; If the GTK+ Section has been unselected and there isn't a compatible GTK+ already, confirm
+Function .onSelChange
+  Push $R0
+
+  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
+
+  ; 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}
+
+  done:
+  Pop $R0
+FunctionEnd
+
+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
-
 ; Select and Disable any Sections that have currently installed dictionaries
 !macro CHECK_SPELLCHECK_SECTION lang
   ;Advance to the next (correct) section index
@@ -1317,6 +1257,7 @@ Function InstallDict
   Pop $R1 ;This is the language file
   Push $R2
   Push $R3
+  Push $R4
 
   ClearErrors
   IfFileExists "$INSTDIR\spellcheck\share\enchant\myspell\$R0.dic" installed
@@ -1329,10 +1270,10 @@ Function InstallDict
   DetailPrint "Downloading the $R0 Dictionary... ($R3)"
   retry:
   NSISdl::download /TIMEOUT=10000 "$R3" "$R2"
-  Pop $R3
-  StrCmp $R3 "cancel" done
-  StrCmp $R3 "success" +3
-    MessageBox MB_RETRYCANCEL "$(PIDGIN_SPELLCHECK_ERROR) : $R3" /SD IDCANCEL IDRETRY retry IDCANCEL done
+  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"
@@ -1346,6 +1287,7 @@ Function InstallDict
     DetailPrint "$R0 Dictionary is installed"
 
   done:
+  Pop $R4
   Pop $R3
   Pop $R2
   Pop $R0
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 3851f6c3d5..0000000000
--- a/pidgin/win32/nsis/translations/afrikaans.nsh
+++ /dev/null
@@ -1,53 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Ondersteuning vir speltoeter.  (Internetverbinding benodigd vir installasie)"
-
diff --git a/pidgin/win32/nsis/translations/albanian.nsh b/pidgin/win32/nsis/translations/albanian.nsh
deleted file mode 100644
index 6cc93dce23..0000000000
--- a/pidgin/win32/nsis/translations/albanian.nsh
+++ /dev/null
@@ -1,32 +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>
-;;
-
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Pidgin-it për Windows"
-
-; GTK+ Section Prompts
-
-; 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 aad49f9c87..0000000000
--- a/pidgin/win32/nsis/translations/arabic.nsh
+++ /dev/null
@@ -1,51 +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			"������� ���� �����.  �� ���� ���� ������ �� ��� ��������."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"�� ������ ���� ���� ��� �����"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"����� ����� ���� ���� ��������. ������� ������ ������� ���� ����� ������ �������� �����."
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"��� ������� ��������.  (����� ����� ��������� �������)"
-
diff --git a/pidgin/win32/nsis/translations/basque.nsh b/pidgin/win32/nsis/translations/basque.nsh
deleted file mode 100644
index 7e4c6ce910..0000000000
--- a/pidgin/win32/nsis/translations/basque.nsh
+++ /dev/null
@@ -1,51 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Zuzentzaile Ortografikoa.  (Internet konexioa behar du instalatzeko)"
-
diff --git a/pidgin/win32/nsis/translations/bulgarian.nsh b/pidgin/win32/nsis/translations/bulgarian.nsh
deleted file mode 100644
index 8bb392c53d..0000000000
--- a/pidgin/win32/nsis/translations/bulgarian.nsh
+++ /dev/null
@@ -1,24 +0,0 @@
-;;
-;;  bulgarian.nsh
-;;
-;;  Bulgarian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1251
-;;
-;;  Author: Hristo Todorov <igel@bofh.bg>
-;;
-
-
-; 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
-
-; GTK+ Section Prompts
-
-; 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 3d29809266..0000000000
--- a/pidgin/win32/nsis/translations/catalan.nsh
+++ /dev/null
@@ -1,50 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Pidgin per Windows"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Suport per a Verificaci� de l'Ortografia.  (�s necesaria connexi� a internet per dur a terme la instal.laci�)"
-
diff --git a/pidgin/win32/nsis/translations/czech.nsh b/pidgin/win32/nsis/translations/czech.nsh
deleted file mode 100644
index 79a1736115..0000000000
--- a/pidgin/win32/nsis/translations/czech.nsh
+++ /dev/null
@@ -1,32 +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
-;;
-
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Pidgin Web Page"
-
-; GTK+ Section Prompts
-
-; 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 2beda186a7..0000000000
--- a/pidgin/win32/nsis/translations/danish.nsh
+++ /dev/null
@@ -1,32 +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
-;;
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�g Windows Pidgin's hjemmeside"
-
-; GTK+ Section Prompts
-
-; 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 5199738a9d..0000000000
--- a/pidgin/win32/nsis/translations/dutch.nsh
+++ /dev/null
@@ -1,42 +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."
-
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Pidgin webpagina"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
diff --git a/pidgin/win32/nsis/translations/english.nsh b/pidgin/win32/nsis/translations/english.nsh
deleted file mode 100644
index aff11521cd..0000000000
--- a/pidgin/win32/nsis/translations/english.nsh
+++ /dev/null
@@ -1,62 +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."
-
-; 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 TRANSLATIONS_SECTION_TITLE		"Localizations"
-!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"
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING DEBUG_SYMBOLS_SECTION_TITLE		"Debug Symbols (for reporting crashes)"
-
-; GTK+ Directory Page
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
-
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DEBUGSYMBOLS_ERROR		"Error Installing Debug Symbols"
-
-!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_GTK_DOWNLOAD_ERROR		"Error Downloading the GTK+ Runtime"
-
diff --git a/pidgin/win32/nsis/translations/finnish.nsh b/pidgin/win32/nsis/translations/finnish.nsh
deleted file mode 100644
index 06021c4981..0000000000
--- a/pidgin/win32/nsis/translations/finnish.nsh
+++ /dev/null
@@ -1,52 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidginin WWW-sivustolla"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Tuki oikoluvulle.  (Asennukseen tarvitaan Internet-yhteys)"
-
diff --git a/pidgin/win32/nsis/translations/french.nsh b/pidgin/win32/nsis/translations/french.nsh
deleted file mode 100644
index 7cd47e67e2..0000000000
--- a/pidgin/win32/nsis/translations/french.nsh
+++ /dev/null
@@ -1,55 +0,0 @@
-;;
-;;  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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est n�cessaire pour son installation)"
diff --git a/pidgin/win32/nsis/translations/galician.nsh b/pidgin/win32/nsis/translations/galician.nsh
deleted file mode 100644
index bc74343b05..0000000000
--- a/pidgin/win32/nsis/translations/galician.nsh
+++ /dev/null
@@ -1,33 +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
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Pidgin Windows"
-
-; GTK+ Section Prompts
-
-; 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 23c75542d7..0000000000
--- a/pidgin/win32/nsis/translations/german.nsh
+++ /dev/null
@@ -1,53 +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."
- 
-; 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
- 
-; 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
-
-; 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_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"
diff --git a/pidgin/win32/nsis/translations/hebrew.nsh b/pidgin/win32/nsis/translations/hebrew.nsh
deleted file mode 100644
index 51511013ed..0000000000
--- a/pidgin/win32/nsis/translations/hebrew.nsh
+++ /dev/null
@@ -1,54 +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			"���� �� ����'�� ��� ��. �� ����� �� ����'�� ������ ����."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� �� "
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�� ����� ����� �� ������ ������� �� ����'��. ������ ����� ����� ��� ���� ����� �������."
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"����� ���� ������ ���� (���� ����� ������� ������)"
-
diff --git a/pidgin/win32/nsis/translations/hungarian.nsh b/pidgin/win32/nsis/translations/hungarian.nsh
deleted file mode 100644
index b5c48936b3..0000000000
--- a/pidgin/win32/nsis/translations/hungarian.nsh
+++ /dev/null
@@ -1,53 +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 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
-
-; 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 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_SECTION_DESCRIPTION	"Helyes�r�s-ellen�rz�s t�mogat�sa. (Internetkapcsolat sz�ks�ges a telep�t�shez)"
-
diff --git a/pidgin/win32/nsis/translations/italian.nsh b/pidgin/win32/nsis/translations/italian.nsh
deleted file mode 100644
index 9532cfa527..0000000000
--- a/pidgin/win32/nsis/translations/italian.nsh
+++ /dev/null
@@ -1,53 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Supporto per il correttore ortografico.  (� richiesta una connessione a internet per l'installazione)"
-
diff --git a/pidgin/win32/nsis/translations/japanese.nsh b/pidgin/win32/nsis/translations/japanese.nsh
deleted file mode 100644
index b4fb44d11a..0000000000
--- a/pidgin/win32/nsis/translations/japanese.nsh
+++ /dev/null
@@ -1,49 +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���Ă�������"
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows Pidgin��Web�y�[�W��K����������B"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"�X�y���`�F�b�N�̃T�|�[�g  (�C���^�[�l�b�g�ڑ����C���X�g�[���ɕK�v�ł�)"
-
diff --git a/pidgin/win32/nsis/translations/korean.nsh b/pidgin/win32/nsis/translations/korean.nsh
deleted file mode 100644
index ee7e9c0fea..0000000000
--- a/pidgin/win32/nsis/translations/korean.nsh
+++ /dev/null
@@ -1,23 +0,0 @@
-;;
-;;  korean.nsh
-;;
-;;  Korean language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 949
-;;
-;;  Author: Kyung-uk Son <vvs740@chol.com>
-;;
-
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"���� �޽��� (�ʼ�)"
-!define GTK_SECTION_TITLE			"GTK+ ��Ÿ�� ȯ�� (�ʼ�)"
-!define PIDGIN_SECTION_DESCRIPTION		"������ �ھ� ���ϰ� dll"
-!define GTK_SECTION_DESCRIPTION		"������ ����ϴ� ��Ƽ �÷��� GUI ��Ŷ"
-
-; GTK+ Directory Page
-
-; GTK+ Section Prompts
-
-; 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 824e802dfa..0000000000
--- a/pidgin/win32/nsis/translations/kurdish.nsh
+++ /dev/null
@@ -1,48 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Were Malpera Pidgin a Windows�"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Desteka kontrola rastniv�s�.  (Ji bo sazkirin� �nternet p�w�st e)"
-
diff --git a/pidgin/win32/nsis/translations/lithuanian.nsh b/pidgin/win32/nsis/translations/lithuanian.nsh
deleted file mode 100644
index 163be39bfd..0000000000
--- a/pidgin/win32/nsis/translations/lithuanian.nsh
+++ /dev/null
@@ -1,51 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Ra�ybos tikrinimo palaikymas.  (Diegimui b�tina interneto jungtis)"
-
diff --git a/pidgin/win32/nsis/translations/norwegian.nsh b/pidgin/win32/nsis/translations/norwegian.nsh
deleted file mode 100644
index 8591a3ff30..0000000000
--- a/pidgin/win32/nsis/translations/norwegian.nsh
+++ /dev/null
@@ -1,48 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Pidgin for Windows' Nettside"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"St�tte for stavekontroll. (Internettoppkobling p�krevd for installasjon)"
diff --git a/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh b/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
deleted file mode 100644
index 79dab8778c..0000000000
--- a/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
+++ /dev/null
@@ -1,71 +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."
-
-; 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"
-
-; 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."
-
-; 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 75055cd388..0000000000
--- a/pidgin/win32/nsis/translations/persian.nsh
+++ /dev/null
@@ -1,55 +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			"������ ����� �� ��� �� ��� ���� ���. ����� �� ����� ���� ��� � ������ ��� ����."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"���� ��� ����� �� ������"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"��� ������ �� ����� �� �� ��� ���� ��� ��� ��� ����. ���� ���� ���� ��� ���� ����� ��� �����."
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"�������� ��؝���� ������. (���� ��� ����� �������� ���� ���)"
-
diff --git a/pidgin/win32/nsis/translations/polish.nsh b/pidgin/win32/nsis/translations/polish.nsh
deleted file mode 100644
index 5d5f775646..0000000000
--- a/pidgin/win32/nsis/translations/polish.nsh
+++ /dev/null
@@ -1,33 +0,0 @@
-;;
-;;  polish.nsh
-;;
-;;  Polish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1250
-;;
-;;  Version 3
-;;  Note: If translating this file, replace '!insertmacro PIDGIN_MACRO_DEFAULT_STRING'
-;;  with '!define'.
-
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Dalej >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"Program $(^Name) jest rozpowszechniany na warunkach Powszechnej Licencji Publicznej GNU (GPL). Licencja jest tu podana wy��cznie w celach informacyjnych. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Klient komunikatora Pidgin (wymagany)"
-!define GTK_SECTION_TITLE			"Biblioteka GTK+ (wymagana, je�li nie jest obecna)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Skr�ty"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Pulpit"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Start"
-!define PIDGIN_SECTION_DESCRIPTION		"G��wne pliki programu Pidgin i biblioteki DLL"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Skr�ty do uruchamiania programu Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Utworzenie skr�tu do programu Pidgin na pulpicie"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Utworzenie wpisu w menu Start dla programu Pidgin"
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Odwied� stron� WWW programu Pidgin"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Instalator nie mo�e odnale�� wpis�w w rejestrze dla programu Pidgin.$\rMo�liwe, �e inny u�ytkownik zainstalowa� ten program."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Brak uprawnie� do odinstalowania tego programu."
diff --git a/pidgin/win32/nsis/translations/portuguese-br.nsh b/pidgin/win32/nsis/translations/portuguese-br.nsh
deleted file mode 100644
index c89d85ff2a..0000000000
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh
+++ /dev/null
@@ -1,46 +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
-;;
-
-
-; 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
-
-; GTK+ Section Prompts
-
-; 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 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_SECTION_DESCRIPTION  "Suporte a verifica��o ortogr�fica (A instala��o necessita de conex�o a internet)"
diff --git a/pidgin/win32/nsis/translations/portuguese.nsh b/pidgin/win32/nsis/translations/portuguese.nsh
deleted file mode 100644
index 2837df89a0..0000000000
--- a/pidgin/win32/nsis/translations/portuguese.nsh
+++ /dev/null
@@ -1,41 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a P�gina Web do Pidgin para Windows"
-
-; GTK+ Section Prompts
-
-; 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 e43b68fd8b..0000000000
--- a/pidgin/win32/nsis/translations/romanian.nsh
+++ /dev/null
@@ -1,40 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizita�i pagina de web Windows Pidgin"
-
-; GTK+ Section Prompts
-
-; 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 05f2a9fcf6..0000000000
--- a/pidgin/win32/nsis/translations/russian.nsh
+++ /dev/null
@@ -1,30 +0,0 @@
-;;
-;;  russian.nsh
-;;
-;;  Russian language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1251
-;;
-;;  Author: Tasselhof <anr@nm.ru>
-;;  Version 2
-;;
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"�������� ���-�������� Pidgin ��� ������������� Windows."
-
-; GTK+ Section Prompts
-
-; 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 a842e62e01..0000000000
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh
+++ /dev/null
@@ -1,23 +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>
-;;
-
-
-; 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
-
-; GTK+ Section Prompts
-
-; 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 c0509619b8..0000000000
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh
+++ /dev/null
@@ -1,46 +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 Ȼ������һ�Ρ�"
-
-; 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
-
-; Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"��� Windows Pidgin ��ҳ"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"ƴд���֧�֡�(��װ��Ҫ���ӵ� Internet)"
diff --git a/pidgin/win32/nsis/translations/slovak.nsh b/pidgin/win32/nsis/translations/slovak.nsh
deleted file mode 100644
index e93a9f8f9a..0000000000
--- a/pidgin/win32/nsis/translations/slovak.nsh
+++ /dev/null
@@ -1,47 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Pidgin"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutn� pripojenie k Internetu)"
-
diff --git a/pidgin/win32/nsis/translations/slovenian.nsh b/pidgin/win32/nsis/translations/slovenian.nsh
deleted file mode 100644
index 9a3a485748..0000000000
--- a/pidgin/win32/nsis/translations/slovenian.nsh
+++ /dev/null
@@ -1,52 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"Podpora preverjanja �rkovanja.  (Za namestitev je potrebna spletna povezava)"
diff --git a/pidgin/win32/nsis/translations/spanish.nsh b/pidgin/win32/nsis/translations/spanish.nsh
deleted file mode 100644
index 7c934ca837..0000000000
--- a/pidgin/win32/nsis/translations/spanish.nsh
+++ /dev/null
@@ -1,30 +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
-;;
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Pidgin Windows"
-
-; GTK+ Section Prompts
-
-; 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 d65b3df487..0000000000
--- a/pidgin/win32/nsis/translations/swedish.nsh
+++ /dev/null
@@ -1,52 +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."
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"St�d f�r R�ttstavning.  (Internetanslutning kr�vs f�r installation)"
diff --git a/pidgin/win32/nsis/translations/trad-chinese.nsh b/pidgin/win32/nsis/translations/trad-chinese.nsh
deleted file mode 100644
index 593855c578..0000000000
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh
+++ /dev/null
@@ -1,55 +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"
-
-; 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
-
-; 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
-
-; 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_SECTION_DESCRIPTION	"���r�ˬd�䴩�]�w�˶������ں����s�u�^�C"
-
diff --git a/pidgin/win32/nsis/translations/valencian.nsh b/pidgin/win32/nsis/translations/valencian.nsh
deleted file mode 100644
index dc972d62ea..0000000000
--- a/pidgin/win32/nsis/translations/valencian.nsh
+++ /dev/null
@@ -1,50 +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."
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina de Pidgin per a Windows"
-
-; GTK+ Section Prompts
-
-; 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_SECTION_DESCRIPTION	"Soport per a Correccio Ortografica.  (es requerix conexio a Internet per a fer l'instalacio)"
-
diff --git a/pidgin/win32/nsis/translations/vietnamese.nsh b/pidgin/win32/nsis/translations/vietnamese.nsh
deleted file mode 100644
index 97082e9e88..0000000000
--- a/pidgin/win32/nsis/translations/vietnamese.nsh
+++ /dev/null
@@ -1,31 +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. 
-;;
-
-; 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
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Pidgin"
-
-; GTK+ Section Prompts
-
-; 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/winpidgin.c b/pidgin/win32/winpidgin.c
index 8135ceeea1..c0186c32cf 100644
--- a/pidgin/win32/winpidgin.c
+++ b/pidgin/win32/winpidgin.c
@@ -605,9 +605,9 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 		char *lpszCmdLine, int nCmdShow) {
 	wchar_t errbuf[512];
 	wchar_t pidgin_dir[MAX_PATH];
+	wchar_t *pidgin_dir_start = NULL;
 	wchar_t exe_name[MAX_PATH];
 	HMODULE hmod;
-	wchar_t *tmp;
 	wchar_t *wtmp;
 	int pidgin_argc;
 	char **pidgin_argv; /* This is in utf-8 */
@@ -672,14 +672,14 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 	if (GetModuleFileNameW(NULL, pidgin_dir, MAX_PATH) != 0) {
 
 		/* primitive dirname() */
-		tmp = wcsrchr(pidgin_dir, L'\\');
+		pidgin_dir_start = wcsrchr(pidgin_dir, L'\\');
 
-		if (tmp) {
+		if (pidgin_dir_start) {
 			HMODULE hmod;
-			tmp[0] = L'\0';
+			pidgin_dir_start[0] = L'\0';
 
 			/* tmp++ will now point to the executable file name */
-			wcscpy(exe_name, tmp + 1);
+			wcscpy(exe_name, pidgin_dir_start + 1);
 
 			wcscat(pidgin_dir, L"\\exchndl.dll");
 			if ((hmod = LoadLibraryW(pidgin_dir))) {
@@ -702,7 +702,8 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 				proc = GetProcAddress(hmod, "SetDebugInfoDir");
 				if (proc) {
 					char *pidgin_dir_ansi = NULL;
-					tmp[0] = L'\0';
+					/* 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) {
@@ -728,7 +729,8 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 
 			}
 
-			tmp[0] = L'\0';
+			/* Restore pidgin_dir to point to where the executable is */
+			pidgin_dir_start[0] = L'\0';
 		}
 	} else {
 		DWORD dw = GetLastError();
@@ -763,9 +765,14 @@ WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
 			return 0;
 
 	/* Now we are ready for Pidgin .. */
-	if ((hmod = LoadLibraryW(L"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);
diff --git a/pidgin/win32/wspell.c b/pidgin/win32/wspell.c
index 2e3cdcc93f..dec6f8dd23 100644
--- a/pidgin/win32/wspell.c
+++ b/pidgin/win32/wspell.c
@@ -73,25 +73,29 @@ void              (*wpidginspell_recheck_all)             (GtkSpell*) = wgtkspel
 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", (path ? path : ""),
+	tmp2 = g_strdup_printf("%s%s%s", tmp,
 		(path ? G_SEARCHPATH_SEPARATOR_S : ""),
-		tmp);
+		(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(GTKSPELL_DLL, "gtkspell_new_attach" );
+	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(GTKSPELL_DLL, "gtkspell_get_from_text_view");
-		wpidginspell_detach = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_detach");
-		wpidginspell_set_language = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_set_language");
-		wpidginspell_recheck_all = (void*) wpurple_find_and_loadproc(GTKSPELL_DLL, "gtkspell_recheck_all");
+		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", GTKSPELL_DLL);
+		purple_debug_warning("wspell", "Couldn't load gtkspell (%s) \n", tmp);
 		/*wpidginspell_new_attach = wgtkspell_new_attach;*/
 	}
+	g_free(tmp);
 	SetErrorMode(old_error_mode);
 }
 
diff --git a/po/ChangeLog b/po/ChangeLog
index 31648266a8..9943047f77 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,16 +1,62 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 165c23da5e..98483dcef5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -125,6 +125,7 @@ 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
@@ -136,6 +137,7 @@ libpurple/protocols/novell/nmuser.c
 libpurple/protocols/novell/novell.c
 libpurple/protocols/oscar/clientlogin.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
@@ -144,6 +146,7 @@ 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/qq/buddy_info.c
 libpurple/protocols/qq/buddy_list.c
 libpurple/protocols/qq/buddy_memo.c
@@ -201,7 +204,6 @@ 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
@@ -272,3 +274,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 adf2d18b2c..704eb843f7 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, 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: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-01-15 00:24+0200\n"
+"POT-Creation-Date: 2010-07-27 01:17-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.1\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"
 
@@ -790,7 +802,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 +1271,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 +1367,6 @@ msgid "Saved Statuses"
 msgstr "Gestoorde statusse"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1554,7 +1568,7 @@ msgstr ""
 msgid "Online"
 msgstr "Aanlyn"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Vanlyn"
 
@@ -1647,6 +1661,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,8 +1689,10 @@ 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."
 msgstr "Die sertifikaat het verval en moet nié as geldig beskou word nie."
@@ -1852,7 +1875,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 +1929,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"
 
@@ -2385,7 +2407,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 +2975,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"
@@ -3181,6 +3203,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"
 
@@ -3316,7 +3341,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"
@@ -3349,7 +3374,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
@@ -3358,7 +3383,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"
@@ -3788,12 +3813,6 @@ 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"
 
@@ -3809,7 +3828,7 @@ 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"
@@ -3824,6 +3843,18 @@ 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"
 
@@ -3831,6 +3862,39 @@ msgstr "SASL-stawing het misluk"
 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 ""
 
@@ -3838,7 +3902,7 @@ msgid "Unable to canonicalize password"
 msgstr ""
 
 msgid "Malicious challenge from server"
-msgstr ""
+msgstr "Kwaadwillige uitdaging vanaf bediener"
 
 msgid "Unexpected response from server"
 msgstr "Onverwagse respons vanaf bediener"
@@ -3894,6 +3958,7 @@ msgstr "Streek"
 msgid "Postal Code"
 msgstr "Poskode"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3908,10 +3973,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"
 
@@ -4127,12 +4196,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 "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."
 
@@ -4231,7 +4309,6 @@ msgstr "Bediener ondersteun nie blokkering nie"
 msgid "Not Authorized"
 msgstr "Nie gemagtig nie"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stemming"
 
@@ -4253,7 +4330,6 @@ msgstr "Aan"
 msgid "None (To pending)"
 msgstr "Geen (aan hangende)"
 
-#. 0
 msgid "None"
 msgstr "Geen"
 
@@ -4267,14 +4343,18 @@ msgstr "Stemmingteks"
 msgid "Allow Buzz"
 msgstr "Laat zoempie toe"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Tweede naam"
+msgstr "Bui"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Vriendkommentaar"
+msgstr "Kommentaar by bui"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Deuntjiekunstenaar"
 
@@ -4445,9 +4525,6 @@ msgstr "Beleidskending"
 msgid "Remote Connection Failed"
 msgstr "Afgeleë verbinding het misluk"
 
-msgid "Resource Constraint"
-msgstr "Hulpbron-beperking"
-
 msgid "Restricted XML"
 msgstr "Ingeperkte XML"
 
@@ -4458,7 +4535,7 @@ msgid "System Shutdown"
 msgstr "Stelselafsluiting"
 
 msgid "Undefined Condition"
-msgstr "Ongedefinieerde verbinding"
+msgstr "Ongedefinieerde toestand"
 
 msgid "Unsupported Encoding"
 msgstr "Niegesteunde enkodering"
@@ -4561,9 +4638,8 @@ msgstr "Kies 'n hulpbron"
 msgid "Initiate Media"
 msgstr "Inisieer media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Hierdie protokol ondersteun nie geselsiekamers nie."
+msgstr "Rekening ondersteun nie PEP nie, kan nie die bui instel nie"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfigureer 'n geselsiekamer."
@@ -4622,9 +4698,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Kies die regte gebruiker"
+msgstr "mood: Stel die huidige gebruikerbui"
 
 msgid "Extended Away"
 msgstr "Vir lank weg"
@@ -4702,15 +4777,14 @@ msgstr "XMPP-boodskapfout"
 msgid "(Code %s)"
 msgstr "(Kode %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Kan nie boodskap stuur nie: Die boodskap is te groot."
+msgstr "'n Pasgemaakte gesiggie in die boodskap is te groot om te stuur."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP-stroomkop ontbreek"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP-weergawes pas nie"
 
 msgid "XMPP stream missing ID"
 msgstr ""
@@ -4788,320 +4862,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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabies"
+msgstr "Bang"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Skaam"
+msgstr "Verwonderd"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Heerlik"
+msgstr "Amoreus"
 
-#. 1
 msgid "Angry"
 msgstr "Kwaad"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Verban"
+msgstr "Geïrriteerd"
 
 msgid "Anxious"
-msgstr "Besorgd"
+msgstr "Angstig"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "U stuur"
+msgstr "Geprikkel"
 
 msgid "Ashamed"
-msgstr "Skaam"
+msgstr "Bekaamd"
 
 msgid "Bored"
 msgstr "Verveeld"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Stoor"
+msgstr "Dapper"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Ryk"
+msgstr "Kalm"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Geselsies"
+msgstr "Versigtig"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Vetdruk"
+msgstr "Koud"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflik"
+msgstr "Selfversekerd"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Gaan voort"
+msgstr "Verward"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontak"
+msgstr "Peinsend"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Koppel"
+msgstr "Vervuld"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Maatskappy"
+msgstr "Befoeterd"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Mal"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Skep"
+msgstr "Kreatief"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Heerlik"
+msgstr "Nuuskierig"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Geweier"
+msgstr "Ontmoedig"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Geskrap"
+msgstr "Depressief"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Ontkoppel."
+msgstr "Teleurgesteld"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Vies"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Gedeaktiveer"
+msgstr "Ontsteld"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Ontheg"
+msgstr "Afgetrokke"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Verleë"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Besorgd"
+msgstr "Jaloers"
 
-#. 2
 msgid "Excited"
 msgstr "Opgewonde"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Heerlik"
+msgstr "Koketterig"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Naam"
+msgstr "Gefrustreerd"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Dankbaar"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Verkry tans..."
+msgstr "Bedroef"
 
-#. 3
 msgid "Grumpy"
 msgstr "Knorrig"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Stad"
+msgstr "Skuldig"
 
-#. 4
 msgid "Happy"
 msgstr "Gelukkig"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Hoopvol"
 
-#. 8
 msgid "Hot"
-msgstr ""
+msgstr "Warm"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Beskeie"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Verneder"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Kwaad"
+msgstr "Honger"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Seer"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Beïndruk"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Verlief"
+msgstr "In vervoering"
 
 msgid "In love"
 msgstr "Verlief"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesies"
+msgstr "Verontwaardig"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Belangstellings"
+msgstr "Geïnteresseerd"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Uitgenooi"
+msgstr "Dronk"
 
-#. 6
 msgid "Invincible"
 msgstr "Onoorwinlik"
 
 msgid "Jealous"
 msgstr "Jaloers"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Aap"
+msgstr "Eensaam"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Hardste"
+msgstr "Verlore"
 
+#, fuzzy
 msgid "Lucky"
-msgstr ""
+msgstr "Soos 'n kind met 'n roomys in elke hand"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Duits"
+msgstr "Gemeen"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Stemming"
+msgstr "Buierig"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Senuweeagtig"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detail"
+msgstr "Neutraal"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Vanlyn"
+msgstr "Geaffronteerd"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Woedend"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Speel"
+msgstr "Spelerig"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Hard"
+msgstr "Trots"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Regte naam"
+msgstr "Ontspanne"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Ontvang"
+msgstr "Verlig"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Verwyder"
+msgstr "Berouvol"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registreer"
+msgstr "Rusteloos"
 
-#. 7
 msgid "Sad"
-msgstr "Ongelukkig"
+msgstr "Hartseer"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Gujaraties"
+msgstr "Sarkasties"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Tevrede"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Heerlik"
+msgstr "Ernstig"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Geblokkeer"
+msgstr "Geskok"
 
 msgid "Shy"
-msgstr ""
+msgstr "Skaam"
 
-#. 9
 msgid "Sick"
 msgstr "Siek"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Vaak"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontaan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Spoed:"
+msgstr "Gespanne"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Liedjie"
+msgstr "Sterk"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Verras"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Dankbaar"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Dors"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Moeg"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Onderstreep"
+msgstr ""
 
-#, fuzzy
 msgid "Weak"
-msgstr "Kletter"
+msgstr "Swak"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Verveeld"
+msgstr "Bekommerd"
 
 msgid "Set User Nickname"
 msgstr "Stel gebruikerbynaam op"
@@ -5264,7 +5277,7 @@ msgid "Peer notification server down"
 msgstr "Ewekniekennisgewing-bediener af"
 
 msgid "Database connect error"
-msgstr "Databasisverbindingsfout"
+msgstr "Databasiskoppelfout"
 
 msgid "Server is going down (abandon ship)"
 msgstr "Bediener dreig om te val (verlaat die skip)"
@@ -5465,18 +5478,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"
 
@@ -5625,9 +5626,6 @@ msgstr "Herdenking"
 msgid "Work"
 msgstr "Werk"
 
-msgid "Job Title"
-msgstr "Postitel"
-
 msgid "Company"
 msgstr "Maatskappy"
 
@@ -5716,6 +5714,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"
 
@@ -5908,24 +5910,6 @@ msgstr "Wil u hierdie vriend ook uit die adresboek skrap?"
 msgid "The username specified is invalid."
 msgstr "Die gespesifiseerde gebruikernaam is ongeldig."
 
-#. 5
-msgid "In Love"
-msgstr "Verlief"
-
-#. 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."
 
@@ -5949,7 +5933,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")
@@ -5959,7 +5943,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"
 
@@ -5967,6 +5955,7 @@ msgid "Verify PIN"
 msgstr "Verifieer PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Vertoonnaam"
 
@@ -5982,7 +5971,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"
@@ -5993,10 +5982,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..."
@@ -6030,19 +6015,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Koppel tans..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Die bynaam wat gegee is, is ongeldig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Die naam 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"
@@ -6070,10 +6052,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."
@@ -6085,7 +6069,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"
 
@@ -6111,11 +6095,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")
@@ -6128,9 +6118,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"
@@ -6191,7 +6203,7 @@ msgid "Subscription Error"
 msgstr ""
 
 msgid "Contact Update Error"
-msgstr ""
+msgstr "Fout met bywerk van kontak"
 
 msgid "File Transfer Error"
 msgstr "Lêeroordragfout"
@@ -6211,26 +6223,29 @@ 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"
 
 msgid "Pending"
 msgstr "Hangend"
@@ -6329,8 +6344,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"
@@ -6370,7 +6385,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"
@@ -6628,9 +6643,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"
 
@@ -6858,9 +6870,9 @@ msgstr "Bedieneradres"
 msgid "Server port"
 msgstr "Bedienerpoort"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Onverwagse respons vanaf %s"
+msgstr "Onverwagte respons van %s ontvang: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6883,70 +6895,125 @@ 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 "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige kletskamernaam"
 
+msgid "Invalid error"
+msgstr "Ongeldige fout"
+
+#, fuzzy
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kan nie kitsboodskappe ontvang nie weens "
+
+#, fuzzy
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan nie SMS stuur sonder om terme te aanvaar nie"
+
+msgid "Cannot send SMS"
+msgstr "Kan nie SMS stuur nie"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan nie SMS stuur na hierdie land nie"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan nie SMS stuur na onbekende land nie"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Robotrekeninge kan nie kitsboodskappe begin nie"
+
+msgid "Bot account cannot IM this user"
+msgstr ""
+
+msgid "Bot account reached IM limit"
+msgstr "Robotrekening het kitsboodskaplimiet bereik"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Robotrekening het daaglikse kitsboodskaplimiet bereik"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Robotrekening het maandelikse kitsboodskaplimiet bereik"
+
+msgid "Unable to receive offline messages"
+msgstr "Kan nie vanlynboodskappe ontvang nie"
+
+msgid "Offline message store full"
+msgstr "Stoor vir vanlynboodskappe is vol"
+
+#, 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"
+
 msgid "Thinking"
 msgstr ""
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Ophou tik"
+msgstr ""
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Vraagdialoog"
+msgstr ""
 
-#, fuzzy
 msgid "Eating"
-msgstr "Roeping"
+msgstr ""
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Speel 'n speletjie"
+msgstr ""
 
 msgid "Typing"
 msgstr "Tik"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nie op kantoor nie"
+msgstr "By die kantoor"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "In die bad"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Voor die TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Sit neer"
+msgstr "Besig met pret"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Vaak"
+msgstr "Slaap"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Gebruik 'n PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Kitsboodskap-vriende"
+msgstr "Ontmoet vriende"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Op die foon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Herhalend"
+msgstr ""
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
@@ -6956,45 +7023,39 @@ msgid "Searching the web"
 msgstr ""
 
 msgid "At a party"
-msgstr ""
+msgstr "By 'n partytjie"
 
 msgid "Having Coffee"
 msgstr ""
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Gebruikerspelery"
+msgstr ""
 
 msgid "Browsing the web"
 msgstr ""
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Liedjie"
+msgstr "Rook"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Werk"
+msgstr ""
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Werk"
+msgstr ""
 
 msgid "Listening to music"
 msgstr "Luister na musiek"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Stuur tans"
+msgstr ""
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Belangstellings"
+msgstr "In die toilet"
 
 msgid "Received invalid data on connection with server"
-msgstr "Het ongeldige data ontvang tydens verbinding met bediener"
+msgstr "Het ongeldige data ontvang tydens koppeling met bediener"
 
 #. *< type
 #. *< ui_requirement
@@ -7039,7 +7100,7 @@ msgid "Lost connection with the remote user:<br>%s"
 msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker."
+msgstr "Het ongeldige data ontvang tydens koppeling met afgeleë gebruiker."
 
 msgid "Unable to establish a connection with the remote user."
 msgstr "Kan nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
@@ -7059,118 +7120,6 @@ msgstr ""
 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 "Rate to client"
-msgstr "Koers na kliënt"
-
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS without accepting terms"
-msgstr "Kan nie SMS stuur sonder om terme te aanvaar nie"
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan nie SMS stuur nie"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Kan nie SMS stuur na hierdie land nie"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Kan nie SMS stuur na onbekende land nie"
-
-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 "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 "
@@ -7207,7 +7156,7 @@ msgid "Games"
 msgstr "Speletjies"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Invoegsels"
@@ -7216,7 +7165,7 @@ msgid "Send Buddy List"
 msgstr "Stuur vriendelys"
 
 msgid "ICQ Direct Connect"
-msgstr "ICQ- direkte verbinding"
+msgstr "ICQ- direkte koppeling"
 
 msgid "AP User"
 msgstr "AP-gebruiker"
@@ -7275,25 +7224,20 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Onsigbaar"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-pos"
+msgstr ""
 
-#, fuzzy
 msgid "Depression"
-msgstr "Prefessie"
+msgstr ""
 
-#, fuzzy
 msgid "At home"
-msgstr "Omtrent %s"
+msgstr "Tuis"
 
-#, fuzzy
 msgid "At work"
-msgstr "Netwerk"
+msgstr "By die werk"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Uit vir ete"
+msgstr ""
 
 msgid "IP Address"
 msgstr "IP-adres"
@@ -7528,28 +7472,9 @@ 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"
 
@@ -7560,7 +7485,7 @@ msgid "Capabilities"
 msgstr "Vermoëns"
 
 msgid "Your AIM connection may be lost."
-msgstr "U AIM-verbinding is dalk ontkoppel."
+msgstr "U AIM-koppeling is dalk ontkoppel."
 
 #. The conversion failed!
 msgid ""
@@ -7812,9 +7737,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-skakel"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Middagete"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7825,7 +7749,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.  "
@@ -7838,7 +7762,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"
@@ -7847,9 +7771,8 @@ msgstr "Kry AIM-inligting"
 msgid "Edit Buddy Comment"
 msgstr "Wysig vriendkommentaar"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Kry statusboodskap"
+msgstr ""
 
 msgid "End Direct IM Session"
 msgstr "Beëindig direkte geselssessie"
@@ -7972,10 +7895,79 @@ 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"
+
 msgid "Aquarius"
 msgstr "Waterdraer"
 
@@ -8266,6 +8258,10 @@ msgstr "Versoek tans"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr "Kennisgewing"
 
@@ -8709,7 +8705,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"
 
@@ -8835,9 +8831,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"
@@ -8863,7 +8859,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"
@@ -9411,7 +9407,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"
@@ -9605,7 +9601,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"
@@ -9651,7 +9647,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"
@@ -9660,7 +9656,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"
@@ -9745,7 +9741,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"
@@ -10110,7 +10106,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"
@@ -10120,7 +10116,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"
@@ -10132,7 +10128,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
@@ -10193,9 +10189,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"
 
@@ -10211,18 +10204,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..."
 
@@ -10289,6 +10277,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"
@@ -10365,7 +10362,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"
@@ -10718,7 +10725,7 @@ 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"
@@ -10748,6 +10755,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"
 
@@ -10794,7 +10805,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"
@@ -10814,9 +10825,8 @@ msgstr "Moenie steur nie"
 msgid "Extended away"
 msgstr "Vir lank weg"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Ontvang tans"
+msgstr "Gevoel"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10946,7 +10956,7 @@ 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
@@ -10987,12 +10997,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"
@@ -11358,13 +11362,11 @@ msgstr "U is tans aangemeld met 'n rekening wat daardie vriend kan byvoeg."
 msgid "Unknown node type"
 msgstr "Onbekende nodustipe"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Kies asseblief u stemming uit die lys."
+msgstr "Kies asseblief u stemming uit die lys"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (opsioneel)"
+msgstr "Boodskap (opsioneel)"
 
 msgid "Edit User Mood"
 msgstr "Redigeer gebruikerstemming"
@@ -11447,9 +11449,8 @@ msgstr "_Voorkeure"
 msgid "/Tools/Pr_ivacy"
 msgstr "_Privaatheid"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "Stelselstaaf_lêer"
+msgstr "Stel _bui"
 
 msgid "/Tools/_File Transfers"
 msgstr "_Lêeroordragte"
@@ -11470,20 +11471,17 @@ msgstr "_Hulp"
 msgid "/Help/Online _Help"
 msgstr "_Hulp aanlyn"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Vriendinligting"
+msgstr "_Bouinligting"
 
 msgid "/Help/_Debug Window"
 msgstr "_Ontfoutvenster"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Bedienerinligting"
+msgstr "_Programmeerinligting"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Persoonlike inligting"
+msgstr "_Vertaalinligting"
 
 msgid "/Help/_About"
 msgstr "_Aangaande"
@@ -11711,9 +11709,8 @@ msgstr "<PurpleMain>/Rekeninge/"
 msgid "_Edit Account"
 msgstr "_Wysig rekening"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Stel stemming op..."
+msgstr "Stel _bui..."
 
 msgid "No actions available"
 msgstr "Geen aksies beskikbaar nie"
@@ -11834,9 +11831,8 @@ msgstr "Oudio/Video-_oproep"
 msgid "/Conversation/Se_nd File..."
 msgstr "S_tuur lêer..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "Kry inligting"
+msgstr "Trek _aandag"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "Voeg vriend_wag by..."
@@ -11919,9 +11915,8 @@ msgstr "Oudio/Video-oproep"
 msgid "/Conversation/Send File..."
 msgstr "Stuur lêer..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "Kry inligting"
+msgstr "Trek aandag"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "Voeg vriendwag by..."
@@ -11987,13 +11982,11 @@ msgstr "_Stuur"
 msgid "0 people in room"
 msgstr "0 mense in die kamer"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Sluit hierdie oortjie"
+msgstr "Sluit soekbalk"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Vind"
+msgstr "Vind:"
 
 #, c-format
 msgid "%d person in room"
@@ -12156,6 +12149,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabies"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Bekaamd"
+
 msgid "Belarusian Latin"
 msgstr "Witrussies in Latynse skrif"
 
@@ -12165,6 +12162,9 @@ msgstr "Bulgaars"
 msgid "Bengali"
 msgstr "Bengaals"
 
+msgid "Bengali-India"
+msgstr "Bengaals (Indië)"
+
 msgid "Bosnian"
 msgstr "Bosnies"
 
@@ -12279,12 +12279,15 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Masedonies"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Maleisies"
+
 msgid "Mongolian"
 msgstr "Mongools"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujaraties"
+msgstr "Mahratti"
 
 msgid "Malay"
 msgstr "Maleisies"
@@ -12304,9 +12307,8 @@ msgstr "Noorweegse Nynorsk"
 msgid "Occitan"
 msgstr "Oksitaans"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr ""
 
 msgid "Punjabi"
 msgstr "Pandjab"
@@ -12389,24 +12391,21 @@ msgstr "Amharies"
 msgid "Lithuanian"
 msgstr "Litous"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12415,8 +12414,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12426,25 +12428,18 @@ msgid ""
 "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 "About %s"
 msgstr "Omtrent %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Vriendinligting"
+msgstr "Bouinligting"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Vriendinligting"
+msgstr "%s-bouinligting"
 
 msgid "Current Developers"
 msgstr "Huidige programmeerders"
@@ -12458,9 +12453,9 @@ msgstr "Afgetrede programmeerders"
 msgid "Retired Crazy Patch Writers"
 msgstr "Afgetrede malle lapverwers"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Bedienerinligting"
+msgstr "%s-programmeerinligting"
 
 msgid "Current Translators"
 msgstr "Huidige vertalers"
@@ -12468,9 +12463,9 @@ msgstr "Huidige vertalers"
 msgid "Past Translators"
 msgstr "Vorige vertalers"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Meer inligting"
+msgstr "%s-vertaalinligting"
 
 msgid "_Name"
 msgstr "_Naam"
@@ -12884,9 +12879,8 @@ msgstr "Voeg kitsboodskap-prent in"
 msgid "Insert Smiley"
 msgstr "Voeg gesiggie in"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Stuur-knoppie"
+msgstr "Gee aandag"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vetdruk</b>"
@@ -12934,7 +12928,7 @@ msgid "_Smile!"
 msgstr "_Glimlag!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Aandag!"
 
 msgid "Log Deletion Failed"
 msgstr "Kon nie staaflêer skrap nie"
@@ -12952,16 +12946,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?"
 
@@ -13066,11 +13060,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."
@@ -13879,10 +13875,6 @@ msgstr "Kortpadteks"
 msgid "Custom Smiley Manager"
 msgstr "Bestuurder van eie gesiggies"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Registrasie vereis"
-
 msgid "Select Buddy Icon"
 msgstr "Kies vriendikoon"
 
@@ -13893,7 +13885,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..."
@@ -14024,9 +14016,8 @@ msgstr "S_peel 'n klank"
 msgid "_Save File"
 msgstr "_Stoor lêer"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Wil u definitief %s skrap?"
+msgstr "Wil u definitief skoonmaak?"
 
 msgid "Select color"
 msgstr "Kies kleur"
@@ -14954,11 +14945,11 @@ 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"
@@ -15021,8 +15012,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..."
@@ -15221,10 +15221,184 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Stuur en ontvang rou XMPP-stanzas."
 
 #. *  description
-#, fuzzy
 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."
+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 "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."
 
@@ -15234,6 +15408,18 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ 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!"
 
@@ -15295,6 +15481,45 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ "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/>"
@@ -15303,6 +15528,21 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ "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>"
@@ -15341,6 +15581,9 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ "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."
 
@@ -15350,6 +15593,9 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ 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."
@@ -15407,9 +15653,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 ... "
 
@@ -15455,15 +15698,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"
 
@@ -15749,6 +15983,9 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "User Browsing"
 #~ msgstr "Gebruikerblaaiery"
 
+#~ msgid "User Gaming"
+#~ msgstr "Gebruikerspelery"
+
 #~ msgid "User Viewing"
 #~ msgstr "Gebruikerbekyking"
 
@@ -16046,7 +16283,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."
@@ -16150,6 +16387,10 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Update information"
 #~ msgstr "Werk inligting by"
 
+#, fuzzy
+#~ msgid "Successed:"
+#~ msgstr "Spoed:"
+
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
diff --git a/po/am.po b/po/am.po
index 5c7603c5cd..9565c93d43 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 ""
 
@@ -800,7 +812,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ተወው"
 
 #, fuzzy
@@ -1291,6 +1303,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1391,7 +1406,6 @@ msgid "Saved Statuses"
 msgstr "የቤት አድራሻ፦"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "አርእስት"
 
@@ -1593,7 +1607,7 @@ msgstr ""
 msgid "Online"
 msgstr "ኦንላይን"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 #, fuzzy
 msgid "Offline"
 msgstr "ኦንላይን"
@@ -1702,6 +1716,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 "ያልታወቀ"
 
@@ -1719,7 +1739,9 @@ 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."
@@ -1949,7 +1971,6 @@ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "ያልታወቀ ስህተት"
@@ -3195,6 +3216,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 "ስም፦"
 
@@ -3789,12 +3813,6 @@ msgstr "ትእዛዝ"
 msgid "execute"
 msgstr "አጥፉ"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3824,6 +3842,15 @@ 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 "መድረክን አስወግድ"
@@ -3833,6 +3860,42 @@ msgid "SASL error: %s"
 msgstr "የIRC ስህተት"
 
 #, fuzzy
+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 ""
+
+#, 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 "ተገናኝቷል"
 
@@ -3901,6 +3964,7 @@ msgstr "አካባቢ"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "አገር"
 
@@ -3915,10 +3979,15 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+#, fuzzy
+msgid "Job Title"
+msgstr "አርእስት"
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "የልደት በዓል"
 
@@ -4160,6 +4229,12 @@ 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 "መድረክን አስወግድ"
@@ -4167,6 +4242,9 @@ 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 ""
 
@@ -4268,7 +4346,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4292,7 +4369,6 @@ msgstr "ወደ ላይ"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "ምንም"
 
@@ -4316,6 +4392,12 @@ msgstr "ጽሑፍ"
 msgid "Mood Comment"
 msgstr "የቢሮ መረጃ፦"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4502,10 +4584,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "መድረክን አስወግድ"
 
-#, fuzzy
-msgid "Resource Constraint"
-msgstr "መድረክን አስወግድ"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4857,7 +4935,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4952,7 +5029,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 #, fuzzy
 msgid "Excited"
 msgstr "ውጣ"
@@ -4971,7 +5047,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "መድረክ፦ (_G)"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "መድረክ፦ (_G)"
@@ -4980,7 +5055,6 @@ msgstr "መድረክ፦ (_G)"
 msgid "Guilty"
 msgstr "ከተማ"
 
-#. 4
 #, fuzzy
 msgid "Happy"
 msgstr "ተጠቀም (_Y)"
@@ -4988,7 +5062,6 @@ msgstr "ተጠቀም (_Y)"
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "እንግዳ ተቀባይ (_H)"
@@ -5028,7 +5101,6 @@ msgstr "አስገባ"
 msgid "Intoxicated"
 msgstr "አስገባ"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5091,7 +5163,6 @@ msgstr "አስወግድ"
 msgid "Restless"
 msgstr "እንደነበረ አድረግ"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -5112,12 +5183,10 @@ msgstr "ደማቅ"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "ቅጽል"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5525,19 +5594,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 "አርእስት"
@@ -5708,10 +5764,6 @@ msgid "Work"
 msgstr ""
 
 #, fuzzy
-msgid "Job Title"
-msgstr "አርእስት"
-
-#, fuzzy
 msgid "Company"
 msgstr "ትእዛዝ"
 
@@ -5805,6 +5857,10 @@ msgstr "ተገናኝቷል"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ተገናኝቷል"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5982,28 +6038,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-#, fuzzy
-msgid "In Love"
-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?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -6037,7 +6071,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"
@@ -6046,6 +6084,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "አሳይ"
@@ -6078,11 +6117,6 @@ msgstr ""
 "\n"
 "<b>ቅጽል ስም፦</b>"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ሚስጢራዊ ቃልን ለውጥ"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6118,21 +6152,16 @@ msgstr "ተገናኝቷል"
 msgid "Connecting..."
 msgstr "ተገናኝቷል"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+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"
@@ -6162,10 +6191,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."
@@ -6177,7 +6206,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
@@ -6211,12 +6240,17 @@ 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")
@@ -6231,6 +6265,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 ""
@@ -6350,6 +6403,10 @@ msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
 #, fuzzy
+msgid "In Love"
+msgstr "ተዉት"
+
+#, fuzzy
 msgid "Pending"
 msgstr "ላክ"
 
@@ -6759,10 +6816,6 @@ msgstr "ሚስጢራዊ ቃል፦"
 msgid "Incorrect password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
-#, fuzzy
-msgid "User not found"
-msgstr "ተጠቃሚ መርጫዎች"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -7008,6 +7061,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "መድረክን አስወግድ"
@@ -7016,6 +7073,65 @@ 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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "ተገናኝቷል"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "አዲስ መልእክት"
+
+#, 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 "ተገናኝቷል"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7180,118 +7296,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 ""
-
-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 ""
-
-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 ""
-
-#, 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 "
@@ -7619,30 +7623,10 @@ 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 "ኦንላይን"
 
@@ -8043,6 +8027,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8375,6 +8428,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "አርእስት"
+
 #, fuzzy
 msgid "Notice"
 msgstr "ምንም"
@@ -10318,10 +10376,6 @@ msgstr "ምረጡ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "የJabber ስህተት %s"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "ሰርቨርን የለም"
-
 msgid "Pager port"
 msgstr ""
 
@@ -10339,19 +10393,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 "ምረጡ..."
@@ -10413,6 +10461,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"
@@ -10484,6 +10538,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 "የአባት ስም፦"
 
@@ -10866,6 +10929,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 ""
 
@@ -11105,13 +11172,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 "የዝምብለህ ይግባ መርጫዎች"
@@ -12385,6 +12445,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "አውቶማቲክ"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ጨዋታዎች"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12394,6 +12458,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12518,6 +12585,10 @@ msgstr "ዝምብለህ ይግባ"
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ወንድ"
+
 msgid "Mongolian"
 msgstr ""
 
@@ -12643,8 +12714,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13209,14 +13280,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
@@ -13305,10 +13376,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
@@ -14179,9 +14250,6 @@ msgstr "አቋራጮች"
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "የፊደል ቅርጽ ምረጡ"
@@ -15351,7 +15419,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
@@ -15560,6 +15638,173 @@ msgstr ""
 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."
+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
+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 "የሞቢል ስልክ፦"
+
+#, 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 "ተገናኝቷል"
diff --git a/po/ar.po b/po/ar.po
index 68cca7c16c..5f2d0cdf03 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "تنبيهات بريديّة جديدة"
 
@@ -778,7 +791,7 @@ msgstr "قف"
 msgid "Waiting for transfer to begin"
 msgstr "في انتظار بدء النقل"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "أُلغِيَ"
 
 msgid "Failed"
@@ -1248,6 +1261,10 @@ msgstr "يتحدث آخرون في الدردشة"
 msgid "Someone says your username in chat"
 msgstr "أحدهم يذكر اسمك في دردشة"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "تتطلب التسجيل"
+
 msgid "GStreamer Failure"
 msgstr "فشل GStreamer"
 
@@ -1341,7 +1358,6 @@ msgid "Saved Statuses"
 msgstr "الحالات المحفوظة"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "العنوان"
 
@@ -1535,7 +1551,7 @@ msgstr ""
 msgid "Online"
 msgstr "متصل"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "غير متصل"
 
@@ -1628,6 +1644,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,9 +1670,10 @@ 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."
@@ -1889,7 +1914,6 @@ msgstr "عطل في استجلاء %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "فشل إنشاء الخيط: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
@@ -3150,6 +3174,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,14 +3818,6 @@ 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 "يتطلب الخادوم التوثيق بالنص الصريح عبر قناة غير معمّاة"
 
@@ -3831,6 +3850,18 @@ 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 "فشل الاستيثاق"
 
@@ -3839,6 +3870,42 @@ 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 "تعذّر الإعداد"
 
@@ -3913,6 +3980,7 @@ msgstr "الإقليم"
 msgid "Postal Code"
 msgstr "الرمز البريدي"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "الدولة"
 
@@ -3927,10 +3995,14 @@ msgstr "اسم المنظمة"
 msgid "Organization Unit"
 msgstr "الوحدة التنظيمية"
 
+msgid "Job Title"
+msgstr "المسمّى الوظيفي"
+
 msgid "Role"
 msgstr "الدّور"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "تاريخ الميلاد"
 
@@ -4152,12 +4224,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 "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 غير صحيحة. يجب تحديد النطاق."
 
@@ -4255,7 +4339,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "غير مصرح"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "المزاج"
 
@@ -4277,7 +4360,6 @@ msgstr "إلى"
 msgid "None (To pending)"
 msgstr "لاشيء (إلى مُرجأ)"
 
-#. 0
 msgid "None"
 msgstr "لا شيء"
 
@@ -4299,6 +4381,12 @@ msgstr "الاسم الأوسط"
 msgid "Mood Comment"
 msgstr "تعليق الصديق"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "اسم الموسيقيّ"
 
@@ -4469,9 +4557,6 @@ msgstr "انتهاك سياسة"
 msgid "Remote Connection Failed"
 msgstr "فشل الاتصال البعيد"
 
-msgid "Resource Constraint"
-msgstr "محدودية في المورد"
-
 msgid "Restricted XML"
 msgstr "XML مقيدة"
 
@@ -4842,7 +4927,6 @@ msgstr "مخزي"
 msgid "Amorous"
 msgstr "مجيد"
 
-#. 1
 msgid "Angry"
 msgstr "غاضب"
 
@@ -4940,7 +5024,6 @@ msgstr ""
 msgid "Envious"
 msgstr "قلق"
 
-#. 2
 msgid "Excited"
 msgstr "متحمّس"
 
@@ -4959,7 +5042,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "يجري الجلب..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "المجموعة"
@@ -4968,14 +5050,12 @@ msgstr "المجموعة"
 msgid "Guilty"
 msgstr "المدينة"
 
-#. 4
 msgid "Happy"
 msgstr "سعيد"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "م_ضيف:"
@@ -5016,7 +5096,6 @@ msgstr "الاهتمامات"
 msgid "Intoxicated"
 msgstr "ادعُ"
 
-#. 6
 msgid "Invincible"
 msgstr "منيع"
 
@@ -5080,7 +5159,6 @@ msgstr "أزِل"
 msgid "Restless"
 msgstr "سجّل"
 
-#. 7
 msgid "Sad"
 msgstr "حزين"
 
@@ -5101,12 +5179,10 @@ msgstr "محظور"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "الكنية"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "نعسان"
@@ -5505,18 +5581,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 "عنوان اللحن"
@@ -5668,9 +5732,6 @@ msgstr "الذكرى السنويّة"
 msgid "Work"
 msgstr "العمل"
 
-msgid "Job Title"
-msgstr "المسمّى الوظيفي"
-
 msgid "Company"
 msgstr "الشركة"
 
@@ -5758,6 +5819,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"
@@ -5967,28 +6032,6 @@ msgstr "أتريد حذف هذا الصديق من دفتر عناوينك أي�
 msgid "The username specified is invalid."
 msgstr "اسم المستخدم المحدد غير صالح."
 
-#. 5
-msgid "In Love"
-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 المدخل غير صالح."
@@ -6025,7 +6068,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"
@@ -6034,6 +6081,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "اسم العائلة"
@@ -6064,11 +6112,6 @@ msgstr ""
 msgid "About"
 msgstr "عن %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "غيّر كلمة السر..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6108,7 +6151,7 @@ msgid "Connecting..."
 msgstr "يتّصل"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "مفتاح SecurID المدخل غير صالح."
 
 #, fuzzy
@@ -6116,14 +6159,9 @@ 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"
@@ -6152,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
@@ -6169,7 +6207,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "الأمن مُفعّل"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "أدخل الرمز"
@@ -6203,12 +6241,17 @@ 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")
@@ -6223,6 +6266,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 ""
@@ -6342,6 +6407,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "واقع في الحب"
+
 #, fuzzy
 msgid "Pending"
 msgstr "يُرسل"
@@ -6751,9 +6819,6 @@ msgstr "كلمة السر انتهت"
 msgid "Incorrect password"
 msgstr "كلمة السر غير صحيحة"
 
-msgid "User not found"
-msgstr "لم يُعثر على المستخدم"
-
 msgid "Account has been disabled"
 msgstr "عُطِّل الحساب"
 
@@ -7001,12 +7066,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "خطأ أثناء استجلاء %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 ""
+
+#, 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 "رسالة بلا اتصال"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7173,120 +7303,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 "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 "
@@ -7302,8 +7318,8 @@ msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(حدث عطل في استقبال هذه الرسالة. إما أنك و%s تستخدمان ترميزين مختلفين أو أن %"
-"s يستخدم عميلا به علات.)"
+"(حدث عطل في استقبال هذه الرسالة. إما أنك و%s تستخدمان ترميزين مختلفين أو أن "
+"%s يستخدم عميلا به علات.)"
 
 #. Label
 msgid "Buddy Icon"
@@ -7659,29 +7675,10 @@ 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 "متصل منذ"
 
@@ -8100,6 +8097,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "الدّلو"
 
@@ -8395,6 +8461,11 @@ msgstr "حوار الطلب"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "قائمة الغرف"
+
 #, fuzzy
 msgid "Notice"
 msgstr "ملاحظة"
@@ -10351,9 +10422,6 @@ msgstr "هويّة ياهو..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ملحقة بروتوكول ياهو"
 
-msgid "Pager server"
-msgstr "خادوم الاستدعاء"
-
 msgid "Pager port"
 msgstr "منفذ الاستدعاء"
 
@@ -10369,18 +10437,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 "هويّة ياهو..."
@@ -10445,6 +10507,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"
@@ -10524,6 +10593,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 "ليس بالمنزل"
 
@@ -10909,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 "ا_قبل"
 
@@ -11168,12 +11250,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 "خيارات الولوج"
@@ -12379,6 +12455,10 @@ msgstr "أفريكانية"
 msgid "Arabic"
 msgstr "عربية"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "مخزي"
+
 msgid "Belarusian Latin"
 msgstr "بلاروسية (لاتينية)"
 
@@ -12388,6 +12468,10 @@ msgstr "بلغارية"
 msgid "Bengali"
 msgstr "بنغالية"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنغالية"
+
 msgid "Bosnian"
 msgstr "بوسنية"
 
@@ -12505,6 +12589,10 @@ msgid "Macedonian"
 msgstr "مقدونية"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "ذكر"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "مقدونية"
 
@@ -12623,8 +12711,8 @@ msgid ""
 "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>"
+"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 "
@@ -13175,14 +13263,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?"
@@ -13286,10 +13374,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
@@ -14141,10 +14229,6 @@ msgid "Custom Smiley Manager"
 msgstr "مدير الشّهادات"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "تتطلب التسجيل"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "اختر صديقا"
 
@@ -15306,8 +15390,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..."
@@ -15519,6 +15615,203 @@ msgstr "أرسِل و استقبل أبيات XMPP خام."
 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."
+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 "لا تملك الصلاحيات لتثبيت هذا التطبيق."
+
+#, 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 "خطأ في إنشاء الاتصال"
@@ -15679,9 +15972,6 @@ msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملا�
 #~ msgid "_User:"
 #~ msgstr "_مستخدم:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "نسخة جتك+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "يجري حسابات..."
@@ -16134,8 +16424,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 "فشل تغيير الأيقونة"
@@ -16294,7 +16584,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."
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 461fbe08ab..27340255bc 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -797,7 +809,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1297,6 +1309,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1400,7 +1415,6 @@ msgid "Saved Statuses"
 msgstr "Vəziyyət"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Başlıq"
 
@@ -1603,7 +1617,7 @@ msgstr ""
 msgid "Online"
 msgstr "Xətdə"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1704,6 +1718,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"
 
@@ -1722,7 +1742,9 @@ 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."
@@ -1951,7 +1973,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"
@@ -3206,6 +3227,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 ""
 
@@ -3800,12 +3824,6 @@ msgstr ""
 msgid "execute"
 msgstr "Sil"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3835,6 +3853,15 @@ 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ı"
@@ -3844,6 +3871,40 @@ msgid "SASL error: %s"
 msgstr "Oxuma xətası"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Səhv istifadəçi adı."
+
+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 "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"
 
@@ -3913,6 +3974,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ölkə"
 
@@ -3927,10 +3989,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ü"
 
@@ -4156,6 +4222,12 @@ 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ı"
@@ -4164,6 +4236,9 @@ msgstr "Bağlantı bacarılmadı"
 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 ""
 
@@ -4264,7 +4339,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4286,7 +4360,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "Heç biri"
 
@@ -4309,6 +4382,12 @@ msgstr "Orta Ad"
 msgid "Mood Comment"
 msgstr "Mətn"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4483,9 +4562,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4829,7 +4905,6 @@ msgstr "Animasiyanı fəallaşdır"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4922,7 +4997,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4940,7 +5014,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Bağlanılır..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Qrup:"
@@ -4948,14 +5021,12 @@ msgstr "Qrup:"
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Qovşaq:"
@@ -4996,7 +5067,6 @@ msgstr "_Daxil Et"
 msgid "Intoxicated"
 msgstr "_Daxil Et"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5059,7 +5129,6 @@ msgstr "Sil"
 msgid "Restless"
 msgstr "Qeyd Et"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -5080,12 +5149,10 @@ msgstr "İstifadəçini Blokla"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Ləqəb:"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5489,19 +5556,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"
@@ -5666,9 +5720,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5758,6 +5809,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 ""
 
@@ -5936,27 +5991,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5989,7 +6023,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 ""
 
@@ -5997,6 +6035,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Göstər"
@@ -6027,11 +6066,6 @@ msgstr ""
 msgid "About"
 msgstr "Hesablar"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Səhv şifrə."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6068,21 +6102,16 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Connecting..."
 msgstr "_Yenidən bağlan"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "_İstifadəçi Adı:"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6110,10 +6139,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."
@@ -6125,7 +6154,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Şifrə"
@@ -6158,12 +6187,17 @@ 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")
@@ -6178,6 +6212,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 ""
@@ -6295,6 +6349,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "_Fərqli Yolla"
@@ -6704,9 +6761,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 ""
 
@@ -6947,6 +7001,10 @@ 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"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Transfer üçün bağlana bilmədi."
@@ -6955,6 +7013,67 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Invalid chat room name"
 msgstr "Səhv istifadəçi adı."
 
+msgid "Invalid error"
+msgstr ""
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, 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 "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 "Soket açıla bilmədi"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Xətdə deyil"
+
+#, 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"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7122,120 +7241,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 ""
-
-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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, 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 "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 "Soket açıla bilmədi"
-
-#, 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 "
@@ -7558,29 +7563,9 @@ 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 ""
 
@@ -7966,6 +7951,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8296,6 +8350,11 @@ msgstr "Qalan"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Başlıq"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Qeyd"
@@ -10199,10 +10258,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"
 
@@ -10220,20 +10275,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"
@@ -10296,6 +10344,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"
@@ -10366,6 +10420,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"
 
@@ -10745,6 +10808,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"
@@ -10987,13 +11054,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"
@@ -12255,6 +12315,9 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharik Dili"
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12264,6 +12327,9 @@ msgstr "Bolqar Dili"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Rumın Dili"
@@ -12389,6 +12455,10 @@ msgid "Macedonian"
 msgstr "Makedon Dili"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Səs Çal"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedon Dili"
 
@@ -12513,8 +12583,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13076,14 +13146,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
@@ -13178,10 +13248,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
@@ -14066,9 +14136,6 @@ msgstr "Qısa Yollar"
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Əlaqəni Seç"
@@ -15265,7 +15332,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
@@ -15476,6 +15553,178 @@ msgstr ""
 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."
+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 "Sil"
+
+#. $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 "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"
@@ -15759,7 +16008,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."
diff --git a/po/be@latin.po b/po/be@latin.po
index 07d8abcca3..9b602bd10f 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -788,7 +801,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 +1274,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 +1371,6 @@ msgid "Saved Statuses"
 msgstr "Zachavanyja statusy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Nazva"
 
@@ -1552,7 +1568,7 @@ msgstr ""
 msgid "Online"
 msgstr "Spałučany"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Adłučany"
 
@@ -1645,6 +1661,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"
 
@@ -1665,9 +1689,10 @@ 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."
@@ -1911,7 +1936,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"
 
@@ -3196,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 "Imia"
 
@@ -3809,14 +3836,6 @@ 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."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Ty vymahaješ šyfravańnia, ale padtrymki TLS/SSL niama."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał"
 
@@ -3849,6 +3868,18 @@ 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"
 
@@ -3857,6 +3888,42 @@ msgid "SASL error: %s"
 msgstr "Pamyłka SASL"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Niapravilnaja ŭmova ŭvodu"
+
+#, 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"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Niepadtrymanaje kadavańnie"
+
+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ć"
 
@@ -3931,6 +3998,7 @@ msgstr "Rehijon"
 msgid "Postal Code"
 msgstr "Paštovy indeks"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Kraina"
 
@@ -3945,10 +4013,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"
 
@@ -4172,12 +4244,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 "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."
 
@@ -4275,7 +4359,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Nie aŭtaryzavany"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nastroj"
 
@@ -4297,7 +4380,6 @@ msgstr "Da"
 msgid "None (To pending)"
 msgstr "Niama (Razhladajecca)"
 
-#. 0
 msgid "None"
 msgstr "Niama"
 
@@ -4319,6 +4401,12 @@ msgstr "Siaredniaje imia"
 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"
 
@@ -4489,9 +4577,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"
 
@@ -4849,7 +4934,6 @@ msgstr "Zasaromleny"
 msgid "Amorous"
 msgstr "Słavuty"
 
-#. 1
 msgid "Angry"
 msgstr "Zły"
 
@@ -4947,7 +5031,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Niespakojny"
 
-#. 2
 msgid "Excited"
 msgstr "Uschvalavany"
 
@@ -4966,7 +5049,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Atrymańnie..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Hrupa"
@@ -4975,14 +5057,12 @@ msgstr "Hrupa"
 msgid "Guilty"
 msgstr "Horad"
 
-#. 4
 msgid "Happy"
 msgstr "Ščaślivy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5023,7 +5103,6 @@ msgstr "Zacikaŭlenaści"
 msgid "Intoxicated"
 msgstr "Zaprasi"
 
-#. 6
 msgid "Invincible"
 msgstr "Nieadolny"
 
@@ -5087,7 +5166,6 @@ msgstr "Vydali"
 msgid "Restless"
 msgstr "Zarehistruj"
 
-#. 7
 msgid "Sad"
 msgstr "Markotny"
 
@@ -5108,12 +5186,10 @@ msgstr "Zablakavany"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Mianuška"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sonny"
@@ -5522,18 +5598,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"
@@ -5687,9 +5751,6 @@ msgstr "Jubilej"
 msgid "Work"
 msgstr "Praca"
 
-msgid "Job Title"
-msgstr "Pasada"
-
 msgid "Company"
 msgstr "Kampanija"
 
@@ -5778,6 +5839,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"
 
@@ -5988,28 +6053,6 @@ msgstr "Chočaš dadać hetaha siabra da svajho śpisu siabroŭ?"
 msgid "The username specified is invalid."
 msgstr "Akreślenaja nazva karystalnika niapravilnaja."
 
-#. 5
-msgid "In Love"
-msgstr "Zakachany"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Tvoj ciapierašni nastroj"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Akreśleny kluč SecurID niapravilny."
@@ -6046,7 +6089,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"
@@ -6055,6 +6102,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Proźvišča"
@@ -6085,11 +6133,6 @@ msgstr ""
 msgid "About"
 msgstr "Ab %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Źmiani parol..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6133,7 +6176,7 @@ msgid "Connecting..."
 msgstr "Spałučeńnie"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Akreśleny kluč SecurID niapravilny."
 
 #, fuzzy
@@ -6141,14 +6184,9 @@ 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"
@@ -6177,10 +6215,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
@@ -6194,7 +6232,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"
@@ -6228,12 +6266,17 @@ 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")
@@ -6248,6 +6291,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 ""
@@ -6368,6 +6433,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Zakachany"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Vysyłańnie"
@@ -6772,9 +6840,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"
 
@@ -7034,12 +7099,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Pamyłka zapytu znaku ŭvachodu"
+
 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 "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Niemahčyma dasłać fajł"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Niemahčyma dasłać kataloh."
+
+#. 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 "Niemahčyma dasłać paviedamleńnie."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Paviedamleńnie biez spałučeńnia"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7207,120 +7337,6 @@ msgstr ""
 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 "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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Niemahčyma dasłać fajł"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Niemahčyma dasłać kataloh."
-
-#. 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 "Niemahčyma dasłać paviedamleńnie."
-
-#, fuzzy
-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 "
@@ -7683,29 +7699,10 @@ 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"
 
@@ -8146,6 +8143,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vadaliŭ"
 
@@ -8467,6 +8533,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"
@@ -10421,9 +10492,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"
 
@@ -10439,18 +10507,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"
@@ -10521,6 +10583,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"
@@ -10604,6 +10675,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"
 
@@ -10992,6 +11074,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"
 
@@ -11238,12 +11324,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"
@@ -12452,6 +12532,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabskaja"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Zasaromleny"
+
 msgid "Belarusian Latin"
 msgstr "Biełaruskaja łacinka"
 
@@ -12461,6 +12545,10 @@ msgstr "Baŭharskaja"
 msgid "Bengali"
 msgstr "Benhalskaja"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Benhalskaja"
+
 msgid "Bosnian"
 msgstr "Baśnijskaja"
 
@@ -12579,6 +12667,10 @@ msgid "Macedonian"
 msgstr "Makiedonskaja"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Mužčynski"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makiedonskaja"
 
@@ -12697,8 +12789,8 @@ msgid ""
 "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>"
+"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/"
@@ -13259,15 +13351,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?"
 
@@ -13372,10 +13464,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
@@ -14233,10 +14325,6 @@ msgid "Custom Smiley Manager"
 msgstr "Kiraŭnik sertyfikataŭ"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Vymahaje rehistracyi"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Abiary siabra"
 
@@ -15422,8 +15510,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..."
@@ -15636,6 +15736,203 @@ msgstr "Dasyłaj i atrymvaj suvoryja strofy XMPP."
 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."
+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 ""
+
+#, 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"
@@ -15798,9 +16095,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..."
@@ -16410,7 +16704,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."
@@ -16512,8 +16806,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 68695266b0..2a01412886 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "Известяване за нова е-поща"
 
@@ -807,7 +820,7 @@ msgstr "Зареждане при стартиране"
 msgid "Waiting for transfer to begin"
 msgstr "Изчакване пренасянето да започне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отказан"
 
 msgid "Failed"
@@ -1319,6 +1332,10 @@ msgstr "Други говорят в чата"
 msgid "Someone says your username in chat"
 msgstr "Някой споменава името ви в чат"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Изисква се регистрация"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1423,7 +1440,6 @@ msgid "Saved Statuses"
 msgstr "Запазени състояния"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Длъжност"
 
@@ -1628,7 +1644,7 @@ msgstr ""
 msgid "Online"
 msgstr "Включен"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Изключен"
 
@@ -1726,6 +1742,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 "Непознат"
 
@@ -1743,9 +1766,10 @@ 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."
 msgstr ""
@@ -1983,7 +2007,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "Грешка при идентификацията"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Причината е неизвестна."
@@ -3246,6 +3269,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 "Малко име"
 
@@ -3821,14 +3847,6 @@ 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 за влизане. Нямаме поддръжка на TLS/SSL."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Сървърът изисква парола в чист текст през некодирана връзка"
 
@@ -3861,6 +3879,18 @@ 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 "Неуспешна идентификация"
 
@@ -3869,6 +3899,42 @@ msgid "SASL error: %s"
 msgstr "Грешка при четенето"
 
 #, 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 "Невъзможност за настройка"
 
@@ -3939,6 +4005,7 @@ msgstr "Област"
 msgid "Postal Code"
 msgstr "Пощенски код"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Държава"
 
@@ -3953,10 +4020,14 @@ msgstr "Организация"
 msgid "Organization Unit"
 msgstr "Отдел"
 
+msgid "Job Title"
+msgstr "Длъжност"
+
 msgid "Role"
 msgstr "Описание на длъжността"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Рожденна дата"
 
@@ -4186,6 +4257,14 @@ 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 "Обикновен текст"
 
@@ -4193,6 +4272,9 @@ msgstr "Обикновен текст"
 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 ""
 
@@ -4299,7 +4381,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Не е разрешено"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настроение"
 
@@ -4321,7 +4402,6 @@ msgstr "До"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "Няма"
 
@@ -4345,6 +4425,12 @@ msgstr "Второ име"
 msgid "Mood Comment"
 msgstr "Коментар за приятел"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4520,9 +4606,6 @@ msgstr "Нарушение на условията"
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr "Ограничен XML"
 
@@ -4874,7 +4957,6 @@ msgstr "Засрамен"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Гневен"
 
@@ -4971,7 +5053,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Загрижен"
 
-#. 2
 msgid "Excited"
 msgstr "Развълнуван"
 
@@ -4989,7 +5070,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Потребителят пише..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група:"
@@ -4998,14 +5078,12 @@ msgstr "Група:"
 msgid "Guilty"
 msgstr "Град"
 
-#. 4
 msgid "Happy"
 msgstr "Щастлив"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Адрес:"
@@ -5046,7 +5124,6 @@ msgstr "Обръщане"
 msgid "Intoxicated"
 msgstr "Покана"
 
-#. 6
 msgid "Invincible"
 msgstr "Неуязвим"
 
@@ -5110,7 +5187,6 @@ msgstr "Премахване"
 msgid "Restless"
 msgstr "Регистрация"
 
-#. 7
 msgid "Sad"
 msgstr "Тъжен"
 
@@ -5131,12 +5207,10 @@ msgstr "Блокиран"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Потребителско име"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Сънлив"
@@ -5548,20 +5622,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 "Длъжност"
@@ -5729,9 +5789,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Длъжност"
-
 msgid "Company"
 msgstr "Фирма"
 
@@ -5825,6 +5882,10 @@ msgstr "IPC тестов сървър"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не може да бъде установена нова връзка."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -6006,28 +6067,6 @@ msgstr "Искате ли да добавите този потребител к
 msgid "The username specified is invalid."
 msgstr "Новото форматиране е неправилно."
 
-#. 5
-msgid "In Love"
-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 "Новото форматиране е неправилно."
@@ -6065,7 +6104,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"
@@ -6074,6 +6117,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Фамилия"
@@ -6104,11 +6148,6 @@ msgstr ""
 msgid "About"
 msgstr "Относно Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Смяна на паролата..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6150,7 +6189,7 @@ msgid "Connecting..."
 msgstr "Свързване"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Новото форматиране е неправилно."
 
 #, fuzzy
@@ -6158,14 +6197,9 @@ 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"
@@ -6194,10 +6228,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."
@@ -6210,7 +6244,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Активиране на защитата"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Въведете парола"
@@ -6244,12 +6278,17 @@ 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")
@@ -6264,6 +6303,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 ""
@@ -6383,6 +6444,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Влюбен"
+
 #, fuzzy
 msgid "Pending"
 msgstr "_Изпращане"
@@ -6801,9 +6865,6 @@ msgstr "Паролата изтече"
 msgid "Incorrect password"
 msgstr "Невярна парола."
 
-msgid "User not found"
-msgstr "Потребителят не е намерен"
-
 msgid "Account has been disabled"
 msgstr "Акаунтът е деактивиран"
 
@@ -7055,6 +7116,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Грешка при установяването на връзката"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Неуспех при свързването"
@@ -7063,6 +7128,67 @@ 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 ""
+
+#, 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 "Непрочетени съобщения"
+
+#, 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 не може да бъде изпратено:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7232,120 +7358,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 ""
-
-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 ""
-
-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 "
@@ -7690,29 +7702,10 @@ 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 "Включен от"
 
@@ -8147,6 +8140,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8488,6 +8550,11 @@ msgstr "Отговорът е отказан"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Списък със стаи"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Бележка"
@@ -10419,10 +10486,6 @@ msgstr "Име в Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Модул за протокола Yahoo"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Сървър "
-
 msgid "Pager port"
 msgstr "Порт за пейджър"
 
@@ -10439,20 +10502,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!"
@@ -10519,6 +10575,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"
@@ -10597,6 +10660,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 "Не е вкъщи"
 
@@ -10982,6 +11055,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 "Прием_ане"
 
@@ -11222,12 +11299,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 "Настройки за влизане"
@@ -12484,6 +12555,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "етиопски"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Засрамен"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12493,6 +12568,10 @@ msgstr "български"
 msgid "Bengali"
 msgstr "бенгали"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "бенгали"
+
 msgid "Bosnian"
 msgstr "босненски"
 
@@ -12617,6 +12696,10 @@ msgid "Macedonian"
 msgstr "македонски"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Мъжки"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "македонски"
 
@@ -12742,8 +12825,8 @@ msgid ""
 "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>"
+"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, и "
@@ -13334,14 +13417,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
@@ -13436,10 +13519,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
@@ -14318,10 +14401,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Изисква се регистрация"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Избор на приятел"
 
@@ -15528,7 +15607,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..."
@@ -15744,6 +15833,195 @@ msgstr ""
 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."
+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 ""
+
+#. 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 "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 "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 "Грешка при установяването на връзката"
@@ -15864,9 +16142,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Потребител:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Версия на GTK+"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Изчисляване..."
@@ -16299,7 +16574,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 ""
 #~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
 
diff --git a/po/bn.po b/po/bn.po
index 4ebc0c9ad3..38a9d88036 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -4,18 +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: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-11 02:20+0600\n"
-"Last-Translator: Sadia Afroz <sadia@ankur.org.bd>\n"
+"POT-Creation-Date: 2010-07-27 02:34-0400\n"
+"PO-Revision-Date: 2010-07-25 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"
@@ -32,7 +34,7 @@ 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
@@ -50,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"
 
@@ -62,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 "পাসওয়ার্ড মনে রাখা হবে"
@@ -91,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 "প্রোটোকল:"
@@ -106,11 +120,11 @@ msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
 msgid "Alias:"
-msgstr "উপনাম:"
+msgstr "ডাকনাম:"
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "সার্ভারে এই একাউন্টটি তৈরী করা হবে।"
+msgstr "সার্ভারে এই অ্যাকাউন্টটি তৈরি করা হবে"
 
 #. Cancel button
 #. Cancel
@@ -124,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"
@@ -156,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 "বন্ধুকে অনুমোদন দিতে চান?"
@@ -178,7 +192,7 @@ msgstr ""
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "একাউন্ট: %1$s (%2$s)"
+msgstr "অ্যাকাউন্ট: %1$s (%2$s)"
 
 #, c-format
 msgid ""
@@ -189,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 "বন্ধু যোগ"
@@ -234,13 +248,13 @@ msgid "Name"
 msgstr "নাম"
 
 msgid "Alias"
-msgstr "উপনাম"
+msgstr "ডাকনাম"
 
 msgid "Group"
 msgstr "দল"
 
 msgid "Auto-join"
-msgstr "স্বয়ংক্রিয় যোগদান"
+msgstr "স্বয়ংক্রিয়-যোগদান"
 
 msgid "Add Chat"
 msgstr "আড্ডা যোগ"
@@ -250,10 +264,10 @@ 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 "দল যোগ"
@@ -272,7 +286,7 @@ msgid "Edit"
 msgstr "সম্পাদনা"
 
 msgid "Edit Settings"
-msgstr "সেটিং সম্পাদনা"
+msgstr "সেটিংস সম্পাদনা"
 
 msgid "Information"
 msgstr "তথ্য"
@@ -294,37 +308,38 @@ 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 "অপসারণ"
@@ -378,7 +393,7 @@ msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে ব্লক/আনব্লক করতে চান তার ব্যবহারকারী নাম বা উপনাম "
+"অনুগ্রহ করে আপনি যে ব্যক্তিকে ব্লক/আনব্লক করতে চান তার ব্যবহারকারী নাম বা ডাকনাম "
 "দিন।"
 
 #. Not multiline
@@ -392,8 +407,8 @@ msgstr "নতুন বার্তা"
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"অনুগ্রহ করে আপনি যে ব্যাক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান তার ব্যবহারকারী নাম বা "
-"উপনাম দিন।"
+"আপনি যে ব্যক্তিকে তাৎক্ষণিক বার্তা পাঠাতে চান অনুগ্রহ করে তার ব্যবহারকারী নাম বা "
+"ডাকনাম দিন।"
 
 msgid "Channel"
 msgstr "চ্যানেল"
@@ -402,7 +417,7 @@ msgid "Join a Chat"
 msgstr "আড্ডায় যোগদান"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "অনুগ্রহ করে আপনি যে আড্ডায় যোগ দিতে চান তার নাম দিন।"
+msgstr "আপনি যে আড্ডায় যোগ দিতে চান অনুগ্রহ করে তার নাম দিন।"
 
 msgid "Join"
 msgstr "যোগ দিন"
@@ -411,7 +426,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"
@@ -421,7 +437,7 @@ msgid "Send IM..."
 msgstr "IM প্রেরণ..."
 
 msgid "Block/Unblock..."
-msgstr "ব্লক/আনব্লক"
+msgstr "ব্লক/আনব্লক..."
 
 msgid "Join Chat..."
 msgstr "আড্ডায় যোগ..."
@@ -430,7 +446,7 @@ msgid "View Log..."
 msgstr "লগ প্রদর্শন..."
 
 msgid "View All Logs"
-msgstr "লগ প্রদর্শন"
+msgstr "সব লগ প্রদর্শন"
 
 # tithi
 msgid "Show"
@@ -440,19 +456,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 "বন্ধু"
@@ -461,14 +477,14 @@ 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."
@@ -582,7 +598,7 @@ msgstr ""
 "Finch পুনরায় সংযোগ করার চেষ্টা করবে না।"
 
 msgid "Re-enable Account"
-msgstr "একাউন্ট পুনরায় সক্রিয়করণ"
+msgstr "অ্যাকাউন্ট পুনরায় সক্রিয়করণ"
 
 # ***
 msgid "No such command."
@@ -631,8 +647,8 @@ 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 "কথোপকথন সংরক্ষণ করা শুরু হয়েছে। ভবিষ্যতে বার্তা লগ করা হবে।"
@@ -760,7 +776,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 ডিফল্ট হিসেবে সায়ান প্রদান করে"
@@ -827,7 +843,7 @@ msgstr "স্থগিত"
 msgid "Waiting for transfer to begin"
 msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 # mark6
@@ -926,7 +942,7 @@ msgid "Reject"
 msgstr "প্রত্যাখান"
 
 msgid "Call in progress."
-msgstr "কলের অগ্রগতি হচ্ছে"
+msgstr "কলের অগ্রগতি হচ্ছে।"
 
 msgid "The call has been terminated."
 msgstr "কল সমাপ্ত করা হয়েছে।"
@@ -937,19 +953,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 "প্রেরক"
@@ -983,7 +999,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
@@ -1076,7 +1092,7 @@ msgstr "যাকে পাউন্স করা হবে"
 
 #. Account:
 msgid "Account:"
-msgstr "একাউন্ট:"
+msgstr "অ্যাকাউন্ট:"
 
 msgid "Buddy name:"
 msgstr "বন্ধুর নাম:"
@@ -1123,7 +1139,7 @@ msgid "Open an IM window"
 msgstr "IM উইন্ডো খোলা হবে"
 
 msgid "Pop up a notification"
-msgstr "একটি ঘোষণা পপআপ করা হবে"
+msgstr "একটি ঘোষনা পপআপ করা হবে"
 
 msgid "Send a message"
 msgstr "একটি বার্তা পাঠানো হবে"
@@ -1146,11 +1162,11 @@ msgid "Cannot create pounce"
 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?"
@@ -1250,7 +1266,7 @@ msgid "Conversations"
 msgstr "কথোপকথন"
 
 msgid "Logging"
-msgstr "কথোপকথন সংরক্ষন"
+msgstr "কথোপকথন সংরক্ষণ"
 
 msgid "You must fill all the required fields."
 msgstr "আপনাকে সব আবশ্যকীয় ক্ষেত্র পূরণ করতে হবে।"
@@ -1313,6 +1329,10 @@ msgstr "অন্যান্যরা আড্ডায় কথা বলে
 msgid "Someone says your username in chat"
 msgstr "কেউ আড্ডায় আপনার নাম উল্লেখ করে"
 
+# snigdha
+msgid "Attention received"
+msgstr "সতর্কতা গ্রহন"
+
 # tithi
 msgid "GStreamer Failure"
 msgstr "GStreamer ব্যর্থতা"
@@ -1352,7 +1372,7 @@ msgid "Sound Method"
 msgstr "শব্দের নিয়ম"
 
 msgid "Method: "
-msgstr "প্রক্রিয়া:"
+msgstr "মেথড:"
 
 # ***
 #, c-format
@@ -1395,8 +1415,9 @@ msgstr "ফাইল"
 msgid "Test"
 msgstr "পরীক্ষা"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset"
-msgstr "রিসেট"
+msgstr "পুনঃনির্ধারণ"
 
 msgid "Choose..."
 msgstr "বাছাই করুন..."
@@ -1412,12 +1433,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
@@ -1461,11 +1481,11 @@ msgid "Edit Status"
 msgstr "অবস্থা সম্পাদনা"
 
 msgid "Use different status for following accounts"
-msgstr "নিম্নোক্ত একাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে"
+msgstr "নিম্নোক্ত অ্যাকাউন্টসমুহের জন্য ভিন্ন অবস্থা ব্যবহার করা হবে"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "সংরক্ষণ & ব্যবহার"
+msgstr "সংরক্ষণ এবং ব্যবহার"
 
 # tithi
 msgid "Certificates"
@@ -1572,7 +1592,7 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষন থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
+"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষণ থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
 "\n"
 "তাৎক্ষণিক বার্তা বা আড্ডার রেকর্ড শুরু করা হলে আড্ডা ইতিহাস সক্রিয় করা হবে।"
 
@@ -1628,7 +1648,7 @@ msgstr ""
 msgid "Online"
 msgstr "অনলাইন"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফলাইন "
 
@@ -1677,7 +1697,7 @@ msgid "Lastlog plugin."
 msgstr "Lastlog প্লাগইন।"
 
 msgid "accounts"
-msgstr "একাউন্ট"
+msgstr "অ্যাকাউন্ট"
 
 msgid "Password is required to sign on."
 msgstr "লগইনের জন্য পাসওয়ার্ড আবশ্যক।"
@@ -1728,6 +1748,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 "অজানা"
 
@@ -1749,9 +1775,12 @@ msgstr ""
 "সার্টিফিকেটটি বিশ্বাসযোগ্য নয় কারণ যাচাই করার মত কোন বিশ্বাসযোগ্য সার্টিফিকেট "
 "বর্তমানে নেই।"
 
-# Translated by sadia
-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 ""
+"সার্টিফিকেটটি এখনও কার্যকর নয়। আপনার কম্পিউটারের সময় এবং তারিখ ঠিক আছে কিনা "
+"পরীক্ষা করুন।"
 
 # Translated by sadia
 msgid "The certificate has expired and should not be considered valid."
@@ -2011,7 +2040,6 @@ msgstr "%s-কে punycode-এ রূপান্তরে ত্রুটি: %
 msgid "Thread creation failure: %s"
 msgstr "থ্রেড তৈরি করতে ব্যর্থ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "অজানা কারণ"
 
@@ -2043,7 +2071,7 @@ msgid "Directory is not writable."
 msgstr "ডিরেক্টরি লিখনযোগ্য নয়।"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "০ বাইটের কোনো ফাইল পাঠানো সম্ভব নয়।"
+msgstr "0 বাইটের কোনো ফাইল পাঠানো সম্ভব নয়।"
 
 msgid "Cannot send a directory."
 msgstr "ডিরেক্টরি পাঠানো সম্ভব নয়।"
@@ -2572,26 +2600,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 "আপনি কতক্ষণ নিষ্ক্রিয় তা আপনি নিজেই কনফিগার করতে পারবেন"
@@ -2903,7 +2931,7 @@ msgstr "এককালীন পাসওয়ার্ড"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr "এককালীন পাসওয়ার্ড সাপোর্ট"
+msgstr "এককালীন পাসওয়ার্ড সমর্থন"
 
 #. *< name
 #. *< version
@@ -2917,9 +2945,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
@@ -2964,7 +2992,7 @@ msgstr "অন্যত্র থাকলে নিষ্ক্রিয় ক
 
 # mark11
 msgid "Display notification message in conversations"
-msgstr "কথোপকথনে ঘোষণা প্রদর্শিত হবে"
+msgstr "কথোপকথনে ঘোষনা প্রদর্শিত হবে"
 
 # ***
 msgid "Raise psychic conversations"
@@ -3077,7 +3105,7 @@ msgid "%s has signed on."
 msgstr "%s লগইন করেছেন।"
 
 msgid "Notify When"
-msgstr "ঘোষণা দেয়া হবে যখন"
+msgstr "ঘোষনা দেয়া হবে যখন"
 
 msgid "Buddy Goes _Away"
 msgstr "বন্ধু অন্যত্র যায় (_A)"
@@ -3095,7 +3123,7 @@ msgstr "বন্ধু লগইন/লগআউট করে (_S)"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "বন্ধুর অবস্থা ঘোষণা"
+msgstr "বন্ধুর অবস্থা ঘোষনা"
 
 # mark12
 #. *< name
@@ -3148,10 +3176,10 @@ msgid "Email"
 msgstr "ইমেইল"
 
 msgid "AIM Account"
-msgstr "AIM একাউন্ট"
+msgstr "AIM অ্যাকাউন্ট"
 
 msgid "XMPP Account"
-msgstr "XMPP একাউন্ট"
+msgstr "XMPP অ্যাকাউন্ট"
 
 #. *< type
 #. *< ui_requirement
@@ -3237,10 +3265,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 "নিবন্ধন সফলভাবে শেষ হয়েছে!"
@@ -3259,7 +3287,7 @@ msgid "Captcha"
 msgstr "ক্যাপচা"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "নতুন Gadu-Gadu একাউন্ট নিবন্ধন করুন"
+msgstr "নতুন Gadu-Gadu অ্যাকাউন্ট নিবন্ধন করুন"
 
 msgid "Please, fill in the following fields"
 msgstr "অনুগ্রহ করে, নিচের ক্ষেত্রগুলো পূরণ করুন"
@@ -3304,7 +3332,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 "পাসওয়ার্ড সফলভাবে পরিবর্তিত হয়েছে!"
@@ -3359,6 +3387,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 "প্রথম নাম"
 
@@ -3633,7 +3664,7 @@ msgid "Online since"
 msgstr "যতক্ষন অনলাইনে"
 
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>বিশেষন নির্ধারন:</b>"
+msgstr "<b>বিশেষন নির্ধারণ:</b>"
 
 # tithi
 msgid "Glorious"
@@ -3723,8 +3754,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
@@ -3851,7 +3882,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 "
@@ -3871,7 +3902,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 "
@@ -3989,14 +4020,6 @@ 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 "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল-টেক্সট প্রমাণীকরণ প্রয়োজন"
 
@@ -4030,6 +4053,17 @@ 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 এর সরলটেক্সট প্রমাণীকরণ প্রয়োজন হতে পারে। এটি "
+"অনুমোদন করে প্রমাণীকরণ অব্যাহত রাখতে চান?"
+
 # tithi
 msgid "SASL authentication failed"
 msgstr "SASL প্রমাণীকরণ ব্যর্থ"
@@ -4038,6 +4072,41 @@ msgstr "SASL প্রমাণীকরণ ব্যর্থ"
 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 "ব্যবহারকারীর নাম অনুমোদিত করতে ব্যর্থ"
@@ -4106,6 +4175,7 @@ msgstr "এলাকা"
 msgid "Postal Code"
 msgstr "পোস্টাল কোড"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "দেশ"
 
@@ -4120,10 +4190,15 @@ msgstr "সংগঠনের নাম"
 msgid "Organization Unit"
 msgstr "সংগঠনের বিভাগ"
 
+# tithi
+msgid "Job Title"
+msgstr "পদমর্যাদা"
+
 msgid "Role"
 msgstr "ভূমিকা"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "জন্মদিন"
 
@@ -4189,7 +4264,7 @@ msgstr ""
 "%s এরপর থেকে আপনার স্ট্যাটাস আপডেট আর দেখতে পাবে না। আপনি কি অগ্রসর হতে চান?"
 
 msgid "Cancel Presence Notification"
-msgstr "উপস্থিতির ঘোষণা বাতিল"
+msgstr "উপস্থিতির ঘোষনা বাতিল"
 
 # tithi
 msgid "Un-hide From"
@@ -4279,10 +4354,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"
@@ -4349,12 +4424,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 "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। অবশ্যই ডোমেইন নির্ধারণ করতে হবে।"
 
@@ -4406,34 +4493,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 "স্ট্রীম আরম্ভ করা হচ্ছে"
@@ -4455,7 +4542,6 @@ msgstr "সার্ভার ব্লক করা সমর্থন কর�
 msgid "Not Authorized"
 msgstr "অনুমোদিত নয়"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "মনমেজাজ"
 
@@ -4478,11 +4564,10 @@ msgstr "প্রাপক"
 
 # tithi
 msgid "None (To pending)"
-msgstr "কোনটি নয় (প্রাপক অমীমাংসিত)"
+msgstr "কোনোটি নয় (প্রাপক অমীমাংসিত)"
 
-#. 0
 msgid "None"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 #. subscription type
 msgid "Subscription"
@@ -4492,17 +4577,23 @@ msgid "Mood Text"
 msgstr "মনমেজাজের টেক্সট"
 
 msgid "Allow Buzz"
-msgstr "বাজ! অনুমোদন করা হবে"
+msgstr "দৃষ্টি আকর্ষন অনুমোদন করা হবে"
 
-#, fuzzy
+# snigdha
 msgid "Mood Name"
-msgstr "মধ্য নাম"
+msgstr "মুডের নাম"
 
-#, fuzzy
+# snigdha
 msgid "Mood Comment"
-msgstr "বন্ধুর মন্তব্য"
+msgstr "মুড মন্তব্য"
 
 # tithi
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "সুরের শিল্পী"
 
@@ -4696,9 +4787,6 @@ msgstr "নীতিমালা লঙ্ঘন"
 msgid "Remote Connection Failed"
 msgstr "দূরবর্তী সংযোগ ব্যর্থ হয়েছে"
 
-msgid "Resource Constraint"
-msgstr "রিসোর্স সীমাবদ্ধতা"
-
 msgid "Restricted XML"
 msgstr "সীমিত XML"
 
@@ -4716,7 +4804,7 @@ msgid "Unsupported Encoding"
 msgstr "অসমর্থিত এনকোডিং"
 
 msgid "Unsupported Stanza Type"
-msgstr "অসমর্থিত ধরণের স্তবক"
+msgstr "অসমর্থিত ধরনের স্তবক"
 
 # tithi
 msgid "Unsupported Version"
@@ -4760,33 +4848,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 এটি সমর্থন করেন না বা এখন তা গ্রহন করতে ইচ্ছুক নন।"
+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 কে বাজ! দেয়া হচ্ছে..."
+msgstr "দৃষ্টি আকর্ষন করা হচ্ছে %s..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4819,9 +4908,9 @@ msgstr "একটি রিসোর্স নির্বাচন করুন
 msgid "Initiate Media"
 msgstr "মিডিয়া শুরু করুন"
 
-#, fuzzy
+# snigdhaসেট এর জায়গায় নির্ধারণ
 msgid "Account does not support PEP, can't set mood"
-msgstr "এই প্রোটোকল আড্ডার আসর সমর্থন করে না।"
+msgstr "অ্যাকাউন্টটি PEP সমর্থন করেনা, মুড নির্ধারন করতে পারছেনা"
 
 msgid "config:  Configure a chat room."
 msgstr "config: একটি আড্ডার আসর কনফিগার করে।"
@@ -4885,11 +4974,11 @@ msgstr ""
 
 # tithi
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: ব্যবহারকারীর মনযোগ পেতে বাজ! ব্যবহার করুন"
+msgstr "দৃষ্টি আকর্ষন: ব্যবহারকারীর মনোযোগ পেতে \"দৃষ্টি আকর্ষন\" ব্যবহার করুন"
 
-#, fuzzy
+# snigdha সেট এর জায়গায় নির্ধারণ
 msgid "mood: Set current user mood"
-msgstr "সঠিক ব্যবহারকারী নির্বাচন"
+msgstr "মুড: বর্তমান ব্যবহারকারীর মুড নির্ধারণ করুন"
 
 # tithi
 msgid "Extended Away"
@@ -4975,14 +5064,17 @@ msgstr "(কোড %s)"
 msgid "A custom smiley in the message is too large to send."
 msgstr "বার্তার ভিতর স্বনির্বাচিত স্মাইলিটি পাঠানোর জন্য খুবই বড়।"
 
+# snigdha
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP স্ট্রীমের শীর্ষচরণ অনুপস্থিত"
 
+# snigdha
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP সংস্করণ এ অমিল"
 
+# snigdha
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP স্ট্রীমে অনুপস্থিত ID"
 
 # tithi
 msgid "XML Parse error"
@@ -5014,7 +5106,7 @@ msgid "_Accept Defaults"
 msgstr "পূর্বনির্ধারিত বিন্যাস গ্রহণ করা হবে (_A)"
 
 msgid "No reason"
-msgstr "কোনো কারন নেই"
+msgstr "কোনো কারণ নেই"
 
 # Kick =  তিরস্কার
 # OR  পদাঘাত
@@ -5063,341 +5155,334 @@ msgstr "%s এ ফাইল পাঠাতে ব্যর্থ, ব্যব�
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "অনুগ্রহ করে %s এর একটি রিসোর্স নির্বাচন করুন যাতে আপনি ফাইল পাঠাতে চান"
 
-#, fuzzy
+# snigdha
 msgid "Afraid"
-msgstr "আরবী"
+msgstr "ভীত"
 
-#, fuzzy
+# snigdha
 msgid "Amazed"
-msgstr "লজ্জিত"
+msgstr "আশ্চর্যান্বিত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Amorous"
-msgstr "চমৎকার"
+msgstr "প্রণয়শীল"
 
-#. 1
+# snigdha
 msgid "Angry"
-msgstr "রাগী"
+msgstr "রাগান্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Annoyed"
-msgstr "নিষিদ্ধ করা হয়েছে"
+msgstr "বিরক্ত"
 
 msgid "Anxious"
 msgstr "উদ্বিগ্ন"
 
-#, fuzzy
+# snigdha
 msgid "Aroused"
-msgstr "আপনি পাঠান"
+msgstr "ফুটিয়ে তোলা"
 
+# snigdha
 msgid "Ashamed"
 msgstr "লজ্জিত"
 
 msgid "Bored"
 msgstr "বিরক্ত"
 
-#, fuzzy
+# snigdha
 msgid "Brave"
-msgstr "সংরক্ষণ"
+msgstr "সাহসী"
 
-#, fuzzy
+# snigdha
 msgid "Calm"
-msgstr "এলাকা"
+msgstr "শান্ত"
 
-#, fuzzy
+# snigdha
 msgid "Cautious"
-msgstr "আড্ডা"
+msgstr "সতর্ক"
 
-#, fuzzy
+# snigdha
 msgid "Cold"
-msgstr "গাঢ়"
+msgstr "শীতল"
 
-#, fuzzy
+# snigdha
 msgid "Confident"
-msgstr "দ্বন্দ্ব"
+msgstr "নিশ্চিত"
 
-#, fuzzy
+# snigdha
 msgid "Confused"
-msgstr "পরবর্তী"
+msgstr "দ্বিধান্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Contemplative"
-msgstr "পরিচিতি"
+msgstr "চিন্তাশীল"
 
-#, fuzzy
 msgid "Contented"
 msgstr "সংযুক্ত"
 
-#, fuzzy
+# snigdha
 msgid "Cranky"
-msgstr "কোম্পানী"
+msgstr "রগচটা"
 
+# snigdha
 msgid "Crazy"
-msgstr ""
+msgstr "দিশেহারা"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Creative"
-msgstr "তৈরি"
+msgstr "সৃজনশীল"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Curious"
-msgstr "চমৎকার"
+msgstr "কৌতুহলী"
 
-# Translated by sadia
-#, fuzzy
+# Translated by snigdha
 msgid "Dejected"
-msgstr "প্রত্যাখ্যান করা হয়েছে"
+msgstr "বিমর্ষ"
 
-# Translated by sadia
-#, fuzzy
+# Translated by snigdha
 msgid "Depressed"
-msgstr "মুছে ফেলা হয়েছে"
+msgstr "হতাশাগ্রস্থ"
 
-#, fuzzy
+# snigdha
 msgid "Disappointed"
-msgstr "বিচ্ছিন্ন।"
+msgstr "নিরাশ"
 
+# snigdha
 msgid "Disgusted"
-msgstr ""
+msgstr "বিরক্ত"
 
-# Translated by sadia
-#, fuzzy
+# Translated by snigdha
 msgid "Dismayed"
-msgstr "নিষ্ক্রিয় করা হয়েছে"
+msgstr "আতংকিত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Distracted"
-msgstr "আলাদা"
+msgstr "বিক্ষিপ্ত"
 
+# snigdha
 msgid "Embarrassed"
-msgstr ""
+msgstr "লজ্জিত"
 
-#, fuzzy
+# snigdha
 msgid "Envious"
-msgstr "উদ্বিগ্ন"
+msgstr "ঈর্ষান্বিত"
 
-#. 2
+# snigdha
 msgid "Excited"
-msgstr "উদ্দীপ্ত"
+msgstr "উত্তেজিত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Flirtatious"
 msgstr "চমৎকার"
 
-#, fuzzy
+# snigdha
 msgid "Frustrated"
-msgstr "প্রথম নাম"
+msgstr "আশাহীন"
 
+# snigdha
 msgid "Grateful"
-msgstr ""
+msgstr "কৃতজ্ঞ"
 
-#, fuzzy
+# snigdha
 msgid "Grieving"
-msgstr "খুঁজে আনা হচ্ছে..."
+msgstr "শোকান্বিত"
 
 # Translated by sadia
-#. 3
 msgid "Grumpy"
 msgstr "রাগান্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Guilty"
-msgstr "শহর"
+msgstr "দোষী"
 
-#. 4
 msgid "Happy"
 msgstr "সুখী"
 
+# snigdha
 msgid "Hopeful"
-msgstr ""
+msgstr "আশান্বিত"
 
 # Translated by sadia
-#. 8
 msgid "Hot"
 msgstr "উত্তেজিত"
 
+# snigdha
 msgid "Humbled"
-msgstr ""
+msgstr "বিনীত"
 
+# snigdha
 msgid "Humiliated"
-msgstr ""
+msgstr "অপমানিত"
 
-#, fuzzy
+# snigdha
 msgid "Hungry"
-msgstr "রাগী"
+msgstr "ক্ষুধার্ত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Hurt"
-msgstr "হাস্যরস"
+msgstr "আঘাত করা"
 
+# Translated by snigdha
 msgid "Impressed"
-msgstr ""
+msgstr "মুগ্ধ"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "In awe"
 msgstr "প্রেমময়"
 
 msgid "In love"
 msgstr "প্রেমময়"
 
-#, fuzzy
+# snigdha
 msgid "Indignant"
-msgstr "ইন্ডোনেশিয়"
+msgstr "রাগান্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Interested"
-msgstr "আগ্রহ"
+msgstr "আগ্রহী"
 
-# Translated by sadia
-#, fuzzy
+# Translated by snigdha
 msgid "Intoxicated"
-msgstr "আমন্ত্রণ জানানো হয়েছে"
+msgstr "মাতাল"
 
 # tithi
-#. 6
 msgid "Invincible"
 msgstr "অজেয়"
 
 msgid "Jealous"
 msgstr "ঈর্ষান্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Lonely"
-msgstr "বানর"
+msgstr "একা"
 
-#, fuzzy
+# snigdha
 msgid "Lost"
-msgstr "সবচেয়ে জোরে"
+msgstr "নিখোঁজ"
 
+# snigdha
 msgid "Lucky"
-msgstr ""
+msgstr "সৌভাগ্যবান"
 
-#, fuzzy
+# snigdha
 msgid "Mean"
-msgstr "জার্মান"
+msgstr "হীনমর্যাদা সম্পন্ন"
 
-#, fuzzy
 msgid "Moody"
-msgstr "মনমেজাজ"
+msgstr "গম্ভীর"
 
+# snigdha
 msgid "Nervous"
-msgstr ""
+msgstr "উদ্বিগ্ন"
 
-#, fuzzy
+# snigdha
 msgid "Neutral"
-msgstr "বিস্তারিত"
+msgstr "নিরপেক্ষ"
 
-#, fuzzy
+# snigdha
 msgid "Offended"
-msgstr "অফলাইন "
+msgstr "অপমানিত"
 
+# snigdha
 msgid "Outraged"
-msgstr ""
+msgstr "নির্মম"
 
-#, fuzzy
 msgid "Playful"
-msgstr "বাজানো হবে"
+msgstr "খেলুড়ে"
 
-#, fuzzy
+# snigdha
 msgid "Proud"
-msgstr "জোরে"
+msgstr "গর্বিত"
 
-#, fuzzy
+# snigdha
 msgid "Relaxed"
-msgstr "আসল নাম"
+msgstr "নিশ্চিন্ত"
 
-#, fuzzy
+# snigdha
 msgid "Relieved"
-msgstr "গৃহীত"
+msgstr "দুশ্চিন্তামুক্ত"
 
-#, fuzzy
+# snigdha
 msgid "Remorseful"
-msgstr "অপসারণ"
+msgstr "দুঃখ ভারাক্রান্ত"
 
-#, fuzzy
+# snigdha
 msgid "Restless"
-msgstr "নিবন্ধন"
+msgstr "অস্থির"
 
-#. 7
 msgid "Sad"
 msgstr "দুঃখী"
 
-#, fuzzy
+# snigdha
 msgid "Sarcastic"
-msgstr "মারাঠি"
+msgstr "শ্লেষাত্মক"
 
+# snigdha
 msgid "Satisfied"
-msgstr ""
+msgstr "তৃপ্ত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Serious"
-msgstr "চমৎকার"
+msgstr "আন্তরিক"
 
 # Samia: Complete
-#, fuzzy
 msgid "Shocked"
-msgstr "ব্লক করা"
+msgstr "আতংকিত"
 
+# snigdha
 msgid "Shy"
-msgstr ""
+msgstr "লজ্জিত"
 
 # Translated by sadia
-#. 9
 msgid "Sick"
 msgstr "অসুস্থ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ঘুমন্ত"
 
+# snigdha
 msgid "Spontaneous"
-msgstr ""
+msgstr "স্বতঃস্ফুর্ত"
 
-#, fuzzy
+# snigdha
 msgid "Stressed"
-msgstr "গতি"
+msgstr "পীড়িত"
 
-#, fuzzy
 msgid "Strong"
-msgstr "গান"
+msgstr "শক্তিশালী"
 
+# snigdha
 msgid "Surprised"
-msgstr ""
+msgstr "অবাক"
 
+# snigdha
 msgid "Thankful"
-msgstr ""
+msgstr "কৃতজ্ঞ"
 
+# snigdha
 msgid "Thirsty"
-msgstr ""
+msgstr "তৃঞ্চার্ত"
 
-#, fuzzy
+# snigdha
 msgid "Tired"
-msgstr "Fire"
+msgstr "ক্লান্ত"
 
-#, fuzzy
+# snigdha
 msgid "Undefined"
-msgstr "নিম্নরেখা"
+msgstr "অনির্ধারিত"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Weak"
-msgstr "ঘুষি"
+msgstr "দুর্বল"
 
-#, fuzzy
+# snigdha
 msgid "Worried"
-msgstr "বিরক্ত"
+msgstr "চিন্তিত"
 
 msgid "Set User Nickname"
-msgstr "ব্যবহারকারীর ডাকনাম নির্ধারন"
+msgstr "ব্যবহারকারীর ডাকনাম নির্ধারণ "
 
 msgid "Please specify a new nickname for you."
 msgstr "অনুগ্রহ করে আপনার জন্য নতুন ডাকনাম দিন।"
@@ -5410,7 +5495,7 @@ msgstr ""
 "এই তথ্যটি আপনার পরিচিতি তালিকার সব বন্ধুর কাছে দৃশ্যমান, সুতরাং উপযুক্ত কিছু পছন্দ করুন।"
 
 msgid "Set"
-msgstr "নির্ধারন করুন"
+msgstr "নির্ধারণ করুন"
 
 msgid "Set Nickname..."
 msgstr "ডাকনাম নির্ধারণ..."
@@ -5523,7 +5608,7 @@ msgid "Switchboard failed"
 msgstr "সুইচবোর্ড ব্যর্থ হয়েছে"
 
 msgid "Notify transfer failed"
-msgstr "স্থানান্তরের ঘোষণা ব্যর্থ হয়েছে"
+msgstr "স্থানান্তরের ঘোষনা ব্যর্থ হয়েছে"
 
 # tithi
 msgid "Required fields missing"
@@ -5635,11 +5720,11 @@ msgstr "অভিভাবক অনুমোদন ব্যতীত শিশ
 
 # tithi
 msgid "Passport account not yet verified"
-msgstr "এখনও পাসপোর্ট একাউন্ট পরীক্ষা করা হয়নি"
+msgstr "এখনও পাসপোর্ট অ্যাকাউন্ট পরীক্ষা করা হয়নি"
 
 # tithi
 msgid "Passport account suspended"
-msgstr "পাসপোর্ট একাউন্ট স্থগিত"
+msgstr "পাসপোর্ট অ্যাকাউন্ট স্থগিত"
 
 msgid "Bad ticket"
 msgstr "ত্রুটিযুক্ত টিকেট"
@@ -5754,7 +5839,7 @@ msgstr "%s এর জন্য ব্লককৃত টেক্সট"
 
 # tithi
 msgid "No text is blocked for this account."
-msgstr "এই একাউন্টটির জন্য কোনো টেক্সট ব্লক করা নেই।"
+msgstr "এই অ্যাকাউন্টটির জন্য কোনো টেক্সট ব্লক করা নেই।"
 
 # tithi
 #, c-format
@@ -5764,7 +5849,7 @@ msgstr "MSN সার্ভার বর্তমানে নিম্নলি
 
 # tithi
 msgid "This account does not have email enabled."
-msgstr "এই একাউন্টটির কোন ইমেইল সক্রিয় নেই।"
+msgstr "এই অ্যাকাউন্টটির কোন ইমেইল সক্রিয় নেই।"
 
 msgid "Send a mobile message."
 msgstr "মোবাইল বার্তা পাঠান।"
@@ -5804,18 +5889,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 "খেলার শিরোনাম"
 
@@ -5975,10 +6048,6 @@ msgstr "বার্ষিকী"
 msgid "Work"
 msgstr "কাজ"
 
-# tithi
-msgid "Job Title"
-msgstr "পদমর্যাদা"
-
 msgid "Company"
 msgstr "কোম্পানী"
 
@@ -6022,7 +6091,7 @@ msgid "Last Updated"
 msgstr "সর্বশেষ হালনাগাদ করা"
 
 msgid "Homepage"
-msgstr "হোমপেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "The user has not created a public profile."
 msgstr "ব্যবহারকারী কোনো পাবলিক প্রোফাইল তৈরী করেনি।"
@@ -6068,6 +6137,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: ব্যবহারকারীদের মনোযোগ পেতে তাদেরকে ধাক্কা দিন"
@@ -6249,7 +6322,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 ""
@@ -6261,7 +6334,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 "একটি অজানা ত্রুটির সংঘটিত হওয়ার কারণে সম্ভবত বার্তা পাঠানো যায়নি:"
@@ -6276,29 +6349,6 @@ msgid "The username specified is invalid."
 msgstr "উল্লেখিত ব্যবহারকারীর নামটি অকার্যকর।"
 
 # tithi
-#. 5
-msgid "In Love"
-msgstr "প্রেমময়"
-
-# Translated by sadia
-#. show current mood
-msgid "Current Mood"
-msgstr "আপনার বর্তমান মেজাজ"
-
-# Translated by sadia
-#. add all moods to list
-msgid "New Mood"
-msgstr "নতুন মেজাজ"
-
-# Translated by sadia
-msgid "Change your Mood"
-msgstr "আপনার মেজাজ পরিবর্তন করুন"
-
-# Translated by sadia
-msgid "How do you feel right now?"
-msgstr "এই মূহুর্তে আপনি কেমন বোধ করছেন?"
-
-# tithi
 #
 #
 # Translated by sadia
@@ -6348,8 +6398,13 @@ msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 "আপনার প্রোফাইলের তথ্য এখনও খুঁজে পাওয়া যায়নি। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
+# snigdha
+msgid "Your UID"
+msgstr "আপনার UID"
+
 # Translated by sadia
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6359,6 +6414,7 @@ msgstr "PIN যাচাই করা হবে"
 
 # Translated by sadia
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "নাম প্রদর্শন করা হবে"
 
@@ -6393,11 +6449,6 @@ msgid "About"
 msgstr "পরিচিতি"
 
 # Translated by sadia
-#. display / change mood
-msgid "Change Mood..."
-msgstr "মেজাজ পরিবর্তন করা হবে..."
-
-# Translated by sadia
 #. display / change profile
 msgid "Change Profile..."
 msgstr "প্রোফাইল পরিবর্তন করা হবে..."
@@ -6441,10 +6492,9 @@ msgstr "সংযুক্ত করা হচ্ছে..."
 # tithi
 #
 #
-#
 # Translated by sadia
-msgid "The nick name you entered is invalid."
-msgstr "আপনি যে ডাকনামটি প্রবেশ করিয়েছেন তা অকার্যকর।"
+msgid "The Display Name you entered is invalid."
+msgstr "আপনি যে নাম প্রবেশ করেছেন তা অকার্যকর।"
 
 # tithi
 #
@@ -6455,20 +6505,14 @@ msgstr "আপনি যে ডাকনামটি প্রবেশ কর�
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "আপনি যে PIN প্রবেশ করিয়েছেন তার দৈর্ঘ্য অকার্যকর [৭-১০]।"
 
-# Translated by sadia
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-এ লগ ইন করার নাম"
-
-# Translated by sadia
-#. nick name
-msgid "Nick Name"
-msgstr "ডাকনাম "
+msgid "MXit ID"
+msgstr "MXit ID"
 
 # Translated by sadia
 #. show the form to the user to complete
 msgid "Register New MXit Account"
-msgstr "নতুন MXit একাউন্টে নিবন্ধন করা হবে"
+msgstr "নতুন MXit অ্যাকাউন্টে নিবন্ধন করা হবে"
 
 # Translated by sadia
 msgid "Please fill in the following fields:"
@@ -6500,14 +6544,14 @@ msgid "Invalid country selected. Please try again."
 msgstr "অকার্যকর দেশ নির্বাচন করা হয়েছে। অনুগ্রহ করে আবার চেষ্টা করুন।"
 
 # Translated by sadia
-msgid "Username is not registered. Please register first."
-msgstr "ব্যবহারকারীর নাম নিবন্ধন করা নেই। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "আপনি যে MXit ID দিয়েছেন তা নিবন্ধন করা নেই। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
 
 # Translated by sadia
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
-"ব্যবহারকারীর নাম ইতিমধ্যেই নিবন্ধন করা হয়েছে। অনুগ্রহ করে অন্য ব্যবহারকারী নাম "
-"নির্বাচন করুন।"
+"আপনার দেয়া MXit ID ইতিমধ্যেই নিবন্ধন করা হয়েছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 # tithi
 #
@@ -6526,7 +6570,7 @@ msgid "Security Code"
 msgstr "নিরাপত্তা কোড"
 
 # Translated by sadia
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "নিরাপত্তা কোড দিন"
 
@@ -6549,7 +6593,7 @@ msgstr "MXit অনুমোদন  "
 
 # Translated by sadia
 msgid "MXit account validation"
-msgstr "MXit একাউন্টের কার্যকারীতা"
+msgstr "MXit অ্যাকাউন্টের কার্যকারীতা"
 
 # Translated by sadia
 msgid "Retrieving User Information..."
@@ -6563,13 +6607,18 @@ msgstr "মেনু লোড করা হচ্ছে..."
 msgid "Status Message"
 msgstr "স্ট্যাটাস বার্তা"
 
+# snigdha
+msgid "Rejection Message"
+msgstr "প্রত্যাখ্যান বার্তা"
+
 # Translated by sadia
+#. hidden number
 msgid "Hidden Number"
 msgstr "লুকানো সংখ্যা"
 
-# Translated by sadia
-msgid "Your Mobile Number..."
-msgstr "আপনার মোবাইল নাম্বার..."
+# snigdha
+msgid "Your MXit ID..."
+msgstr "আপনার MXit ID..."
 
 # Translated by sadia
 #. Configuration options
@@ -6585,6 +6634,25 @@ msgstr "HTTP-র মাধ্যমে সংযুক্ত করা হবে
 msgid "Enable splash-screen popup"
 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."
@@ -6724,6 +6792,10 @@ msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit-তে একটি সংযোগ ত্রুটি দেখা দিয়েছে। (stage 0x06 পড়ুন)"
 
+# tithi
+msgid "In Love"
+msgstr "প্রেমময়"
+
 # Translated by sadia
 msgid "Pending"
 msgstr "মূলতবি রয়েছে"
@@ -6905,11 +6977,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"
@@ -6961,7 +7033,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!"
@@ -7171,11 +7243,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 "সার্ভার ডিরেক্টরিতে প্রবেশ করতে পারে না"
@@ -7204,7 +7273,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 "আপনি একটি কথোপকথনে একই ব্যক্তিকে দুইবার যোগ করতে পারেন না"
@@ -7307,9 +7377,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)."
@@ -7444,113 +7515,197 @@ msgstr ""
 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 অনুরোধে ত্রুটি"
+
 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 ""
+msgstr "চিন্তা করছে"
 
-#, fuzzy
+# snigdha
 msgid "Shopping"
-msgstr "টাইপ বন্ধ করে"
+msgstr "কেনাকাটা"
 
-#, fuzzy
+# snigdha
 msgid "Questioning"
-msgstr "জিজ্ঞাসা ডায়ালগ"
+msgstr "জিজ্ঞাসা করা হচ্ছে"
 
-#, fuzzy
+# snigdha
 msgid "Eating"
-msgstr "পেজিং"
+msgstr "খাচ্ছে"
 
-#, fuzzy
+# snigdha
 msgid "Watching a movie"
-msgstr "একটি খেলা খেলছে"
+msgstr "চলচিত্র দেখছে"
 
 msgid "Typing"
 msgstr "টাইপ করছে"
 
-#, fuzzy
+# snigdha
 msgid "At the office"
-msgstr "অফিসে নেই"
+msgstr "অফিসে"
 
+# snigdha
 msgid "Taking a bath"
-msgstr ""
+msgstr "গোছল করছে"
 
+# snigdha
 msgid "Watching TV"
-msgstr ""
+msgstr "টেলিভিশন দেখছে"
 
-#, fuzzy
+# snigdha
 msgid "Having fun"
-msgstr "কল শেষ করুন"
+msgstr "মজা করছে"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "ঘুমন্ত"
+msgstr "ঘুমাচ্ছে"
 
+# snigdha
 msgid "Using a PDA"
-msgstr ""
+msgstr "PDA ব্যবহার করছে"
 
-#, fuzzy
+# snigdha
 msgid "Meeting friends"
-msgstr "IM বন্ধু"
+msgstr "বন্ধুদের সাথে দেখা করছে"
 
-#, fuzzy
+# snigdha
 msgid "On the phone"
-msgstr "ফোনে কথা বলছি"
+msgstr "ফোনে কথা বলছে"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Surfing"
-msgstr "পুনরাবৃত্ত"
+msgstr "খোঁজ করছে"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "মোবাইল"
 
+# snigdha
 msgid "Searching the web"
-msgstr ""
+msgstr "ওয়েবটি খুঁজছে"
 
+# snigdha
 msgid "At a party"
-msgstr ""
+msgstr "পার্টিতে"
 
+# snigdha
 msgid "Having Coffee"
-msgstr ""
+msgstr "কফি পান করছি"
 
+# snigdha
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "মিথুন রাশি"
+msgstr "খেলছি"
 
+# snigdha
 msgid "Browsing the web"
-msgstr ""
+msgstr "ওয়েব ব্রাউজ করছি"
 
-#, fuzzy
+# snigdha
 msgid "Smoking"
-msgstr "গান"
+msgstr "ধুমপান করছি"
 
-#, fuzzy
+# snigdha
 msgid "Writing"
-msgstr "কাজ করছে"
+msgstr "লিখছি"
 
+# snigdha
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "কাজ করছে"
+msgstr "পান করছি"
 
 # tithi
 msgid "Listening to music"
 msgstr "গান শুনছি"
 
-#, fuzzy
+# snigdha
 msgid "Studying"
-msgstr "পাঠানো হচ্ছে"
+msgstr "পড়ছি"
 
-#, fuzzy
+# snigdha
 msgid "In the restroom"
-msgstr "আগ্রহ"
+msgstr "বিশ্রামাগারে আছে"
 
 msgid "Received invalid data on connection with server"
 msgstr "সার্ভারের সাথে সংযোগের সময় অকার্যকর ডাটা গৃহীত হয়ে‌ছে"
@@ -7625,146 +7780,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 এ থাকা অবস্থায় নয়"
-
-# 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 "অফলাইন বার্তার সংগ্রহস্থল পূর্ণ"
-
 # tithi
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7774,7 +7789,7 @@ msgid ""
 msgstr ""
 "(এই বার্তাটি গ্রহণে ত্রুটি হয়েছে। আপনি যে বন্ধুর সঙ্গে কথা বলছেন তিনি সম্ভবত ভিন্ন "
 "একটি এনকোডিং ব্যবহার করছেন। যদি আপনি জানেন তিনি কি এনকোডিং ব্যবহার করছেন, আপনি "
-"আপনার AIM/ICQ একাউন্টের উচ্চপর্যায়ের অপশনে তা উল্লেখ করতে পারেন।)"
+"আপনার AIM/ICQ অ্যাকাউন্টের উচ্চপর্যায়ের অপশনে তা উল্লেখ করতে পারেন।)"
 
 # tithi
 #, c-format
@@ -7803,8 +7818,10 @@ msgstr "ফাইল সংগ্রহ"
 msgid "Games"
 msgstr "খেলা"
 
+# snigdha
+#
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "এ্যাড-ইন"
@@ -7881,24 +7898,23 @@ msgstr "ওয়েব সচেতন"
 msgid "Invisible"
 msgstr "অদৃশ্য"
 
-#, fuzzy
+# snigdha
 msgid "Evil"
-msgstr "ইমেইল"
+msgstr "পাপী"
 
-#, fuzzy
+# snigdha
 msgid "Depression"
-msgstr "পেশা"
+msgstr "হতাশা"
 
-#, fuzzy
+# snigdha
 msgid "At home"
-msgstr "আমার সম্পর্কে"
+msgstr "বাসায়"
 
-#, fuzzy
+# snigdha
 msgid "At work"
-msgstr "নেটওয়ার্ক"
+msgstr "কাজে"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "At lunch"
 msgstr "দুপুরে খাওয়ার জন্য বাইরে"
 
@@ -7967,7 +7983,7 @@ msgstr "ব্যবহারকারীর নাম বিদ্যমান
 # tithi
 #. Suspended account
 msgid "Your account is currently suspended"
-msgstr "আপনার একাউন্টটি সাময়িকভাবে বরখাস্ত করা হয়েছে"
+msgstr "আপনার অ্যাকাউন্টটি সাময়িকভাবে বরখাস্ত করা হয়েছে"
 
 # tithi
 #. service temporarily unavailable
@@ -7995,7 +8011,7 @@ msgstr ""
 #. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "আপনার ব্যবহৃত ক্লায়েন্ট সংস্করণটি খুব পুরনো। অনুগ্রহ করে %s এ হালনাহাদ করুন"
+msgstr "আপনার ব্যবহৃত ক্লায়েন্ট সংস্করণটি খুব পুরনো। অনুগ্রহ করে %s এ হালনাগাদ করুন"
 
 # tithi
 #
@@ -8039,7 +8055,7 @@ msgstr ""
 "অনুগ্রহ করে আমাকে অনুমোদন দিন যেন আমি আপনাকে আমার বন্ধু তালিকায় যুক্ত করতে পারি।"
 
 msgid "No reason given."
-msgstr "কোনো কারন দর্শানো হয়নি।"
+msgstr "কোনো কারণ দর্শানো হয়নি।"
 
 # tithi
 msgid "Authorization Denied Message:"
@@ -8076,8 +8092,8 @@ msgid ""
 msgstr ""
 "আপনি একটি বিশেষ বার্তা গ্রহণ করেছেন\n"
 "\n"
-"প্রেরক: %1$s [%2$s]\n"
-"%3$s "
+"প্রেরক: %s [%s]\n"
+"%s"
 
 # tithi
 #, c-format
@@ -8166,32 +8182,10 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
 msgstr[1] "আপনি অজ্ঞাত কারণে %2$s থেকে %1$huটি বার্তা হারিয়েছেন।"
 
-# 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"
-
 #, c-format
 msgid "User information not available: %s"
 msgstr "ব্যবহারকারীর তথ্য পাওয়া যাচ্ছে না: %s"
 
-msgid "Unknown reason."
-msgstr "অজ্ঞাত কারণ।"
-
 msgid "Online Since"
 msgstr "যখন থেকে অনলাইনে"
 
@@ -8272,7 +8266,7 @@ msgstr "আপনি %s নিশ্চিত করতে একটি ইম�
 
 # tithi
 msgid "Account Confirmation Requested"
-msgstr "একাউন্ট নিশ্চিতকরণ অনুরোধ করা হয়েছে"
+msgstr "অ্যাকাউন্ট নিশ্চিতকরণ অনুরোধ করা হয়েছে"
 
 # tithi
 #, c-format
@@ -8328,7 +8322,7 @@ msgstr "ত্রুটি 0x%04x: অজানা ত্রুটি।"
 
 # tithi
 msgid "Error Changing Account Info"
-msgstr "একাউন্ট তথ্য পরিবর্তনের ত্রুটি"
+msgstr "অ্যাকাউন্ট তথ্য পরিবর্তনের ত্রুটি"
 
 # tithi
 #, c-format
@@ -8336,7 +8330,7 @@ msgid "The email address for %s is %s"
 msgstr "%1$s এর ইমেইল ঠিকানা %2$s"
 
 msgid "Account Info"
-msgstr "একাউন্ট তথ্য"
+msgstr "অ্যাকাউন্ট তথ্য"
 
 # tithi
 msgid ""
@@ -8485,9 +8479,9 @@ msgstr "আপনার IM চিত্র পাঠানো হয়নি।
 msgid "iTunes Music Store Link"
 msgstr "iTunes সঙ্গীত স্টোরের লিংক "
 
-#, fuzzy
+# snigdha
 msgid "Lunch"
-msgstr "Finch"
+msgstr "দুপুরের খাবার"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -8523,9 +8517,9 @@ msgid "Edit Buddy Comment"
 msgstr "বন্ধুর মন্তব্য সম্পাদন"
 
 # mark30
-#, fuzzy
+# snigdha
 msgid "Get X-Status Msg"
-msgstr "অবস্থার বার্তা খুঁজুন"
+msgstr "স্ট্যাটাস-X সম্পর্কিত বার্তা দেখুন"
 
 # Translated by sadia
 msgid "End Direct IM Session"
@@ -8533,7 +8527,7 @@ msgstr "সরাসরি IM সেশন সমাপ্ত করা হব�
 
 # tithi
 msgid "Direct IM"
-msgstr "Direct IM"
+msgstr "ডিরেক্ট IM"
 
 # tithi
 msgid "Re-request Authorization"
@@ -8547,8 +8541,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 "নতুন বিন্যাসটি অকার্যকর।"
@@ -8603,13 +8598,14 @@ msgstr "পাসওয়ার্ড পরিবর্তন (ওয়েব)"
 msgid "Configure IM Forwarding (web)"
 msgstr "IM ফরওয়ার্ডিং কনফিগারেশন (ওয়েব)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "গোপনতার অপশন নির্ধারণ ..."
+msgstr "গোপনীয়তার অপশন নির্ধারণ ..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "একাউন্ট নিশ্চিতকরণ"
+msgstr "অ্যাকাউন্ট নিশ্চিতকরণ"
 
 # tithi
 msgid "Display Currently Registered Email Address"
@@ -8666,13 +8662,99 @@ 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 এ থাকা অবস্থায় নয়"
 
 # tithi
 msgid "Aquarius"
@@ -8931,7 +9013,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
@@ -8984,6 +9066,11 @@ msgstr "অনুরোধ করা হচ্ছে"
 msgid "Admin"
 msgstr "প্রশাসক"
 
+# snigdha
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "আসরের শিরোনাম"
+
 msgid "Notice"
 msgstr "বিজ্ঞপ্তি"
 
@@ -9047,7 +9134,7 @@ msgstr ""
 
 # tithi
 msgid "Sorry, you are not our style"
-msgstr "দুঃখিত,আপনি আমাদের ধাঁচের  নন"
+msgstr "দুঃখিত,আপনি আমাদের ধাঁচের নন"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun সদস্যদের সফলভাবে পরিবর্তন করা হয়েছে"
@@ -9239,7 +9326,7 @@ msgid "Change Password"
 msgstr "পাসওয়ার্ড পরিবর্তন"
 
 msgid "Account Information"
-msgstr "একাউন্ট তথ্য"
+msgstr "অ্যাকাউন্ট তথ্য"
 
 # tithi
 msgid "Update all QQ Quns"
@@ -9401,13 +9488,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:"
@@ -9519,16 +9606,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"
@@ -9617,7 +9704,7 @@ msgstr "অধিবেশনে আমন্ত্রন..."
 
 # tithi
 msgid "Send TEST Announcement"
-msgstr "পরীক্ষমূলক ঘোষণা প্রেরণ"
+msgstr "পরীক্ষামূলক ঘোষনা প্রেরণ"
 
 msgid "Topic:"
 msgstr "বিষয়:"
@@ -9632,7 +9719,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
@@ -9722,12 +9809,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"
@@ -9954,7 +10041,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.
@@ -10037,8 +10124,9 @@ msgid "Geolocation"
 msgstr "ভৌগলিক-অবস্থান"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset IM Key"
-msgstr "IM কী রিসেট করা হবে"
+msgstr "IM কী পুনঃনির্ধারণ করা হবে"
 
 # tithi
 msgid "IM with Key Exchange"
@@ -10176,7 +10264,7 @@ msgstr "ব্যবহারকারীর সীমা"
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "চ্যানেলে ব্যবহারকারীর সীমা নির্ধারণ করুন। ব্যবহারকারী সীমা পুনঃ বিন্যাস করতে শূন্য "
-"নির্ধারন করুন।"
+"নির্ধারণ করুন।"
 
 msgid "Invite List"
 msgstr "আমন্ত্রন তালিকা"
@@ -10188,24 +10276,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 "ব্যক্তিগত চ্যানেল পুনঃনির্ধারণ করুন"
 
@@ -10213,7 +10303,7 @@ msgstr "ব্যক্তিগত চ্যানেল পুনঃনির�
 msgid "Set Private Channel"
 msgstr "ব্যক্তিগত চ্যানেল নির্ধারণ"
 
-# tithi
+# tithiরিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Secret Channel"
 msgstr "গোপন চ্যানেল পুনঃনির্ধারণ"
 
@@ -11142,9 +11232,6 @@ msgstr "ইয়াহু ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ইয়াহু! প্রোটোকল প্লাগইন"
 
-msgid "Pager server"
-msgstr "পেইজার সার্ভার"
-
 msgid "Pager port"
 msgstr "পেইজার পোর্ট"
 
@@ -11162,18 +11249,12 @@ msgid "Ignore conference and chatroom invitations"
 msgstr "অধিবেশন এবং আড্ডার আসরের আমন্ত্রন অগ্রাহ্য করা হবে"
 
 # Translated by sadia
-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 "আড্ডার আসরের তালিকার URL"
 
-msgid "Yahoo Chat server"
-msgstr "ইয়াহু আড্ডা সার্ভার"
-
-msgid "Yahoo Chat port"
-msgstr "ইয়াহু আড্ডার পোর্ট"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "ইয়াহু জাপান ID..."
 
@@ -11233,15 +11314,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"
@@ -11285,7 +11375,7 @@ msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"অত্যধিকবার লগইন করার ব্যর্থ চেষ্টার কারণে আপনার একাউন্টটি জব্দ করা হয়েছে। অনুগ্রহ "
+"অত্যধিকবার লগইন করার ব্যর্থ চেষ্টার কারণে আপনার অ্যাকাউন্টটি জব্দ করা হয়েছে। অনুগ্রহ "
 "করে ইয়াহু! ওয়েবসাইটে লগিং করার চেষ্টা করুন।"
 
 # Translated by sadia
@@ -11309,7 +11399,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"
@@ -11318,7 +11408,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 উত্তর পাওয়া গেছে"
@@ -11331,6 +11421,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 "বাসায় নেই"
 
@@ -11379,7 +11479,7 @@ msgstr "উপস্থিতি সেটিং"
 
 # tithi
 msgid "Start Doodling"
-msgstr "Doodle করা শুরু করুন"
+msgstr "হিজিবিজি কাজ করা শুরু করুন"
 
 msgid "Select the ID you want to activate"
 msgstr "আপনি যে ID টি সক্রিয় করতে চান তা নির্বাচন করুন"
@@ -11398,21 +11498,21 @@ msgstr "ইনবক্স খুলুন"
 
 # Translated by sadia
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr "SMS পাঠানো যাচ্ছে না। মোবাইল পরিবাহক সংগ্রহ করতে ব্যর্থ। "
+msgstr "SMS পাঠানো যাচ্ছে না। মোবাইল পরিবাহক সংগ্রহ করতে ব্যর্থ।"
 
 # Translated by sadia
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr "SMS পাঠানো যাচ্ছে না। অপরিচিত মোবাইল পরিবাহক। "
+msgstr "SMS পাঠানো যাচ্ছে না। অপরিচিত মোবাইল পরিবাহক।"
 
 # Translated by sadia
 msgid "Getting mobile carrier to send the SMS."
-msgstr "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 "হিজিবিজি অনুরোধ পাঠানো হয়েছে"
+msgstr "হিজিবিজি অনুরোধ পাঠানো হয়েছে।"
 
 msgid "Unable to connect."
 msgstr "সংযুক্ত করতে ব্যর্থ।"
@@ -11457,7 +11557,7 @@ msgid "Latest News"
 msgstr "সর্বশেষ খবর"
 
 msgid "Home Page"
-msgstr "হোমপেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "Cool Link 1"
 msgstr "দারুন লিংক ১"
@@ -11559,8 +11659,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"
@@ -11729,7 +11828,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.
@@ -11743,6 +11842,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)"
 
@@ -11812,9 +11915,9 @@ msgstr "বিরক্ত করবেন না"
 msgid "Extended away"
 msgstr "অনেকক্ষন যাবত অন্যত্র"
 
-#, fuzzy
+# snigdha
 msgid "Feeling"
-msgstr "গ্রহণ করা হচ্ছে"
+msgstr "অনুভুব করছি"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11992,13 +12095,6 @@ 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 "লগইনের অপশন"
@@ -12017,15 +12113,15 @@ 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)"
@@ -12076,21 +12172,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)"
@@ -12116,13 +12212,13 @@ 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"
-"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং \"একাউন্টসমূহ\" মেনুর \"একাউন্ট নিয়ন্ত্রন"
-"\" উইন্ডো থেকে নতুন একাউন্ট যোগ, সম্পাদনা বা অপসারণ করতে পারেন।"
+"আপনি পুনরায় এই উইন্ডোতে ফিরে আসতে পারেন এবং \"অ্যাকাউন্ট\" মেনুর \"অ্যাকাউন্ট "
+"নিয়ন্ত্রন\" উইন্ডো থেকে নতুন অ্যাকাউন্ট যোগ, সম্পাদনা বা অপসারণ করতে পারেন।"
 
 #. Buddy List
 msgid "Background Color"
@@ -12253,8 +12349,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 নামের পরিচিতি আছে। আপনি কি তাদের একত্রিত করতে চান?"
 
@@ -12272,7 +12367,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 "
@@ -12323,7 +12418,7 @@ msgid "Show When Offline"
 msgstr "অফলাইন হলে প্রদর্শন করা হবে"
 
 msgid "_Alias..."
-msgstr "উপনাম... (_A)"
+msgstr "ডাকনাম... (_A)"
 
 msgid "_Remove"
 msgstr "অপসারণ (_R)"
@@ -12370,7 +12465,7 @@ 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
@@ -12379,24 +12474,23 @@ msgstr "আপনি বর্তমানে এমন কোনো একা�
 msgid "Unknown node type"
 msgstr "অজানা নোডের ধরন"
 
-# tithi
-#, fuzzy
+# snigdha
 msgid "Please select your mood from the list"
-msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মনমেজাজ নির্বাচন করুন।"
+msgstr "অনুগ্রহ করে তালিকা থেকে আপনার মুড নির্বাচন করুন"
 
-#, fuzzy
+# snigdha
 msgid "Message (optional)"
-msgstr "উপনাম (ঐচ্ছিক)"
+msgstr "বার্তা (ঐচ্ছিক)"
 
 msgid "Edit User Mood"
-msgstr "ব্যবহাকারীর মনমেজাজ সম্পাদন"
+msgstr "ব্যবহাকারীর মুড সম্পাদনা"
 
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/বন্ধুগণ (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/বন্ধুগণ/নতুন বার্তা... (_M)"
+msgstr "/বন্ধুগণ/নতুন তাৎক্ষনিক বার্তা... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
 msgstr "/বন্ধুগণ/আড্ডায় যোগদান... (_C)"
@@ -12435,17 +12529,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"
@@ -12466,12 +12560,13 @@ msgstr "/টুল/প্লাগইন (_G)"
 msgid "/Tools/Pr_eferences"
 msgstr "/টুল/পছন্দসমূহ (_E)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Pr_ivacy"
-msgstr "/টুল/গোপনতা (_I)"
+msgstr "/টুল/গোপনীয়তা (_I)"
 
-#, fuzzy
+# snigdha
 msgid "/Tools/Set _Mood"
-msgstr "/টুল/সিস্টেম লগ (_L)"
+msgstr "/টুল/মুড সেট (_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/টুল/ফাইল স্থানান্তর (_F)"
@@ -12492,27 +12587,26 @@ msgstr "/সহায়তা (_H)"
 msgid "/Help/Online _Help"
 msgstr "/সহায়তা/অনলাইন সহায়িকা (_H)"
 
-#, fuzzy
+# snigdha
 msgid "/Help/_Build Information"
-msgstr "বন্ধুর তথ্য"
+msgstr "/সহায়ক /তথ্য গড়ুন (_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/সহায়তা/ডিবাগ উইন্ডো (_D)"
 
-#, fuzzy
+# snigdha
 msgid "/Help/De_veloper Information"
-msgstr "সার্ভারের তথ্য"
+msgstr "/সহায়ক/ডেভেলপার তথ্য (_v)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "ব্যক্তিগত তথ্য"
+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 ""
@@ -12534,7 +12628,7 @@ msgid "(no topic set)"
 msgstr "(কোনো বিষয়বস্তু নির্ধারণ করা হয়নি)"
 
 msgid "Buddy Alias"
-msgstr "বন্ধুর উপনাম"
+msgstr "বন্ধুর ডাকনাম"
 
 msgid "Logged In"
 msgstr "লগইন করেছে"
@@ -12587,8 +12681,9 @@ msgstr "/বন্ধুগণ/আড্ডা যোগ..."
 msgid "/Buddies/Add Group..."
 msgstr "/বন্ধুগণ/দল যোগ..."
 
+# Snigdha গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Privacy"
-msgstr "/টুল/গোপনতা"
+msgstr "/টুল/গোপনীয়তা"
 
 msgid "/Tools/Room List"
 msgstr "/টুল/আসরের তালিকা"
@@ -12634,9 +12729,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>"
@@ -12648,7 +12743,7 @@ msgid "_Login"
 msgstr "লগইন (_L)"
 
 msgid "/Accounts"
-msgstr "/একাউন্ট"
+msgstr "/অ্যাকাউন্ট"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -12661,9 +12756,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
@@ -12691,7 +12786,7 @@ msgstr "বন্ধুর নাম (_u):"
 
 # and this
 msgid "(Optional) A_lias:"
-msgstr "উপনাম (ঐচ্ছিক) (_l):"
+msgstr "ডাকনাম (ঐচ্ছিক) (_l):"
 
 msgid "Add buddy to _group:"
 msgstr "বন্ধুকে দলে যোগ করুন (_g):"
@@ -12708,11 +12803,11 @@ 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):"
@@ -12724,7 +12819,7 @@ msgstr "দল (_G):"
 #
 # Translated by sadia
 msgid "Auto_join when account connects."
-msgstr "একাউন্ট সংযুক্ত হলে স্বয়ংক্রিয়ভাবে যোগ দেয়া হবে। (_j)"
+msgstr "অ্যাকাউন্ট সংযুক্ত হলে স্বয়ংক্রিয়ভাবে যোগ দেয়া হবে। (_j)"
 
 # tithi
 msgid "_Remain in chat after window is closed."
@@ -12734,20 +12829,20 @@ 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)"
 
-#, fuzzy
+# snigdhaসেট এর জায়গায় নির্ধারণ
 msgid "Set _Mood..."
-msgstr "মনমেজাজ নির্ধারন..."
+msgstr "মুড নির্ধারণ...(_M)"
 
 msgid "No actions available"
 msgstr "কোনো প্রতিক্রিয়া বিদ্যমান নেই"
@@ -12777,7 +12872,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 "বন্ধুকে আড্ডার আসরে আমন্ত্রণ জানান"
@@ -12871,9 +12966,9 @@ msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডি
 msgid "/Conversation/Se_nd File..."
 msgstr "/কথোপকথন/ফাইল প্রেরণ... (_n)"
 
-#, fuzzy
+# snigdha
 msgid "/Conversation/Get _Attention"
-msgstr "/কথোপকথন/তথ্য গ্রহণ"
+msgstr "/কথোপকথন/ মনোযোগ আকর্ষন (_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ... (_P)"
@@ -12888,7 +12983,7 @@ msgid "/Conversation/M_ore"
 msgstr "/কথোপকথন/আরও (_o)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/কথোপকথন/উপনাম... (_i)"
+msgstr "/কথোপকথন/ডাকনাম... (_i)"
 
 msgid "/Conversation/_Block..."
 msgstr "/কথোপকথন/ব্লক... (_B)"
@@ -12956,9 +13051,9 @@ msgstr "/কথোপকথন/মিডিয়া/অডিও‌\\/ভিডি
 msgid "/Conversation/Send File..."
 msgstr "/কথোপকথন/ফাইল প্রেরণ..."
 
-#, fuzzy
+# snigdha
 msgid "/Conversation/Get Attention"
-msgstr "/কথোপকথন/তথ্য গ্রহণ"
+msgstr "/কথোপকথন/মনোযোগ আকর্ষন"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ..."
@@ -12970,7 +13065,7 @@ msgid "/Conversation/Invite..."
 msgstr "/কথোপকথন/আমন্ত্রণ..."
 
 msgid "/Conversation/Alias..."
-msgstr "/কথোপকথন/উপনাম..."
+msgstr "/কথোপকথন/ডাকনাম..."
 
 msgid "/Conversation/Block..."
 msgstr "/কথোপকথন/ব্লক..."
@@ -13024,13 +13119,13 @@ msgstr "প্রেরণ (_S)"
 msgid "0 people in room"
 msgstr "আসরে ০ ব্যক্তি উপস্থিত"
 
-#, fuzzy
+# snigdha
 msgid "Close Find bar"
-msgstr "এই ট্যাবটি বন্ধ করা হবে"
+msgstr "ফাইন্ডবার বন্ধ করুন"
 
-#, fuzzy
+# snigdha
 msgid "Find:"
-msgstr "খুঁজুন"
+msgstr "খুঁজুন:"
 
 #, c-format
 msgid "%d person in room"
@@ -13052,7 +13147,7 @@ msgstr "নতুন ঘটনা"
 
 # fix me tithi
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: সব কথোপকথনের স্ক্রলব্যাক মুছে ফেলা হবে।"
+msgstr "মুছে ফেলা: সব কথোপকথনের স্ক্রলব্যাক মুছে ফেলা হবে।"
 
 msgid "Confirm close"
 msgstr "বন্ধ নিশ্চিতকরণ"
@@ -13088,13 +13183,13 @@ msgid "By group"
 msgstr "দল অনুসারে"
 
 msgid "By account"
-msgstr "একাউন্ট অনুসারে"
+msgstr "অ্যাকাউন্ট অনুসারে"
 
 msgid "Find"
 msgstr "খুঁজুন"
 
 msgid "_Search for:"
-msgstr "অনুসন্ধান (_S):"
+msgstr "যা অনুসন্ধান করা হবে (_S):"
 
 msgid "Save Debug Log"
 msgstr "ডিবাগ লগ সংরক্ষণ করা হবে"
@@ -13201,6 +13296,10 @@ msgstr "আফ্রিকান"
 msgid "Arabic"
 msgstr "আরবী"
 
+# snigdha
+msgid "Assamese"
+msgstr "আসামীয়"
+
 # tithi
 msgid "Belarusian Latin"
 msgstr "বেলারুশিয় ল্যাটিন"
@@ -13211,6 +13310,10 @@ msgstr "বুলগেরীয়"
 msgid "Bengali"
 msgstr "বাংলা"
 
+# snigdha
+msgid "Bengali-India"
+msgstr "বাংলা-ইন্ডিয়া"
+
 msgid "Bosnian"
 msgstr "বসনীয়"
 
@@ -13248,7 +13351,7 @@ msgstr "ব্রিটিশ ইংরেজী"
 
 # tithi
 msgid "Esperanto"
-msgstr "এসপার‌্যান্টো"
+msgstr "এসপারান্তো"
 
 msgid "Spanish"
 msgstr "স্প্যানিশ"
@@ -13296,7 +13399,7 @@ msgid "Armenian"
 msgstr "আর্মেনীয়"
 
 msgid "Indonesian"
-msgstr "ইন্ডোনেশিয়"
+msgstr "ইন্দোনেশীয়"
 
 msgid "Italian"
 msgstr "ইটালিয়"
@@ -13308,7 +13411,7 @@ msgid "Georgian"
 msgstr "জর্জীয়"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu জর্জিয় অনুবাদকবৃন্দ"
+msgstr "উবুন্টু জর্জিয় অনুবাদকবৃন্দ"
 
 msgid "Khmer"
 msgstr "খেমার"
@@ -13334,6 +13437,11 @@ msgstr "লাও"
 msgid "Macedonian"
 msgstr "ম্যাসেডনিয়"
 
+# Translated by sadia
+# corrected by Snigdha
+msgid "Malayalam"
+msgstr "মালায়ালাম"
+
 msgid "Mongolian"
 msgstr "মঙ্গোলীয়"
 
@@ -13432,7 +13540,7 @@ msgid "Vietnamese"
 msgstr "ভিয়েতনামী"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "টি.এম.থানহ এবং জিনোমী-ভিআই টিম"
+msgstr "টি.এম.থানহ এবং জিনোম-ভিআই টিম"
 
 msgid "Simplified Chinese"
 msgstr "সরলকৃত চীনা"
@@ -13451,24 +13559,23 @@ msgid "Lithuanian"
 msgstr "লিথুনীয়"
 
 # fix me tithi
-#, fuzzy, c-format
+# snigdha
+#, 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>"
+"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\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
@@ -13476,9 +13583,14 @@ msgid ""
 "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: #pidgin irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 
 # Translated by sadia
-#, fuzzy, c-format
+# snigdha
+#, 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/"
@@ -13488,25 +13600,27 @@ msgid ""
 "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></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 সম্পর্কে"
 
-#, fuzzy
+# snigdha
 msgid "Build Information"
-msgstr "বন্ধুর তথ্য"
+msgstr "তথ্য সংগ্রহ করুন"
 
+# snigdha
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "বন্ধুর তথ্য"
+msgstr "তথ্য সংগ্রহ করুন %s"
 
 msgid "Current Developers"
 msgstr "বর্তমান ডেভেলপারগণ"
@@ -13520,9 +13634,10 @@ msgstr "অবসরপ্রাপ্ত ডেভেলপার"
 msgid "Retired Crazy Patch Writers"
 msgstr "অবসরপ্রাপ্ত অত্যুৎসাহী প্যাচ লেখক"
 
-#, fuzzy, c-format
+# snigdha
+#, c-format
 msgid "%s Developer Information"
-msgstr "সার্ভারের তথ্য"
+msgstr "ডেভলপার তথ্য %s"
 
 msgid "Current Translators"
 msgstr "বর্তমান অনুবাদক"
@@ -13530,16 +13645,16 @@ msgstr "বর্তমান অনুবাদক"
 msgid "Past Translators"
 msgstr "পুরনো অনুবাদক"
 
-# Translated by sadia
-#, fuzzy, c-format
+# Translated by snigdha
+#, c-format
 msgid "%s Translator Information"
-msgstr "আরও তথ্য"
+msgstr "অনুবাদক তথ্য %s"
 
 msgid "_Name"
 msgstr "নাম (_N)"
 
 msgid "_Account"
-msgstr "একাউন্ট (_A)"
+msgstr "অ্যাকাউন্ট (_A)"
 
 msgid "Get User Info"
 msgstr "ব্যবহারকারীর তথ্য"
@@ -13548,29 +13663,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 ""
@@ -13622,8 +13738,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 "বন্ধু অপসারণ"
@@ -13660,7 +13775,7 @@ msgid "New _Message..."
 msgstr "নতুন বার্তা...(_M)"
 
 msgid "_Accounts"
-msgstr "একাউন্ট (_A)"
+msgstr "অ্যাকাউন্ট (_A)"
 
 msgid "Plu_gins"
 msgstr "প্লাগইন (_g)"
@@ -13739,8 +13854,9 @@ msgstr "ফাইল স্থানান্তরের বিবরণ (_d)"
 msgid "Paste as Plain _Text"
 msgstr "সরল টেক্সট হিসেবে প্রতিলেপন (_T)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset formatting"
-msgstr "বিন্যাস রিসেট (_R)"
+msgstr "বিন্যাস পুনঃনির্ধারণ (_R)"
 
 # tithi
 msgid "Disable _smileys in selected text"
@@ -13795,38 +13911,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"
@@ -13953,8 +14074,9 @@ msgid "Foreground Color"
 msgstr "পুরোভাগের রং"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Formatting"
-msgstr "বিন্যাস রিসেট"
+msgstr "বিন্যাস নির্ধারন করা হচ্ছে"
 
 msgid "Insert IM Image"
 msgstr "IM চিত্র প্রবেশ করান"
@@ -13962,9 +14084,9 @@ msgstr "IM চিত্র প্রবেশ করান"
 msgid "Insert Smiley"
 msgstr "স্মাইলি প্রবেশ করান"
 
-#, fuzzy
+# snigdha
 msgid "Send Attention"
-msgstr "প্রেরণ বোতাম"
+msgstr "মনোযোগ দিন"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>মোটা (_B)</b>"
@@ -14014,8 +14136,9 @@ msgstr "অনুভূমিক মাপকাঠি (_H)"
 msgid "_Smile!"
 msgstr "হাসি! (_S)"
 
+# snigdha
 msgid "_Attention!"
-msgstr ""
+msgstr "দৃষ্টিআকর্ষন! (_A)"
 
 msgid "Log Deletion Failed"
 msgstr "লগ অপসারণ ব্যর্থ"
@@ -14034,16 +14157,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?"
@@ -14068,7 +14191,7 @@ 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
@@ -14122,9 +14245,9 @@ msgid ""
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
-"উল্লিখিত একাউন্ট সক্রিয় করা হবে (ঐচ্ছিক আর্গুমেন্টের নাম\\n                      "
-"ব্যবহার করার জন্য একাউন্ট উল্লেখ করা হবে, কমা দ্বারা পৃথককৃত।"
-"\\n                      এটা ছাড়া শুধুমাত্র প্রথম একাউন্টটি সক্রিয় করা হবে)। "
+"উল্লিখিত অ্যাকাউন্ট সক্রিয় করা হবে (ঐচ্ছিক আর্গুমেন্টের নাম\\n                      "
+"ব্যবহার করার জন্য অ্যাকাউন্ট উল্লেখ করা হবে, কমা দ্বারা পৃথককৃত।"
+"\\n                      এটা ছাড়া শুধুমাত্র প্রথম অ্যাকাউন্টটি সক্রিয় করা হবে)। "
 
 # Translated by sadia
 msgid "X display to use"
@@ -14165,11 +14288,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "প্রস্থান করছে কারণ আরেকটি libpurple ক্লায়েন্ট ইতিমধ্যে চলছে।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/মিডিয়া (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "কল শেষ করুন"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14293,7 +14418,7 @@ msgid "Pounce on Whom"
 msgstr "যাকে পাউন্স করা হবে"
 
 msgid "_Account:"
-msgstr "একাউন্ট (_A):"
+msgstr "অ্যাকাউন্ট (_A):"
 
 msgid "_Buddy name:"
 msgstr "বন্ধুর নাম (_B):"
@@ -14305,7 +14430,7 @@ msgid "Signs o_ff"
 msgstr "লগআউট করে (_f)"
 
 msgid "Goes a_way"
-msgstr "অনত্র যায় (_w)"
+msgstr "অন্যত্র যায় (_w)"
 
 msgid "Ret_urns from away"
 msgstr "অন্যত্র অবস্থা থেকে ফিরে আসে (_u)"
@@ -14333,7 +14458,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)"
@@ -14436,8 +14561,8 @@ msgid ""
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"নিম্নোক্ত তালিকা থেকে আপনার পছন্দনীয় একটি থীম নির্বাচন করুন।\\nনতুন কোন থীম টেনে "
-"এনে থীম তালিকায় ছেড়ে দিলেই সেটা ইনস্টল হয়ে যাবে।\n"
+"নিম্নোক্ত তালিকা থেকে আপনার পছন্দনীয় একটি থীম নির্বাচন করুন।\n"
+"নতুন কোন থীম টেনে এনে থীম তালিকায় ছেড়ে দিলেই সেটা ইনস্টল হয়ে যাবে।\n"
 "আপনি যে স্মাইলি থীম ব্যবহার করতে চান তা নিম্নবর্তী তালিকা থেকে বাছাই করুন। নতুন "
 "থীম তালিকায় টেনে এনে ফেলে ইনস্টল করতে পারেন।"
 
@@ -14591,10 +14716,10 @@ 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 "পোর্ট"
@@ -14651,7 +14776,7 @@ msgid "Desktop Default"
 msgstr "পূর্বনির্ধারিত ডেস্কটপ "
 
 msgid "GNOME Default"
-msgstr "পূর্বনির্ধারিত GNOME "
+msgstr "জিনোম ডিফল্ট"
 
 msgid "Galeon"
 msgstr "গ্যালিওন"
@@ -14679,7 +14804,7 @@ msgstr "ব্রাউজার নির্বাচন"
 #
 # Translated by sadia
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr "GNOME পছন্দসমূহের মধ্যে ব্রাউজার পছন্দসমূহ কনফিগার করা হয়েছে "
+msgstr "GNOME পছন্দসমূহের মধ্যে ব্রাউজার পছন্দসমূহ কনফিগার করা হয়েছে"
 
 # tithi
 msgid "<b>Browser configuration program was not found.</b>"
@@ -14739,7 +14864,7 @@ msgstr "SOCKS4 প্রক্সি সম্বলিত দূরবর্ত
 
 # Translated by sadia
 msgid "Proxy t_ype:"
-msgstr "প্রক্সির ধরণ: (_y)"
+msgstr "প্রক্সির ধরন: (_y)"
 
 msgid "No proxy"
 msgstr "কোনো প্রক্সি নেই"
@@ -14792,7 +14917,7 @@ msgid "Loudest"
 msgstr "সবচেয়ে জোরে"
 
 msgid "_Method:"
-msgstr "প্রক্রিয়া (_M):"
+msgstr "মেথড (_M):"
 
 msgid "Console beep"
 msgstr "কনসোল বীপ"
@@ -14826,8 +14951,9 @@ msgstr "বাজানো হবে"
 msgid "_Browse..."
 msgstr "ব্রাউজ... (_B)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset"
-msgstr "রিসেট (_R)"
+msgstr "পুনঃনির্ধারণ (_R)"
 
 msgid "_Report idle time:"
 msgstr "নিষ্ক্রিয় সময় দেখানো হবে (_R):"
@@ -14890,14 +15016,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"
@@ -14989,7 +15118,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"
@@ -15036,20 +15165,16 @@ msgstr "শর্টকাট টেক্সট"
 msgid "Custom Smiley Manager"
 msgstr "স্বনির্বাচিত স্মাইলি ব্যবস্থাপক"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "সক্রিয়করণ আবশ্যক"
-
 msgid "Select Buddy Icon"
 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 "নেটওয়ার্ক সংযোগের জন্য অপেক্ষা করা হচ্ছে"
@@ -15197,7 +15322,7 @@ msgid "Pidgin"
 msgstr "পিজিন"
 
 msgid "_Alias"
-msgstr "উপনাম (_A)"
+msgstr "ডাকনাম (_A)"
 
 msgid "Close _tabs"
 msgstr "সব ট্যাব বন্ধ করা হবে (_t)"
@@ -15232,7 +15357,7 @@ msgid "Selecting this disables graphical emoticons."
 msgstr "এটি নির্বাচন করলে গ্রাফিকাল অনুভূতিচিহ্ন নিষ্ক্রিয় হবে।"
 
 msgid "none"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 # mark50
 msgid "Small"
@@ -15295,7 +15420,7 @@ msgstr "বন্ধু অন্যত্র"
 
 # fix me tithi
 msgid "Buddy is \"extended\" away"
-msgstr "বন্ধু \"অনেকক্ষন যাবত\" অন্যত্র:"
+msgstr "বন্ধু \"অনেকক্ষন যাবৎ\" অন্যত্র:"
 
 #. Not used yet.
 msgid "Buddy is mobile"
@@ -15316,7 +15441,7 @@ msgid "Use last buddy when scores are equal"
 msgstr "স্কোর সমান হলে সর্বশেষ বন্ধুকে ব্যবহার করা হবে"
 
 msgid "Point values to use for account..."
-msgstr "একাউন্টে ব্যবহারের জন্য মান নির্দেশ করা হবে..."
+msgstr "অ্যাকাউন্টে ব্যবহারের জন্য মান নির্দেশ করা হবে..."
 
 #. *< type
 #. *< ui_requirement
@@ -15588,7 +15713,7 @@ msgstr "Evolution একত্রিকরণ কনফিগারেশন"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "সব একাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ংক্রিয়ভাবে যুক্ত হবে।"
+msgstr "সব অ্যাকাউন্টগুলো নির্বাচন করুন যাতে বন্ধুরা স্বয়ংক্রিয়ভাবে যুক্ত হবে।"
 
 #. *< type
 #. *< ui_requirement
@@ -15610,10 +15735,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
@@ -15773,7 +15898,7 @@ msgstr "ফোকাসকৃত উইন্ডো (_F)"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "ঘোষণা পদ্ধতি"
+msgstr "ঘোষনা পদ্ধতি"
 
 msgid "Prepend _string into window title:"
 msgstr "উইন্ডো শিরোনামের অগ্রভাগে স্ট্রিং যোগ করা হবে (_s):"
@@ -15804,7 +15929,7 @@ msgstr "বর্তমান কথোপকথন উইন্ডো (_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "ঘোষণা অপসারণ"
+msgstr "ঘোষনা অপসারণ"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
@@ -15833,14 +15958,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
@@ -15879,7 +16004,7 @@ msgid "Highlighted Message Name Color"
 msgstr "হাইলাইটকৃত বার্তার নামের রং"
 
 msgid "Typing Notification Color"
-msgstr "ঘোষণা টাইপ করার ফন্টের রং"
+msgstr "ঘোষনা টাইপ করার ফন্টের রং"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView অনুভূমিক বিভাজন"
@@ -15915,7 +16040,7 @@ msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ টেক্সট শর্টকাটের থীম"
 
 msgid "Disable Typing Notification Text"
-msgstr "ঘোষণা টাইপ করার টেক্সট নিষ্ক্রিয় করুন"
+msgstr "ঘোষনা টাইপ করার টেক্সট নিষ্ক্রিয় করুন"
 
 msgid "GTK+ Theme Control Settings"
 msgstr "GTK+ থীম নিয়ন্ত্রণ সেটিং"
@@ -15978,7 +16103,7 @@ msgstr "এখন ডাউনলোড করা হবে"
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "রিলিজ ঘোষণা"
+msgstr "রিলিজ ঘোষনা"
 
 #. *< name
 #. *< version
@@ -16124,7 +16249,7 @@ msgid "Warning dialog"
 msgstr "সতর্কবানী ডায়ালগ"
 
 msgid "What kind of dialog is this?"
-msgstr "এটি কি ধরণের ডায়ালগ?"
+msgstr "এটি কি ধরনের ডায়ালগ?"
 
 msgid "Status Icons"
 msgstr "অবস্থা আইকন"
@@ -16210,10 +16335,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 "তারিখ প্রদর্শন..."
@@ -16416,7 +16549,7 @@ msgid "Windows Pidgin Options"
 msgstr "উইন্ডোজ পিজিনের অপশন"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্ট অপশন।"
+msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্"
 
 # fix me
 msgid ""
@@ -16433,10 +16566,10 @@ 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>"
@@ -16446,14 +16579,246 @@ msgstr "<font color='#777777'>XMPP এর সাথে সংযুক্ত ন
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "নতুন XMPP স্তবক পাঠান এবং গ্রহণ করুন।"
+msgstr "অশোধিত XMPP স্তবক পাঠান এবং গ্রহন করুন।"
 
-# tithi
+# snigdha
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
 
+# snigdha
+#. $(^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 ""
+"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 "চিহ্নগুলোকে ডিবাগ করা হবে (ক্র্যাশের রিপোর্ট করার জন্য)"
+
+# snigdha
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "ডেস্কটপ"
+
+# snigdha
+#. $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/ হতে 'অফলাইন ইনস্টলার' ব্যবহার  করুন।"
+
+# snigdha
+#. $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/ হতে 'অফলাইন ইনস্টলার' ব্যবহার করুন।"
+
+# snigdha
+#. $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 তে স্বনির্ধারিত ইনস্টলেশনের "
+"নির্দেশনা দেয়া আছে।"
+
+# snigdha
+#. 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 "পরবর্তী >"
+
+# snigdha
+#. 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
+# 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 ""
+"পিজিনে বিদ্যমান ইন্সটল করা সংস্করণটি আনইন্সটল করা যাচ্ছে না। বর্তমানে ইন্সটল করা "
+"সংস্করণটি অপসারন না করেই নতুন সংস্করণটি ইন্সটল করতে হবে।"
+
+# snigdha
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "পিজিনের ওয়েব পেজ দেখুন"
+
+# snigdha
+msgid "You do not have permission to uninstall this application."
+msgstr "আপনার এই অ্যাপ্লিকেশনটি আনইন্সটল করার অনুমতি নেই।"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+
+# Translated by sadia
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "সার্টিফিকেটটি এখনও কার্যকর করা হয়নি।"
+
+# tithi
+#
+#
+#
+# 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 "Rate to host"
+#~ 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 "Error creating conference."
 #~ msgstr "অধিবেশন তৈরিতে ত্রুটি"
@@ -16464,6 +16829,23 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 #~ 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 আপনাকে ধাক্কা দিয়েছে!"
 
@@ -16473,7 +16855,7 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 
 # tithi
 #~ msgid "This Hotmail account may not be active."
-#~ msgstr "এই হটমেইল একাউন্টটি সক্রিয় নাও থাকতে পারে।"
+#~ msgstr "এই হটমেইল অ্যাকাউন্টটি সক্রিয় নাও থাকতে পারে।"
 
 # tithi
 #~ msgid "Profile URL"
@@ -16504,7 +16886,7 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 #~ msgstr "আপনার বন্ধু তালিকা পূর্ণ থাকার কারণে %s কে যোগ করা যাচ্ছে না।"
 
 #~ msgid "%s is not a valid passport account."
-#~ msgstr "%s বৈধ পাসপোর্ট একাউন্ট নয়।"
+#~ msgstr "%s বৈধ পাসপোর্ট অ্যাকাউন্ট নয়।"
 
 #~ msgid "Service Temporarily Unavailable."
 #~ msgstr "সাময়িকভাবে সেবা পাওয়া যাচ্ছে না।"
@@ -16521,6 +16903,34 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 #~ 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 ""
+#~ "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 ""
 #~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 #~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
@@ -16580,36 +16990,6 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 #~ msgid "Insert a <message/> stanza."
 #~ msgstr "একটি <message/> স্তবক প্রবেশ করান।"
 
-# Translated by sadia
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr ""
-#~ "সরাসরি সংযোগ স্থাপনে ব্যর্থ হওয়ার পর বিকল্প XMPP সংযোগ প্রক্রিয়া খুঁজে পাওয়া "
-#~ "যায়নি।"
-
-# tithi
-#
-#
-#
-# Translated by sadia
-#~ msgid "CAPTCHA requested. Logging into the AIM/ICQ website may fix this."
-#~ msgstr ""
-#~ "ক্যাপচা অনুরোধ করা হয়েছে। AIM/ICQ ওয়েবসাইটে লগ ইন করা হলে হয়ত এটা নির্দিষ্ট "
-#~ "করা যেতে পারে।"
-
-# Translated by sadia
-#~ 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"
-
 # tithi mark
 #, fuzzy
 #~ msgid "(Default)"
@@ -16639,157 +17019,3 @@ msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "মূল সার্টিফিকেটটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
-
-# tithi
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "বহুবিধ প্রোটোকল দিয়ে তাৎক্ষনিক বার্তা প্রেরণ করুন"
-
-#~ msgid "_Start port:"
-#~ msgstr "শুরুর পোর্ট (_S):"
-
-#~ msgid "_End port:"
-#~ msgstr "শেষের পোর্ট (_E):"
-
-#~ msgid "_User:"
-#~ msgstr "ব্যবহারকারী (_U):"
-
-#~ 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 "অকার্যকর সার্টিফিকেট কতৃপক্ষের স্বাক্ষর"
-
-# ***
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "লুকানো কনফিগারেশন যুক্ত/বিভক্ত করা হবে"
-
-# tithi
-#~ msgid "Minimum Room Size"
-#~ msgstr "আসরের নূন্যতম আকার"
-
-# tithi
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "ব্যবহারকারীর মিথস্ক্রিয়তার সময়সীমা উত্তীর্ণ (মিনিটে)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "ফাইলটি খুলতে ব্যর্থ"
-
-# tithi
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "আপনার একাউন্টটি আবদ্ধ, অনুগ্রহ করে ইয়াহু! ওয়েবসাইটে লগইন করুন।"
-
-# tithi
-#~ 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/>"
-
-#~ msgid "_Resume"
-#~ msgstr "পুনরায় শুরু (_R)"
-
-# 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"
-#~ 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"
-
-# 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"
-#~ "  -v, --version       display the current version and exit\n"
-#~ 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"
-#~ "  -v, --version       বর্তমান সংস্করণ প্রদর্শন করে প্রস্থান করা হবে\n"
-
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "ত্রুটিপূর্ণ BOSH সংযোগ সার্ভার"
-
-# tithi
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "SILC কী যুগল লোড না করা সম্ভব হয়নি"
-
-# tithi
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr ""
-#~ "\"%3$s\" এর কারণে \"%2$s\" আসরে %1$s আপনার অধিবেশনের আমন্ত্রণ প্রত্যাখ্যান "
-#~ "করেছেন।"
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "আমন্ত্রন প্রত্যাখ্যান করা হয়েছে"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "সকেট খোলা যাচ্ছে না"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index c3aeaaf5af..2d8a9ddd68 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-31 00:11-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -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 "নতুন বার্তার বিজ্ঞপ্তি"
 
@@ -782,7 +795,7 @@ msgstr "বন্ধ"
 msgid "Waiting for transfer to begin"
 msgstr "পরিবহণ আরম্ভে অপেক্ষা চলছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 msgid "Failed"
@@ -1248,6 +1261,10 @@ msgstr "অন্যরা আলাপ করলে"
 msgid "Someone says your username in chat"
 msgstr "আলাপনের মধ্যে আপনার নাম উল্লেখ করা হলে"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "সক্রিয়করণ আবশ্যক"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-র বিফলতা"
 
@@ -1341,7 +1358,6 @@ msgid "Saved Statuses"
 msgstr "সংরক্ষিত অবস্থা"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "শিরোনাম"
 
@@ -1540,7 +1556,7 @@ msgstr "URL সহ বার্তা প্রাপ্ত করার সম�
 msgid "Online"
 msgstr "অন-লাইন"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফ-লাইন"
 
@@ -1633,6 +1649,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 "অজানা"
 
@@ -1652,8 +1676,10 @@ 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 "সার্টিফিকেটের মেয়াদ পূর্ণ হয়েছে ও বর্তমানে বৈধ নয়।"
@@ -1888,7 +1914,6 @@ msgstr "%s-কে punycode-এ পরিবর্তন করতে ত্র�
 msgid "Thread creation failure: %s"
 msgstr "থ্রেড নির্মাণ করতে ব্যর্থ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "অজানা কারণ"
 
@@ -3162,6 +3187,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 "নাম"
 
@@ -3771,12 +3799,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 "সার্ভারের ক্ষেত্রে এনক্রিপশনবিহীন স্ট্রিমের মাধ্যমে প্লেইন-টেক্সট অনুমোদন প্রয়োজন"
 
@@ -3809,6 +3831,18 @@ 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 অনুমোদন ব্যর্থ"
 
@@ -3816,6 +3850,42 @@ msgstr "SASL অনুমোদন ব্যর্থ"
 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 "ব্যবহারকারীর নামের ক্ষেত্রে ক্যানোনিক্যাল বৈশিষ্ট্য নির্ধারণ করতে ব্যর্থ"
 
@@ -3879,6 +3949,7 @@ msgstr "অঞ্চল"
 msgid "Postal Code"
 msgstr "পোস্টাল কোড"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "দেশ"
 
@@ -3893,10 +3964,14 @@ msgstr "প্রতিষ্ঠানের নাম"
 msgid "Organization Unit"
 msgstr "প্রাতিষ্ঠানিক বিভাগ"
 
+msgid "Job Title"
+msgstr "পদ"
+
 msgid "Role"
 msgstr "ভূমিকা"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "জন্মদিন"
 
@@ -4113,12 +4188,22 @@ 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। ডোমেইন নির্ধারণ করা আবশ্যক।"
 
@@ -4215,7 +4300,6 @@ msgstr "সার্ভার দ্বারা ব্লকিং ব্যব
 msgid "Not Authorized"
 msgstr "অনুমোদিত নয়"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "মেজাজ"
 
@@ -4237,7 +4321,6 @@ msgstr "প্রেরণের উদ্দেশ্যে"
 msgid "None (To pending)"
 msgstr "অনুমোদনের অপেক্ষারত"
 
-#. 0
 msgid "None"
 msgstr "শূণ্য"
 
@@ -4259,6 +4342,12 @@ msgstr "মধ্যের নাম"
 msgid "Mood Comment"
 msgstr "বন্ধুর মন্তব্য"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "গানের শিল্পী"
 
@@ -4429,9 +4518,6 @@ msgstr "নিয়মের উলঙ্ঘন"
 msgid "Remote Connection Failed"
 msgstr "দূরবর্তী সংযোগ বিফল হয়েছে"
 
-msgid "Resource Constraint"
-msgstr "রিসোর্সের সীমা"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4781,7 +4867,6 @@ msgstr "লজ্জিত"
 msgid "Amorous"
 msgstr "অপরূপ"
 
-#. 1
 msgid "Angry"
 msgstr "রাগত"
 
@@ -4879,7 +4964,6 @@ msgstr ""
 msgid "Envious"
 msgstr "উৎকণ্ঠিত"
 
-#. 2
 msgid "Excited"
 msgstr "উচ্ছ্বশিত"
 
@@ -4898,7 +4982,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "উদ্ধার করা হচ্ছে..."
 
-#. 3
 msgid "Grumpy"
 msgstr "গোমড়ামুখ"
 
@@ -4906,14 +4989,12 @@ msgstr "গোমড়ামুখ"
 msgid "Guilty"
 msgstr "শহর"
 
-#. 4
 msgid "Happy"
 msgstr "খুশি"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "আকর্ষণীয়"
 
@@ -4953,7 +5034,6 @@ msgstr "শখ"
 msgid "Intoxicated"
 msgstr "আমন্ত্রিত"
 
-#. 6
 msgid "Invincible"
 msgstr "অপরাজেয়"
 
@@ -5017,7 +5097,6 @@ msgstr "মুছে ফেলুন"
 msgid "Restless"
 msgstr "নিবন্ধন করুন"
 
-#. 7
 msgid "Sad"
 msgstr "দুঃখী"
 
@@ -5039,11 +5118,9 @@ msgstr "প্রতিরোধিত"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "অসুস্থ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ঘুমে আচ্ছন্ন"
@@ -5446,18 +5523,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 "খেলার শিরোনাম"
 
@@ -5606,9 +5671,6 @@ msgstr "বার্ষিকী"
 msgid "Work"
 msgstr "কর্ম"
 
-msgid "Job Title"
-msgstr "পদ"
-
 msgid "Company"
 msgstr "কোম্পানি"
 
@@ -5696,6 +5758,10 @@ 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: কোনো ব্যবহারকারীর নজর কাঁড়ার জন্য তাকে খোঁচা মারুন"
 
@@ -5888,24 +5954,6 @@ msgstr "ঠিকানা বই থেকেও এই বন্ধুর ত�
 msgid "The username specified is invalid."
 msgstr "উল্লিখিত ব্যবহারকারীর নাম বৈধ নয়।"
 
-#. 5
-msgid "In Love"
-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 বৈধ নয়।"
 
@@ -5939,7 +5987,11 @@ msgstr ""
 "প্রোফাইল সংক্রান্ত তথ্য এখনো উদ্ধার করা সম্ভব হয়নি। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা "
 "করুন।"
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5947,6 +5999,7 @@ msgid "Verify PIN"
 msgstr "PIN যাচাই করুন"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "নাম প্রদর্শন করা হবে"
 
@@ -5974,10 +6027,6 @@ msgstr "বর্তমানে কোনো স্প্ল্যাশ-স্
 msgid "About"
 msgstr "পরিচিতি"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "মেজাজ পরিবর্তন করুন..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "প্রোফাইল পরিবর্তন করুন..."
@@ -6012,19 +6061,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "সংযোগ করা হচ্ছে..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit লগ-ইনের নাম"
-
-#. nick name
-msgid "Nick Name"
-msgstr "উপনাম"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6055,10 +6101,12 @@ 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 ""
 "ব্যবহারকারীর নাম পূর্বেই নিবন্ধিত হয়েছে। অনুগ্রহ করে একটি ভিন্ন নাম নির্বাচন করুন।"
 
@@ -6071,7 +6119,7 @@ msgstr "নিরাপত্তামূলক কোড লেখা হয়ন
 msgid "Security Code"
 msgstr "নিরাপত্তামূলক কোড"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "নিরাপত্তামূলক কোড লিখুন"
 
@@ -6097,11 +6145,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")
@@ -6114,6 +6168,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 "রুম: (_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-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে। অনুগ্রহ করে পুনরায় সংযোগ করুন।"
@@ -6218,6 +6294,9 @@ msgstr "MXit-র জন্য সংযোগ সংক্রান্ত এক
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit-র জন্য সংযোগ সংক্রান্ত একটি ত্রুটি দেখা দিয়েছে। (read stage 0x06)"
 
+msgid "In Love"
+msgstr "অনুরাগ"
+
 msgid "Pending"
 msgstr "অসমাপ্ত"
 
@@ -6613,9 +6692,6 @@ msgstr "পাসওয়ার্ডের মেয়াদ উত্তীর্�
 msgid "Incorrect password"
 msgstr "পাসওয়ার্ড সঠিক নয়"
 
-msgid "User not found"
-msgstr "ব্যবহারকারীকে পাওয়া যায়নি"
-
 msgid "Account has been disabled"
 msgstr "অ্যাকাউন্ট নিষ্ক্রিয় করা হয়েছে"
 
@@ -6873,12 +6949,73 @@ 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 ""
 
@@ -7046,116 +7183,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 "অবচিত 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 "অভিভাবকদের দ্বারা ধার্য সীমারেখার কারণে 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 "অফ-লাইন বার্তা সংগ্রহস্থল পূর্ণ হয়ে গিয়েছে"
-
 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 "
@@ -7524,28 +7551,9 @@ 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 "অনলাইন অবস্থার অবকাল"
 
@@ -7970,6 +7978,75 @@ 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-এ উপস্থিত থাকাকালীন নয়"
+
 msgid "Aquarius"
 msgstr "কুম্ভ"
 
@@ -8252,6 +8329,11 @@ msgstr "অনুরোধ করা হচ্ছে"
 msgid "Admin"
 msgstr "অ্যাডমিন"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "রুমের তালিকা"
+
 msgid "Notice"
 msgstr "বিজ্ঞপ্তি"
 
@@ -10159,9 +10241,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! প্রোটোকল প্লাগ-ইন"
 
-msgid "Pager server"
-msgstr "পেজার সার্ভার"
-
 msgid "Pager port"
 msgstr "পেজার পোর্ট"
 
@@ -10177,18 +10256,13 @@ 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 Chat সার্ভার"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat পোর্ট"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10257,6 +10331,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 "ব্যবহারকারী নাম অথবা পাসওয়ার্ড অনুপস্থিত"
@@ -10333,6 +10416,17 @@ msgstr "%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 ""
+"MXit সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ। অনুগ্রহ করে সার্ভারের বৈশিষ্ট্য পরীক্ষা "
+"করুন।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "ঘরে অনুপস্থিত"
 
@@ -10712,6 +10806,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)"
 
@@ -10951,12 +11049,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 "লগ-ইন সংক্রান্ত বিকল্প"
@@ -12122,6 +12214,10 @@ msgstr "আফ্রিকান্স"
 msgid "Arabic"
 msgstr "আরবি"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "লজ্জিত"
+
 msgid "Belarusian Latin"
 msgstr "বেলারুশিয়ান লাতিন"
 
@@ -12131,6 +12227,10 @@ msgstr "বুলগারিয়ান"
 msgid "Bengali"
 msgstr "বাংলা"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "বাংলা"
+
 msgid "Bosnian"
 msgstr "বসনিয়ান"
 
@@ -12245,6 +12345,10 @@ msgstr "লাও"
 msgid "Macedonian"
 msgstr "মেসিডোনিয়ান"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "মালায়"
+
 msgid "Mongolian"
 msgstr "মঙ্গোলিয়ান"
 
@@ -12359,8 +12463,8 @@ msgid ""
 "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>"
+"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 "
@@ -12914,15 +13018,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 ""
 "%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?"
@@ -13028,11 +13132,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "একটি ভিন্ন libpurple ক্লায়েন্ট বর্তমানে চলছে। এই কারণে প্রস্থান করা হচ্ছে।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/মিডিয়া (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল সমাপ্ত করুন (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "কল সমাপ্ত করুন"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13835,10 +13941,6 @@ msgstr "শর্ট-কাটের লেখা"
 msgid "Custom Smiley Manager"
 msgstr "স্বনির্ধারিত হাসিমুখ পরিচালন ব্যবস্থা"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "সক্রিয়করণ আবশ্যক"
-
 msgid "Select Buddy Icon"
 msgstr "বন্ধুর আইকন নির্বাচন করুন"
 
@@ -14974,8 +15076,20 @@ msgstr "প্রতি N মিনিট অন্তর iChat-বিন্য�
 msgid "Timestamp Format Options"
 msgstr "সময়ের চিহ্ন প্রদর্শনের বিন্যাসের বিকল্প"
 
-#, c-format
-msgid "_Force 24-hour time format"
+#, 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..."
@@ -15180,6 +15294,199 @@ msgstr "Raw XMPP অনুচ্ছেদ প্রেরণ ও প্রাপ
 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 "/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 "কনফারেন্স প্রস্তুত করতে সমস্যা।"
 
diff --git a/po/bs.po b/po/bs.po
index c7de16093f..d32707e169 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -809,7 +822,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "Cekanje na pocetak transfera"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkazano"
 
 msgid "Failed"
@@ -1320,6 +1333,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 +1443,6 @@ msgid "Saved Statuses"
 msgstr "Statistike servera"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titula"
 
@@ -1632,7 +1648,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1734,6 +1750,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"
 
@@ -1752,9 +1776,10 @@ 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."
 msgstr ""
@@ -1992,7 +2017,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."
@@ -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 "Ime"
 
@@ -3926,16 +3953,6 @@ msgstr "Komanda iskljucena"
 msgid "execute"
 msgstr "Neocekivan"
 
-#, fuzzy
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Serveru je potrebna (tekstualna) autentikacija preko nekriptovanog toka"
@@ -3969,6 +3986,19 @@ 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"
 
@@ -3977,6 +4007,42 @@ msgid "SASL error: %s"
 msgstr "Greška prilikom citanja"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Finaliziranje konekcije"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Nepodržana verzija"
+
+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 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"
 
@@ -4047,6 +4113,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"
 
@@ -4061,10 +4128,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"
 
@@ -4298,6 +4369,16 @@ msgid "Roles:"
 msgstr "Uloga"
 
 #, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
+
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Obicni tekst"
 
@@ -4305,6 +4386,9 @@ msgstr "Obicni tekst"
 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 ""
 
@@ -4411,7 +4495,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Neautorizovani"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -4433,7 +4516,6 @@ msgstr "Prema"
 msgid "None (To pending)"
 msgstr "Ništa (prema toku)"
 
-#. 0
 msgid "None"
 msgstr "Niko"
 
@@ -4457,6 +4539,12 @@ msgstr "Srednje ime"
 msgid "Mood Comment"
 msgstr "Komentar prijatelja"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4633,9 +4721,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"
 
@@ -5001,7 +5086,6 @@ msgstr "Posramljen/a"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Ljut/a"
 
@@ -5099,7 +5183,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Nemiran/a"
 
-#. 2
 msgid "Excited"
 msgstr "Uzbuden/a"
 
@@ -5117,7 +5200,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Spajanje…"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupa:"
@@ -5126,14 +5208,12 @@ msgstr "Grupa:"
 msgid "Guilty"
 msgstr "Grad"
 
-#. 4
 msgid "Happy"
 msgstr "Sretan/a"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5174,7 +5254,6 @@ msgstr "Sucelje"
 msgid "Intoxicated"
 msgstr "Pozovi"
 
-#. 6
 msgid "Invincible"
 msgstr "Nedodirljiv/a"
 
@@ -5238,7 +5317,6 @@ msgstr "Odstrani"
 msgid "Restless"
 msgstr "Registruj se"
 
-#. 7
 msgid "Sad"
 msgstr "Tužan/a"
 
@@ -5259,12 +5337,10 @@ msgstr "Blokirano"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nadimak"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Pospan/a"
@@ -5689,19 +5765,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"
@@ -5875,9 +5938,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Poslovna titula"
-
 msgid "Company"
 msgstr "Kompanija"
 
@@ -5978,6 +6038,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"
 
@@ -6178,27 +6242,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Zaljubljen/a"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Vaše trenutno raspoloženje"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Korisnicki modusi"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Promjeni lozinku"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "Ukucani SecurID je pogrešan."
@@ -6235,7 +6278,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"
@@ -6244,6 +6291,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prikaz"
@@ -6275,11 +6323,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..."
@@ -6323,7 +6366,7 @@ msgid "Connecting..."
 msgstr "Spajanje"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ukucani SecurID je pogrešan."
 
 #, fuzzy
@@ -6331,14 +6374,9 @@ 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"
@@ -6375,10 +6413,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
@@ -6392,7 +6430,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Sigurnost omogucena"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Promjeni lozinku"
@@ -6426,12 +6464,17 @@ 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")
@@ -6446,6 +6489,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 ""
@@ -6565,6 +6630,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Zaljubljen/a"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Pošalji"
@@ -6984,9 +7052,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"
 
@@ -7057,8 +7122,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)."
@@ -7246,6 +7311,10 @@ 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"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nemoguce spajanje"
@@ -7254,6 +7323,67 @@ msgstr "Nemoguce spajanje"
 msgid "Invalid chat room name"
 msgstr "Pogrešno ime sobe"
 
+msgid "Invalid error"
+msgstr "Nevažeca greška"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Nemoguce poslati datoteku"
+
+#. 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 "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 "Nije moguce poslati poruku."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7426,120 +7556,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Nemoguce poslati datoteku"
-
-#. 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 "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 "Nije moguce poslati poruku."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "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 "
@@ -7894,29 +7910,10 @@ 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"
 
@@ -8361,6 +8358,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8702,6 +8768,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"
@@ -10710,10 +10781,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"
 
@@ -10730,20 +10797,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"
@@ -10815,6 +10875,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"
@@ -10874,8 +10943,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"
@@ -10898,6 +10967,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"
 
@@ -11302,6 +11382,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"
@@ -11555,12 +11639,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"
@@ -12848,6 +12926,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharski"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Posramljen/a"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12857,6 +12939,9 @@ msgstr "Bugarski"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Estonski"
@@ -12982,6 +13067,10 @@ msgid "Macedonian"
 msgstr "Makedonski"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Muško"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonski"
 
@@ -13105,8 +13194,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13686,14 +13775,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
@@ -13782,10 +13871,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
@@ -14705,10 +14794,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Potrebna registracija"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Izaberite prijatelja"
 
@@ -15938,7 +16023,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..."
@@ -16157,6 +16252,196 @@ msgstr ""
 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."
+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 "Prihvati standardne postavke"
+
+#. $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 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 "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"
@@ -16290,9 +16575,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Korisnik:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime verzija"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Racunanje..."
@@ -16767,7 +17049,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."
@@ -18143,8 +18425,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"
diff --git a/po/ca.po b/po/ca.po
index 8a814992b1..407b78a455 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: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-16 23:08+0100\n"
+"POT-Creation-Date: 2010-08-01 08:49+0200\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"
 
@@ -643,7 +657,6 @@ msgstr "Envia a"
 msgid "Conversation"
 msgstr "Conversa"
 
-# FIXME ?
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
@@ -821,7 +834,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 +893,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 +1073,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 +1307,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 +1403,6 @@ msgid "Saved Statuses"
 msgstr "Estats desats"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1514,7 +1528,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 +1603,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 +1696,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,8 +1721,12 @@ 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."
@@ -1946,7 +1969,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"
 
@@ -2274,7 +2296,7 @@ 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 +2788,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
@@ -3223,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"
 
@@ -3829,15 +3853,6 @@ 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"
 
@@ -3868,6 +3883,19 @@ 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"
 
@@ -3875,6 +3903,43 @@ msgstr "Ha fallat l'autenticació SASL"
 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"
@@ -3892,7 +3957,7 @@ 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"
@@ -3939,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"
 
@@ -3953,10 +4019,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"
 
@@ -4175,16 +4245,28 @@ msgstr "No s'ha trobat cap usuari"
 msgid "Roles:"
 msgstr "Rols:"
 
+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 "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"
 
@@ -4278,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"
 
@@ -4301,7 +4382,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -4315,15 +4395,18 @@ msgstr "Text sobre l'estat d'ànim"
 msgid "Allow Buzz"
 msgstr "Permet les botzines"
 
-# Segons la viquipèdia
-#, fuzzy
 msgid "Mood Name"
-msgstr "Nom del mig"
+msgstr "Nom de l'estat d'ànim"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Comentari de l'amic"
+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"
 
@@ -4400,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"
@@ -4478,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"
@@ -4495,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"
 
@@ -4616,9 +4695,8 @@ msgstr "Seleccioneu un recurs"
 msgid "Initiate Media"
 msgstr "Inicia el medi"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Aquest protocol no implementa sales de xat."
+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."
@@ -4673,9 +4751,8 @@ 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ó"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Seleccioneu l'usuari correcte"
+msgstr "modd: estableix l'estat d'ànim de l'usuari"
 
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
@@ -4759,13 +4836,13 @@ msgstr ""
 "és massa llarga."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Falta la capçalera del flux XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Les versions del XMPP no coincideixen"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Manca l'identificador del fluxe XMPP"
 
 msgid "XML Parse error"
 msgstr "Error en l'anàlisi de l'XML"
@@ -4809,7 +4886,7 @@ msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "S'ha produit un error en el fluxe de transferència de dades en banda\n"
+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."
@@ -4845,32 +4922,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Àrab"
+msgstr "Espantat"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Avergonyit"
+msgstr "Al·lucinant"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Gloriós"
+msgstr "Amorós"
 
-#. 1
 msgid "Angry"
 msgstr "Enfadat"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Bandejat"
+msgstr "Emprenyat"
 
 msgid "Anxious"
 msgstr "Ansiós"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "S'enviarà"
+msgstr "Animat"
 
 msgid "Ashamed"
 msgstr "Avergonyit"
@@ -4878,289 +4949,231 @@ msgstr "Avergonyit"
 msgid "Bored"
 msgstr "Avorrit"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Desa"
+msgstr "Brau"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Regne"
+msgstr "Calmat"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Xats"
+msgstr "Prudent"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Negreta"
+msgstr "Fred"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflicte"
+msgstr "Amb confiança"
 
-#, fuzzy
 msgid "Confused"
-msgstr "_Configura"
+msgstr "Confós"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contacte"
+msgstr "Contemplatiu"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Connectat"
+msgstr "Acontentat"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Empresa"
+msgstr "Empipat"
 
-#, fuzzy
 msgid "Crazy"
-msgstr "Crazychat"
+msgstr "Boig"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Crea"
+msgstr "Creatiu"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Gloriós"
+msgstr "Curiós"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Rebutjat"
+msgstr "Enfonsat"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Suprimit"
+msgstr "Deprimit"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Desconnectat."
+msgstr "Decebut"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Repugnat"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Inhabilitat"
+msgstr "Descoratjat"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Separat"
+msgstr "Distret"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Avergonyit"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Ansiós"
+msgstr "Envejós"
 
-#. 2
 msgid "Excited"
 msgstr "Excitat"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Gloriós"
+msgstr "Amb ganes de flirtar"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Nom"
+msgstr "Frustrat"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Agraït"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "S'està recuperant..."
+msgstr "De dol"
 
-#. 3
 msgid "Grumpy"
 msgstr "Rondinaire"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Ciutat"
+msgstr "Culpable"
 
-#. 4
 msgid "Happy"
 msgstr "Content"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Esperançat"
 
-#. 8
 msgid "Hot"
 msgstr "Calent"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Avergonyit"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Humiliat"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Enfadat"
+msgstr "Afamat"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Ferit"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impressionat"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Enamorat"
+msgstr "Reverent"
 
 msgid "In love"
 msgstr "Enamorat"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesi"
+msgstr "Indignant"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interessos"
+msgstr "Interessat"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Convidat"
+msgstr "Intoxicat"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencible"
 
 msgid "Jealous"
 msgstr "Gelós"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Mico"
+msgstr "Sol"
 
-#, fuzzy
 msgid "Lost"
-msgstr "El més alt"
+msgstr "Perdut"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Sortós"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Alemany"
+msgstr "Malèvol"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Estat d'ànim"
+msgstr "Llunàtic"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nerviós"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detalls"
+msgstr "Neutral"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Fora de línia"
+msgstr "Ofès"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Enrabiat"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Reprodueix"
+msgstr "Juganer"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Alt"
+msgstr "Orgullós"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Nom real"
+msgstr "Relaxat"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Rebuts"
+msgstr "Alleujat"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Suprimeix"
+msgstr "Amb remordiments"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registra"
+msgstr "Neguitós"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Marathi"
+msgstr "Sarcàstic"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfet"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Gloriós"
+msgstr "Seriós"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blocat"
+msgstr "En estat de xoc"
 
 msgid "Shy"
-msgstr ""
+msgstr "Vergonyós"
 
-#. 9
 msgid "Sick"
 msgstr "Malalt"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Endormiscat"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Espontani"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Velocitat"
+msgstr "Estressat"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Cançó"
+msgstr "Fort"
 
-#, fuzzy
 msgid "Surprised"
-msgstr "morrejat"
+msgstr "Sorprès"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Agraït"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Assedegat"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Cansat"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Subratllat"
+msgstr "Indefinit"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Bufetejar"
+msgstr "Decandit"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Avorrit"
+msgstr "Preocupat"
 
 msgid "Set User Nickname"
 msgstr "Estableix el sobrenom de l'usuari"
@@ -5525,18 +5538,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"
 
@@ -5684,9 +5685,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Feina"
 
-msgid "Job Title"
-msgstr "Títol de la feina"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5775,6 +5773,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ó"
 
@@ -5980,24 +5981,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."
 
-#. 5
-msgid "In Love"
-msgstr "Enamorat"
-
-#. 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."
 
@@ -6010,8 +5993,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'."
@@ -6033,7 +6016,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"
 
@@ -6041,6 +6028,7 @@ msgid "Verify PIN"
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -6067,10 +6055,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..."
@@ -6103,19 +6087,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"
@@ -6147,11 +6124,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."
@@ -6162,7 +6141,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"
 
@@ -6188,12 +6167,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")
@@ -6206,6 +6189,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."
@@ -6311,6 +6311,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"
 
@@ -6714,9 +6717,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"
 
@@ -6807,8 +6807,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)."
@@ -6854,8 +6854,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)."
@@ -6876,7 +6876,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);
@@ -6985,114 +6985,157 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL no permet que us autentiqueu amb aquest nom d'usuari aquí"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "S'ha produït un error en sol·licitar %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 "Cannot receive IM due to parental controls"
+msgstr "Els controls parentals no permeten que es pugui rebre MI"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "No es poden enviar SMS si no s'accepten els termes"
+
+msgid "Cannot send SMS"
+msgstr "No s'ha pogut enviar l'SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "No es poden enviar SMS a aquest país"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "No es poden enviar SMS a un país desconegut"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Els robots no poden iniciar MI"
+
+msgid "Bot account cannot IM this user"
+msgstr "Aquest robot no pot fer MI amb aquest usuari"
+
+msgid "Bot account reached IM limit"
+msgstr "Aquest robot ha superat el límit de MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Aquest robot ha superat el límit de MI diari"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Aquest robot ha superat el límit de MI mensual"
+
+msgid "Unable to receive offline messages"
+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"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Pensant"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Pari d'escriure"
+msgstr "Comprant"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Diàleg de pregunta"
+msgstr "Preguntant"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Radiomissatgeria"
+msgstr "Menjant"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Jugant a un joc"
+msgstr "Mirant una pel·lícula"
 
 msgid "Typing"
 msgstr "Teclejant"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Fora de l'oficina"
+msgstr "A l'oficina"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Prenent un bany"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Mirant la tele"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Penja"
+msgstr "Passant-ho bé"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Endormiscat"
+msgstr "Dormint"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Emprant el PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Amics de MI"
+msgstr "Amb amics"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Al telèfon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Recurrent"
+msgstr "Navegant"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mòbil"
 
-#, fuzzy
 msgid "Searching the web"
-msgstr "Avisa l'usuari"
+msgstr "Cercant a la web"
 
-#, fuzzy
 msgid "At a party"
-msgstr "Port d'autorització"
+msgstr "En una festa"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Prenent un cafè"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Jocs d'usuari"
+msgstr "Jugant"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Navegant la web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Cançó"
+msgstr "Fumant"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Treballant"
+msgstr "Escrivint"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Treballant"
+msgstr "Bevent"
 
 # És un estat, com "fora de línia", etc. (josep)
 msgid "Listening to music"
 msgstr "Escoltant música"
 
-#, fuzzy
 msgid "Studying"
-msgstr "S'està enviant"
+msgstr "Estudiant"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interessos"
+msgstr "Al lavabo"
 
 msgid "Received invalid data on connection with server"
 msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
@@ -7162,116 +7205,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "No es poden enviar SMS si no s'accepten els termes"
-
-msgid "Cannot send SMS"
-msgstr "No s'ha pogut enviar l'SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "No es poden enviar SMS a aquest país"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "No es poden enviar SMS a un país desconegut"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Els robots no poden iniciar MI"
-
-msgid "Bot account cannot IM this user"
-msgstr "Aquest robot no pot fer MI amb aquest usuari"
-
-msgid "Bot account reached IM limit"
-msgstr "Aquest robot ha superat el límit de MI"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Aquest robot ha superat el límit de MI diari"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Aquest robot ha superat el límit de MI mensual"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7309,7 +7242,7 @@ msgid "Games"
 msgstr "Jocs"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Afegits"
@@ -7377,25 +7310,20 @@ msgstr "Conscient de la web"
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Correu electrònic"
+msgstr "Maliciós"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Professió"
+msgstr "Depressió"
 
-#, fuzzy
 msgid "At home"
-msgstr "Quant a mi"
+msgstr "A casa"
 
-#, fuzzy
 msgid "At work"
-msgstr "Xarxa"
+msgstr "A la feina"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "A fora dinant"
+msgstr "Dinant"
 
 msgid "IP Address"
 msgstr "Adreça IP"
@@ -7599,8 +7527,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 ""
@@ -7628,28 +7556,9 @@ 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"
 
@@ -7910,9 +7819,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enllaç al magatzem de música iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Dinar"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7945,9 +7853,8 @@ msgstr "Obtén informació de AIM"
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Aconsegueix el missatge d'estat"
+msgstr "Aconsegueix el missatge d'estat X"
 
 msgid "End Direct IM Session"
 msgstr "Finalitzar la sessió de MI directa"
@@ -8077,6 +7984,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -8333,10 +8309,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"
@@ -8362,6 +8338,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"
 
@@ -8799,7 +8780,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"
@@ -8961,10 +8942,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 ""
@@ -10028,8 +10009,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"
@@ -10038,7 +10020,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"
@@ -10259,7 +10241,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
@@ -10274,9 +10256,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"
 
@@ -10294,20 +10273,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
@@ -10375,6 +10349,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"
@@ -10454,6 +10437,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"
 
@@ -10500,13 +10493,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..."
@@ -10564,7 +10557,7 @@ msgstr ""
 "navegador:"
 
 msgid "Yahoo! ID"
-msgstr "ID de Yahoo!"
+msgstr "Identificador de Yahoo!"
 
 msgid "Hobbies"
 msgstr "Aficions"
@@ -10844,6 +10837,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"
 
@@ -10910,9 +10907,8 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "S'està rebent"
+msgstr "Estat d'ànim"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11085,12 +11081,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"
@@ -11460,13 +11450,11 @@ msgstr "No esteu connectat amb cap protocol que permeti afegir aquest amic."
 msgid "Unknown node type"
 msgstr "Codi d'error desconegut"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Seleccioneu l'estat d'ànim de la llista."
+msgstr "Seleccioneu l'estat d'ànim de la llista"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Àlies (opcional)"
+msgstr "Missatge (opcional)"
 
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
@@ -11550,9 +11538,8 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Eines/_Registre del sistema"
+msgstr "/Eines/Esta_bleix l'estat d'ànim"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
@@ -11573,20 +11560,17 @@ msgstr "/A_juda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en línia"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "/Ajuda/Informació sobre el _muntatge"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informació del servidor"
+msgstr "/Ajuda/Informació sobre els d_esenvolupadors"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Informació personal"
+msgstr "/Ajuda/Informació sobre els _traductors"
 
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
@@ -11815,9 +11799,8 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Estableix l'estat d'ànim..."
+msgstr "Estableix l'_estat d'ànim..."
 
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
@@ -11938,15 +11921,14 @@ msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversa/Aconsegueix informació"
+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..."
@@ -11961,16 +11943,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..."
@@ -12023,9 +12005,8 @@ msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversa/Aconsegueix informació"
+msgstr "/Conversa/Aconsegueix atenció"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afegeix avís per a l'amic..."
@@ -12091,13 +12072,11 @@ msgstr "_Envia"
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Tanca aquesta pestanya"
+msgstr "Tanca la barra de cerca"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Cerca"
+msgstr "Cerca:"
 
 #, c-format
 msgid "%d person in room"
@@ -12265,6 +12244,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Àrab"
 
+msgid "Assamese"
+msgstr "Assamès"
+
 msgid "Belarusian Latin"
 msgstr "Bielorús (llatí)"
 
@@ -12274,6 +12256,9 @@ msgstr "Búlgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí (Ìndia)"
+
 msgid "Bosnian"
 msgstr "Bosnià"
 
@@ -12389,6 +12374,9 @@ msgstr "Lasià"
 msgid "Macedonian"
 msgstr "Macedoni"
 
+msgid "Malayalam"
+msgstr "Malaiàlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
@@ -12500,25 +12488,23 @@ msgstr "Amhàric"
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12527,8 +12513,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12538,26 +12527,25 @@ msgid ""
 "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 "About %s"
 msgstr "Quant al %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "Informació sobre el muntatge"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "Informació sobre el muntatge del %s"
 
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
@@ -12571,9 +12559,9 @@ msgstr "Desenvolupadors retirats"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escriptors de pedaços retirats"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informació del servidor"
+msgstr "Informació sobre els desenvolupadors del %s"
 
 msgid "Current Translators"
 msgstr "Traductors actuals"
@@ -12581,9 +12569,9 @@ msgstr "Traductors actuals"
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Més informació"
+msgstr "Informació sobre els traductors del %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -13002,9 +12990,8 @@ msgstr "Insereix una imatge de MI"
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Alerta!"
+msgstr "Envia atenció"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
@@ -13052,9 +13039,8 @@ msgstr "Línia _horitzontal"
 msgid "_Smile!"
 msgstr "_Somrieu!"
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Alerta!"
+msgstr "_Atenció!"
 
 msgid "Log Deletion Failed"
 msgstr "No s'ha pogut suprimir el registre"
@@ -13072,16 +13058,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?"
@@ -13131,7 +13117,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"
 
@@ -13191,11 +13176,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."
@@ -13237,7 +13222,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"
@@ -13310,7 +13296,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"
@@ -13720,7 +13705,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:"
@@ -13978,7 +13963,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"
@@ -14008,10 +13994,6 @@ msgstr "Drecera"
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Cal activació"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccioneu una icona per a l'amic"
 
@@ -15161,8 +15143,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..."
@@ -15366,9 +15357,220 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia i rep blocs XMPP en brut."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
+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."
+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 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."
@@ -15536,9 +15738,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..."
 
@@ -16127,7 +16326,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."
@@ -16507,9 +16706,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"
 
@@ -16954,9 +17150,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>"
 
@@ -17112,8 +17305,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"
+#~ "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"
@@ -17865,9 +18058,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 ca03404fdf..880bca243f 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -33,13 +33,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-16 23:08+0100\n"
+"POT-Creation-Date: 2010-08-02 09:57-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. Translators may want to transliterate the name.
@@ -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,7 +336,8 @@ msgstr ""
 "En suprimir este contacte, també se suprimiran tots els amics que hi haja"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "En suprimir este grup, també se suprimiran tots els amics que hi haja"
+msgstr ""
+"En suprimir este grup, també se suprimiran tots els amics que hi haja"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -581,7 +596,8 @@ 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."
@@ -641,7 +657,6 @@ msgstr "Envia a"
 msgid "Conversation"
 msgstr "Conversa"
 
-# FIXME ?
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
@@ -754,8 +769,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."
@@ -819,7 +834,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"
@@ -1058,7 +1073,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"
 
@@ -1293,6 +1307,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"
 
@@ -1386,7 +1403,6 @@ msgid "Saved Statuses"
 msgstr "Estats alçats"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1512,7 +1528,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."
 
@@ -1527,7 +1542,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"
@@ -1588,7 +1603,7 @@ msgstr ""
 msgid "Online"
 msgstr "En línia"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1681,6 +1696,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"
 
@@ -1700,8 +1721,12 @@ 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."
@@ -1944,7 +1969,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"
 
@@ -2164,7 +2188,8 @@ msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un terminal."
+"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un "
+"terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si l'orde especificada ha de gestionar URL «aim»"
@@ -2271,7 +2296,7 @@ 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)"
@@ -2717,8 +2742,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"
@@ -2763,7 +2788,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
@@ -2787,7 +2811,8 @@ 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
@@ -2814,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..."
@@ -3219,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"
 
@@ -3648,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 "
@@ -3825,15 +3853,6 @@ 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"
 
@@ -3864,6 +3883,19 @@ 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"
 
@@ -3871,6 +3903,43 @@ msgstr "Ha fallat l'autenticació SASL"
 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"
@@ -3888,7 +3957,7 @@ 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"
@@ -3935,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"
 
@@ -3949,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"
 
@@ -4171,16 +4245,28 @@ msgstr "No s'ha trobat cap usuari"
 msgid "Roles:"
 msgstr "Rols:"
 
+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 "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"
 
@@ -4274,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"
 
@@ -4297,7 +4382,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
-#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -4311,15 +4395,18 @@ msgstr "Text sobre l'estat d'ànim"
 msgid "Allow Buzz"
 msgstr "Permet les botzines"
 
-# Segons la viquipèdia
-#, fuzzy
 msgid "Mood Name"
-msgstr "Nom del mig"
+msgstr "Nom de l'estat d'ànim"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Comentari de l'amic"
+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"
 
@@ -4396,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"
@@ -4474,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"
@@ -4491,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"
 
@@ -4612,9 +4695,8 @@ msgstr "Seleccioneu un recurs"
 msgid "Initiate Media"
 msgstr "Inicia el medi"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Este protocol no implementa sales de xat."
+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."
@@ -4669,9 +4751,8 @@ 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ó"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Seleccioneu l'usuari correcte"
+msgstr "modd: estableix l'estat d'ànim de l'usuari"
 
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
@@ -4755,13 +4836,13 @@ msgstr ""
 "és massa llarga."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Falta la capçalera del flux XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Les versions del XMPP no coincideixen"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Manca l'identificador del fluxe XMPP"
 
 msgid "XML Parse error"
 msgstr "Error en l'anàlisi de l'XML"
@@ -4805,7 +4886,7 @@ msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "S'ha produit un error en el fluxe de transferència de dades en banda\n"
+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."
@@ -4841,32 +4922,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Àrab"
+msgstr "Espantat"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Avergonyit"
+msgstr "Al·lucinant"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Gloriós"
+msgstr "Amorós"
 
-#. 1
 msgid "Angry"
 msgstr "Enfadat"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Bandejat"
+msgstr "Emprenyat"
 
 msgid "Anxious"
 msgstr "Ansiós"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "S'enviarà"
+msgstr "Animat"
 
 msgid "Ashamed"
 msgstr "Avergonyit"
@@ -4874,289 +4949,231 @@ msgstr "Avergonyit"
 msgid "Bored"
 msgstr "Avorrit"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Alça"
+msgstr "Brau"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Regne"
+msgstr "Calmat"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Xats"
+msgstr "Prudent"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Negreta"
+msgstr "Fred"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflicte"
+msgstr "Amb confiança"
 
-#, fuzzy
 msgid "Confused"
-msgstr "_Configura"
+msgstr "Confós"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contacte"
+msgstr "Contemplatiu"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Connectat"
+msgstr "Acontentat"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Empresa"
+msgstr "Empipat"
 
-#, fuzzy
 msgid "Crazy"
-msgstr "Crazychat"
+msgstr "Boig"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Crea"
+msgstr "Creatiu"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Gloriós"
+msgstr "Curiós"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Rebutjat"
+msgstr "Enfonsat"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Suprimit"
+msgstr "Deprimit"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Desconnectat."
+msgstr "Decebut"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Repugnat"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Inhabilitat"
+msgstr "Descoratjat"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Separat"
+msgstr "Distret"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Avergonyit"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Ansiós"
+msgstr "Envejós"
 
-#. 2
 msgid "Excited"
 msgstr "Excitat"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Gloriós"
+msgstr "Amb ganes de flirtar"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Nom"
+msgstr "Frustrat"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Agraït"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "S'està recuperant..."
+msgstr "De dol"
 
-#. 3
 msgid "Grumpy"
 msgstr "Rondinaire"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Ciutat"
+msgstr "Culpable"
 
-#. 4
 msgid "Happy"
 msgstr "Content"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Esperançat"
 
-#. 8
 msgid "Hot"
 msgstr "Calent"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Avergonyit"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Humiliat"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Enfadat"
+msgstr "Afamat"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Ferit"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impressionat"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Enamorat"
+msgstr "Reverent"
 
 msgid "In love"
 msgstr "Enamorat"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesi"
+msgstr "Indignant"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interessos"
+msgstr "Interessat"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Convidat"
+msgstr "Intoxicat"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencible"
 
 msgid "Jealous"
 msgstr "Gelós"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Mico"
+msgstr "Sol"
 
-#, fuzzy
 msgid "Lost"
-msgstr "El més alt"
+msgstr "Perdut"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Sortós"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Alemany"
+msgstr "Malèvol"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Estat d'ànim"
+msgstr "Llunàtic"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nerviós"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detalls"
+msgstr "Neutral"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Fora de línia"
+msgstr "Ofès"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Enrabiat"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Reprodueix"
+msgstr "Juganer"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Alt"
+msgstr "Orgullós"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Nom real"
+msgstr "Relaxat"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Rebuts"
+msgstr "Alleujat"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Suprimeix"
+msgstr "Amb remordiments"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registra"
+msgstr "Neguitós"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Marathi"
+msgstr "Sarcàstic"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfet"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Gloriós"
+msgstr "Seriós"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blocat"
+msgstr "En estat de xoc"
 
 msgid "Shy"
-msgstr ""
+msgstr "Vergonyós"
 
-#. 9
 msgid "Sick"
 msgstr "Malalt"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Endormiscat"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Espontani"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Velocitat"
+msgstr "Estressat"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Cançó"
+msgstr "Fort"
 
-#, fuzzy
 msgid "Surprised"
-msgstr "morrejat"
+msgstr "Sorprés"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Agraït"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Assedegat"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Cansat"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Subratllat"
+msgstr "Indefinit"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Bufetejar"
+msgstr "Decandit"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Avorrit"
+msgstr "Preocupat"
 
 msgid "Set User Nickname"
 msgstr "Estableix el sobrenom de l'usuari"
@@ -5479,7 +5496,8 @@ msgstr "No hi ha text blocat per este compte."
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
+msgstr ""
+"Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "Este compte no té el correu habilitat."
@@ -5520,18 +5538,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"
 
@@ -5679,9 +5685,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Faena"
 
-msgid "Job Title"
-msgstr "Títol de la faena"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5770,6 +5773,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è vos pare atenció"
 
@@ -5975,24 +5981,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."
 
-#. 5
-msgid "In Love"
-msgstr "Enamorat"
-
-#. 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."
 
@@ -6005,8 +5993,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'."
@@ -6028,7 +6016,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"
 
@@ -6036,6 +6028,7 @@ msgid "Verify PIN"
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -6062,10 +6055,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..."
@@ -6098,19 +6087,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"
@@ -6142,11 +6124,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."
@@ -6157,7 +6141,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"
 
@@ -6183,12 +6167,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")
@@ -6201,6 +6189,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."
@@ -6306,6 +6311,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"
 
@@ -6468,8 +6476,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."
@@ -6709,9 +6717,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"
 
@@ -6725,7 +6730,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"
@@ -6745,7 +6750,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"
@@ -6766,7 +6771,8 @@ 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"
@@ -6782,8 +6788,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)."
@@ -6870,7 +6876,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);
@@ -6979,114 +6985,157 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL no permet que vos autentiqueu amb este nom d'usuari ací"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "S'ha produït un error en sol·licitar %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 "Cannot receive IM due to parental controls"
+msgstr "Els controls parentals no permeten que es puga rebre MI"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "No es poden enviar SMS si no s'accepten els termes"
+
+msgid "Cannot send SMS"
+msgstr "No s'ha pogut enviar l'SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "No es poden enviar SMS a este país"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "No es poden enviar SMS a un país desconegut"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Els robots no poden iniciar MI"
+
+msgid "Bot account cannot IM this user"
+msgstr "Este robot no pot fer MI amb este usuari"
+
+msgid "Bot account reached IM limit"
+msgstr "Este robot ha superat el límit de MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Este robot ha superat el límit de MI diari"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Este robot ha superat el límit de MI mensual"
+
+msgid "Unable to receive offline messages"
+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"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Pensant"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Pare d'escriure"
+msgstr "Comprant"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Diàleg de pregunta"
+msgstr "Preguntant"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Radiomissatgeria"
+msgstr "Menjant"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Jugant a un joc"
+msgstr "Mirant una pel·lícula"
 
 msgid "Typing"
 msgstr "Teclejant"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Fora de l'oficina"
+msgstr "A l'oficina"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Prenent un bany"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Mirant la tele"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Penja"
+msgstr "Passant-ho bé"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Endormiscat"
+msgstr "Dormint"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Emprant el PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Amics de MI"
+msgstr "Amb amics"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Al telèfon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Recurrent"
+msgstr "Navegant"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mòbil"
 
-#, fuzzy
 msgid "Searching the web"
-msgstr "Avisa l'usuari"
+msgstr "Cercant a la web"
 
-#, fuzzy
 msgid "At a party"
-msgstr "Port d'autorització"
+msgstr "En una festa"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Prenent un cafè"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Jocs d'usuari"
+msgstr "Jugant"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Navegant la web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Cançó"
+msgstr "Fumant"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Treballant"
+msgstr "Escrivint"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Treballant"
+msgstr "Bevent"
 
 # És un estat, com "fora de línia", etc. (josep)
 msgid "Listening to music"
 msgstr "Escoltant música"
 
-#, fuzzy
 msgid "Studying"
-msgstr "S'està enviant"
+msgstr "Estudiant"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interessos"
+msgstr "Al lavabo"
 
 msgid "Received invalid data on connection with server"
 msgstr "S'han rebut dades invàlides a la connexió amb el servidor"
@@ -7147,8 +7196,8 @@ 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 "
+"%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
@@ -7156,116 +7205,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "No es poden enviar SMS si no s'accepten els termes"
-
-msgid "Cannot send SMS"
-msgstr "No s'ha pogut enviar l'SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "No es poden enviar SMS a este país"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "No es poden enviar SMS a un país desconegut"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Els robots no poden iniciar MI"
-
-msgid "Bot account cannot IM this user"
-msgstr "Este robot no pot fer MI amb este usuari"
-
-msgid "Bot account reached IM limit"
-msgstr "Este robot ha superat el límit de MI"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Este robot ha superat el límit de MI diari"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Este robot ha superat el límit de MI mensual"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7282,8 +7221,9 @@ msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(S'ha produït un error en rebre este missatge. És molt possible que %s empri "
-"una codificació diferent a la vostra, o que %s tinga un client defectuós)"
+"(S'ha produït un error en rebre este missatge. És molt possible que %s "
+"empri una codificació diferent a la vostra, o que %s tinga un client "
+"defectuós)"
 
 #. Label
 msgid "Buddy Icon"
@@ -7302,7 +7242,7 @@ msgid "Games"
 msgstr "Jocs"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Afegits"
@@ -7370,25 +7310,20 @@ msgstr "Conscient de la web"
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Correu electrònic"
+msgstr "Maliciós"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Professió"
+msgstr "Depressió"
 
-#, fuzzy
 msgid "At home"
-msgstr "Quant a mi"
+msgstr "A casa"
 
-#, fuzzy
 msgid "At work"
-msgstr "Xarxa"
+msgstr "A la faena"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "A fora dinant"
+msgstr "Dinant"
 
 msgid "IP Address"
 msgstr "Adreça IP"
@@ -7423,9 +7358,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."
@@ -7592,8 +7527,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 ""
@@ -7621,28 +7556,9 @@ 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"
 
@@ -7903,9 +7819,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enllaç al magatzem de música iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Dinar"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7938,9 +7853,8 @@ msgstr "Obtén informació d'AIM"
 msgid "Edit Buddy Comment"
 msgstr "Edita el comentari sobre l'amic"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Aconsegueix el missatge d'estat"
+msgstr "Aconsegueix el missatge d'estat X"
 
 msgid "End Direct IM Session"
 msgstr "Finalitzar la sessió de MI directa"
@@ -7981,8 +7895,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"
@@ -8070,6 +7984,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -8326,10 +8309,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"
@@ -8355,6 +8338,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"
 
@@ -8429,11 +8417,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"
@@ -8441,8 +8429,7 @@ msgstr "No s'ha pogut entrar al Qun %u, administrat per %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-"<b>L'administrador %2$u 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>"
@@ -8572,8 +8559,7 @@ 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"
 
-#, fuzzy
-msgid "<i>Feel free to join us!</i> :)"
+msgid "<i>Feel free to join vos!</i> :)"
 msgstr "<i>No dubteu a col·laborar amb nosaltres!</i> :)"
 
 #, c-format
@@ -8794,7 +8780,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"
@@ -8909,8 +8895,8 @@ msgid ""
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari %"
-"s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
+"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari "
+"%s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
 "convidar-hi l'usuari."
 
 msgid "Invite to Conference"
@@ -8956,10 +8942,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 ""
@@ -9040,7 +9026,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."
 
@@ -9893,7 +9879,8 @@ msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;tema nou&gt;]: mostra o canvia el tema"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
+msgstr ""
+"join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
 
 msgid "list:  List channels on this network"
 msgstr "list:  llista els canals en esta xarxa"
@@ -10022,8 +10009,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"
@@ -10032,7 +10020,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"
@@ -10253,7 +10241,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
@@ -10268,9 +10256,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"
 
@@ -10288,20 +10273,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
@@ -10319,8 +10299,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"
@@ -10337,15 +10317,14 @@ 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"
@@ -10370,6 +10349,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"
@@ -10449,6 +10437,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"
 
@@ -10495,13 +10493,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..."
@@ -10555,10 +10553,11 @@ 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"
@@ -10597,9 +10596,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."
@@ -10627,8 +10626,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."
@@ -10708,11 +10707,13 @@ msgstr ""
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"inst &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"topic &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"topic &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
@@ -10836,6 +10837,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"
 
@@ -10902,9 +10907,8 @@ msgstr "No molesteu"
 msgid "Extended away"
 msgstr "Absent durant una bona estona"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "S'està rebent"
+msgstr "Estat d'ànim"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11077,12 +11081,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"
@@ -11201,8 +11199,8 @@ msgstr ""
 "voleu que el %s es connecte amb més comptes de missatgeria instantània (MI), "
 "torneu a prémer <b>Afig</b> fins a configurar-los tots.\n"
 "\n"
-"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir "
-"del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
+"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a "
+"partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
 #. Buddy List
@@ -11338,8 +11336,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."
@@ -11452,13 +11450,11 @@ msgstr "No esteu connectat amb cap protocol que permeta afegir este amic."
 msgid "Unknown node type"
 msgstr "Codi d'error desconegut"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Seleccioneu l'estat d'ànim de la llista."
+msgstr "Seleccioneu l'estat d'ànim de la llista"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Àlies (opcional)"
+msgstr "Missatge (opcional)"
 
 msgid "Edit User Mood"
 msgstr "Edita l'estat d'ànim"
@@ -11542,9 +11538,8 @@ msgstr "/Eines/Pre_ferències"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eines/_Privadesa"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Eines/_Registre del sistema"
+msgstr "/Eines/Esta_bleix l'estat d'ànim"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Eines/_Transferència de fitxers"
@@ -11565,20 +11560,17 @@ msgstr "/A_juda"
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/A_juda en línia"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "/Ajuda/Informació sobre el _muntatge"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Finestra de _depuració"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informació del servidor"
+msgstr "/Ajuda/Informació sobre els d_esenvolupadors"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Informació personal"
+msgstr "/Ajuda/Informació sobre els _traductors"
 
 msgid "/Help/_About"
 msgstr "/Ajuda/_Quant a"
@@ -11807,9 +11799,8 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "_Edita el compte"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Estableix l'estat d'ànim..."
+msgstr "Estableix l'_estat d'ànim..."
 
 msgid "No actions available"
 msgstr "No hi ha accions disponibles"
@@ -11930,15 +11921,14 @@ msgstr "/Conversa/Medi/Tru_cada d'àudio i vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/Envia un _fitxer..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversa/Aconsegueix informació"
+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..."
@@ -11953,16 +11943,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..."
@@ -12015,9 +12005,8 @@ msgstr "/Conversa/Medi/Trucada d'àudio i vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Envia un fitxer..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversa/Aconsegueix informació"
+msgstr "/Conversa/Aconsegueix atenció"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Afig avís per a l'amic..."
@@ -12083,13 +12072,11 @@ msgstr "_Envia"
 msgid "0 people in room"
 msgstr "No hi ha ningú a la sala"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Tanca esta pestanya"
+msgstr "Tanca la barra de cerca"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Cerca"
+msgstr "Cerca:"
 
 #, c-format
 msgid "%d person in room"
@@ -12257,6 +12244,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Àrab"
 
+msgid "Assamese"
+msgstr "Assamés"
+
 msgid "Belarusian Latin"
 msgstr "Bielorús (llatí)"
 
@@ -12266,6 +12256,9 @@ msgstr "Búlgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí (Ìndia)"
+
 msgid "Bosnian"
 msgstr "Bosnià"
 
@@ -12381,6 +12374,9 @@ msgstr "Lasià"
 msgid "Macedonian"
 msgstr "Macedoni"
 
+msgid "Malayalam"
+msgstr "Malaiàlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
@@ -12492,7 +12488,7 @@ msgstr "Amhàric"
 msgid "Lithuanian"
 msgstr "Lituà"
 
-#, fuzzy, c-format
+#, 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 "
@@ -12501,16 +12497,14 @@ msgid ""
 "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 ""
@@ -12519,8 +12513,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12530,26 +12527,25 @@ msgid ""
 "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 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/>"
+"<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/>"
 
 #, c-format
 msgid "About %s"
 msgstr "Quant al %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "Informació sobre el muntatge"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informació sobre l'amic"
+msgstr "Informació sobre el muntatge del %s"
 
 msgid "Current Developers"
 msgstr "Desenvolupadors actuals"
@@ -12563,9 +12559,9 @@ msgstr "Desenvolupadors retirats"
 msgid "Retired Crazy Patch Writers"
 msgstr "Escriptors de pedaços retirats"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informació del servidor"
+msgstr "Informació sobre els desenvolupadors del %s"
 
 msgid "Current Translators"
 msgstr "Traductors actuals"
@@ -12573,9 +12569,9 @@ msgstr "Traductors actuals"
 msgid "Past Translators"
 msgstr "Antics traductors"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Més informació"
+msgstr "Informació sobre els traductors del %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12938,8 +12934,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!"
@@ -12994,9 +12990,8 @@ msgstr "Insereix una imatge de MI"
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Alerta!"
+msgstr "Envia atenció"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negreta</b>"
@@ -13044,9 +13039,8 @@ msgstr "Línia _horitzontal"
 msgid "_Smile!"
 msgstr "_Somrieu!"
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Alerta!"
+msgstr "_Atenció!"
 
 msgid "Log Deletion Failed"
 msgstr "No s'ha pogut suprimir el registre"
@@ -13123,7 +13117,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"
 
@@ -13180,13 +13173,14 @@ 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."
@@ -13301,7 +13295,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"
@@ -13711,7 +13704,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:"
@@ -13999,10 +13992,6 @@ msgstr "Drecera"
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Cal activació"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccioneu una icona per a l'amic"
 
@@ -14053,8 +14042,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"
@@ -14072,15 +14061,15 @@ msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com a "
-"icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com "
+"a icona d'amic per a este usuari."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a "
-"este usuari."
+"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per "
+"a este usuari."
 
 #. I don't know if we really want to do anything here.  Most of
 #. * the desktop item types are crap like "MIME Type" (I have no
@@ -14387,7 +14376,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 "
@@ -15152,8 +15141,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..."
@@ -15268,8 +15266,7 @@ msgstr "_Transparència de la finestra de la llista d'amics"
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
-"Treu la transparència de la finestra de la llista d'amics en obtindre el "
-"focus"
+"Treu la transparència de la finestra de la llista d'amics en obtindre el focus"
 
 #. *< type
 #. *< ui_requirement
@@ -15293,8 +15290,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."
 
@@ -15358,9 +15355,220 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia i rep blocs XMPP en brut."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Este connector és útil per a depurar servidors i clients XMPP."
+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."
+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 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."
@@ -15372,13 +15580,13 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgstr "No s'ha pogut crear el sòcol: %s"
 
 #~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s vos ha donat un cop de colze!"
+#~ 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 este compte Hotmail no siga actiu."
+#~ msgstr "Pot ser que aquest compte Hotmail no sigui actiu."
 
 #~ msgid "Profile URL"
 #~ msgstr "URL del perfil"
@@ -15420,10 +15628,10 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ msgstr "No s'ha pogut suprimir el grup"
 
 #~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s vos ha afegit a la seua llista d'amics."
+#~ msgstr "%s us ha afegit a la seva llista d'amics."
 
 #~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s vos ha suprimit de la seua llista d'amics."
+#~ 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"
@@ -15458,7 +15666,7 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "\n"
 #~ "%s"
 #~ msgstr ""
-#~ "S'ha produït un error en alçar la imatge\n"
+#~ "S'ha produït un error en desar la imatge\n"
 #~ "\n"
 #~ "%s"
 
@@ -15469,7 +15677,7 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "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"
+#~ "possiblement la imatge estigui corrompuda"
 
 # FIXME: stanza -> estrofa (literal) (Josep)
 #~ msgid "Insert an <iq/> stanza."
@@ -15528,9 +15736,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..."
 
@@ -16119,7 +16324,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."
@@ -16499,9 +16704,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"
 
@@ -16946,9 +17148,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>"
 
@@ -17857,9 +18056,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 b16219717d..88f8fea6ca 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: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-12 22:16+0100\n"
+"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"PO-Revision-Date: 2010-08-01 18:18+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"
 
@@ -781,7 +793,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 +1263,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 +1359,6 @@ msgid "Saved Statuses"
 msgstr "Uložené stavy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titul"
 
@@ -1542,7 +1556,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 +1649,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é"
 
@@ -1656,8 +1676,10 @@ msgstr ""
 "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ý."
@@ -1892,7 +1914,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"
 
@@ -3156,6 +3177,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"
 
@@ -3763,12 +3787,6 @@ 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"
 
@@ -3799,6 +3817,17 @@ 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"
 
@@ -3806,6 +3835,39 @@ msgstr "SASL autentizace selhala"
 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"
 
@@ -3869,6 +3931,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "PSČ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Země"
 
@@ -3883,10 +3946,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í"
 
@@ -4101,12 +4168,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 "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."
 
@@ -4203,7 +4279,6 @@ msgstr "Server nepodporuje blokování"
 msgid "Not Authorized"
 msgstr "Neautorizován"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nálada"
 
@@ -4225,7 +4300,6 @@ msgstr "Do"
 msgid "None (To pending)"
 msgstr "Žádné (do čeká)"
 
-#. 0
 msgid "None"
 msgstr "Žádné"
 
@@ -4239,14 +4313,18 @@ msgstr "Text nálady"
 msgid "Allow Buzz"
 msgstr "Povolit buzení"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Prostřední jméno"
+msgstr "Jméno nálady"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Poznámka o kamarádovi"
+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"
 
@@ -4417,9 +4495,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"
 
@@ -4532,9 +4607,8 @@ msgstr "Zvolte zdroj"
 msgid "Initiate Media"
 msgstr "Inicializovat multimédia"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Tento protokol nepodporuje místnosti chatu."
+msgstr "Nemohu nastavit náladu. Účet nepodporuje PEP."
 
 msgid "config:  Configure a chat room."
 msgstr "config: Nastavit místnost chatu."
@@ -4590,9 +4664,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Zvolte správného uživatele"
+msgstr "nálada: Nastavit náladu"
 
 msgid "Extended Away"
 msgstr "Pryč na dlouho"
@@ -4674,13 +4747,13 @@ 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 ""
+msgstr "Hlavička XMPP přenosu chybí"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Nesoulad verzí XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Chybějící ID XMPP přenosu"
 
 msgid "XML Parse error"
 msgstr "Chyba zpracování XML"
@@ -4755,32 +4828,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabština"
+msgstr "Vylekaný"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Hanbící se"
+msgstr "Ohromený"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Nádherný"
+msgstr "Vášnivý"
 
-#. 1
 msgid "Angry"
 msgstr "Rozzlobený"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Zakázán"
+msgstr "Podrážděný"
 
 msgid "Anxious"
 msgstr "Nedočkavý"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Odesíláte"
+msgstr "Vzrušený"
 
 msgid "Ashamed"
 msgstr "Hanbící se"
@@ -4788,288 +4855,231 @@ msgstr "Hanbící se"
 msgid "Bored"
 msgstr "Znuděný"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Uložit"
+msgstr "Statečný"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Realm"
+msgstr "Klidný"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chaty"
+msgstr "Obezřetný"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Tučné"
+msgstr "Prochladlý"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflikt"
+msgstr "Sebejistý"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Pokračovat"
+msgstr "Zmatený"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontakt"
+msgstr "Rozjímavý"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Připojen"
+msgstr "Spokojený"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Společnost"
+msgstr "Nevrlý"
 
-#, fuzzy
 msgid "Crazy"
-msgstr "Crazychat"
+msgstr "Potrhlý"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Vytvořit"
+msgstr "Tvůrčí"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Nádherný"
+msgstr "Zvídavý"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Odmítnutý"
+msgstr "Skleslý"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Smazané"
+msgstr "Deprimovaný"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Odpojen."
+msgstr "Zklamaný"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Znechucený"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Zakázané"
+msgstr "Zděšený"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Odpojen"
+msgstr "Rozptýlený"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Rozpačitý"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Nedočkavý"
+msgstr "Závistivý"
 
-#. 2
 msgid "Excited"
 msgstr "Vzrušený"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Nádherný"
+msgstr "Koketní"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Křestní jméno"
+msgstr "Rozčarovaný"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Vděčný"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Stahuji..."
+msgstr "Truchlící"
 
-#. 3
 msgid "Grumpy"
 msgstr "Mrzutý"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Město"
+msgstr "Provinilý"
 
-#. 4
 msgid "Happy"
 msgstr "Šťastný"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Plný naděje"
 
-#. 8
 msgid "Hot"
 msgstr "Žhavý"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Pokorný"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Pokorný"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Rozzlobený"
+msgstr "Hladový"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Zraněný"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Ohromený"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Zamilovaný"
+msgstr "Užaslý"
 
 msgid "In love"
 msgstr "Zamilovaný"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonéština"
+msgstr "Rozhořčený"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Zájmy"
+msgstr "Zaujat"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Pozvaný"
+msgstr "Opilý"
 
-#. 6
 msgid "Invincible"
 msgstr "Neporazitelný"
 
 msgid "Jealous"
 msgstr "Žárlivý"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Opice"
+msgstr "Osamělý"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Nejhlasitější"
+msgstr "Ztracený"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Mající štěstí"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Němčina"
+msgstr "Protivný"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Nálada"
+msgstr "Náladový"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervozní"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detail"
+msgstr "Neutrální"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Odpojen"
+msgstr "Uražený"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Pobouřený"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Přehrát"
+msgstr "Hravý"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Hlasitý"
+msgstr "Hrdý"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Skutečné jméno"
+msgstr "V pohodě"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Přijato"
+msgstr "Uvolněný"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Odstranit"
+msgstr "Kajícný"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registrovat"
+msgstr "Neposedný"
 
-#. 7
 msgid "Sad"
 msgstr "Smutný"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Marathi"
+msgstr "Jízlivý"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Uspokojený"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Nádherný"
+msgstr "Vážný"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Zablokován"
+msgstr "Šokovaný"
 
 msgid "Shy"
-msgstr ""
+msgstr "Plachý"
 
-#. 9
 msgid "Sick"
 msgstr "Nemocný"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Ospalý"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontánní"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Úspěch:"
+msgstr "Stresovaný"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Píseň"
+msgstr "Silný"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Překvapený"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Vděčný"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Žíznivý"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Unavený"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Podtržené"
+msgstr "..."
 
-#, fuzzy
 msgid "Weak"
-msgstr "Úder"
+msgstr "Slabý"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Znuděný"
+msgstr "Ustaraný"
 
 msgid "Set User Nickname"
 msgstr "Nastavit přezdívku"
@@ -5427,18 +5437,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"
 
@@ -5588,9 +5586,6 @@ msgstr "Výročí"
 msgid "Work"
 msgstr "Práce"
 
-msgid "Job Title"
-msgstr "Název zaměstnání"
-
 msgid "Company"
 msgstr "Společnost"
 
@@ -5678,6 +5673,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"
 
@@ -5870,24 +5868,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é."
 
-#. 5
-msgid "In Love"
-msgstr "Zamilovaný"
-
-#. 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ý."
 
@@ -5900,8 +5880,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'."
@@ -5919,7 +5899,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"
 
@@ -5927,6 +5911,7 @@ msgid "Verify PIN"
 msgstr "Ověření PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
@@ -5953,10 +5938,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..."
@@ -5987,19 +5968,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"
@@ -6027,11 +6001,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"
@@ -6042,7 +6016,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"
 
@@ -6068,11 +6042,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")
@@ -6085,6 +6063,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."
@@ -6188,6 +6183,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í"
 
@@ -6587,9 +6585,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"
 
@@ -6842,112 +6837,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL neumožňuje ověřit jméno tady"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Chyba žádosti %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 "Cannot receive IM due to parental controls"
+msgstr "Nemohu získat IM z důvodu rodičovské ochrany"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nemohu poslat SMS bez přijmutí podmínek"
+
+msgid "Cannot send SMS"
+msgstr "Nemohu odeslat SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nemohu odeslat SMS do této země"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nemohu poslat SMS do neznámé země"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot účet nemůže zahájit IM "
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot účet nemůže IM tohoto uživatele"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot účet dosáhl IM limit"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot účet dosáhl denní IM limit"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot účet dosáhl měsíční IM limit"
+
+msgid "Unable to receive offline messages"
+msgstr "Nemohu přijmout offline zprávy"
+
+msgid "Offline message store full"
+msgstr "Úložiště offline zpráv je plné"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Zamyšlený"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Přestane psát"
+msgstr "Nakupující"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Dialog s otázkou"
+msgstr "Zvídavý"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Pager"
+msgstr "Jím"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Hraju"
+msgstr "Sledující film"
 
 msgid "Typing"
 msgstr "Píše"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nejsem v kanceláři"
+msgstr "V kanceláři"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "V koupelně"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Sledující TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Zavěsit"
+msgstr "V pohodě"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Ospalý"
+msgstr "Spící"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Používající PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Přátelé IM"
+msgstr "Schůzka s přáteli"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "Telefonuji"
+msgstr "Na telefonu"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Opakující se"
+msgstr "Surfující"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobilní"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Hledám na webu"
 
-#, fuzzy
 msgid "At a party"
-msgstr "Port autentizace"
+msgstr "Na párty"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Na kávě"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Uživatel hraje"
+msgstr "Hrající hry"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Procházím web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Píseň"
+msgstr "Kouřící"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Pracovní"
+msgstr "Píšící"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Pracovní"
+msgstr "Pijící"
 
 msgid "Listening to music"
 msgstr "Poslouchá muziku"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Odesílám"
+msgstr "Studující"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Zájmy"
+msgstr "Odpočívající"
 
 msgid "Received invalid data on connection with server"
 msgstr "Na spojení se serverem přijata neplatná data"
@@ -7015,116 +7054,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nemohu poslat SMS bez přijmutí podmínek"
-
-msgid "Cannot send SMS"
-msgstr "Nemohu odeslat SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nemohu odeslat SMS do této země"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nemohu poslat SMS do neznámé země"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Bot účet nemůže zahájit IM "
-
-msgid "Bot account cannot IM this user"
-msgstr "Bot účet nemůže IM tohoto uživatele"
-
-msgid "Bot account reached IM limit"
-msgstr "Bot účet dosáhl IM limit"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Bot účet dosáhl denní IM limit"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Bot účet dosáhl měsíční IM limit"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7160,7 +7089,7 @@ msgid "Games"
 msgstr "Hry"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Přídavky"
@@ -7228,23 +7157,18 @@ msgstr "Ví o WWW"
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Email"
+msgstr "Ďábel"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Zaměstnání"
+msgstr "Deprese"
 
-#, fuzzy
 msgid "At home"
-msgstr "O mně"
+msgstr "Doma"
 
-#, fuzzy
 msgid "At work"
-msgstr "Síť"
+msgstr "V práci"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "Na obědě"
 
@@ -7493,28 +7417,9 @@ 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"
 
@@ -7780,9 +7685,8 @@ 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"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Oběd"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7815,9 +7719,8 @@ msgstr "Získat informace AIM"
 msgid "Edit Buddy Comment"
 msgstr "Upravit poznámku o kamarádovi"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Získat zprávu o stavu"
+msgstr "Získat zprávu o X-stavu"
 
 msgid "End Direct IM Session"
 msgstr "Přímé IM ukončeno"
@@ -7943,6 +7846,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vodnář"
 
@@ -8225,6 +8197,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"
 
@@ -10117,9 +10093,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"
 
@@ -10135,18 +10108,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..."
 
@@ -10212,6 +10179,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"
@@ -10286,6 +10261,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"
 
@@ -10668,6 +10651,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"
 
@@ -10734,9 +10721,8 @@ msgstr "Nerušit"
 msgid "Extended away"
 msgstr "Pryč na dlouho"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Přijímám"
+msgstr "Citlivý"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10912,12 +10898,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í"
@@ -11284,13 +11264,11 @@ 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"
 
-#, fuzzy
 msgid "Please select your mood from the list"
 msgstr "Prosím vyberte náladu ze seznamu"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (nepovinný)"
+msgstr "Zpráva (nepovinná)"
 
 msgid "Edit User Mood"
 msgstr "Upravit náladu uživatele"
@@ -11373,9 +11351,8 @@ msgstr "/Nástroje/_Nastavení"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Soukromí"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Nástroje/Systémový záz_nam"
+msgstr "/Nástroje/Nastavit ná_ladu"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Přenosy souborů"
@@ -11396,20 +11373,17 @@ msgstr "/Nápo_věda"
 msgid "/Help/Online _Help"
 msgstr "/Nápověda/_Nápověda online"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informace o kamarádovi"
+msgstr "/Nápověda/Informace o sestavení"
 
 msgid "/Help/_Debug Window"
 msgstr "/Nápověda/_Ladicí okno"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informace o serveru"
+msgstr "/Nápověda/Informace o vývojářích"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Osobní informace"
+msgstr "/Nápověda/Informace o _překladatelích"
 
 msgid "/Help/_About"
 msgstr "/Nápověda/O _aplikaci"
@@ -11638,9 +11612,8 @@ msgstr "<PurpleMain>/Účty/"
 msgid "_Edit Account"
 msgstr "_Upravit účet"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Nastavit náladu..."
+msgstr "Nastavit ná_ladu..."
 
 msgid "No actions available"
 msgstr "Žádné akce nejsou k dispozici"
@@ -11760,9 +11733,8 @@ msgstr "/Konverzace/Multimédia/Audio\\/Video _hovor"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konverzace/Odeslat _soubor..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Konverzace/Získat informace"
+msgstr "/Konverzace/Získat _pozornost"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konverzace/Přidat _sledování kamaráda..."
@@ -11845,9 +11817,8 @@ msgstr "/Konverzace/Multimédia\\/Video hovor"
 msgid "/Conversation/Send File..."
 msgstr "/Konverzace/Odeslat soubor..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Konverzace/Získat informace"
+msgstr "/Konverzace/Získat pozornost"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konverzace/Přidat sledování kamaráda..."
@@ -11913,13 +11884,11 @@ msgstr "_Odeslat"
 msgid "0 people in room"
 msgstr "0 lidí v místnosti"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Zavřít tuto záložku"
+msgstr "Zavřít vyhledávací řádek"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Hledat"
+msgstr "Hledat:"
 
 #, c-format
 msgid "%d person in room"
@@ -12083,6 +12052,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabština"
 
+msgid "Assamese"
+msgstr "Ásámština"
+
 msgid "Belarusian Latin"
 msgstr "Běloruština (latinka)"
 
@@ -12092,6 +12064,9 @@ msgstr "Bulharština"
 msgid "Bengali"
 msgstr "Bengálština"
 
+msgid "Bengali-India"
+msgstr "Bengálština (Indie)"
+
 msgid "Bosnian"
 msgstr "Bosenština"
 
@@ -12206,6 +12181,9 @@ msgstr "Laonština"
 msgid "Macedonian"
 msgstr "Makedonština"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolština"
 
@@ -12314,22 +12292,21 @@ msgstr "Amharština"
 msgid "Lithuanian"
 msgstr "Litevština"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12338,8 +12315,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12349,7 +12329,7 @@ msgid ""
 "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/"
@@ -12360,14 +12340,13 @@ msgstr ""
 msgid "About %s"
 msgstr "O %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informace o kamarádovi"
+msgstr "Informace o sestavení"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informace o kamarádovi"
+msgstr "Informace o sestavení %s"
 
 msgid "Current Developers"
 msgstr "Současní vývojáři"
@@ -12381,9 +12360,9 @@ msgstr "Vývojáři na odpočinku"
 msgid "Retired Crazy Patch Writers"
 msgstr "Šílení autoři patchů na odpočinku"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informace o serveru"
+msgstr "Informace o vývojářích %s"
 
 msgid "Current Translators"
 msgstr "Současní překladatelé"
@@ -12391,9 +12370,9 @@ msgstr "Současní překladatelé"
 msgid "Past Translators"
 msgstr "Dřívější překladatelé"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Více informací"
+msgstr "Informace o překladatelích %s"
 
 msgid "_Name"
 msgstr "_Název"
@@ -12751,7 +12730,7 @@ msgstr ""
 " %s"
 
 msgid "Smile!"
-msgstr "Úsměv!"
+msgstr "Smajlík!"
 
 msgid "_Manage custom smileys"
 msgstr "_Spravovat uživatelské smajlíky"
@@ -12801,9 +12780,8 @@ msgstr "Vložit obrázek IM"
 msgid "Insert Smiley"
 msgstr "Vložit smajlík"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Pozor!"
+msgstr "Poslat požadavek na pozornost"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tučné</b>"
@@ -12850,9 +12828,8 @@ msgstr "_Vodorovná čára"
 msgid "_Smile!"
 msgstr "Ú_směv!"
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Pozor!"
+msgstr "Vyžádat pozornost!"
 
 msgid "Log Deletion Failed"
 msgstr "Selhalo mazání záznamu"
@@ -12865,21 +12842,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?"
@@ -12983,11 +12960,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."
@@ -13048,7 +13025,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."
@@ -13786,10 +13763,6 @@ msgstr "Text klávesové zkratky:"
 msgid "Custom Smiley Manager"
 msgstr "Správce smajlíků"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Je vyžadována aktivace"
-
 msgid "Select Buddy Icon"
 msgstr "Vybrat ikonu kamaráda"
 
@@ -14911,8 +14884,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..."
@@ -15113,10 +15095,215 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Přijímat a odesílat přímo sekce XMPP."
 
 #. *  description
-#, fuzzy
 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."
+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 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."
 
@@ -15287,9 +15474,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)."
 
@@ -15858,7 +16042,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."
diff --git a/po/da.po b/po/da.po
index 5376459440..188ead28b1 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -799,7 +812,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 +1282,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 +1379,6 @@ msgid "Saved Statuses"
 msgstr "Gemte statuser"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1561,7 +1577,7 @@ msgstr ""
 msgid "Online"
 msgstr "Tilkoblet"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Afkoblet"
 
@@ -1654,6 +1670,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"
 
@@ -1674,9 +1698,10 @@ 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."
@@ -1920,7 +1945,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"
 
@@ -3195,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 "Fornavn"
 
@@ -3805,14 +3832,6 @@ 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."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Du kræver kryptering, men ingen TLS/SSL-understøttelse blev fundet."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
 
@@ -3845,6 +3864,18 @@ 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"
 
@@ -3853,6 +3884,42 @@ msgid "SASL error: %s"
 msgstr "SASL fejl"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Ugyldig indtastningsbetingelse"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Ikke understøttet 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 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"
 
@@ -3927,6 +3994,7 @@ msgstr "Område"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3941,10 +4009,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"
 
@@ -4167,12 +4239,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 "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."
 
@@ -4270,7 +4354,6 @@ msgstr "Server understøtter ikke blokering"
 msgid "Not Authorized"
 msgstr "Ikke godkendt"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humør"
 
@@ -4292,7 +4375,6 @@ msgstr "Til"
 msgid "None (To pending)"
 msgstr "Ingen (Til afventer)"
 
-#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4314,6 +4396,12 @@ msgstr "Mellemnavn"
 msgid "Mood Comment"
 msgstr "Vennekommentar"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Sangkunstner"
 
@@ -4484,9 +4572,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"
 
@@ -4845,7 +4930,6 @@ msgstr "Skammer sig"
 msgid "Amorous"
 msgstr "Strålende"
 
-#. 1
 msgid "Angry"
 msgstr "Sur"
 
@@ -4944,7 +5028,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Spændt"
 
-#. 2
 msgid "Excited"
 msgstr "Begejstret"
 
@@ -4963,7 +5046,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Henter..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Gruppe"
@@ -4972,14 +5054,12 @@ msgstr "Gruppe"
 msgid "Guilty"
 msgstr "By"
 
-#. 4
 msgid "Happy"
 msgstr "Glad"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Værtsnavn:"
@@ -5020,7 +5100,6 @@ msgstr "Interesser"
 msgid "Intoxicated"
 msgstr "Invitér"
 
-#. 6
 msgid "Invincible"
 msgstr "Usårlig"
 
@@ -5084,7 +5163,6 @@ msgstr "Slet"
 msgid "Restless"
 msgstr "Registrér"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
@@ -5105,12 +5183,10 @@ msgstr "Blokeret"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Kælenavn"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Søvnig"
@@ -5509,18 +5585,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"
 
@@ -5671,9 +5735,6 @@ msgstr "Jubilæum"
 msgid "Work"
 msgstr "Arbejde"
 
-msgid "Job Title"
-msgstr "Job titel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5762,6 +5823,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"
 
@@ -5956,28 +6021,6 @@ msgstr "Vil du også slette denne ven fra din adressebog?"
 msgid "The username specified is invalid."
 msgstr "Brugernavnet du angav er ugyldigt."
 
-#. 5
-msgid "In Love"
-msgstr "Forelsket"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Dit nuværende humør"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "SecurID-nøglen du indtastede er ugyldig."
@@ -6014,7 +6057,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"
@@ -6023,6 +6070,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Efternavn"
@@ -6054,11 +6102,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..."
@@ -6102,7 +6145,7 @@ msgid "Connecting..."
 msgstr "Tilslutter"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 #, fuzzy
@@ -6110,14 +6153,9 @@ 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"
@@ -6146,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
@@ -6163,7 +6201,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Sikkerhedsaktiveret"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Indtast kode"
@@ -6197,12 +6235,17 @@ 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")
@@ -6217,6 +6260,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."
@@ -6337,6 +6402,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Forelsket"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Sender"
@@ -6735,9 +6803,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"
 
@@ -6992,12 +7057,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Fejl ved oprettelse af forbindelse"
+
 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 "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Kan ikke sende fil"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Kan ikke sende en mappe."
+
+#. 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 "Kunne ikke sende besked."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Besked når afkoblet"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7166,120 +7296,6 @@ msgstr ""
 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 "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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan ikke sende fil"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kan ikke sende en mappe."
-
-#. 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 "Kunne ikke sende besked."
-
-#, fuzzy
-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 "
@@ -7643,29 +7659,10 @@ 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"
 
@@ -8097,6 +8094,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vandmand"
 
@@ -8383,6 +8449,11 @@ msgstr "Anmoder"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Rumliste"
+
 msgid "Notice"
 msgstr "Bemærk"
 
@@ -10286,9 +10357,6 @@ msgstr "Yahoo-id..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo protokolmodul"
 
-msgid "Pager server"
-msgstr "Bipper-server"
-
 msgid "Pager port"
 msgstr "Bipper port"
 
@@ -10304,18 +10372,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..."
@@ -10389,6 +10451,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"
@@ -10473,6 +10544,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"
 
@@ -10854,6 +10936,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"
 
@@ -11091,12 +11177,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"
@@ -12298,6 +12378,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabisk"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skammer sig"
+
 msgid "Belarusian Latin"
 msgstr "Hviderussisk latinsk"
 
@@ -12307,6 +12391,10 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnisk"
 
@@ -12423,6 +12511,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mand"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
@@ -12541,8 +12633,8 @@ msgid ""
 "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>"
+"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 "
@@ -13088,19 +13180,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?"
@@ -13198,10 +13290,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
@@ -14051,10 +14143,6 @@ msgid "Custom Smiley Manager"
 msgstr "Brugertilpasset håndtering af smiley"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Aktivering krævet"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Vælg ven"
 
@@ -15232,8 +15320,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..."
@@ -15448,6 +15548,206 @@ 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."
+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."
+
+#, 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"
@@ -15618,9 +15918,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bruger:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ kørselstidsversion"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Udregner..."
@@ -16192,7 +16489,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."
diff --git a/po/de.po b/po/de.po
index fcc9f0b775..929b23137a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,13 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-11 21:02+0100\n"
-"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2010-08-01 00:18+0200\n"
+"PO-Revision-Date: 2010-08-01 00:16+0200\n"
+"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Translators may want to transliterate the name.
@@ -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"
 
@@ -717,7 +733,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 +813,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 +858,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 +895,7 @@ msgid "All Conversations"
 msgstr "Alle Unterhaltungen"
 
 msgid "System Log"
-msgstr "System-Mitschnitt"
+msgstr "Systemmitschnitt"
 
 msgid "Calling..."
 msgstr "Anrufen..."
@@ -1268,6 +1284,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 +1380,6 @@ msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1421,7 +1439,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 +1582,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1657,6 +1675,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,8 +1703,12 @@ 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."
 msgstr ""
@@ -1918,7 +1948,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"
 
@@ -2242,7 +2271,7 @@ msgid "Error with your webcam"
 msgstr "Fehler mit Ihrer Webcam"
 
 msgid "Conference error"
-msgstr "Konferenz-Fehler"
+msgstr "Konferenzfehler"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3200,6 +3229,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"
 
@@ -3811,15 +3843,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 "
@@ -3856,6 +3879,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"
 
@@ -3863,6 +3899,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"
 
@@ -3926,6 +3997,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3940,10 +4012,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"
 
@@ -4163,12 +4239,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."
 
@@ -4269,7 +4357,6 @@ msgstr "Server unterstützt kein Blockieren"
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stimmung"
 
@@ -4289,11 +4376,10 @@ msgid "To"
 msgstr "Ausstehend"
 
 msgid "None (To pending)"
-msgstr "Nein (ausgehend unbestätigt)"
+msgstr "Keine (ausgehend unbestätigt)"
 
-#. 0
 msgid "None"
-msgstr "Nein"
+msgstr "Keine"
 
 #. subscription type
 msgid "Subscription"
@@ -4305,14 +4391,18 @@ msgstr "Stimmungstext"
 msgid "Allow Buzz"
 msgstr "Anklopfen erlauben"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Zweiter Name"
+msgstr "Name der Stimmung"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Buddy-Kommentar"
+msgstr "Stimmungskommentar"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Künstler anpassen"
 
@@ -4483,9 +4573,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"
 
@@ -4603,9 +4690,8 @@ msgstr "Wählen Sie eine Ressource"
 msgid "Initiate Media"
 msgstr "Initiiere Medien"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Dieses Protokoll unterstützt keine Chaträume."
+msgstr "Konto unterstützt kein PEP, kann die Stimmung nicht setzen"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
@@ -4663,9 +4749,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Wählen Sie den richtigen Benutzer"
+msgstr "mood: Setze die aktuelle Benutzerstimmung"
 
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
@@ -4749,13 +4834,13 @@ msgstr ""
 "werden."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Der XMPP-Datenstromkopf fehlt"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP-Versionskonflikt"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Fehlende ID im XMPP-Datenstrom"
 
 msgid "XML Parse error"
 msgstr "Fehler beim Einlesen von XML-Daten"
@@ -4834,32 +4919,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabisch"
+msgstr "Ängstlich, besorgt"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Beschämt"
+msgstr "Verblüfft"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorreich"
+msgstr "Sinnlich"
 
-#. 1
 msgid "Angry"
 msgstr "Verärgert"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Verbannt"
+msgstr "Ärgerlich"
 
 msgid "Anxious"
-msgstr "Besorgt"
+msgstr "Ängstlich, unruhig"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Sie senden"
+msgstr "Aufgerüttelt"
 
 msgid "Ashamed"
 msgstr "Beschämt"
@@ -4867,288 +4946,232 @@ msgstr "Beschämt"
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Speichern"
+msgstr "Tapfer"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Realm"
+msgstr "Beruhigt"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chats"
+msgstr "Zurückhaltend"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Fett"
+msgstr "Unterkühlt"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflikt"
+msgstr "Zuversichtlich"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Fortfahren"
+msgstr "Verwirrt"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontakt"
+msgstr "Nachdenklich"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Verbunden"
+msgstr "Zufrieden"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Firma"
+msgstr "Schrullig"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Verrückt"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Erzeugen"
+msgstr "Kreativ"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorreich"
+msgstr "Neugierig"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Abgelehnt"
+msgstr "Niedergeschlagen"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Gelöscht"
+msgstr "Deprimiert"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Verbindung unterbrochen."
+msgstr "Enttäuscht"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Empört"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Deaktiviert"
+msgstr "Bestürzt"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Unbeteiligt"
+msgstr "Abgelenkt"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Verlegen"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Besorgt"
+msgstr "Neidisch"
 
-#. 2
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorreich"
+msgstr "Verführerisch"
 
 # old strings
-#, fuzzy
 msgid "Frustrated"
-msgstr "Vorname"
+msgstr "Frustriert"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Dankbar, erkenntlich"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Empfange..."
+msgstr "Trauernd"
 
-#. 3
 msgid "Grumpy"
-msgstr "Mürrisch"
+msgstr "Brummig"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Stadt"
+msgstr "Schuldig"
 
-#. 4
 msgid "Happy"
-msgstr "Glücklich"
+msgstr "Erfreut"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Hoffnungsvoll"
 
-#. 8
 msgid "Hot"
 msgstr "Heiß"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Gedemütigt"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Erniedrigt"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Verärgert"
+msgstr "Hungrig"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Verletzt"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Beeindruckt"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Verliebt"
+msgstr "Ehrfurchtsvoll"
 
 msgid "In love"
 msgstr "Verliebt"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesisch"
+msgstr "Entrüstet"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interessen"
+msgstr "Interessiert"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Eingeladen"
+msgstr "Betrunken"
 
-#. 6
 msgid "Invincible"
-msgstr "Unerschütterlich"
+msgstr "Unbesiegbar"
 
 msgid "Jealous"
 msgstr "Eifersüchtig"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Affe"
+msgstr "Einsam"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Am lautesten"
+msgstr "Verloren"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Glücklich"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Deutsch"
+msgstr "Gemein"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Stimmung"
+msgstr "Launisch"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Reizbar"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detail"
+msgstr "Gleichgültig"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Offline"
+msgstr "Beleidigt"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Empört"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Abspielen"
+msgstr "Verspielt"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Laut"
+msgstr "Stolz"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Echter Name"
+msgstr "Entspannt"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Empfangen"
+msgstr "Erleichtert"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Entfernen"
+msgstr "Reumütig"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registrieren"
+msgstr "Ruhelos"
 
-#. 7
 msgid "Sad"
 msgstr "Traurig"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Marathi"
+msgstr "Sarkastisch"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Befriedigt"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorreich"
+msgstr "Ernsthaft"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blockiert"
+msgstr "Schockiert"
 
 msgid "Shy"
-msgstr ""
+msgstr "Schüchtern"
 
-#. 9
 msgid "Sick"
 msgstr "Krank"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
-msgstr "Müde"
+msgstr "Schläfrig"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Geschwindigkeit"
+msgstr "Gestresst"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Lied"
+msgstr "Stark"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Überrascht"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Dankbar, froh"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Durstig"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Müde"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Unterstrichen"
+msgstr "Undefiniert"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Schlag"
+msgstr "Schwach"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Gelangweilt"
+msgstr "Besorgt, beunruhigt"
 
 msgid "Set User Nickname"
 msgstr "Setze Benutzer-Spitzname"
@@ -5516,18 +5539,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"
 
@@ -5677,9 +5688,6 @@ msgstr "Jahrestag"
 msgid "Work"
 msgstr "Geschäftlich"
 
-msgid "Job Title"
-msgstr "Beruf"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5768,6 +5776,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"
 
@@ -5979,24 +5990,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."
 
-#. 5
-msgid "In Love"
-msgstr "Verliebt"
-
-#. 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."
 
@@ -6009,8 +6002,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'."
@@ -6020,7 +6013,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")
@@ -6032,7 +6025,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"
 
@@ -6040,6 +6037,7 @@ msgid "Verify PIN"
 msgstr "PIN bestätigen"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Anzeigename"
 
@@ -6066,10 +6064,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..."
@@ -6104,19 +6098,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"
@@ -6151,14 +6138,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."
@@ -6169,7 +6157,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"
 
@@ -6195,11 +6183,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")
@@ -6212,6 +6204,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 ""
@@ -6317,6 +6326,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"
 
@@ -6719,9 +6731,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"
 
@@ -6988,111 +6997,157 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Fehler beim Anfordern von %s"
+
 msgid "Could not join chat room"
 msgstr "Konnte Chatraum nicht betreten"
 
 msgid "Invalid chat room name"
 msgstr "Ungültiger Chatraumname"
 
-msgid "Thinking"
+msgid "Invalid error"
+msgstr "Ungültiger Name"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kann wegen Kinderschutzeinstellungen keine IM empfangen"
+
+msgid "Cannot send SMS without accepting terms"
 msgstr ""
+"SMS können nicht gesendet werden ohne die Vertragsbedingungen zu akzeptieren"
+
+msgid "Cannot send SMS"
+msgstr "Kann SMS nicht senden"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kann keine SMS in dieses Land senden"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kann keine SMS in ein unbekanntes Land schicken"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot-Konten können keine IMs initiieren"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot-Konten können diesem Benutzer keine Nachricht senden"
+
+msgid "Bot account reached IM limit"
+msgstr "Das Bot-Konto erreichte die IM-Grenze"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot-Konto erreichte die tägliche IM-Grenze"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot-Konto erreichte die monatliche IM-Grenze"
+
+msgid "Unable to receive offline messages"
+msgstr "Kann keine Offline-Nachrichten empfangen"
+
+msgid "Offline message store full"
+msgstr "Offline-Nachrichtenspeicher voll"
+
+#, 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"
+
+msgid "Thinking"
+msgstr "Denkt nach"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "aufhört zu tippen"
+msgstr "Kauft ein"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Frage-Dialog"
+msgstr "Fragt etwas"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Funkruf"
+msgstr "Beim Essen"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Spielt ein Spiel"
+msgstr "Schaut einen Film an"
 
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nicht im Büro"
+msgstr "Im Büro"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Nimmt ein Bad"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Schaut Fernsehen"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Auflegen"
+msgstr "Hat Spaß"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Müde"
+msgstr "Schläft"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Benutzt einen PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "IM-Freunde"
+msgstr "Freunde treffen"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Am Telefon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Wiederkehrend"
+msgstr "Surft"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
-msgstr "Mobil"
+msgstr "Ist mobil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Sucht etwas im Web"
 
 msgid "At a party"
-msgstr ""
+msgstr "Auf einer Party"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Trinkt Kaffee"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Zwillinge"
+msgstr "Spielt am PC"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Surft im Web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Lied"
+msgstr "Raucht"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Arbeitet"
+msgstr "Schreibt"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Arbeitet"
+msgstr "Trinkt"
 
 msgid "Listening to music"
 msgstr "Musik hören"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Sende"
+msgstr "Lernt"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interessen"
+msgstr "Auf der Toilette"
 
 msgid "Received invalid data on connection with server"
 msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen"
@@ -7163,117 +7218,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-"SMS können nicht gesendet werden ohne die Vertragsbedingungen zu akzeptieren"
-
-msgid "Cannot send SMS"
-msgstr "Kann SMS nicht senden"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Kann keine SMS in dieses Land senden"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Kann keine SMS in ein unbekanntes Land schicken"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Bot-Konten können keine IMs initiieren"
-
-msgid "Bot account cannot IM this user"
-msgstr "Bot-Konten können diesem Benutzer keine Nachricht senden"
-
-msgid "Bot account reached IM limit"
-msgstr "Das Bot-Konto erreichte die IM-Grenze"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Bot-Konto erreichte die tägliche IM-Grenze"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Bot-Konto erreichte die monatliche IM-Grenze"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7311,7 +7255,7 @@ msgid "Games"
 msgstr "Spiele"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Zusätze"
@@ -7379,23 +7323,18 @@ msgstr "In Web"
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-Mail"
+msgstr "Böse"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Beruf"
+msgstr "Depression"
 
-#, fuzzy
 msgid "At home"
-msgstr "Über mich"
+msgstr "Zu Hause"
 
-#, fuzzy
 msgid "At work"
-msgstr "Netzwerk"
+msgstr "Bei der Arbeit"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "Zur Mittagspause"
 
@@ -7607,10 +7546,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
@@ -7644,28 +7583,9 @@ 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"
 
@@ -7936,9 +7856,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Mittagspause"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7971,9 +7890,8 @@ msgstr "AIM-Info"
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Abwesenheitsmitteilung abrufen"
+msgstr "X-Status-Nachricht abrufen"
 
 msgid "End Direct IM Session"
 msgstr "Direkt-IM-Sitzung beenden"
@@ -8102,6 +8020,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Wassermann"
 
@@ -8384,6 +8371,10 @@ msgstr "Frage an"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Raumtitel"
+
 msgid "Notice"
 msgstr "Bemerkung"
 
@@ -10311,9 +10302,6 @@ msgstr "Yahoo-ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo!-Protokoll-Plugin"
 
-msgid "Pager server"
-msgstr "Pager-Server"
-
 msgid "Pager port"
 msgstr "Pager-Port"
 
@@ -10329,18 +10317,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..."
 
@@ -10409,6 +10391,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"
@@ -10489,6 +10480,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"
 
@@ -10879,6 +10880,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"
 
@@ -10945,9 +10950,8 @@ msgstr "Nicht stören"
 msgid "Extended away"
 msgstr "Länger abwesend"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Empfange"
+msgstr "Befinden"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11120,12 +11124,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"
@@ -11499,13 +11497,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unbekannter Knotentyp"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Bitte setzen Sie eine Stimmung aus der Liste."
+msgstr "Bitte wählen Sie Ihre Stimmung aus der Liste"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (optional)"
+msgstr "Nachricht (optional)"
 
 msgid "Edit User Mood"
 msgstr "Benutzerstimmung ändern"
@@ -11588,9 +11584,8 @@ msgstr "/Werkzeuge/_Einstellungen"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Werkzeuge/_System-Mitschnitt"
+msgstr "/Werkzeuge/Setze _Stimmung"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
@@ -11599,7 +11594,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"
@@ -11611,20 +11606,17 @@ msgstr "/_Hilfe"
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Buddy-Information"
+msgstr "/Hilfe/_Build-Informationen"
 
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Serverinformation"
+msgstr "/Hilfe/_Entwickler-Informationen"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Persönliche Informationen"
+msgstr "/Hilfe/Ü_bersetzer-Informationen"
 
 msgid "/Help/_About"
 msgstr "/Hilfe/Ü_ber"
@@ -11722,7 +11714,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"
@@ -11855,9 +11847,8 @@ msgstr "<PurpleMain>/Konten/"
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Setze Stimmung..."
+msgstr "Setze _Stimmung..."
 
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
@@ -11979,9 +11970,8 @@ msgstr "/Unterhaltung/Medien/A_udio-\\/Video-Anruf"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Unterhaltung/Info abrufen"
+msgstr "/Unterhaltung/_Aufmerksamkeit erregen"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/_Buddy-Alarm hinzufügen..."
@@ -12064,9 +12054,8 @@ msgstr "/Unterhaltung/Medien/Audio-\\/Video-Anruf"
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Unterhaltung/Info abrufen"
+msgstr "/Unterhaltung/Aufmerksamkeit erregen"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
@@ -12132,13 +12121,11 @@ msgstr "Ab_schicken"
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Diesen Reiter schließen"
+msgstr "Suchleiste schließen"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Suchen"
+msgstr "Suchen:"
 
 #, c-format
 msgid "%d person in room"
@@ -12302,6 +12289,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabisch"
 
+msgid "Assamese"
+msgstr "Assamesisch"
+
 msgid "Belarusian Latin"
 msgstr "Weißrussisch (Latin)"
 
@@ -12309,7 +12299,10 @@ msgid "Bulgarian"
 msgstr "Bulgarisch"
 
 msgid "Bengali"
-msgstr "Bengalisch"
+msgstr "Bengali"
+
+msgid "Bengali-India"
+msgstr "Bengali-Indien"
 
 msgid "Bosnian"
 msgstr "Bosnisch"
@@ -12425,6 +12418,9 @@ msgstr "Laotisch"
 msgid "Macedonian"
 msgstr "Makedonisch"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolisch"
 
@@ -12465,7 +12461,7 @@ msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
 msgid "Pashto"
-msgstr "Paschtunisch"
+msgstr "Paschtu"
 
 msgid "Romanian"
 msgstr "Rumänisch"
@@ -12495,7 +12491,7 @@ msgid "Swahili"
 msgstr "Swahili"
 
 msgid "Tamil"
-msgstr "Tamilisch"
+msgstr "Tamil"
 
 msgid "Telugu"
 msgstr "Telugu"
@@ -12533,7 +12529,7 @@ msgstr "Amharisch"
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#, fuzzy, c-format
+#, 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 "
@@ -12542,15 +12538,14 @@ msgid ""
 "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 ""
@@ -12559,8 +12554,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12570,31 +12569,31 @@ msgid ""
 "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 "About %s"
 msgstr "Über %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Buddy-Information"
+msgstr "Build-Informationen"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Buddy-Information"
+msgstr "%s-Build-Informationen"
 
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
@@ -12608,9 +12607,9 @@ msgstr "Zurückgetretene Entwickler"
 msgid "Retired Crazy Patch Writers"
 msgstr "Zurückgetretene verrückte Patchschreiber"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Serverinformation"
+msgstr "%s-Entwickler-Informationen"
 
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
@@ -12618,9 +12617,9 @@ msgstr "Aktuelle Übersetzer"
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Mehr Informationen"
+msgstr "%s-Übersetzer-Informationen"
 
 msgid "_Name"
 msgstr "_Name"
@@ -12824,7 +12823,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"
@@ -12871,7 +12870,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 ""
@@ -12879,17 +12878,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"
@@ -13042,9 +13041,8 @@ msgstr "IM-Bild einfügen"
 msgid "Insert Smiley"
 msgstr "Smiley einfügen"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Senden-Knopf"
+msgstr "Aufmerksamkeitsgesuch senden"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fett</b>"
@@ -13092,7 +13090,7 @@ msgid "_Smile!"
 msgstr "_Lächeln!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Aufmerksamkeit!"
 
 msgid "Log Deletion Failed"
 msgstr "Löschen des Mitschnitts fehlgeschlagen"
@@ -13121,8 +13119,7 @@ msgid ""
 "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?"
@@ -13228,11 +13225,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."
@@ -13758,7 +13755,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"
@@ -13767,7 +13764,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"
@@ -14040,10 +14037,6 @@ msgstr "Verknüpfter Text"
 msgid "Custom Smiley Manager"
 msgstr "Verwaltung für benutzerdefinierte Smileys"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktivierung erforderlich"
-
 msgid "Select Buddy Icon"
 msgstr "Buddy-Icon auswählen"
 
@@ -14266,12 +14259,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"
@@ -14404,7 +14397,7 @@ msgid ""
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>Beschreibung:</b>"
+"<b>Beschreibung:</b> "
 
 #. Create the window.
 msgid "Service Discovery"
@@ -15011,7 +15004,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"
@@ -15189,8 +15182,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..."
@@ -15205,7 +15207,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
@@ -15391,125 +15393,155 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Sendet und empfängt RAW-XMPP-Blöcke."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
 
-#~ msgid "Error creating conference."
-#~ msgstr "Fehler beim Erstellen der Konferenz."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Kann die Socket nicht an den Port binden: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Lauschen auf Socket nicht möglich: %s"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s hat Sie gerade angestoßen!"
-
-#~ 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."
+#. $(^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 ""
+"$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die "
+"Lizenz dient hier nur der Information. $_CLICK"
 
-#~ msgid "Profile URL"
-#~ msgstr "URL des Profils"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-Protokoll-Plugin"
+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."
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s ist keine gültige Gruppe."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin-Basisdateien und -DLLs"
 
-#~ msgid "Unknown error."
-#~ msgstr "Unbekannter Fehler."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Erstellt einen Eintrag für Pidgin im Startmenü"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s auf %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Erstellt eine Verknüpfung zu Pidgin auf dem Desktop"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug-Symbole (zum Melden von Abstürzen)"
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Kann den Benutzer nicht für %s (%s) blockieren"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Kann den Benutzer nicht für %s (%s) erlauben"
+#. $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."
 
-#~ 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."
+#. $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."
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s ist kein gültiges Passport-Konto."
+#. $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"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Dienst momentan nicht verfügbar."
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime-Umgebung (erforderlich, falls nicht vorhanden)"
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Kann die Gruppe nicht umbenennen"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokalisierungen"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Kann die Gruppe nicht löschen"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Weiter >"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugefügt."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Client (erforderlich)"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
+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?"
 
-#~ 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/>"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Verknüpfungen"
 
-#~ 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>"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Verknüpfungen zum Starten von Pidgin"
 
-#~ 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>"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Unterstützung für Rechtschreibkontrolle"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Debugging-Information"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmenü"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Nicht erkannter Dateityp\n"
-#~ "\n"
-#~ "Verwende Standard (PNG)."
+#. 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 ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fehler beim Speichern des Bildes\n"
-#~ "\n"
-#~ "%s"
+msgid "The installer is already running."
+msgstr "Der Installer läuft schon."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Öffnen der Datei '%s' fehlgeschlagen: %s"
+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."
 
-#~ 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"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI-Behandlung"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Einen <iq/> Block einfügen."
+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."
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Einen <presence/> Block einfügen."
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besuchen Sie die Pidgin-Webseite"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Einen <message/> Block einfügen."
+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 9c823e0d31..ad95321495 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
@@ -805,7 +818,7 @@ msgstr "གཞི་སྒྲིག"
 msgid "Waiting for transfer to begin"
 msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ཆ་མེད་བཏང་ཡི།"
 
 msgid "Failed"
@@ -1316,6 +1329,10 @@ msgstr "ཁ་སླབ་ནང་གཞན་ཚུ་བློ་སླབ།
 msgid "Someone says your username in chat"
 msgstr "མི་ཅིག་གིས་ ཁ་སླབ་ནང་ ཁྱོད་ཀྱི་མིང་སླབ་མས།"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ཐོ་བཀོད་དགོཔ།"
+
 msgid "GStreamer Failure"
 msgstr "ཇི་སི་ཊི་མར་ འཐུས་ཤོར་འབྱུང་།"
 
@@ -1420,7 +1437,6 @@ msgid "Saved Statuses"
 msgstr "གནས་ཚད་ཚུ་སྲུངས་བཞག་ཡོདཔ།"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "མགོ་མིང་།"
 
@@ -1619,7 +1635,7 @@ msgstr ""
 msgid "Online"
 msgstr "གློག་ཐོག"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ཨོཕ་ལ་ཡིན།"
 
@@ -1718,6 +1734,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 "མ་ཤེསཔ།"
 
@@ -1735,9 +1759,10 @@ 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."
 msgstr ""
@@ -1969,7 +1994,6 @@ msgstr "%s: %d དོགས་པ་སེལ་ནིའི་འཛོལ་�
 msgid "Thread creation failure: %s"
 msgstr "ཐེ་རེཌི་གསར་བསྐྲུན་འཐུས་ཤོར།: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
@@ -3267,6 +3291,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 "འགོ་མིང་།"
 
@@ -3886,18 +3913,6 @@ msgstr "བརྡ་བཀོད་ལྕོགས་མིན་ཐལ།"
 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 ""
-"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
-"རྒྱབ་སྐྱོར་མིན་འདུག"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "སར་བརའདི་ལུ་ གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན།"
@@ -3931,6 +3946,19 @@ 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 "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
@@ -3939,6 +3967,42 @@ msgid "SASL error: %s"
 msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
 
 #, 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 "རིམ་སྒྲིག་འབད་མི་ཚུགས།"
 
@@ -4013,6 +4077,7 @@ msgstr "ལུང་ཕྱོགས།"
 msgid "Postal Code"
 msgstr "འགྲེམ་ཨང་།"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "རྒྱལ་ཁབ།"
 
@@ -4027,10 +4092,14 @@ msgstr "ཚོགས་སྡེའི་མིང་།"
 msgid "Organization Unit"
 msgstr "ཚོགས་སྡེའི་ཆ་ཕྲན།"
 
+msgid "Job Title"
+msgstr "ལས་གཡོག་ མགོ་མིང་།"
+
 msgid "Role"
 msgstr "ལས་འགན།"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "སྐྱེ་བའི་ཉིནམ།"
 
@@ -4258,6 +4327,18 @@ msgid "Roles:"
 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 ""
+"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
+"རྒྱབ་སྐྱོར་མིན་འདུག"
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
 
@@ -4265,6 +4346,9 @@ 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 ""
 
@@ -4371,7 +4455,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "དབང་སྤྲོད་མ་འབད།"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ཁམས།"
 
@@ -4393,7 +4476,6 @@ msgstr "ལུ།"
 msgid "None (To pending)"
 msgstr "ཅི་མེད་ (བསྣར་ལུ)"
 
-#. 0
 msgid "None"
 msgstr "ཅི་མེད།"
 
@@ -4417,6 +4499,12 @@ msgstr "བར་མའི་མིང་།"
 msgid "Mood Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4591,9 +4679,6 @@ msgstr "སྲིད་བྱུས་འགལ་བ།"
 msgid "Remote Connection Failed"
 msgstr "ཐག་རིང་གི་མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Resource Constraint"
-msgstr "ཐོན་ཁུངས་བཀག་དམ།"
-
 msgid "Restricted XML"
 msgstr "བཀག་དམ་ཅན་ ཨེགསི་ཨེམ་ཨེལ།"
 
@@ -4961,7 +5046,6 @@ msgstr "ངོ་ཚ་སྟེ།"
 msgid "Amorous"
 msgstr "སྡེ་ཚན།"
 
-#. 1
 msgid "Angry"
 msgstr "ཁྲོ་བོ།"
 
@@ -5059,7 +5143,6 @@ msgstr ""
 msgid "Envious"
 msgstr "སེམས་འཚབ།"
 
-#. 2
 msgid "Excited"
 msgstr "སྤྲོ་སེམས་སློང་བའི།"
 
@@ -5078,7 +5161,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "མཐུད་དོ..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "སྡེ་ཚན།"
@@ -5087,14 +5169,12 @@ msgstr "སྡེ་ཚན།"
 msgid "Guilty"
 msgstr "གྲོང་སྡེ།"
 
-#. 4
 msgid "Happy"
 msgstr "དགའ་ཉམས་ཅན།"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "ཧོསཊི:(_H)"
@@ -5135,7 +5215,6 @@ msgstr "དངུལ་སྐྱེད་ཚུ།"
 msgid "Intoxicated"
 msgstr "མགྲོན་དུ་འབོད།"
 
-#. 6
 msgid "Invincible"
 msgstr "དབང་ལུ་བསྡུ་མི་ཚུགས་པའི།"
 
@@ -5199,7 +5278,6 @@ msgstr "རྩ་བསྐྲད་བཏང་།"
 msgid "Restless"
 msgstr "ཐོ་དེབ།"
 
-#. 7
 msgid "Sad"
 msgstr "སྐྱོ་ཉམས་ཅན།"
 
@@ -5220,12 +5298,10 @@ msgstr "འགགས་ཡོདཔ།"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "སྐྱོན་མིང་།"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "གཉིད་ཐིབ་ཐིབ།"
@@ -5648,20 +5724,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 "མགོ་མིང་།"
@@ -5821,9 +5883,6 @@ msgstr "ལོ་འཁོར་དུས་དྲན།"
 msgid "Work"
 msgstr "ཨའི་ཨེམ་ ལཱ་གཡོག"
 
-msgid "Job Title"
-msgstr "ལས་གཡོག་ མགོ་མིང་།"
-
 msgid "Company"
 msgstr "ཚོང་སྡེ།"
 
@@ -5914,6 +5973,10 @@ msgstr "ཨའི་པི་སི་བརྟག་ཞིབ་སར་བར
 msgid "Show custom smileys"
 msgstr "སྲོལ་སྒྲིག་ སི་མའི་ལི་ཚུ་སྟོན།"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ལྷོག་བཀོག: ཁོང་རའི་དྲན་བཏོན་ནིའི་དོན་ལུ་ ལག་ལེན་པ་གཅིག་ལྷོག་བཀོག"
 
@@ -6107,28 +6170,6 @@ msgstr "ཆ་རོགས་འདི་ ཁྱོད་ཀྱི་ཆ་ར�
 msgid "The username specified is invalid."
 msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
 
-#. 5
-msgid "In Love"
-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 "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
@@ -6165,7 +6206,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 "ཡུ་ཨའི་ཨེན།"
@@ -6174,6 +6219,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "བཀྲམ་སྟོན།"
@@ -6205,11 +6251,6 @@ msgstr "ཁ་སླབ་ནི་  ད་ལྟོ་མི་ཐོབ།"
 msgid "About"
 msgstr "གཱེམ་གྱི་སྐོར་ལས"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6249,7 +6290,7 @@ msgid "Connecting..."
 msgstr "མཐུད་དོ།"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
 #, fuzzy
@@ -6257,14 +6298,9 @@ 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"
@@ -6296,10 +6332,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
@@ -6313,7 +6349,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "མཐའ་བཙན་ལྕོགས་ཅན་བཟོ་ཡི།"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ཆོག་ཡིག་བཙུགས།"
@@ -6347,12 +6383,17 @@ 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")
@@ -6367,6 +6408,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 ""
@@ -6486,6 +6549,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "མཛའ་མཐུན།"
+
 #, fuzzy
 msgid "Pending"
 msgstr "གཏང་།"
@@ -6911,9 +6977,6 @@ msgstr "ལམ་ཡིག་འདི་ དུས་ཡོལ་ནུག"
 msgid "Incorrect password"
 msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
 
-msgid "User not found"
-msgstr "ལག་ལེན་མ་ཐོབ།"
-
 msgid "Account has been disabled"
 msgstr "རྩིས་ཐོ་འདི་ ལྕོགས་མིན་ཐལ་སོ་ནུག"
 
@@ -7169,6 +7232,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "མཐུད་མ་ཚུགས།"
@@ -7177,6 +7244,67 @@ 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 ""
+
+#, 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 "ཨོཕ་ལ་ཡིན།"
+
+#, 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ལུ་འཕྲིན་དོན་གཏང་མ་ཚུགས།"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7346,120 +7474,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 "ནུས་མེད་ ཨེསི་ཨེན་ཨེ་སི།"
-
-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 ""
-
-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 "
@@ -7829,29 +7843,10 @@ 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 "ལས་ཚུར་ གློག་ཐོག"
 
@@ -8287,6 +8282,75 @@ 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 "ཨེ་ཨོ་ཨེལ་གྱི་སྐབས་སུ་ མེན།"
+
 msgid "Aquarius"
 msgstr "དུས་སྦྱོར་བུམ་པ།"
 
@@ -8608,6 +8672,11 @@ msgstr "ཌའི་ལོག་ཞུ།"
 msgid "Admin"
 msgstr "ཨེ་ཌིཡམ།"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ཁང་མིག་གི་ཐོ་ཡིག"
+
 #, fuzzy
 msgid "Notice"
 msgstr "དྲན་ཐོ།"
@@ -10567,9 +10636,6 @@ msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 msgid "Yahoo! Protocol Plugin"
 msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
 
-msgid "Pager server"
-msgstr "བརྡ་འཕྲུལ་སར་བར།"
-
 msgid "Pager port"
 msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
 
@@ -10585,18 +10651,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 "ཡ་ཧུ!ཨའི་ཌི།"
@@ -10667,6 +10727,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"
@@ -10751,6 +10820,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 "ཁྱིམ་ནང་ མེན།"
 
@@ -11143,6 +11221,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)"
 
@@ -11391,12 +11473,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 "ནང་བསྐྱོད་ཀྱི་གདམ་ཁ་ཚུ།"
@@ -12638,6 +12714,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "ཨ་ར་བིཀ།"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ངོ་ཚ་སྟེ།"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12647,6 +12727,10 @@ msgstr "བཱལ་ག་རི་ཡཱན།"
 msgid "Bengali"
 msgstr "བེང་ག་ལི།"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "བེང་ག་ལི།"
+
 msgid "Bosnian"
 msgstr "བོསོ་ནི་ཡཱན།"
 
@@ -12769,6 +12853,10 @@ msgid "Macedonian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "ཕོ།"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "མེ་སི་ཌོ་ནི་ཡཱན།"
 
@@ -12890,8 +12978,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "གེམ་འདི་ ཨེ་ཨའི་ཨེམ་ ཨེམ་ཨེསི་ཨེན་ ཡ་ཧུ་! ཇེབ་བར་ ཨའི་སི་ཀིའུ་ ཨའི་ཨར་སི་ ཨེསི་ཨའི་ཨེལ་སི་ ནོ་བེལ་སྡེ་"
 "རིམ་ ལོ་ཊསི་དུས་གཅིག་པ་ ཛེ་ཕིའར་ ག་ཌུ་-ག་ཌུ་ དང་ ཀིའུ་ཀིའུ་ཚུ་ཆ་མཉམ་རང་ ཚར་གཅིག་གུ་ལུ་ལག་ལེན་"
@@ -13470,14 +13558,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
@@ -13584,10 +13672,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
@@ -14465,10 +14553,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "ཐོ་བཀོད་དགོཔ།"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ཆ་རོགས་སེལ་འཐུ་འབད།"
 
@@ -15678,7 +15762,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..."
@@ -15891,6 +15987,206 @@ msgstr ""
 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."
+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 "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_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 "ཇི་ཊི་ཀེ་+གཡོག་བཀོད་དུས་ཚོད་ཐོན་རིམ།"
+
+#. 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 ""
+
+#, 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 "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
@@ -16040,9 +16336,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "ལག་ལེན་པ:(_U)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ཇི་ཊི་ཀེ་+གཡོག་བཀོད་དུས་ཚོད་ཐོན་རིམ།"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "རྩིས་སྟོན་པའི་བསྒང་..."
@@ -16596,7 +16889,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."
@@ -17350,9 +17643,6 @@ msgstr ""
 #~ msgid "_Deny"
 #~ msgstr "ཉན་མི་བཏུབ་པས།(_D)"
 
-#~ msgid "Invalid Username"
-#~ msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "ཁྱོད་ཀྱིས་ ད་ལྟོ་རྐྱངམ་ཅིག་ ནཱཌཇི་བཏང་ཡོད།"
 
@@ -18059,9 +18349,6 @@ msgstr ""
 #~ msgid "Show _buttons as:"
 #~ msgstr "དེ་བཟུམ་སྦེ་གཡེབ་རྟ་ཚུ་སྟོན:(_b)"
 
-#~ msgid "Text"
-#~ msgstr "ཚིག་ཡིག"
-
 #~ msgid "Pictures and text"
 #~ msgstr "པར་ཚུ་དང་ཚིག་ཡིག་"
 
diff --git a/po/el.po b/po/el.po
index 42e13a73f4..8885aac39f 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "Ειδοποιήσεις νέας αλληλογραφίας"
 
@@ -791,7 +804,7 @@ msgstr "Σταμάτημα"
 msgid "Waiting for transfer to begin"
 msgstr "Αναμονή έναρξης μεταφοράς"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 msgid "Failed"
@@ -1265,6 +1278,10 @@ msgstr "Άλλοι μιλούν σε συζήτηση"
 msgid "Someone says your username in chat"
 msgstr "Κάποιος είπε το όνομά σας σε μια συζήτηση"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Απαιτείται ενεργοποίηση"
+
 msgid "GStreamer Failure"
 msgstr "Αποτυχία GStreamer"
 
@@ -1358,7 +1375,6 @@ msgid "Saved Statuses"
 msgstr "Αποθηκευμένες καταστάσεις"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -1563,7 +1579,7 @@ msgstr ""
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Χωρίς σύνδεση"
 
@@ -1656,6 +1672,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 "Άγνωστο"
 
@@ -1676,9 +1700,10 @@ 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."
@@ -1910,7 +1935,6 @@ msgstr "Σφάλμα κατά την εύρεση του %s: %d"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Άγνωστη αιτία"
 
@@ -3202,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 "Όνομα"
 
@@ -3811,12 +3838,6 @@ 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 ""
 "Ο εξυπηρετητής απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κωδικοποιημένης "
@@ -3850,6 +3871,20 @@ 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"
 
@@ -3858,6 +3893,42 @@ 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 "Αδυναμία ρύθμισης"
 
@@ -3924,6 +3995,7 @@ msgstr "Περιοχή"
 msgid "Postal Code"
 msgstr "Ταχ. Κώδικας"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Χώρα"
 
@@ -3938,10 +4010,14 @@ msgstr "Όνομα οργανισμού"
 msgid "Organization Unit"
 msgstr "Τμήμα"
 
+msgid "Job Title"
+msgstr "Τίτλος εργασίας"
+
 msgid "Role"
 msgstr "Ρόλος"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Ημερομηνία γέννησης"
 
@@ -4159,12 +4235,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 "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 ""
 
@@ -4265,7 +4350,6 @@ msgstr "Ο εξυπηρετητής δεν υπηστηρίζει αποκλει
 msgid "Not Authorized"
 msgstr "Δεν εγκρίθηκε"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Διάθεση"
 
@@ -4287,7 +4371,6 @@ msgstr "Σε"
 msgid "None (To pending)"
 msgstr "Κανένα (Προς εκκρεμεί)"
 
-#. 0
 msgid "None"
 msgstr "Καμία"
 
@@ -4309,6 +4392,12 @@ msgstr "Πατρώνυμο"
 msgid "Mood Comment"
 msgstr "Σχόλιο φίλου"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Καλλιτέχνης"
 
@@ -4479,9 +4568,6 @@ msgstr "Παράβαση πολιτικής"
 msgid "Remote Connection Failed"
 msgstr "Αποτυχία απομακρυσμένης σύνδεσης"
 
-msgid "Resource Constraint"
-msgstr "Περιορισμός πόρων"
-
 msgid "Restricted XML"
 msgstr "Περιορισμένο XML"
 
@@ -4833,7 +4919,6 @@ msgstr "Ντροπαλός"
 msgid "Amorous"
 msgstr "Χαρούμενος"
 
-#. 1
 msgid "Angry"
 msgstr "Θυμωμένος"
 
@@ -4931,7 +5016,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Αμήχανος"
 
-#. 2
 msgid "Excited"
 msgstr "Εντυπωσιασμένος"
 
@@ -4950,7 +5034,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Λήψη..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Ομάδα"
@@ -4959,14 +5042,12 @@ msgstr "Ομάδα"
 msgid "Guilty"
 msgstr "Πόλη"
 
-#. 4
 msgid "Happy"
 msgstr "Χαρούμενος"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Κεντρικός Υπολογιστής:"
@@ -5007,7 +5088,6 @@ msgstr "Ενδιαφέροντα"
 msgid "Intoxicated"
 msgstr "Πρόσκληση"
 
-#. 6
 msgid "Invincible"
 msgstr "Άτρωτος"
 
@@ -5071,7 +5151,6 @@ msgstr "Αφαίρεση"
 msgid "Restless"
 msgstr "Καταχώρηση"
 
-#. 7
 msgid "Sad"
 msgstr "Λυπημένος"
 
@@ -5092,12 +5171,10 @@ msgstr "Αποκλεισμένος"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Ψευδώνυμο"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Κοιμισμένος"
@@ -5497,18 +5574,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 "Τίτλος παιχνιδιού"
 
@@ -5659,9 +5724,6 @@ msgstr "Γενέθλια"
 msgid "Work"
 msgstr "Εργασία"
 
-msgid "Job Title"
-msgstr "Τίτλος εργασίας"
-
 msgid "Company"
 msgstr "Εταιρία"
 
@@ -5750,6 +5812,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: σκούντηγμα ενός χρήστη για να ζητήσετε την προσοχή του"
 
@@ -5946,28 +6012,6 @@ msgstr "Θέλετε να διαγράψετε αυτόν το φίλο και �
 msgid "The username specified is invalid."
 msgstr "Το όνομα χρήστη που δόθηκε δεν είναι έγκυρο."
 
-#. 5
-msgid "In Love"
-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 που πληκτρολογήθηκε είναι λανθασμένο"
@@ -6004,7 +6048,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"
@@ -6013,6 +6061,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Επώνυμο"
@@ -6043,11 +6092,6 @@ msgstr ""
 msgid "About"
 msgstr "Σχετικά με μένα"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Αλλαγή κωδικού..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6091,7 +6135,7 @@ msgid "Connecting..."
 msgstr "Γίνεται σύνδεση"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
 
 #, fuzzy
@@ -6099,14 +6143,9 @@ 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"
@@ -6135,10 +6174,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
@@ -6152,7 +6191,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Ασφάλεια ενεργοποιήθηκε"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Εισαγωγή κωδικού"
@@ -6186,12 +6225,17 @@ 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")
@@ -6206,6 +6250,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 ""
@@ -6326,6 +6392,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Ερωτευμένος"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Αποστολή"
@@ -6725,9 +6794,6 @@ msgstr "Ο κωδικός έχει λήξει"
 msgid "Incorrect password"
 msgstr "Λανθασμένος κωδικός."
 
-msgid "User not found"
-msgstr "Ο χρήστης δε βρέθηκε"
-
 msgid "Account has been disabled"
 msgstr "Ο λογαριασμός έχει απενεργοποιηθεί"
 
@@ -6819,14 +6885,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 ""
@@ -6994,12 +7060,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 "Μήνυμα χωρίς σύνδεση"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7168,120 +7299,6 @@ 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 "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 "
@@ -7645,29 +7662,10 @@ 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 "Συνδεδεμένος από"
 
@@ -8104,6 +8102,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Υδροχόος"
 
@@ -8386,6 +8453,11 @@ msgstr "Γίνεται αίτηση"
 msgid "Admin"
 msgstr "Διαχειριστής"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Λίστα δωματίων"
+
 msgid "Notice"
 msgstr "Σημείωση"
 
@@ -10291,9 +10363,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Πρόσθετο πρωτοκόλλου Yahoo!"
 
-msgid "Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης"
-
 msgid "Pager port"
 msgstr "Θύρα τηλεειδοποιητή"
 
@@ -10309,18 +10378,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..."
 
@@ -10388,6 +10451,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 "Λείπει το όνομα χρήστη ή ο κωδικός."
@@ -10467,6 +10539,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 "Εκτός σπιτιού"
 
@@ -10813,8 +10896,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"
@@ -10840,6 +10923,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 "_Αποδοχή"
 
@@ -11007,8 +11094,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"
@@ -11077,12 +11164,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 "Επιλογές εισόδου"
@@ -12261,6 +12342,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Αραβικά"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ντροπαλός"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12270,6 +12355,9 @@ msgstr "Βουλγάρικα"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12384,6 +12472,10 @@ msgstr ""
 msgid "Macedonian"
 msgstr "Μακεδονικά (Σλαβικά)"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Άντρας"
+
 msgid "Mongolian"
 msgstr "Μογγολικά"
 
@@ -12502,8 +12594,8 @@ msgid ""
 "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>"
+"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, "
@@ -12511,8 +12603,8 @@ msgstr ""
 "MySpaceIM, Gadu-Gadu και QQ, όλα ταυτόχρονα.  Είναι γραμμένο με τη χρήση GTK"
 "+.<BR><BR>Μπορείτε να τροποποιήσετε και να αναδιανείμετε το πρόγραμμα υπό "
 "τους όρους της άδειας χρήσης GPL (έκδοση 2 ή νεότερη).  Ένα αντίγραφο της "
-"άδειας χρήσης GPL περιέχεται στο αρχείο COPYING που διανέμεται μαζί με το %"
-"s.  Το %s είναι πνευματική ιδιοκτησία των συμβαλλομένων.  Δείτε το αρχείο "
+"άδειας χρήσης GPL περιέχεται στο αρχείο COPYING που διανέμεται μαζί με το "
+"%s.  Το %s είναι πνευματική ιδιοκτησία των συμβαλλομένων.  Δείτε το αρχείο "
 "COPYRIGHT για την πλήρη λίστα όλων των συμβαλλομένων.  Δεν παρέχουμε καμία "
 "εγγύηση για αυτό το πρόγραμμα.<BR><BR>"
 
@@ -13057,16 +13149,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;"
@@ -13156,10 +13248,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
@@ -13997,10 +14090,6 @@ msgstr "Κείμενο συντόμευσης"
 msgid "Custom Smiley Manager"
 msgstr "Διαχειριστής προσαρμοσμένων φατσουλών"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Απαιτείται ενεργοποίηση"
-
 msgid "Select Buddy Icon"
 msgstr "Επιλογή εικονιδίου φίλου"
 
@@ -15156,8 +15245,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..."
@@ -15372,6 +15473,201 @@ 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
+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 ""
+
+#, 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 "Σφάλμα δημιουργίας συζήτησης."
 
@@ -15518,9 +15814,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Χρήστης:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Έκδοση GTK+ Runtime"
-
 #~ msgid "Calling ... "
 #~ msgstr "Κλήση... "
 
@@ -15991,7 +16284,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 ""
 #~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
 
@@ -16318,8 +16611,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 8fca9ab8af..f84276a34c 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -821,8 +834,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 +1345,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 +1456,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,7 +1663,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1749,6 +1765,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"
 
@@ -1767,9 +1791,10 @@ 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."
 msgstr ""
@@ -2007,7 +2032,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."
@@ -2104,14 +2128,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"
@@ -3302,6 +3326,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"
 
@@ -3946,14 +3973,6 @@ 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."
-
-#, 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 "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
@@ -3986,6 +4005,18 @@ 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"
 
@@ -3994,6 +4025,42 @@ msgid "SASL error: %s"
 msgstr "Read error"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Finalising connection"
+
+#, 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 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"
 
@@ -4064,6 +4131,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4078,10 +4146,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"
 
@@ -4316,12 +4388,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 "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 ""
 
@@ -4427,7 +4510,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4449,7 +4531,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "None"
 
@@ -4473,6 +4554,12 @@ msgstr "Middle Name"
 msgid "Mood Comment"
 msgstr "Buddy Comment"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4647,9 +4734,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -5008,7 +5092,6 @@ msgstr "Ashamed"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Angry"
 
@@ -5106,7 +5189,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Anxious"
 
-#. 2
 msgid "Excited"
 msgstr "Excited"
 
@@ -5124,7 +5206,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Connecting..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group:"
@@ -5133,14 +5214,12 @@ msgstr "Group:"
 msgid "Guilty"
 msgstr "City"
 
-#. 4
 msgid "Happy"
 msgstr "Happy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5181,7 +5260,6 @@ msgstr "_Insert"
 msgid "Intoxicated"
 msgstr "Invite"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
@@ -5245,7 +5323,6 @@ msgstr "Remove"
 msgid "Restless"
 msgstr "Register"
 
-#. 7
 msgid "Sad"
 msgstr "Sad"
 
@@ -5266,12 +5343,10 @@ msgstr "Blocked"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sleepy"
@@ -5696,19 +5771,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"
@@ -5882,9 +5944,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5984,6 +6043,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 ""
 
@@ -6196,27 +6259,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "In Love"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "The SecurID key entered is invalid."
@@ -6253,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"
@@ -6262,6 +6308,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6293,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..."
@@ -6341,7 +6383,7 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 #, fuzzy
@@ -6349,14 +6391,9 @@ 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"
@@ -6393,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
@@ -6410,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"
@@ -6444,12 +6481,17 @@ 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")
@@ -6464,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."
@@ -6584,6 +6648,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "In Love"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -7005,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"
 
@@ -7266,6 +7330,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7274,6 +7342,67 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
+msgid "Invalid error"
+msgstr "Invalid error"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
+
+#. 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 "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 "Unable to send message."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7447,120 +7576,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
-
-#. 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 "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 "Unable to send message."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "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 "
@@ -7914,29 +7929,10 @@ 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"
 
@@ -8383,6 +8379,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8724,6 +8789,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -9195,7 +9265,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>"
@@ -9276,7 +9346,7 @@ msgstr "Unable to send message to %s:"
 
 #, fuzzy
 msgid "Place Closed"
-msgstr "Canceled"
+msgstr "Cancelled"
 
 msgid "Microphone"
 msgstr ""
@@ -10732,10 +10802,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"
 
@@ -10753,20 +10819,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"
@@ -10833,6 +10892,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"
@@ -10910,6 +10976,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"
 
@@ -11311,6 +11388,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"
@@ -11564,13 +11645,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"
@@ -12864,6 +12938,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12873,6 +12951,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -13000,6 +13081,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
@@ -13123,8 +13208,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13707,14 +13792,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
@@ -13809,10 +13894,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
@@ -14723,10 +14808,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -15955,7 +16036,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
@@ -16176,6 +16267,195 @@ msgstr ""
 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."
+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 "Accept Defaults"
+
+#. $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
+#, 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 "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"
@@ -16308,9 +16588,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -16785,8 +17062,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."
@@ -18150,9 +18427,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 a1b9dcf1cd..627efef93e 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -821,7 +834,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 +1345,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 +1456,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,7 +1663,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1749,6 +1765,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"
 
@@ -1767,9 +1791,10 @@ 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."
 msgstr ""
@@ -2007,7 +2032,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."
@@ -3302,6 +3326,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"
 
@@ -3948,14 +3975,6 @@ 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."
-
-#, 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 "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
@@ -3988,6 +4007,18 @@ 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"
 
@@ -3996,6 +4027,42 @@ msgid "SASL error: %s"
 msgstr "Read error"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Finalizing connection"
+
+#, 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 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"
 
@@ -4066,6 +4133,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4080,10 +4148,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"
 
@@ -4318,12 +4390,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 "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 ""
 
@@ -4429,7 +4512,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4451,7 +4533,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "None"
 
@@ -4475,6 +4556,12 @@ msgstr "Middle Name"
 msgid "Mood Comment"
 msgstr "Buddy Comment"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4649,9 +4736,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -5010,7 +5094,6 @@ msgstr "Ashamed"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Angry"
 
@@ -5108,7 +5191,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Anxious"
 
-#. 2
 msgid "Excited"
 msgstr "Excited"
 
@@ -5126,7 +5208,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Connecting..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group:"
@@ -5135,14 +5216,12 @@ msgstr "Group:"
 msgid "Guilty"
 msgstr "City"
 
-#. 4
 msgid "Happy"
 msgstr "Happy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5183,7 +5262,6 @@ msgstr "_Insert"
 msgid "Intoxicated"
 msgstr "Invite"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
@@ -5247,7 +5325,6 @@ msgstr "Remove"
 msgid "Restless"
 msgstr "Register"
 
-#. 7
 msgid "Sad"
 msgstr "Sad"
 
@@ -5268,12 +5345,10 @@ msgstr "Blocked"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sleepy"
@@ -5698,19 +5773,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"
@@ -5884,9 +5946,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5986,6 +6045,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 ""
 
@@ -6187,27 +6250,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "In Love"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "The SecurID key entered is invalid."
@@ -6244,7 +6286,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"
@@ -6253,6 +6299,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6284,11 +6331,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..."
@@ -6332,7 +6374,7 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 #, fuzzy
@@ -6340,14 +6382,9 @@ 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"
@@ -6384,10 +6421,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
@@ -6401,7 +6438,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6435,12 +6472,17 @@ 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")
@@ -6455,6 +6497,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."
@@ -6575,6 +6639,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "In Love"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6996,9 +7063,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"
 
@@ -7257,6 +7321,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7265,6 +7333,67 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
+msgid "Invalid error"
+msgstr "Invalid error"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
+
+#. 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 "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 "Unable to send message."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7438,120 +7567,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
-
-#. 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 "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 "Unable to send message."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "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 "
@@ -7907,29 +7922,10 @@ 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"
 
@@ -8372,6 +8368,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8713,6 +8778,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -10721,10 +10791,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"
 
@@ -10742,20 +10808,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"
@@ -10822,6 +10881,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"
@@ -10899,6 +10965,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"
 
@@ -11300,6 +11377,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"
@@ -11553,13 +11634,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"
@@ -12853,6 +12927,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12862,6 +12940,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12989,6 +13070,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
@@ -13112,8 +13197,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13696,14 +13781,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
@@ -13798,10 +13883,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
@@ -14712,10 +14797,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -15944,7 +16025,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
@@ -16165,6 +16256,195 @@ msgstr ""
 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."
+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 "Accept Defaults"
+
+#. $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
+#, 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 "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"
@@ -16297,9 +16577,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -16773,7 +17050,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."
@@ -18132,9 +18409,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 4c7cbecc98..61e8fa2139 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -780,7 +793,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 +1260,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 +1357,6 @@ msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1541,7 +1557,7 @@ msgstr "When receiving a message with URL(s), TinyURL for easier copying"
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1634,6 +1650,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"
 
@@ -1654,9 +1678,10 @@ 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."
@@ -1898,7 +1923,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"
 
@@ -3165,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 "Forename"
 
@@ -3768,12 +3795,6 @@ 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"
 
@@ -3804,6 +3825,18 @@ 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"
 
@@ -3812,6 +3845,42 @@ 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"
 
@@ -3878,6 +3947,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postcode"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -3892,10 +3962,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"
 
@@ -4113,12 +4187,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 "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."
 
@@ -4216,7 +4300,6 @@ msgstr "Server doesn't support blocking"
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4238,7 +4321,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "None"
 
@@ -4260,6 +4342,12 @@ msgstr "Middle Name"
 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"
 
@@ -4430,9 +4518,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -4783,7 +4868,6 @@ msgstr "Ashamed"
 msgid "Amorous"
 msgstr "Glorious"
 
-#. 1
 msgid "Angry"
 msgstr "Angry"
 
@@ -4881,7 +4965,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Anxious"
 
-#. 2
 msgid "Excited"
 msgstr "Excited"
 
@@ -4900,7 +4983,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Retrieving..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group"
@@ -4909,14 +4991,12 @@ msgstr "Group"
 msgid "Guilty"
 msgstr "City"
 
-#. 4
 msgid "Happy"
 msgstr "Happy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -4957,7 +5037,6 @@ msgstr "Interests"
 msgid "Intoxicated"
 msgstr "Invite"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
@@ -5021,7 +5100,6 @@ msgstr "Remove"
 msgid "Restless"
 msgstr "Register"
 
-#. 7
 msgid "Sad"
 msgstr "Sad"
 
@@ -5042,12 +5120,10 @@ msgstr "Blocked"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sleepy"
@@ -5447,18 +5523,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"
 
@@ -5606,9 +5670,6 @@ msgstr "Anniversary"
 msgid "Work"
 msgstr "Work"
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5697,6 +5758,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"
 
@@ -5889,28 +5954,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "In Love"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "The SecurID key entered is invalid"
@@ -5947,7 +5990,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"
@@ -5956,6 +6003,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Family Name"
@@ -5986,11 +6034,6 @@ msgstr ""
 msgid "About"
 msgstr "About me"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6034,7 +6077,7 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid"
 
 #, fuzzy
@@ -6042,14 +6085,9 @@ 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"
@@ -6078,10 +6116,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
@@ -6095,7 +6133,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Enter code"
@@ -6129,12 +6167,17 @@ 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")
@@ -6149,6 +6192,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 ""
@@ -6268,6 +6333,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "In Love"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Sending"
@@ -6667,9 +6735,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"
 
@@ -6925,12 +6990,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL does not allow your screen name to authenticate here"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error requesting "
+
 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 "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
+
+#. 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 "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 "Unable to send message."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline Message"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7097,120 +7227,6 @@ msgstr ""
 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 "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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
-
-#. 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 "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 "Unable to send message."
-
-#, fuzzy
-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 "
@@ -7562,29 +7578,10 @@ 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"
 
@@ -8009,6 +8006,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8291,6 +8357,11 @@ msgstr "Requesting"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 msgid "Notice"
 msgstr "Notice"
 
@@ -10181,9 +10252,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Protocol Plugin"
 
-msgid "Pager server"
-msgstr "Pager server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10199,18 +10267,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..."
 
@@ -10276,6 +10338,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"
@@ -10351,6 +10422,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"
 
@@ -10728,6 +10810,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"
 
@@ -10965,12 +11051,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"
@@ -12146,6 +12226,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -12155,6 +12239,10 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -12269,6 +12357,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macedonian"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
 msgid "Mongolian"
 msgstr "Mongolian"
 
@@ -12387,8 +12479,8 @@ msgid ""
 "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>"
+"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, "
@@ -12933,19 +13025,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?"
@@ -13044,11 +13136,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."
@@ -13872,10 +13966,6 @@ msgstr "Shortcut Text"
 msgid "Custom Smiley Manager"
 msgstr "Custom Smiley Manager"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Activation required"
-
 msgid "Select Buddy Icon"
 msgstr "Select Buddy Icon"
 
@@ -15003,8 +15093,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..."
@@ -15216,6 +15318,206 @@ msgstr "Send and receive raw XMPP stanzas."
 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."
+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 ""
+
+#, 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."
 
@@ -15388,9 +15690,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 fa062939d1..b66d13e24c 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -753,7 +766,7 @@ msgstr "Haltu"
 msgid "Waiting for transfer to begin"
 msgstr "Atendante la alŝutoeko"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Rezignita"
 
 msgid "Failed"
@@ -1216,6 +1229,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 +1326,6 @@ msgid "Saved Statuses"
 msgstr "Konservitaj Statoj"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titolon"
 
@@ -1499,7 +1515,7 @@ msgstr ""
 msgid "Online"
 msgstr "Enrete"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Senkonekta"
 
@@ -1592,6 +1608,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"
 
@@ -1609,9 +1631,10 @@ 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."
 msgstr ""
@@ -1835,7 +1858,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"
 
@@ -3057,6 +3079,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"
 
@@ -3625,12 +3650,6 @@ msgstr ""
 msgid "execute"
 msgstr "ruligi"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3659,6 +3678,16 @@ msgstr ""
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, 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"
 
@@ -3667,6 +3696,40 @@ 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"
 
@@ -3733,6 +3796,7 @@ msgstr "Regiono"
 msgid "Postal Code"
 msgstr "Poŝto Kodo"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Lando"
 
@@ -3747,10 +3811,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"
 
@@ -3963,12 +4031,21 @@ msgstr "Neniu uzanto trovita"
 msgid "Roles:"
 msgstr "Roloj:"
 
+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 "Malvalida XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4066,7 +4143,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Etoso"
 
@@ -4088,7 +4164,6 @@ msgstr "Al"
 msgid "None (To pending)"
 msgstr "Nenio (Al atendante)"
 
-#. 0
 msgid "None"
 msgstr "Nenio"
 
@@ -4110,6 +4185,12 @@ msgstr "Meza Nomo"
 msgid "Mood Comment"
 msgstr "Kunul Komento"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4280,9 +4361,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4619,7 +4697,6 @@ msgstr "Animaciigi"
 msgid "Amorous"
 msgstr "Glora"
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4716,7 +4793,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4735,7 +4811,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Ricevante..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
@@ -4744,14 +4819,12 @@ msgstr "Grupo"
 msgid "Guilty"
 msgstr "Urbo"
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Retnodo:"
@@ -4791,7 +4864,6 @@ msgstr "Interesiĝoj"
 msgid "Intoxicated"
 msgstr "Invitu"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4855,7 +4927,6 @@ msgstr "Forigu"
 msgid "Restless"
 msgstr "Registru"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4876,12 +4947,10 @@ msgstr "Blokita"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Karesnomo"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5270,18 +5339,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"
 
@@ -5427,9 +5484,6 @@ msgstr "Naskiĝdato"
 msgid "Work"
 msgstr "Laboro"
 
-msgid "Job Title"
-msgstr "Laboro Titolo"
-
 msgid "Company"
 msgstr "Kompanio"
 
@@ -5513,6 +5567,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 ""
 
@@ -5682,28 +5740,6 @@ msgstr "Ĉu vi volas forigi tiun kunul el via adresaro ankaŭ?"
 msgid "The username specified is invalid."
 msgstr "La enigita uzantnomo malvalidas."
 
-#. 5
-msgid "In Love"
-msgstr ""
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Aktuale ĉe"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "La enigita SecurID malvalidas."
@@ -5740,7 +5776,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"
@@ -5749,6 +5789,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Familia Nomo"
@@ -5779,11 +5820,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..."
@@ -5821,7 +5857,7 @@ msgid "Connecting..."
 msgstr "Konektante"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "La enigita SecurID malvalidas."
 
 #, fuzzy
@@ -5829,14 +5865,9 @@ 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"
@@ -5864,10 +5895,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."
@@ -5879,7 +5910,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Enigu kodon"
@@ -5913,12 +5944,17 @@ 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")
@@ -5933,6 +5969,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 ""
@@ -6051,6 +6109,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "Sendante"
@@ -6438,9 +6499,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "Misa pasvorto"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6682,12 +6740,76 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Eraro skribante al %s: %s"
+
 msgid "Could not join chat room"
 msgstr "Ne povis aliĝi babilejon"
 
 msgid "Invalid chat room name"
 msgstr "Malvalida babilejo nomo"
 
+msgid "Invalid error"
+msgstr "Malvalida eraro"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Ne povas sendi dosierujon %s."
+
+#. 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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Ne eblas sendi mesaĝon: %s"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Senkonekta Mesaĝo"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -6850,119 +6972,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Malvalida eraro"
-
-msgid "Invalid SNAC"
-msgstr "Malvalida SNAC"
-
-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 "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 ""
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Ne povas sendi dosierujon %s."
-
-#. 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 ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Ne eblas sendi mesaĝon: %s"
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Senkonekta Mesaĝ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 "
@@ -7278,29 +7287,10 @@ 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"
 
@@ -7691,6 +7681,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr "Verŝisto"
 
@@ -7973,6 +8032,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Babilejoj Listo"
+
 msgid "Notice"
 msgstr ""
 
@@ -9762,9 +9826,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"
 
@@ -9780,18 +9841,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..."
 
@@ -9851,6 +9906,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"
@@ -9918,6 +9979,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"
 
@@ -10275,6 +10345,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"
 
@@ -10508,12 +10582,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"
@@ -11663,6 +11731,10 @@ msgstr "Afrikansa"
 msgid "Arabic"
 msgstr "Araba"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ludoj"
+
 msgid "Belarusian Latin"
 msgstr "Belorusa Latina"
 
@@ -11672,6 +11744,10 @@ msgstr "Bulgara"
 msgid "Bengali"
 msgstr "Bengala"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengala"
+
 msgid "Bosnian"
 msgstr "Bosna"
 
@@ -11786,6 +11862,10 @@ msgstr "Laŭa"
 msgid "Macedonian"
 msgstr "Makedona"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malina"
+
 msgid "Mongolian"
 msgstr "Mongola"
 
@@ -11904,8 +11984,8 @@ msgid ""
 "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>"
+"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 "
@@ -12444,14 +12524,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?"
@@ -12538,10 +12618,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
@@ -13354,10 +13436,6 @@ msgstr "Ligilo teksto"
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Registrado postulita"
-
 msgid "Select Buddy Icon"
 msgstr "Elektu Kunulan Piktogramon"
 
@@ -14454,8 +14532,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..."
@@ -14659,6 +14749,197 @@ msgstr ""
 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."
+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 "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 ""
+
+#, 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."
 
@@ -14774,9 +15055,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Uzanto:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Rultempa Versio"
-
 #~ msgid "Calling ... "
 #~ msgstr "Alvokante..."
 
diff --git a/po/es.po b/po/es.po
index 54e2f4a84a..0cd7dd45d4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,14 +1,14 @@
-# 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>
-# Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com>
 #
 # Agradecemos la ayuda de revisión realizada por:
 # Nathaniel Case, Santiago Erquicia, Francisco Javier F. Serrador,
@@ -53,15 +53,72 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2009-08-05 01:47+0200\n"
+"POT-Creation-Date: 2010-08-07 13: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.
@@ -100,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"
 
@@ -108,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"
 
@@ -646,7 +718,7 @@ msgid ""
 "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 ""
@@ -713,8 +785,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."
@@ -779,7 +851,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"
 
@@ -844,7 +916,7 @@ msgstr "Parar"
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -1273,10 +1345,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"
@@ -1315,6 +1387,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"
 
@@ -1408,7 +1483,6 @@ msgid "Saved Statuses"
 msgstr "Estados guardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1471,7 +1545,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"
@@ -1586,13 +1660,13 @@ 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 ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Sólo crear TinyURL para URLs 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)"
@@ -1610,7 +1684,7 @@ msgstr ""
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1703,6 +1777,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"
 
@@ -1722,8 +1802,12 @@ msgstr ""
 "El certificado no es confiado porque no certifica que puede verificarlo es "
 "actualmente confiado"
 
-msgid "The certificate is not valid yet."
-msgstr "El certificado no es aún válido."
+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."
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "El certificado ha expirado y no sería considerado válido."
@@ -1763,7 +1847,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
@@ -1964,7 +2048,6 @@ msgstr "Error al convertir %s en código puny: %d"
 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"
 
@@ -2270,7 +2353,7 @@ msgid ""
 "packages."
 msgstr ""
 "No se encontró ningún código. Instale algunos códigos que se encuentran en "
-"los paquetes de los plugings de GStreamer."
+"los paquetes de complementos de GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
@@ -2567,7 +2650,7 @@ msgid "For rooms with more than this many people"
 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"
@@ -2716,7 +2799,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"
@@ -3021,8 +3104,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"
@@ -3152,7 +3235,7 @@ msgid "Enter captcha text"
 msgstr "Introducir texto del captcha"
 
 msgid "Captcha"
-msgstr ""
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
@@ -3253,6 +3336,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"
 
@@ -3482,7 +3568,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"
@@ -3862,13 +3948,6 @@ 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"
 
@@ -3898,6 +3977,20 @@ 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"
@@ -3906,21 +3999,54 @@ msgstr "Falló la autenticación SASL"
 msgid "SASL error: %s"
 msgstr "Error de SASL: %s"
 
-#, fuzzy
+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 configurar"
+msgstr "No se pudo convertir el nombre de usuario"
 
-#, fuzzy
+# No se pudo convertir la contraseña a forma canónica
 msgid "Unable to canonicalize password"
-msgstr "No se pudo enviar la contraseña"
+msgstr "No se pudo convertir la contraseña a forma canónica"
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "Desafío inválido del servidor"
+msgstr "Desafío malicioso del servidor"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba"
+msgstr "Respuesta no esperada del servidor"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "El gestor de conexiones BOSH terminó su sesión."
@@ -3973,6 +4099,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"
 
@@ -3987,10 +4114,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"
 
@@ -4047,11 +4179,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"
@@ -4208,12 +4340,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 "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."
 
@@ -4314,7 +4456,6 @@ msgstr "El servidor no soporta bloqueos"
 msgid "Not Authorized"
 msgstr "No autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -4336,7 +4477,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr "Nadie (Destino pendiente)"
 
-#. 0
 msgid "None"
 msgstr "Ninguno"
 
@@ -4350,14 +4490,18 @@ msgstr "Texto de estado de ánimo"
 msgid "Allow Buzz"
 msgstr "Permitir codazos"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Nombre medio"
+msgstr "Nombre de estado de ánimo"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Comentario de amigo"
+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"
 
@@ -4528,9 +4672,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"
 
@@ -4644,9 +4785,8 @@ msgstr "Seleccione un recurso"
 msgid "Initiate Media"
 msgstr "Iniciar medio"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Este protocolo no está soportado en las habitaciones de chats."
+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."
@@ -4654,9 +4794,8 @@ 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."
@@ -4675,7 +4814,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."
@@ -4705,9 +4843,8 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Seleccione el usuario correcto"
+msgstr "mood: Establecer el estado de ánimo del usuario"
 
 msgid "Extended Away"
 msgstr "Ausencia extendida"
@@ -4785,18 +4922,18 @@ msgstr "Mensaje de error de XMPP"
 msgid "(Code %s)"
 msgstr "(Código %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "No se pudo enviar el mensaje: es demasiado grande."
+msgstr ""
+"Hay un emoticono en el mensaje que es demasiado grande para poder enviarlo."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Falta la cabecera del flujo XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "La versión XMPP no coincide"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Falta el ID del flujo XMPP"
 
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
@@ -4876,32 +5013,26 @@ 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"
 
 # Amhario
-#, fuzzy
 msgid "Afraid"
-msgstr "Árabe"
+msgstr "Asustado"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Avergonzado"
+msgstr "Sorprendido"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorioso"
+msgstr "Amoroso"
 
-#. 1
 msgid "Angry"
 msgstr "Furioso"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Expulsado"
+msgstr "Molesto"
 
 msgid "Anxious"
 msgstr "Ansioso"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Usted envía"
+msgstr "Excitado"
 
 msgid "Ashamed"
 msgstr "Avergonzado"
@@ -4909,288 +5040,231 @@ msgstr "Avergonzado"
 msgid "Bored"
 msgstr "Aburrido"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Guardar"
+msgstr "Bravo"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Dominio"
+msgstr "Tranquilo"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chats"
+msgstr "Cauteloso"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Negrita"
+msgstr "Frío"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflicto"
+msgstr "Confiado"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Continuar"
+msgstr "Confuso"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contacto"
+msgstr "Contemplativo"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Conectado"
+msgstr "Contento"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Compañía"
+msgstr "Antipático"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Loco"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Crear"
+msgstr "Creativo"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorioso"
+msgstr "Curioso"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Rechazar"
+msgstr "Hundido"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Borrar"
+msgstr "Deprimido"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Desconectado."
+msgstr "Decepcionado"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Disgustado"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "_Deshabilitar"
+msgstr "Consternado"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Desligado"
+msgstr "Distraído"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Avergonzado"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Ansioso"
+msgstr "Envidioso"
 
-#. 2
 msgid "Excited"
 msgstr "Excitado"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorioso"
+msgstr "Coqueta"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Nombre:"
+msgstr "Frustrado"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Agradecido"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Obteniendo..."
+msgstr "Triste"
 
-#. 3
-#, fuzzy
 msgid "Grumpy"
-msgstr "Grupo"
+msgstr "Quejica"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Ciudad"
+msgstr "Culpable"
 
-#. 4
 msgid "Happy"
 msgstr "Feliz"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Esperanzado"
 
-#. 8
 msgid "Hot"
-msgstr "Calor"
+msgstr "Acalorado"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Humilde"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Humillado"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Furioso"
+msgstr "Hambriento"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Herido"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impresionado"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Enamorado"
+msgstr "Extasiado"
 
 msgid "In love"
 msgstr "Enamorado"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesio"
+msgstr "Indignado"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Aficiones"
+msgstr "Interesado"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Invitar"
+msgstr "Intoxicado"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencible"
 
 msgid "Jealous"
 msgstr "Celoso"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Mono"
+msgstr "Sólo"
 
-#, fuzzy
 msgid "Lost"
-msgstr "El más ruidoso"
+msgstr "Perdido"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Afortunado"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Alemán"
+msgstr "Malvado"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Estado de ánimo"
+msgstr "Triste"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervioso"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detalle"
+msgstr "Neutral"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Desconectado"
+msgstr "Ofendido"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Asombrado"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Reproducir"
+msgstr "Juguetón"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Ruidoso"
+msgstr "Orgulloso"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Nombre real"
+msgstr "Relajado"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Recibido"
+msgstr "Aliviado"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Quitar"
+msgstr "Arrepentido"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registrar"
+msgstr "Incansable"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Gujarati"
+msgstr "Sarcástico"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfecho"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorioso"
+msgstr "Serio"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Bloqueado"
+msgstr "Alucinado"
 
 msgid "Shy"
-msgstr ""
+msgstr "Tímido"
 
-#. 9
 msgid "Sick"
 msgstr "Enfermo"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Dormido"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Espontáneo"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Velocidad"
+msgstr "Estresado"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Canción"
+msgstr "Fuerte"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Sorprendido"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Agradecido"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Sediento"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Cansado"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Subrayado"
+msgstr "Indefinido"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Golpear"
+msgstr "Débil"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Aburrido"
+msgstr "Preocupado"
 
 msgid "Set User Nickname"
 msgstr "Establecer apodo de usuario"
@@ -5389,9 +5463,8 @@ msgstr "Fichero de amigos incorrecto"
 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"
 
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
@@ -5454,8 +5527,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"
@@ -5474,9 +5547,9 @@ 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Establecer su nombre de amigo."
+msgstr "Establecer  nombre de amigo para %s."
 
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
@@ -5562,18 +5635,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"
 
@@ -5612,7 +5673,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."
@@ -5723,10 +5784,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"
 
@@ -5816,6 +5873,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"
 
@@ -5840,9 +5900,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."
@@ -5921,7 +5980,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"
@@ -5958,14 +6017,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"
@@ -6018,24 +6076,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Enamorado"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Luna actual"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Luna nueva"
-
-msgid "Change your Mood"
-msgstr "Cambiar su luna"
-
-msgid "How do you feel right now?"
-msgstr "¿Cómo se encuentra justo ahora?"
-
 msgid "The PIN you entered is invalid."
 msgstr "La clave PIN introducida es inválida."
 
@@ -6046,19 +6086,20 @@ 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]."
 
 msgid "The two PINs you entered do not match."
-msgstr "Las dos PINes que entró no coincide."
+msgstr "Las dos PINes que introdujo no coinciden."
 
-msgid "The name you entered is invalid."
-msgstr "El nombre que entró es inválido."
+msgid "The Display Name you entered is invalid."
+msgstr "El nombre que introdujo es inválido."
 
 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")
@@ -6069,7 +6110,11 @@ 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
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6077,354 +6122,310 @@ msgid "Verify PIN"
 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!"
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit HTTP 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 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 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"
-
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "La clave SecurID introducida no es válida"
+msgstr "Conectando..."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "La clave SecurID introducida no es válida"
+msgstr "El PIN que ha introducido no tiene una longitud válida [7-10]."
 
 #. mxit login name
-#, fuzzy
-msgid "MXit Login Name"
-msgstr "Apellido de soltera"
-
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Apodo"
+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..."
 
-#, fuzzy
 msgid "Loading menu..."
-msgstr "Accediendo"
+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..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s le ha enviado una invitación de chat de voz, pero no está aún no "
-"soportado."
+"%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."
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "Error interno del servidor"
+msgstr "Se produjo un error interno en el servidor MXit."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "Error de SASL: %s"
+msgstr "Error de conexión: %s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Error de SASL: %s"
+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 ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x05)"
+
+msgid "In Love"
+msgstr "Enamorado"
 
-#, 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"
@@ -6805,9 +6806,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"
 
@@ -6815,7 +6813,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"
@@ -7037,13 +7035,13 @@ msgstr "Dirección del servidor"
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Se recibió una respuesta que no se esperaba de "
+msgstr "Se recibió una respuesta que no se esperaba de %s: %s"
 
-#, fuzzy, c-format
+#, 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 "
@@ -7055,78 +7053,131 @@ 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 "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 ""
+msgstr "Pensando"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Deja de escribir"
+msgstr "Comprando"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Diálogo de pregunta"
+msgstr "Preguntando"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Enviar"
+msgstr "Comiendo"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Jugando un juego"
+msgstr "Viendo una película"
 
 msgid "Typing"
 msgstr "Tecleando"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Fuera de la oficina"
+msgstr "En la oficina"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Bañandome"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Viendo la televisión"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Colgar"
+msgstr "Disfrutando"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Dormido"
+msgstr "Durmiendo"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Utilizando una PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Amigos MI"
+msgstr "Visitando a amigos"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Al teléfono"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Recurrente"
+msgstr "Surfeando"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
 #. "I am mobile." / "John is mobile."
@@ -7134,45 +7185,39 @@ msgid "Mobile"
 msgstr "Móvil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Buscando en la web"
 
 msgid "At a party"
-msgstr ""
+msgstr "En una fiesta"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Tomando café"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Géminis"
+msgstr "Jugando a videojuegos"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Navegando la web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Canción"
+msgstr "Fumando"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Trabajando"
+msgstr "Escribiendo"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Trabajando"
+msgstr "Bebiendo"
 
 msgid "Listening to music"
 msgstr "Escuchando música"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Enviando"
+msgstr "Estudiando"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Aficiones"
+msgstr "En el baño"
 
 msgid "Received invalid data on connection with server"
 msgstr "Se recibieron datos inválidos al conectarse al servidor"
@@ -7233,128 +7278,14 @@ msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
-"%s 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 "
+"%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 archivo %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 "
@@ -7392,7 +7323,7 @@ msgid "Games"
 msgstr "Juegos"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Extensiones"
@@ -7460,25 +7391,20 @@ msgstr "Capacidad web"
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Correo-e"
+msgstr "Malvado"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Profesión"
+msgstr "Depresión"
 
-#, fuzzy
 msgid "At home"
-msgstr "Sobre mí"
+msgstr "En casa"
 
-#, fuzzy
 msgid "At work"
-msgstr "Red"
+msgstr "En el trabajo"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Salí a comer"
+msgstr "En la hora de la comida"
 
 msgid "IP Address"
 msgstr "Dirección IP"
@@ -7549,15 +7475,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
@@ -7567,15 +7492,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"
@@ -7717,29 +7641,10 @@ 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"
 
@@ -8003,9 +7908,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Comida"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -8028,9 +7932,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"
@@ -8040,13 +7943,11 @@ msgstr "Info"
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Obtener msj de estado"
+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"
@@ -8173,6 +8074,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -8312,7 +8282,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"
@@ -8455,6 +8425,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"
 
@@ -8569,7 +8543,7 @@ msgid " FromMobile"
 msgstr " DeMóvil"
 
 msgid " BindMobile"
-msgstr " BindMóvil"
+msgstr " AsociarMóvil"
 
 msgid " Video"
 msgstr " Vídeo"
@@ -8729,7 +8703,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"
@@ -8805,7 +8779,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"
@@ -8877,7 +8851,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"
 
@@ -8930,8 +8904,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»"
@@ -9136,9 +9110,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»"
@@ -9188,8 +9162,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"
@@ -9600,10 +9574,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"
@@ -10371,9 +10345,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"
 
@@ -10389,18 +10360,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..."
 
@@ -10420,8 +10385,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"
@@ -10470,6 +10435,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 "
@@ -10498,26 +10472,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."
@@ -10549,6 +10524,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"
 
@@ -10592,7 +10577,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"
@@ -10611,12 +10596,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
@@ -10929,6 +10915,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"
 
@@ -10995,9 +10985,8 @@ msgstr "No molestar"
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Recibiendo"
+msgstr "Sintiendo"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11160,6 +11149,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"
@@ -11167,12 +11158,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"
@@ -11304,9 +11289,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
@@ -11336,7 +11320,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"
@@ -11360,35 +11344,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"
@@ -11404,9 +11385,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"
@@ -11542,13 +11522,11 @@ msgstr "No está conectado con ninguna cuenta que pueda añadir a ese amigo."
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Escoja un estado de ánimo de la lista."
+msgstr "Escoja un estado de ánimo de la lista"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Apodo (opcional)"
+msgstr "Mensaje (opcional)"
 
 msgid "Edit User Mood"
 msgstr "Editar estados de ánimo del usuario"
@@ -11631,9 +11609,8 @@ msgstr "/Herramientas/_Preferencias"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Herramientas/_Registro del sistema"
+msgstr "/Herramientas/Fijar estado de á_nimo"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
@@ -11654,20 +11631,17 @@ msgstr "/_Ayuda"
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Información de amigos"
+msgstr "/Ayuda/Información de _compilación"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Información del servidor"
+msgstr "/Ayuda/Información de desa_rrollador"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Información personal"
+msgstr "/Ayuda/Información de _traducción"
 
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
@@ -11877,9 +11851,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."
@@ -11899,9 +11872,8 @@ msgstr "<PurpleMain>/Cuentas/"
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Fijar estado de ánimo..."
+msgstr "Fijar estado de áni_mo..."
 
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
@@ -11992,9 +11964,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..."
@@ -12023,9 +11994,8 @@ msgstr "/Conversación/Medio/_Llamada audio\\/vídeo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar archivo..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversación/Obtener información"
+msgstr "/Conversación/Obtener _atención"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir a_viso de amigo..."
@@ -12108,9 +12078,8 @@ msgstr "/Conversación/Llamada audio\\/vídeo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversación/Obtener información"
+msgstr "/Conversación/Obtener atención"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
@@ -12176,13 +12145,11 @@ msgstr "_Enviar"
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Cerrar esta solapa"
+msgstr "Cerrar la barra de búsqueda"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Buscar"
+msgstr "Buscar:"
 
 #, c-format
 msgid "%d person in room"
@@ -12346,6 +12313,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Árabe"
 
+msgid "Assamese"
+msgstr "Asamés"
+
 msgid "Belarusian Latin"
 msgstr "Latín bieloruso"
 
@@ -12355,6 +12325,9 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengalí"
 
+msgid "Bengali-India"
+msgstr "Bengalí-India"
+
 msgid "Bosnian"
 msgstr "Bosnio"
 
@@ -12398,7 +12371,7 @@ msgid "Estonian"
 msgstr "Estonio"
 
 msgid "Basque"
-msgstr ""
+msgstr "Vasco"
 
 msgid "Persian"
 msgstr "Persa"
@@ -12469,16 +12442,17 @@ msgstr "Laosiano"
 msgid "Macedonian"
 msgstr "Macedonio"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
+msgstr "Maratí"
 
-#, fuzzy
 msgid "Malay"
-msgstr "Hombre"
+msgstr "Malayo"
 
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
@@ -12495,9 +12469,8 @@ msgstr "Noruego Nynorsk"
 msgid "Occitan"
 msgstr "Occitano"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabí"
@@ -12553,7 +12526,6 @@ msgstr "Thai"
 msgid "Turkish"
 msgstr "Turco"
 
-#, fuzzy
 msgid "Ukranian"
 msgstr "Ucraniano"
 
@@ -12582,25 +12554,22 @@ msgstr "Amhárico"
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12609,6 +12578,9 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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 ""
@@ -12620,19 +12592,26 @@ msgid ""
 "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 "About %s"
 msgstr "Acerca de %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Información de amigos"
+msgstr "Información de compilación"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Información de amigos"
+msgstr "Información de compilación de %s"
 
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
@@ -12646,9 +12625,9 @@ msgstr "Desarrolladores retirados"
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Información del servidor"
+msgstr "Información de desarrollo de %s"
 
 msgid "Current Translators"
 msgstr "Traductores actuales"
@@ -12656,9 +12635,9 @@ msgstr "Traductores actuales"
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Información de trabajo"
+msgstr "Información de traducción de %s"
 
 msgid "_Name"
 msgstr "_Nombre"
@@ -12917,7 +12896,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."
@@ -13071,9 +13050,8 @@ msgstr "Insertar imagen MI"
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Botón «enviar»"
+msgstr "Enviar atención"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrita</b>"
@@ -13121,7 +13099,7 @@ msgid "_Smile!"
 msgstr "¡_Sonría!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Atención!"
 
 msgid "Log Deletion Failed"
 msgstr "Falló el borrado del registro"
@@ -13139,19 +13117,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?"
@@ -13180,44 +13158,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 ""
@@ -13251,11 +13233,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."
@@ -13263,10 +13245,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"
@@ -13478,20 +13460,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Desconocido..... ¡Por favor, informe de esto! "
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(A medida)"
 
 msgid "Penguin Pimps"
-msgstr "Pinguinos bonitos"
+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."
@@ -13502,35 +13483,30 @@ msgstr "No se pudo cargar el tema."
 msgid "Theme failed to copy."
 msgstr "No se pudo copiar el tema."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Selección de navegador"
+msgstr "Selección de tema"
 
 #. 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 ""
-"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."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Tema de la lista de amigos"
+msgstr "Tema de la lista de amigos:"
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "Iconos de estado"
+msgstr "Tema de iconos de estado:"
 
-#, fuzzy
 msgid "Sound Theme:"
-msgstr "Apellido"
+msgstr "Tema de sonidos:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Temas de emoticonos"
+msgstr "Temas de emoticonos:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
@@ -13646,15 +13622,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:"
 
@@ -13670,34 +13644,28 @@ 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 "Use_rname:"
-msgstr "Nombre de usuario:"
+msgstr "Nombre de usua_rio:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Contraseña:"
+msgstr "_Contraseña:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13738,11 +13706,9 @@ msgstr "Manual"
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
-"Puede configurar las preferencias del proxy y del navegador\n"
-"en las preferencias de GNOME."
+"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>"
@@ -13776,11 +13742,9 @@ msgstr ""
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
-"Puede configurar las preferencias del proxy y del navegador\n"
-"en las preferencias de GNOME."
+"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>"
@@ -13790,24 +13754,20 @@ 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 "Utilizar un DNS remoto con pasarelas SOCKS4"
+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:"
+msgstr "Puert_o:"
 
-#, fuzzy
 msgid "User_name:"
-msgstr "Nombre de usuario:"
+msgstr "_Nombre de usuario:"
 
 msgid "Log _format:"
 msgstr "Formato de _registro:"
@@ -13896,9 +13856,8 @@ msgstr "Basado en teclado o en uso de ratón"
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Cambiar el estado cuando esté _inactivo"
+msgstr "Cambiar el estado cuando esté _inactivo:"
 
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
@@ -13925,9 +13884,8 @@ msgstr "Navegador"
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Temas de emoticonos"
+msgstr "Temas"
 
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
@@ -14089,10 +14047,6 @@ msgstr "Atajo de teclado"
 msgid "Custom Smiley Manager"
 msgstr "Gestor de emoticonos a medida"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Es necesaria la activación"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccionar icono de amigo"
 
@@ -14236,9 +14190,8 @@ msgstr "Re_producir un sonido"
 msgid "_Save File"
 msgstr "_Guardar archivo"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "¿Seguro que quiere borrar a %s?"
+msgstr "¿Seguro que quiere borrar?"
 
 msgid "Select color"
 msgstr "Seleccionar el color"
@@ -14445,7 +14398,7 @@ msgid "Directory"
 msgstr "Directorio"
 
 msgid "PubSub Collection"
-msgstr "Collección PubSub"
+msgstr "Colección PubSub"
 
 msgid "PubSub Leaf"
 msgstr "Rama PubSub"
@@ -14566,9 +14519,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"
@@ -14997,7 +14950,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
@@ -15248,8 +15201,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..."
@@ -15451,10 +15415,224 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar y recibir entradas XMPP en crudo."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores 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 ""
+"$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aquí "
+"sólo con propósito informativo: $_CLICK"
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Una suite de herramientas GUI multiplataforma, utilizada por Pidgin"
+
+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."
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Ficheros y dlls principales de Core"
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crear una entrada en el Menú de Inicio para Pidgin"
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Crear un icono para Pidgin en el Escritorio"
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Símbolos de depuración (para reportar caídas)"
+
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Escritorio"
+
+#. $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/ ."
+
+#. $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/ ."
+
+#. $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"
+
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Entorno de ejecución de GTK+ (necesario si no está instalado)"
+
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Ubicaciones"
+
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Siguiente >"
+
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Cliente de mensajerí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 ""
+"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+?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Atajos"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Atajos para ejecutar Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Soporte de corrector ortográfico"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menú de inicio"
+
+#. 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 "The installer is already running."
+msgstr "El instalador ya se está ejecutando."
+
+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."
+
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestores de 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 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."
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visite la página Web de Pidgin"
+
+msgid "You do not have permission to uninstall this application."
+msgstr "No tiene permisos para desinstalar esta aplicación."
+
+#~ msgid "The name you entered is invalid."
+#~ msgstr "El nombre que introdujo es inválido."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Colgar"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El apado que introdujo no es válido."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nombre de usuario MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Apodo"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Su número de teléfono móvil..."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificado no es aún válido."
+
+#~ msgid "Rate to host"
+#~ msgstr "Tasa de mensajes al servidor"
+
+#~ msgid "Rate to client"
+#~ msgstr "Tasa de mensajes al cliente"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Razón desconocida."
+
+#~ msgid "Artist"
+#~ msgstr "Artista"
+
+#~ msgid "Album"
+#~ msgstr "Album"
+
+#~ msgid "Current Mood"
+#~ msgstr "Luna actual"
+
+#~ msgid "New Mood"
+#~ msgstr "Luna nueva"
+
+#~ msgid "Change your Mood"
+#~ msgstr "Cambiar su luna"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "¿Cómo se encuentra justo ahora?"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Cambiar su contraseña..."
+
+#~ msgid "Pager server"
+#~ msgstr "Servidor buscapersonas"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "Servidor de chat de Yahoo"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Puerto de chat de Yahoo"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientación"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "La orientación en el área de notificación."
+
 #~ msgid "Error creating conference."
 #~ msgstr "Error al crear la conferencia."
 
diff --git a/po/et.po b/po/et.po
index e20a6febb9..eed5d13d28 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -782,7 +795,7 @@ msgstr "Seiska"
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Tühistatud"
 
 msgid "Failed"
@@ -1251,6 +1264,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 +1361,6 @@ msgid "Saved Statuses"
 msgstr "Salvestatud olekud"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Pealkiri"
 
@@ -1541,7 +1557,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ühendatud"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ühendamata"
 
@@ -1634,6 +1650,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"
 
@@ -1654,9 +1678,10 @@ 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."
@@ -1898,7 +1923,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"
 
@@ -3174,6 +3198,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"
 
@@ -3768,14 +3795,6 @@ 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."
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Sa vajad krüptimist, kuid TLS/SSL-i tuge ei leitud."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
 
@@ -3808,6 +3827,18 @@ 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"
 
@@ -3816,6 +3847,42 @@ msgid "SASL error: %s"
 msgstr "SASL-i viga"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Vigane hüüdnimi"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Toetamata versioon"
+
+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 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"
 
@@ -3890,6 +3957,7 @@ msgstr "Piirkond"
 msgid "Postal Code"
 msgstr "Postiindeks"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Riik"
 
@@ -3904,10 +3972,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"
 
@@ -4130,12 +4202,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 "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."
 
@@ -4233,7 +4317,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Autoriseerimata"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Meeleolu"
 
@@ -4255,7 +4338,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "Puudub"
 
@@ -4277,6 +4359,12 @@ msgstr "Keskmine nimi"
 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"
 
@@ -4447,9 +4535,6 @@ msgstr "Reeglite rikkumine"
 msgid "Remote Connection Failed"
 msgstr "Tõrge kaugühenduse loomisel"
 
-msgid "Resource Constraint"
-msgstr "Vahendi piirang"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4800,7 +4885,6 @@ msgstr "Häbenev"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Vihane"
 
@@ -4898,7 +4982,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Rahutu"
 
-#. 2
 msgid "Excited"
 msgstr "Põnevil"
 
@@ -4916,7 +4999,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Vastuvõtmine..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupp"
@@ -4925,14 +5007,12 @@ msgstr "Grupp"
 msgid "Guilty"
 msgstr "Linn"
 
-#. 4
 msgid "Happy"
 msgstr "Õnnelik"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -4973,7 +5053,6 @@ msgstr "Huvid"
 msgid "Intoxicated"
 msgstr "Kutsu"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5037,7 +5116,6 @@ msgstr "Eemalda"
 msgid "Restless"
 msgstr "Registreeri"
 
-#. 7
 msgid "Sad"
 msgstr "Kurb"
 
@@ -5058,12 +5136,10 @@ msgstr "Blokitud"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Hüüdnimi"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Unine"
@@ -5464,18 +5540,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"
@@ -5624,9 +5688,6 @@ msgstr "Tähtpäev"
 msgid "Work"
 msgstr "Tööl"
 
-msgid "Job Title"
-msgstr "Töö nimetus"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5713,6 +5774,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"
 
@@ -5898,28 +5963,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr "Määratud kasutajanimi on vigane."
 
-#. 5
-msgid "In Love"
-msgstr "Armunud"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Sinu hetkemeeleolu"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
@@ -5956,7 +5999,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"
@@ -5965,6 +6012,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Perekonnanimi"
@@ -5995,11 +6043,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..."
@@ -6043,7 +6086,7 @@ msgid "Connecting..."
 msgstr "Ühendumine"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
 
 #, fuzzy
@@ -6051,14 +6094,9 @@ 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"
@@ -6087,10 +6125,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
@@ -6104,7 +6142,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Turvalisus on lubatud"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Sisesta parool"
@@ -6138,12 +6176,17 @@ 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")
@@ -6158,6 +6201,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 ""
@@ -6277,6 +6342,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Armunud"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Saatmine"
@@ -6675,9 +6743,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"
 
@@ -6934,12 +6999,77 @@ 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 "Could not join chat room"
 msgstr "Jututoaga pole võimalik ühineda"
 
 msgid "Invalid chat room name"
 msgstr "Vigane jututoa nimi"
 
+msgid "Invalid error"
+msgstr "Ebakorrektne viga"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Faili pole võimalik saata"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Kataloogi pole võimalik saata."
+
+#. 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 "Sõnumit pole võimalik saata."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Võrguvaba sõnum"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7104,120 +7234,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Ebakorrektne viga"
-
-msgid "Invalid SNAC"
-msgstr "Vigane SNAC"
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-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 ""
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Faili pole võimalik saata"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kataloogi pole võimalik saata."
-
-#. 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 "Sõnumit pole võimalik saata."
-
-#, 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 "
@@ -7555,29 +7571,10 @@ 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"
 
@@ -7981,6 +7978,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr "Veevalaja"
 
@@ -8298,6 +8364,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:"
@@ -10174,9 +10245,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo protokolli plugin"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -10192,18 +10260,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..."
@@ -10270,6 +10332,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"
@@ -10347,6 +10417,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"
 
@@ -10718,6 +10799,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"
 
@@ -10951,12 +11036,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"
@@ -12149,6 +12228,10 @@ msgstr "Aafrika"
 msgid "Arabic"
 msgstr "Araabia"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Häbenev"
+
 msgid "Belarusian Latin"
 msgstr "Valgevene ladina"
 
@@ -12158,6 +12241,10 @@ msgstr "Bulgaaria"
 msgid "Bengali"
 msgstr "Bengaali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengaali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -12275,6 +12362,10 @@ msgid "Macedonian"
 msgstr "Makedoonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Mees"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedoonia"
 
@@ -12393,8 +12484,8 @@ msgid ""
 "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>"
+"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!, "
@@ -12933,14 +13024,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?"
@@ -13027,10 +13118,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
@@ -13874,10 +13965,6 @@ msgid "Custom Smiley Manager"
 msgstr "Kohandatud tujunägude haldur"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Volituste andmine katkestati"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Vali sõber"
 
@@ -15026,8 +15113,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..."
@@ -15240,6 +15339,194 @@ msgstr ""
 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."
+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 ""
+
+#, 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"
@@ -15361,9 +15648,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..."
@@ -15797,7 +16081,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."
diff --git a/po/eu.po b/po/eu.po
index d6430f032b..271fa1ccae 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -788,7 +801,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 +1271,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 +1368,6 @@ msgid "Saved Statuses"
 msgstr "Egoera Gordeak"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titulua"
 
@@ -1549,7 +1565,7 @@ msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
 msgid "Online"
 msgstr "Konektatuta"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Deskonektatuta"
 
@@ -1642,6 +1658,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"
 
@@ -1659,8 +1683,10 @@ 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."
 msgstr "Iraungi egin da zertifikatua, eta ezin da baliozkotzat hartu."
@@ -1897,7 +1923,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"
 
@@ -3172,6 +3197,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,13 +3807,6 @@ 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"
@@ -3817,6 +3838,19 @@ 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"
 
@@ -3825,6 +3859,42 @@ 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"
 
@@ -3891,6 +3961,7 @@ msgstr "Eskualdea"
 msgid "Postal Code"
 msgstr "Posta-Kodea"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Estatua"
 
@@ -3905,10 +3976,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"
 
@@ -4125,6 +4200,13 @@ 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"
@@ -4132,6 +4214,10 @@ msgstr "Ping-denbora agortua"
 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."
 
@@ -4228,7 +4314,6 @@ msgstr "Zerbitzariak ez ditu blokeoak jasaten"
 msgid "Not Authorized"
 msgstr "Baimenik Ez"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Umorea"
 
@@ -4250,7 +4335,6 @@ msgstr "Nori"
 msgid "None (To pending)"
 msgstr "Ez (Nori erabakitzeke)"
 
-#. 0
 msgid "None"
 msgstr "Batere ez"
 
@@ -4272,6 +4356,12 @@ msgstr "Bigarren Izena"
 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"
 
@@ -4442,9 +4532,6 @@ msgstr "Politika-Bortxaketa"
 msgid "Remote Connection Failed"
 msgstr "Urruneko Konexioak Huts"
 
-msgid "Resource Constraint"
-msgstr "Baliabide-Murrizketa"
-
 msgid "Restricted XML"
 msgstr "XML Murriztua"
 
@@ -4802,7 +4889,6 @@ msgstr "Lotsatuta"
 msgid "Amorous"
 msgstr "Harrigarria"
 
-#. 1
 msgid "Angry"
 msgstr "Haserre"
 
@@ -4900,7 +4986,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Grinatsu"
 
-#. 2
 msgid "Excited"
 msgstr "Aztoratuta"
 
@@ -4919,7 +5004,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Eskuratzen..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Taldea"
@@ -4928,14 +5012,12 @@ msgstr "Taldea"
 msgid "Guilty"
 msgstr "Herria"
 
-#. 4
 msgid "Happy"
 msgstr "Zoriontsu"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Ostalaria:"
@@ -4976,7 +5058,6 @@ msgstr "Intereresak"
 msgid "Intoxicated"
 msgstr "Gonbidatu"
 
-#. 6
 msgid "Invincible"
 msgstr "Garaiezin"
 
@@ -5040,7 +5121,6 @@ msgstr "Kendu"
 msgid "Restless"
 msgstr "Erregistratu"
 
-#. 7
 msgid "Sad"
 msgstr "Goibel"
 
@@ -5061,12 +5141,10 @@ msgstr "Blokeatuta"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Ezizena"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Logurarekin"
@@ -5470,18 +5548,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"
 
@@ -5632,9 +5698,6 @@ msgstr "Urtebetetzea"
 msgid "Work"
 msgstr "Lana"
 
-msgid "Job Title"
-msgstr "Lanpostua"
-
 msgid "Company"
 msgstr "Enpresa"
 
@@ -5723,6 +5786,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"
 
@@ -5916,28 +5983,6 @@ msgstr "Zure helbide-liburutik ere ezabatu nahi al duzu lagun hau?"
 msgid "The username specified is invalid."
 msgstr "Baliogabea da zehaztutako erabiltzaile-izena."
 
-#. 5
-msgid "In Love"
-msgstr "Maitemindua"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Zure Umorea Orain"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Baliogabea da sartutako SecurID-gakoa"
@@ -5974,7 +6019,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"
@@ -5983,6 +6032,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Deitura"
@@ -6014,11 +6064,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..."
@@ -6062,7 +6107,7 @@ msgid "Connecting..."
 msgstr "Konektatzen"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Baliogabea da sartutako SecurID-gakoa"
 
 #, fuzzy
@@ -6070,14 +6115,9 @@ 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"
@@ -6106,10 +6146,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
@@ -6123,7 +6163,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Segurtasuna Gaituta"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Kodea sartu"
@@ -6157,12 +6197,17 @@ 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")
@@ -6177,6 +6222,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."
@@ -6298,6 +6365,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Maitemindua"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Bidaltzen"
@@ -6698,9 +6768,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"
 
@@ -6954,12 +7021,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL-k ez du zure pantaila-izena hemen balioztatzea onartzen"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Errorea %s eskatzean: %s"
+
 msgid "Could not join chat room"
 msgstr "Ezin gelara batu"
 
 msgid "Invalid chat room name"
 msgstr "Gela-izen baliogabea"
 
+msgid "Invalid error"
+msgstr "Errore baliogabea"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Ezin fitxategia bidali"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Ezin da direktoririk bidali."
+
+#. 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 "Ezin mezua bidali."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline-Mezua"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7128,120 +7260,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "%s fitxategiak %s dauzka, hau da, %s tamaina maximoa baina handiagoa da."
 
-msgid "Invalid error"
-msgstr "Errore baliogabea"
-
-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"
-
-msgid "Request ambiguous"
-msgstr "Eskaera anbiguoa"
-
-msgid "Queue full"
-msgstr "Ilara beteta"
-
-msgid "Not while on AOL"
-msgstr "Ez AOLn egon bitartean"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Ezin fitxategia bidali"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Ezin da direktoririk bidali."
-
-#. 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 "Ezin mezua bidali."
-
-#, fuzzy
-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 "
@@ -7594,29 +7612,10 @@ 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"
 
@@ -8046,6 +8045,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Akuario"
 
@@ -8328,6 +8396,11 @@ msgstr "Eskatzen"
 msgid "Admin"
 msgstr "Administratzailea"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Gela-Zerrenda"
+
 msgid "Notice"
 msgstr "Oharra"
 
@@ -10242,9 +10315,6 @@ msgstr "Yahoo IDa..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Protokolo-Plugina"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -10260,18 +10330,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..."
 
@@ -10337,6 +10402,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"
@@ -10413,6 +10487,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"
 
@@ -10794,6 +10879,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"
 
@@ -11031,12 +11120,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"
@@ -12196,6 +12279,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabiera"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Lotsatuta"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12205,6 +12292,10 @@ msgstr "Bulgariera"
 msgid "Bengali"
 msgstr "Bengalera"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalera"
+
 msgid "Bosnian"
 msgstr "Bosniera"
 
@@ -12319,6 +12410,10 @@ msgstr "Laoera"
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Gizonezkoa"
+
 msgid "Mongolian"
 msgstr "Mongoliaera"
 
@@ -12439,8 +12534,8 @@ msgid ""
 "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>"
+"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 "
@@ -12994,8 +13089,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?"
@@ -13003,8 +13098,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?"
@@ -13099,11 +13194,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."
@@ -13929,10 +14026,6 @@ msgstr "Lasterbide-Testua"
 msgid "Custom Smiley Manager"
 msgstr "Smiley Pertsonalizatuen Kudeatzailea"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktibazioa beharrezkoa"
-
 msgid "Select Buddy Icon"
 msgstr "Lagun-Ikonoa Hautatu"
 
@@ -15078,8 +15171,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..."
@@ -15287,6 +15392,202 @@ msgstr ""
 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."
+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 "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."
 
@@ -15454,9 +15755,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)."
 
@@ -16042,7 +16340,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."
@@ -16061,11 +16359,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"
diff --git a/po/fa.po b/po/fa.po
index 8f21e0006e..0d407b9808 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: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "اطلاع‌های نامهٔ جدید"
 
@@ -795,7 +808,7 @@ msgstr "توقف"
 msgid "Waiting for transfer to begin"
 msgstr "در حال انتظار برای آغاز انتقال"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "صرف نظر شد"
 
 msgid "Failed"
@@ -843,8 +856,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 +869,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 +1299,10 @@ msgstr "دیگران در گپ حرف می‌زنند"
 msgid "Someone says your username in chat"
 msgstr "کسی نام شما را در گپ می‌گوید"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ثبت نام لازم است"
+
 msgid "GStreamer Failure"
 msgstr "شکست GStreamer"
 
@@ -1388,7 +1405,6 @@ msgid "Saved Statuses"
 msgstr "وضعیت‌های ذخیره شده"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "عنوان"
 
@@ -1588,7 +1604,7 @@ msgstr ""
 msgid "Online"
 msgstr "برخط"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "برون‌خط"
 
@@ -1686,6 +1702,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 "نامعلوم"
 
@@ -1703,9 +1727,10 @@ 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."
 msgstr ""
@@ -1937,7 +1962,6 @@ msgstr "خطا هنگام تحویل %s: %Id"
 msgid "Thread creation failure: %s"
 msgstr "شکست ایجاد رشته: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "دلیل نامعلوم"
 
@@ -2788,8 +2812,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 "از دوردست صدایی به گوش می‌رسد..."
@@ -3195,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 "نام"
 
@@ -3809,16 +3836,6 @@ 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 لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "کارگزار به تأیید هویت متنی ساده روی جریان رمزنگاری نشده نیاز دارد"
 
@@ -3851,6 +3868,18 @@ 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 "تأیید هویت شکست خورد"
 
@@ -3859,6 +3888,42 @@ 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 "پیکربندی ممکن نیست"
 
@@ -3933,6 +3998,7 @@ msgstr "منطقه"
 msgid "Postal Code"
 msgstr "کُد پستی"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "کشور"
 
@@ -3947,10 +4013,14 @@ msgstr "نام سازمان"
 msgid "Organization Unit"
 msgstr "واحد سازمان"
 
+msgid "Job Title"
+msgstr "عنوان شغلی"
+
 msgid "Role"
 msgstr "نقش"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "روز تولد"
 
@@ -4179,6 +4249,16 @@ 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 "متن ساده"
 
@@ -4186,6 +4266,9 @@ 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 ""
 
@@ -4292,7 +4375,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "اجازه ندارد"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "حال"
 
@@ -4314,7 +4396,6 @@ msgstr "گیرنده"
 msgid "None (To pending)"
 msgstr "هیچ‌کدام (گیرندهٔ مشروط)"
 
-#. 0
 msgid "None"
 msgstr "هیچ‌کدام"
 
@@ -4338,6 +4419,12 @@ msgstr "نام وسط"
 msgid "Mood Comment"
 msgstr "توضیح دربارهٔ رفیق"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 #, fuzzy
 msgid "Tune Artist"
 msgstr "هنرمندان"
@@ -4513,9 +4600,6 @@ msgstr "نقض سیاست"
 msgid "Remote Connection Failed"
 msgstr "اتصال دوردست شکست خورد"
 
-msgid "Resource Constraint"
-msgstr "محدودیت منابع"
-
 msgid "Restricted XML"
 msgstr "XML محدود"
 
@@ -4877,7 +4961,6 @@ msgstr "خجالت زده"
 msgid "Amorous"
 msgstr "معرکه"
 
-#. 1
 msgid "Angry"
 msgstr "عصبانی"
 
@@ -4976,7 +5059,6 @@ msgstr ""
 msgid "Envious"
 msgstr "نگران"
 
-#. 2
 msgid "Excited"
 msgstr "هیجان‌زده"
 
@@ -4995,7 +5077,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "در حال اتصال..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "گروه"
@@ -5004,14 +5085,12 @@ msgstr "گروه"
 msgid "Guilty"
 msgstr "شهر"
 
-#. 4
 msgid "Happy"
 msgstr "خوشحال"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "میزبان:"
@@ -5052,7 +5131,6 @@ msgstr "علایق"
 msgid "Intoxicated"
 msgstr "دعوت"
 
-#. 6
 msgid "Invincible"
 msgstr "سرسخت"
 
@@ -5116,7 +5194,6 @@ msgstr "حذف"
 msgid "Restless"
 msgstr "ثبت"
 
-#. 7
 msgid "Sad"
 msgstr "غمگین"
 
@@ -5137,12 +5214,10 @@ msgstr "رابطه قطع شد"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "لقب"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "خواب‌آلود"
@@ -5236,8 +5311,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 ""
@@ -5557,20 +5632,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 "عنوان"
@@ -5723,9 +5784,6 @@ msgstr "سالگرد ازدواج"
 msgid "Work"
 msgstr "کاری"
 
-msgid "Job Title"
-msgstr "عنوان شغلی"
-
 msgid "Company"
 msgstr "شرکت"
 
@@ -5816,6 +5874,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: به کاربران سقلمه می‌زند تا حواسشان را جمع کنند"
 
@@ -6009,28 +6071,6 @@ msgstr "آیا می‌خواهید این رفیق را به فهرست رفقا
 msgid "The username specified is invalid."
 msgstr "نام کاربری مشخص شده نامعتبر است."
 
-#. 5
-msgid "In Love"
-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 وارد شده نامعتبر است."
@@ -6067,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"
@@ -6076,6 +6120,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "نمایش"
@@ -6107,11 +6152,6 @@ msgstr "گپ در حال حاضر قابل دسترسی نیست"
 msgid "About"
 msgstr "دربارهٔ %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "تغییر گذرواژه..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6155,7 +6195,7 @@ msgid "Connecting..."
 msgstr "در حال اتصال"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 #, fuzzy
@@ -6163,14 +6203,9 @@ 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"
@@ -6205,10 +6240,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
@@ -6222,7 +6257,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "امنیت به کار انداخته شد"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "گذرواژه را وارد کنید"
@@ -6256,12 +6291,17 @@ 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")
@@ -6276,6 +6316,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."
@@ -6396,6 +6458,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "عاشق"
+
 #, fuzzy
 msgid "Pending"
 msgstr "فرستادن"
@@ -6817,9 +6882,6 @@ msgstr "گذرواژه منقضی شده است"
 msgid "Incorrect password"
 msgstr "گذرواژهٔ نادرست"
 
-msgid "User not found"
-msgstr "کاربر پیدا نشد"
-
 msgid "Account has been disabled"
 msgstr "حساب از کار انداخته شده است"
 
@@ -7076,6 +7138,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "خطای هنگام ایجاد اتصال"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "متصل نشد"
@@ -7084,6 +7150,67 @@ 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 ""
+
+#, 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 "پیغام برون‌خط"
+
+#, 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 پیغام فرستاد:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7251,120 +7378,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 ""
-
-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 "
@@ -7717,29 +7730,10 @@ 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 "برخط از"
 
@@ -8167,6 +8161,75 @@ 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 امکان ندارد"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8489,6 +8552,11 @@ msgstr "محاورهٔ درخواست"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "فهرست اتاق"
+
 #, fuzzy
 msgid "Notice"
 msgstr "یادداشت"
@@ -9151,8 +9219,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 ""
@@ -10433,9 +10501,6 @@ msgstr "شناسهٔ Yahoo!‎"
 msgid "Yahoo! Protocol Plugin"
 msgstr "متصل شوندهٔ قرارداد یاهو"
 
-msgid "Pager server"
-msgstr "کارگزار پِی‌جو"
-
 msgid "Pager port"
 msgstr "درگاه پِی‌جو"
 
@@ -10451,18 +10516,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!‎"
@@ -10534,6 +10593,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"
@@ -10618,6 +10686,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 "خانه نیستم"
 
@@ -10997,6 +11076,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 "_پذیرش"
 
@@ -11232,12 +11315,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 "گزینه‌های ورود به سیستم"
@@ -12467,6 +12544,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "عربی"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "خجالت زده"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12476,6 +12557,10 @@ msgstr "بلغاری"
 msgid "Bengali"
 msgstr "بنگالی"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنگالی"
+
 msgid "Bosnian"
 msgstr "بوسنیایی"
 
@@ -12596,6 +12681,10 @@ msgid "Macedonian"
 msgstr "مقدونی"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "مقدونی"
 
@@ -12716,18 +12805,17 @@ msgid ""
 "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>"
+"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 ""
@@ -13296,16 +13384,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  آغاز شده است برای همیشه حذف "
 "کنید؟"
@@ -13414,10 +13502,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
@@ -14286,10 +14374,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "ثبت نام لازم است"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "انتخاب رفیق"
 
@@ -15490,7 +15574,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..."
@@ -15702,6 +15798,202 @@ msgstr ""
 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 ""
+"$(^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 "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 "خطای هنگام ایجاد اتصال"
@@ -15837,9 +16129,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgid "_User:"
 #~ msgstr "_کاربر:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "نسخهٔ دارای GTK+ در زمان اجرا"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "در حال محاسبه"
@@ -16394,7 +16683,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."
@@ -17273,8 +17562,8 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
-#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. در ویژگی‌های حساب «استفاده از "
-#~ "TLS در صورت وجود» را انتخاب کنید."
+#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. در ویژگی‌های حساب «استفاده "
+#~ "از TLS در صورت وجود» را انتخاب کنید."
 
 #~ msgid "Use TLS if available"
 #~ msgstr "استفاده از TLS در صورت وجود"
@@ -17947,9 +18236,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 d69841b599..b0307e43fa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -789,7 +802,7 @@ msgstr "Pysäytä"
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Peruutettu"
 
 msgid "Failed"
@@ -1260,6 +1273,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"
 
@@ -1353,7 +1369,6 @@ msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Otsikko"
 
@@ -1554,7 +1569,7 @@ msgstr ""
 msgid "Online"
 msgstr "Linjoilla"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -1647,6 +1662,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,8 +1688,10 @@ 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."
 msgstr "Varmenne on vanhentunut eikä sitä tulisi pitää kelvollisena."
@@ -1901,7 +1926,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"
 
@@ -3178,6 +3202,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"
 
@@ -3782,12 +3809,6 @@ 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"
@@ -3819,6 +3840,19 @@ 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"
 
@@ -3827,6 +3861,42 @@ 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"
 
@@ -3893,6 +3963,7 @@ msgstr "Seutu"
 msgid "Postal Code"
 msgstr "Postinumero"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Maa"
 
@@ -3907,10 +3978,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ä"
 
@@ -4126,12 +4201,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 "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."
 
@@ -4228,7 +4313,6 @@ msgstr "Palvelin ei tue estämistä"
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mieliala"
 
@@ -4250,7 +4334,6 @@ msgstr "vain sinulta"
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#. 0
 msgid "None"
 msgstr "Ei mitään"
 
@@ -4272,6 +4355,12 @@ msgstr "Muut etunimet"
 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ä"
 
@@ -4442,9 +4531,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"
 
@@ -4796,7 +4882,6 @@ msgstr "Häpeää"
 msgid "Amorous"
 msgstr "Loistokas"
 
-#. 1
 msgid "Angry"
 msgstr "Vihainen"
 
@@ -4895,7 +4980,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Levoton"
 
-#. 2
 msgid "Excited"
 msgstr "Innostunut"
 
@@ -4914,7 +4998,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Haetaan..."
 
-#. 3
 msgid "Grumpy"
 msgstr "Äreä"
 
@@ -4922,14 +5005,12 @@ msgstr "Äreä"
 msgid "Guilty"
 msgstr "Paikkakunta"
 
-#. 4
 msgid "Happy"
 msgstr "Onnellinen"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "Tulinen"
 
@@ -4969,7 +5050,6 @@ msgstr "Kiinnostukset"
 msgid "Intoxicated"
 msgstr "Kutsu"
 
-#. 6
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
@@ -5033,7 +5113,6 @@ msgstr "Poista"
 msgid "Restless"
 msgstr "Rekisteröi"
 
-#. 7
 msgid "Sad"
 msgstr "Surullinen"
 
@@ -5055,11 +5134,9 @@ msgstr "Estetty"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "Kipeä"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Unelias"
@@ -5463,18 +5540,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"
 
@@ -5622,9 +5687,6 @@ msgstr "Vuosipäivä"
 msgid "Work"
 msgstr "Työ"
 
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
 msgid "Company"
 msgstr "Yritys"
 
@@ -5712,6 +5774,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"
 
@@ -5902,24 +5968,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Rakastunut"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Tämänhetkinen mieliala"
-
-#. add all moods to list
-msgid "New Mood"
-msgstr "Uusi mieliala"
-
-msgid "Change your Mood"
-msgstr "Vaihda mielialaa"
-
-msgid "How do you feel right now?"
-msgstr "Kuinka voit nyt?"
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen"
@@ -5955,7 +6003,11 @@ msgstr "Profiili"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5963,6 +6015,7 @@ msgid "Verify PIN"
 msgstr "Varmista PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Näyttönimi"
 
@@ -5991,10 +6044,6 @@ msgstr "Ryhmäkeskustelu ei ole parhaillaan käytettävissä"
 msgid "About"
 msgstr "Omat tiedot"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Vaihda mielialaa..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Vaihda profiilia..."
@@ -6034,7 +6083,7 @@ msgid "Connecting..."
 msgstr "Yhdistetään..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen"
 
 #, fuzzy
@@ -6042,13 +6091,9 @@ 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
-msgid "Nick Name"
-msgstr "Kutsumanimi"
-
 #. show the form to the user to complete
 msgid "Register New MXit Account"
 msgstr "Rekisteröi uusi MXit-tili"
@@ -6085,10 +6130,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
@@ -6102,7 +6147,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"
@@ -6137,12 +6182,17 @@ 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")
@@ -6157,6 +6207,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."
@@ -6277,6 +6349,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Rakastunut"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Lähetetään"
@@ -6674,9 +6749,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ä"
 
@@ -6933,12 +7005,76 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ei salli näyttönimen todentamista tätä kautta"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Virhe pyydettäessä %s: %s"
+
 msgid "Could not join chat room"
 msgstr "Keskusteluhuoneeseen ei voi liittyä"
 
 msgid "Invalid chat room name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
+msgid "Invalid error"
+msgstr "Epäkelpo virhe"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+msgid "Cannot send SMS"
+msgstr "Tekstiviestin (SMS) lähetys ei onnistu"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Kansiota ei voi lähettää."
+
+#. 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 "Viestiä ei voi lähettää."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Yhteydetön viesti"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Viestiä ei voi lähettää: %s (%s)"
+
+#, c-format
+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 ""
 
@@ -7108,119 +7244,6 @@ 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 "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"
-
-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ä"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-msgid "Cannot send SMS"
-msgstr "Tekstiviestin (SMS) lähetys ei onnistu"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kansiota ei voi lähettää."
-
-#. 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 "Viestiä ei voi lähettää."
-
-#, fuzzy
-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 "
@@ -7572,28 +7595,9 @@ msgstr[0] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Viestiä ei voi lähettää: %s (%s)"
-
-#, c-format
-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"
-
-#, 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"
 
@@ -8023,6 +8027,75 @@ 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ä"
+
 msgid "Aquarius"
 msgstr "vesimies"
 
@@ -8305,6 +8378,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"
 
@@ -10198,9 +10276,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"
 
@@ -10216,18 +10291,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..."
 
@@ -10294,6 +10364,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"
@@ -10373,6 +10452,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"
 
@@ -10754,6 +10844,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"
 
@@ -10991,12 +11085,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"
@@ -12159,6 +12247,10 @@ msgstr "afrikaans"
 msgid "Arabic"
 msgstr "arabia"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Häpeää"
+
 msgid "Belarusian Latin"
 msgstr "valkovenäjä latinalainen"
 
@@ -12168,6 +12260,10 @@ msgstr "bulgaria"
 msgid "Bengali"
 msgstr "bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "bengali"
+
 msgid "Bosnian"
 msgstr "bosnia"
 
@@ -12282,6 +12378,10 @@ msgstr "lao"
 msgid "Macedonian"
 msgstr "makedonia"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mies"
+
 msgid "Mongolian"
 msgstr "mongolia"
 
@@ -12400,8 +12500,8 @@ msgid ""
 "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>"
+"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 libpurple-kirjastoon perustuva pikaviestinsovellus, joka "
 "kykenee samanaikaisesti yhdistämään useisiin eri viestinpalveluihin. %s on "
@@ -12938,20 +13038,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?"
@@ -13056,11 +13156,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."
@@ -13865,9 +13967,6 @@ msgstr "Oikotien teksti"
 msgid "Custom Smiley Manager"
 msgstr "Omien hymiöiden hallinta"
 
-msgid "Attention received"
-msgstr "Huomio vastanotettu"
-
 msgid "Select Buddy Icon"
 msgstr "Valitse tuttavakuvake"
 
@@ -15001,8 +15100,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..."
@@ -15216,6 +15327,198 @@ 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."
+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 "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"
 
@@ -15389,9 +15692,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)."
 
@@ -15962,7 +16262,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."
 
@@ -17068,9 +17368,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."
 
@@ -17162,7 +17459,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..."
@@ -17237,8 +17534,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"
@@ -17263,8 +17560,8 @@ 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"
@@ -18140,9 +18437,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 30f8cf9de2..7af8c6ffcd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,13 +21,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
-"PO-Revision-Date: 2010-02-11 19:10+0100\n"
+"POT-Creation-Date: 2010-08-03 18:32+0200\n"
+"PO-Revision-Date: 2010-08-03 18:31+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #. Translators may want to transliterate the name.
@@ -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"
 
@@ -805,7 +821,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"
@@ -1274,6 +1290,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 +1386,6 @@ msgid "Saved Statuses"
 msgstr "États prédéfinis"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titre"
 
@@ -1568,7 +1586,7 @@ msgstr ""
 msgid "Online"
 msgstr "En ligne"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Déconnecté"
 
@@ -1661,6 +1679,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,8 +1704,12 @@ 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."
@@ -1918,7 +1946,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"
 
@@ -3210,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 "Prénom"
 
@@ -3820,16 +3850,6 @@ 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 "
@@ -3864,6 +3884,20 @@ 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"
 
@@ -3871,6 +3905,40 @@ msgstr "Échec de l'authentification SASL"
 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"
 
@@ -3934,6 +4002,7 @@ msgstr "Région"
 msgid "Postal Code"
 msgstr "Code postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Pays"
 
@@ -3948,10 +4017,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"
 
@@ -4169,12 +4242,25 @@ msgstr "Aucun utilisateur trouvé."
 msgid "Roles:"
 msgstr "Rôles :"
 
+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 "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."
 
@@ -4275,7 +4361,6 @@ msgstr "Le serveur ne supporte pas le blocage"
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humeur"
 
@@ -4297,7 +4382,6 @@ msgstr "Destination"
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#. 0
 msgid "None"
 msgstr "Aucun"
 
@@ -4311,14 +4395,18 @@ msgstr "Texte d'humeur"
 msgid "Allow Buzz"
 msgstr "Autoriser les Buzz"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Deuxième prénom"
+msgstr "Nom de l'humeur"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Commentaire"
+msgstr "Commentaire de l'humeur"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artistes musicaux"
 
@@ -4489,9 +4577,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"
 
@@ -4609,9 +4694,8 @@ msgstr "Choisissez une ressource"
 msgid "Initiate Media"
 msgstr "Session média"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Les salons de discussions ne sont pas supportés par ce protocole."
+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"
@@ -4669,9 +4753,8 @@ 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."
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Choisissez un des utilisateurs"
+msgstr "mood : Changer d'humeur pour l'utilisateur"
 
 msgid "Extended Away"
 msgstr "Longue absence"
@@ -4755,13 +4838,13 @@ msgstr ""
 "envoyée."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "En-tête de flux XMPP manquante"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Version XMPP incorrecte"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "ID de flux XMPP manquant"
 
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
@@ -4842,32 +4925,26 @@ msgstr ""
 "Veuillez sélectionner parmi les ressources de %s, à laquelle vous voulez "
 "envoyer un fichier"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabe"
+msgstr "Apeuré"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Honteux"
+msgstr "Impressionné"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorieux"
+msgstr "Amoureux"
 
-#. 1
 msgid "Angry"
 msgstr "En colère"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Banni"
+msgstr "Ennuyé"
 
 msgid "Anxious"
 msgstr "Anxieux"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Vous envoyez"
+msgstr "Excité"
 
 msgid "Ashamed"
 msgstr "Honteux"
@@ -4875,287 +4952,231 @@ msgstr "Honteux"
 msgid "Bored"
 msgstr "Ennuyé"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Enregistrer"
+msgstr "Courageux"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Domaine"
+msgstr "Calme"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Discussions"
+msgstr "Prudent"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Gras"
+msgstr "Froid"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflit"
+msgstr "Confiant"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Continuer"
+msgstr "Déconcerté"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contact"
+msgstr "Penseur"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Connecté"
+msgstr "Content"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Société"
+msgstr "À cran"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Fou"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Créer"
+msgstr "Créatif"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorieux"
+msgstr "Curieux"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Refusé"
+msgstr "Découragé"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Supprimé"
+msgstr "Déprimé"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Déconnecté"
+msgstr "Déçu"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Dégouté"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Désactivé"
+msgstr "Consterné"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Détaché"
+msgstr "Distrait"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Embarrassé"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Anxieux"
+msgstr "Jaloux"
 
-#. 2
 msgid "Excited"
 msgstr "Excité"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorieux"
+msgstr "Flirtant"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Prénom :"
+msgstr "Frustré"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Reconnaissant"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Récupération en cours..."
+msgstr "Chagriné"
 
-#. 3
 msgid "Grumpy"
 msgstr "Grognon"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Localité"
+msgstr "Coupable"
 
-#. 4
 msgid "Happy"
 msgstr "Heureux"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Plein d'espoir"
 
-#. 8
 msgid "Hot"
 msgstr "Chaud"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Humble"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Humilié"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "En colère"
+msgstr "Affamé"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humour"
+msgstr "Blessé"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impressionné"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Amoureux"
+msgstr "Admiratif"
 
 msgid "In love"
 msgstr "Amoureux"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonésien"
+msgstr "Indigné"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Intérêts"
+msgstr "Intéressé"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Invité"
+msgstr "Intoxiqué"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
 msgid "Jealous"
 msgstr "Jaloux"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Singe"
+msgstr "Seul"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Le plus fort"
+msgstr "Perdu"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Chanceux"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Allemand"
+msgstr "Méchant"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Humeur"
+msgstr "Morose"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nerveux"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Détail"
+msgstr "Neutre"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Déconnecté"
+msgstr "Offensé"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Outragé"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Jouer"
+msgstr "Joueur"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Fort"
+msgstr "Fier"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Nom réel"
+msgstr "Relaxé"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Reçu"
+msgstr "Soulagé"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Supprimer"
+msgstr "Pris de remords"
 
-#, fuzzy
 msgid "Restless"
-msgstr "S'enregistrer"
+msgstr "Agité"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Marâthî"
+msgstr "Sarcastique"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfait"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorieux"
+msgstr "Sérieux"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Bloqué"
+msgstr "Choqué"
 
 msgid "Shy"
-msgstr ""
+msgstr "Timide"
 
-#. 9
 msgid "Sick"
 msgstr "Malade"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Somnolant"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontané"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Vitesse"
+msgstr "Stressé"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Chanson"
+msgstr "Fort"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Surpris"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Remerciant"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Assoiffé"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Fatigué"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Souligné"
+msgstr "Indéfini"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Frapper"
+msgstr "Faible"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Ennuyé"
+msgstr "Inquiet"
 
 msgid "Set User Nickname"
 msgstr "Changer de pseudo"
@@ -5521,18 +5542,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"
 
@@ -5682,9 +5691,6 @@ msgstr "Anniversaire"
 msgid "Work"
 msgstr "Professionnel"
 
-msgid "Job Title"
-msgstr "Position"
-
 msgid "Company"
 msgstr "Société"
 
@@ -5772,6 +5778,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."
 
@@ -5966,24 +5975,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."
 
-#. 5
-msgid "In Love"
-msgstr "Amoureux"
-
-#. 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."
 
@@ -5997,8 +5988,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'."
@@ -6019,7 +6010,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"
 
@@ -6027,6 +6022,7 @@ msgid "Verify PIN"
 msgstr "Vérification code"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -6053,10 +6049,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..."
@@ -6091,19 +6083,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"
@@ -6134,13 +6119,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."
@@ -6151,7 +6137,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é"
 
@@ -6177,11 +6163,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")
@@ -6194,6 +6184,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."
@@ -6296,6 +6303,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"
 
@@ -6693,9 +6703,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é"
 
@@ -6956,111 +6963,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Erreur à la demande de %s"
+
 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 "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"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Impossible d'envoyer de SMS sans accepter les termes"
+
+msgid "Cannot send SMS"
+msgstr "Impossible d'envoyer le SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Impossible d'envoyer le SMS vers ce pays"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Impossible d'envoyer le SMS vers un pays inconnu"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Les comptes Bot ne peuvent pas commencer les conversations"
+
+msgid "Bot account cannot IM this user"
+msgstr "Le compte Bot ne peut pas envoyer de message à cette personne"
+
+msgid "Bot account reached IM limit"
+msgstr "Le compte Bot a atteint sa limite de messages"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Le compte Bot a atteint sa limite de messages quotidiens"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Le compte Bot a atteint sa limite de messages mensuels"
+
+msgid "Unable to receive offline messages"
+msgstr "Impossible de recevoir les messages déconnectés"
+
+msgid "Offline message store full"
+msgstr "Stockage des messages déconnectés plein"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "En pleine réflexion"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "S'arrête d'écrire"
+msgstr "En courses"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Boite de message pour demande"
+msgstr "En plein questionnement"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Bipeur"
+msgstr "En train de manger"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Joue"
+msgstr "Regarde un film"
 
 msgid "Typing"
 msgstr "En train d'écrire"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Pas au travail"
+msgstr "Au travail"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Prend un bain"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Regarde la télé"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Raccrocher"
+msgstr "S'amuse"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Somnolant"
+msgstr "Dort"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Utilise un PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Amis de messagerie"
+msgstr "Rencontre des amis"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Au téléphone"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Récurrente"
+msgstr "Surf"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Téléphone portable"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Recherche sur internet"
 
 msgid "At a party"
-msgstr ""
+msgstr "À une fête"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Prend un café"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "L'utilisateur joue"
+msgstr "Joue"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Surf le web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Chanson"
+msgstr "Fume"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Travaille"
+msgstr "Écrit"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Travaille"
+msgstr "Bois"
 
 msgid "Listening to music"
 msgstr "Écoute de la musique"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Envoi en cours"
+msgstr "Étudie"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Intérêts"
+msgstr "Aux toilettes"
 
 msgid "Received invalid data on connection with server"
 msgstr "Données non valides reçues à la connexion sur le serveur."
@@ -7130,116 +7182,6 @@ 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 "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"
-
-msgid "Request ambiguous"
-msgstr "Requête ambiguë"
-
-msgid "Queue full"
-msgstr "File d'attente pleine"
-
-msgid "Not while on AOL"
-msgstr "Impossible sur AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Impossible de recevoir le message à cause du contrôle parental"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Impossible d'envoyer de SMS sans accepter les termes"
-
-msgid "Cannot send SMS"
-msgstr "Impossible d'envoyer le SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Impossible d'envoyer le SMS vers ce pays"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Impossible d'envoyer le SMS vers un pays inconnu"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Les comptes Bot ne peuvent pas commencer les conversations"
-
-msgid "Bot account cannot IM this user"
-msgstr "Le compte Bot ne peut pas envoyer de message à cette personne"
-
-msgid "Bot account reached IM limit"
-msgstr "Le compte Bot a atteint sa limite de messages"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Le compte Bot a atteint sa limite de messages quotidiens"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Le compte Bot a atteint sa limite de messages mensuels"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7276,7 +7218,7 @@ msgid "Games"
 msgstr "Jeux"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Modules"
@@ -7344,25 +7286,20 @@ msgstr "Sur internet"
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Courriel"
+msgstr "Méchant"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Profession"
+msgstr "Dépression"
 
-#, fuzzy
 msgid "At home"
-msgstr "À mon propos"
+msgstr "À la maison"
 
-#, fuzzy
 msgid "At work"
-msgstr "Réseau"
+msgstr "Au travail"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Parti manger"
+msgstr "Déjeuner"
 
 msgid "IP Address"
 msgstr "Adresse IP"
@@ -7604,28 +7541,9 @@ 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"
 
@@ -7894,9 +7812,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Lien de l'iTunes Music Store"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Déjeuner"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7929,9 +7846,8 @@ msgstr "Récupérer les infos AIM"
 msgid "Edit Buddy Comment"
 msgstr "Modifier le commentaire"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Obtenir le message d'état"
+msgstr "Obtenir le message X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Terminer la connexion directe"
@@ -8059,6 +7975,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Verseau"
 
@@ -8341,6 +8326,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"
 
@@ -10247,9 +10236,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"
 
@@ -10265,18 +10251,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..."
 
@@ -10345,6 +10325,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"
@@ -10426,6 +10415,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"
 
@@ -10813,6 +10812,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"
 
@@ -10879,9 +10882,8 @@ msgstr "Ne pas déranger"
 msgid "Extended away"
 msgstr "Longue absence"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Réception en cours"
+msgstr "Ressent"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11052,12 +11054,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"
@@ -11426,13 +11422,11 @@ msgstr "Il n'y a aucun compte actif permettant d'ajouter cet utilisateur."
 msgid "Unknown node type"
 msgstr "Type de noeud inconnu"
 
-#, fuzzy
 msgid "Please select your mood from the list"
 msgstr "Veuillez choisir votre humeur dans la liste."
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (facultatif)`"
+msgstr "message (facultatif)`"
 
 msgid "Edit User Mood"
 msgstr "Modifier l'humeur"
@@ -11504,7 +11498,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"
@@ -11515,9 +11509,8 @@ msgstr "/Outils/_Préférences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Outils/Voir les archives s_ystème"
+msgstr "/Outils/Changer d'_humeur"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
@@ -11536,22 +11529,19 @@ msgid "/_Help"
 msgstr "/Aid_e"
 
 msgid "/Help/Online _Help"
-msgstr "/Aide/Aid_e en ligne"
+msgstr "/Aide/_Aide en ligne"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informations sur le contact"
+msgstr "/Aide/_Informations sur le programme"
 
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informations du serveur"
+msgstr "/Aide/Liste des _développeurs"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Informations personnelles"
+msgstr "/Aide/Liste des _traducteurs"
 
 msgid "/Help/_About"
 msgstr "/Aide/À _propos de"
@@ -11784,9 +11774,8 @@ msgstr "<PurpleMain>/Comptes/"
 msgid "_Edit Account"
 msgstr "Modifier le c_ompte"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Changer d'humeur..."
+msgstr "Changer d'_humeur..."
 
 msgid "No actions available"
 msgstr "Aucune action disponible"
@@ -11907,9 +11896,8 @@ msgstr "/Conversation/Média/A_ppel audio\\/vidéo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversation/Voir les informations"
+msgstr "/Conversation/Attirer l'_attention"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une _alerte..."
@@ -11992,9 +11980,8 @@ msgstr "/Conversation/Média/Appel audio\\/vidéo"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversation/Voir les informations"
+msgstr "/Conversation/Attirer l'attention"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
@@ -12060,13 +12047,11 @@ msgstr "_Envoyer"
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Fermer cet onglet"
+msgstr "Fermer la barre de recherche"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Chercher"
+msgstr "Chercher :"
 
 #, c-format
 msgid "%d person in room"
@@ -12231,6 +12216,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabe"
 
+msgid "Assamese"
+msgstr "Assamais"
+
 msgid "Belarusian Latin"
 msgstr "Biélorusse latin"
 
@@ -12240,6 +12228,9 @@ msgstr "Bulgare"
 msgid "Bengali"
 msgstr "Bengalî"
 
+msgid "Bengali-India"
+msgstr "Bengalî indien"
+
 msgid "Bosnian"
 msgstr "Bosnien"
 
@@ -12354,6 +12345,9 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macédonien"
 
+msgid "Malayalam"
+msgstr "Malayâlam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
@@ -12462,7 +12456,7 @@ msgstr "Amharique"
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#, fuzzy, c-format
+#, 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 "
@@ -12471,15 +12465,13 @@ msgid ""
 "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 ""
@@ -12488,8 +12480,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12511,14 +12506,13 @@ msgstr ""
 msgid "About %s"
 msgstr "À propos de %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informations sur le contact"
+msgstr "Informations sur le programme"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informations sur le contact"
+msgstr "Informations sur le programme %s"
 
 msgid "Current Developers"
 msgstr "Codeurs"
@@ -12532,9 +12526,9 @@ msgstr "Codeurs retraités"
 msgid "Retired Crazy Patch Writers"
 msgstr "Patcheurs fous retraités"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informations du serveur"
+msgstr "Liste des développeurs de %s"
 
 msgid "Current Translators"
 msgstr "Traducteurs"
@@ -12542,9 +12536,9 @@ msgstr "Traducteurs"
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Plus d'informations"
+msgstr "Liste des traducteurs de %s"
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12957,9 +12951,8 @@ msgstr "Insérer une image"
 msgid "Insert Smiley"
 msgstr "Insérer une frimousse"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Attention !"
+msgstr "Attirer l'attention"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Gras</b>"
@@ -13006,9 +12999,8 @@ msgstr "Barre _horizontale"
 msgid "_Smile!"
 msgstr "Sourie_z !"
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Attention !"
+msgstr "_Attention !"
 
 msgid "Log Deletion Failed"
 msgstr "Échec de suppression de l'archive"
@@ -13141,11 +13133,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."
@@ -13944,11 +13936,7 @@ msgid "Shortcut Text"
 msgstr "Texte de raccourci"
 
 msgid "Custom Smiley Manager"
-msgstr "Gestionnaire de frimousses personnalisée"
-
-#, fuzzy
-msgid "Attention received"
-msgstr "Activation nécessaire"
+msgstr "Gestionnaire de frimousses personnalisées"
 
 msgid "Select Buddy Icon"
 msgstr "Choisir l'icône de contact"
@@ -15100,8 +15088,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..."
@@ -15301,10 +15298,210 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Envoyer et recevoir des blocs XMPP."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs 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 ""
+"$(^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 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 "MXit Login Name"
+#~ msgstr "Nom d'utilisateur MXit"
+
+#~ 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."
 
@@ -15368,22 +15565,6 @@ msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 #~ msgid "%s has removed you from his or her buddy list."
 #~ msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
 
-#~ 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\">Salon IRC :</FONT> #pidgin sur irc.freenode.net<BR><BR>"
-
-#~ 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 "Debugging Information"
 #~ msgstr "Informations de debug"
 
@@ -15828,7 +16009,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."
 
diff --git a/po/ga.po b/po/ga.po
index f7804d2eb9..1554da08f5 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 ""
 
@@ -738,7 +750,7 @@ msgid "Waiting for transfer to begin"
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cealaithe"
 
 #, fuzzy
@@ -1202,6 +1214,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1298,7 +1313,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 #, fuzzy
 msgid "Title"
 msgstr "Teideal"
@@ -1492,7 +1506,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1586,6 +1600,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"
@@ -1604,7 +1624,9 @@ 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."
@@ -1827,7 +1849,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"
@@ -3030,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 "Ainm Baiste:"
 
@@ -3600,12 +3624,6 @@ msgstr ""
 msgid "execute"
 msgstr "Deán"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3635,6 +3653,15 @@ 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 ""
 
@@ -3643,6 +3670,40 @@ 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."
 
@@ -3712,6 +3773,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"
@@ -3727,11 +3789,15 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 #, fuzzy
 msgid "Role"
 msgstr "Post"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Lá breithe"
 
@@ -3957,6 +4023,12 @@ 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"
@@ -3964,6 +4036,9 @@ msgstr "Dínascadh de bharr moille rófhada"
 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 ""
 
@@ -4062,7 +4137,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Níl údaraithe"
 
-#. (reference: "libpurple/request.h")
 #, fuzzy
 msgid "Mood"
 msgstr "fonn"
@@ -4087,7 +4161,6 @@ msgstr "Do"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 #, fuzzy
 msgid "None"
 msgstr "Tada"
@@ -4110,6 +4183,12 @@ msgstr "Ainm an Ghrúpa"
 msgid "Mood Comment"
 msgstr "Eolais Logann"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4282,9 +4361,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4617,7 +4693,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4711,7 +4786,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4728,7 +4802,6 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grúpa"
@@ -4737,14 +4810,12 @@ msgstr "Grúpa"
 msgid "Guilty"
 msgstr "Cathair"
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Óstach"
@@ -4784,7 +4855,6 @@ msgstr "Comhéadan"
 msgid "Intoxicated"
 msgstr "Aisiompaigh"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4848,7 +4918,6 @@ msgstr "Scrios"
 msgid "Restless"
 msgstr "Athshocraigh"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4867,11 +4936,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5265,20 +5332,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"
@@ -5429,9 +5482,6 @@ msgstr ""
 msgid "Work"
 msgstr "Obair"
 
-msgid "Job Title"
-msgstr ""
-
 #, fuzzy
 msgid "Company"
 msgstr "Comhlacht:"
@@ -5517,6 +5567,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5688,26 +5741,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5740,7 +5773,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"
@@ -5749,6 +5786,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sloinne"
@@ -5778,11 +5816,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..."
@@ -5818,21 +5851,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Nasctha"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "_Leasainm:"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -5860,10 +5888,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."
@@ -5875,7 +5903,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Íontráil Pasfhocal"
@@ -5907,12 +5935,17 @@ msgstr "Logáilte isteach!\n"
 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")
@@ -5927,6 +5960,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 ""
@@ -6042,6 +6095,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "Ping"
@@ -6431,9 +6487,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "pasfhocal mícheart"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6672,12 +6725,74 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "earráid agus ag léamh %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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Ní féidir an comhad a oscailt."
+
+msgid "Offline message store full"
+msgstr ""
+
+#, 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."
+
 msgid "Thinking"
 msgstr ""
 
@@ -6834,118 +6949,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 Neamhbhailí"
-
-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 ""
-
-#, 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 ""
-
-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 ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Ní féidir an comhad a oscailt."
-
-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 "
@@ -7262,30 +7265,10 @@ 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 ""
 
@@ -7665,6 +7648,76 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7970,6 +8023,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Teideal"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Nóta"
@@ -9814,9 +9872,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Prótacal Breiseán"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9832,18 +9887,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"
@@ -9905,6 +9954,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"
@@ -9974,6 +10029,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 ""
 
@@ -10333,6 +10396,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"
 
@@ -10564,14 +10631,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 ""
@@ -11745,6 +11804,10 @@ msgstr "Afracáinis"
 msgid "Arabic"
 msgstr "Araibis"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Cluichí"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11754,6 +11817,10 @@ msgstr "Bulgáiris"
 msgid "Bengali"
 msgstr "Beangáilis"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Beangáilis"
+
 msgid "Bosnian"
 msgstr "Boisnis"
 
@@ -11872,6 +11939,10 @@ msgid "Macedonian"
 msgstr "Macadóinis"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Fireannach"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macadóinis"
 
@@ -11990,8 +12061,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12505,14 +12576,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?"
@@ -12600,10 +12671,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
@@ -13424,9 +13495,6 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Roghnaigh Cló..."
@@ -14538,7 +14606,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..."
@@ -14740,6 +14817,169 @@ msgstr ""
 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."
+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
+#, 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"
 
diff --git a/po/gl.po b/po/gl.po
index 32c303f65c..f067cc5bb1 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -794,7 +807,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 +1277,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 +1374,6 @@ msgid "Saved Statuses"
 msgstr "Estados gardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1560,7 +1576,7 @@ msgstr ""
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1653,6 +1669,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"
 
@@ -1673,9 +1697,10 @@ 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."
@@ -1920,7 +1945,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"
 
@@ -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 "Nome"
 
@@ -3812,13 +3839,6 @@ 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"
@@ -3851,6 +3871,19 @@ 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"
 
@@ -3859,6 +3892,42 @@ 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"
 
@@ -3925,6 +3994,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"
 
@@ -3939,10 +4009,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"
 
@@ -4160,12 +4234,23 @@ msgstr "Non se encontrou usuarios"
 msgid "Roles:"
 msgstr "Roles:"
 
+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 "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."
 
@@ -4265,7 +4350,6 @@ msgstr "O servidor non admite o bloqueo"
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Estado de ánimo"
 
@@ -4287,7 +4371,6 @@ msgstr "Para"
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#. 0
 msgid "None"
 msgstr "Ninguén"
 
@@ -4309,6 +4392,12 @@ msgstr "Segundo nome"
 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"
 
@@ -4479,9 +4568,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"
 
@@ -4838,7 +4924,6 @@ msgstr "Avergoñado"
 msgid "Amorous"
 msgstr "Glorioso"
 
-#. 1
 msgid "Angry"
 msgstr "Enfadado"
 
@@ -4936,7 +5021,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Ansioso"
 
-#. 2
 msgid "Excited"
 msgstr "Emocionado"
 
@@ -4955,7 +5039,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Recuperando..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
@@ -4964,14 +5047,12 @@ msgstr "Grupo"
 msgid "Guilty"
 msgstr "Cidade"
 
-#. 4
 msgid "Happy"
 msgstr "Feliz"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5012,7 +5093,6 @@ msgstr "Intereses"
 msgid "Intoxicated"
 msgstr "Convidar"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencíbel"
 
@@ -5076,7 +5156,6 @@ msgstr "Eliminar"
 msgid "Restless"
 msgstr "Rexistrar"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
@@ -5097,12 +5176,10 @@ msgstr "Bloqueado"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Alias"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Adurmiñado"
@@ -5508,18 +5585,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"
 
@@ -5669,9 +5734,6 @@ msgstr "Aniversario"
 msgid "Work"
 msgstr "Traballo"
 
-msgid "Job Title"
-msgstr "Posto de traballo"
-
 msgid "Company"
 msgstr "Compañía"
 
@@ -5760,6 +5822,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"
 
@@ -5959,28 +6025,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Namorado"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "O seu estado de ánimo actual"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "A chave SecurID que se introduciu non é válida"
@@ -6017,7 +6061,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"
@@ -6026,6 +6074,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelidos"
@@ -6056,11 +6105,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..."
@@ -6104,7 +6148,7 @@ msgid "Connecting..."
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID que se introduciu non é válida"
 
 #, fuzzy
@@ -6112,14 +6156,9 @@ 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"
@@ -6148,10 +6187,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
@@ -6165,7 +6204,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Seguridade activada"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Introducir código"
@@ -6199,12 +6238,17 @@ 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")
@@ -6219,6 +6263,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 ""
@@ -6338,6 +6404,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Namorado"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Enviando"
@@ -6440,8 +6509,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"
@@ -6738,9 +6807,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"
 
@@ -6830,8 +6896,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)."
@@ -7001,12 +7067,77 @@ 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í"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Erro ao consultar"
+
 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 "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Non se pode enviar o ficheiro"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Non se pode 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 "Non se puido enviar a mensaxe."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Mensaxe sen conexión"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7166,128 +7297,14 @@ msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
-"%s 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 "
+"%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 "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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Non se pode enviar o ficheiro"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Non se pode 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 "Non se puido enviar a mensaxe."
-
-#, fuzzy
-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 "
@@ -7643,29 +7660,10 @@ 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"
 
@@ -8099,6 +8097,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Acuario"
 
@@ -8381,6 +8448,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"
 
@@ -10286,9 +10358,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"
 
@@ -10304,18 +10373,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..."
 
@@ -10383,6 +10446,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"
@@ -10462,6 +10534,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"
 
@@ -10847,6 +10930,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"
 
@@ -11084,12 +11171,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"
@@ -12266,6 +12347,10 @@ msgstr "Africano"
 msgid "Arabic"
 msgstr "Árabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Avergoñado"
+
 msgid "Belarusian Latin"
 msgstr "Bieloruso Latín"
 
@@ -12275,6 +12360,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengalí"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalí"
+
 msgid "Bosnian"
 msgstr "Bosníaco"
 
@@ -12389,6 +12478,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macedonio"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Home"
+
 msgid "Mongolian"
 msgstr "Macedonio"
 
@@ -12507,16 +12600,16 @@ msgid ""
 "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>"
+"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>"
 
@@ -13049,21 +13142,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?"
@@ -13165,11 +13258,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."
@@ -13998,10 +14093,6 @@ msgstr "Texto de atallo"
 msgid "Custom Smiley Manager"
 msgstr "Xestor de emoticonas personalizadas"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Requírese activación"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccionar icona de contacto"
 
@@ -15142,8 +15233,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..."
@@ -15357,6 +15460,207 @@ msgstr "Enviar e recibir entradas XMPP en bruto."
 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."
+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."
+
+#, 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."
 
@@ -15530,9 +15834,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 7d1acae7d8..185bd10573 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-08 19:18-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -62,12 +63,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 "નવા મેઈલ સૂચનો"
 
@@ -776,7 +789,7 @@ msgstr "અટકાવો"
 msgid "Waiting for transfer to begin"
 msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "રદ થયેલ"
 
 msgid "Failed"
@@ -1244,6 +1257,9 @@ msgstr "બીજા સંવાદમાં વાત કરે છે"
 msgid "Someone says your username in chat"
 msgstr "કોઈ તમારું વપરાશકર્તાનામ વાતચીતમાં કહે છે"
 
+msgid "Attention received"
+msgstr "ધ્યાન મળ્યુ"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer નિષ્ફળતા"
 
@@ -1336,6 +1352,7 @@ msgstr "પરિસ્થિતિને કાઢી નાંખો"
 msgid "Saved Statuses"
 msgstr "સંગ્રહાયેલ પરિસ્થિતિઓ"
 
+#. title
 msgid "Title"
 msgstr "શીર્ષક"
 
@@ -1533,7 +1550,7 @@ msgstr ""
 msgid "Online"
 msgstr "ઓનલાઈન"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ઓફલાઈન"
 
@@ -1626,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,8 +1670,10 @@ 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 "પ્રમાણપત્રની તારીખ જતી રહી છે અને પ્રમાણિત નક્કી કરવુ જોઇએ નહિં."
@@ -1881,7 +1908,6 @@ msgstr "પુનીકોડ માટે %s ને રૂપાંતર ક�
 msgid "Thread creation failure: %s"
 msgstr "થ્રેડ બનાવવાનું નિષ્ફળ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "અજ્ઞાત કારણ"
 
@@ -3126,6 +3152,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 "પ્રથમ નામ"
 
@@ -3725,12 +3754,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 "એનક્રિપ્ટ નહિં એવી સ્ટ્રીમ પર સર્વર માટે સાદુલખાણ સત્તાધિકરણ જરૂરી છે"
 
@@ -3761,6 +3784,18 @@ 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 સત્તાધિકરણ નિષ્ફળ"
 
@@ -3768,6 +3803,42 @@ msgstr "SASL સત્તાધિકરણ નિષ્ફળ"
 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 "વપરાશકર્તાને કૅનોનિકેલાઇઝ કરવામાં અસમર્થ"
 
@@ -3831,6 +3902,7 @@ msgstr "વિસ્તાર"
 msgid "Postal Code"
 msgstr "પોસ્ટલ કોડ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "દેશ"
 
@@ -3845,8 +3917,6 @@ msgstr "સંસ્થા નામ"
 msgid "Organization Unit"
 msgstr "સંસ્થા એકમ"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "નોકરી શીર્ષક"
 
@@ -3854,6 +3924,7 @@ msgid "Role"
 msgstr "ભૂમિકા"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "જન્મદિવસ"
 
@@ -4071,12 +4142,22 @@ 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. ડોમેઇનને સુયોજિત કરવુ જ જોઇએ."
 
@@ -4173,7 +4254,6 @@ msgstr "સર્વર એ બ્લોકીંગ ને આધાર આપ�
 msgid "Not Authorized"
 msgstr "સત્તાધિકારીત નથી"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "સ્વભાવ"
 
@@ -4195,7 +4275,6 @@ msgstr "પ્રતિ"
 msgid "None (To pending)"
 msgstr "કંઈ નહિં (બાકી રહેલ પ્રતિ)"
 
-#. 0
 msgid "None"
 msgstr "કંઇ નહી"
 
@@ -4391,9 +4470,6 @@ msgstr "પોલિસી ભંગ"
 msgid "Remote Connection Failed"
 msgstr "દૂરસ્થ જોડાણ નિષ્ફળ"
 
-msgid "Resource Constraint"
-msgstr "સ્રોત પરિમાણ"
-
 msgid "Restricted XML"
 msgstr "આરક્ષિત XML"
 
@@ -4584,21 +4660,6 @@ msgstr "XMPP પ્રોટોકોલ પ્લગઇન"
 msgid "Domain"
 msgstr "ડોમેઇન"
 
-#, fuzzy
-msgid "Require STARTTLS"
-msgstr "SSL/TLS જરૂરી છે"
-
-#, fuzzy
-msgid "Require old (port 5223) SSL"
-msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
-
-msgid "Use STARTTLS (if available)"
-msgstr ""
-
-#, fuzzy
-msgid "SSL/TLS"
-msgstr "SSL/TLS જરૂરી છે"
-
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS જરૂરી છે"
 
@@ -4749,7 +4810,6 @@ msgstr "આશ્ચર્યચકિત"
 msgid "Amorous"
 msgstr "પ્રણયશીલ"
 
-#. 1
 msgid "Angry"
 msgstr "ક્રોધી"
 
@@ -4828,7 +4888,6 @@ msgstr "શરમિંદગી"
 msgid "Envious"
 msgstr "ઇર્ષાળુ"
 
-#. 2
 msgid "Excited"
 msgstr "ઉત્તેજિત"
 
@@ -4844,21 +4903,18 @@ msgstr "મહાન"
 msgid "Grieving"
 msgstr "દુ:ખ આપવુ"
 
-#. 3
 msgid "Grumpy"
 msgstr "મિજાજી"
 
 msgid "Guilty"
 msgstr "દોષી"
 
-#. 4
 msgid "Happy"
 msgstr "ખુશ"
 
 msgid "Hopeful"
 msgstr "આશાસ્પદ"
 
-#. 8
 msgid "Hot"
 msgstr "ગરમ"
 
@@ -4892,7 +4948,6 @@ msgstr "રસપ્રદ"
 msgid "Intoxicated"
 msgstr "પીધેલુ"
 
-#. 6
 msgid "Invincible"
 msgstr "અદૃશ્ય"
 
@@ -4944,7 +4999,6 @@ msgstr "પશ્ચાતાપી"
 msgid "Restless"
 msgstr "અસ્વસ્થ"
 
-#. 7
 msgid "Sad"
 msgstr "નિરાશ"
 
@@ -4963,11 +5017,9 @@ msgstr "આઘાત"
 msgid "Shy"
 msgstr "શરમાળ"
 
-#. 9
 msgid "Sick"
 msgstr "બિમાર"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ઊંઘમાં"
@@ -5594,6 +5646,10 @@ msgstr "HTTP પદ્દતિ સર્વર"
 msgid "Show custom smileys"
 msgstr "વૈવિધ્યપૂર્ણ હસતા ચહેરાઓને બતાવો"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "જોડાણને બનાવવામાં અસમર્થ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ટહુકો: ધ્યાન ખેંચવા માટે વપરાશકર્તાને ટહુકો કરો"
 
@@ -5779,24 +5835,6 @@ msgstr "શું તમારી સરનામાં ચોપડી મા�
 msgid "The username specified is invalid."
 msgstr "સ્પષ્ટ થયેલ વપરાશકર્તાનામ અયોગ્ય છે."
 
-#. 5
-msgid "In Love"
-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 તમે દાખલ થયેલ છે તે અયોગ્ય છે."
 
@@ -5828,7 +5866,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 "PIN"
 
@@ -5836,6 +5878,7 @@ msgid "Verify PIN"
 msgstr "PIN ને ચકાસો"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "દર્શાવ નામ"
 
@@ -5862,10 +5905,6 @@ msgstr "ત્યાં હાલમાં સ્પ્લેશ-સ્ક્ર
 msgid "About"
 msgstr "વિશે"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "મિજાજને બદલો..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "રૂપરેખાને બદલો..."
@@ -5897,19 +5936,16 @@ msgstr "MXit સર્વર સાથે જોડાવામાં અસમ�
 msgid "Connecting..."
 msgstr "જોડાઈ રહ્યા છીએ..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit પ્રવેશ નામ"
-
-#. nick name
-msgid "Nick Name"
-msgstr "લાડકું નામ"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5939,10 +5975,12 @@ 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 ""
 "વપરાશકર્તા પહેલેથી જ રજીસ્ટર થયેલ છે. મહેરબાની કરીને બીજો વપરાશકર્તાનામ પસંદ કરો."
 
@@ -5955,7 +5993,7 @@ msgstr "તમે સુરક્ષા કોડને દાખલ કર્�
 msgid "Security Code"
 msgstr "સુરક્ષા કોડ"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "સુરક્ષા કોડને દાખલ કરો"
 
@@ -5981,11 +6019,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")
@@ -5998,6 +6042,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 "કક્ષ (_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 માં જોડાણ ગુમાવી દીધુ. મહેરબાની કરીને ફરીથી જોડો."
@@ -6100,6 +6166,9 @@ msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit માં જોડાણ ભૂલ ઉદ્ભવી. (રીડ સ્ટેજ 0x06)"
 
+msgid "In Love"
+msgstr "પ્રેમમાં"
+
 msgid "Pending"
 msgstr "અટકેલ"
 
@@ -6494,9 +6563,6 @@ msgstr "પાસવર્ડની સમયમર્યાદા સમાપ�
 msgid "Incorrect password"
 msgstr "અયોગ્ય પાસવર્ડ"
 
-msgid "User not found"
-msgstr "વપરાશકર્તા મળ્યો નથી"
-
 msgid "Account has been disabled"
 msgstr "ખાતું નિષ્ક્રિય કરાઈ ગયેલ છે"
 
@@ -6599,8 +6665,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)."
@@ -6749,12 +6815,73 @@ 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 "મર્યાદાઓને સ્વીકાર્યા વગર 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 "બોટ ખાતુ એ IMs ને પ્રારંભ કરી શકતુ નથી"
+
+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
+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 "વિચારી રહ્યા છે"
 
@@ -6905,116 +7032,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 "લુપ્ત થઈ ગયેલ 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 "મુખ્ય નિયંત્રણો દરમ્યાન 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 "બોટ ખાતુ એ IMs ને પ્રારંભ કરી શકતુ નથી"
-
-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 "ઓફલાઈન સંદેશ સંગ્રહ સંપૂર્ણ"
-
 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 "
@@ -7356,28 +7373,9 @@ 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 "ત્યારથી ઓનલાઈન"
 
@@ -7785,6 +7783,75 @@ 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 "કુંભ રાશિ"
 
@@ -9967,7 +10034,8 @@ 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"
@@ -10499,6 +10567,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)"
 
@@ -10736,12 +10808,6 @@ msgstr "Internet Messenger"
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-msgid "Orientation"
-msgstr "દિશા"
-
-msgid "The orientation of the tray."
-msgstr "ટ્રેની દિશા."
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "પ્રવેશ વિકલ્પો"
@@ -11889,6 +11955,10 @@ msgstr "આફ્રિકન"
 msgid "Arabic"
 msgstr "અરૅબિક"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "શરમાળ"
+
 msgid "Belarusian Latin"
 msgstr "બેલારુસિયન લેટિન"
 
@@ -12015,6 +12085,10 @@ msgstr "લાઓ"
 msgid "Macedonian"
 msgstr "મેકડોનિયન"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "મલય"
+
 msgid "Mongolian"
 msgstr "મોન્ગોલિયન"
 
@@ -12129,8 +12203,8 @@ msgid ""
 "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>"
+"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 એ પ્રકાશિત થયેલ છે, અને "
@@ -12675,16 +12749,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?"
@@ -12788,11 +12862,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ઉત્સાહી થઇ રહ્યા છે કારણ કે બીજા libpurple ક્લાયન્ટ એ પહેલેથી જ ચાલી રહ્યા છે.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/મીડિયા (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/મીડિયા/હેંગઅપ (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "સ્તબ્ધ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13588,9 +13664,6 @@ msgstr "ટુંકાણ લખાણ"
 msgid "Custom Smiley Manager"
 msgstr "વૈવિધ્યપૂર્ણ હસ્તો ચહેરો સંચાલક"
 
-msgid "Attention received"
-msgstr "ધ્યાન મળ્યુ"
-
 msgid "Select Buddy Icon"
 msgstr "મિત્ર આઇકનને પસંદ કરો"
 
@@ -14706,8 +14779,20 @@ msgstr "દરેક N મિનિટે iChat-style ટાઇમસ્ટે�
 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 "ડેસ્કટોપ મૂળભૂત"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-કલાક સમય માળખાં માટે દબાણ કરો (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24-કલાક સમય માળખાં માટે દબાણ કરો (_F)"
 
 msgid "Show dates in..."
@@ -14907,3 +14992,193 @@ 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."
+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 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 "ટુંકાણ"
+
+#. 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 "/Media/_Hangup"
+#~ msgstr "/મીડિયા/હેંગઅપ (_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "અજ્ઞાત કારણ."
+
+#, fuzzy
+#~ msgid "Require STARTTLS"
+#~ msgstr "SSL/TLS જરૂરી છે"
+
+#, fuzzy
+#~ msgid "Require old (port 5223) SSL"
+#~ msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
+
+#, fuzzy
+#~ 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 "ટ્રેની દિશા."
diff --git a/po/he.po b/po/he.po
index bd7082152b..18d992cd3a 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-15 19:51+0200\n"
-"Last-Translator: Shalom Craimer <scraimer at google's mail dot com>\n"
+"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"PO-Revision-Date: 2010-08-01 09:55+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 "הודעה על דואר חדש"
 
@@ -769,7 +781,7 @@ msgstr "עצור"
 msgid "Waiting for transfer to begin"
 msgstr "ממתין להעברה להתחיל"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "בוטל"
 
 msgid "Failed"
@@ -1232,6 +1244,9 @@ msgstr "אחרים מדברים בשיחה"
 msgid "Someone says your username in chat"
 msgstr "מישהו מזכיר את שם המשתמש שלך בשיחה"
 
+msgid "Attention received"
+msgstr "תשומת-לב התקבלה"
+
 msgid "GStreamer Failure"
 msgstr "תקלת GStreamer"
 
@@ -1325,7 +1340,6 @@ msgid "Saved Statuses"
 msgstr "סטטוסים נשמרו"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "תואר"
 
@@ -1518,7 +1532,7 @@ msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להע
 msgid "Online"
 msgstr "מחובר"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "מנותק"
 
@@ -1611,6 +1625,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,8 +1648,10 @@ 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 "תוקף התעודה פג, ולכן אין להחשיבה כתקפה."
@@ -1862,7 +1884,6 @@ msgstr "שגיאה בהמרת %s אל punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "כשל בעת יצירת חוט-תהליך חדש: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
@@ -3100,6 +3121,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 "שם פרטי"
 
@@ -3694,12 +3718,6 @@ 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 "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
@@ -3728,6 +3746,17 @@ 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 נכשל"
 
@@ -3735,6 +3764,39 @@ 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 ""
+"השרת תומך בלכידת ערוצים, אך נראה כי אינו מפרסם זאת. זה כנראה מעיד על תקיפת "
+"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 "לא ניתן לפרק את שם המשתמש"
 
@@ -3798,6 +3860,7 @@ msgstr "איזור"
 msgid "Postal Code"
 msgstr "מיקוד"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "מדינה"
 
@@ -3812,10 +3875,14 @@ msgstr "שם האירגון"
 msgid "Organization Unit"
 msgstr "מחלקה"
 
+msgid "Job Title"
+msgstr "תואר"
+
 msgid "Role"
 msgstr "תפקיד"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "יום הולדת"
 
@@ -4029,12 +4096,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 "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 שגוי. יש להגדיר את הדומיין."
 
@@ -4131,7 +4207,6 @@ msgstr "השרת לא תומך בחסימה"
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "מצב רוח"
 
@@ -4153,7 +4228,6 @@ msgstr "אל"
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
-#. 0
 msgid "None"
 msgstr "ללא"
 
@@ -4167,14 +4241,18 @@ msgstr "טקסט מצב-רוח"
 msgid "Allow Buzz"
 msgstr "אפשר זימזום"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "שם אמצעי"
+msgstr "שם מצב-הרוח"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "הערת איש קשר"
+msgstr "הערת מצב-הרוח"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "אמן השיר"
 
@@ -4345,9 +4423,6 @@ msgstr "חילול ההסכם"
 msgid "Remote Connection Failed"
 msgstr "שגיאת תקשורת בצד המרוחק"
 
-msgid "Resource Constraint"
-msgstr "הגבלת משאבים"
-
 msgid "Restricted XML"
 msgstr "XML מוגבל"
 
@@ -4457,9 +4532,8 @@ msgstr "יש לבחור משאב"
 msgid "Initiate Media"
 msgstr "יזום מדיה"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
+msgstr "חשבון זה אינו תומך PEP, לא ניתן לקבוע את מצב-הרוח"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  קבע הגדרות חדר צ'אט."
@@ -4512,9 +4586,8 @@ 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 "בחר/י משתמש נכון"
+msgstr "mood: לקביעת מצב-רוח המשתמש"
 
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
@@ -4596,13 +4669,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "החייכן שלך גדול מכדי להישלח בתוך ההודעה."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "חסרה תחילית stream XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "גירסא לא נכונה של XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "חסרה מספר-זיהוי של stream XMPP"
 
 msgid "XML Parse error"
 msgstr "שגיאת פיענוח XML"
@@ -4676,32 +4749,26 @@ msgstr "לא ניתן לשלוח את הקובץ אל %s, אינך רשומ/ה �
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "יש לבחור את המשאב של %s אליו ברצונך לשלוח קובץ"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "ערבית"
+msgstr "פחד"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "מבוייש"
+msgstr "תדהמה"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "מרומם"
+msgstr "אהבה"
 
-#. 1
 msgid "Angry"
 msgstr "כועס"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "חסום"
+msgstr "עצבנות"
 
 msgid "Anxious"
 msgstr "לחוץ"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "אתה שולח"
+msgstr "גירוי"
 
 msgid "Ashamed"
 msgstr "מבוייש"
@@ -4709,287 +4776,231 @@ msgstr "מבוייש"
 msgid "Bored"
 msgstr "משועמם"
 
-#, fuzzy
 msgid "Brave"
-msgstr "שמור"
+msgstr "אומץ"
 
-#, fuzzy
 msgid "Calm"
-msgstr "איזור"
+msgstr "רוגע"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "שיחות"
+msgstr "זהירות"
 
-#, fuzzy
 msgid "Cold"
-msgstr "מודגש"
+msgstr "קר"
 
-#, fuzzy
 msgid "Confident"
-msgstr "התנגשות"
+msgstr "מלא ביטחון"
 
-#, fuzzy
 msgid "Confused"
-msgstr "המשך"
+msgstr "בילבול"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "איש הקשר"
+msgstr "הירהורים"
 
-#, fuzzy
 msgid "Contented"
-msgstr "מחובר"
+msgstr "שביעות רצון"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "חברה"
+msgstr "קיטורים"
 
 msgid "Crazy"
-msgstr ""
+msgstr "שיגעון"
 
-#, fuzzy
 msgid "Creative"
-msgstr "צור"
+msgstr "יצירתיות"
 
-#, fuzzy
 msgid "Curious"
-msgstr "מרומם"
+msgstr "סקרנות"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "נדחה"
+msgstr "נידחיות"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "מחוק"
+msgstr "דיכאון"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "מנותק."
+msgstr "אכזבה"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "גועל"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "כבוי"
+msgstr "עצב לא צפוי"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "מנותק"
+msgstr "היסח הדעת"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "מבוכה"
 
-#, fuzzy
 msgid "Envious"
-msgstr "לחוץ"
+msgstr "קינאה"
 
-#. 2
 msgid "Excited"
 msgstr "נלהב"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "מרומם"
+msgstr "פלירטוט"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "שם פרטי"
+msgstr "תיסכול"
 
 msgid "Grateful"
-msgstr ""
+msgstr "מלא-תודה"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "שולף..."
+msgstr "אבל"
 
-#. 3
 msgid "Grumpy"
 msgstr "עצבני"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "עיר"
+msgstr "אשמה"
 
-#. 4
 msgid "Happy"
 msgstr "שמח"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "מלא-תקווה"
 
-#. 8
 msgid "Hot"
 msgstr "חם"
 
 msgid "Humbled"
-msgstr ""
+msgstr "צניעות"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "השפלה"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "כועס"
+msgstr "רעב"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "הומור"
+msgstr "כאב"
 
 msgid "Impressed"
-msgstr ""
+msgstr "התרשמות"
 
-#, fuzzy
 msgid "In awe"
-msgstr "מאוהב"
+msgstr "פליאה"
 
 msgid "In love"
 msgstr "מאוהב"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "אינדונזית"
+msgstr "גאווה נפגעה"
 
-#, fuzzy
 msgid "Interested"
-msgstr "תחומי עניין"
+msgstr "עניין"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "הוזמן"
+msgstr "שיכרות"
 
-#. 6
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
 msgid "Jealous"
 msgstr "מקנא"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "קוף"
+msgstr "בדידות"
 
-#, fuzzy
 msgid "Lost"
-msgstr "הכי רועש"
+msgstr "אבוד"
 
 msgid "Lucky"
-msgstr ""
+msgstr "בר-מזל"
 
-#, fuzzy
 msgid "Mean"
-msgstr "גרמנית"
+msgstr "נבזיות"
 
-#, fuzzy
 msgid "Moody"
-msgstr "מצב רוח"
+msgstr "אין מצב רוח"
 
 msgid "Nervous"
-msgstr ""
+msgstr "עצבניות"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "פרטים"
+msgstr "ניטרלי"
 
-#, fuzzy
 msgid "Offended"
-msgstr "מנותק"
+msgstr "עלבון"
 
 msgid "Outraged"
-msgstr ""
+msgstr "התלהמות"
 
-#, fuzzy
 msgid "Playful"
-msgstr "נגן"
+msgstr "משחקיות"
 
-#, fuzzy
 msgid "Proud"
-msgstr "רועש"
+msgstr "גאווה"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "שם אמיתי"
+msgstr "רגיעה"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "נתקבלו"
+msgstr "הורדת לחץ"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "הסר"
+msgstr "חרטה"
 
-#, fuzzy
 msgid "Restless"
-msgstr "הרשם"
+msgstr "חוסר-מנוחה"
 
-#. 7
 msgid "Sad"
 msgstr "עצוב"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "מרטהי"
+msgstr "ציני"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "שבעות רצון"
 
-#, fuzzy
 msgid "Serious"
-msgstr "מרומם"
+msgstr "רצינות"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "חסום"
+msgstr "הלם"
 
 msgid "Shy"
-msgstr ""
+msgstr "ביישנות"
 
-#. 9
 msgid "Sick"
 msgstr "חולה"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ישנוני"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "ספונטני"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "מהירות"
+msgstr "לחץ"
 
-#, fuzzy
 msgid "Strong"
-msgstr "שיר"
+msgstr "כוח"
 
 msgid "Surprised"
-msgstr ""
+msgstr "הפתעה"
 
 msgid "Thankful"
-msgstr ""
+msgstr "תודה"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "צימאון"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "עייפות"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "קו תחתון"
+msgstr "לא מוגדר"
 
-#, fuzzy
 msgid "Weak"
-msgstr "כאפה"
+msgstr "חולשה"
 
-#, fuzzy
 msgid "Worried"
-msgstr "משועמם"
+msgstr "דאגה"
 
 msgid "Set User Nickname"
 msgstr "קבע כינוי משתמש"
@@ -5345,18 +5356,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 "שם המשחק"
 
@@ -5504,9 +5503,6 @@ msgstr "יום נישואין"
 msgid "Work"
 msgstr "בעבודה"
 
-msgid "Job Title"
-msgstr "תואר"
-
 msgid "Company"
 msgstr "חברה"
 
@@ -5592,6 +5588,9 @@ msgstr "פעולת שרת-HTTP"
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
+msgid "Allow direct connections"
+msgstr "אפשר חיבורים ישירים"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5775,24 +5774,6 @@ msgstr "האם ברצונך גם למחוק את המשתמש הזה מפנקס
 msgid "The username specified is invalid."
 msgstr "שם המשתמש שהוזן אינו חוקי."
 
-#. 5
-msgid "In Love"
-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 שהזנת אינו חוקי."
 
@@ -5805,8 +5786,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'."
@@ -5824,7 +5805,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 "מספר זיהוי"
 
@@ -5832,6 +5817,7 @@ msgid "Verify PIN"
 msgstr "וידוא מספר מזהה"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "שם תצוגה"
 
@@ -5858,10 +5844,6 @@ msgstr "אין חלון-הקדמה זמין כרגע"
 msgid "About"
 msgstr "אודות"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "שינוי מצב-רוח..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "שנה פרופיל..."
@@ -5892,19 +5874,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"
@@ -5932,11 +5907,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 "שגיאה פנימית. יש לנסות מאוחר יותר."
@@ -5947,7 +5922,7 @@ msgstr "לא הזנת את קוד האבטחה"
 msgid "Security Code"
 msgstr "קוד אבטחה"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "הזן קוד אבטחה"
 
@@ -5973,11 +5948,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")
@@ -5990,6 +5969,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 אבד. נא להתחבר בשנית."
@@ -6093,6 +6089,9 @@ msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x06)"
 
+msgid "In Love"
+msgstr "מאוהב"
+
 msgid "Pending"
 msgstr "ממתין"
 
@@ -6484,9 +6483,6 @@ msgstr "פג תוקף סיסמתך"
 msgid "Incorrect password"
 msgstr "סיסמה לא נכונה"
 
-msgid "User not found"
-msgstr "המשתמש לא נמצא"
-
 msgid "Account has been disabled"
 msgstr "החשבון בוטל"
 
@@ -6736,111 +6732,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL אינם מאפשרים לאמת את שם המשתמש שלך כאן"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "שגיאה בבקשת %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 "לא ניתן לשלוח 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 "חשבון רובוטי לא יכולים ליזום שיחות"
+
+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 ""
+msgstr "מחשבה"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "מפסיק/ה להקליד הודעה"
+msgstr "קניות"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "חלון שאלה"
+msgstr "תהייה"
 
-#, fuzzy
 msgid "Eating"
-msgstr "מדפדף"
+msgstr "אוכל"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "באמצע משחק"
+msgstr "באמצע סרט"
 
 msgid "Typing"
 msgstr "מקליד/ה"
 
-#, fuzzy
 msgid "At the office"
-msgstr "לא נמצא במשרד"
+msgstr "במשרד"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "רחצה באמבט"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "צפייה בטלויזיה"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "התנתק"
+msgstr "בכיף"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "ישנוני"
+msgstr "שינה"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "שימוש במחשב כף-יד"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "חברי בהודעות מידיות"
+msgstr "במפגש עם חברים"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "משוחח בטלפון"
+msgstr "בטלפון"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "חוזר"
+msgstr "גלישה"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "נייד"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "חיפוש באינטרנט"
 
 msgid "At a party"
-msgstr ""
+msgstr "במסיבה"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "שתיית קפה"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "תאומים"
+msgstr "משחקים"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "דפדוף באינטרנט"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "שיר"
+msgstr "עישון"
 
-#, fuzzy
 msgid "Writing"
-msgstr "עובד"
+msgstr "כתיבה"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "עובד"
+msgstr "שותה"
 
 msgid "Listening to music"
 msgstr "מקשיב/ה למוזיקה"
 
-#, fuzzy
 msgid "Studying"
-msgstr "שליחה"
+msgstr "לימודים"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "תחומי עניין"
+msgstr "בשירותים"
 
 msgid "Received invalid data on connection with server"
 msgstr "התקבל מידע שגוי בעת חיבור עם השרת."
@@ -6908,116 +6949,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 "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 "לא ניתן לשלוח 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 "חשבון רובוטי לא יכולים ליזום שיחות"
-
-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 "איזור אחסון ההודעות הלא-מקוונות הינו מלא"
-
 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 "
@@ -7053,7 +6984,7 @@ msgid "Games"
 msgstr "משחקים"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "תוספות"
@@ -7121,25 +7052,20 @@ msgstr "מודע רשת"
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#, fuzzy
 msgid "Evil"
-msgstr "דואר"
+msgstr "רוע-לב"
 
-#, fuzzy
 msgid "Depression"
-msgstr "מקצוע"
+msgstr "דיכאון"
 
-#, fuzzy
 msgid "At home"
-msgstr "אודותי"
+msgstr "בבית"
 
-#, fuzzy
 msgid "At work"
-msgstr "רשת"
+msgstr "בעבודה"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "יצא לאכול"
+msgstr "בארוחת-צהריים"
 
 msgid "IP Address"
 msgstr "כתובת IP"
@@ -7360,28 +7286,9 @@ 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 "מחובר מאז"
 
@@ -7623,9 +7530,8 @@ msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמו
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "פינץ'"
+msgstr "ארוחת-צהריים"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7658,9 +7564,8 @@ msgstr "הצג פרטי AIM"
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "הורד הודעת מצב"
+msgstr "שלוף הודעת X-Status"
 
 msgid "End Direct IM Session"
 msgstr "סיים חיבור IM ישיר"
@@ -7786,6 +7691,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "דלי"
 
@@ -8068,6 +8042,10 @@ msgstr "מבקש"
 msgid "Admin"
 msgstr "מנהל"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "כותרת החדר"
+
 msgid "Notice"
 msgstr "הודעה"
 
@@ -9939,9 +9917,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo!"
 
-msgid "Pager server"
-msgstr "שרת ה-Pager"
-
 msgid "Pager port"
 msgstr "יציאת Pager"
 
@@ -9957,18 +9932,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"
 
@@ -10032,6 +10001,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 "שם משתמש או סיסמה חסרים"
@@ -10106,6 +10083,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 "לא נמצא בבית"
 
@@ -10474,6 +10459,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,9 +10529,8 @@ msgstr "נא לא להפריע"
 msgid "Extended away"
 msgstr "העדרות ממושכת"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "קבלה"
+msgstr "ההרגשה שלי"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10712,12 +10700,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 "מאפייני כניסה למערכת"
@@ -11079,13 +11061,11 @@ msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוס�
 msgid "Unknown node type"
 msgstr "נקודה-ברשת מסוג לא מוכר"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "יש לבחור את מצב הרוח שלך מהרשימה."
+msgstr "יש לבחור את מצב הרוח שלך מהרשימה"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "שם נוסף (לא חובה)"
+msgstr "הודעה (לא חובה)"
 
 msgid "Edit User Mood"
 msgstr "קבע מצב-רוח משתמש"
@@ -11168,9 +11148,8 @@ msgstr "/כלים/_העדפות"
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/כלים/דו\"ח המערכת"
+msgstr "/כלים/קבע מצב-ר_וח"
 
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
@@ -11191,20 +11170,17 @@ msgstr "/_עזרה"
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "מידע עבור איש הקשר"
+msgstr "/עזרה/_גירסת תוכנה"
 
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "מידע על השרת"
+msgstr "/עזרה/פרטי מפת_חים"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "מידע אישי"
+msgstr "/עזרה/פרטי מתר_גמים"
 
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
@@ -11429,7 +11405,6 @@ msgstr "<PurpleMain>/חשבונות/"
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
-#, fuzzy
 msgid "Set _Mood..."
 msgstr "קבע מצב-רוח..."
 
@@ -11551,9 +11526,8 @@ msgstr "/שיחת ו_ידאו/\\קול/שיחה/מדיה"
 msgid "/Conversation/Se_nd File..."
 msgstr "/שיחה/ש_לח קובץ..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/שיחה/הצג מידע"
+msgstr "/שיחה/הסב תשומת _לב"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/שיחה/הוסף פ_עולת תגובה..."
@@ -11636,9 +11610,8 @@ msgstr "/שיחת וידאו/\\קול/שיחה/מדיה"
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/שיחה/הצג מידע"
+msgstr "/שיחה/הסב תשומת לב"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/שיחה/הוסף פעולת תגובה לאירועי איש קשר..."
@@ -11704,13 +11677,11 @@ msgstr "ש_לח"
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "סגור טאב זה"
+msgstr "סגור סרגל חיפוש"
 
-#, fuzzy
 msgid "Find:"
-msgstr "חפש"
+msgstr "חפש:"
 
 #, c-format
 msgid "%d person in room"
@@ -11873,6 +11844,9 @@ msgstr "אפריקאנס"
 msgid "Arabic"
 msgstr "ערבית"
 
+msgid "Assamese"
+msgstr "אסאמית"
+
 msgid "Belarusian Latin"
 msgstr "לטינית בלארוסית"
 
@@ -11882,6 +11856,9 @@ msgstr "בולגרית"
 msgid "Bengali"
 msgstr "בנגאלית"
 
+msgid "Bengali-India"
+msgstr "בנגאלית-הודו"
+
 msgid "Bosnian"
 msgstr "בוסנית"
 
@@ -11996,6 +11973,9 @@ msgstr "לאית"
 msgid "Macedonian"
 msgstr "מקדונית"
 
+msgid "Malayalam"
+msgstr "מלאיאלאם"
+
 msgid "Mongolian"
 msgstr "מונגולית"
 
@@ -12104,23 +12084,20 @@ msgstr "אמהרית"
 msgid "Lithuanian"
 msgstr "ליטואנית"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12129,8 +12106,11 @@ msgid ""
 "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>\tערוץ IRC: #pidgin on irc."
+"freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12140,24 +12120,24 @@ msgid ""
 "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 "About %s"
 msgstr "אודות %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "מידע עבור איש הקשר"
+msgstr "פרטי גרסת תוכנה"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "מידע עבור איש הקשר"
+msgstr "%s פרטי גרסת תוכנה"
 
 msgid "Current Developers"
 msgstr "מפתחים"
@@ -12171,9 +12151,9 @@ msgstr "מפתחים שתרמו בעבר"
 msgid "Retired Crazy Patch Writers"
 msgstr "מחברי תיקונים מטורפים בדימוס"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "מידע על השרת"
+msgstr "%s פרטי מפתח"
 
 msgid "Current Translators"
 msgstr "מתרגמים פעילים"
@@ -12181,9 +12161,9 @@ msgstr "מתרגמים פעילים"
 msgid "Past Translators"
 msgstr "מתרגמים לשעבר"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "מידע נוסף"
+msgstr "%s פרטי מתרגם"
 
 msgid "_Name"
 msgstr "שם_"
@@ -12580,9 +12560,8 @@ msgstr "הכנס תמונת-הודעה מיידית"
 msgid "Insert Smiley"
 msgstr "הכנס חיוכון"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "כפתור שליחה"
+msgstr "שליחת בקשת תשומת-לב"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>מ_ודגש:</b>"
@@ -12630,7 +12609,7 @@ msgid "_Smile!"
 msgstr "חייך!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "תשומת-לב!"
 
 msgid "Log Deletion Failed"
 msgstr "מחיקת יומן-הרישום נכשלה"
@@ -12646,14 +12625,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?"
@@ -12756,11 +12735,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."
@@ -13554,10 +13533,6 @@ msgstr "טקסט לקיצור-דרך"
 msgid "Custom Smiley Manager"
 msgstr "מנהל החייכנים שלך"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "נדרשת הפעלה"
-
 msgid "Select Buddy Icon"
 msgstr "בחירת תמונה עבור חבר"
 
@@ -14669,8 +14644,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 "הצג תאריכים ב..."
@@ -14867,10 +14851,213 @@ 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 ""
+"$(^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-ו 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 "צור קיצור-דרך עבור פידג'ין על שולחן העבודה"
+
+#. 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רכיב זה נחוץ לפעולת פידג'ין; "
+"אם ניסיון נוסף נכשל, ייתן ונאלץ להשתמש ב'התקנה לא-מקוונת'  מהאתר: from "
+"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 ""
+"לפידג'ין נחוצה סביבת הרצה של 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 ""
+".GTK+ ההתקנה לא מצאה את הרישומים של$\\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 ".Pidginבקרו באתר של "
+
+msgid "You do not have permission to uninstall this application."
+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 "/מדיה/_ניתוק"
+
+#~ 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 "Unknown reason."
+#~ msgstr "סיבה לא ידועה."
+
+#~ msgid "Artist"
+#~ msgstr "אמן"
+
+#~ msgid "Album"
+#~ msgstr "אלבום"
+
+#~ msgid "Pager server"
+#~ msgstr "שרת ה-Pager"
+
+#~ 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 "שגיאה ביצירת שיחת הועידה."
 
diff --git a/po/hi.po b/po/hi.po
index 8d91d09a7f..035bd019ef 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:10-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -60,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 "नयी डाक सूचना"
 
@@ -767,7 +780,7 @@ msgstr "रूकें"
 msgid "Waiting for transfer to begin"
 msgstr "हस्तांतरण के शुरु होने की प्रतीक्षा करता है."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द"
 
 msgid "Failed"
@@ -1230,6 +1243,10 @@ msgstr "दूसरे बात-चीत में बोले"
 msgid "Someone says your username in chat"
 msgstr "किसी ने चैट में आपका नाम पुकारा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "सक्रियन आवशयक"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer विफलता"
 
@@ -1323,7 +1340,6 @@ msgid "Saved Statuses"
 msgstr "सहेजी वस्तुस्थिति"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "शीर्षक"
 
@@ -1522,7 +1538,7 @@ msgstr ""
 msgid "Online"
 msgstr "ऑनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ऑफ़लाइन"
 
@@ -1615,6 +1631,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 "अज्ञात"
 
@@ -1634,8 +1658,10 @@ 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 "प्रमाणपत्र समाप्त हो गया है और इसे वैध नहीं माना जा सकता है."
@@ -1872,7 +1898,6 @@ msgstr "%s को प्यूनीकोड में बदलने मे�
 msgid "Thread creation failure: %s"
 msgstr "थ्रेड निर्माण विफल: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "अज्ञात कारण"
 
@@ -3125,6 +3150,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 "पहला नाम"
 
@@ -3723,14 +3751,6 @@ msgstr "तदर्थ कमाँड विफल"
 msgid "execute"
 msgstr "कार्यान्वित करें"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"सर्वर पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
-"समर्थन नहीं मिला।"
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "आपको गोपन चाहिए, लेकिन कोई TLS/SSL समर्थन नहीं मिला."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "विगोपित स्ट्रीम पर सादा पाठ प्रमाणीकरण सर्वर के लिए जरूरी है "
 
@@ -3761,6 +3781,18 @@ 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 प्रमाणीकरण असफल"
 
@@ -3768,6 +3800,42 @@ msgstr "SASL प्रमाणीकरण असफल"
 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 "उपयोक्ता कैनोनिकैलाइज करने में असमर्थ"
 
@@ -3831,6 +3899,7 @@ msgstr "क्षेत्र"
 msgid "Postal Code"
 msgstr "डाक कोड"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "देश"
 
@@ -3845,10 +3914,14 @@ msgstr "संस्था नाम"
 msgid "Organization Unit"
 msgstr "संस्था ईकाई"
 
+msgid "Job Title"
+msgstr "पद नाम"
+
 msgid "Role"
 msgstr "भूमिका"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "जन्मदिन"
 
@@ -4063,12 +4136,24 @@ 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 "आपको गोपन चाहिए, लेकिन कोई 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. डोमेन जरूर सेट होना चाहिए."
 
@@ -4165,7 +4250,6 @@ msgstr "सर्वर ब्लॉकिंग का समर्थन न�
 msgid "Not Authorized"
 msgstr "प्राधिकृत नहीं"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "स्वभाव"
 
@@ -4187,7 +4271,6 @@ msgstr "को"
 msgid "None (To pending)"
 msgstr "कोई नहीं (स्थगित में)"
 
-#. 0
 msgid "None"
 msgstr "कुछ नहीं"
 
@@ -4209,6 +4292,12 @@ msgstr "मध्य नाम"
 msgid "Mood Comment"
 msgstr "बड्डी टिप्पणी"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "कलाकार ट्यून करें"
 
@@ -4379,9 +4468,6 @@ msgstr "नीति उल्लंघन"
 msgid "Remote Connection Failed"
 msgstr "दूरस्थ संबंधन विफल"
 
-msgid "Resource Constraint"
-msgstr "संसाधन निर्धारक"
-
 msgid "Restricted XML"
 msgstr "प्रतिबंधित XML"
 
@@ -4726,7 +4812,6 @@ msgstr "शर्मिंदा"
 msgid "Amorous"
 msgstr "दैदीप्यमान"
 
-#. 1
 msgid "Angry"
 msgstr "क्रोधित"
 
@@ -4824,7 +4909,6 @@ msgstr ""
 msgid "Envious"
 msgstr "चिंतित"
 
-#. 2
 msgid "Excited"
 msgstr "उत्साहित"
 
@@ -4843,7 +4927,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "प्राप्त कर रहा है..."
 
-#. 3
 msgid "Grumpy"
 msgstr "Grumpy"
 
@@ -4851,14 +4934,12 @@ msgstr "Grumpy"
 msgid "Guilty"
 msgstr "शहर"
 
-#. 4
 msgid "Happy"
 msgstr "सुखी"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "गर्म"
 
@@ -4898,7 +4979,6 @@ msgstr "ब्याज"
 msgid "Intoxicated"
 msgstr "आमंत्रित"
 
-#. 6
 msgid "Invincible"
 msgstr "अजय"
 
@@ -4962,7 +5042,6 @@ msgstr "हटाएँ"
 msgid "Restless"
 msgstr "पंजीकृत करें"
 
-#. 7
 msgid "Sad"
 msgstr "दुखी"
 
@@ -4984,11 +5063,9 @@ msgstr "रोका गया"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "बीमार"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "उनींदा"
@@ -5383,18 +5460,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 "खेल शीर्षक"
 
@@ -5542,9 +5607,6 @@ msgstr "वर्षगांठ"
 msgid "Work"
 msgstr "कार्यस्थल"
 
-msgid "Job Title"
-msgstr "पद नाम"
-
 msgid "Company"
 msgstr "कंपनी"
 
@@ -5630,6 +5692,10 @@ msgstr "HTTP विधि सर्वर"
 msgid "Show custom smileys"
 msgstr "पसंदीदा स्माइली दिखाएं"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "संबंधन बनाने में असमर्थ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "टहोका: ध्यान आकृष्ठ करने लिए एक प्रयोक्ता को टहोका दीजिए"
 
@@ -5815,24 +5881,6 @@ msgstr "क्या आप इस दोस्त को दोस्त सू
 msgid "The username specified is invalid."
 msgstr "दर्ज़ उपयोक्तानाम अवैध है."
 
-#. 5
-msgid "In Love"
-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 "दर्ज पिन अवैध है।"
 
@@ -5864,7 +5912,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 "PIN"
 
@@ -5872,6 +5924,7 @@ msgid "Verify PIN"
 msgstr "पिन जाँचें"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "नाम प्रदर्शित करें"
 
@@ -5898,10 +5951,6 @@ msgstr "कोई स्प्लैश स्क्रीन अभी उप�
 msgid "About"
 msgstr "के बारे में"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "मूड बदलें..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "प्रोफ़ाइल बदलें..."
@@ -5932,19 +5981,16 @@ msgstr "MXit सर्वर से कनेक्ट करने में �
 msgid "Connecting..."
 msgstr "जुड़ रहा है..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit लॉगिन नाम"
-
-#. nick name
-msgid "Nick Name"
-msgstr "उप नाम"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5972,10 +6018,12 @@ 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 "उपयोक्तानाम पहले से पंजीकृत है. दूसरा उपयोक्तानाम चुनें."
 
 msgid "Internal error. Please try again later."
@@ -5987,7 +6035,7 @@ msgstr "आपने सुरक्षा कोड नहीं दर्ज�
 msgid "Security Code"
 msgstr "सुरक्षा कोड"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "सुरक्षा कोड बदलें"
 
@@ -6013,11 +6061,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 "याहू! आइ डी"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6030,6 +6084,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 "कक्ष (_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 के साथ आपका कनेक्शन खत्म हो गया. कृपया फिर कोशिश करें."
@@ -6132,6 +6208,9 @@ msgstr "MXit में एक कनेक्शन त्रुटि आई. (
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit में एक कनेक्शन त्रुटि आई. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "प्यार में"
+
 msgid "Pending"
 msgstr "स्थगित"
 
@@ -6526,9 +6605,6 @@ msgstr "कूटशब्द का समय समाप्त हो गय�
 msgid "Incorrect password"
 msgstr "गलत कूटशब्द"
 
-msgid "User not found"
-msgstr "प्रयोक्ता नहीं मिला"
-
 msgid "Account has been disabled"
 msgstr "खाता को निष्क्रिय कर दिया गया है"
 
@@ -6779,12 +6855,73 @@ 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 "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 खाता 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 ""
 
@@ -6951,116 +7088,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 "अप्रचलित 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 दौरान नहीं"
-
-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 खाता 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 "ऑफलाइन संदेश स्टोर पूर्ण"
-
 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 "
@@ -7404,28 +7431,9 @@ 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 "से ऑनलाइन"
 
@@ -7834,6 +7842,75 @@ 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 "चेतावनी स्तर काफी उच्च (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 दौरान नहीं"
+
 msgid "Aquarius"
 msgstr "कुंभ"
 
@@ -8116,6 +8193,11 @@ msgstr "अनुरोध"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "कमरा सूची"
+
 msgid "Notice"
 msgstr "सूचना"
 
@@ -9989,9 +10071,6 @@ msgstr "याहू! आइ डी"
 msgid "Yahoo! Protocol Plugin"
 msgstr "याहू प्रोटोकाल प्लगइन"
 
-msgid "Pager server"
-msgstr "पेजर सर्वर"
-
 msgid "Pager port"
 msgstr "पेजर पोर्ट"
 
@@ -10007,18 +10086,13 @@ 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 बात-चीत पोर्ट"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "याहू! जापान आइ डी"
 
@@ -10081,6 +10155,14 @@ 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
 msgid "Username or password missing"
 msgstr "उपनाम या कूटशब्द गुम"
@@ -10155,6 +10237,15 @@ 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 "MXit सर्वर से कनेक्ट करने में असमर्थ. कृपया अपना सर्वर सेटिंग जाँचें."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "घर पर नहीं"
 
@@ -10528,6 +10619,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)"
 
@@ -10766,12 +10861,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 "लॉगिन विकल्प"
@@ -11929,6 +12018,10 @@ msgstr "अफ्रीकांस"
 msgid "Arabic"
 msgstr "अरबी"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "शर्मिंदा"
+
 msgid "Belarusian Latin"
 msgstr "बेलारूसी लैटिन"
 
@@ -11938,6 +12031,10 @@ msgstr "बुल्गारियाई"
 msgid "Bengali"
 msgstr "बंगाली"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "बंगाली"
+
 msgid "Bosnian"
 msgstr "बोस्नियाई"
 
@@ -12052,6 +12149,10 @@ msgstr "लाओ"
 msgid "Macedonian"
 msgstr "मकदूनियाई"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "मलय"
+
 msgid "Mongolian"
 msgstr "मंगोलियन"
 
@@ -12166,8 +12267,8 @@ msgid ""
 "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>"
+"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, "
@@ -12710,16 +12811,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 पर शुरू होता है?"
 
@@ -12824,11 +12925,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "बाहर निकल रहा है क्योंकि libpurple क्लाइंट पहले से चल रहा है.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
+msgstr "हैंगअप"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13622,10 +13725,6 @@ msgstr "शोर्टकट पाठ"
 msgid "Custom Smiley Manager"
 msgstr "पसंदीदा स्माइली प्रबंधक"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "सक्रियन आवशयक"
-
 msgid "Select Buddy Icon"
 msgstr "दोस्त प्रतीक चुनें"
 
@@ -14743,8 +14842,20 @@ msgstr "iChat-style टाइमस्टैंप हर 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 "डेस्कटोप मूलभूत"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-घंटाक समय प्रारूपक लिए बाध्य करें (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24-घंटाक समय प्रारूपक लिए बाध्य करें (_F)"
 
 msgid "Show dates in..."
@@ -14946,6 +15057,199 @@ msgstr "कच्चा XMPP बंद भेजें व पाएं."
 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 "/Media/_Hangup"
+#~ msgstr "/Media/_Hangup"
+
+#~ 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 "सम्मेलन बनाने में त्रुटि."
 
diff --git a/po/hu.po b/po/hu.po
index b398ffceb3..b343de7ce2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,22 +1,22 @@
 # 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2009-11-26 13:06+0100\n"
+"POT-Creation-Date: 2010-08-15 21:49+0200\n"
+"PO-Revision-Date: 2010-08-15 21:48+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\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"
 
@@ -679,7 +693,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 +804,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 +1273,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 +1369,6 @@ msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Beosztás"
 
@@ -1509,7 +1525,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,7 +1569,7 @@ msgstr ""
 msgid "Online"
 msgstr "Elérhető"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Kilépett"
 
@@ -1646,6 +1662,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"
 
@@ -1665,8 +1687,12 @@ 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."
@@ -1903,7 +1929,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"
 
@@ -1944,9 +1969,8 @@ 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"
 
-#, fuzzy
 msgid "File is not readable."
-msgstr "A könyvtár nem írható."
+msgstr "A fájl nem olvasható."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
@@ -3182,6 +3206,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,14 +3821,6 @@ 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"
@@ -3819,7 +3838,7 @@ msgid ""
 "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"
@@ -3831,7 +3850,20 @@ 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"
@@ -3840,21 +3872,51 @@ msgstr "A SASL hitelesítés meghiúsult"
 msgid "SASL error: %s"
 msgstr "SASL hiba: %s"
 
-#, fuzzy
+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 beállítás sikertelen"
+msgstr "A felhasználónév kanonizálása sikertelen"
 
-#, fuzzy
 msgid "Unable to canonicalize password"
-msgstr "Nem nyitható meg figyelőport."
+msgstr "A jelszó kanonizálása sikertelen"
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "Érvénytelen hívás a kiszolgálótól"
+msgstr "Rosszindulatú hívás a kiszolgálótól"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól"
+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."
@@ -3907,6 +3969,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"
 
@@ -3921,10 +3984,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"
 
@@ -3956,9 +4023,8 @@ msgstr "Prioritás"
 msgid "Resource"
 msgstr "Erőforrás"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Frissítés"
+msgstr "Működési idő"
 
 msgid "Logged Off"
 msgstr "Kijelentkezett"
@@ -4142,12 +4208,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 "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."
 
@@ -4244,7 +4321,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"
 
@@ -4266,7 +4342,6 @@ msgstr "Címzett"
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#. 0
 msgid "None"
 msgstr "Nincs"
 
@@ -4280,14 +4355,18 @@ msgstr "Hangulatszöveg"
 msgid "Allow Buzz"
 msgstr "Csörgetés engedélyezése"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Középső név"
+msgstr "Hangulatnév"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Partnermegjegyzés"
+msgstr "Hangulatmegjegyzés"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Dal előadója"
 
@@ -4458,9 +4537,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"
 
@@ -4579,9 +4655,8 @@ msgstr "Válasszon erőforrást"
 msgid "Initiate Media"
 msgstr "Multimédiás kapcsolat indítása"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
+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."
@@ -4638,9 +4713,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Megfelelő felhasználó kiválasztása"
+msgstr "mood: Felhasználó aktuális hangulatának beállítása"
 
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
@@ -4718,18 +4792,17 @@ msgstr "XMPP üzenethiba"
 msgid "(Code %s)"
 msgstr "(%s kód)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Nem küldhető üzenet: az üzenet túl nagy."
+msgstr "Az üzenetben lévő egyéni hangulatjel túl nagy az elküldéshez."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Az XMPP adatfolyamfejléc hiányzik"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP verzióeltérés"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Az XMPP adatfolyam-azonosító hiányzik"
 
 msgid "XML Parse error"
 msgstr "XML elemzési hiba"
@@ -4808,32 +4881,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "arab"
+msgstr "Félő"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Megszégyenült"
+msgstr "Lenyűgözött"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Ragyogó"
+msgstr "Szerelmes"
 
-#. 1
 msgid "Angry"
 msgstr "Dühös"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Kitiltva"
+msgstr "Ideges"
 
 msgid "Anxious"
 msgstr "Nyugtalan"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Ezt küldi"
+msgstr "Izgatott"
 
 msgid "Ashamed"
 msgstr "Megszégyenült"
@@ -4841,287 +4908,232 @@ msgstr "Megszégyenült"
 msgid "Bored"
 msgstr "Unott"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Mentés"
+msgstr "Bátor"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Tartomány"
+msgstr "Nyugodt"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Csevegések"
+msgstr "Óvatos"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Félkövér"
+msgstr "Higgadt"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Ütközés"
+msgstr "Magabiztos"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Folytatás"
+msgstr "Zavart"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Partner"
+msgstr "Elmélkedő"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Kapcsolódva"
+msgstr "Elégedett"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Cég"
+msgstr "Bizonytalan"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Őrült"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Létrehozás"
+msgstr "Kreatív"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Ragyogó"
+msgstr "Kíváncsi"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Visszautasítva"
+msgstr "Lehangolt"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Törölve"
+msgstr "Depis"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Kapcsolat bontva."
+msgstr "Kiábrándult"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Undorodó"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Tiltva"
+msgstr "Rémült"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Leválasztott"
+msgstr "Megzavart"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Feszélyezett"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Nyugtalan"
+msgstr "Irigy"
 
-#. 2
 msgid "Excited"
 msgstr "Érdeklődő"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Ragyogó"
+msgstr "Flörtölős"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Utónév"
+msgstr "Frusztrált"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Hálás"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Lekérés…"
+msgstr "Szomorkodó"
 
-#. 3
 msgid "Grumpy"
 msgstr "Rosszkedvű"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Város"
+msgstr "Bűnös"
 
-#. 4
 msgid "Happy"
 msgstr "Boldog"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Reménykedő"
 
-#. 8
 msgid "Hot"
 msgstr "Forró"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Megalázkodó"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Megszégyenült"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Dühös"
+msgstr "Éhes"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Megbántott"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Elbűvölt"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Szerelmes"
+msgstr "Megijedt"
 
 msgid "In love"
 msgstr "Szerelmes"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "indonéz"
+msgstr "Ingerült"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Érdeklődési kör"
+msgstr "Érdeklődő"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Meghívva"
+msgstr "Részeg"
 
-#. 6
 msgid "Invincible"
 msgstr "Legyőzhetetlen"
 
 msgid "Jealous"
 msgstr "Féltékeny"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Majom"
+msgstr "Magányos"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Leghangosabb"
+msgstr "Elveszett"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Szerencsés"
 
-#, fuzzy
 msgid "Mean"
-msgstr "német"
+msgstr "Aljas"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Hangulat"
+msgstr "Kedvetlen"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Ideges"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Részletek"
+msgstr "Semleges"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Kilépett"
+msgstr "Megsértődött"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Felháborodott"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Lejátszás"
+msgstr "Játékos"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Hangos"
+msgstr "Büszke"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Valódi név"
+msgstr "Nyugodt"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Fogadott"
+msgstr "Megkönnyebbült"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Eltávolítás"
+msgstr "Bűnbánó"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Regisztráció"
+msgstr "Nyugtalan"
 
-#. 7
 msgid "Sad"
 msgstr "Szomorú"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Szarkasztikus"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Elégedett"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Ragyogó"
+msgstr "Komoly"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Tiltott"
+msgstr "Megdöbbent"
 
 msgid "Shy"
-msgstr ""
+msgstr "Félénk"
 
-#. 9
 msgid "Sick"
 msgstr "Beteg"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Álmos"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontán"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Sebesség"
+msgstr "Feszült"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Dal"
+msgstr "Erős"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Meglepett"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Hálás"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Szomjas"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Tűz"
+msgstr "Fáradt"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Aláhúzott"
+msgstr "Nem definiált"
 
 # fixme: valami ilyesmi...
-#, fuzzy
 msgid "Weak"
-msgstr "Lecsapás"
+msgstr "Gyenge"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Unott"
+msgstr "Aggódó"
 
 msgid "Set User Nickname"
 msgstr "Felhasználói becenév beállítása"
@@ -5398,9 +5410,9 @@ msgstr "E-mail cím…"
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Becenév beállítása."
+msgstr "Becenév beállítása %s számára."
 
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
@@ -5486,18 +5498,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"
 
@@ -5648,9 +5648,6 @@ msgstr "Évforduló"
 msgid "Work"
 msgstr "Munka"
 
-msgid "Job Title"
-msgstr "Beosztás"
-
 msgid "Company"
 msgstr "Cég"
 
@@ -5739,6 +5736,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"
 
@@ -5931,24 +5931,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."
 
-#. 5
-msgid "In Love"
-msgstr "Szerelmes"
-
-#. 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."
 
@@ -5961,8 +5943,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'."
@@ -5980,7 +5962,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"
 
@@ -5988,6 +5974,7 @@ msgid "Verify PIN"
 msgstr "PIN ellenőrzése"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Megjelenő név"
 
@@ -6014,10 +6001,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…"
@@ -6052,19 +6035,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"
@@ -6092,12 +6068,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."
@@ -6108,7 +6085,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"
 
@@ -6134,11 +6111,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")
@@ -6151,6 +6132,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."
@@ -6253,6 +6251,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"
 
@@ -6651,9 +6652,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"
 
@@ -6881,13 +6879,13 @@ msgstr "Kiszolgáló címe"
 msgid "Server port"
 msgstr "Kiszolgáló portja"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Váratlan válasz érkezett innen: %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 "
@@ -6906,115 +6904,162 @@ 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"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Hiba %s lekérésekor"
+
 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 "Cannot receive IM due to parental controls"
+msgstr "Nem fogadható üzenet a szülői felügyelet miatt"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nem küldhető SMS a feltételek elfogadása nélkül"
+
+msgid "Cannot send SMS"
+msgstr "Nem küldhető SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nem küldhető SMS ebbe az országba"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nem küldhető SMS ismeretlen országba"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Botfiókok nem kezdeményezhetnek azonnali üzenetküldést"
+
+msgid "Bot account cannot IM this user"
+msgstr "Botfiókok nem küldhetnek azonnali üzenetet a felhasználónak"
+
+msgid "Bot account reached IM limit"
+msgstr "A botfiók elérte az azonnali üzenetek korlátját"
+
+msgid "Bot account reached daily IM limit"
+msgstr "A botfiók elérte a napi azonnali üzenetek korlátját"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "A botfiók elérte a havi azonnali üzenetek korlátját"
+
+msgid "Unable to receive offline messages"
+msgstr "Nem lehet offline üzeneteket fogadni"
+
+msgid "Offline message store full"
+msgstr "Az offline üzenetek tárolója megtelt"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Gondolkozik"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Abbahagyja a gépelést"
+msgstr "Vásárol"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Kérdező ablak"
+msgstr "Kérdez"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Lapozás"
+msgstr "Eszik"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Játszik"
+msgstr "Filmet néz"
 
 msgid "Typing"
 msgstr "Gépel"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nem vagyok a munkahelyemen"
+msgstr "Munkában"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Fürdik"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "TV-t néz"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Lerakás"
+msgstr "Szórakozik"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Álmos"
+msgstr "Alszik"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "PDA-t használ"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "IM barátok"
+msgstr "Barátokkal találkozik"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "Telefonálok"
+msgstr "Telefonál"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Ismétlődő"
+msgstr "Szörfözik"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Keres a weben"
 
 msgid "At a party"
-msgstr ""
+msgstr "Bulin"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Kávézik"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Ikrek"
+msgstr "Játszik"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Webet böngész"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Dal"
+msgstr "Dohányzik"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Dolgozik"
+msgstr "Ír"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Dolgozik"
+msgstr "Iszik"
 
 msgid "Listening to music"
 msgstr "Zenét hallgat"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Küldés"
+msgstr "Tanul"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Érdeklődési kör"
+msgstr "Mellékhelyiségben"
 
 msgid "Received invalid data on connection with server"
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól"
@@ -7082,205 +7127,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nem küldhető SMS a feltételek elfogadása nélkül"
-
-msgid "Cannot send SMS"
-msgstr "Nem küldhető SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nem küldhető SMS ebbe az országba"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nem küldhető SMS ismeretlen országba"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Botfiókok nem kezdeményezhetnek azonnali üzenetküldést"
-
-msgid "Bot account cannot IM this user"
-msgstr "Botfiókok nem küldhetnek azonnali üzenetet a felhasználónak"
-
-msgid "Bot account reached IM limit"
-msgstr "A botfiók elérte az azonnali üzenetek korlátját"
-
-msgid "Bot account reached daily IM limit"
-msgstr "A botfiók elérte a napi azonnali üzenetek korlátját"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "A botfiók elérte a havi azonnali üzenetek korlátját"
-
-msgid "Unable to receive offline messages"
-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 ""
-"(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.)"
-
-#. Label
-msgid "Buddy Icon"
-msgstr "Partnerikon"
-
-msgid "Voice"
-msgstr "Hang"
-
-msgid "AIM Direct IM"
-msgstr "AIM közvetlen azonnali üzenetek"
-
-msgid "Get File"
-msgstr "Fájl letöltése"
-
-msgid "Games"
-msgstr "Játékok"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr "Kiegészítők"
-
-msgid "Send Buddy List"
-msgstr "Partnerlista küldése"
-
-msgid "ICQ Direct Connect"
-msgstr "ICQ közvetlen kapcsolat"
-
-msgid "AP User"
-msgstr "AP felhasználó"
-
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-msgid "Nihilist"
-msgstr "Nihilista"
-
-msgid "ICQ Server Relay"
-msgstr "ICQ közvetítő kiszolgáló"
-
-msgid "Old ICQ UTF8"
-msgstr "Régi ICQ UTF8"
-
-msgid "Trillian Encryption"
-msgstr "Trillian titkosítás"
-
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-msgid "Hiptop"
-msgstr "Hiptop"
-
-msgid "Security Enabled"
-msgstr "Biztonság engedélyezve"
-
-msgid "Video Chat"
-msgstr "Videócsevegés"
-
-msgid "iChat AV"
-msgstr "iChat AV"
-
-msgid "Live Video"
-msgstr "Élő videó"
-
-msgid "Camera"
-msgstr "Fényképezőgép"
-
-msgid "Screen Sharing"
-msgstr "Képernyőmegosztás"
-
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
@@ -7296,34 +7142,20 @@ msgstr "A weben"
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-mail"
+msgstr "Gonosz"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Foglalkozás"
+msgstr "Depresszió"
 
-#, fuzzy
 msgid "At home"
-msgstr "A névjegyem"
+msgstr "Otthon"
 
-#, fuzzy
 msgid "At work"
-msgstr "Hálózat"
+msgstr "Munkában"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Ebédelni mentem"
-
-msgid "IP Address"
-msgstr "IP cím"
-
-msgid "Warning Level"
-msgstr "Figyelmeztetési szint"
-
-msgid "Buddy Comment"
-msgstr "Partnermegjegyzés"
+msgstr "Ebédel"
 
 #, c-format
 msgid "Unable to connect to authentication server: %s"
@@ -7423,15 +7255,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 "
@@ -7442,6 +7265,9 @@ msgstr ""
 "következő indoklással:\n"
 "%s"
 
+msgid "No reason given."
+msgstr "Nincs ok megadva."
+
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
@@ -7560,79 +7386,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.]"
-
 #, 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"
 
@@ -7846,9 +7606,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Ebéd"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7881,9 +7640,8 @@ msgstr "AIM információk lekérése"
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Állapotüzenet lekérése"
+msgstr "X-állapotüzenet lekérése"
 
 msgid "End Direct IM Session"
 msgstr "A közvetlen kapcsolat befejezése"
@@ -7914,8 +7672,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"
@@ -7969,9 +7727,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"
 
@@ -8012,6 +7767,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vízöntő"
 
@@ -8294,6 +8118,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"
 
@@ -10063,6 +9891,9 @@ msgstr "Videokonferencia"
 msgid "Computer"
 msgstr "Számítógép"
 
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
 msgid "PDA"
 msgstr "PDA"
 
@@ -10216,9 +10047,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"
 
@@ -10234,18 +10062,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ó…"
 
@@ -10313,6 +10135,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"
@@ -10393,6 +10224,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"
 
@@ -10481,6 +10322,9 @@ msgstr "%s felajánlja egy %d fájlból álló csoport elküldését.\n"
 msgid "Write Error"
 msgstr "Írási hiba"
 
+msgid "IP Address"
+msgstr "IP cím"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
@@ -10522,6 +10366,9 @@ msgstr "Érdekes link 2"
 msgid "Cool Link 3"
 msgstr "Érdekes link 3"
 
+msgid "Member Since"
+msgstr "Tagság kezdete"
+
 msgid "Last Update"
 msgstr "Utolsó frissítés"
 
@@ -10777,6 +10624,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"
 
@@ -10843,9 +10694,8 @@ msgstr "Ne zavarjanak"
 msgid "Extended away"
 msgstr "Bővített távollét"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Fogadás"
+msgstr "Hangulat"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11016,12 +10866,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"
@@ -11145,6 +10989,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"
@@ -11392,13 +11240,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Ismeretlen csomóponttípus"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Válassza ki a hangulatát a listából."
+msgstr "Válassza ki a hangulatát a listából"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Álnév (elhagyható)"
+msgstr "Üzenet (elhagyható)"
 
 msgid "Edit User Mood"
 msgstr "Felhasználói hangulat szerkesztése"
@@ -11481,9 +11327,8 @@ msgstr "/Eszközök/_Beállítások"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Eszközök/_Rendszernapló"
+msgstr "/Eszközök/Ha_ngulat beállítása"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
@@ -11504,20 +11349,17 @@ msgstr "/_Súgó"
 msgid "/Help/Online _Help"
 msgstr "/Súgó/Online _súgó"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Partnerinformáció"
+msgstr "/Súgó/Build _információk"
 
 msgid "/Help/_Debug Window"
 msgstr "/Súgó/_Hibakereső ablak"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Kiszolgálóinformációk"
+msgstr "/Súgó/_Fejlesztői információk"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Személyes információk"
+msgstr "/Súgó/F_ordítóinformációk"
 
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
@@ -11746,9 +11588,8 @@ msgstr "<PurpleMain>/Fiókok/"
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Hangulat beállítása…"
+msgstr "Ha_ngulat beállítása…"
 
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
@@ -11870,9 +11711,8 @@ 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…"
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Társalgás/Információ lekérése"
+msgstr "/Társalgás/_Figyelem kérése"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele…"
@@ -11921,10 +11761,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"
@@ -11955,9 +11795,8 @@ msgstr "/Társalgás/Média/Hang\\/videóhívás"
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése…"
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Társalgás/Információ lekérése"
+msgstr "/Társalgás/Figyelem kérése"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Társalgás/Partnerfigyelmeztetés felvétele…"
@@ -11996,10 +11835,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…"
@@ -12023,13 +11862,11 @@ msgstr "_Küldés"
 msgid "0 people in room"
 msgstr "0 személy tartózkodik a szobában"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Ezen lap bezárása"
+msgstr "Keresősáv bezárása"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Keresés"
+msgstr "Keresés:"
 
 #, c-format
 msgid "%d person in room"
@@ -12193,6 +12030,9 @@ msgstr "afrikaans"
 msgid "Arabic"
 msgstr "arab"
 
+msgid "Assamese"
+msgstr "Asszámi"
+
 msgid "Belarusian Latin"
 msgstr "Fehérorosz latin"
 
@@ -12202,6 +12042,9 @@ msgstr "bolgár"
 msgid "Bengali"
 msgstr "bengáli"
 
+msgid "Bengali-India"
+msgstr "Indiai bengáli"
+
 msgid "Bosnian"
 msgstr "bosnyák"
 
@@ -12316,12 +12159,14 @@ msgstr "lao"
 msgid "Macedonian"
 msgstr "macedón"
 
+msgid "Malayalam"
+msgstr "Malajálam"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "gudzsaráti"
+msgstr "Maráthi"
 
 msgid "Malay"
 msgstr "Maláj"
@@ -12341,9 +12186,8 @@ msgstr "Norvég Nynorsk"
 msgid "Occitan"
 msgstr "Okcitán"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Orija"
 
 msgid "Punjabi"
 msgstr "Pandzsábi"
@@ -12426,7 +12270,7 @@ msgstr "amhara"
 msgid "Lithuanian"
 msgstr "litván"
 
-#, fuzzy, c-format
+#, 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 "
@@ -12435,15 +12279,13 @@ msgid ""
 "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 ""
@@ -12452,8 +12294,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12463,25 +12309,25 @@ msgid ""
 "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 "About %s"
 msgstr "A %s névjegye"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Partnerinformáció"
+msgstr "Build információk"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Partnerinformáció"
+msgstr "%s build információi"
 
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők"
@@ -12495,9 +12341,9 @@ msgstr "Visszavonult fejlesztők"
 msgid "Retired Crazy Patch Writers"
 msgstr "Visszavonult őrült patch szerzők"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Kiszolgálóinformációk"
+msgstr "%s fejlesztői információi"
 
 msgid "Current Translators"
 msgstr "Jelenlegi fordítók"
@@ -12505,9 +12351,9 @@ msgstr "Jelenlegi fordítók"
 msgid "Past Translators"
 msgstr "Korábbi fordítók"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "További információk"
+msgstr "%s fordítóinformációi"
 
 msgid "_Name"
 msgstr "_Név"
@@ -12626,7 +12472,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"
@@ -12914,9 +12760,8 @@ msgstr "Kép beszúrása"
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Küldés gomb"
+msgstr "Figyelemkérés küldése"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Félkövér</b>"
@@ -12964,7 +12809,7 @@ msgid "_Smile!"
 msgstr "M_osolyt!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Figyelem!"
 
 msgid "Log Deletion Failed"
 msgstr "Napló törlése meghiúsult"
@@ -13097,11 +12942,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."
@@ -13430,7 +13275,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"
@@ -13541,7 +13386,7 @@ msgid "Konqueror"
 msgstr "Konqueror"
 
 msgid "Desktop Default"
-msgstr "Munkaasztal alapértelmezése"
+msgstr "Asztali környezet alapértelmezése"
 
 msgid "GNOME Default"
 msgstr "GNOME alapértelmezés"
@@ -13901,10 +13746,6 @@ msgstr "Billentyűparancs szövege"
 msgid "Custom Smiley Manager"
 msgstr "Egyénihangulatjel-kezelő"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktiválás szükséges"
-
 msgid "Select Buddy Icon"
 msgstr "Válasszon partnerikont"
 
@@ -14012,6 +13853,10 @@ msgstr ""
 "<b>Fájlméret:</b> %s\n"
 "<b>Képméret:</b> %dx%d"
 
+#. Label
+msgid "Buddy Icon"
+msgstr "Partnerikon"
+
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
@@ -14047,9 +13892,8 @@ msgstr "H_ang lejátszása"
 msgid "_Save File"
 msgstr "Fájl m_entése"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Biztos, hogy törölni akarja %s fiókot?"
+msgstr "Biztos, hogy törölni akarja?"
 
 msgid "Select color"
 msgstr "Szín kiválasztása"
@@ -14945,6 +14789,9 @@ msgstr "Operátor"
 msgid "Half Operator"
 msgstr "Féloperátor"
 
+msgid "Voice"
+msgstr "Hang"
+
 msgid "Authorization dialog"
 msgstr "Hitelesítési ablak"
 
@@ -15048,8 +14895,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…"
@@ -15145,7 +15001,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"
@@ -15249,141 +15105,153 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Nyers XMPP mondatok küldése és fogadása."
 
 #. *  description
-#, fuzzy
 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."
 
-#~ msgid "Error creating conference."
-#~ msgstr "Hiba a konferencia létrehozásakor."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Nem köthető a foglalat a porthoz: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Nem lehet figyelni a foglalaton: %s"
-
-#~ 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 "%s just sent you a Nudge!"
-#~ msgstr "%s megbökte!"
-
-#~ 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"
+#. $(^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"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN protokollbővítmény"
+#. 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 "%s is not a valid group."
-#~ msgstr "%s érvénytelen csoport."
+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."
 
-#~ msgid "Unknown error."
-#~ msgstr "Ismeretlen hiba."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin fájlok és dll-ek"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s ezen: %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Start Menü bejegyzés létrehozása a Pidginhez"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Nem lehet felhasználót felvenni ehhez: %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Parancsikon létrehozása a Pidginhez az asztalon"
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Nem lehet letiltani a felhasználót ezen: %s (%s)"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Hibakeresési szimbólumok (összeomlások bejelentéséhez)"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Nem lehet engedélyezni a felhasználót ezen: %s (%s)"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Asztal"
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "%s nem adható hozzá, mert a partnerlista tele van."
+#. $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."
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s érvénytelen passport fiók."
+#. $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."
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "A szolgáltatás átmenetileg nem érhető el."
+#. $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."
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Nem lehet átnevezni a csoportot"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ futtató környezet (szükséges, ha nincs jelen)"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Nem lehet törölni a csoportot"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Fordítások"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s felvette Önt a partnerlistájára."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Tovább >"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s eltávolította Önt a partnerlistájáról."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin azonnali üzenő kliens (szükséges)"
 
-#~ 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"
+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?"
 
-#~ 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/>"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Parancsikonok"
 
-#~ 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>"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Parancsikonok a Pidgin indításához"
 
-#~ 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>"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Helyesírás-ellenőrzés támogatása"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Hibakeresési információk"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Start Menü"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Ismeretlen fájltípus\n"
-#~ "\n"
-#~ "Alapértelmezett PNG használata."
+#. 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 ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hiba a kép mentése közben\n"
-#~ "\n"
-#~ "%s"
+msgid "The installer is already running."
+msgstr "A telepítő már fut."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Nem sikerült megnyitni a(z) „%s” fájlt: %s"
+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."
 
-#~ 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"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI kezelők"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "<iq/> mondat beszúrása."
+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. "
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "<presence/> mondat beszúrása."
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "A Pidgin weboldalának felkeresése"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "<message/> mondat beszúrása."
+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 dd2d649a7b..2e037d9893 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "Նոր նամակի ծանուցումներ"
 
@@ -743,7 +755,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1198,6 +1210,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1289,7 +1304,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1477,7 +1491,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1570,6 +1584,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 ""
 
@@ -1587,7 +1607,9 @@ 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."
@@ -1807,7 +1829,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -3001,6 +3022,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 ""
 
@@ -3564,12 +3588,6 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3598,6 +3616,15 @@ 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 ""
 
@@ -3605,6 +3632,37 @@ msgstr ""
 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 ""
 
@@ -3668,6 +3726,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3682,10 +3741,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3897,12 +3960,21 @@ 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 ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3999,7 +4071,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4021,7 +4092,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4041,6 +4111,12 @@ msgstr ""
 msgid "Mood Comment"
 msgstr ""
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4211,9 +4287,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4544,7 +4617,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4627,7 +4699,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4643,21 +4714,18 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 msgid "Grumpy"
 msgstr ""
 
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr ""
 
@@ -4691,7 +4759,6 @@ msgstr ""
 msgid "Intoxicated"
 msgstr ""
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4745,7 +4812,6 @@ msgstr ""
 msgid "Restless"
 msgstr ""
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4764,11 +4830,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5152,18 +5216,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 ""
 
@@ -5309,9 +5361,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5395,6 +5444,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5563,24 +5615,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 ""
 
@@ -5612,7 +5646,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 ""
 
@@ -5620,6 +5658,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5647,10 +5686,6 @@ msgstr ""
 msgid "About"
 msgstr "Հաշիվներ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5682,18 +5717,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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
@@ -5723,10 +5754,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."
@@ -5738,7 +5769,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5764,10 +5795,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
@@ -5781,6 +5816,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 ""
@@ -5884,6 +5936,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -6267,9 +6322,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6508,12 +6560,73 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 ""
 
@@ -6662,116 +6775,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 ""
-
-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 ""
-
-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 ""
-
 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 "
@@ -7084,28 +7087,9 @@ 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 ""
 
@@ -7481,6 +7465,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7763,6 +7816,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -9552,9 +9609,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9570,18 +9624,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 ""
 
@@ -9641,6 +9689,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 ""
@@ -9707,6 +9761,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 ""
 
@@ -10063,6 +10125,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 ""
 
@@ -10293,12 +10359,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 ""
@@ -11421,6 +11481,9 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11430,6 +11493,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11544,6 +11610,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Malayalam"
+msgstr ""
+
 msgid "Mongolian"
 msgstr ""
 
@@ -11658,8 +11727,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12167,14 +12236,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?"
@@ -12261,10 +12330,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
@@ -13053,9 +13122,6 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -14133,7 +14199,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..."
@@ -14328,3 +14403,127 @@ 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."
+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
+#, 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 025a950352..18e88e0467 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -802,7 +815,7 @@ msgstr "Stop"
 msgid "Waiting for transfer to begin"
 msgstr "Menunggu transfer untuk mulai"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Dibatalkan"
 
 msgid "Failed"
@@ -1287,6 +1300,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 +1397,6 @@ msgid "Saved Statuses"
 msgstr "Status Penyimpanan"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Judul"
 
@@ -1577,7 +1593,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1675,6 +1691,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"
 
@@ -1695,9 +1719,10 @@ 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."
@@ -1941,7 +1966,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"
 
@@ -3222,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 "Nama Depan"
 
@@ -3841,16 +3868,6 @@ 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 "
@@ -3885,6 +3902,20 @@ 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"
 
@@ -3893,6 +3924,42 @@ msgid "SASL error: %s"
 msgstr "kesalahan SASL"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Kondisi input tidak valid"
+
+#, 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"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Pengkodean Tidak Didukung"
+
+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"
 
@@ -3967,6 +4034,7 @@ msgstr "Daerah"
 msgid "Postal Code"
 msgstr "Kode Pos"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Negara"
 
@@ -3981,10 +4049,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"
 
@@ -4210,12 +4282,26 @@ msgid "Roles:"
 msgstr "Peranan"
 
 #, 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."
+
+#, 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."
 
@@ -4315,7 +4401,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Tidak Diijinkan"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4337,7 +4422,6 @@ msgstr "Kepada"
 msgid "None (To pending)"
 msgstr "Tidak ada (Ke pending)"
 
-#. 0
 msgid "None"
 msgstr "Tidak Ada"
 
@@ -4359,6 +4443,12 @@ msgstr "Nama Tengah"
 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"
 
@@ -4529,9 +4619,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"
 
@@ -4891,7 +4978,6 @@ msgstr "Malu"
 msgid "Amorous"
 msgstr "Berjaya"
 
-#. 1
 msgid "Angry"
 msgstr "Marah"
 
@@ -4989,7 +5075,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Tidak Sabar Lagi"
 
-#. 2
 msgid "Excited"
 msgstr "Bersemangant"
 
@@ -5008,7 +5093,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Mengambil..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Kelompok"
@@ -5017,14 +5101,12 @@ msgstr "Kelompok"
 msgid "Guilty"
 msgstr "Kota"
 
-#. 4
 msgid "Happy"
 msgstr "Senang"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5065,7 +5147,6 @@ msgstr "Minat"
 msgid "Intoxicated"
 msgstr "Undang"
 
-#. 6
 msgid "Invincible"
 msgstr "Tak Terkalahkan"
 
@@ -5129,7 +5210,6 @@ msgstr "Hilangkan"
 msgid "Restless"
 msgstr "Mendaftar"
 
-#. 7
 msgid "Sad"
 msgstr "Sedih"
 
@@ -5150,12 +5230,10 @@ msgstr "Diblokir"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nama Panggilan"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Mengantuk"
@@ -5567,20 +5645,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"
@@ -5733,9 +5797,6 @@ msgstr "Ulang Tahun"
 msgid "Work"
 msgstr "Pekerjaan"
 
-msgid "Job Title"
-msgstr "Jabatan"
-
 msgid "Company"
 msgstr "Perusahaan"
 
@@ -5824,6 +5885,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"
 
@@ -6022,28 +6087,6 @@ msgstr "Apakah anda ingin menambahkan teman ini ke daftar teman anda?"
 msgid "The username specified is invalid."
 msgstr "Nama layar yang ditentukan tidak valid."
 
-#. 5
-msgid "In Love"
-msgstr "Jatuh Cinta"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Mood Anda Sekarang"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
@@ -6080,7 +6123,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"
@@ -6089,6 +6136,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nama Keluarga"
@@ -6119,11 +6167,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..."
@@ -6167,7 +6210,7 @@ msgid "Connecting..."
 msgstr "Menyambungkan"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 #, fuzzy
@@ -6175,14 +6218,9 @@ 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"
@@ -6211,10 +6249,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
@@ -6228,7 +6266,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Keamanan Diaktifkan"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Masukkan kata sandi"
@@ -6262,12 +6300,17 @@ 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")
@@ -6282,6 +6325,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 ""
@@ -6401,6 +6466,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Jatuh Cinta"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Kirim"
@@ -6806,9 +6874,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"
 
@@ -6881,8 +6946,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)."
@@ -7070,6 +7135,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Kesalahan dalam memohon token login"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Tidak dapat menyambung"
@@ -7078,6 +7147,67 @@ msgstr "Tidak dapat menyambung"
 msgid "Invalid chat room name"
 msgstr "Nama Kamar Tidak Valid"
 
+msgid "Invalid error"
+msgstr "Kesalahan tidak valid"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Tidak dapat mengirim file"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Tidak dapat mengirim direktori."
+
+#. 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 "Tidak dapat mengirim pesan."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Pesan Offlinee"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7242,120 +7372,6 @@ msgstr ""
 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)"
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Tidak dapat mengirim file"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Tidak dapat mengirim direktori."
-
-#. 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 "Tidak dapat mengirim pesan."
-
-#, fuzzy
-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 "
@@ -7718,29 +7734,10 @@ 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"
 
@@ -8177,6 +8174,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8498,6 +8564,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"
@@ -9087,8 +9158,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"
@@ -10450,9 +10521,6 @@ msgstr "ID Yahoo!"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Protokol Plugin Yahoo"
 
-msgid "Pager server"
-msgstr "Server Penyeranta"
-
 msgid "Pager port"
 msgstr "Port Penyeranta"
 
@@ -10468,18 +10536,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!"
@@ -10552,6 +10614,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"
@@ -10638,6 +10709,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"
 
@@ -11020,6 +11102,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"
 
@@ -11260,12 +11346,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"
@@ -12491,6 +12571,10 @@ msgstr "Bahasa Afrika"
 msgid "Arabic"
 msgstr "Arab"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Malu"
+
 msgid "Belarusian Latin"
 msgstr "Latin Belorusia"
 
@@ -12500,6 +12584,10 @@ msgstr "Bulgaria"
 msgid "Bengali"
 msgstr "Bengal"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengal"
+
 msgid "Bosnian"
 msgstr "Bosnia"
 
@@ -12618,6 +12706,10 @@ msgid "Macedonian"
 msgstr "Makedonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Pria"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonia"
 
@@ -12737,8 +12829,8 @@ msgid ""
 "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>"
+"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 "
@@ -13302,16 +13394,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?"
 
@@ -13418,10 +13510,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
@@ -14283,10 +14375,6 @@ msgid "Custom Smiley Manager"
 msgstr "Manajer Sertifikat"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Disyaratkan Pendaftaran"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Pilih Teman"
 
@@ -15486,8 +15574,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..."
@@ -15700,6 +15800,205 @@ msgstr "Kirim dan terima bait-bait XMPP mentah."
 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."
+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 ""
+
+#, 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"
@@ -15866,9 +16165,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..."
@@ -16473,7 +16769,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."
@@ -16535,8 +16831,8 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ "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"
diff --git a/po/it.po b/po/it.po
index e6dcf1571d..71e5350e19 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2009-08-29 09:39+0100\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -635,9 +648,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 +660,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 +808,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 +1248,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 +1277,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 +1374,6 @@ msgid "Saved Statuses"
 msgstr "Messaggi di stato salvati"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titolo"
 
@@ -1540,10 +1553,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,7 +1580,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Non connesso"
 
@@ -1661,6 +1674,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"
 
@@ -1679,9 +1698,13 @@ 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."
 msgstr ""
@@ -1914,15 +1937,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"
 
@@ -1964,9 +1986,8 @@ 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"
 
-#, fuzzy
 msgid "File is not readable."
-msgstr "La directory non è scrivibile."
+msgstr "Il file non è leggibile."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
@@ -2243,15 +2264,12 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Si è verificato un errore irreversibile di Farsight2."
 
-#, 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"
 
-#, fuzzy
 msgid "Conference error"
 msgstr "Errore nella conferenza"
 
@@ -3212,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"
 
@@ -3821,13 +3842,6 @@ 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 "
@@ -3858,7 +3872,21 @@ 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"
@@ -3867,21 +3895,52 @@ msgstr "Autenticazione SASL fallita"
 msgid "SASL error: %s"
 msgstr "Errore SASL: %s"
 
-#, fuzzy
+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 configurare"
+msgstr "Impossibile rendere il nome utente in forma canonica"
 
-#, fuzzy
 msgid "Unable to canonicalize password"
-msgstr "Impossibile aprire una porta in ascolto."
+msgstr "Impossibile rendere la password in forma canonica"
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "Challenge non valido dal server"
+msgstr "Challenge maligna da parte del server"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "È stata ricevuta una risposta HTTP inattesa da parte del 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."
@@ -3934,6 +3993,7 @@ msgstr "Regione"
 msgid "Postal Code"
 msgstr "Codice postale"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Paese"
 
@@ -3948,10 +4008,14 @@ msgstr "Organizzazione"
 msgid "Organization Unit"
 msgstr "Ufficio"
 
+msgid "Job Title"
+msgstr "Impiego"
+
 msgid "Role"
 msgstr "Ruolo"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Compleanno"
 
@@ -3983,9 +4047,8 @@ msgstr "Priorità"
 msgid "Resource"
 msgstr "Risorsa"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Aggiorna"
+msgstr "Tempo di attività"
 
 msgid "Logged Off"
 msgstr "Si è disconnesso"
@@ -4171,12 +4234,23 @@ msgstr "Nessun utente trovato"
 msgid "Roles:"
 msgstr "Ruoli:"
 
+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 "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."
 
@@ -4273,7 +4347,6 @@ msgstr "Il server non supporta il blocco"
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Umore"
 
@@ -4295,7 +4368,6 @@ msgstr "Verso"
 msgid "None (To pending)"
 msgstr "Nessuna (In attesa di \"Verso\")"
 
-#. 0
 msgid "None"
 msgstr "Nessuno"
 
@@ -4309,14 +4381,18 @@ msgstr "Messaggio di umore"
 msgid "Allow Buzz"
 msgstr "Permetti i buzz"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Secondo nome"
+msgstr "Nome per l'umore"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Commento per il contatto"
+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"
 
@@ -4487,9 +4563,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"
 
@@ -4607,9 +4680,8 @@ msgstr "Scegli una risorsa"
 msgid "Initiate Media"
 msgstr "Avvia sessione multimediale"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Questo protocollo non supporta le stanze di discussione."
+msgstr "L'account non supporta PEP, impossibile impostare l'umore"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una stanza di discussione."
@@ -4617,9 +4689,8 @@ 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."
@@ -4667,9 +4738,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Scegliere l'utente corretto"
+msgstr "mood: imposta l'umore per l'utente"
 
 msgid "Extended Away"
 msgstr "Assente per molto"
@@ -4749,18 +4819,19 @@ msgstr "Errore messaggio XMPP"
 msgid "(Code %s)"
 msgstr " (Codice %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Impossibile inviare il messaggio: il messaggio è troppo grande."
+msgstr ""
+"Uno smiley personalizzato all'interno del messaggio è troppo grande per "
+"essere inviato."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Header dello stream XMPP mancante"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Versione XMPP non coincidente"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "ID dello stream XMPP mancante"
 
 msgid "XML Parse error"
 msgstr "Errore di parsing XML"
@@ -4838,32 +4909,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabo"
+msgstr "Spaventato"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Vergognoso"
+msgstr "Stupito"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorioso"
+msgstr "Amoroso"
 
-#. 1
 msgid "Angry"
 msgstr "Arrabbiato"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Cacciato"
+msgstr "Infastidito"
 
 msgid "Anxious"
 msgstr "Ansioso"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Testo inviato"
+msgstr "Eccitato"
 
 msgid "Ashamed"
 msgstr "Vergognoso"
@@ -4871,289 +4936,231 @@ msgstr "Vergognoso"
 msgid "Bored"
 msgstr "Annoiato"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Salva"
+msgstr "Coraggioso"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Dominio"
+msgstr "Calmo"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chat"
+msgstr "Cauto"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Grassetto"
+msgstr "Freddo"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflitto"
+msgstr "Confidente"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Continua"
+msgstr "Confuso"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contatto"
+msgstr "Contemplativo"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Connesso"
+msgstr "Soddisfatto"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Compagnia"
+msgstr "Nervoso"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Pazzo"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Crea"
+msgstr "Creativo"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorioso"
+msgstr "Curioso"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Rifiuta"
+msgstr "Demoralizzato"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Elimina"
+msgstr "Depresso"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Disconnesso."
+msgstr "Deluso"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Disgustato"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "_Disabilita"
+msgstr "Sgomento"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Distaccato"
+msgstr "Distratto"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Imbarazzato"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Ansioso"
+msgstr "Invidioso"
 
-#. 2
 msgid "Excited"
 msgstr "Eccitato"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorioso"
+msgstr "Civettuolo"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Nome"
+msgstr "Frustrato"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Grato"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Scaricamento in corso..."
+msgstr "In lutto"
 
-#. 3
-#, fuzzy
 msgid "Grumpy"
-msgstr "Gruppo"
+msgstr "Stizzito"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Città"
+msgstr "Colpevole"
 
-#. 4
 msgid "Happy"
 msgstr "Felice"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Pieno di speranza"
 
-#. 8
-#, fuzzy
 msgid "Hot"
-msgstr "_Host:"
+msgstr "Caldo"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Umile"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Umiliato"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Arrabbiato"
+msgstr "Affamato"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Ferito"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impressionato"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Innamorato"
+msgstr "Incantato"
 
 msgid "In love"
 msgstr "Innamorato"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesiano"
+msgstr "Indignato"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interessi"
+msgstr "Interessato"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Invita"
+msgstr "Intossicato"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincibile"
 
 msgid "Jealous"
 msgstr "Geloso"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Scimmia"
+msgstr "Solitario"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Altissimo"
+msgstr "Perso"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Fortunato"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Tedesco"
+msgstr "Avaro"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Umore"
+msgstr "Lunatico"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervoso"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Dettaglio"
+msgstr "Neutrale"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Non connesso"
+msgstr "Offeso"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Indignato"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Riproduci"
+msgstr "Giocoso"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Alto"
+msgstr "Fiero"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Vero nome"
+msgstr "Rilassato"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Ricevuti"
+msgstr "Sollevato"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Rimuovi"
+msgstr "Pieno di rimorsi"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Iscrizione"
+msgstr "Irrequieto"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarcastico"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Soddisfatto"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorioso"
+msgstr "Serio"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Bloccato"
+msgstr "Shoccato"
 
 msgid "Shy"
-msgstr ""
+msgstr "Timido"
 
-#. 9
-#, fuzzy
 msgid "Sick"
-msgstr "Nickname"
+msgstr "Malato"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Assonnato"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontaneo"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Velocità"
+msgstr "Stressato"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Canzone"
+msgstr "Forte"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Sorpreso"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Riconoscente"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Assetato"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fuoco"
+msgstr "Stanco"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Sottolineato"
+msgstr "Non definito"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Picchia"
+msgstr "Debole"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Annoiato"
+msgstr "Preoccupato"
 
 msgid "Set User Nickname"
 msgstr "Imposta il nickname"
@@ -5431,9 +5438,9 @@ msgstr "Indirizzo email..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Il tuo nuovo alias MSN è troppo lungo."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Imposta un alias."
+msgstr "Imposta un alias per %s."
 
 msgid "Set your friendly name."
 msgstr "Imposta un alias."
@@ -5519,18 +5526,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"
 
@@ -5568,7 +5563,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."
@@ -5679,9 +5674,6 @@ msgstr "Anniversario"
 msgid "Work"
 msgstr "Lavoro"
 
-msgid "Job Title"
-msgstr "Impiego"
-
 msgid "Company"
 msgstr "Compagnia"
 
@@ -5770,6 +5762,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"
 
@@ -5794,9 +5789,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."
@@ -5972,55 +5966,30 @@ msgstr "Vuoi cancellare questo contatto anche dalla tua rubrica?"
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."
 
-#. 5
-msgid "In Love"
-msgstr "Innamorato"
-
-#. 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"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Sono momentaneamente assente"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "La chiave SecurID immessa non è valida"
+msgstr "Il PIN immesso non è valido."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "La chiave SecurID immessa non è valida"
+msgstr "Il PIN immesso ha una lunghezza non valida [4-10]."
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
+msgstr "Il PIN non è valido. Dovrebbe essere composto soltanto da cifre [0-9]."
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "Le nuove password non coincidono."
+msgstr "I due PIN immessi non corrispondono."
 
-#, fuzzy
 msgid "The name you entered is invalid."
-msgstr "La chiave SecurID immessa non è valida"
+msgstr "Il nome immesso non è valido."
 
 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")
@@ -6029,352 +5998,332 @@ 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!"
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
-"Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
-"desideri collegarti."
+"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 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..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "La chiave SecurID immessa non è valida"
+msgid "The Display Name you entered is invalid."
+msgstr "Il nome immesso non è valido."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "La chiave SecurID immessa non è valida"
+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 ""
+msgstr "Paese selezionato non valido. Riprova più tardi."
 
-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 "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..."
 
-#, fuzzy
 msgid "Loading menu..."
-msgstr "Login in corso"
+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..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s ti ha inviato un invito alla chat vocale. Questa caratteristica non è "
-"ancora supportata."
+"%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"
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "Si è verificato un errore di certificato sconosciuto."
+msgstr "Si è verificato un errore interno al server MXit."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "Errore SASL: %s"
+msgstr "Errore di login: %s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Errore SASL: %s"
+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 ""
+msgstr "Si è verificato un errore di connessione a MXit. (read stage 0x06)"
+
+msgid "In Love"
+msgstr "Innamorato"
 
-#, 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"
@@ -6753,9 +6702,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"
 
@@ -6990,9 +6936,9 @@ msgstr "Indirizzo del server"
 msgid "Server port"
 msgstr "Porta del server"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "È stata ricevuta una risposta inattesa da parte di %s"
+msgstr "È stata ricevuta una risposta inattesa da parte di %s: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -7015,115 +6961,163 @@ 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 "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 "Thinking"
+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"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Smette di scrivere"
+msgstr "Shopping"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Finestra di richiesta"
+msgstr "Discutendo"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Numero del pager"
+msgstr "Mangiando"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Giocando"
+msgstr "Guardando un film"
 
 msgid "Typing"
 msgstr "Sta scrivendo"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Non in ufficio"
+msgstr "In ufficio"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Facendo un bagno"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Guardando la TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Riaggancia"
+msgstr "Divertendosi"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Assonnato"
+msgstr "Dormendo"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Usando un palmare"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Amici MI"
+msgstr "In compagnia di amici"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Al telefono"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Ricorrente"
+msgstr "Navigando"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Cellulare"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Cercando sul web"
 
 msgid "At a party"
-msgstr ""
+msgstr "Ad una festa"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Prendendo un caffè"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Gemelli"
+msgstr "Giocando"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Navigando sul web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Canzone"
+msgstr "Fumando"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Al lavoro"
+msgstr "Scrivendo"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Al lavoro"
+msgstr "Bevendo"
 
 msgid "Listening to music"
 msgstr "Sta ascoltando musica"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Invio in corso"
+msgstr "Studiando"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interessi"
+msgstr "In bagno"
 
 msgid "Received invalid data on connection with server"
 msgstr "Ricevuti dati non validi durante la connessione con il server"
@@ -7192,120 +7186,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 "
@@ -7343,7 +7223,7 @@ msgid "Games"
 msgstr "Giochi"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "Extra ICQ"
 
 msgid "Add-Ins"
 msgstr "Add-in"
@@ -7411,23 +7291,18 @@ msgstr "Rendi visibile il tuo stato sul web"
 msgid "Invisible"
 msgstr "Invisibile"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Email"
+msgstr "Malvagio"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Professione"
+msgstr "Depressione"
 
-#, fuzzy
 msgid "At home"
-msgstr "Informazioni su di me"
+msgstr "A casa"
 
-#, fuzzy
 msgid "At work"
-msgstr "Rete"
+msgstr "Al lavoro"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "A pranzo"
 
@@ -7499,14 +7374,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
@@ -7515,14 +7390,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"
@@ -7670,29 +7545,10 @@ 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"
 
@@ -7960,9 +7816,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link all'iTunes Music Store"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Pranzo"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7996,9 +7851,8 @@ msgstr "Ottieni info AIM"
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Ottieni messaggio di stato"
+msgstr "Ottieni il messaggio x-status"
 
 msgid "End Direct IM Session"
 msgstr "Termina la sessione di messaggi immediati diretti"
@@ -8129,6 +7983,86 @@ 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 ""
+
 msgid "Aquarius"
 msgstr "Acquario"
 
@@ -8411,6 +8345,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"
 
@@ -8981,8 +8919,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"
@@ -10321,9 +10259,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"
 
@@ -10339,18 +10274,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..."
 
@@ -10420,6 +10350,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"
@@ -10500,6 +10439,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"
 
@@ -10562,12 +10511,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
@@ -10855,8 +10806,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"
@@ -10882,6 +10833,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"
 
@@ -10948,9 +10903,8 @@ msgstr "Non disturbare"
 msgid "Extended away"
 msgstr "Assente per molto"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Ricezione in corso"
+msgstr "Sensazione"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11113,6 +11067,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"
@@ -11120,12 +11076,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"
@@ -11494,13 +11444,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tipo di nodo sconosciuto"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Scegli il tuo umore dalla lista."
+msgstr "Scegli il tuo umore dalla lista"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (opzionale)"
+msgstr "Messaggio (opzionale)"
 
 msgid "Edit User Mood"
 msgstr "Modifica l'umore dell'utente"
@@ -11583,9 +11531,8 @@ msgstr "/Strumenti/Pr_eferenze"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Strumenti/_Log di sistema"
+msgstr "/Strumenti/Imposta _umore"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
@@ -11606,20 +11553,17 @@ msgstr "/_Aiuto"
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Aiuto online"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informazioni sul contatto"
+msgstr "/Aiuto/Informazioni sulla _compilazione"
 
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _debug"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informazioni sul server"
+msgstr "/Aiuto/Informazioni sugli s_viluppatori"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Informazioni personali"
+msgstr "/Aiuto/Informazioni sui _traduttori"
 
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
@@ -11849,9 +11793,8 @@ msgstr "<PurpleMain>/Account/"
 msgid "_Edit Account"
 msgstr "_Modifica account"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Scegli l'umore..."
+msgstr "Imposta l'u_more..."
 
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
@@ -11974,9 +11917,8 @@ msgstr "/Conversazione/Media/_Chiamata audio\\/video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversazione/Info"
+msgstr "/Conversazione/Richiedi _attenzione"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _allarme..."
@@ -12059,9 +12001,8 @@ msgstr "/Conversazione/Media/Chiamata audio\\/video"
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversazione/Info"
+msgstr "/Conversazione/Richiedi attenzione"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un allarme..."
@@ -12127,13 +12068,11 @@ msgstr "_Invia"
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Chiudi questa scheda"
+msgstr "Chiudi la barra di ricerca"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Trova"
+msgstr "Trova:"
 
 #, c-format
 msgid "%d person in room"
@@ -12296,6 +12235,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabo"
 
+msgid "Assamese"
+msgstr "Assamese"
+
 msgid "Belarusian Latin"
 msgstr "Bielorusso latino"
 
@@ -12305,6 +12247,9 @@ msgstr "Bulgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Bosniaco"
 
@@ -12419,16 +12364,17 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macedone"
 
+msgid "Malayalam"
+msgstr "Malayam"
+
 msgid "Mongolian"
 msgstr "Mongolo"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
+msgstr "Marathi"
 
-#, fuzzy
 msgid "Malay"
-msgstr "Maschile"
+msgstr "Malese"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
@@ -12445,9 +12391,8 @@ msgstr "Norvegese Nynorsk"
 msgid "Occitan"
 msgstr "Occitano"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12503,9 +12448,8 @@ msgstr "Thailandese"
 msgid "Turkish"
 msgstr "Turco"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "Armeno"
+msgstr "Ucraino"
 
 msgid "Urdu"
 msgstr "Urdu"
@@ -12531,24 +12475,22 @@ msgstr "Amarico"
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12557,8 +12499,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12568,26 +12513,25 @@ msgid ""
 "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 "About %s"
 msgstr "Informazioni su %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informazioni sul contatto"
+msgstr "Informazioni sulla compilazione"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informazioni sul contatto"
+msgstr "Informazioni sulla compilazione di %s"
 
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
@@ -12596,14 +12540,14 @@ 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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informazioni sul server"
+msgstr "Informazioni sugli sviluppatori di %s"
 
 msgid "Current Translators"
 msgstr "Traduttori attuali"
@@ -12611,9 +12555,9 @@ msgstr "Traduttori attuali"
 msgid "Past Translators"
 msgstr "Traduttori precedenti"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Informazioni sul lavoro"
+msgstr "Informazioni sui traduttori di %s"
 
 msgid "_Name"
 msgstr "_Nome"
@@ -12858,7 +12802,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 ""
@@ -12872,16 +12816,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"
@@ -13025,9 +12969,8 @@ msgstr "Inserisci un'immagine"
 msgid "Insert Smiley"
 msgstr "Inserisci uno smiley"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Pulsante 'Invia'"
+msgstr "Invia una richiesta di attenzione"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Grassetto</b>"
@@ -13075,7 +13018,7 @@ msgid "_Smile!"
 msgstr "_Sorridi!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Attenzione!"
 
 msgid "Log Deletion Failed"
 msgstr "Cancellazione del log fallita"
@@ -13093,16 +13036,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?"
@@ -13136,7 +13079,7 @@ msgstr ""
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
 msgstr "usa DIR per i file di configurazione"
@@ -13157,17 +13100,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"
@@ -13206,11 +13150,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."
@@ -13431,20 +13377,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Sconosciuto... Per piacere riporta questo errore!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Personalizzato)"
 
 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."
@@ -13455,34 +13400,29 @@ msgstr "Impossibile caricare il tema."
 msgid "Theme failed to copy."
 msgstr "Impossibile copiare il tema."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Scelta del browser"
+msgstr "Scelta dei temi"
 
 #. 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 ""
-"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."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Tema per la lista contatti"
+msgstr "Tema per la lista contatti:"
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "Icone di stato"
+msgstr "Tema per le icone di stato:"
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "Tema sonoro:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Temi degli smiley"
+msgstr "Tema per gli smiley:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
@@ -13598,17 +13538,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>"
@@ -13622,34 +13560,28 @@ 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 "Use_rname:"
-msgstr "Nome utente:"
+msgstr "Nome u_tente:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Password:"
+msgstr "Pass_word:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13690,11 +13622,8 @@ msgstr "Manuale"
 msgid "Browser Selection"
 msgstr "Scelta del browser"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
-"Le preferenze del proxy e del browser sono configurate\n"
-"nelle Preferenze di GNOME"
+msgstr "Le preferenze del browser sono configurate nelle Preferenze di GNOME"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
@@ -13729,11 +13658,8 @@ msgstr ""
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
-"Le preferenze del proxy e del browser sono configurate\n"
-"nelle Preferenze di GNOME"
+msgstr "Le preferenze del proxy sono configurate nelle Preferenze di GNOME"
 
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
@@ -13744,24 +13670,20 @@ msgstr "Configura il _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"
+msgstr "Usa un _DNS remoto con proxy SOCKS4"
 
-#, fuzzy
 msgid "Proxy t_ype:"
-msgstr "_Tipo di proxy:"
+msgstr "T_ipo di proxy:"
 
 msgid "No proxy"
 msgstr "Nessun proxy"
 
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Porta:"
+msgstr "P_orta:"
 
-#, fuzzy
 msgid "User_name:"
-msgstr "Nome utente:"
+msgstr "Nome u_tente:"
 
 msgid "Log _format:"
 msgstr "_Formato del log:"
@@ -13850,9 +13772,8 @@ msgstr "Sulla base dell'utilizzo della tastiera o del mouse"
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuti prima di diventare inattivo:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Modifica lo stato quando sei _inattivo"
+msgstr "Imposta il seguente stato quando sei _inattivo:"
 
 msgid "_Auto-reply:"
 msgstr "Risposta _automatica:"
@@ -13879,9 +13800,8 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Stato / Inattività"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Temi degli smiley"
+msgstr "Temi"
 
 msgid "Allow all users to contact me"
 msgstr "Consenti a tutti di contattarmi"
@@ -14040,10 +13960,6 @@ msgstr "Testo della scorciatoia"
 msgid "Custom Smiley Manager"
 msgstr "Gestione degli smiley personalizzati"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Richiesta attivazione"
-
 msgid "Select Buddy Icon"
 msgstr "Seleziona l'icona per il contatto"
 
@@ -14186,9 +14102,8 @@ msgstr "_Riproduci il suono"
 msgid "_Save File"
 msgstr "_Salva il file"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Sei sicuro di voler eliminare %s?"
+msgstr "Vuoi davvero pulire?"
 
 msgid "Select color"
 msgstr "Scegli il colore"
@@ -14875,9 +14790,8 @@ msgstr "Separazione orizzontale per GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "Finestra di conversazione"
+msgstr "Storico della conversazione"
 
 msgid "Request Dialog"
 msgstr "Finestra di richiesta"
@@ -15194,8 +15108,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..."
@@ -15346,9 +15269,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"
@@ -15398,188 +15320,180 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Invia e riceve blocchi XMPP"
 
 #. *  description
-#, fuzzy
 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."
 
-#~ msgid "Error creating conference."
-#~ msgstr "Errore nella creazione della conferenza."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Impossibile associare il socket alla porta: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Impossibile mettersi in ascolto sul socket: %s"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr ""
-#~ "Impossibile trovare metodi alternativi per la connessione XMPP, dal "
-#~ "momento che la connessione diretta è fallita."
+#. $(^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 ""
+"$(^Name) è distribuito sotto la GNU General Public License (GPL). La licenza "
+"è mostrata qui solamente a scopo informativo. $_CLICK"
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s ti ha appena inviato un trillo!"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "L'alias cambia troppo rapidamente"
+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."
 
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "Questo account Hotmail potrebbe essere non attivo."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "File principali di Pidgin e dll"
 
-#~ msgid "Profile URL"
-#~ msgstr "URL del profilo"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Crea una voce per Pidgin nel Menu Avvio"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Plugin per il protocollo MSN"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Crea un collegamento a Pidgin sul desktop"
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s non è un gruppo valido"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Simboli di debug (per comunicare i crash)"
 
-#~ msgid "Unknown error."
-#~ msgstr "Errore sconosciuto."
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s su %s: (%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 ""
+"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/ ."
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Impossibile aggiungere l'utente su %s (%s)"
+#. $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/ ."
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Impossibile bloccare l'utente su %s (%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 ""
+"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 "Unable to permit user on %s (%s)"
-#~ msgstr "Impossibile autorizzare l'utente su %s (%s)"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Ambiente di Runtime GTK+ (richiesto se non presente)"
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "%s non può essere aggiunto perché la tua lista contatti è piena."
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localizzazioni"
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s non è un profilo passport valido"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Avanti >"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Servizio temporaneamente non disponibile."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin - Client per Messaggi Immediati (richiesto)"
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Impossibile rinominare il gruppo"
+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+?"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Impossibile cancellare il gruppo"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Scorciatoie"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s ti ha aggiunto alla sua lista contatti."
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Collegamenti per avviare Pidgin"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s ti ha rimosso dalla sua lista contatti."
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Supporto per il correttore ortografico"
 
-#, 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."
-
-#~ 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\">Canale IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
-
-#~ 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 "Debugging Information"
-#~ msgstr "Informazioni di debug"
-
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Tipo di file sconosciuto\n"
-#~ "\n"
-#~ "Verrà utilizzato il formato predefinito PNG."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Errore nel salvataggio dell'immagine\n"
-#~ "\n"
-#~ "%s"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Avvio"
 
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "(predefinito)"
+#. 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 "Install Theme"
-#~ msgstr "Installa tema"
+msgid "The installer is already running."
+msgstr "Il programma di installazione è già in esecuzione"
 
-#~ msgid "Icon"
-#~ msgstr "Icona"
+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."
 
-#~ msgid "Use document font from _theme"
-#~ msgstr "Usa il carattere di _sistema"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Gestori degli URI"
 
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Server proxy &amp; Browser"
+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."
 
-#~ msgid "Auto-away"
-#~ msgstr "Assente automatico"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Visita la pagina web di Pidgin"
 
-#~ msgid "Change _status to:"
-#~ msgstr "Cambia lo _stato in:"
+msgid "You do not have permission to uninstall this application."
+msgstr "Non hai il permesso per rimuovere questa applicazione."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Impossibile aprire il file '%s': %s"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Il certificato non è ancora valido."
 
-#~ 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 "The nick name you entered is invalid."
+#~ msgstr "Il nickname immesso non è valido"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Inserisci una stanza <iq/>."
+#~ msgid "MXit Login Name"
+#~ msgstr "Nome di login per MXit"
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Inserisci una stanza <presence/>."
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Inserisci una stanza <message/>"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Il tuo numero di cellulare..."
 
 #, 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."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Client multiprotocollo per messaggi immediati"
-
-#~ msgid "_Start port:"
-#~ msgstr "_Prima porta:"
+#~ msgid "Rate to host"
+#~ msgstr "Invita in chat"
 
-#~ msgid "_End port:"
-#~ msgstr "_Ultima porta:"
-
-#~ msgid "_User:"
-#~ msgstr "_Utente:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versione dell'ambiente runtime GTK+"
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Ultimo client conosciuto"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr ""
-#~ "Senza questo argomento, sarà abilitato solo il primo\n"
-#~ "                      account)"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Riaggancia"
diff --git a/po/ja.po b/po/ja.po
index 914548b0c6..728e89b715 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "新着メールを通知する"
 
@@ -795,7 +808,7 @@ msgstr "停止する"
 msgid "Waiting for transfer to begin"
 msgstr "転送開始を待っています"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "キャンセルしました"
 
 msgid "Failed"
@@ -1287,6 +1300,10 @@ msgstr "他の人がチャットで話しました"
 msgid "Someone says your username in chat"
 msgstr "チャットで誰かがあなたの名前を入力した時"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "登録が必要です"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer のエラー"
 
@@ -1389,7 +1406,6 @@ msgid "Saved Statuses"
 msgstr "保存した状態"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "題名"
 
@@ -1587,7 +1603,7 @@ msgstr ""
 msgid "Online"
 msgstr "オンライン"
 
-#. primative,						no,							id,			name
+#. 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,9 +1726,10 @@ 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."
 msgstr ""
@@ -1934,7 +1959,6 @@ msgstr "%s を解決する際にエラー: %d"
 msgid "Thread creation failure: %s"
 msgstr "スレッドの生成に失敗しました: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因は不明です"
 
@@ -3213,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 "名"
 
@@ -3831,18 +3858,6 @@ 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 を要求してきましたが、TLS/SSL はサポートし"
-"ていません。"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
 
@@ -3875,6 +3890,18 @@ 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 "認証に失敗しました"
 
@@ -3883,6 +3910,42 @@ 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 "設定できません"
 
@@ -3957,6 +4020,7 @@ msgstr "州"
 msgid "Postal Code"
 msgstr "郵便番号"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "国"
 
@@ -3971,10 +4035,14 @@ msgstr "組織名"
 msgid "Organization Unit"
 msgstr "担当部署"
 
+msgid "Job Title"
+msgstr "肩書"
+
 msgid "Role"
 msgstr "役職"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "誕生日"
 
@@ -4199,12 +4267,28 @@ 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 "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 が間違っています (ドメインを指定して下さい)"
 
@@ -4310,7 +4394,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "承認されていません"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "不機嫌"
 
@@ -4332,7 +4415,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "なし"
 
@@ -4356,6 +4438,12 @@ msgstr "ミドル・ネーム"
 msgid "Mood Comment"
 msgstr "仲間のコメント"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 #, fuzzy
 msgid "Tune Artist"
 msgstr "アーティスト"
@@ -4529,9 +4617,6 @@ msgstr "ポリシー違反"
 msgid "Remote Connection Failed"
 msgstr "リモート接続に失敗しました"
 
-msgid "Resource Constraint"
-msgstr "リソース制限"
-
 msgid "Restricted XML"
 msgstr "制限付き XML"
 
@@ -4903,7 +4988,6 @@ msgstr "恥じる"
 msgid "Amorous"
 msgstr "Glorious"
 
-#. 1
 msgid "Angry"
 msgstr "怒る"
 
@@ -5001,7 +5085,6 @@ msgstr ""
 msgid "Envious"
 msgstr "心配"
 
-#. 2
 msgid "Excited"
 msgstr "興奮"
 
@@ -5020,7 +5103,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "取得中..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "グループ"
@@ -5029,14 +5111,12 @@ msgstr "グループ"
 msgid "Guilty"
 msgstr "町"
 
-#. 4
 msgid "Happy"
 msgstr "ハッピー"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "ホスト名(_H):"
@@ -5077,7 +5157,6 @@ msgstr "趣味"
 msgid "Intoxicated"
 msgstr "招待する"
 
-#. 6
 msgid "Invincible"
 msgstr "無敵"
 
@@ -5141,7 +5220,6 @@ msgstr "削除"
 msgid "Restless"
 msgstr "登録"
 
-#. 7
 msgid "Sad"
 msgstr "悲しむ"
 
@@ -5162,12 +5240,10 @@ msgstr "拒否しているか"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "あだ名"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "眠いよ"
@@ -5582,20 +5658,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 "題名"
@@ -5748,9 +5810,6 @@ msgstr "記念日"
 msgid "Work"
 msgstr "職種"
 
-msgid "Job Title"
-msgstr "肩書"
-
 msgid "Company"
 msgstr "勤務先"
 
@@ -5842,6 +5901,10 @@ msgstr "IPC のテスト用サーバ"
 msgid "Show custom smileys"
 msgstr "独自のスマイリーを表示する"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "新しい接続を開けません"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "合図: ユーザに向けて警告音を鳴らす"
 
@@ -6042,28 +6105,6 @@ msgstr "この相手を仲間リストに追加しますか？"
 msgid "The username specified is invalid."
 msgstr "指定したスクリーン名が間違っています"
 
-#. 5
-msgid "In Love"
-msgstr "恋愛中"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "現在の Mood"
-
-#. 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 "入力したセキュア ID 鍵は不正です。"
@@ -6100,7 +6141,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"
@@ -6109,6 +6154,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "苗字"
@@ -6139,11 +6185,6 @@ msgstr ""
 msgid "About"
 msgstr "%s について"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "パスワードの変更..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6183,7 +6224,7 @@ msgid "Connecting..."
 msgstr "接続中です"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "入力したセキュア ID 鍵は不正です。"
 
 #, fuzzy
@@ -6191,14 +6232,9 @@ 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"
@@ -6227,10 +6263,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
@@ -6244,7 +6280,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "セキュリティは有効"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "パスワードの入力"
@@ -6278,12 +6314,17 @@ 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")
@@ -6298,6 +6339,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 ""
@@ -6417,6 +6480,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "恋愛中"
+
 #, fuzzy
 msgid "Pending"
 msgstr "送信する"
@@ -6841,9 +6907,6 @@ msgstr "パスワードの有効期限が切れています"
 msgid "Incorrect password"
 msgstr "パスワードが間違っています"
 
-msgid "User not found"
-msgstr "ユーザが見つかりません"
-
 msgid "Account has been disabled"
 msgstr "アカウントが無効になっています"
 
@@ -7097,6 +7160,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "接続を開始する際にエラー"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "接続できませんでした"
@@ -7105,6 +7172,67 @@ 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 ""
+
+#, 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 "オフラインのメッセージ"
+
+#, 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 さんへメッセージを送信できません"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7269,120 +7397,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 "旧式の 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 "
@@ -7755,29 +7769,10 @@ 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 "サイン・インした日時"
 
@@ -8201,6 +8196,75 @@ 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 に居る時はできません"
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -8522,6 +8586,11 @@ msgstr "質問ダイアログの文字"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ルームの一覧"
+
 #, fuzzy
 msgid "Notice"
 msgstr "備考"
@@ -10474,9 +10543,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! プロトコル・プラグイン"
 
-msgid "Pager server"
-msgstr "ページャのサーバ"
-
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
@@ -10492,18 +10558,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"
@@ -10575,6 +10635,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"
@@ -10661,6 +10730,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 "家に居ません"
 
@@ -11054,6 +11132,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)"
 
@@ -11298,12 +11380,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 "ログインのオプション"
@@ -12532,6 +12608,10 @@ msgstr "アフリカーンズ語"
 msgid "Arabic"
 msgstr "アラビア語"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "恥じる"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12541,6 +12621,10 @@ msgstr "ブルガリア語"
 msgid "Bengali"
 msgstr "ベンガル語"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "ベンガル語"
+
 msgid "Bosnian"
 msgstr "ボスニア語"
 
@@ -12661,6 +12745,10 @@ msgid "Macedonian"
 msgstr "マケドニア語"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "男性"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "マケドニア語"
 
@@ -12781,8 +12869,8 @@ msgid ""
 "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>"
+"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 といったプロトコルを全て同時に"
@@ -13364,14 +13452,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
@@ -13479,10 +13567,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
@@ -14347,10 +14435,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "登録が必要です"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "仲間の選択"
 
@@ -15533,8 +15617,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..."
@@ -15748,6 +15844,204 @@ 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 ""
+"$(^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 ""
+"あなたはこのアプリケーションをアンインストールする権限を持っていません。"
+
+#, 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 "接続を開始する際にエラー"
@@ -15908,9 +16202,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "ユーザ名(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ラインタイムのバージョン"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "計算中..."
@@ -16468,7 +16759,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 ""
 #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
 
diff --git a/po/ka.po b/po/ka.po
index 4a4b8855b7..27eff72d7b 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "ახალი ელ.ფოსტის შეტყობინებები"
 
@@ -794,7 +807,7 @@ msgstr "Hiptop"
 msgid "Waiting for transfer to begin"
 msgstr "ველოდები გადატანის დაწყებას"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "გაუქმებულია"
 
 #, fuzzy
@@ -1294,6 +1307,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "საჭიროა რეგისტრაცია"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1395,7 +1412,6 @@ msgid "Saved Statuses"
 msgstr "შენახული სტატუსები"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "სათაური"
 
@@ -1597,7 +1613,7 @@ msgstr ""
 msgid "Online"
 msgstr "ხაზზე"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "გასული ქსელიდან"
 
@@ -1695,6 +1711,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 "უცნობი"
 
@@ -1712,7 +1736,9 @@ 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."
@@ -1949,7 +1975,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "აუტენტიფიკაციის შეცდომა"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "უცნობი მიზეზი."
@@ -3183,6 +3208,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 "სახელი"
 
@@ -3762,12 +3790,6 @@ msgstr "ბრძანება გაუქმებულია"
 msgid "execute"
 msgstr "მოულოდნელი"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3797,6 +3819,15 @@ 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 "აუტენტიფიკაცია ვერ მოხერხდა"
@@ -3806,6 +3837,42 @@ 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 "ვერ ვაკონფიგურირებ"
 
@@ -3875,6 +3942,7 @@ msgstr "რეგიონი"
 msgid "Postal Code"
 msgstr "საფოსტო კოდი"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ქვეყანა"
 
@@ -3889,10 +3957,14 @@ msgstr "ორგანიზაციის სახელი"
 msgid "Organization Unit"
 msgstr "დანაყოფი"
 
+msgid "Job Title"
+msgstr "პროფესია"
+
 msgid "Role"
 msgstr "როლი"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "დაბადების დღე"
 
@@ -4115,6 +4187,12 @@ 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 "ტექსტი"
@@ -4123,6 +4201,9 @@ msgstr "ტექსტი"
 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 ""
 
@@ -4232,7 +4313,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "ავტორიზაცია"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4255,7 +4335,6 @@ msgstr "ვის"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "არაფერი"
 
@@ -4279,6 +4358,12 @@ msgstr "ოჯახური სახელი"
 msgid "Mood Comment"
 msgstr "ანგარიშის პარამეტრების შეცვლა"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4453,9 +4538,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4811,7 +4893,6 @@ msgstr "ანიმირება"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "გაბრაზებული"
 
@@ -4906,7 +4987,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr "აღფრთოვანებული"
 
@@ -4924,7 +5004,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "მომხმარებელი კრიფავს..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "ჯგუფი:"
@@ -4933,14 +5012,12 @@ msgstr "ჯგუფი:"
 msgid "Guilty"
 msgstr "ქალაქი"
 
-#. 4
 msgid "Happy"
 msgstr "ბედნიერი"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_ჰოსტი:"
@@ -4981,7 +5058,6 @@ msgstr "_ჩამატება"
 msgid "Intoxicated"
 msgstr "დაპატიჟება"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5045,7 +5121,6 @@ msgstr "წაშლა"
 msgid "Restless"
 msgstr "რესგისტრაცია"
 
-#. 7
 msgid "Sad"
 msgstr "მოწყენილი"
 
@@ -5066,12 +5141,10 @@ msgstr "დაბლოკილია"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "მეტსახელი"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5481,19 +5554,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 "სათაური"
@@ -5654,9 +5714,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "პროფესია"
-
 msgid "Company"
 msgstr "კომპანია"
 
@@ -5749,6 +5806,10 @@ msgstr "IPC ტესტ სერვერი"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5922,27 +5983,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5977,7 +6017,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 ""
 
@@ -5985,6 +6029,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "ოჯახური სახელი"
@@ -6015,11 +6060,6 @@ msgstr ""
 msgid "About"
 msgstr "Pidgin-ის შესახებ"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "პაროლის შეცვლა..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6057,21 +6097,16 @@ msgstr "არ ვარ დაკავშირებული სერვე
 msgid "Connecting..."
 msgstr "დაკავშირება"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+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"
@@ -6099,10 +6134,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."
@@ -6115,7 +6150,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "დაცვა ჩართულია"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "შეიყვანე პაროლი"
@@ -6148,12 +6183,17 @@ 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")
@@ -6168,6 +6208,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 ""
@@ -6287,6 +6348,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "შეყვარებული"
+
 #, fuzzy
 msgid "Pending"
 msgstr "_გაგზავნა"
@@ -6701,9 +6765,6 @@ msgstr "პაროლს ვადა გაუვიდა"
 msgid "Incorrect password"
 msgstr "არასწორი პაროლი."
 
-msgid "User not found"
-msgstr "ვერ ვიპოვე მომხმარებელი"
-
 #, fuzzy
 msgid "Account has been disabled"
 msgstr "ანგარიში გამორთულია"
@@ -6943,6 +7004,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "შეცდომა პროფაილის ჩამოტანისას"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ვერ ვუკავშირდები"
@@ -6951,6 +7016,67 @@ 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 ""
+
+#, 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 "შეტყობინების გაგზავნა"
+
+#, 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 -თან"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7117,120 +7243,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 ""
-
-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 ""
-
-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 "
@@ -7547,29 +7559,10 @@ 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 ""
 
@@ -7957,6 +7950,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8293,6 +8355,11 @@ msgstr "პრივატი"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ოთახების სია"
+
 #, fuzzy
 msgid "Notice"
 msgstr "შენიშვნა"
@@ -10169,10 +10236,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo პროტოკოლის პლაგინი"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "პროქსი სერვერი"
-
 msgid "Pager port"
 msgstr ""
 
@@ -10189,19 +10252,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"
@@ -10264,6 +10320,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"
@@ -10334,6 +10396,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 ""
 
@@ -10697,6 +10768,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 "_აქცეპტირება"
 
@@ -10936,12 +11011,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 "შესვლის პარამეტრები"
@@ -12176,6 +12245,10 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+#, fuzzy
+msgid "Assamese"
+msgstr "თამაში"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12185,6 +12258,10 @@ msgstr "ბულგარული"
 msgid "Bengali"
 msgstr "ბენგალი"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "ბენგალი"
+
 msgid "Bosnian"
 msgstr "ბოსნიური"
 
@@ -12308,6 +12385,10 @@ msgid "Macedonian"
 msgstr "მაკედონიური"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "მამრობითი"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "მაკედონიური"
 
@@ -12436,8 +12517,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12991,14 +13072,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
@@ -13087,10 +13168,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
@@ -13950,10 +14031,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "საჭიროა რეგისტრაცია"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ფონტის არჩევა"
 
@@ -15123,8 +15200,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..."
@@ -15332,6 +15419,179 @@ msgstr ""
 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."
+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 "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)."
@@ -15410,10 +15670,6 @@ msgstr ""
 #~ msgstr "_მომხმარებელი:"
 
 #, fuzzy
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ვერსია"
-
-#, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "გაანგარიშება..."
 
diff --git a/po/km.po b/po/km.po
index 40706cf81a..01a05c2c99 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 19:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -60,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 "ការ​ជូនដំណឹង​សំបុត្រ​ថ្មី"
 
@@ -764,7 +777,7 @@ msgstr "បញ្ឈប់"
 msgid "Waiting for transfer to begin"
 msgstr "រង់ចាំ​ការ​ផ្ទេរ​ចាប់ផ្ដើម"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "បានបោះបង់"
 
 msgid "Failed"
@@ -1228,6 +1241,10 @@ msgstr "អ្នកផ្សេង​និយាយ​នៅ​ក្នុង
 msgid "Someone says your username in chat"
 msgstr "មាន​មនុស្ស​ម្នាក់​និយាយ​អំពី​ឈ្មោះអ្នកប្រើ​របស់​អ្នក​នៅ​ក្នុង​ការជជែក"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
+
 msgid "GStreamer Failure"
 msgstr "ភាព​បរាជ័យ​របស់ GStreamer"
 
@@ -1321,7 +1338,6 @@ msgid "Saved Statuses"
 msgstr "ស្ថានភាព​ដែល​បាន​រក្សាទុក"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ចំណង​ជើង"
 
@@ -1517,7 +1533,7 @@ msgstr "នៅពេល​ទទួល​សារ​ដែល​មាន URL(s
 msgid "Online"
 msgstr "លើ​បណ្ដាញ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ក្រៅ​បណ្តាញ"
 
@@ -1610,6 +1626,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 "មិន​ស្គាល់"
 
@@ -1630,8 +1654,10 @@ 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 "វិញ្ញាបនបត្រ​បានផុត​កំណត់ ហើយ​​មិនគួរ​​ត្រូវ​បាន​ចាក់ទុកថា​ត្រឹមត្រូវ​នោះ​ទេ ។"
@@ -1869,7 +1895,6 @@ msgstr "កំហុស​ក្នុងការ​បម្លែង %s ទ�
 msgid "Thread creation failure: %s"
 msgstr "បានបរាជ័យ​ក្នុងការ​បង្កើត​ខ្សែស្រឡាយ ៖ %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "មិនស្គាល់​ហេតុផល"
 
@@ -3111,6 +3136,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 "នាម​ខ្លួន"
 
@@ -3708,12 +3736,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 "ម៉ាស៊ីន​បម្រើ​ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ជា​អត្ថបទ​ធម្មតា​លើ​ស្ទ្រីម​ដែល​មិនបានអ៊ិនគ្រីប"
 
@@ -3744,6 +3766,18 @@ 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"
 
@@ -3752,6 +3786,42 @@ msgstr "បាន​បរាជ័យ​ក្នុង​​ការ​ផ្
 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 "មិន​អាច​ប្រកាស​ឈ្មោះ​អ្ន​ប្រើ​បាន​ទេ​"
 
@@ -3818,6 +3888,7 @@ msgstr "តំបន់"
 msgid "Postal Code"
 msgstr "លេខប្រៃសណីយ៍"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ប្រទេស"
 
@@ -3832,10 +3903,14 @@ msgstr "ឈ្មោះ​អង្គភាព"
 msgid "Organization Unit"
 msgstr "ផ្នែក​នៃ​អង្គភាព"
 
+msgid "Job Title"
+msgstr "ងារ​ការងារ"
+
 msgid "Role"
 msgstr "តួនាទី"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ថ្ងៃ​កំណើត"
 
@@ -4050,12 +4125,22 @@ 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 មិន​ត្រឹមត្រូវ"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "លេខសម្គាល់ XMPP មិនត្រឹមត្រូវ ។ ដែន​ត្រូវ​តែ​បានកំណត់ ។"
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "លេខសម្គាល់ XMPP មិនត្រឹមត្រូវ ។ ដែន​ត្រូវ​តែ​បានកំណត់ ។"
 
@@ -4152,7 +4237,6 @@ msgstr "ម៉ាស៊ីន​បម្រើ​មិន​គាំទ្រ
 msgid "Not Authorized"
 msgstr "មិន​បានផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "អារម្មណ៍"
 
@@ -4174,7 +4258,6 @@ msgstr "ទៅ"
 msgid "None (To pending)"
 msgstr "គ្មាន (ដល់​មិនទាន់សម្រេច)"
 
-#. 0
 msgid "None"
 msgstr "គ្មាន"
 
@@ -4196,6 +4279,12 @@ msgstr "ឈ្មោះ​កណ្ដាល"
 msgid "Mood Comment"
 msgstr "មតិយោបល់​មិត្តភក្ដិ"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "សិល្បករ Tune"
 
@@ -4366,9 +4455,6 @@ msgstr "ការ​បំពាន​គោលនយោបាយ"
 msgid "Remote Connection Failed"
 msgstr "បានបរាជ័យ​ក្នុងកា​រតភ្ជាប់​ពី​ចម្ងាយ"
 
-msgid "Resource Constraint"
-msgstr "កា​រដាក់​កម្រិត​ធនធាន"
-
 msgid "Restricted XML"
 msgstr "XML ដែល​បាន​ដាក់​កម្រិត"
 
@@ -4708,7 +4794,6 @@ msgstr "អៀនខ្មាស់"
 msgid "Amorous"
 msgstr "Glorious"
 
-#. 1
 msgid "Angry"
 msgstr "ខឹង"
 
@@ -4806,7 +4891,6 @@ msgstr ""
 msgid "Envious"
 msgstr "រសាប់រសល់"
 
-#. 2
 msgid "Excited"
 msgstr "រំភើប"
 
@@ -4825,7 +4909,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "កំពុង​ទៅ​យក..."
 
-#. 3
 msgid "Grumpy"
 msgstr "មួរម៉ៅ"
 
@@ -4833,14 +4916,12 @@ msgstr "មួរម៉ៅ"
 msgid "Guilty"
 msgstr "ទីក្រុង​"
 
-#. 4
 msgid "Happy"
 msgstr "សប្បាយ"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "ក្តៅ"
 
@@ -4880,7 +4961,6 @@ msgstr "ចំណាប់​អារម្មណ៍"
 msgid "Intoxicated"
 msgstr "បាន​អញ្ជើញ"
 
-#. 6
 msgid "Invincible"
 msgstr "មិន​ចុះចាញ់"
 
@@ -4944,7 +5024,6 @@ msgstr "យក​ចេញ"
 msgid "Restless"
 msgstr "ចុះឈ្មោះ"
 
-#. 7
 msgid "Sad"
 msgstr "ក្រៀមក្រំ"
 
@@ -4966,11 +5045,9 @@ msgstr "បានទប់ស្កាត់"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "ឈឺ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ងងុយដេក"
@@ -5368,18 +5445,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 "ចំណង​ជើង​ល្បែង"
 
@@ -5527,9 +5592,6 @@ msgstr "ខួប​កំណើត"
 msgid "Work"
 msgstr "ការងារ"
 
-msgid "Job Title"
-msgstr "ងារ​ការងារ"
-
 msgid "Company"
 msgstr "ក្រុមហ៊ុន"
 
@@ -5615,6 +5677,10 @@ msgstr "ម៉ាស៊ីនបម្រើ​វិធីសាស្ត្រ
 msgid "Show custom smileys"
 msgstr "បង្ហាញ​សញ្ញាណ​អារម្មណ៍​ផ្ទាល់ខ្លួន"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ច្រាន​ចេញ ៖ ច្រានអ្នកប្រើ​ចេញ​ដើម្បី​ទទួល​បាន​ការ​ចាបអារម្មណ៍​របស់​ពួកគេ"
 
@@ -5792,24 +5858,6 @@ msgstr "តើ​អ្នក​ចង់​លុប​មិត្តភក្
 msgid "The username specified is invalid."
 msgstr "ឈ្មោះ​អ្នកប្រើ​ដែល​បាន​បញ្ជាក់​មិន​ត្រឹមត្រូវ ។"
 
-#. 5
-msgid "In Love"
-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 ដែល​អ្នក​បាន​បញ្ចូល​មិនត្រឹមត្រូវទេ ។"
 
@@ -5841,7 +5889,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 "PIN"
 
@@ -5849,6 +5901,7 @@ msgid "Verify PIN"
 msgstr "ផ្ទៀងផ្ទាត់ PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "បង្ហាញ​ឈ្មោះ​"
 
@@ -5875,10 +5928,6 @@ msgstr "បច្ចុប្បន្ន​មិនមាន​អេក្រ
 msgid "About"
 msgstr "អំពី"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "ប្ដូរ​អារម្មណ៍..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "ផ្លាស់ប្ដូរ​ទម្រង់..."
@@ -5909,19 +5958,16 @@ msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​
 msgid "Connecting..."
 msgstr "កំពុង​តភ្ជាប់..."
 
-msgid "The nick name you entered is invalid."
-msgstr "សម្មតិនាម​ ដែល​អ្នក​បាន​បញ្ចូលមិន​ត្រឹមត្រូវ​ទេ ។"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ​ទេ ។"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​​មាន​ប្រវែង​មិន​ត្រឹមត្រូវ [៧-១០] ។"
 
 #. 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
 msgid "Register New MXit Account"
@@ -5949,10 +5995,12 @@ 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 "ឈ្មោះ​អ្នក​ប្រើ ត្រូវ​បាន​ចុះឈ្មោះ​រួច​ហើយ ។ សូម​ជ្រើស​ឈ្មោះ​អ្នក​ប្រើ​ផ្សេង​ពី​នេះ ។"
 
 msgid "Internal error. Please try again later."
@@ -5964,7 +6012,7 @@ msgstr "អ្នក​មិន​បានបញ្ចូល​កូដ​ស
 msgid "Security Code"
 msgstr "កូដ​សុវត្ថិភាព"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "បញ្ចូល​កូដ​សុវត្ថិភាព"
 
@@ -5990,11 +6038,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 "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6007,6 +6061,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 ។ សូម​តភ្ជាប់​​ឡើង​វិញ ។"
@@ -6109,6 +6185,9 @@ msgstr "កំហុស​ក្នុងកា​រតភ្ជាប់​ប
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "កំហុស​ក្នុងការ​តភ្ជាប់​បានកើត​ឡើង​ចំពោះ MXit ។ (អាន​ដំណាក់កាល 0x06)"
 
+msgid "In Love"
+msgstr "សេចក្តី​ស្រឡាញ់"
+
 msgid "Pending"
 msgstr "រង់ចាំ​"
 
@@ -6500,9 +6579,6 @@ msgstr "ពាក្យ​​​សម្ងាត់​បាន​ផុត​
 msgid "Incorrect password"
 msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
 
-msgid "User not found"
-msgstr "រក​មិនឃើញ​អ្នក​ប្រើ"
-
 msgid "Account has been disabled"
 msgstr "គណនី​ត្រូវ​បាន​បិទ"
 
@@ -6750,12 +6826,73 @@ 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 "មិន​អាច​ផ្ញើ 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 "គណនី​អ្នកលេង​លើ​បណ្ដាញ​​មិនអាច​ចាប់ផ្ដើម IMs បាន​ទេ"
+
+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
+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 ""
 
@@ -6922,116 +7059,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 "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"
-
-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 "គណនី​អ្នកលេង​លើ​បណ្ដាញ​​មិនអាច​ចាប់ផ្ដើម IMs បាន​ទេ"
-
-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 "សារ​ក្រៅ​បណ្ដាញ​ផ្ទុក​ពេញ​ហើយ"
-
 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 "
@@ -7369,28 +7396,9 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "អ្នកបាត់​សារ %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 "លើ​បណ្ដាញ​តាំងពី"
 
@@ -7794,6 +7802,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquarius"
 
@@ -8076,6 +8153,11 @@ msgstr "សំណើ"
 msgid "Admin"
 msgstr "គ្រប់គ្រង"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "បញ្ជី​បន្ទប់"
+
 msgid "Notice"
 msgstr "ចំណាំ"
 
@@ -9947,9 +10029,6 @@ msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ...
 msgid "Yahoo! Protocol Plugin"
 msgstr "យ៉ាហ៊ូ​ ! កម្មវិធី​ជំនួយ​​ពិធីការ"
 
-msgid "Pager server"
-msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
-
 msgid "Pager port"
 msgstr "ច្រក​ភេយ័រ"
 
@@ -9965,18 +10044,13 @@ 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 "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
-
-msgid "Yahoo Chat port"
-msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "លេខ​​សម្គាល់​​យ៉ាហ៊ូ​ជប៉ុន..."
 
@@ -10040,6 +10114,15 @@ msgid ""
 "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 "បាត់​ឈ្មោះ​អ្នក​ប្រើ ឬ​ពាក្យ​សម្ងាត់"
@@ -10114,6 +10197,15 @@ msgstr "បាត់បង់​ការ​តភ្ជាប់​ជា​ម
 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 "មិននៅ​ផ្ទះ​ទេ"
 
@@ -10483,6 +10575,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 "យល់​​​ព្រម​"
 
@@ -10715,12 +10811,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 "ជម្រើស​​ចូល"
@@ -11871,6 +11961,10 @@ msgstr "អាហ្វ្រីកាអាន"
 msgid "Arabic"
 msgstr "អារ៉ាប់"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "អៀនខ្មាស់"
+
 msgid "Belarusian Latin"
 msgstr "បេឡារុស្ស ឡាទីន"
 
@@ -11998,6 +12092,10 @@ msgstr "ឡាវ"
 msgid "Macedonian"
 msgstr "​ម៉ាសេដូនី"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ម៉ាឡេស៊ី"
+
 msgid "Mongolian"
 msgstr "ម៉ុងហ្គោលី"
 
@@ -12112,8 +12210,8 @@ msgid ""
 "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>"
+"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 "
@@ -12646,14 +12744,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?"
@@ -12757,11 +12855,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."
@@ -13552,10 +13652,6 @@ msgstr "អត្ថបទ​ផ្លូវកាត់"
 msgid "Custom Smiley Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​សញ្ញាអារម្មណ៍​ផ្ទាល់ខ្លួន"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
-
 msgid "Select Buddy Icon"
 msgstr "ជ្រើស​រូបតំណាង​មិត្តភក្ដិ"
 
@@ -14659,8 +14755,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..."
@@ -14862,6 +14970,199 @@ msgstr "ផ្ញើ​ និង​ទទួល​ XMPP stanzas ដើម ។"
 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 "ចាប់ផ្ដើម"
+
+#. 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 "/Media/_Hangup"
+#~ 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 "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
+
+#~ msgid "Yahoo Chat port"
+#~ msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
+
+#~ msgid "Orientation"
+#~ msgstr "ទិស"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ទិស​របស់​ថាស ។"
+
 #~ msgid "Error creating conference."
 #~ msgstr "កំហុស​ក្នុងកា​របង្កើត​សន្និសីទ"
 
diff --git a/po/kn.po b/po/kn.po
index fc94b2e3f8..753bd1753e 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 19:18-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-26 12:08+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: American English <>\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 "ದೋಷ"
 
+#, 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 "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
@@ -789,7 +802,7 @@ msgstr "ನಿಲ್ಲಿಸು"
 msgid "Waiting for transfer to begin"
 msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ರದ್ದಾಗಿದೆ"
 
 msgid "Failed"
@@ -1264,6 +1277,9 @@ msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಇತರರು ಮಾತಾಡು�
 msgid "Someone says your username in chat"
 msgstr "ಯಾರೋ ಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನು ಹೇಳುತ್ತಿದ್ದಾರೆ"
 
+msgid "Attention received"
+msgstr "ಗಮನವನ್ನು ಸ್ವೀಕರಿಸಲಾದ"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer ವಿಫಲತೆ"
 
@@ -1358,7 +1374,6 @@ msgid "Saved Statuses"
 msgstr "ಉಳಿಸಿದ ಸ್ಥಿತಿಗಳು"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ಶೀರ್ಷಿಕೆ"
 
@@ -1558,7 +1573,7 @@ msgstr ""
 msgid "Online"
 msgstr "ಆನ್‍ಲೈನ್"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ಆಫ್‍ಲೈನ್"
 
@@ -1651,6 +1666,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 "ಗೊತ್ತಿಲ್ಲದ"
 
@@ -1670,8 +1693,10 @@ 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 "ಪ್ರಮಾಣಪತ್ರದ ವಾಯಿದೆ ತೀರಿದೆ ಹಾಗು ಅದನ್ನು ಮಾನ್ಯವಾದುದು ಎಂದು ಪರಿಗಣಿಸುವಂತಿಲ್ಲ."
@@ -1909,7 +1934,6 @@ msgstr "%s ಅನ್ನು punycode ಆಗಿ ಬದಲಾಯಿಸುವಲ್�
 msgid "Thread creation failure: %s"
 msgstr "ಎಳೆ(ತ್ರೆಡ್) ರಚಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ."
 
@@ -3194,6 +3218,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 "ಮೊದಲ ಹೆಸರು"
 
@@ -3807,13 +3834,6 @@ 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 ""
 "ಪರಿಚಾರಕಕ್ಕಾಗಿ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸ್ಟ್ರೀಮ್‌ನ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
@@ -3846,6 +3866,19 @@ 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 ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
 
@@ -3854,6 +3887,43 @@ msgstr "SASL ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
 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 "ಬಳಕೆದಾರ ಸಿಗಲಿಲ್ಲ"
+
+# , c-format
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "ತಪ್ಪು ಬಳಕೆದಾರಹೆಸರು"
+
+msgid "Resource Constraint"
+msgstr "ಸಂಪನ್ಮೂಲ ಮಿತಿ"
+
 msgid "Unable to canonicalize username"
 msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಮಾನಕವಾಗಿಸಲು ಆಗಲಿಲ್ಲ"
 
@@ -3918,6 +3988,7 @@ msgstr "ಪ್ರದೇಶ"
 msgid "Postal Code"
 msgstr "ಅಂಚೆ ಸಂಖ್ಯೆ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ದೇಶ"
 
@@ -3932,10 +4003,14 @@ msgstr "ಸಂಸ್ಥೆ ಹೆಸರು"
 msgid "Organization Unit"
 msgstr "ಸಂಸ್ಥೆಯ ಘಟಕ"
 
+msgid "Job Title"
+msgstr "ಹುದ್ದೆ"
+
 msgid "Role"
 msgstr "ಪಾತ್ರ"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ಹುಟ್ಟುಹಬ್ಬ"
 
@@ -4152,12 +4227,23 @@ 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 ಐಡಿ"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "ಅಮಾನ್ಯವಾದ XMPP ID. ಡೊಮೈನನ್ನು ಸೂಚಿಸಬೇಕು."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ಅಮಾನ್ಯವಾದ XMPP ID. ಡೊಮೈನನ್ನು ಸೂಚಿಸಬೇಕು."
 
@@ -4258,7 +4344,6 @@ msgstr "ನಿಷೇಧಿಸುವುದನ್ನು ಪರಿಚಾರಕವ�
 msgid "Not Authorized"
 msgstr "ಅಧಿಕಾರ ಪಡೆದಿಲ್ಲ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ಲಹರಿ"
 
@@ -4280,7 +4365,6 @@ msgstr "ಗೆ"
 msgid "None (To pending)"
 msgstr "ಏನೂ ಇಲ್ಲ (ಬಾಕಿ ಇರುವ)"
 
-#. 0
 msgid "None"
 msgstr "ಏನೂ ಇಲ್ಲ"
 
@@ -4300,6 +4384,12 @@ msgstr "ಲಹರಿಯ ಹೆಸರು"
 msgid "Mood Comment"
 msgstr "ಲಹರಿಯ ಅಭಿಪ್ರಾಯ"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "ರಾಗದ ಕಲಾವಿದ"
 
@@ -4470,9 +4560,6 @@ msgstr "ನೀತಿ ಉಲ್ಲಂಘನೆ"
 msgid "Remote Connection Failed"
 msgstr "ದೂರ ಸಂಪರ್ಕ ವಿಫಲ"
 
-msgid "Resource Constraint"
-msgstr "ಸಂಪನ್ಮೂಲ ಮಿತಿ"
-
 msgid "Restricted XML"
 msgstr "ನಿರ್ಬಂಧಿತ  XML"
 
@@ -4823,7 +4910,6 @@ msgstr "ಆಶ್ಚರ್ಯಗೊಂಡ"
 msgid "Amorous"
 msgstr "ಒಲುಮೆಯ"
 
-#. 1
 msgid "Angry"
 msgstr "ಕುಪಿತ"
 
@@ -4903,7 +4989,6 @@ msgstr "ಮುಜುಗರಗೊಂಡ"
 msgid "Envious"
 msgstr "ಅಸೂಯೆಗೊಂಡ"
 
-#. 2
 msgid "Excited"
 msgstr "ಉತ್ತೇಜಿತ"
 
@@ -4919,21 +5004,18 @@ msgstr "ಕೃತಜ್ಞ"
 msgid "Grieving"
 msgstr "ಮರುಗುವ"
 
-#. 3
 msgid "Grumpy"
 msgstr "ಸಿಡುಕು"
 
 msgid "Guilty"
 msgstr "ತಪ್ಪುಮಾಡಿದ"
 
-#. 4
 msgid "Happy"
 msgstr "ಹರ್ಷಚಿತ್ತ"
 
 msgid "Hopeful"
 msgstr "ಆಶಾವಾದಿ"
 
-#. 8
 msgid "Hot"
 msgstr "ಹಾಟ್"
 
@@ -4968,7 +5050,6 @@ msgstr "ಆಸಕ್ತಿಯ"
 msgid "Intoxicated"
 msgstr "ಪರವಶಗೊಂಡ"
 
-#. 6
 msgid "Invincible"
 msgstr "ಅದಮ್ಯ"
 
@@ -5020,7 +5101,6 @@ msgstr "ಪಶ್ಚಾತಾಪ"
 msgid "Restless"
 msgstr "ಚಡಪಡಿಸುವ"
 
-#. 7
 msgid "Sad"
 msgstr "ದುಃಖಿತ"
 
@@ -5039,11 +5119,9 @@ msgstr "ದಂಗು ಬಡಿದ"
 msgid "Shy"
 msgstr "ನಾಚಿಕೆಗೊಂಡ"
 
-#. 9
 msgid "Sick"
 msgstr "ರೋಗಗ್ರಸ್ತ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ನಿದ್ದೆ!"
@@ -5447,18 +5525,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 "ಆಟದ ಶೀರ್ಷಿಕೆ"
 
@@ -5607,9 +5673,6 @@ msgstr "ವಾರ್ಷಿಕೋತ್ಸವ"
 msgid "Work"
 msgstr "ಕೆಲಸ"
 
-msgid "Job Title"
-msgstr "ಹುದ್ದೆ"
-
 msgid "Company"
 msgstr "ಸಂಸ್ಥೆ"
 
@@ -5698,6 +5761,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(ಮೆತ್ತಗೆ ತಿವಿ): ಬಳಕೆದಾರರ ಗಮನ ಸೆಳೆಯಲು ಅವರನ್ನು ಮೆತ್ತಗೆ ತಿವಿ"
 
@@ -5894,24 +5961,6 @@ msgstr "ವಿಳಾಸಪುಸ್ತಕದಿಂದ ಈ ಗೆಳೆಯನ ಸ
 msgid "The username specified is invalid."
 msgstr "ಸೂಚಿಸಲಾದ ಬಳಕೆದಾರ ಹೆಸರು ತಪ್ಪಾಗಿದೆ."
 
-#. 5
-msgid "In Love"
-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 ತಪ್ಪಾಗಿದೆ."
 
@@ -5946,7 +5995,11 @@ msgstr ""
 "ನಿಮ್ಮ ವ್ಯಕ್ತಿಪರಿಚಯ ಮಾಹಿತಿಯನ್ನು ಇನ್ನೂ ಸಹ ಪಡೆಯಲಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ "
 "ಪ್ರಯತ್ನಿಸಿ."
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5954,6 +6007,7 @@ msgid "Verify PIN"
 msgstr "PIN ಅನ್ನು ಪರಿಶೀಲಿಸಿ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ತೋರಿಸುವ ಹೆಸರು"
 
@@ -5980,10 +6034,6 @@ msgstr "ಪ್ರಸಕ್ತ ಯಾವುದೆ ಎರಚು ತೆರೆಯು
 msgid "About"
 msgstr "ಇದರ ಕುರಿತು"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "ಲಹರಿಯನ್ನು ಬದಲಾಯಿಸಿ..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "ವ್ಯಕ್ತಿಪರಿಚಯವನ್ನು ಬದಲಿಸಿ..."
@@ -6018,19 +6068,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit ಪ್ರವೇಶದ ಹೆಸರು"
-
-#. nick name
-msgid "Nick Name"
-msgstr "ಅಡ್ಡಹೆಸರು"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6063,10 +6110,12 @@ 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 ""
 "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಈಗಾಗಲೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಆರಿಸಿ."
 
@@ -6079,7 +6128,7 @@ msgstr "ನೀವು ಸುರಕ್ಷತಾ ಸಂಕೇತವನ್ನು ನ
 msgid "Security Code"
 msgstr "ಸುರಕ್ಷತಾ ಸಂಕೇತ"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "ಸುರಕ್ಷತಾ ಸಂಕೇತವನ್ನು ಬರೆಯಿರಿ"
 
@@ -6105,11 +6154,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")
@@ -6122,6 +6177,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 "ಕೋಣೆ(_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 ನೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ. ದಯವಿಟ್ಟು ಮರಳಿ ಸಂಪರ್ಕಿಸು."
@@ -6226,6 +6303,9 @@ msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿ
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit ಗೆ ಒಂದು ಸಂಪರ್ಕ ದೋಷ ಉಂಟಾಗಿದೆ. (ಓದಿದ ಹಂತ 0x06)"
 
+msgid "In Love"
+msgstr "ಪ್ರೇಮಪಾಶದಲ್ಲಿ"
+
 msgid "Pending"
 msgstr "ಬಾಕಿ ಇರುವ"
 
@@ -6623,9 +6703,6 @@ msgstr "ಗುಪ್ತಪದ ಹಳಸಿದೆ! "
 msgid "Incorrect password"
 msgstr "ತಪ್ಪು ಗುಪ್ತಪದ"
 
-msgid "User not found"
-msgstr "ಬಳಕೆದಾರ ಸಿಗಲಿಲ್ಲ"
-
 msgid "Account has been disabled"
 msgstr "ಖಾತೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 
@@ -6885,12 +6962,73 @@ 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 "ನಿಯಮಗಳನ್ನು ಒಪ್ಪಿಕೊಳ್ಳದ ಹೊರತು 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
+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 "ಆಲೋಚಿಸುತ್ತಿರುವ"
 
@@ -7042,116 +7180,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 "ಪ್ರಚಲಿತದಲ್ಲಿಲ್ಲದ 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 "ಪೋಷಕರ ನಿಯಂತ್ರಣದಿಂದ 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 "ಆಫ್‌ಲೈನ್‌ ಸಂದೇಶದ ಶೇಖರಣೆ ತುಂಬಿದೆ"
-
 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 "
@@ -7514,28 +7542,9 @@ 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 "ಈ ಸಮಯದಿಂದ ಆನ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ"
 
@@ -7966,6 +7975,75 @@ 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 ನಲ್ಲಿದ್ದಾಗ ಅಲ್ಲ"
+
 msgid "Aquarius"
 msgstr "ಕುಂಭ(ಅಕ್ವೇರಿಸ್)"
 
@@ -8249,6 +8327,11 @@ msgstr "ಕೋರಿಕೆ"
 msgid "Admin"
 msgstr "ವ್ಯವಸ್ಥಾಪಕ"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "ಕೋಣೆಗಳ ಪಟ್ಟಿ"
+
 msgid "Notice"
 msgstr "ಸೂಚನೆ"
 
@@ -10159,9 +10242,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
 
-msgid "Pager server"
-msgstr "ಪೇಜರ್ ಪರಿಚಾರಕ"
-
 msgid "Pager port"
 msgstr "ಪೇಜರ್ ಸಂಪರ್ಕಸ್ಥಾನ"
 
@@ -10177,18 +10257,13 @@ 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  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10257,6 +10332,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 "ಬಳಕೆದಾರ ಅಥವ ಗುಪ್ತಪದದ ಹೆಸರು ಕಾಣಿಸುತ್ತಿಲ್ಲ"
@@ -10334,6 +10418,17 @@ msgstr "%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 ""
+"MXit ಪರಿಚಾರಕ(ಸರ್ವರ್) ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ನಿಮ್ಮ ಪರಿಚಾರಕದ "
+"ಸಿದ್ಧತೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "ಮನೆಯಲ್ಲಿಲ್ಲ"
 
@@ -10716,6 +10811,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)"
 
@@ -10954,12 +11053,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 "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
@@ -12118,6 +12211,10 @@ msgstr "ಆಫ್ರಿಕಾನಸ್"
 msgid "Arabic"
 msgstr "ಅರೇಬಿಕ್"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ನಾಚಿಕೆ"
+
 msgid "Belarusian Latin"
 msgstr "ಬೆಲಾರುಸಿಯನ್ ಲ್ಯಾಟಿನ್"
 
@@ -12245,6 +12342,10 @@ msgstr "ಲಾವೋ"
 msgid "Macedonian"
 msgstr "ಮ್ಯಾಕೆಡೊನಿಯನ್"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ಮಲಯ"
+
 msgid "Mongolian"
 msgstr "ಮಂಗೋಲಿಯನ್"
 
@@ -12359,8 +12460,8 @@ msgid ""
 "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>"
+"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 ಅನ್ನು "
@@ -12910,16 +13011,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 ಎಂಬಲ್ಲಿ ಆರಂಭಗೊಳಿಸಲಾದಂತಹ ವ್ಯವಸ್ಥೆಯ ದಾಖಲೆಯನ್ನು ನೀವು ಖಚಿತವಾಗಿಯೂ ಶಾಶ್ವತವಾಗಿ "
 "ಅಳಿಸಿಹಾಕಬೇಕೆಂದಿದ್ದೀರಾ?"
@@ -13026,11 +13127,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ಬೇರೊಂದು libpurple ಕ್ಲೈಂಟ್ ಚಾಲನೆಯಲ್ಲಿರುವುದರಿಂದ ನಿರ್ಗಮಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ಮಾಧ್ಯಮ(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ಮಾಧ್ಯಮ/ಹ್ಯಾಂಗ್‌ಅಪ್(_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "ಹ್ಯಾಂಗ್ಅಪ್"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13828,9 +13931,6 @@ msgstr "ಶಾರ್ಟ್-ಕಟ್ ಪಠ್ಯ"
 msgid "Custom Smiley Manager"
 msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿ ವ್ಯವಸ್ಥಾಪಕ"
 
-msgid "Attention received"
-msgstr "ಗಮನವನ್ನು ಸ್ವೀಕರಿಸಲಾದ"
-
 msgid "Select Buddy Icon"
 msgstr "ಗೆಳೆಯ ಚಿಹ್ನೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
@@ -14970,8 +15070,22 @@ msgid "Timestamp Format Options"
 msgstr "ಸಮಯಮುದ್ರೆ ಸ್ವರೂಪದ ಆಯ್ಕೆಗಳು"
 
 # , c-format
-#, c-format
-msgid "_Force 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force timestamp format:"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪವನ್ನು ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
+
+#, fuzzy
+msgid "Use system default"
+msgstr "ಗಣಕ ಪೂರ್ವನಿಯೋಜಿತ"
+
+# , c-format
+#, fuzzy
+msgid "12 hour time format"
+msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪವನ್ನು ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
+
+# , c-format
+#, fuzzy
+msgid "24 hour time format"
 msgstr "೨೪ ಗಂಟೆ ಸಮಯಸ್ವರೂಪವನ್ನು ಬಲವಂತವಾಗಿ ಸೂಚಿಸಿ(_F)"
 
 msgid "Show dates in..."
@@ -15179,6 +15293,200 @@ 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
+#, 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 "\"%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 "/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)"
 
@@ -15330,9 +15638,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "ಬಳಕೆದಾರ(U)"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ರನ್‍ಟೈಂ ಆವೃತ್ತಿ"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "ಲೆಖ್ಕಹಾಕುತ್ತಿದೆ"
@@ -15625,7 +15930,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."
@@ -15643,8 +15948,8 @@ 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 ಕಡತವೊಂದನ್ನು ಕಳಿಸಲು ನಿಮ್ಮನ್ನು ಕೋರಿದ್ದಾರೆ"
diff --git a/po/ko.po b/po/ko.po
index 4c91c07541..fe3d6fcba6 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "새 메일 알림"
 
@@ -803,7 +816,7 @@ msgstr "입력"
 msgid "Waiting for transfer to begin"
 msgstr "전송 시작을 기다리고 있습니다."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "취소되었습니다."
 
 msgid "Failed"
@@ -1310,6 +1323,10 @@ msgstr "다른 사람이 대화로 이야기 했습니다."
 msgid "Someone says your username in chat"
 msgstr "대화에서 누군가가 내 이름을 입력했을 때"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "등록이 필요합니다."
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 오류"
 
@@ -1412,7 +1429,6 @@ msgid "Saved Statuses"
 msgstr "저장된 상태"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "제목"
 
@@ -1609,7 +1625,7 @@ msgstr ""
 msgid "Online"
 msgstr "온라인"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "오프라인"
 
@@ -1708,6 +1724,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 "알 수 없음"
 
@@ -1725,9 +1749,10 @@ 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."
 msgstr ""
@@ -1962,7 +1987,6 @@ msgstr "%s 해석 중 오류: %d"
 msgid "Thread creation failure: %s"
 msgstr "스레드 생성에 실패했습니다: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "이유를 알 수 없습니다."
 
@@ -3236,6 +3260,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 "이름"
 
@@ -3851,18 +3878,6 @@ 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 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
-"다."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
 
@@ -3895,6 +3910,18 @@ 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 "인증에 실패했습니다."
 
@@ -3903,6 +3930,42 @@ 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 "설정할 수 없습니다."
 
@@ -3977,6 +4040,7 @@ msgstr "구/군"
 msgid "Postal Code"
 msgstr "우편번호"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "국가"
 
@@ -3991,10 +4055,14 @@ msgstr "조직명"
 msgid "Organization Unit"
 msgstr "부서"
 
+msgid "Job Title"
+msgstr "직위"
+
 msgid "Role"
 msgstr "직위"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "생일"
 
@@ -4220,6 +4288,18 @@ 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 "일반 문자열"
 
@@ -4227,6 +4307,9 @@ msgstr "일반 문자열"
 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 ""
 
@@ -4333,7 +4416,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "인증되어 있지 않습니다."
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "기분"
 
@@ -4355,7 +4437,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "없음"
 
@@ -4379,6 +4460,12 @@ msgstr "가운데 이름"
 msgid "Mood Comment"
 msgstr "친구의 코멘트"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4553,9 +4640,6 @@ msgstr "정책 위반"
 msgid "Remote Connection Failed"
 msgstr "리모트 접속이 끊어졌습니다."
 
-msgid "Resource Constraint"
-msgstr "자원 제한"
-
 msgid "Restricted XML"
 msgstr "제한된 XML"
 
@@ -4926,7 +5010,6 @@ msgstr "부끄러움"
 msgid "Amorous"
 msgstr "Glorious"
 
-#. 1
 msgid "Angry"
 msgstr "언짢음"
 
@@ -5024,7 +5107,6 @@ msgstr ""
 msgid "Envious"
 msgstr "걱정됨"
 
-#. 2
 msgid "Excited"
 msgstr "흥분됨"
 
@@ -5043,7 +5125,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "사용자가 무언가를 입력하고 있습니다..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "그룹"
@@ -5052,14 +5133,12 @@ msgstr "그룹"
 msgid "Guilty"
 msgstr "도시"
 
-#. 4
 msgid "Happy"
 msgstr "행복함"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "호스트명(_H):"
@@ -5100,7 +5179,6 @@ msgstr "취미"
 msgid "Intoxicated"
 msgstr "초대"
 
-#. 6
 msgid "Invincible"
 msgstr "무적"
 
@@ -5164,7 +5242,6 @@ msgstr "삭제"
 msgid "Restless"
 msgstr "등록"
 
-#. 7
 msgid "Sad"
 msgstr "슬픔"
 
@@ -5185,12 +5262,10 @@ msgstr "내가 거부됨"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "별명"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "취침"
@@ -5606,20 +5681,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 "제목"
@@ -5771,9 +5832,6 @@ msgstr "기념일"
 msgid "Work"
 msgstr "직종"
 
-msgid "Job Title"
-msgstr "직위"
-
 msgid "Company"
 msgstr "회사"
 
@@ -5863,6 +5921,10 @@ msgstr "HTTP 방식 서버"
 msgid "Show custom smileys"
 msgstr "사용자 이모티콘 표시"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "새로운 접속을 생성할 수 없습니다."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "신호: 사용자를 향해 경고음 발생"
 
@@ -6059,28 +6121,6 @@ msgstr "이 상대를 친구 목록에 추가하시겠습니까?"
 msgid "The username specified is invalid."
 msgstr "지정한 아이디가 잘못되었습니다."
 
-#. 5
-msgid "In Love"
-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 "입력한 보안 ID 키는 잘못되었습니다."
@@ -6117,7 +6157,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"
@@ -6126,6 +6170,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "성"
@@ -6156,11 +6201,6 @@ msgstr ""
 msgid "About"
 msgstr "%s 정보"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "비밀번호 변경..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6200,7 +6240,7 @@ msgid "Connecting..."
 msgstr "접속 중입니다."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
 #, fuzzy
@@ -6208,14 +6248,9 @@ 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"
@@ -6244,10 +6279,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
@@ -6261,7 +6296,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "보안 사용"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "비밀번호 입력"
@@ -6295,12 +6330,17 @@ 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")
@@ -6315,6 +6355,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 ""
@@ -6434,6 +6496,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "연애"
+
 #, fuzzy
 msgid "Pending"
 msgstr "보내기"
@@ -6854,9 +6919,6 @@ msgstr "비밀번호 유효기간이 만료되었습니다."
 msgid "Incorrect password"
 msgstr "비밀번호가 틀립니다."
 
-msgid "User not found"
-msgstr "사용자를 찾을 수 없습니다."
-
 msgid "Account has been disabled"
 msgstr "계정이 사용이 금지되었습니다."
 
@@ -7109,6 +7171,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%s 을(를) 해석하는 중 오류"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "접속할 수 없었습니다."
@@ -7117,6 +7183,67 @@ 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 ""
+
+#, 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 "오프라인 메시지"
+
+#, 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 님에게 메시지를 보낼 수 없습니다."
+
 msgid "Thinking"
 msgstr ""
 
@@ -7282,120 +7409,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 "구형 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 사용 중에는 불가능합니다."
-
-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 "
@@ -7748,29 +7761,10 @@ 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 "접속한 일시"
 
@@ -8190,6 +8184,75 @@ 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 사용 중에는 불가능합니다."
+
 msgid "Aquarius"
 msgstr "물병자리"
 
@@ -8511,6 +8574,11 @@ msgstr "질문 창의 글꼴"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "대화실 목록"
+
 #, fuzzy
 msgid "Notice"
 msgstr "비고"
@@ -10466,9 +10534,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! 프로토콜 플러그인"
 
-msgid "Pager server"
-msgstr "호출기 서버"
-
 msgid "Pager port"
 msgstr "호출기 포트"
 
@@ -10484,18 +10549,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"
@@ -10568,6 +10627,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"
@@ -10654,6 +10722,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 "집에 없음"
 
@@ -11041,6 +11118,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)"
 
@@ -11282,12 +11363,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 "로그인 설정"
@@ -12510,6 +12585,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "아라비아어"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "부끄러움"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12519,6 +12598,10 @@ msgstr "불가리아어"
 msgid "Bengali"
 msgstr "벵갈어"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "벵갈어"
+
 msgid "Bosnian"
 msgstr "보스니아어"
 
@@ -12642,6 +12725,10 @@ msgid "Macedonian"
 msgstr "마케도니아어"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "남"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "마케도니아어"
 
@@ -12764,8 +12851,8 @@ msgid ""
 "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>"
+"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 프로토콜을 모두 이용할 "
@@ -13316,14 +13403,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
@@ -13431,10 +13518,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
@@ -14296,10 +14383,6 @@ msgid "Custom Smiley Manager"
 msgstr "인증 관리자"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "등록이 필요합니다."
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "친구 선택"
 
@@ -15486,8 +15569,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..."
@@ -15698,6 +15793,204 @@ 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 "가임이 사용하는 멀티 플랫폼 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 "이 프로그램을 제거할 수 있는 권한이 없습니다."
+
+#, 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 "접속 생성 중 오류"
@@ -15856,9 +16149,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "사용자명(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ 런타임 버전"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "계산 중..."
@@ -16401,7 +16691,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."
diff --git a/po/ku.po b/po/ku.po
index 4c765b3828..f461b1fa4b 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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û"
 
@@ -815,7 +828,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 +1339,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 +1448,6 @@ msgid "Saved Statuses"
 msgstr "Rewşên Hatine Tomarkirin"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Sernivîs"
 
@@ -1645,7 +1661,7 @@ msgstr ""
 msgid "Online"
 msgstr "Girêdayî"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Negirêdayî"
 
@@ -1743,6 +1759,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"
 
@@ -1760,9 +1784,10 @@ 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."
 msgstr ""
@@ -1998,7 +2023,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."
@@ -3262,6 +3286,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"
 
@@ -3871,18 +3898,6 @@ 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 "
@@ -3917,6 +3932,20 @@ 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"
 
@@ -3925,6 +3954,42 @@ msgid "SASL error: %s"
 msgstr "Çewtiya SASL"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "GirÊdan qut bû."
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Guhertoya Nederbasdar"
+
+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 "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"
 
@@ -3995,6 +4060,7 @@ msgstr "Herêm"
 msgid "Postal Code"
 msgstr "Koda Posteyê"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Welat"
 
@@ -4009,10 +4075,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ê"
 
@@ -4240,6 +4310,18 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, 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."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Deqa rast"
 
@@ -4247,6 +4329,9 @@ msgstr "Deqa rast"
 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 ""
 
@@ -4352,7 +4437,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Destûr Nehat Dayîn"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Baş"
 
@@ -4374,7 +4458,6 @@ msgstr "Bo"
 msgid "None (To pending)"
 msgstr "Ne yek jî (ji bo hilandinê)"
 
-#. 0
 msgid "None"
 msgstr "Ne yek jî"
 
@@ -4398,6 +4481,12 @@ msgstr "Navê navîn"
 msgid "Mood Comment"
 msgstr "Raveya Hevalan"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4573,9 +4662,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"
 
@@ -4940,7 +5026,6 @@ msgstr "Şermdar"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Aciz"
 
@@ -5038,7 +5123,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Bêzar"
 
-#. 2
 msgid "Excited"
 msgstr "Heyecanbûyî"
 
@@ -5056,7 +5140,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Tê Girêdan..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Kom:"
@@ -5065,14 +5148,12 @@ msgstr "Kom:"
 msgid "Guilty"
 msgstr "Bajar"
 
-#. 4
 msgid "Happy"
 msgstr "Dilşad"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5112,7 +5193,6 @@ msgstr "Têxê"
 msgid "Intoxicated"
 msgstr "Vexwîne"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -5176,7 +5256,6 @@ msgstr "Rake"
 msgid "Restless"
 msgstr "Tomarkirin"
 
-#. 7
 msgid "Sad"
 msgstr "Xemgîn"
 
@@ -5197,12 +5276,10 @@ msgstr "(Hat qedexekirin)"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Leqeb"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Xilmaş"
@@ -5625,19 +5702,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"
@@ -5802,9 +5866,6 @@ msgstr ""
 msgid "Work"
 msgstr "Faqsa Kar"
 
-msgid "Job Title"
-msgstr "Sernavê Kar"
-
 msgid "Company"
 msgstr "Şirket"
 
@@ -5901,6 +5962,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 ""
 
@@ -6099,27 +6164,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Evîndar"
-
-#. 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"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Şîfreyê Biguherîne"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
@@ -6156,7 +6200,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"
@@ -6165,6 +6213,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Dîmen"
@@ -6196,11 +6245,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..."
@@ -6244,7 +6288,7 @@ msgid "Connecting..."
 msgstr "Girêdide"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 #, fuzzy
@@ -6252,14 +6296,9 @@ 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"
@@ -6297,10 +6336,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
@@ -6314,7 +6353,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Ewlekarî çalake"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Şîfreyê Binivîse"
@@ -6348,12 +6387,17 @@ 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")
@@ -6368,6 +6412,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 ""
@@ -6487,6 +6553,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Evîndar"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Bişîne"
@@ -6909,9 +6978,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"
 
@@ -7166,6 +7232,10 @@ 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"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Nekarî girêbide"
@@ -7174,6 +7244,67 @@ msgstr "Nekarî girêbide"
 msgid "Invalid chat room name"
 msgstr "Navê Nederbasdar ê Odeyan"
 
+msgid "Invalid error"
+msgstr "Xeletiya nederbasdar"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Pelgeh nayê şandin"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Nikarî cilbendekê bişînî."
+
+#. 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 "Peyam nehat şandin."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Negirêdayî "
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7345,120 +7476,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Xeletiya nederbasdar"
-
-msgid "Invalid SNAC"
-msgstr "SNACa nederbasdar"
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-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'ê"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Pelgeh nayê şandin"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Nikarî cilbendekê bişînî."
-
-#. 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 "Peyam nehat şandin."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Negirêdayî "
-
 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 "
@@ -7804,29 +7821,10 @@ 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î"
@@ -8230,6 +8228,75 @@ 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'ê"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8571,6 +8638,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"
@@ -10466,10 +10538,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ê"
 
@@ -10486,19 +10554,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!"
@@ -10567,6 +10628,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"
@@ -10640,6 +10710,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 ""
 
@@ -11003,6 +11084,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"
 
@@ -11249,12 +11334,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ê"
@@ -12508,6 +12587,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharî"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Şermdar"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12517,6 +12600,10 @@ msgstr "Bulgarî"
 msgid "Bengali"
 msgstr "Bengalî"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalî"
+
 msgid "Bosnian"
 msgstr "Bosnayî"
 
@@ -12638,6 +12725,10 @@ msgid "Macedonian"
 msgstr "Makedonî"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Nêr"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonî"
 
@@ -12761,8 +12852,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13332,14 +13423,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
@@ -13429,10 +13520,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
@@ -14316,10 +14407,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Tomarbûn Divê"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Heval hilbijêre"
 
@@ -15528,7 +15615,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..."
@@ -15738,6 +15835,188 @@ msgstr ""
 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."
+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 ""
+
+#. $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 (pêwîst)"
+
+#. 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 ""
+
+#. 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 "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"
@@ -15860,9 +16139,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bikarhêner:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Guhertoya GTK+Runtime"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Tê hesibandin..."
@@ -17525,9 +17801,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"
 
diff --git a/po/lo.po b/po/lo.po
index ee22b9ad63..71d22c2e3b 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "ອີເເມວລ໌ໃຫ່ມເຕືອນ"
 
@@ -731,7 +744,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1186,6 +1199,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1277,7 +1293,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1465,7 +1480,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1558,6 +1573,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 ""
 
@@ -1575,7 +1596,9 @@ 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."
@@ -1795,7 +1818,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -2989,6 +3011,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 ""
 
@@ -3551,12 +3576,6 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3585,6 +3604,15 @@ 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 ""
 
@@ -3592,6 +3620,37 @@ msgstr ""
 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 ""
 
@@ -3655,6 +3714,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3669,10 +3729,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3885,12 +3949,21 @@ 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 ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3987,7 +4060,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4009,7 +4081,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4029,6 +4100,12 @@ msgstr ""
 msgid "Mood Comment"
 msgstr ""
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4199,9 +4276,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4532,7 +4606,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4615,7 +4688,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4631,21 +4703,18 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 msgid "Grumpy"
 msgstr ""
 
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr ""
 
@@ -4679,7 +4748,6 @@ msgstr ""
 msgid "Intoxicated"
 msgstr ""
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4733,7 +4801,6 @@ msgstr ""
 msgid "Restless"
 msgstr ""
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4752,11 +4819,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5140,18 +5205,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 ""
 
@@ -5297,9 +5350,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5383,6 +5433,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5551,24 +5604,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 ""
 
@@ -5600,7 +5635,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 ""
 
@@ -5608,6 +5647,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5635,10 +5675,6 @@ msgstr ""
 msgid "About"
 msgstr "ບັນຊີທົວໄປ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5669,18 +5705,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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
@@ -5710,10 +5742,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."
@@ -5725,7 +5757,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5751,10 +5783,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
@@ -5768,6 +5804,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 ""
@@ -5872,6 +5925,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -6255,9 +6311,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6496,12 +6549,73 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 ""
 
@@ -6650,116 +6764,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 ""
-
-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 ""
-
-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 ""
-
 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 "
@@ -7072,28 +7076,9 @@ 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 ""
 
@@ -7470,6 +7455,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7752,6 +7806,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -9542,9 +9600,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9560,18 +9615,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 ""
 
@@ -9631,6 +9680,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 ""
@@ -9697,6 +9752,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 ""
 
@@ -10053,6 +10116,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 ""
 
@@ -10283,12 +10350,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 ""
@@ -11413,6 +11474,9 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11422,6 +11486,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11536,6 +11603,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Malayalam"
+msgstr ""
+
 msgid "Mongolian"
 msgstr ""
 
@@ -11650,8 +11720,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12160,14 +12230,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?"
@@ -12254,10 +12324,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 +13115,6 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -14125,7 +14192,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..."
@@ -14320,3 +14396,127 @@ 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."
+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
+#, 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 259bea826c..5d78684b57 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
 
@@ -530,7 +543,7 @@ msgstr "Liudijimų tvarkytuvė"
 msgid "Hostname"
 msgstr "Mazgo vardas"
 
-#  Info button


+#  Info button
 msgid "Info"
 msgstr "Informacija"
 
@@ -621,7 +634,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 +650,7 @@ msgstr "Rodyti laiko žymas"
 msgid "Add Buddy Pounce..."
 msgstr "Sukurti reakciją į bičiulį..."
 
-#  Invite


+#  Invite
 msgid "Invite..."
 msgstr "Pakviesti..."
 
@@ -813,7 +826,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 +849,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 +908,7 @@ msgstr "Pokalbiai su %s"
 msgid "All Conversations"
 msgstr "Visi pokalbiai"
 
-#  Window **********


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


+#  Invite
 msgid "Invite"
 msgstr "Pakviesti"
 
@@ -1046,18 +1059,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 +1078,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 +1151,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 +1207,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 +1309,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 +1406,6 @@ msgid "Saved Statuses"
 msgstr "Išsaugotos būsenos"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Pavadinimas"
 
@@ -1588,17 +1604,17 @@ msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų ž
 msgid "Online"
 msgstr "Prisijungęs"
 
-#. primative,						no,							id,			name
+#. 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ų"
 
@@ -1685,6 +1701,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"
 
@@ -1704,8 +1728,10 @@ 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."
 msgstr ""
@@ -1782,7 +1808,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"
 
@@ -1881,7 +1907,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 "
@@ -1946,7 +1972,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"
 
@@ -2390,7 +2415,7 @@ msgstr "Įveskite savo pastabas žemiau..."
 msgid "Edit Notes..."
 msgstr "Redaguoti pastabas..."
 
-#  "New Buddy Pounce"


+#  "New Buddy Pounce"
 #. *< major version
 #. *< minor version
 #. *< type
@@ -2444,13 +2469,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
@@ -2460,14 +2485,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
@@ -2771,8 +2796,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"
 
@@ -2856,13 +2881,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
@@ -2872,10 +2897,10 @@ msgstr "Pakelti nujaučiamų pokalbių langus"
 msgid "Signals Test"
 msgstr "Signalų testas"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2883,13 +2908,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
@@ -2899,10 +2924,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
@@ -2923,10 +2948,10 @@ msgstr "X.509 liudijimai"
 msgid "GNUTLS"
 msgstr "GNUTLS biblioteka"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -2998,13 +3023,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
@@ -3014,10 +3039,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
@@ -3276,6 +3301,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 +3328,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 +3490,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 +3510,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 +3624,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 +3906,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,13 +3926,6 @@ 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ų "
@@ -3937,6 +3958,20 @@ 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"
 
@@ -3945,6 +3980,42 @@ 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"
 
@@ -4011,7 +4082,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"
 
@@ -4026,10 +4098,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"
 
@@ -4105,9 +4181,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"
@@ -4249,12 +4325,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 "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."
 
@@ -4352,7 +4439,6 @@ msgstr "Serveris nepalaiko blokavimo"
 msgid "Not Authorized"
 msgstr "Prieiga nesuteikta"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nuotaika"
 
@@ -4374,7 +4460,6 @@ msgstr "bičiulio patvirtinta"
 msgid "None (To pending)"
 msgstr "Jokia (laukiama patvirtinimo iš bičiulio)"
 
-#. 0
 msgid "None"
 msgstr "niekaip"
 
@@ -4396,6 +4481,12 @@ msgstr "Antras vardas"
 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"
 
@@ -4566,9 +4657,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"
 
@@ -4612,7 +4700,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"
@@ -4929,7 +5017,6 @@ msgstr "Susigėdęs"
 msgid "Amorous"
 msgstr "Šlovingas"
 
-#. 1
 msgid "Angry"
 msgstr "Piktas"
 
@@ -5027,7 +5114,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Neramus"
 
-#. 2
 msgid "Excited"
 msgstr "Susijaudinęs"
 
@@ -5046,7 +5132,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Išrenkama..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupė"
@@ -5055,14 +5140,12 @@ msgstr "Grupė"
 msgid "Guilty"
 msgstr "Miestas"
 
-#. 4
 msgid "Happy"
 msgstr "Laimingas"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Mazgas:"
@@ -5099,12 +5182,11 @@ msgstr "Indoneziečių kalba"
 msgid "Interested"
 msgstr "Pomėgiai"
 
-#  Invite


+#  Invite
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Pakviesti"
 
-#. 6
 msgid "Invincible"
 msgstr "Nenugalimas"
 
@@ -5168,7 +5250,6 @@ msgstr "Pašalinti"
 msgid "Restless"
 msgstr "Registruotis"
 
-#. 7
 msgid "Sad"
 msgstr "Liūdnas"
 
@@ -5182,7 +5263,7 @@ msgstr ""
 msgid "Serious"
 msgstr "Šlovingas"
 
-#  Block button


+#  Block button
 #, fuzzy
 msgid "Shocked"
 msgstr "Blokuotas"
@@ -5190,12 +5271,10 @@ msgstr "Blokuotas"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Vardas"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Mieguistas"
@@ -5393,7 +5472,7 @@ msgstr "Serveris užimtas"
 msgid "Server unavailable"
 msgstr "Serveris neprieinamas"
 
-# Kaip išversti „peer“?


+# Kaip išversti „peer“?
 msgid "Peer notification server down"
 msgstr "Kitų vartotojų informavimo serveris neprieinamas"
 
@@ -5599,18 +5678,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"
 
@@ -5741,18 +5808,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"
 
@@ -5763,9 +5830,6 @@ msgstr "Sukaktis"
 msgid "Work"
 msgstr "Darbas"
 
-msgid "Job Title"
-msgstr "Pareigos"
-
 msgid "Company"
 msgstr "Kompanija"
 
@@ -5853,6 +5917,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į"
 
@@ -5962,7 +6030,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"
@@ -6050,28 +6118,6 @@ msgstr "Ar norite pašalinti šį bičiulį taip pat ir iš adresų knygos?"
 msgid "The username specified is invalid."
 msgstr "Nurodytas neteisingas vardas."
 
-#. 5
-msgid "In Love"
-msgstr "Įsimylėjęs"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Jūsų dabartinė nuotaika"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Įvestas SecurID raktas yra neteisingas."
@@ -6108,7 +6154,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"
@@ -6117,6 +6167,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Pavardė"
@@ -6147,11 +6198,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..."
@@ -6195,7 +6241,7 @@ msgid "Connecting..."
 msgstr "Jungiamasi"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
 #, fuzzy
@@ -6203,14 +6249,9 @@ 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"
@@ -6239,10 +6280,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
@@ -6256,12 +6297,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"
@@ -6291,12 +6332,17 @@ 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")
@@ -6311,6 +6357,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 ""
@@ -6430,12 +6498,15 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-#  Build the Send As menu


+msgid "In Love"
+msgstr "Įsimylėjęs"
+
+#  Build the Send As menu
 #, fuzzy
 msgid "Pending"
 msgstr "Siunčiama"
 
-#  Invite


+#  Invite
 #, fuzzy
 msgid "Invited"
 msgstr "Pakviesti"
@@ -6835,9 +6906,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"
 
@@ -6981,7 +7049,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"
 
@@ -7095,12 +7163,78 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL neleidžia jūsų vardui prisijungti"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Užklausos %s metu gauta klaida: %s"
+
 msgid "Could not join chat room"
 msgstr "Nepavyko prisijungti prie pokalbių kambario"
 
 msgid "Invalid chat room name"
 msgstr "Neteisingas pokalbių kambario pavadinimas"
 
+msgid "Invalid error"
+msgstr "Neteisinga klaida"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Negalima išsiųsti failo"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Negalima siųsti katalogo."
+
+#. 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 "Negalima išsiųsti žinutės."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Atjungta žinutė"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7193,7 +7327,7 @@ msgstr "Dirba"
 msgid "Listening to music"
 msgstr "Klausausi muzikos"
 
-#  Build the Send As menu


+#  Build the Send As menu
 #, fuzzy
 msgid "Studying"
 msgstr "Siunčiama"
@@ -7205,17 +7339,17 @@ 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


+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7232,15 +7366,15 @@ msgstr "AIM protokolo papildinys"
 msgid "ICQ UIN..."
 msgstr "ICQ UIN..."
 
-#  *< 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
@@ -7289,120 +7423,6 @@ msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 "Failas „%s“ yra %s dydžio – didesnis nei maksimalus leidžiamas dydis %s."
 
-msgid "Invalid error"
-msgstr "Neteisinga klaida"
-
-msgid "Invalid SNAC"
-msgstr "Neteisingas SNAC"
-
-msgid "Rate to host"
-msgstr "Sparta į mazgą"
-
-msgid "Rate to client"
-msgstr "Sparta į klientą"
-
-msgid "Service unavailable"
-msgstr "Tarnyba neprieinama"
-
-msgid "Service not defined"
-msgstr "Tarnyba neaprašyta"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC pasenęs"
-
-msgid "Not supported by host"
-msgstr "Nepalaikoma mazgo"
-
-msgid "Not supported by client"
-msgstr "Nepalaikoma kliento"
-
-msgid "Refused by client"
-msgstr "Atsisakyta kliento"
-
-msgid "Reply too big"
-msgstr "Atsakas per didelis"
-
-msgid "Responses lost"
-msgstr "Prarasti atsakai"
-
-msgid "Request denied"
-msgstr "Užklausa negalima"
-
-msgid "Busted SNAC payload"
-msgstr "Neteisingas SNAC turinys"
-
-msgid "Insufficient rights"
-msgstr "Nepakankamos teisės"
-
-msgid "In local permit/deny"
-msgstr "Yra vietiniame leidimo ar draudimo sąraše"
-
-msgid "Warning level too high (sender)"
-msgstr "Per aukštas siuntėjo perspėjimo lygis"
-
-msgid "Warning level too high (receiver)"
-msgstr "Per aukštas gavėjo perspėjimo lygis"
-
-msgid "User temporarily unavailable"
-msgstr "Vartotojas laikinai neprieinamas"
-
-msgid "No match"
-msgstr "Nėra atitikmens"
-
-msgid "List overflow"
-msgstr "Sąrašo perpildymas"
-
-msgid "Request ambiguous"
-msgstr "Nevienareikšmė užklausa"
-
-msgid "Queue full"
-msgstr "Eilė pilna"
-
-msgid "Not while on AOL"
-msgstr "Negalima prisijungus per AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Negalima išsiųsti failo"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Negalima siųsti katalogo."
-
-#. 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 "Negalima išsiųsti žinutės."
-
-#, fuzzy
-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 "
@@ -7422,7 +7442,7 @@ 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
 #. Label
 msgid "Buddy Icon"
 msgstr "Vartotojo paveiksliukas"
@@ -7781,30 +7801,10 @@ 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"
 
@@ -7817,7 +7817,7 @@ 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!
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
@@ -8245,6 +8245,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vandenis"
 
@@ -8332,7 +8401,7 @@ msgstr "Privatus"
 msgid "QQ Number"
 msgstr "QQ numeris"
 
-#  Country


+#  Country
 msgid "Country/Region"
 msgstr "Šalis ar regionas"
 
@@ -8372,11 +8441,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"
 
@@ -8404,7 +8473,7 @@ msgstr "Nepavyko pakeisti bičiulio informacijos."
 msgid "Note"
 msgstr "Pastabos"
 
-#  Label


+#  Label
 #. callback
 msgid "Buddy Memo"
 msgstr "Pastabos apie bičiulį"
@@ -8437,7 +8506,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"
 
@@ -8532,6 +8601,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"
 
@@ -8774,15 +8848,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
@@ -9030,7 +9104,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: "
 
@@ -9974,7 +10048,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"
 
@@ -10177,16 +10251,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
@@ -10199,7 +10273,7 @@ msgstr ""
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolo papildinys"
 
-#  *  description


+#  *  description
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "SILC papildinys"
@@ -10404,16 +10478,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
@@ -10425,16 +10499,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"
@@ -10483,9 +10557,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"
 
@@ -10501,18 +10572,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..."
 
@@ -10581,6 +10647,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"
@@ -10659,6 +10734,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"
 
@@ -10698,7 +10784,7 @@ msgstr "Prisijungti prie pokalbio"
 msgid "Initiate Conference"
 msgstr "Inicijuoti konferenciją"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "Presence Settings"
 msgstr "Būsenos nuostatos"
 
@@ -11005,7 +11091,7 @@ msgstr "Atskleidimas"
 msgid "Unable to create socket: %s"
 msgstr "Nepavyko sukurti jungties: %s"
 
-#  Data is assumed to be the destination sn


+#  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"
@@ -11031,8 +11117,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.
 #.
@@ -11045,6 +11131,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"
 
@@ -11289,12 +11379,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"
@@ -11325,13 +11409,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"
 
@@ -11347,7 +11431,7 @@ msgstr "SOCKS 4"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 msgid "Use Environmental Settings"
 msgstr "naudoti aplinkos nuostatas"
 
@@ -11570,11 +11654,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"
 
@@ -11635,7 +11719,7 @@ msgstr "_Pašalinti grupę"
 msgid "_Rename"
 msgstr "P_ervadinti"
 
-#  join button


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


+#  Use Environmental Settings
 msgid "_Edit Settings..."
 msgstr "K_eisti nuostatas..."
 
@@ -11681,7 +11765,7 @@ msgstr "Alternatyvusis vardas (neprivalomas)"
 msgid "Edit User Mood"
 msgstr "Nustatyti vartotojo nuotaiką"
 
-#  Buddies menu


+#  Buddies menu
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Bičiuliai"
@@ -11698,7 +11782,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"
 
@@ -11708,21 +11792,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"
 
@@ -11745,7 +11829,7 @@ msgstr "/_Paskyros"
 msgid "/Accounts/Manage Accounts"
 msgstr "/Paskyros/Tvarkyti paskyras"
 
-#  Tools


+#  Tools
 #. Tools
 msgid "/_Tools"
 msgstr "/_Įrankiai"
@@ -11784,7 +11868,7 @@ msgstr "/Įrankiai/_Sistemos žurnalas"
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Išjungti _garsus"
 
-#  Help


+#  Help
 #. Help
 msgid "/_Help"
 msgstr "/Pa_galba"
@@ -11869,7 +11953,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..."
 
@@ -11963,8 +12047,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
 #.
@@ -11974,13 +12058,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"
 
@@ -11993,7 +12077,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:"
 
@@ -12054,12 +12138,12 @@ 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"
 
@@ -12134,7 +12218,7 @@ msgstr "Keisti dydį"
 msgid "Show All"
 msgstr "Viską rodyti"
 
-#  Conversation menu


+#  Conversation menu
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/_Pokalbis"
@@ -12212,7 +12296,7 @@ msgstr "/Pokalbis/Įt_erpti paveiksliuką..."
 msgid "/Conversation/_Close"
 msgstr "/Pokalbis/U_žverti"
 
-#  Options


+#  Options
 #. Options
 msgid "/_Options"
 msgstr "/P_arinktys"
@@ -12232,11 +12316,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
@@ -12317,16 +12401,16 @@ 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"
@@ -12339,7 +12423,7 @@ msgstr "Uždaryti šią kortelę"
 msgid "Find:"
 msgstr "Paieška"
 
-#  Setup the label telling how many people are in the room.


+#  Setup the label telling how many people are in the room.
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12502,6 +12586,10 @@ 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"
 
@@ -12511,6 +12599,10 @@ msgstr "Bulgarų kalba"
 msgid "Bengali"
 msgstr "Bengalų kalba"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalų kalba"
+
 msgid "Bosnian"
 msgstr "Bosnių kalba"
 
@@ -12625,6 +12717,10 @@ msgstr "Laosiečių kalba"
 msgid "Macedonian"
 msgstr "Makedoniečių kalba"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Vyras"
+
 msgid "Mongolian"
 msgstr "Mongolų kalba"
 
@@ -12743,16 +12839,16 @@ msgid ""
 "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>"
+"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>"
 
@@ -13088,7 +13184,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"
 
@@ -13178,7 +13274,7 @@ msgstr ""
 "šypsenelė:\n"
 "%s"
 
-#  show everything


+#  show everything
 msgid "Smile!"
 msgstr "Šypsokis!"
 
@@ -13230,7 +13326,7 @@ msgstr "Įterpti vaizdą"
 msgid "Insert Smiley"
 msgstr "Įterpti šypsenėlę"
 
-#  Build the Send As menu


+#  Build the Send As menu
 #, fuzzy
 msgid "Send Attention"
 msgstr "Siuntimo mygtukas"
@@ -13277,7 +13373,7 @@ msgstr "_nuorodą"
 msgid "_Horizontal rule"
 msgstr "_Horizontali linija"
 
-#  show everything


+#  show everything
 msgid "_Smile!"
 msgstr "_Šypsokitės!"
 
@@ -13299,14 +13395,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?"
@@ -13411,11 +13507,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."
@@ -13428,7 +13526,7 @@ msgstr "%s nori pradėti vaizdo pokalbį su jumis."
 msgid "Incoming Call"
 msgstr "Įeinantis skambutis"
 
-#  Pause button


+#  Pause button
 msgid "_Pause"
 msgstr "_Sustabdyti"
 
@@ -13470,7 +13568,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į"
 
@@ -13531,7 +13629,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"
@@ -13602,7 +13700,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 į"
 
@@ -13700,31 +13798,31 @@ msgstr "Spartieji klavišai"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Uždaryti p_okalbius grįžimo („Escape“) klavišu"
 
-#  *< api_version


-#  *< type


-#  *< ui_requirement


-#  *< flags


-#  *< dependencies


-#  *< priority


-#  *< id


+#  *< 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"
 
@@ -13734,7 +13832,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"
 
@@ -13748,14 +13846,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:"
 
@@ -13819,7 +13917,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."
@@ -14102,7 +14200,7 @@ msgstr "Programos paleidimo metu nustatyti būseną:"
 msgid "Interface"
 msgstr "Sąsaja"
 
-#  We use the registered default browser in windows


+#  We use the registered default browser in windows
 msgid "Browser"
 msgstr "Naršyklė"
 
@@ -14252,7 +14350,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ę"
 
@@ -14263,7 +14361,7 @@ msgstr "_Paveiksliukas:"
 msgid "S_hortcut text:"
 msgstr "_Sekos klavišų kombinacija:"
 
-#  show everything


+#  show everything
 msgid "Smiley"
 msgstr "Šypsenėlė"
 
@@ -14273,10 +14371,6 @@ msgstr "Sekos klavišų kombinacija"
 msgid "Custom Smiley Manager"
 msgstr "Nuosavų šypsenėlių tvarkytuvė"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Būtinas aktyvavimas"
-
 msgid "Select Buddy Icon"
 msgstr "Pasirinkti bičiulio paveiksliuką"
 
@@ -14440,7 +14534,7 @@ msgstr "Uždaryti kor_teles"
 msgid "_Get Info"
 msgstr "_Gauti informaciją"
 
-#  Invite


+#  Invite
 msgid "_Invite"
 msgstr "Pakv_iesti"
 
@@ -14570,7 +14664,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"
 
@@ -14686,14 +14780,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
@@ -14703,15 +14797,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 ""
@@ -14731,7 +14825,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"
@@ -14745,16 +14839,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 "
@@ -14789,7 +14883,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 "
@@ -14802,7 +14896,7 @@ msgstr ""
 msgid "User _details"
 msgstr "Vartotojo _duomenys"
 
-#  "Associate Buddy" button


+#  "Associate Buddy" button
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
 msgstr "_Susieti bičiulį"
@@ -14822,25 +14916,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
@@ -14866,7 +14960,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:"
@@ -14880,13 +14974,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
@@ -14896,10 +14990,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
@@ -14907,7 +15001,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"
@@ -14919,13 +15013,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
@@ -14935,10 +15029,10 @@ msgstr "Istorija"
 msgid "Iconify on Away"
 msgstr "Suskleisti pasitraukiant"
 
-#  *< name


-#  *< version


-#  *  summary


-#  *  description


+#  *< name
+#  *< version
+#  *  summary
+#  *  description
 #. *< name
 #. *< version
 #. *  summary
@@ -15025,7 +15119,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:"
@@ -15036,7 +15130,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:"
@@ -15044,17 +15138,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ą"
@@ -15062,55 +15156,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
@@ -15120,10 +15214,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
@@ -15167,7 +15261,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"
 
@@ -15184,7 +15278,7 @@ msgstr "Pokalbio įrašas"
 msgid "Request Dialog"
 msgstr "Užklausos dialogas"
 
-#  ---------- "Notify For" ----------


+#  ---------- "Notify For" ----------
 msgid "Notify Dialog"
 msgstr "Informacinis dialogas"
 
@@ -15208,13 +15302,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"
 
@@ -15237,13 +15331,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"
 
@@ -15277,13 +15371,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
@@ -15293,16 +15387,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 "
@@ -15311,7 +15405,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
@@ -15323,7 +15417,7 @@ msgstr ""
 msgid "Send Button"
 msgstr "Siuntimo mygtukas"
 
-#  IM Convo trans options


+#  IM Convo trans options
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
@@ -15450,13 +15544,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"
 
@@ -15472,13 +15566,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
@@ -15489,13 +15583,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
@@ -15543,8 +15637,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..."
@@ -15609,7 +15715,7 @@ msgstr "P_apildinys"
 msgid "D_evice"
 msgstr "Į_renginys"
 
-#  Use Environmental Settings


+#  Use Environmental Settings
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -15636,7 +15742,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"
@@ -15653,7 +15759,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"
@@ -15673,16 +15779,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 "
@@ -15695,8 +15801,8 @@ msgstr ""
 "\n"
 "* Pastaba: šis papildinys reikalauja Windows 2000 arba vėlesnės versijos."
 
-#  Autostart


-#  Autostart


+#  Autostart
+#  Autostart
 #. Autostart
 msgid "Startup"
 msgstr "Paleidimas"
@@ -15712,7 +15818,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:"
@@ -15745,7 +15851,7 @@ 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:"
 
@@ -15763,6 +15869,209 @@ msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
 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."
+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 "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."
 
@@ -15806,7 +16115,7 @@ msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
 #~ msgid "Unable to add user on %s (%s)"
 #~ msgstr "Negalima pridėti vartotojo paskyroje %s (%s)"
 
-#  Data is assumed to be the destination sn


+#  Data is assumed to be the destination sn
 #~ msgid "Unable to block user on %s (%s)"
 #~ msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
 
@@ -15938,8 +16247,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/mk.po b/po/mk.po
index aa42ff868b..a24446400a 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-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 "Да го авторизирам пријателот?"
@@ -793,7 +806,7 @@ msgstr "Стопирај"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да започне преносот"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажано"
 
 msgid "Failed"
@@ -1266,6 +1279,10 @@ msgstr "Другите зборуваат во разговор"
 msgid "Someone says your username in chat"
 msgstr "Некој го напишал Вашето име во разговорот"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна е регистрација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer не успеа"
 
@@ -1359,7 +1376,6 @@ msgid "Saved Statuses"
 msgstr "Зачувани статуси"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Наслов"
 
@@ -1557,7 +1573,7 @@ msgstr ""
 msgid "Online"
 msgstr "Поврзано"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Офлајн"
 
@@ -1650,6 +1666,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 "Непознато"
 
@@ -1670,9 +1694,10 @@ 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."
@@ -1909,7 +1934,6 @@ msgstr "Грешка при преведување на %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Креирањето на нишката не успеа: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Непозната причина"
 
@@ -3201,6 +3225,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 "Име"
 
@@ -3813,14 +3840,6 @@ 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 ""
 "Серверот бара проверка на автентичност со чист текст преку неенкриптиран тек"
@@ -3854,6 +3873,19 @@ 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 "Проверката не успеа"
 
@@ -3862,6 +3894,42 @@ 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 "Не можам да конфигурирам"
 
@@ -3936,6 +4004,7 @@ msgstr "Регион"
 msgid "Postal Code"
 msgstr "Поштенски број"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Држава"
 
@@ -3950,10 +4019,14 @@ msgstr "Име на организација"
 msgid "Organization Unit"
 msgstr "Организациона единица"
 
+msgid "Job Title"
+msgstr "Наслов на работака"
+
 msgid "Role"
 msgstr "Улога"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Роденден"
 
@@ -4180,12 +4253,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 "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 ид. Мора да поставите домен."
 
@@ -4287,7 +4372,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Не сте авторизирани"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Расположение"
 
@@ -4309,7 +4393,6 @@ msgstr "До"
 msgid "None (To pending)"
 msgstr "Ништо (се чека)"
 
-#. 0
 msgid "None"
 msgstr "Ништо"
 
@@ -4331,6 +4414,12 @@ msgstr "Средно име"
 msgid "Mood Comment"
 msgstr "Коментар за пријател"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Артист за песната"
 
@@ -4501,9 +4590,6 @@ msgstr "Прекршување на правилата"
 msgid "Remote Connection Failed"
 msgstr "Далечната врска не успеа"
 
-msgid "Resource Constraint"
-msgstr "Задржување на ресурси"
-
 msgid "Restricted XML"
 msgstr "Забранет XML"
 
@@ -4860,7 +4946,6 @@ msgstr "Засрамен"
 msgid "Amorous"
 msgstr "Сјајно"
 
-#. 1
 msgid "Angry"
 msgstr "Лут"
 
@@ -4958,7 +5043,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Вознемирен"
 
-#. 2
 msgid "Excited"
 msgstr "Возбуден"
 
@@ -4977,7 +5061,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Земам..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
@@ -4986,14 +5069,12 @@ msgstr "Група"
 msgid "Guilty"
 msgstr "Град"
 
-#. 4
 msgid "Happy"
 msgstr "Среќен"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Хост:"
@@ -5034,7 +5115,6 @@ msgstr "Интереси"
 msgid "Intoxicated"
 msgstr "Покани"
 
-#. 6
 msgid "Invincible"
 msgstr "Непобедлив"
 
@@ -5098,7 +5178,6 @@ msgstr "Отстрани"
 msgid "Restless"
 msgstr "Регистрирај"
 
-#. 7
 msgid "Sad"
 msgstr "Тажен"
 
@@ -5119,12 +5198,10 @@ msgstr "Блокирано"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Прекар"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Сонлив"
@@ -5530,18 +5607,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 "Наслов на песната"
@@ -5696,9 +5761,6 @@ msgstr "Годишнина"
 msgid "Work"
 msgstr "Работа"
 
-msgid "Job Title"
-msgstr "Наслов на работака"
-
 msgid "Company"
 msgstr "Компанија"
 
@@ -5788,6 +5850,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 на корисник за да го привлечете вниманието"
 
@@ -5995,28 +6061,6 @@ msgstr "Дали сакате да го додадете овој пријате
 msgid "The username specified is invalid."
 msgstr "Името за екранот е невалидно."
 
-#. 5
-msgid "In Love"
-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 клучот кој го внесовте е невалиден."
@@ -6053,7 +6097,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"
@@ -6062,6 +6110,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -6092,11 +6141,6 @@ msgstr ""
 msgid "About"
 msgstr "За %s"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Промени ја лозинката..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6140,7 +6184,7 @@ msgid "Connecting..."
 msgstr "Поврзување"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID клучот кој го внесовте е невалиден."
 
 #, fuzzy
@@ -6148,14 +6192,9 @@ 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"
@@ -6184,10 +6223,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
@@ -6201,7 +6240,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Безбедноста е овозможена"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Внесете лозинка:"
@@ -6235,12 +6274,17 @@ 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")
@@ -6255,6 +6299,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 ""
@@ -6374,6 +6440,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Заљубен"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Испраќам"
@@ -6765,9 +6834,6 @@ msgstr "Рокот на лозинката истече"
 msgid "Incorrect password"
 msgstr "Грешна лозинка"
 
-msgid "User not found"
-msgstr "Корисникот не е пронајден"
-
 msgid "Account has been disabled"
 msgstr "Сметката е оневозможена"
 
@@ -6855,8 +6921,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)."
@@ -6902,8 +6968,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)."
@@ -7028,12 +7094,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 "Офлајн порака"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7198,120 +7329,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 "Застарен 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 "
@@ -7678,29 +7695,10 @@ 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 "Поврзан од"
 
@@ -8145,6 +8143,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -8466,6 +8533,11 @@ msgstr "Дијалог со барање"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Листа со соби"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Белешка"
@@ -10423,9 +10495,6 @@ msgstr "Yahoo! Ид."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Приклучок за Yahoo протоколот"
 
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
 msgid "Pager port"
 msgstr "Порта на пејџер"
 
@@ -10441,18 +10510,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! Ид."
@@ -10523,6 +10586,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"
@@ -10609,6 +10681,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 "Не сум дома"
 
@@ -10997,6 +11080,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 "_Прифати"
 
@@ -11243,12 +11330,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 "Логин опции"
@@ -12455,6 +12536,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Засрамен"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -12464,6 +12549,10 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnian"
 
@@ -12582,6 +12671,10 @@ msgid "Macedonian"
 msgstr "Македонски"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Машко"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Македонски"
 
@@ -12700,8 +12793,8 @@ msgid ""
 "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>"
+"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, "
@@ -13261,24 +13354,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 "Да го избришам логот?"
@@ -13381,10 +13474,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
@@ -14244,10 +14337,6 @@ msgid "Custom Smiley Manager"
 msgstr "Менаџер за сертификати"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Потребна е регистрација"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Избери пријател"
 
@@ -15436,8 +15525,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..."
@@ -15650,6 +15751,203 @@ msgstr "Испрати и прими чисти XMPP делови."
 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
+#, 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 ""
+
+#, 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 "Грешка во креирањето на врска"
@@ -15809,9 +16107,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "_User:"
 #~ msgstr "_Корисник:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Верзија на GTK+ Runtime"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "_Пресметувам..."
@@ -16372,7 +16667,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."
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 389823cb1c..d6528b9e5d 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "Шинэ мэйлийн сануулга"
 
@@ -761,7 +774,7 @@ msgstr "Зогсоох"
 msgid "Waiting for transfer to begin"
 msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 msgid "Failed"
@@ -1229,6 +1242,9 @@ msgstr "Бусад нь чатаар байхад"
 msgid "Someone says your username in chat"
 msgstr "Хэн нэгэн чатад таны хэрэглэгчийн нэрийг хэлэхэд"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1322,7 +1338,6 @@ msgid "Saved Statuses"
 msgstr "Хадгалагдсан Төлөвүүд"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Гарчиг"
 
@@ -1511,7 +1526,7 @@ msgstr ""
 msgid "Online"
 msgstr "Онлайн"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Оффлайн"
 
@@ -1604,6 +1619,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 "Үл мэдэгдэх"
 
@@ -1621,9 +1644,10 @@ 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."
 msgstr ""
@@ -1853,7 +1877,6 @@ msgstr "Холболт үүсгэх алдаа"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Үл мэдэгдэх шалтгаан"
 
@@ -3074,6 +3097,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 "Нэр"
 
@@ -3648,14 +3674,6 @@ msgstr "Ad-Hoc Команд Биелэгдээгүй"
 msgid "execute"
 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 дэмжлэг олдсонгүй."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3685,6 +3703,15 @@ 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 "SSL Холболт амжилтгүй болсон"
@@ -3694,6 +3721,42 @@ 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 "Тохиргоо хийх боломжгүй"
 
@@ -3767,6 +3830,7 @@ msgstr "Бүс нутаг"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Улс"
 
@@ -3781,10 +3845,14 @@ msgstr "Байгууллагын нэр"
 msgid "Organization Unit"
 msgstr "Байгуулагын нэгж"
 
+msgid "Job Title"
+msgstr "Ажлын нэр"
+
 msgid "Role"
 msgstr "Үүрэг"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Төрсөн өдөр"
 
@@ -4004,12 +4072,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 "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. Домэйныг тохируулах хэрэгтэй."
 
@@ -4107,7 +4187,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4129,7 +4208,6 @@ msgstr "Рүү"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4151,6 +4229,12 @@ msgstr "Бүлгийн нэр"
 msgid "Mood Comment"
 msgstr "Харилцагчийн Тайлбар"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Ая зохиогч"
 
@@ -4321,9 +4405,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "Алсын холболт тасарсан"
 
-msgid "Resource Constraint"
-msgstr "Нөөцын хязгаарлалт"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4672,7 +4753,6 @@ msgstr "Ичсэн"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Ууртай"
 
@@ -4769,7 +4849,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Санаа зовоосон"
 
-#. 2
 msgid "Excited"
 msgstr "Баярлуулах"
 
@@ -4787,7 +4866,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Хайж байна..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Бүлэг"
@@ -4796,14 +4874,12 @@ msgstr "Бүлэг"
 msgid "Guilty"
 msgstr "Хот"
 
-#. 4
 msgid "Happy"
 msgstr "Аж жаргалтай"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "Хост:"
@@ -4844,7 +4920,6 @@ msgstr "Сонирхол"
 msgid "Intoxicated"
 msgstr "Урих"
 
-#. 6
 msgid "Invincible"
 msgstr "Дийлдэшгүй"
 
@@ -4907,7 +4982,6 @@ msgstr "Устгах"
 msgid "Restless"
 msgstr "Бүртгүүлэх"
 
-#. 7
 msgid "Sad"
 msgstr "Уйтгартай"
 
@@ -4928,11 +5002,9 @@ msgstr "Хаагдсан"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Нойрмог"
@@ -5328,18 +5400,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 "Аяны нэр"
@@ -5490,9 +5550,6 @@ msgstr "Төрсөн өдөр"
 msgid "Work"
 msgstr "Ажил"
 
-msgid "Job Title"
-msgstr "Ажлын нэр"
-
 msgid "Company"
 msgstr "Компани"
 
@@ -5577,6 +5634,10 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Холболт үүсгэх боломжгүй"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5758,28 +5819,6 @@ msgstr "Харилцагчийн жагсаалтанд энэ харилцаг�
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 түлхүүр буруу байна."
@@ -5816,7 +5855,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 ""
 
@@ -5824,6 +5867,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Гэрийн нэр"
@@ -5854,11 +5898,6 @@ msgstr ""
 msgid "About"
 msgstr "%s ийн талаар"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Нууц үгийг солих..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5898,7 +5937,7 @@ msgid "Connecting..."
 msgstr "Серверт холбогдох"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
 #, fuzzy
@@ -5906,14 +5945,9 @@ 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"
@@ -5942,10 +5976,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
@@ -5959,7 +5993,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Хамгаалалтыг идэвхтэй болгосон"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Нууц үг оруул"
@@ -5993,12 +6027,17 @@ 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")
@@ -6013,6 +6052,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 ""
@@ -6132,6 +6192,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Хайртай"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Илгээж байна"
@@ -6522,9 +6585,6 @@ msgstr "Нууц үгийн хугацаа дууссан"
 msgid "Incorrect password"
 msgstr "Буруу нууц үг"
 
-msgid "User not found"
-msgstr "Хэрэглэгч олдсонгүй"
-
 msgid "Account has been disabled"
 msgstr "Бүртгэлийг идэвхгүй болгосон"
 
@@ -6768,12 +6828,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%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 ""
+
+#, 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 "Оффлайн мессеж"
+
+#, 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 рүү мессеж илгээх боломжгүй:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -6939,120 +7064,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 ""
-
-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 ""
-
-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 "
@@ -7394,29 +7405,10 @@ 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 "Онлайн болсоноос хойш"
 
@@ -7801,6 +7793,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8115,6 +8176,11 @@ msgstr "Буруу хүсэлт"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Өрөөний Жагсаалт"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Тэмдэглэл"
@@ -9975,9 +10041,6 @@ msgstr "Yahoo! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Портокол Нэмэлт програм"
 
-msgid "Pager server"
-msgstr "Пежер сервер"
-
 msgid "Pager port"
 msgstr "Пежер порт"
 
@@ -9993,18 +10056,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"
@@ -10067,6 +10124,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"
@@ -10140,6 +10203,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 "Гэртээ байхгүй байна"
 
@@ -10511,6 +10583,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 "Зөвшөөрөх"
 
@@ -10744,12 +10820,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 "Нэвтрэх Сонголт"
@@ -11936,6 +12006,10 @@ msgstr "Өмнөд Африкийн хэл"
 msgid "Arabic"
 msgstr "Араб хэл"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ичсэн"
+
 msgid "Belarusian Latin"
 msgstr "Беларусын Латин хэл"
 
@@ -11945,6 +12019,10 @@ msgstr "Болгари хэл"
 msgid "Bengali"
 msgstr "Бенгали хэл"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Бенгали хэл"
+
 msgid "Bosnian"
 msgstr "Боснини хэл"
 
@@ -12062,6 +12140,10 @@ msgid "Macedonian"
 msgstr "Македони хэл"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "эр"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Македони хэл"
 
@@ -12180,8 +12262,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12704,14 +12786,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?"
@@ -12798,10 +12880,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
@@ -13633,9 +13715,6 @@ msgstr "Товчны хослол"
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Харилцагч Сонгох"
@@ -14761,8 +14840,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..."
@@ -14965,6 +15053,191 @@ msgstr ""
 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."
+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
+#, 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 ""
+
+#, 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 "Холболт үүсгэх алдаа"
@@ -15329,7 +15602,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."
diff --git a/po/mr.po b/po/mr.po
index 158f7189c8..530a3b84d1 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-10 18:27+0530\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-05-03 14:42+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
-"Language-Team: Marathi <fedora-trans-mr@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"
@@ -60,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 "नवीन मेल/टपाल सूचना"
 
@@ -722,7 +735,7 @@ msgid "Filter:"
 msgstr "गाळण:"
 
 msgid "Pause"
-msgstr "Pause"
+msgstr "थांबा"
 
 #, c-format
 msgid "File Transfers - %d%% of %d file"
@@ -766,7 +779,7 @@ msgstr "थांबा"
 msgid "Waiting for transfer to begin"
 msgstr "स्थानांतर सुरू करण्याची प्रतिक्षा करत आहे"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द केले"
 
 msgid "Failed"
@@ -1231,6 +1244,9 @@ msgstr "इतर संभाषणामध्ये बोलत आहेत
 msgid "Someone says your username in chat"
 msgstr "कुणितरी संभाषणमध्ये तुमचे वापरकर्तानाव घेत आहे"
 
+msgid "Attention received"
+msgstr "सावधानता प्राप्त"
+
 msgid "GStreamer Failure"
 msgstr "Gस्ट्रीमर अपयशी"
 
@@ -1324,7 +1340,6 @@ msgid "Saved Statuses"
 msgstr "जतन केलेली स्थिर उपयुक्तता"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "शीर्षक"
 
@@ -1470,7 +1485,7 @@ msgid ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-" साधने -> प्राधान्ये -> लॉगिंग कडून लॉगिंग सक्षम करू शकता.\n"
+" साधणे -> प्राधान्ये -> लॉगिंग कडून लॉगिंग सक्षम करू शकता.\n"
 "तात्काळ संदेशा आणि/किंवा संभाषणासाठी लॉग्जला  सक्षम केल्याने  समान प्रकारच्या संवादासाठी  "
 "इतिहासास कार्यान्वित करेल."
 
@@ -1519,7 +1534,7 @@ msgstr "URL(s) पासून संदेश प्राप्त करत�
 msgid "Online"
 msgstr "ऑनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ऑफलाईन"
 
@@ -1612,6 +1627,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 "अपरिचीत"
 
@@ -1631,8 +1652,10 @@ 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 "प्रमाणपत्राची वेळ समाप्त झाली आहे व त्यामुळे त्यांस वैध समझणे अशक्य आहे."
@@ -1868,7 +1891,6 @@ msgstr "%s ला पुनीकोड मध्ये रूपांतरी
 msgid "Thread creation failure: %s"
 msgstr "संबद्ध संदेशमालिका निर्मिती  अयशस्वी झाली: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "अपरिचीत कारण"
 
@@ -3124,6 +3146,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 "प्रथमनाव"
 
@@ -3584,8 +3609,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;:कृती करा."
@@ -3725,12 +3750,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 " सर्व्हरला अनक्रिप्टेड स्ट्रिम वर प्लेन मजकूर प्रमाणिकी करण्याची आवश्यकता आहे"
 
@@ -3761,6 +3780,18 @@ 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 ओळख पटवणे अपयशी"
 
@@ -3768,6 +3799,39 @@ 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 ""
+"सर्व्हर चॅनल बाईंडिंगकरीता समर्थन पुरवत नाही, परंतु त्यांस जाहिर देखील करत नाही.  शक्यतया "
+"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 "वापरकर्तानाव कॅनॉनीकल करणे अशक्य"
 
@@ -3831,6 +3895,7 @@ msgstr "प्रदेश"
 msgid "Postal Code"
 msgstr "पोस्टाचा कोड"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "देश"
 
@@ -3845,10 +3910,14 @@ msgstr "संस्थेचे नाव"
 msgid "Organization Unit"
 msgstr "संस्थेचा विभाग"
 
+msgid "Job Title"
+msgstr "कार्याचे शिर्षक"
+
 msgid "Role"
 msgstr "भुमिका"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "वाढदिवस"
 
@@ -4063,12 +4132,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 "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 +4243,6 @@ msgstr "सर्व्हर ब्लॉकींगला समर्थन
 msgid "Not Authorized"
 msgstr "अधिकृत नसलेले"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "मानसिक स्थिती"
 
@@ -4187,7 +4264,6 @@ msgstr "प्रति"
 msgid "None (To pending)"
 msgstr "काहीही नाही (प्रलंबित करण्यासाठी)"
 
-#. 0
 msgid "None"
 msgstr "काहीही नाही"
 
@@ -4196,19 +4272,23 @@ msgid "Subscription"
 msgstr "सबस्क्रिपशन"
 
 msgid "Mood Text"
-msgstr "Mood मजकूर"
+msgstr "मूडचे मजकूर"
 
 msgid "Allow Buzz"
-msgstr "Buzz स्वीकारा"
+msgstr "बज् स्वीकारा"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "मधले नाव"
+msgstr "मूडचे नाव"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "बड्डी बद्दल टिप्पणी"
+msgstr "मूडची टिप्पणी"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "कलाकार ट्यून करा"
 
@@ -4379,9 +4459,6 @@ msgstr "धोरणाचे उल्लंघन"
 msgid "Remote Connection Failed"
 msgstr "दूरस्थ जोडणी अपयशी झाली"
 
-msgid "Resource Constraint"
-msgstr "आवकाची आवश्यकता"
-
 msgid "Restricted XML"
 msgstr "प्रतिबंधित केलेले  XML "
 
@@ -4491,15 +4568,14 @@ msgstr "स्रोत नीवडा"
 msgid "Initiate Media"
 msgstr "मिडीया सुरू करा"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "संभाषण  खोलीला प्रोटोकॉल आधार देत नाहीत."
+msgstr "खाते PEP करीता समर्थन पुरवत नाही, मूड सेट करणे अशक्य"
 
 msgid "config:  Configure a chat room."
-msgstr "अंतर्गत रचना: संभाषण खोलीची अंतर्गत रचना  करा."
+msgstr "अंतर्गत रचना: संभाषण रूम संरचीत करा."
 
 msgid "configure:  Configure a chat room."
-msgstr "अंतर्गत  रचना: संभाषण खोलीची अंतर्गत रचना करा."
+msgstr "अंतर्गत  रचना: संभाषण रूम संरचीत करा."
 
 msgid "part [message]:  Leave the room."
 msgstr "part [संदेश]:  रूम सोडा."
@@ -4546,9 +4622,8 @@ msgstr "ping &lt;jid&gt;:\t वापरकर्ता/घटक/सर्व�
 msgid "buzz: Buzz a user to get their attention"
 msgstr "बझ: वापरकर्त्याचे लक्ष वेधण्यासाठी आवाज करा"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "योग्य वापरकर्ता निवडा"
+msgstr "मूड: सध्याचे वापरकर्ता मूड सेट करा"
 
 msgid "Extended Away"
 msgstr "दुर वर पसरलेला"
@@ -4630,13 +4705,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "संदेशमधील पसंतीची स्माईली पाठवण्यासाठी खूपच मोठे आहे."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP स्ट्रीम हेड्डर आढळले नाही"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP आवृत्ती जुळली नाही"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP सट्रीमचे ID आढळले नाही"
 
 msgid "XML Parse error"
 msgstr "XML दोष स्पष्ट करण्यात दोष"
@@ -4660,7 +4735,7 @@ msgstr ""
 "मूळस्थितीची  नियंत्रणे स्विकारायची आहेत का?"
 
 msgid "_Configure Room"
-msgstr "खोलीची अंतर्गत रचना करा (_C)"
+msgstr "रूम संरचीत करा (_C)"
 
 msgid "_Accept Defaults"
 msgstr "मूळस्थितीना स्विकारा (_A)"
@@ -4711,320 +4786,258 @@ msgstr "%s कडे फाइल पाठवणे अशक्य, वाप�
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "फाइल ज्या %s वापरकर्त्याकडे पाठवायचे, कृपया त्याचे स्रोत नीवडा"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "अरेबिक"
+msgstr "घाबरले"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "लाजलेला"
+msgstr "आश्चर्यचकित"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "उत्कृष्ट"
+msgstr "आकर्षीत"
 
-#. 1
 msgid "Angry"
 msgstr "रागीट"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "मनाई केलेले"
+msgstr "त्रस्त"
 
 msgid "Anxious"
 msgstr "चिंताक्रांत"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "आपण पाठवा "
+msgstr "जागे"
 
 msgid "Ashamed"
-msgstr "लाजलेला"
+msgstr "लज्जित"
 
 msgid "Bored"
 msgstr "कंटाळवाणे"
 
-#, fuzzy
 msgid "Brave"
-msgstr "साठवा"
+msgstr "धीट"
 
-#, fuzzy
 msgid "Calm"
-msgstr "विषय/राज्य"
+msgstr "शांत"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "संभाषण"
+msgstr "सावध"
 
-#, fuzzy
 msgid "Cold"
-msgstr "ठळक"
+msgstr "घाबरणे"
 
-#, fuzzy
 msgid "Confident"
-msgstr "मतभेद"
+msgstr "ठाम"
 
-#, fuzzy
 msgid "Confused"
-msgstr "चालू ठेवा"
+msgstr "गोंधळात"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "संपर्क"
+msgstr "विचारी"
 
-#, fuzzy
 msgid "Contented"
-msgstr "जोडलेले"
+msgstr "संतुष्ट"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "कंपनी"
+msgstr "तापट"
 
 msgid "Crazy"
-msgstr ""
+msgstr "वेडपट"
 
-#, fuzzy
 msgid "Creative"
-msgstr "निर्माण करा"
+msgstr "सृजनशील"
 
-#, fuzzy
 msgid "Curious"
-msgstr "उत्कृष्ट"
+msgstr "चौकस"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "नकारले"
+msgstr "उदास"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "नष्ट केले"
+msgstr "दुःखी"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "खंडीत."
+msgstr "निराश"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "उबग"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "अकार्यान्वीत"
+msgstr "धास्ती"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "न जोडलेला"
+msgstr "भांबावलेला"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "गांगरवले"
 
-#, fuzzy
 msgid "Envious"
-msgstr "चिंताक्रांत"
+msgstr "हेवा वाटणे"
 
-#. 2
 msgid "Excited"
-msgstr "आश्चर्यचकीत"
+msgstr "क्षोभित"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "उत्कृष्ट"
+msgstr "छचोरपणा"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "पहिले नाव"
+msgstr "नाउमेद"
 
 msgid "Grateful"
-msgstr ""
+msgstr "आभारी"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "प्राप्त करत आहे..."
+msgstr "शोकतीत"
 
-#. 3
 msgid "Grumpy"
 msgstr "तापट"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "शहर"
+msgstr "दोषी"
 
-#. 4
 msgid "Happy"
-msgstr "आनंद"
+msgstr "आनंदी"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "आशादायक"
 
-#. 8
 msgid "Hot"
-msgstr "गरम"
+msgstr "तापट"
 
 msgid "Humbled"
-msgstr ""
+msgstr "नम्र"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "अपमानास्पद"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "रागीट"
+msgstr "भुकेला"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "मनोवृत्ती"
+msgstr "इजा करणे"
 
 msgid "Impressed"
-msgstr ""
+msgstr "कौतुकास्पद"
 
-#, fuzzy
 msgid "In awe"
-msgstr "प्रेमात "
+msgstr "भयचकीत"
 
 msgid "In love"
 msgstr "प्रेमात"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "इंडोनेशियन"
+msgstr "संतप्त"
 
-#, fuzzy
 msgid "Interested"
-msgstr "आवड"
+msgstr "जिज्ञासू"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "आमंत्रीत"
+msgstr "धुंदी"
 
-#. 6
 msgid "Invincible"
-msgstr "अजिंक्य"
+msgstr "दुर्जय"
 
 msgid "Jealous"
 msgstr "मत्सर"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "माकड"
+msgstr "उदास"
 
-#, fuzzy
 msgid "Lost"
-msgstr "अतिशय मोठा आवाज"
+msgstr "गमावलेला"
 
 msgid "Lucky"
-msgstr ""
+msgstr "नशीबवान"
 
-#, fuzzy
 msgid "Mean"
-msgstr "जर्मन"
+msgstr "स्वार्थी"
 
-#, fuzzy
 msgid "Moody"
-msgstr "मानसिक स्थिती"
+msgstr "लहरी"
 
 msgid "Nervous"
-msgstr ""
+msgstr "चिंतातूर"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "तपशील"
+msgstr "तटस्थ"
 
-#, fuzzy
 msgid "Offended"
-msgstr "ऑफलाईन"
+msgstr "नाखूष"
 
 msgid "Outraged"
-msgstr ""
+msgstr "हिंसक"
 
-#, fuzzy
 msgid "Playful"
-msgstr "चालू करा"
+msgstr "हसरा"
 
-#, fuzzy
 msgid "Proud"
-msgstr "जोरात"
+msgstr "स्वाभिमानी"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "खरे नाव"
+msgstr "चिंतामुक्त"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "प्राप्त"
+msgstr "मुक्त"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "काढून टाकणे"
+msgstr "पश्र्चात्तापदग्ध"
 
-#, fuzzy
 msgid "Restless"
-msgstr "रेजिस्टर"
+msgstr "अस्वस्थ"
 
-#. 7
 msgid "Sad"
 msgstr "दु:खी"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "मराठी"
+msgstr "उपरोधिक"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "समाधानी"
 
-#, fuzzy
 msgid "Serious"
-msgstr "उत्कृष्ट"
+msgstr "गंभीर"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "ब्लॉक्ड्"
+msgstr "थक्क"
 
 msgid "Shy"
-msgstr ""
+msgstr "लाजाळू"
 
-#. 9
 msgid "Sick"
 msgstr "आजारी"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "झोपाळु"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "स्वाभाविक"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "वेग"
+msgstr "तणाव"
 
-#, fuzzy
 msgid "Strong"
-msgstr "गीत"
+msgstr "अविचल"
 
 msgid "Surprised"
-msgstr ""
+msgstr "आश्चर्यचकित"
 
 msgid "Thankful"
-msgstr ""
+msgstr "कृतज्ञ"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "तृषित"
 
-#, fuzzy
 msgid "Tired"
-msgstr "आग"
+msgstr "दमलेला"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "अधोरेखित"
+msgstr "अनिश्चित"
 
-#, fuzzy
 msgid "Weak"
-msgstr "व्हॅक (whack)"
+msgstr "कमजोर"
 
-#, fuzzy
 msgid "Worried"
-msgstr "कंटाळवाणे"
+msgstr "चिंताक्रांत"
 
 msgid "Set User Nickname"
 msgstr "वापरकर्त्याचे टोपणनाव सेट करा"
@@ -5382,18 +5395,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 "खेळाचे शीर्षक"
 
@@ -5541,9 +5542,6 @@ msgstr "ऍनीवर्सरी"
 msgid "Work"
 msgstr "कामकाजाचे दुरध्वनी"
 
-msgid "Job Title"
-msgstr "कार्याचे शिर्षक"
-
 msgid "Company"
 msgstr "कंपनी"
 
@@ -5632,6 +5630,10 @@ msgstr "HTTP पद्धत सर्व्हर"
 msgid "Show custom smileys"
 msgstr "इच्छित स्माईलीज (हास्य मुद्रा)दाखवा"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "जोडणी निर्माण करण्यात असमर्थ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "कोपरखळी:वापरकर्ता त्यांचे लक्ष वेधणारी कोपरखळी "
 
@@ -5815,24 +5817,6 @@ msgstr "हा बड्डी तुम्हाला पत्ता पु�
 msgid "The username specified is invalid."
 msgstr "निर्देशीत वापरकर्त्याचेनाव अवैध आहे."
 
-#. 5
-msgid "In Love"
-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 अवैध आहे."
 
@@ -5864,7 +5848,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 "PIN"
 
@@ -5872,6 +5860,7 @@ msgid "Verify PIN"
 msgstr "PIN तपासा"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "दिस्पलेचे नाव"
 
@@ -5898,10 +5887,6 @@ msgstr "स्पलॅश-पडदा सध्या उपलब्ध न�
 msgid "About"
 msgstr "विषयी"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "मूड बदला..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "प्रोफाइल बदला..."
@@ -5932,19 +5917,16 @@ msgstr "MXit सर्व्हरशी जोडणी अशक्य. कृ
 msgid "Connecting..."
 msgstr "जोडणी करत आहे..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit प्रवेश नाव"
-
-#. nick name
-msgid "Nick Name"
-msgstr "टोपणनाव"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5972,10 +5954,12 @@ 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 "वापरकर्त्याचेनाव आधिपासूनच नोंदणीकृत आहे. कृपया इतर वापरकर्तानाव नीवडा."
 
 msgid "Internal error. Please try again later."
@@ -5987,7 +5971,7 @@ msgstr "तुम्ही सुरक्षा कोड दिले ना�
 msgid "Security Code"
 msgstr "सुरक्षा कोड"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "सुरक्षा कोड द्या"
 
@@ -6013,11 +5997,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")
@@ -6030,6 +6020,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 "कक्ष (_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 सह जोडणी खंडीत झाली. कृपया पुनः जोडणी करा."
@@ -6132,6 +6144,9 @@ msgstr "MXit ला जोडणी संबंधीत त्रुटी आ
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit ला जोडणी संबंधीत त्रुटी आढळली. (रिड स्टेज 0x06)"
 
+msgid "In Love"
+msgstr "प्रेमात "
+
 msgid "Pending"
 msgstr "उर्वरीत"
 
@@ -6526,9 +6541,6 @@ msgstr "परवलीचाशब्द समाप्त झाला आह
 msgid "Incorrect password"
 msgstr "अयोग्य गुप्तशब्द"
 
-msgid "User not found"
-msgstr "वापरकर्ता आढळला नाही"
-
 msgid "Account has been disabled"
 msgstr "खाते असक्षम करण्यात आले आहे"
 
@@ -6781,111 +6793,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL पडद्यावरील नावाची ओळख पटवण्यासाठी येथे परवानगी देण्यास मनाई करतो"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "%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 ""
+msgstr "विचार करत आङे"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "टंकलेखन थांबवा"
+msgstr "शॉपींग करत आहे"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "प्रश्न संवाद"
+msgstr "चौकशी करत आहे"
 
-#, fuzzy
 msgid "Eating"
-msgstr "पृष्ठांक घालत आहे"
+msgstr "खात आहे"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "खेळ खेळत आहे"
+msgstr "चित्रपट पहात आहे"
 
 msgid "Typing"
-msgstr "टंकलेखन"
+msgstr "टाइप करत आहे"
 
-#, fuzzy
 msgid "At the office"
-msgstr "ऑफिसमध्ये नाही"
+msgstr "ऑफिसमध्ये"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "आंघोळ करत आहे"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "TV पहात आहे"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "स्तब्ध"
+msgstr "मजा घेत आहे"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "झोपाळु"
+msgstr "झोप घेत आहे"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "PDA वापरत आहे"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "IM मित्र"
+msgstr "मित्रांशी भेटत आहे"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "दुरध्वनीवर"
+msgstr "फोनवर"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "परत घडत आहे"
+msgstr "सर्फ करत आहे"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "मोबाइल"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "वेबवर शोधत आहे"
 
 msgid "At a party"
-msgstr ""
+msgstr "पार्टीमध्ये"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "कॉफी घेत आहे"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "मिथुन रास"
+msgstr "खेळत आहे"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "वेब ब्राऊज करत आहे"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "गीत"
+msgstr "स्मोक् करत आहे"
 
-#, fuzzy
 msgid "Writing"
-msgstr "कार्य"
+msgstr "लिहत आहे"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "कार्य"
+msgstr "पिहीत आहे"
 
 msgid "Listening to music"
 msgstr "संगीत ऐकत आहे"
 
-#, fuzzy
 msgid "Studying"
-msgstr "पाठवत आहे"
+msgstr "अभ्यास"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "आवड"
+msgstr "रेस्टरूममध्ये"
 
 msgid "Received invalid data on connection with server"
 msgstr "सर्व्हरशी जोडणी स्थापीत केल्यानंतर अवैध डाटा प्राप्त झाले"
@@ -6953,116 +7010,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 "अप्रचलित  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 "पॅरेंटल कंट्रोलमुळे 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 "ऑफलाइन संदेश साठा रिकामा नाही"
-
 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 "
@@ -7098,7 +7045,7 @@ msgid "Games"
 msgstr "खेळ"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "जोड़-सुविधा"
@@ -7166,25 +7113,20 @@ msgstr "वेबचा माहितगार"
 msgid "Invisible"
 msgstr "अदृश्य"
 
-#, fuzzy
 msgid "Evil"
-msgstr "ईमेल"
+msgstr "दुष्ट"
 
-#, fuzzy
 msgid "Depression"
-msgstr "व्यवसाय"
+msgstr "उदासी"
 
-#, fuzzy
 msgid "At home"
-msgstr "माझ्या विषयी"
+msgstr "घरी"
 
-#, fuzzy
 msgid "At work"
-msgstr "नेटवर्क"
+msgstr "कामावर"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "जेवणासाठी बाहेर"
+msgstr "जेवतेवेळी"
 
 msgid "IP Address"
 msgstr "IP पत्ता"
@@ -7407,28 +7349,9 @@ msgstr[0] "अज्ञात कारणाने %2$s पासून आप�
 msgstr[1] "अज्ञात कारणाने %2$s पासून आपण %1$hu संदेश मुकाल."
 
 #, 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 "पासून चालू  आहे"
 
@@ -7680,9 +7603,8 @@ msgstr "आपली IM प्रतिमा पाठवली नाही.
 msgid "iTunes Music Store Link"
 msgstr "iध्वनी संगीत साठ्याचा दुवा"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "फिंच"
+msgstr "दुपारचे जेवण"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7715,9 +7637,8 @@ msgstr "AIM माहिती प्राप्त करा"
 msgid "Edit Buddy Comment"
 msgstr "बड्डी टिप्पणी संपादन करा"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Msg ची सद्यःस्थिति मिळवा"
+msgstr "X-स्थिती संदेश प्राप्त करा"
 
 msgid "End Direct IM Session"
 msgstr "डायरेक्ट IM सत्र समाप्त"
@@ -7842,6 +7763,75 @@ 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 "कुंभ रास"
 
@@ -8124,6 +8114,10 @@ msgstr "विनंती करत आहे"
 msgid "Admin"
 msgstr "प्रशासक"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "रूमचे शीर्षक"
+
 msgid "Notice"
 msgstr "सूचना"
 
@@ -9986,7 +9980,7 @@ 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 "यादी:याहू जालजोडणीवर खोलीची यादी"
+msgstr "यादी:याहू जालजोडणीवर रूमची सूची"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr "डुडल: डुडल सत्र चालू  करण्याची वापरकर्त्यास विनंती करा"
@@ -10007,9 +10001,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! प्रोटोकॉल प्लगइन"
 
-msgid "Pager server"
-msgstr "पेजर सर्व्हर"
-
 msgid "Pager port"
 msgstr "पेजर पोर्ट"
 
@@ -10025,17 +10016,12 @@ 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 "याहू संभाषण सर्व्हर"
-
-msgid "Yahoo Chat port"
-msgstr "याहू संभाषण पोर्ट/स्थान"
+msgstr "संभाषण  रूमची  यादीURL"
 
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
@@ -10102,6 +10088,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 "वापरकर्तानाव किंवा पासवर्ड आढळले नाही"
@@ -10176,6 +10170,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 "घरात नाही"
 
@@ -10550,6 +10552,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)"
 
@@ -10614,11 +10620,10 @@ msgid "Do not disturb"
 msgstr "व्यत्यय आणू नका"
 
 msgid "Extended away"
-msgstr "विस्तारीत दूर आहे"
+msgstr "विस्तारीत केले"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "प्राप्त करत आहे"
+msgstr "अनुभव"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10789,12 +10794,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 "प्रवेश करण्याचे पर्याय"
@@ -11144,7 +11143,7 @@ msgid "_Expand"
 msgstr "विस्तार करा (_E)"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/साधने/आवाजांना बंद करा"
+msgstr "/साधणे/आवाजांना बंद करा"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11156,13 +11155,11 @@ msgstr "आपण आता खात्याबरोबर उघडले �
 msgid "Unknown node type"
 msgstr "अपरिचीत नोडचे प्रकार"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "कृपया सूचीतून मूड नीवडा."
+msgstr "कृपया सूचीतून मूड नीवडा"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "उर्फ नाव (वैकल्पिक)"
+msgstr "संदेश (वैकल्पिक)"
 
 msgid "Edit User Mood"
 msgstr "वापरकर्त्याचा मूड संपादीत करा"
@@ -11225,10 +11222,10 @@ msgstr "/खाते/खाते व्यवस्थापीत करा"
 
 #. Tools
 msgid "/_Tools"
-msgstr "/साधने (_T)"
+msgstr "/साधणे (_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/साधने/बड्डी हल्ला करते (_P)"
+msgstr "/साधणे/बड्डी हल्ला करते (_P)"
 
 msgid "/Tools/_Certificates"
 msgstr "/शाधणे/ प्रमाणपत्रे (_C)"
@@ -11237,29 +11234,28 @@ msgid "/Tools/Custom Smile_ys"
 msgstr "/साधणे/पसंतीचे स्माइलीज् (_y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/साधने/प्लगईनस (_g)"
+msgstr "/साधणे/प्लगईनस (_g)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/साधने/प्राधान्ये (_e)"
+msgstr "/साधणे/प्राधान्ये (_e)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/साधने/गुप्तता (_i)"
+msgstr "/साधणे/गुप्तता (_i)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/साधने/प्रणाली लॉग (_L)"
+msgstr "/साधणे/मूड सेट करा (_M)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/साधने/फाइलचे स्थानांतरण (_F)"
+msgstr "/साधणे/फाइलचे स्थानांतरण (_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/साधने/खोली यादी (_o)"
+msgstr "/साधणे/खोली यादी (_o)"
 
 msgid "/Tools/System _Log"
-msgstr "/साधने/प्रणाली लॉग (_L)"
+msgstr "/साधणे/प्रणाली लॉग (_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/साधने/आवाजास बंद करा (_S)"
+msgstr "/साधणे/आवाजास बंद करा (_S)"
 
 #. Help
 msgid "/_Help"
@@ -11268,20 +11264,17 @@ msgstr "/मदत (_H)"
 msgid "/Help/Online _Help"
 msgstr "/मदत/ऑनलाइन मदत (_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "बड्डी माहिती "
+msgstr "/मदत/बिल्ड माहिती (_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/मदत/पटल डिबग करा (_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "सर्वर माहिती"
+msgstr "/मदत/डेव्हलपर माहिती (_v)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "वैयक्तिक माहिती"
+msgstr "/मदत/भाषांतरकाची माहिती (_T)"
 
 msgid "/Help/_About"
 msgstr "/मदत/विषयी (_A)"
@@ -11361,10 +11354,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"
@@ -11373,10 +11366,10 @@ msgstr[0] "%2$s कडील न वाचलेला %1$d संदेश\n"
 msgstr[1] "%2$s कडील न वाचलेला %1$d संदेश\n"
 
 msgid "Manually"
-msgstr "हाताने"
+msgstr "स्वहस्ते"
 
 msgid "By status"
-msgstr "सद्यःस्थिति "
+msgstr "सद्यःस्थिति"
 
 msgid "By recent log activity"
 msgstr "अलिकडील लॉग क्रिया द्वारे"
@@ -11507,9 +11500,8 @@ msgstr "<PurpleMain>/खाते/"
 msgid "_Edit Account"
 msgstr "खाते संपादीत करा (_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "मूड सेट करा..."
+msgstr "मूड सेट करा (_M)..."
 
 msgid "No actions available"
 msgstr "कृती उपल्बध बाही"
@@ -11518,7 +11510,7 @@ msgid "_Disable"
 msgstr "अकार्यान्वीत(_D)"
 
 msgid "/Tools"
-msgstr "/साधने"
+msgstr "/साधणे"
 
 msgid "/Buddies/Sort Buddies"
 msgstr "/बड्डीज/बड्डीजना वर्गीकृत करा"
@@ -11597,7 +11589,7 @@ msgid "/_Conversation"
 msgstr "/संवाद (_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/संवाद/नवी तात्कालिक संदेश (_M)..."
+msgstr "/संवाद/नवीन तात्कालिक संदेश (_M)..."
 
 msgid "/Conversation/Join a _Chat..."
 msgstr "/संवाद/संभाषणात सामिल व्हा (_C)..."
@@ -11629,15 +11621,14 @@ msgstr "/संवाद/मिडीया/ऑडिओ/विडिओ कॉ�
 msgid "/Conversation/Se_nd File..."
 msgstr "/संवाद/फाइल पाठवा (_n)..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/संवादाची/माहिती मिळवा. "
+msgstr "/संवाद/लक्ष वेधा (_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/संवाद/बड्डी हल्ला समावेश करा (_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/संवादाबद्दलची/माहिती प्राप्त करा (_G)"
+msgstr "/संवाद/माहिती प्राप्त करा (_G)"
 
 msgid "/Conversation/In_vite..."
 msgstr "/संवाद/आमंत्रीत करा (_v)..."
@@ -11700,7 +11691,7 @@ msgid "/Conversation"
 msgstr "/संवाद"
 
 msgid "/Conversation/View Log"
-msgstr "/संभाषण/लॉग पहा"
+msgstr "/संवाद/लॉग पहा"
 
 msgid "/Conversation/Media/Audio Call"
 msgstr "/संवाद/मिडीया/ऑडिओ कॉल"
@@ -11712,17 +11703,16 @@ msgid "/Conversation/Media/Audio\\/Video Call"
 msgstr "/संवाद/मिडीया/ऑडिओ\\/विडिओ कॉल"
 
 msgid "/Conversation/Send File..."
-msgstr "/संभाषण/फाइल पाठवा..."
+msgstr "/संवाद/फाइल पाठवा..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/संवादाची/माहिती मिळवा. "
+msgstr "/संवाद/लक्ष वेधा"
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/संभाषण/ बड्डी हल्ला समाविष्ट करा..."
+msgstr "/संवाद/ बड्डी हल्ला समाविष्ट करा..."
 
 msgid "/Conversation/Get Info"
-msgstr "/संवादाची/माहिती मिळवा. "
+msgstr "/संवाद/माहिती मिळवा. "
 
 msgid "/Conversation/Invite..."
 msgstr "/संवादासाठी/आमंत्रण..."
@@ -11782,13 +11772,11 @@ msgstr "पाठवा (_S)"
 msgid "0 people in room"
 msgstr "खाली मध्ये लोक नाहीत"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "ही टॅब बंद करा"
+msgstr "शोधा पट्टी बंद करा"
 
-#, fuzzy
 msgid "Find:"
-msgstr "शोधा"
+msgstr "शोधा:"
 
 #, c-format
 msgid "%d person in room"
@@ -11951,6 +11939,10 @@ msgstr "आफ्रिकान्स्"
 msgid "Arabic"
 msgstr "अरेबिक"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "लज्जित"
+
 msgid "Belarusian Latin"
 msgstr "बुलरुसीअन लॅटीन"
 
@@ -11960,6 +11952,9 @@ msgstr "बल्गेरियन"
 msgid "Bengali"
 msgstr "बंगाली"
 
+msgid "Bengali-India"
+msgstr "बंगाली-भारत"
+
 msgid "Bosnian"
 msgstr "बॉस्नियन"
 
@@ -12074,6 +12069,10 @@ msgstr "लाओ "
 msgid "Macedonian"
 msgstr "मेसीडोनियन"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "मलय"
+
 msgid "Mongolian"
 msgstr "मंगोलीयन"
 
@@ -12182,23 +12181,21 @@ msgstr "अम्हारिक"
 msgid "Lithuanian"
 msgstr "लीथूएनीयन"
 
-#, fuzzy, c-format
+#, 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>"
+"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>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 ग्राफिकल मॉड्यूलर संदेश क्लाएंट, 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 ""
@@ -12207,8 +12204,11 @@ msgid ""
 "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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12218,25 +12218,24 @@ msgid ""
 "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/>3rd पार्टी "
-"प्रोटोकॉल्स् किंवा प्लगइन्स करीता मदत पुरवणे अशक्य आहे!<br/>या लिस्टची प्राथमिक भाषा "
-"<b>इंग्रजी</b> आहे.  तुम्ही इतर भाषामध्ये पोस्ट करू शकता, परंतु प्रतिसाद कमी मदतीचे असू "
-"शकते.<br/><br/>"
+"<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 विषयी"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "बड्डी माहिती "
+msgstr "बिल्ड माहिती"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "बड्डी माहिती "
+msgstr "%s बिल्ड माहिती"
 
 msgid "Current Developers"
 msgstr "वर्तमान डेव्हलपर्स्"
@@ -12250,9 +12249,9 @@ msgstr "निवृत्त डेव्हलपर्स्"
 msgid "Retired Crazy Patch Writers"
 msgstr "रिटायर्ड् कुशल पॅच लेखक"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "सर्वर माहिती"
+msgstr "%s डेव्हलपर माहिती"
 
 msgid "Current Translators"
 msgstr "चालू अनुवादक"
@@ -12260,9 +12259,9 @@ msgstr "चालू अनुवादक"
 msgid "Past Translators"
 msgstr "पूर्वीचा  अनुवादक"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "अधिक माहिती"
+msgstr "%s भाषांतरकाची माहिती"
 
 msgid "_Name"
 msgstr "नाव (_N)"
@@ -12271,7 +12270,7 @@ msgid "_Account"
 msgstr "खाते (_A)"
 
 msgid "Get User Info"
-msgstr "वापरकर्त्याची माहिती मिळवा"
+msgstr "वापरकर्त्याची माहिती प्राप्त करा"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
@@ -12666,9 +12665,8 @@ msgstr "IM प्रतिमा अंतर्भूत करा"
 msgid "Insert Smiley"
 msgstr "स्माइली अंतर्भूत करा"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "बटण पाटवा"
+msgstr "दक्षता पाठवा"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>ठळक (_B)</b>"
@@ -12716,7 +12714,7 @@ msgid "_Smile!"
 msgstr "स्माईल (_S)!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "सावधानता (_A)!"
 
 msgid "Log Deletion Failed"
 msgstr "लॉग नष्ट करण्यास अपयशी"
@@ -12733,16 +12731,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?"
@@ -12847,11 +12845,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "इतर libpurple क्लाएंट आधिपासूनच कार्यरत असल्यामुळे बाहेर पडत आहे.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/मिडिया (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/मिडीया/हँगअप (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "स्तब्ध"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13646,10 +13646,6 @@ msgstr "मजकूरचे शार्टकट"
 msgid "Custom Smiley Manager"
 msgstr "पसंतीच्या स्माईलीचे व्यवस्थापक"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "सक्रिय करणे आवश्यक"
-
 msgid "Select Buddy Icon"
 msgstr "बड्डी चिन्ह नीवडा"
 
@@ -14770,8 +14766,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 "यात दिनांक दाखवा..."
@@ -14967,123 +14972,177 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "कच्चे XMPP कडवी पाठवा आणि मिळवा."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "हा प्लगईन डिबगिंग XMPP सर्व्हरसाठी किंवा ग्राहकांसाठी उपयुक्त ठरतो."
+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 ""
 
-#~ msgid "Error creating conference."
-#~ msgstr "सभा निर्मीण करतेवेळी त्रुटी."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
 
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "सॉकेटला पोर्टशी बांधणी करणे अशक्य: %s"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
 
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "सॉकेटवर ऐकणे अशक्य: %s"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s ने आपणास नुकतीच कोपरखळी पाठवली!"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "डेस्कटॉप पूर्वनिर्धारीत"
 
-#~ msgid "Friendly name changes too rapidly"
-#~ 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 ""
 
-#~ msgid "This Hotmail account may not be active."
-#~ 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 "Profile URL"
-#~ msgstr "माहितीलेख URL "
+#. $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 "MSN Protocol Plugin"
-#~ msgstr "MSN प्रोटोकाल प्लगइन "
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr ""
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s वैध गट नाही."
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "ठिकाण"
 
-#~ msgid "Unknown error."
-#~ msgstr "अज्ञात दोष."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr ""
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr " %s (%s) वर %s "
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin इंटरनेट संदेशवाहक"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "%s (%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 ""
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "%s (%s) वर वापरकर्त्याला व्यत्यय आणण्यास असमर्थ"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "शॉर्टकट"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "%s (%s) वर वापरकर्त्याला परवानगी देण्यास असमर्थ"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "%s ला समाविष्ट करणे अशक्य कारण आपली बड्डी यादी पूर्ण भरली आहे."
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s वैध परवाना खाते नाही."
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "प्रारंभ"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "सेवा तात्पुरती अनुपलब्ध आहे."
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
-#~ msgid "Unable to rename group"
-#~ 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 "Unable to delete group"
-#~ msgstr "गट काढून टाकण्यास असमर्थ"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "प्रमाणपत्र अजूनही वैध नाही."
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s  ने त्याच्या किंवा तिच्या बड्डी यादीत समाविष्ट केले."
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "दिलेले टोपणनाव अवैध आहे."
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s ने आपणास त्याच्या किंवा तिच्या बड्डी यादीतून काढून टाकले."
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit प्रवेश नाव"
 
-#~ 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 "Nick Name"
+#~ msgstr "टोपणनाव"
 
-#~ 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 "Your Mobile Number..."
+#~ msgstr "आपला मोबाइल क्रमांक..."
 
-#~ 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 "Rate to host"
+#~ msgstr "आयोजकाचे प्रमाण"
 
-#~ msgid "Debugging Information"
-#~ msgstr "दोषांची माहिती"
+#~ msgid "Rate to client"
+#~ msgstr "ग्राहकाचे प्रमाण"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "अपरिचित फाइल प्रकार\n"
-#~ "\n"
-#~ " PNG ला मूळस्थितीत आणत आहे."
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/मिडीया/हँगअप (_H)"
 
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "प्रतिमा जतन करण्यात दोष\n"
-#~ "\n"
-#~ "%s"
+#~ msgid "Unknown reason."
+#~ msgstr "अज्ञात कारण."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "फाइल '%s' उघडण्यात अपयशी झाले: %s"
+#~ msgid "Current Mood"
+#~ msgstr "सध्याचा मूड"
 
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr ""
-#~ "प्रतिमा '%s' लोड करण्यात अपयशी झाले: कारण माहित नाही, बहुधा प्रतिमा दुषित असावी"
+#~ msgid "New Mood"
+#~ msgstr "नवीन मूड"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr " <iq/>कडवे घाला."
+#~ msgid "Change your Mood"
+#~ msgstr "मूड बदला"
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr " <उपस्थित/> कडवे घाला."
+#~ msgid "How do you feel right now?"
+#~ msgstr "तुम्हाला अत्ता कसे वाटते?"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr " <संदेशाचे/> कडवे घाला."
+#~ msgid "Change Mood..."
+#~ msgstr "मूड बदला..."
diff --git a/po/ms_MY.po b/po/ms_MY.po
index 3967e29a64..b734d1ecdb 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -729,7 +741,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -1184,6 +1196,9 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1275,7 +1290,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1463,7 +1477,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1556,6 +1570,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 ""
 
@@ -1573,7 +1593,9 @@ 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."
@@ -1793,7 +1815,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -2987,6 +3008,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 ""
 
@@ -3549,12 +3573,6 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3583,6 +3601,15 @@ 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 ""
 
@@ -3590,6 +3617,37 @@ msgstr ""
 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 ""
 
@@ -3653,6 +3711,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr ""
 
@@ -3667,10 +3726,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr ""
 
@@ -3882,12 +3945,21 @@ 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 ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -3984,7 +4056,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4006,7 +4077,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4026,6 +4096,12 @@ msgstr ""
 msgid "Mood Comment"
 msgstr ""
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4196,9 +4272,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4529,7 +4602,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4608,7 +4680,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4624,21 +4695,18 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 msgid "Grumpy"
 msgstr ""
 
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr ""
 
@@ -4672,7 +4740,6 @@ msgstr ""
 msgid "Intoxicated"
 msgstr ""
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4724,7 +4791,6 @@ msgstr ""
 msgid "Restless"
 msgstr ""
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4743,11 +4809,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5131,18 +5195,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 ""
 
@@ -5288,9 +5340,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr ""
 
@@ -5374,6 +5423,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5542,24 +5594,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 ""
 
@@ -5591,7 +5625,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 ""
 
@@ -5599,6 +5637,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5625,10 +5664,6 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr ""
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr ""
@@ -5659,18 +5694,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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
@@ -5699,10 +5730,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."
@@ -5714,7 +5745,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -5740,10 +5771,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
@@ -5757,6 +5792,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 ""
@@ -5860,6 +5912,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 msgid "Pending"
 msgstr ""
 
@@ -6242,9 +6297,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6483,12 +6535,73 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 ""
 
@@ -6637,116 +6750,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 ""
-
-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 ""
-
-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 ""
-
 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 "
@@ -7058,28 +7061,9 @@ 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 ""
 
@@ -7455,6 +7439,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7737,6 +7790,10 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr ""
+
 msgid "Notice"
 msgstr ""
 
@@ -9526,9 +9583,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr ""
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9544,18 +9598,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 ""
 
@@ -9615,6 +9663,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 ""
@@ -9681,6 +9735,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 ""
 
@@ -10037,6 +10099,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 ""
 
@@ -10267,12 +10333,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 ""
@@ -11395,6 +11455,9 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+msgid "Assamese"
+msgstr ""
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11404,6 +11467,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -11518,6 +11584,9 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+msgid "Malayalam"
+msgstr ""
+
 msgid "Mongolian"
 msgstr ""
 
@@ -11632,8 +11701,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12141,14 +12210,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?"
@@ -12235,10 +12304,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
@@ -13023,9 +13092,6 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
@@ -14101,7 +14167,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..."
@@ -14296,3 +14371,126 @@ 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."
+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/my_MM.po b/po/my_MM.po
index 9b0210d9ae..057f736ddb 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
@@ -821,7 +834,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 +1345,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 +1456,6 @@ msgid "Saved Statuses"
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,7 +1663,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1749,6 +1765,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 "မသိရပာ"
 
@@ -1767,9 +1791,10 @@ 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."
 msgstr ""
@@ -2008,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."
@@ -3304,6 +3328,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"
 
@@ -3949,14 +3976,6 @@ 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"
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Server requires SSL for login"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
@@ -3989,6 +4008,18 @@ 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"
 
@@ -3997,6 +4028,42 @@ msgid "SASL error: %s"
 msgstr "Read error"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Finalizing connection"
+
+#, 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 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"
 
@@ -4067,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"
 
@@ -4081,10 +4149,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"
 
@@ -4320,6 +4392,14 @@ 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"
 
@@ -4327,6 +4407,9 @@ msgstr "Plain text"
 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 ""
 
@@ -4433,7 +4516,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4455,7 +4537,6 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "မရ္ဟိပာ"
 
@@ -4479,6 +4560,12 @@ msgstr "Middle Name"
 msgid "Mood Comment"
 msgstr "Buddy Comment"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4655,9 +4742,6 @@ msgstr "Policy Violation"
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -5018,7 +5102,6 @@ msgstr "Ashamed"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Angry"
 
@@ -5115,7 +5198,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Anxious"
 
-#. 2
 msgid "Excited"
 msgstr "Excited"
 
@@ -5133,7 +5215,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Connecting..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group:"
@@ -5142,14 +5223,12 @@ msgstr "Group:"
 msgid "Guilty"
 msgstr "City"
 
-#. 4
 msgid "Happy"
 msgstr "Happy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "(_H) စက္‌:"
@@ -5190,7 +5269,6 @@ msgstr "_Insert"
 msgid "Intoxicated"
 msgstr "Invite"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
@@ -5254,7 +5332,6 @@ msgstr "ဖယ္‌ပစ္‌လိုက္‌"
 msgid "Restless"
 msgstr "မ္ဟတ္‌ပံုတင္‌မယ္‌"
 
-#. 7
 msgid "Sad"
 msgstr "Sad"
 
@@ -5275,12 +5352,10 @@ msgstr "Block"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sleepy"
@@ -5705,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"
@@ -5891,9 +5953,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5993,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 ""
 
@@ -6191,27 +6254,6 @@ msgstr "Do you want to add this buddy to your buddy list?"
 msgid "The username specified is invalid."
 msgstr "The new formatting is invalid."
 
-#. 5
-msgid "In Love"
-msgstr "In Love"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Change Password"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "The new formatting is invalid."
@@ -6248,7 +6290,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"
@@ -6257,6 +6303,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6288,11 +6335,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..."
@@ -6336,7 +6378,7 @@ msgid "Connecting..."
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The new formatting is invalid."
 
 #, fuzzy
@@ -6344,14 +6386,9 @@ 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"
@@ -6388,10 +6425,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
@@ -6405,7 +6442,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6439,12 +6476,17 @@ 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")
@@ -6459,6 +6501,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."
@@ -6579,6 +6643,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "In Love"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -7000,9 +7067,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"
 
@@ -7262,6 +7326,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7270,6 +7338,67 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
+msgid "Invalid error"
+msgstr "Invalid error"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
+
+#. 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 "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 "Message ပို့လို့ မရပာ။"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7443,120 +7572,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
-
-#. 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 "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 "Message ပို့လို့ မရပာ။"
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "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 "
@@ -7912,29 +7927,10 @@ 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"
 
@@ -8377,6 +8373,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8716,6 +8781,11 @@ msgstr "Request ambiguous"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -10725,10 +10795,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"
 
@@ -10746,20 +10812,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"
@@ -10826,6 +10885,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"
@@ -10903,6 +10969,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"
 
@@ -11304,6 +11381,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"
@@ -11553,13 +11634,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"
@@ -12850,6 +12924,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12859,6 +12937,9 @@ msgstr "Bulgarian"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12986,6 +13067,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
@@ -13110,8 +13195,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13694,14 +13779,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
@@ -13796,10 +13881,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
@@ -14710,10 +14795,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ေဘာ္ဒာ ရ္ဝေးမယ္‌"
 
@@ -15944,7 +16025,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
@@ -16164,6 +16255,195 @@ msgstr ""
 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."
+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 "Accept Defaults"
+
+#. $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
+#, 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 "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"
@@ -16303,9 +16583,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -16780,7 +17057,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."
@@ -18148,9 +18425,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 a89a7c134c..4e5b66f64c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,10 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -66,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"
 
@@ -790,7 +803,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"
@@ -1257,6 +1270,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"
 
@@ -1350,7 +1367,6 @@ msgid "Saved Statuses"
 msgstr "Lagrede statuser"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tittel"
 
@@ -1550,7 +1566,7 @@ msgstr ""
 msgid "Online"
 msgstr "Pålogget"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Avlogget"
 
@@ -1644,6 +1660,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"
 
@@ -1663,8 +1687,10 @@ msgstr ""
 "Dette sertifikatet er ikke betrodd fordi det ikke fins noe sertifikat som "
 "kan verfisere at det er betrodd for tiden."
 
-msgid "The certificate is not valid yet."
-msgstr "Sertifikatet er ikke gyldig enda."
+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 "Sertifikatet har utgått og bør ikke regnes som gyldig."
@@ -1901,7 +1927,6 @@ msgstr "Klarte konvertere %s til punykode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Autentiseringsfeil: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ukjent grunn"
 
@@ -3173,6 +3198,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"
 
@@ -3774,12 +3802,6 @@ msgstr "Ad-hoc kommando feilet"
 msgid "execute"
 msgstr "utfør"
 
-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."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
@@ -3813,6 +3835,20 @@ 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"
 
@@ -3820,6 +3856,42 @@ msgstr "SASL-autentisering feilet"
 msgid "SASL error: %s"
 msgstr "SASL-feil: %s"
 
+#, 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 "Server does not support channel binding"
+msgstr "Tjener støtter ikke blokkering"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Tegnkodingen er ikke støttet"
+
+msgid "User not found"
+msgstr "Brukeren ble ikke funnet"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Ugyldig brukernavn"
+
+msgid "Resource Constraint"
+msgstr "Ressursbegrensning"
+
 msgid "Unable to canonicalize username"
 msgstr "Klarte ikke kanonisere brukernavn"
 
@@ -3883,6 +3955,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3897,10 +3970,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"
 
@@ -4121,12 +4198,22 @@ msgstr "Ingen brukere funnet"
 msgid "Roles:"
 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."
+
 msgid "Ping timed out"
 msgstr "Tidsavbrudd for ping"
 
 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."
 
@@ -4224,7 +4311,6 @@ msgstr "Tjener støtter ikke blokkering"
 msgid "Not Authorized"
 msgstr "Ikke godkjent"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Sinnsstemning"
 
@@ -4247,7 +4333,6 @@ msgstr "Til"
 msgid "None (To pending)"
 msgstr "Ingen (Til pågående)"
 
-#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4269,6 +4354,12 @@ msgstr "Mellomnavn"
 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"
 
@@ -4441,9 +4532,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"
 
@@ -4792,7 +4880,6 @@ msgstr "Skamfull"
 msgid "Amorous"
 msgstr "Strålende"
 
-#. 1
 msgid "Angry"
 msgstr "Sint"
 
@@ -4890,7 +4977,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Bekymret"
 
-#. 2
 msgid "Excited"
 msgstr "Oppglødd"
 
@@ -4909,7 +4995,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Mottar..."
 
-#. 3
 msgid "Grumpy"
 msgstr "Gretten"
 
@@ -4917,14 +5002,12 @@ msgstr "Gretten"
 msgid "Guilty"
 msgstr "By"
 
-#. 4
 msgid "Happy"
 msgstr "Glad"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "Varm"
 
@@ -4964,7 +5047,6 @@ msgstr "Interesser"
 msgid "Intoxicated"
 msgstr "Invitert"
 
-#. 6
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
@@ -5028,7 +5110,6 @@ msgstr "Fjern"
 msgid "Restless"
 msgstr "Registrer"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
@@ -5050,11 +5131,9 @@ msgstr "Blokkert"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "Syk"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Trøtt"
@@ -5455,18 +5534,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"
 
@@ -5615,9 +5682,6 @@ msgstr "Bursdag"
 msgid "Work"
 msgstr "Arbeid"
 
-msgid "Job Title"
-msgstr "Tittel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5706,6 +5770,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"
 
@@ -5895,24 +5963,6 @@ msgstr "Ønsker du å slette denne kontakten fra adresseboka også?"
 msgid "The username specified is invalid."
 msgstr "Det oppgitte brukernavnet er ugyldig."
 
-#. 5
-msgid "In Love"
-msgstr "Forelsket"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Gjeldende humør"
-
-#. add all moods to list
-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 "The PIN you entered is invalid."
 msgstr "Den inntastede PIN-koden er ugyldig."
 
@@ -5944,7 +5994,11 @@ 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
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5952,6 +6006,7 @@ msgid "Verify PIN"
 msgstr "Kontrollere PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visningsnavn"
 
@@ -5978,10 +6033,6 @@ msgstr "Intet velkomstbilde er tilgjengelig for øyeblikket"
 msgid "About"
 msgstr "Om"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Endre humør ..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Endre profil ..."
@@ -6015,19 +6066,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Kobler til ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Det inntastede kallenavnet er ugyldig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Navnet du skrev er ugyldig."
 
 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"
-msgstr "MXit brukernavn"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Kallenavn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6055,10 +6103,12 @@ msgstr "Økta di er utgått. Prøv igjen seinere."
 msgid "Invalid country selected. Please try again."
 msgstr "Ugyldig land valgt. Prøv igjen seinere."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Brukernavnet er ikke registrert. Du må registrere det først."
 
-msgid "Username is already registered. Please choose another username."
+#, 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."
@@ -6070,7 +6120,7 @@ msgstr "Du skrev ikke inn sikkerhetskoden"
 msgid "Security Code"
 msgstr "Sikkerhetskode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Skriv inn sikkerhetskode"
 
@@ -6096,11 +6146,17 @@ msgstr "Leser inn meny ..."
 msgid "Status Message"
 msgstr "Statusmelding"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Mottatte beskjeder"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skjult nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ditt mobilnummer ..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6113,6 +6169,28 @@ msgstr "Koble til via HTTP"
 msgid "Enable splash-screen popup"
 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 "Vi har mistet forbindelsen til MXit. Du må koble til på nytt."
@@ -6216,6 +6294,9 @@ msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "En feil i MXit-forbindelsen oppstod. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "Forelsket"
+
 msgid "Pending"
 msgstr "Utestående"
 
@@ -6610,9 +6691,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"
 
@@ -6870,12 +6948,73 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL tillater ikke at ditt skjermnavn autentiserer her"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Feil ved forespørsel %s: %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 "Cannot receive IM due to parental controls"
+msgstr "Klarte ikke motta lynmelding på grunn av foreldrekontroll"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan ikke sende SMS uten at du godtar vilkårene"
+
+msgid "Cannot send SMS"
+msgstr "Klarte ikke sende SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Klarte ikke sende SMS til dette landet"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan ikke sende SMS til ukjent land"
+
+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 "Klarte ikke motta avloggede beskjeder"
+
+msgid "Offline message store full"
+msgstr "Lager avloggede beskjeder er fullt"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Klarte ikke sende beskjed: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Klarte ikke sende beskjed: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Klarte ikke sende beskjed til %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Klarte ikke sende beskjed til %s: %s"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7042,116 +7181,6 @@ msgstr ""
 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 "Invalid error"
-msgstr "Ugyldig feil"
-
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-msgid "Rate to host"
-msgstr "Hastighet til maskin"
-
-msgid "Rate to client"
-msgstr "Hastighet til klient"
-
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Klarte ikke motta lynmelding på grunn av foreldrekontroll"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Kan ikke sende SMS uten at du godtar vilkårene"
-
-msgid "Cannot send SMS"
-msgstr "Klarte ikke sende SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Klarte ikke sende SMS til dette landet"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Kan ikke sende SMS til ukjent land"
-
-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 "Klarte ikke motta avloggede beskjeder"
-
-msgid "Offline message store full"
-msgstr "Lager avloggede beskjeder 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 "
@@ -7511,28 +7540,9 @@ 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."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Klarte ikke sende beskjed: %s (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Klarte ikke sende beskjed: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarte ikke sende beskjed til %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Klarte ikke sende beskjed til %s: %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"
 
@@ -7961,6 +7971,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vannmannen"
 
@@ -8244,6 +8323,11 @@ msgstr "Forespør"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Romliste"
+
 msgid "Notice"
 msgstr "Merknad"
 
@@ -10148,9 +10232,6 @@ msgstr "Yahoo! ID ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo!-protokolltillegg"
 
-msgid "Pager server"
-msgstr "Søketjenestetjener"
-
 msgid "Pager port"
 msgstr "Personsøker-port"
 
@@ -10166,18 +10247,13 @@ msgstr "Samtaleroms språk"
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer konferanse og samtalerom invitasjoner"
 
-msgid "Use account proxy for SSL connections"
+#, 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"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo! JAPAN ID ..."
 
@@ -10245,6 +10321,15 @@ msgstr ""
 "Konto låst: Ukjent grunn. Å logge inn på Yahoo! sitt nettsted, kan kanskje "
 "løse 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 ""
+"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 "Brukernavn eller passord mangler"
@@ -10322,6 +10407,16 @@ msgstr "Mistet forbindelse med %s: %s"
 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 ""
+
 msgid "Not at Home"
 msgstr "Ikke hjemme"
 
@@ -10703,6 +10798,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"
 
@@ -10941,12 +11040,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"
@@ -12110,6 +12203,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabisk"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skamfull"
+
 msgid "Belarusian Latin"
 msgstr "Belarusian Latin"
 
@@ -12119,6 +12216,10 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bosnisk"
 
@@ -12233,6 +12334,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malayisk"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
@@ -12348,8 +12453,8 @@ msgid ""
 "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>"
+"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 "
@@ -12900,16 +13005,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?"
 
@@ -13011,11 +13116,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutter fordi en annen libpurple-klient allerede kjører.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Legg på"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Legg på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13812,10 +13919,6 @@ msgstr "Snarveitekst"
 msgid "Custom Smiley Manager"
 msgstr "Tilpassede smilefjes"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktivering kreves"
-
 msgid "Select Buddy Icon"
 msgstr "Velg kontaktikon"
 
@@ -14950,8 +15053,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..."
@@ -15161,6 +15276,199 @@ 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."
+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 "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."
 
@@ -15327,9 +15635,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Bruker:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versjon av GTK+ kjøremiljø "
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Beregner..."
@@ -15903,7 +16208,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."
 
diff --git a/po/ne.po b/po/ne.po
index 85205c0a3e..2b2c9ae4f4 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "नयाँ प्रत्र सूचनाहरू"
 
@@ -811,7 +824,7 @@ msgstr "हिपटप"
 msgid "Waiting for transfer to begin"
 msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द गरियो"
 
 msgid "Failed"
@@ -1322,6 +1335,10 @@ msgstr "अरुले कुरा गर्दा"
 msgid "Someone says your username in chat"
 msgstr "कुराकानीमा तपाईँको नाम कसैले भन्दा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "आवश्यक दर्ता "
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1428,7 +1445,6 @@ msgid "Saved Statuses"
 msgstr "सर्भर तथ्याङ्क"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "शीर्षक"
 
@@ -1632,7 +1648,7 @@ msgstr ""
 msgid "Online"
 msgstr "अनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "अफलाइन"
 
@@ -1734,6 +1750,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 "अज्ञात"
 
@@ -1752,9 +1776,10 @@ 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."
 msgstr ""
@@ -1992,7 +2017,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr "प्रमाणीकरण असफलता"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "अज्ञात कारण ।"
@@ -3284,6 +3308,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 "पहिलो नाम"
 
@@ -3928,14 +3955,6 @@ 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 आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
 
@@ -3968,6 +3987,18 @@ 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 "प्रमाणीकरण असफल भयो"
 
@@ -3976,6 +4007,42 @@ msgid "SASL error: %s"
 msgstr "त्रुटि पढ्नुहोस्"
 
 #, 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 "कन्फिगरेसन गर्न अक्षम"
 
@@ -4046,6 +4113,7 @@ msgstr "क्षेत्र"
 msgid "Postal Code"
 msgstr "हुलाकी संकेत"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "देश"
 
@@ -4060,10 +4128,14 @@ msgstr "संगठन नाम"
 msgid "Organization Unit"
 msgstr "संगठन एकाई"
 
+msgid "Job Title"
+msgstr "कार्य शीर्षक"
+
 msgid "Role"
 msgstr "भूमिका"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "जन्मदिन"
 
@@ -4298,6 +4370,14 @@ 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 "सादा पाठ"
 
@@ -4305,6 +4385,9 @@ msgstr "सादा पाठ"
 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 ""
 
@@ -4411,7 +4494,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "अधिकार प्राप्त छैन"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "मुड"
 
@@ -4433,7 +4515,6 @@ msgstr "लाई"
 msgid "None (To pending)"
 msgstr "कुनै पनि होइन (अनिर्णीत गर्न)"
 
-#. 0
 msgid "None"
 msgstr "कुनै पनि होइन"
 
@@ -4457,6 +4538,12 @@ msgstr "बिचको नाम"
 msgid "Mood Comment"
 msgstr "साथी टिप्पणी"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4633,9 +4720,6 @@ msgstr "नीति उल्ङ्घन"
 msgid "Remote Connection Failed"
 msgstr "टाढा जडान असफल भयो"
 
-msgid "Resource Constraint"
-msgstr "अपवाद संसाधान"
-
 msgid "Restricted XML"
 msgstr "निषेधित गरिएको XML"
 
@@ -5002,7 +5086,6 @@ msgstr "लज्जित"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "रिसाएको"
 
@@ -5100,7 +5183,6 @@ msgstr ""
 msgid "Envious"
 msgstr "चिन्तित"
 
-#. 2
 msgid "Excited"
 msgstr "उत्तेजित"
 
@@ -5118,7 +5200,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "जडान गरिदैछ..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "समूह:"
@@ -5127,14 +5208,12 @@ msgstr "समूह:"
 msgid "Guilty"
 msgstr "शहर"
 
-#. 4
 msgid "Happy"
 msgstr "खुशी"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "होस्ट:"
@@ -5175,7 +5254,6 @@ msgstr "इन्टरफेस"
 msgid "Intoxicated"
 msgstr "आमन्त्रण गर्नुहोस्"
 
-#. 6
 msgid "Invincible"
 msgstr "अजेय"
 
@@ -5239,7 +5317,6 @@ msgstr "हटाउनुहोस्"
 msgid "Restless"
 msgstr "दर्ता"
 
-#. 7
 msgid "Sad"
 msgstr "उदास"
 
@@ -5260,12 +5337,10 @@ msgstr "रोकिएको छ"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "निक"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "निद्रालु"
@@ -5689,19 +5764,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 "शीर्षक"
@@ -5875,9 +5937,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "कार्य शीर्षक"
-
 msgid "Company"
 msgstr "कम्पनी"
 
@@ -5979,6 +6038,10 @@ msgid "Show custom smileys"
 msgstr "प्रयोगकर्ता विवरणहरू देखाउनुहोस्"
 
 #, fuzzy
+msgid "Allow direct connections"
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
+
+#, fuzzy
 msgid "nudge: nudge a user to get their attention"
 msgstr "बज्: साथीको ध्यान आकृष्ट गर्न बज् गर्नुहोस्"
 
@@ -6176,27 +6239,6 @@ msgstr "के तपाईँं आफ्नो साथी सूचीम�
 msgid "The username specified is invalid."
 msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
 
-#. 5
-msgid "In Love"
-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?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
@@ -6233,7 +6275,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"
@@ -6242,6 +6288,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "प्रदर्शन"
@@ -6273,11 +6320,6 @@ msgstr "कुराकानी हाल उपलब्ध छैन"
 msgid "About"
 msgstr "गाइमको बारेमा"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "पासवर्ड परिवर्तन गर्नुहोस्..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6321,7 +6363,7 @@ msgid "Connecting..."
 msgstr "जडान"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 #, fuzzy
@@ -6329,14 +6371,9 @@ 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"
@@ -6367,10 +6404,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
@@ -6384,7 +6421,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "सुरक्षा सक्षम गरियो"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
@@ -6418,12 +6455,17 @@ 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")
@@ -6438,6 +6480,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 ""
@@ -6557,6 +6621,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "मायामा"
+
 #, fuzzy
 msgid "Pending"
 msgstr "पठाउनुहोस्"
@@ -6976,9 +7043,6 @@ msgstr "पासवर्डकोसमय सकिएको छ"
 msgid "Incorrect password"
 msgstr "गलत पासवर्ड ।"
 
-msgid "User not found"
-msgstr "प्रयोकर्ता फेला परेन"
-
 msgid "Account has been disabled"
 msgstr "खाता निस्क्रिय भइसेको छ"
 
@@ -7233,6 +7297,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "जडान सिर्जना गर्दा त्रुटि"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "जडान गर्न सकिएन"
@@ -7241,6 +7309,67 @@ 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 ""
+
+#, 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 "अफलाइन"
+
+#, 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 मा सन्देश पठाउन अक्षम:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7413,120 +7542,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 ""
-
-#, 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 "
@@ -7885,29 +7900,10 @@ 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 "अनलाइन अवधि"
 
@@ -8343,6 +8339,75 @@ 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 ""
 
@@ -8684,6 +8749,11 @@ msgstr "अनुरोध अस्पष्ट"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "कोठा सूची"
+
 #, fuzzy
 msgid "Notice"
 msgstr "द्रष्टव्य"
@@ -10691,10 +10761,6 @@ msgstr "याहू! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "याहू प्रोटोकल प्लगइन"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सि सर्भर"
-
 msgid "Pager port"
 msgstr "पेजर पोर्ट"
 
@@ -10712,20 +10778,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"
@@ -10793,6 +10852,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"
@@ -10869,6 +10935,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 "घरमा छैन"
 
@@ -11270,6 +11347,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 "स्वीकार गर्नुहोस्"
@@ -11523,12 +11604,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 "लगइन विकल्पहरू"
@@ -12816,6 +12891,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "अम्हारिक"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "लज्जित"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12825,6 +12904,9 @@ msgstr "बुल्गेरियन"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "एस्टोनियन"
@@ -12949,6 +13031,10 @@ msgid "Macedonian"
 msgstr "म्यासिडोनियन"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "पुरुष"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "म्यासिडोनियन"
 
@@ -13072,8 +13158,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13656,14 +13742,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
@@ -13759,10 +13845,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
@@ -14681,10 +14767,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "आवश्यक दर्ता "
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "साथी चयन गर्नुहोस्"
 
@@ -15909,7 +15991,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..."
@@ -16127,6 +16219,196 @@ msgstr ""
 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."
+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
+#, 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 "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 "जडान सिर्जना गर्दा त्रुटि"
@@ -16271,9 +16553,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "प्रयोगकर्ता:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+रनटाइम संस्करण"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "गणना गर्दैछ..."
@@ -16746,7 +17025,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."
diff --git a/po/nl.po b/po/nl.po
index dbc11f4ebb..632920e02c 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2009-07-20 12:53+0100\n"
-"Last-Translator: Daniël Heres <danielheres@gmail.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"PO-Revision-Date: 2010-08-01 09:08+0100\n"
+"Last-Translator: Dingoe <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,27 @@ 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 +562,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 +573,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 +607,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 +631,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 +648,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 +660,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 +678,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 +690,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 +715,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 +727,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 +740,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 +804,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 +821,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 +861,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 +888,7 @@ msgid "System Log"
 msgstr "Systeemlogboek"
 
 msgid "Calling..."
-msgstr "Bellen..."
+msgstr "Aan 't Bellen..."
 
 msgid "Hangup"
 msgstr "Ophangen"
@@ -883,13 +898,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 +912,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 +924,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 +946,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 +992,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 +1006,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 +1030,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 +1102,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 +1133,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 +1215,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 +1243,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 +1272,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 +1285,7 @@ msgid "(default)"
 msgstr "(standaard)"
 
 msgid "Select Sound File ..."
-msgstr "Selecteer geluids-bestand..."
+msgstr "Selecteer geluidsbestand..."
 
 msgid "Sound Preferences"
 msgstr "Geluidsvoorkeuren"
@@ -1279,7 +1297,7 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 msgid "Console Beep"
-msgstr "Console-pieptoon"
+msgstr "Console pieptoon"
 
 msgid "Command"
 msgstr "Opdracht"
@@ -1288,7 +1306,7 @@ msgid "No Sound"
 msgstr "Geen geluid"
 
 msgid "Sound Method"
-msgstr "Geluids-methode"
+msgstr "Geluidsmethode"
 
 msgid "Method: "
 msgstr "Methode:"
@@ -1298,7 +1316,7 @@ msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Geluids opdracht:\n"
+"Geluidscommando:\n"
 "(%s voor bestandsnaam)"
 
 #. Sound options
@@ -1306,7 +1324,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 +1359,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 +1368,6 @@ msgid "Saved Statuses"
 msgstr "Opgeslagen statussen"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1429,10 +1446,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 +1460,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 +1518,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 +1546,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,19 +1565,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"
 
-#. primative,						no,							id,			name
+#. 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"
@@ -1577,10 +1594,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"
@@ -1588,13 +1605,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"
@@ -1615,7 +1632,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"
@@ -1649,89 +1666,92 @@ 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."
+msgstr "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
 
 #. 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
@@ -1740,31 +1760,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
@@ -1776,31 +1795,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
@@ -1808,14 +1827,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."
@@ -1836,34 +1855,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"
@@ -1871,7 +1890,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"
@@ -1880,49 +1899,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 ""
@@ -1949,26 +1965,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"
 
-#, fuzzy
 msgid "File is not readable."
-msgstr "Map is niet beschrijfbaar."
+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"
@@ -1984,9 +1998,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"
@@ -2004,9 +2018,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"
@@ -2015,20 +2029,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."
@@ -2039,158 +2053,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>"
@@ -2199,7 +2205,7 @@ msgid "HTML"
 msgstr "HTML"
 
 msgid "Plain text"
-msgstr "Tekst"
+msgstr "Platte Tekst"
 
 msgid "Old flat format"
 msgstr "Oud plat formaat"
@@ -2241,56 +2247,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."
+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
 msgid "Conference error"
-msgstr "Conferentie afgesloten"
+msgstr "Conferentie fout"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Fout bij maken verbinding"
+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"
@@ -2301,7 +2308,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."
@@ -2317,14 +2324,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"
@@ -2336,7 +2343,7 @@ msgid "_Cancel"
 msgstr "_Annuleren"
 
 msgid "Ask"
-msgstr "Vraag"
+msgstr "Vragen"
 
 msgid "Auto Accept"
 msgstr "Automatisch accepteren"
@@ -2352,30 +2359,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
@@ -2386,16 +2394,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
@@ -2434,7 +2444,7 @@ msgstr "De met libpurple meegeleverde coderingen testen."
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr "DBus-voorbeeld"
+msgstr "DBus voorbeeld"
 
 #  *< name
 #  *< version
@@ -2445,7 +2455,7 @@ msgstr "DBus-voorbeeld"
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus voorbeeldplug-in"
+msgstr "DBus plug-in voorbeeld"
 
 #. *< type
 #. *< ui_requirement
@@ -2454,14 +2464,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"
@@ -2469,28 +2479,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"
@@ -2502,20 +2512,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
@@ -2531,26 +2541,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
@@ -2573,7 +2583,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
@@ -2583,17 +2593,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."
@@ -2602,14 +2612,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
@@ -2621,7 +2631,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
@@ -2658,7 +2668,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"
@@ -2674,7 +2684,7 @@ msgstr "Map voor logboeken"
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "Logboekweergave"
+msgstr "Log Lezer"
 
 #  *< name
 #  *< version
@@ -2683,11 +2693,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"
@@ -2695,24 +2704,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
@@ -2724,46 +2732,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"
@@ -2775,7 +2785,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"
@@ -2794,7 +2804,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 ""
@@ -2802,6 +2812,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
@@ -2810,19 +2824,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.  "
@@ -2832,10 +2846,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"
@@ -2843,9 +2857,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
@@ -2955,13 +2968,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
@@ -2970,7 +2983,7 @@ msgstr "Contact _meldt zich aan/af"
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Contactstatusmelding"
+msgstr "Vriendenstatusmelding"
 
 #. *< name
 #. *< version
@@ -2980,34 +2993,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?"
@@ -3041,10 +3052,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"
@@ -3078,32 +3089,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"
@@ -3113,10 +3124,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."
@@ -3134,7 +3145,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"
@@ -3163,7 +3174,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"
@@ -3172,13 +3183,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."
@@ -3196,17 +3207,17 @@ 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
@@ -3215,7 +3226,7 @@ msgstr "Beschikbaar"
 
 #. 2
 msgid "Chatty"
-msgstr "Chatgraag"
+msgstr "Babbelziek"
 
 #. 3
 msgid "Do Not Disturb"
@@ -3232,6 +3243,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"
 
@@ -3242,13 +3256,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"
@@ -3257,16 +3271,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
@@ -3278,14 +3292,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
@@ -3302,22 +3316,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
@@ -3331,15 +3345,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"
@@ -3394,9 +3408,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"
@@ -3405,13 +3418,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"
@@ -3474,14 +3487,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>"
@@ -3490,7 +3503,7 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentificeerd)</i>"
 
 msgid "Nick"
-msgstr "Bijnaam"
+msgstr "Nick"
 
 msgid "Currently on"
 msgstr "Nu aanwezig"
@@ -3550,7 +3563,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"
@@ -3564,7 +3577,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
@@ -3603,14 +3616,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"
@@ -3624,27 +3637,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"
@@ -3653,24 +3666,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 "
@@ -3683,14 +3696,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 ""
@@ -3698,7 +3711,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."
@@ -3710,18 +3723,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."
@@ -3737,14 +3750,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"
@@ -3754,22 +3767,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 ""
@@ -3783,7 +3795,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."
@@ -3798,28 +3810,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"
@@ -3843,21 +3854,9 @@ 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!
@@ -3865,54 +3864,98 @@ 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 "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"
+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?"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Identificatie mislukt"
+msgstr "SASL waarmerking mislukt"
 
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-fout: %s"
 
-#, fuzzy
+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 niet configureren"
+msgstr "Kan gebruikersnaam niet canonicaliseren"
 
-#, fuzzy
 msgid "Unable to canonicalize password"
-msgstr "Kon geen poort openen om te luisteren."
+msgstr "Kan wachtwoord niet canonicaliseren"
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "Ongeldige vraag van server"
+msgstr "Kwaardaardige Challenge van server"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht antwoord van server"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "De BOSH connectie manager heeft uw sessie afgebroken."
 
 msgid "No session ID given"
 msgstr "Geen sessie-ID gegeven"
@@ -3920,21 +3963,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"
@@ -3943,13 +3980,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
@@ -3957,17 +3994,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"
 
@@ -3982,10 +4020,14 @@ msgstr "Organisatie"
 msgid "Organization Unit"
 msgstr "Afdeling"
 
+msgid "Job Title"
+msgstr "Functieomschrijving"
+
 msgid "Role"
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Geboortedatum"
 
@@ -4003,7 +4045,7 @@ msgstr ""
 "openbaar wilt maken."
 
 msgid "Client"
-msgstr "Client"
+msgstr "Cliënt"
 
 msgid "Operating System"
 msgstr "Besturingssysteem"
@@ -4015,14 +4057,13 @@ msgid "Priority"
 msgstr "Prioriteit"
 
 msgid "Resource"
-msgstr "Hulpmiddel"
+msgstr "Hulpbron"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Bijwerken"
+msgstr "Tijd in de lucht"
 
 msgid "Logged Off"
-msgstr "UItgelogd"
+msgstr "Afgemeld"
 
 #, c-format
 msgid "%s ago"
@@ -4043,13 +4084,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"
@@ -4072,7 +4112,7 @@ msgid "Initiate _Chat"
 msgstr "_Chat starten"
 
 msgid "Log In"
-msgstr "Inloggen"
+msgstr "Aanmelden"
 
 msgid "Log Out"
 msgstr "Afmelden"
@@ -4092,23 +4132,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"
@@ -4124,13 +4164,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:"
@@ -4139,7 +4179,7 @@ msgid "_Server:"
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "Bij_naam:"
+msgstr "_Handle:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4178,7 +4218,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"
@@ -4204,29 +4244,39 @@ msgstr "Geen gebruikers gevonden"
 msgid "Roles:"
 msgstr "Rollen:"
 
+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 "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"
@@ -4236,7 +4286,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"
@@ -4254,14 +4304,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."
@@ -4281,25 +4331,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"
@@ -4307,7 +4357,6 @@ msgstr "Server ondersteunt blokkeren niet"
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Stemming"
 
@@ -4318,7 +4367,7 @@ msgid "Both"
 msgstr "Beide"
 
 msgid "From (To pending)"
-msgstr "Van"
+msgstr "Van (Aan wachtrij)"
 
 msgid "From"
 msgstr "Van"
@@ -4327,56 +4376,59 @@ msgid "To"
 msgstr "Aan"
 
 msgid "None (To pending)"
-msgstr "Geen"
+msgstr "Geen (aan wachtrij)"
 
-#. 0
 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"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Tweede naam"
+msgstr "Stemmingsnaam"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Contactopmerking"
+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"
@@ -4411,7 +4463,7 @@ msgid "Conflict"
 msgstr "Conflict"
 
 msgid "Feature Not Implemented"
-msgstr "Feature niet geïmplementeerd"
+msgstr "Functie niet geïmplementeerd"
 
 msgid "Forbidden"
 msgstr "Verboden"
@@ -4462,25 +4514,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"
@@ -4516,14 +4568,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"
 
@@ -4534,7 +4583,7 @@ msgid "System Shutdown"
 msgstr "Systeem wordt uitgeschakeld"
 
 msgid "Undefined Condition"
-msgstr "Ongedefnieerde voorwaarde"
+msgstr "Ongedefinieerde voorwaarde"
 
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
@@ -4549,7 +4598,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"
@@ -4573,61 +4622,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."
+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!"
 
 #, c-format
 msgid "Buzzing %s..."
 msgstr "%s trillen..."
 
-#, fuzzy, c-format
+#, 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"
@@ -4635,9 +4685,8 @@ msgstr "Kies een bron"
 msgid "Initiate Media"
 msgstr "Media opstarten"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
+msgstr "Account ondersteunt geen PEP, kan stemming niet instellen"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
@@ -4645,9 +4694,8 @@ 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."
@@ -4659,21 +4707,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 ""
@@ -4690,7 +4737,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."
@@ -4699,9 +4746,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Kies juiste gebruiker"
+msgstr "Stemming: instellen huidige gebruikersstemming"
 
 msgid "Extended Away"
 msgstr "Lang weg"
@@ -4742,7 +4788,7 @@ msgid "Connect server"
 msgstr "Verbinden met server"
 
 msgid "File transfer proxies"
-msgstr "Bestandsoverdracht proxy"
+msgstr "Bestandsoverdracht proxies"
 
 msgid "BOSH URL"
 msgstr "BOSH koppeling"
@@ -4750,7 +4796,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."
@@ -4773,31 +4819,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)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
+msgstr "Een aangepast emoticon in het bericht  is te groot om te verzenden."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP datastroom koptekst mist"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP Versie ongelijkheid"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP datastroom ID mist"
 
 msgid "XML Parse error"
-msgstr "XML analysefout"
+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"
@@ -4810,8 +4855,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"
@@ -4824,7 +4869,7 @@ 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)"
@@ -4833,15 +4878,14 @@ msgstr "Eruit gegooid (%s)"
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
-#, fuzzy
 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"
@@ -4868,34 +4912,28 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabisch"
+msgstr "Bang"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Beschaamd"
+msgstr "Verbaasd"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorieus"
+msgstr "Verliefd"
 
-#. 1
 msgid "Angry"
 msgstr "Boos"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Verbannen"
+msgstr "Geërgerd"
 
 msgid "Anxious"
 msgstr "Angstig"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Je stuurt"
+msgstr "Opgewonden"
 
 msgid "Ashamed"
 msgstr "Beschaamd"
@@ -4903,302 +4941,244 @@ msgstr "Beschaamd"
 msgid "Bored"
 msgstr "Verveeld"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Opslaan"
+msgstr "Dapper"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Gebied"
+msgstr "Kalm"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chats"
+msgstr "Voorzichtig"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Vet"
+msgstr "Koud"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflict"
+msgstr "zelfverzekerd"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Doorgaan"
+msgstr "Verward"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contact"
+msgstr "Beschouwend"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Verbonden"
+msgstr "Tevreden"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Bedrijf"
+msgstr "Humeurig"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Gek"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Aanmaken"
+msgstr "Creatief"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorieus"
+msgstr "Nieuwsgierig"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Weigeren"
+msgstr "Neerslachtig"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Verwijderen"
+msgstr "Terneergeslagen"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Verbinding verbroken"
+msgstr "Teleurgesteld"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Walgend"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "_Uitzetten"
+msgstr "Onthutst"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Losgekoppeld"
+msgstr "Afgeleid"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Bedremmeld"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Angstig"
+msgstr "Jaloers"
 
-#. 2
 msgid "Excited"
 msgstr "Opgewonden"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorieus"
+msgstr "Flirterig"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Voornaam"
+msgstr "Gefrustreerd"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Dankbaar"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Ophalen..."
+msgstr "Rouwend"
 
-#. 3
-#, fuzzy
 msgid "Grumpy"
-msgstr "Groep"
+msgstr "Knorrig"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Stad"
+msgstr "Schuldig"
 
-#. 4
 msgid "Happy"
 msgstr "Blij"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Hoopvol"
 
-#. 8
-#, fuzzy
 msgid "Hot"
-msgstr "_Host:"
+msgstr "Heet"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Nederig"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Vernederd"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Boos"
+msgstr "Hongerig"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Gegriefd"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Onder de indruk"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Verliefd"
+msgstr "ontzagvol"
 
 msgid "In love"
 msgstr "Verliefd"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesisch"
+msgstr "Verontwaardigd"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interesses"
+msgstr "Geïnteresseerd"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Uitnodigen"
+msgstr "Dronken"
 
-#. 6
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
 
 msgid "Jealous"
 msgstr "Jaloers"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Aap"
+msgstr "Eenzaam"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Hardst"
+msgstr "Verloren"
 
 msgid "Lucky"
-msgstr ""
+msgstr "heb geluk"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Duits"
+msgstr "Gemeen"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Stemming"
+msgstr "Humeurig"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Zenuwachtig"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detail"
+msgstr "Neutraal"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Offline "
+msgstr "Beledigd"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Woedend"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Afspelen"
+msgstr "Speels"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Hard"
+msgstr "Trots"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Echte naam"
+msgstr "Ontspannen"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Ontvangen"
+msgstr "Opgelucht"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Verwijderen"
+msgstr "Berouwvol"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registreren"
+msgstr "Rusteloos"
 
-#. 7
 msgid "Sad"
 msgstr "Verdrietig"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarcastisch"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Tevreden"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorieus"
+msgstr "Ernstig"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Geblokkeerd"
+msgstr "Geschokt"
 
 msgid "Shy"
-msgstr ""
+msgstr "Verlegen"
 
-#. 9
-#, fuzzy
 msgid "Sick"
-msgstr "Bijnaam"
+msgstr "Misselijk"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Slaperig"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontaan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Geslaagd:"
+msgstr "Gestrest"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Liedje"
+msgstr "Sterk"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Verbaasd"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Dankbaar"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Dorstig"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Brand"
+msgstr "Moe"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Onderstrepen"
+msgstr "Onbepaald"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Afranselen"
+msgstr "Zwak"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Verveeld"
+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"
@@ -5220,14 +5200,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 ""
@@ -5245,10 +5225,10 @@ msgstr ""
 "%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
 
 msgid "Unable to parse message"
-msgstr "Kan het bericht niet analyseren"
+msgstr "Kan het bericht niet ontleden"
 
 msgid "Syntax Error (probably a client bug)"
-msgstr "Syntaxfout (waarschijnlijk een client-bug)"
+msgstr "Syntaxfout (waarschijnlijk een cliënt-bug)"
 
 msgid "Invalid email address"
 msgstr "Ongeldig e-mailadres"
@@ -5278,7 +5258,7 @@ msgid "Not on list"
 msgstr "Niet in de lijst"
 
 msgid "User is offline"
-msgstr "Gebruiker is off-line"
+msgstr "Gebruiker is offline"
 
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
@@ -5302,7 +5282,7 @@ msgid "Cannot remove group zero"
 msgstr "Kan groep nul niet verwijderen"
 
 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"
 
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
@@ -5314,25 +5294,25 @@ msgid "Required fields missing"
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
 msgid "Too many hits to a FND"
-msgstr "Te veel resultaten bij zoekopdracht"
+msgstr "Te veel resultaten bij een FND"
 
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
 msgid "Service temporarily unavailable"
-msgstr "Service momenteel niet toegankelijk"
+msgstr "Dienst tijdelijk niet toegankelijk"
 
 msgid "Database server error"
-msgstr "Database-server fout"
+msgstr "Databaseserver fout"
 
 msgid "Command disabled"
 msgstr "Opdracht uitgeschakeld"
 
 msgid "File operation error"
-msgstr "Bestandsfout"
+msgstr "Bestandsbewerkingsfout"
 
 msgid "Memory allocation error"
-msgstr "Geheugenfout"
+msgstr "Geheugentoewijzingsfout"
 
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde naar server gestuurd"
@@ -5344,7 +5324,7 @@ msgid "Server unavailable"
 msgstr "Server niet beschikbaar"
 
 msgid "Peer notification server down"
-msgstr "Meldingsserver is off-line"
+msgstr "Peer meldingsserver is offline"
 
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
@@ -5362,7 +5342,7 @@ msgid "Unable to write"
 msgstr "Kan niet schrijven"
 
 msgid "Session overload"
-msgstr "Sessie-overload"
+msgstr "Sessie overbelasting"
 
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
@@ -5374,12 +5354,11 @@ msgid "Passport not verified"
 msgstr "Passport niet geverifieerd"
 
 msgid "Bad friend file"
-msgstr "Onbegrijpelijk contactenbestand"
+msgstr "Slechte vrienden bestand"
 
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "Bijnaam verandert te snel"
 
@@ -5387,19 +5366,19 @@ msgid "Server too busy"
 msgstr "Server te druk bezig"
 
 msgid "Authentication failed"
-msgstr "Identificatie mislukt"
+msgstr "Waarmerking mislukt"
 
 msgid "Not allowed when offline"
-msgstr "Niet toegestaan tijdens off-line-status"
+msgstr "Niet toegestaan tijdens offline-status"
 
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
 msgid "Kids Passport without parental consent"
-msgstr "Kinderpaspoort zonder toezegging van ouder"
+msgstr "Kinderpaspoort zonder ouderlijke goedkeuring"
 
 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"
@@ -5416,10 +5395,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>"
@@ -5435,28 +5414,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 ..."
@@ -5464,15 +5441,15 @@ msgstr "E-mailadres ..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Uw nieuwe MSN-bijnaam is te lang."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Bijnaam instellen."
+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."
@@ -5484,14 +5461,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"
@@ -5510,16 +5487,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"
@@ -5528,7 +5505,7 @@ msgid "Working"
 msgstr "Werken"
 
 msgid "Has you"
-msgstr "Heeft je"
+msgstr "Heeft u"
 
 msgid "Home Phone Number"
 msgstr "Telefoonnummer thuis"
@@ -5549,25 +5526,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..."
@@ -5591,22 +5556,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"
@@ -5639,7 +5603,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"
@@ -5675,7 +5639,7 @@ msgid "Favorite Quote"
 msgstr "Favoriete citaat"
 
 msgid "Contact Info"
-msgstr "Accountinformatie"
+msgstr "Contactpersoon informatie"
 
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -5711,9 +5675,6 @@ msgstr "Verjaardag"
 msgid "Work"
 msgstr "Werk"
 
-msgid "Job Title"
-msgstr "Functieomschrijving"
-
 msgid "Company"
 msgstr "Bedrijf"
 
@@ -5721,7 +5682,7 @@ msgid "Department"
 msgstr "Afdeling"
 
 msgid "Profession"
-msgstr "Baan"
+msgstr "Beroep"
 
 msgid "Work Phone"
 msgstr "Telefoon werk"
@@ -5736,7 +5697,7 @@ msgid "Work Mobile"
 msgstr "Gsm werk"
 
 msgid "Work Pager"
-msgstr "Semafoon werk"
+msgstr "pager werk"
 
 msgid "Work Fax"
 msgstr "Fax werk"
@@ -5745,7 +5706,7 @@ msgid "Work Email"
 msgstr "E-mail werk"
 
 msgid "Work IM"
-msgstr "Chat werk"
+msgstr "IM  werk"
 
 msgid "Start Date"
 msgstr "Begindatum"
@@ -5791,7 +5752,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"
@@ -5800,20 +5761,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."
+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"
@@ -5827,9 +5790,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."
@@ -5891,34 +5853,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"
@@ -5927,7 +5885,7 @@ msgid "Transferring"
 msgstr "Bezig met transport"
 
 msgid "Starting authentication"
-msgstr "Starten van authentificatie"
+msgstr "Waarmerking starten"
 
 msgid "Getting cookie"
 msgstr "Cookie opvragen"
@@ -5936,18 +5894,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"
@@ -5957,7 +5913,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 ""
@@ -5968,7 +5924,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:"
@@ -5981,7 +5937,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 ""
@@ -5994,63 +5950,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."
 
-#. 5
-msgid "In Love"
-msgstr "Verliefd"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Uw huidige stemming"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Humeur gebruiker"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Wachtwoord veranderen"
-
-#, fuzzy
-msgid "How do you feel right now?"
-msgstr "Ik ben er even niet"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De PINcode die u invulde is ongeldig."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [4-10]."
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
+msgstr "De PINcode is ongeldig. Het kan uitsluiten cijfers bevatten [0-9]."
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "Nieuwe wachtwoorden zijn niet gelijk."
+msgstr "De twee PINcodes die u invulde zijn niet gelijk."
 
-#, fuzzy
-msgid "The name you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgid "The Display Name you entered is invalid."
+msgstr "De schermnaam die u invoerde is ongeldig."
 
 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")
@@ -6059,368 +5990,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!"
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit HTTP 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 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 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"
-
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "Bezig met Verbinden..."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Bijnaam"
+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..."
 
-#, fuzzy
 msgid "Loading menu..."
-msgstr "Aanmelden"
+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..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
+"%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"
 
-#, fuzzy
 msgid "An internal MXit server error occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
+msgstr "Een interne MXit serverfout opgetreden."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "SASL-fout: %s"
+msgstr "Aanmeldingsfout: %s (%i)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "SASL-fout: %s"
+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 ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x06)"
+
+msgid "In Love"
+msgstr "Verliefd"
 
-#, 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"
@@ -6429,11 +6328,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"
@@ -6460,7 +6359,7 @@ msgid "MySpace"
 msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr "Chat-vrienden"
+msgstr "IM Vrienden"
 
 #, c-format
 msgid ""
@@ -6470,29 +6369,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"
@@ -6504,23 +6403,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"
@@ -6546,21 +6444,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"
@@ -6587,19 +6485,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!"
@@ -6608,14 +6509,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"
@@ -6627,104 +6528,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
@@ -6734,11 +6635,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
@@ -6748,15 +6649,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"
@@ -6771,10 +6672,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"
@@ -6788,9 +6689,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"
 
@@ -6804,7 +6702,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"
@@ -6813,7 +6711,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 "
@@ -6826,10 +6725,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"
@@ -6848,7 +6747,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"
@@ -6861,12 +6760,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
@@ -6880,11 +6779,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 ""
@@ -6899,7 +6798,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
@@ -6908,7 +6807,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)."
@@ -6920,7 +6819,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)."
@@ -6928,7 +6827,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 ""
@@ -6941,7 +6840,7 @@ msgid "Personal Title"
 msgstr "Persoonlijke titel"
 
 msgid "Mailstop"
-msgstr "Post-stop"
+msgstr "Mailstop"
 
 msgid "User ID"
 msgstr "Gebruikers-ID"
@@ -6957,10 +6856,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..."
@@ -6983,24 +6882,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
@@ -7014,152 +6912,198 @@ 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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht antwoord ontvangen van %s: %s"
 
-#, fuzzy, c-format
+#, 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 ""
 "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 "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL laat niet toe uw schermnaam hier te waarmerken"
+
+#, c-format
+msgid "Error requesting %s"
+msgstr "Fout opvragen  %s"
 
 msgid "Could not join chat room"
-msgstr "Kon gesprek-ruimte niet binnenkomen"
+msgstr "Kon chatruimte niet binnenkomen"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
 
+msgid "Invalid error"
+msgstr "Ongeldige fout"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Kan geen IM ontvangen door ouderlijk toezicht "
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan geen SMS zenden zonder de voorwaarden te accepteren"
+
+msgid "Cannot send SMS"
+msgstr "Kan SMS niet verzenden"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan geen SMS zenden naar dit land."
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan geen SMS zenden naar onbekend land"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot accounts kunnen geen IM's initiëren "
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot account kan geen IM sturen naar deze gebruiker"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot account heeft de IM limiet bereikt"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot account heeft dagelijks IM limiet bereikt"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot account heeft maandelijks IM limiet bereikt"
+
+msgid "Unable to receive offline messages"
+msgstr "Kan geen offline berichten ontvangen"
+
+msgid "Offline message store full"
+msgstr "offline berichten opslag vol "
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Kan bericht niet verzenden: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Kan het bericht niet verzenden: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Kan bericht niet verzenden naar %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Kan bericht niet verzenden naar %s: %s"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Aan het nadenken"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "...stopt met typen"
+msgstr "Winkelen"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Dialoogvenster voor vragen"
+msgstr "Vragenstellen"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Semafoon"
+msgstr "Eten"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Speelt een spelletje"
+msgstr "Film kijken"
 
 msgid "Typing"
 msgstr "Typen"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Niet op kantoor"
+msgstr "Op kantoor"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Aan 't Baden"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "aan 't TV kijken"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Ophangen"
+msgstr "Pret hebben"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Slaperig"
+msgstr "Slapen"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Een PDA aan 't gebruiken"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Chat-vrienden"
+msgstr "vrienden bezoeken"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Aan de telefoon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Herhalend"
+msgstr "Surfen"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobiel"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Iets op het web zoeken"
 
 msgid "At a party"
-msgstr ""
+msgstr "Op een feestje"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Koffie drinken"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Gamende gebruiker"
+msgstr "Gamen"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Surfen op het web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Liedje"
+msgstr "Roken"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Werken"
+msgstr "Schrijven"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Werken"
+msgstr "Drinken"
 
 msgid "Listening to music"
-msgstr "Luisteren naar muziek"
+msgstr "naar muziek aan 't luisteren"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Verzenden"
+msgstr "Studeren"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interesses"
+msgstr "Op de WC"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Ongeldige data ontvangen van server."
+msgstr "Ongeldige data ontvangen bij verbinding met server"
 
 #. *< type
 #. *< ui_requirement
@@ -7206,9 +7150,8 @@ msgstr "De verbinding is verbroken met de volgende gebruiker:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Ongeldige data ontvangen via directe verbinding."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "Kan geen verbinding maken met de andere gebruiker."
+msgstr "Kan geen verbinding maken met gebruiker op afstand."
 
 msgid "Direct IM established"
 msgstr "Directe verbinding opgezet"
@@ -7218,127 +7161,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 probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s "
-"toe op Direct IM.  Probeer bestandsoverdracht.\n"
+"%s probeerde u een %s bestand te sturen, maar we staan bestanden tot %s toe "
+"op Direct IM.  Probeer in plaats hiervan bestandsoverdracht.\n"
 
 #, 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 "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 "Service not defined"
-msgstr "Service niet gedefinieerd"
-
-msgid "Obsolete SNAC"
-msgstr "Verouderde SNAC"
-
-msgid "Not supported by host"
-msgstr "Niet ondersteund door host"
-
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Kan bestand niet verzenden"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Kan geen map sturen."
-
-#. 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 het bericht niet verzenden."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Off-line bericht"
-
 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 "
@@ -7356,8 +7185,7 @@ msgid ""
 "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.)"
+"verschillende coderingmethoden ingesteld, of %s heeft een instabiele cliënt.)"
 
 # msgstr ""
 # "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
@@ -7380,13 +7208,13 @@ msgid "Games"
 msgstr "Spelletjes"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Extra's"
 
 msgid "Send Buddy List"
-msgstr "Contactenlijst verzenden"
+msgstr "Vriendenlijst verzenden"
 
 msgid "ICQ Direct Connect"
 msgstr "ICQ Directe verbinding"
@@ -7448,25 +7276,20 @@ msgstr "Zichtbaar op web"
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-mail"
+msgstr "Kwaadaardig"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Baan"
+msgstr "Depressie"
 
-#, fuzzy
 msgid "At home"
-msgstr "Over mij"
+msgstr "Thuis"
 
-#, fuzzy
 msgid "At work"
-msgstr "Netwerk"
+msgstr "Op het werk"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Lunchen"
+msgstr "Aan 't Lunchen"
 
 msgid "IP Address"
 msgstr "IP-adres"
@@ -7475,17 +7298,17 @@ msgid "Warning Level"
 msgstr "Waarschuwingsniveau"
 
 msgid "Buddy Comment"
-msgstr "Contactopmerking"
+msgstr "Opmerking bij Vriend"
 
-#, fuzzy, c-format
+#, 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"
@@ -7497,7 +7320,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, "
@@ -7508,10 +7331,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."
@@ -7525,28 +7349,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
@@ -7555,16 +7376,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."
 
@@ -7581,7 +7400,7 @@ 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."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn vriendenlijst."
 
 msgid "No reason given."
 msgstr "Geen reden gegeven."
@@ -7595,19 +7414,19 @@ msgid ""
 "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 ""
@@ -7616,7 +7435,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"
@@ -7628,7 +7447,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"
@@ -7640,17 +7459,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"
@@ -7690,10 +7509,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
@@ -7701,9 +7520,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."
@@ -7711,29 +7530,10 @@ 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"
 
@@ -7797,7 +7597,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"
@@ -7863,8 +7663,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."
@@ -7874,8 +7674,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
@@ -7886,11 +7686,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."
@@ -7903,53 +7703,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 ""
@@ -7957,7 +7757,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"
@@ -7967,7 +7767,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"
@@ -7980,7 +7780,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"
@@ -7991,22 +7791,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"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+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."
@@ -8022,24 +7821,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"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Statusbericht tonen"
+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"
@@ -8048,7 +7844,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)"
@@ -8061,8 +7857,8 @@ 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: "
@@ -8071,23 +7867,23 @@ msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wacht niet op toestemming</i>"
 
 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"
@@ -8117,17 +7913,16 @@ 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"
+msgstr "Vriend zoeken via informatie"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Gebruiker is niet aangemeld"
+msgstr "Gebruik clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -8135,8 +7930,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"
@@ -8166,6 +7961,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Waterman"
 
@@ -8265,9 +8129,8 @@ msgstr "Postcode"
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Gebruiker toestaan?"
+msgstr "Toevoegen toestaan"
 
 msgid "Cellphone Number"
 msgstr "Mobiele nummer"
@@ -8282,7 +8145,7 @@ msgid "Publish Mobile"
 msgstr "Mobiel publiceren"
 
 msgid "Publish Contact"
-msgstr "Contact publiceren"
+msgstr "Contactpersoon publiceren"
 
 msgid "College"
 msgstr "School"
@@ -8303,14 +8166,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"
@@ -8318,24 +8180,18 @@ msgstr "Informatie wijzigen"
 msgid "Update"
 msgstr "Bijwerken"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Contactinformatie veranderen."
+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"
@@ -8357,7 +8213,7 @@ msgid "%u requires verification"
 msgstr "%u vereist identificatie"
 
 msgid "Add buddy question"
-msgstr "Contactvraag toevoegen"
+msgstr "Vraag van Vriend toevoegen"
 
 msgid "Enter answer here"
 msgstr "Voer hier antwoord in"
@@ -8369,17 +8225,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"
@@ -8388,25 +8244,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"
@@ -8439,9 +8294,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)"
@@ -8458,6 +8312,10 @@ msgstr "Aanvragen"
 msgid "Admin"
 msgstr "Beheerder"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Ruimte titel"
+
 msgid "Notice"
 msgstr "Opmerking"
 
@@ -8473,22 +8331,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"
@@ -8501,7 +8358,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"
@@ -8514,7 +8371,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"
@@ -8523,38 +8380,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"
@@ -8573,7 +8429,7 @@ msgid " FromMobile"
 msgstr " Vanaf mobiel"
 
 msgid " BindMobile"
-msgstr "BindMobile"
+msgstr "BiNDMobile"
 
 msgid " Video"
 msgstr "Video"
@@ -8599,7 +8455,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"
@@ -8609,9 +8465,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"
@@ -8619,7 +8475,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"
@@ -8652,7 +8508,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"
@@ -8663,22 +8519,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"
@@ -8700,7 +8554,7 @@ msgid "About OpenQ"
 msgstr "Over OpenQ"
 
 msgid "Modify Buddy Memo"
-msgstr "Contactmemo wijzigen"
+msgstr "Vriendmemo wijzigen"
 
 #. *< type
 #. *< ui_requirement
@@ -8713,13 +8567,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"
@@ -8731,48 +8585,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"
@@ -8794,17 +8647,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"
@@ -8813,11 +8668,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"
@@ -8826,7 +8680,7 @@ msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 msgid "QQ Error"
-msgstr "QQ-fout"
+msgstr "QQ Fout"
 
 #, c-format
 msgid ""
@@ -8835,7 +8689,7 @@ msgid ""
 "%s\n"
 "%s"
 msgstr ""
-"Server-nieuws:\n"
+"Server Nieuws:\n"
 "%s\n"
 "%s\n"
 "%s"
@@ -8853,43 +8707,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>"
@@ -8897,14 +8750,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..."
@@ -8913,19 +8766,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"
@@ -8966,7 +8819,7 @@ msgid "Microphone"
 msgstr "Microfoon"
 
 msgid "Speakers"
-msgstr "Speakers"
+msgstr "Luidsprekers"
 
 msgid "Video Camera"
 msgstr "Videocamera"
@@ -8975,7 +8828,7 @@ msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
 msgid "Supports"
-msgstr "Ondersteuning"
+msgstr "Ondersteunt"
 
 msgid "External User"
 msgstr "Externe gebruiker"
@@ -8988,7 +8841,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"
@@ -8998,13 +8851,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 ""
@@ -9012,15 +8865,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"
@@ -9036,7 +8889,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"
@@ -9071,8 +8924,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"
@@ -9097,13 +8951,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"
@@ -9144,8 +8998,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"
@@ -9157,17 +9012,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'"
@@ -9222,7 +9079,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
@@ -9316,8 +9173,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.
@@ -9326,7 +9183,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 "
@@ -9346,14 +9203,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"
@@ -9374,7 +9231,7 @@ msgid "User Modes"
 msgstr "Gebruikersmodi"
 
 msgid "Preferred Contact"
-msgstr "Voorkeurscontact"
+msgstr "Voorkeurscontactpersoon"
 
 msgid "Preferred Language"
 msgstr "Voorkeurstaal"
@@ -9386,7 +9243,7 @@ msgid "Timezone"
 msgstr "Tijdzone"
 
 msgid "Geolocation"
-msgstr "Geo-locatie"
+msgstr "Geolocatie"
 
 msgid "Reset IM Key"
 msgstr "IM-sleutel resetten"
@@ -9454,7 +9311,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"
@@ -9477,14 +9334,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"
@@ -9548,7 +9405,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"
@@ -9557,7 +9414,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"
@@ -9566,7 +9423,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"
@@ -9660,7 +9517,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>"
@@ -9677,7 +9534,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"
@@ -9710,7 +9567,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"
@@ -9780,7 +9637,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"
@@ -9794,12 +9651,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 ""
@@ -9825,9 +9682,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"
@@ -9841,7 +9697,6 @@ msgstr ""
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
@@ -9852,7 +9707,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"
 
@@ -9896,7 +9750,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"
@@ -9965,7 +9819,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"
@@ -9985,36 +9839,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"
@@ -10029,30 +9882,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"
@@ -10061,18 +9913,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"
@@ -10080,11 +9932,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"
@@ -10094,7 +9946,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 "
@@ -10138,7 +9990,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"
@@ -10155,9 +10007,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,
@@ -10232,19 +10083,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"
@@ -10296,36 +10147,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
@@ -10343,7 +10190,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"
@@ -10362,13 +10209,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..."
@@ -10383,12 +10230,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"
@@ -10405,18 +10248,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..."
 
@@ -10431,13 +10268,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"
@@ -10454,44 +10290,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 ""
@@ -10499,45 +10340,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."
@@ -10545,35 +10386,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"
@@ -10597,31 +10442,31 @@ 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"
+msgstr "offline 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?"
@@ -10633,22 +10478,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."
@@ -10680,14 +10525,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"
@@ -10696,22 +10540,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 "
@@ -10727,15 +10571,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"
@@ -10757,12 +10601,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"
@@ -10788,9 +10632,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 "
@@ -10827,10 +10670,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"
@@ -10842,33 +10685,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 ""
@@ -10921,17 +10767,17 @@ msgstr "Ontmaskering"
 msgid "Unable to create socket: %s"
 msgstr "Kan geen socket aanmaken: %s"
 
-#, fuzzy, c-format
+#, 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"
@@ -10939,7 +10785,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!"
@@ -10957,6 +10803,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"
 
@@ -10964,7 +10814,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"
@@ -10993,7 +10843,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"
@@ -11006,7 +10856,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"
@@ -11021,11 +10871,10 @@ msgid "Do not disturb"
 msgstr "Niet storen"
 
 msgid "Extended away"
-msgstr "Uitgebreide weg"
+msgstr "Voor langere tijd weg"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Ontvangen"
+msgstr "Gevoel"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11115,9 +10964,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 ""
@@ -11150,7 +10999,7 @@ 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
@@ -11176,30 +11025,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"
@@ -11208,7 +11052,7 @@ msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
 msgid "_Username:"
-msgstr "_Gebruiker:"
+msgstr "_Gebruikersnaam:"
 
 msgid "Remember pass_word"
 msgstr "_Wachtwoord onthouden"
@@ -11218,14 +11062,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"
@@ -11257,11 +11101,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:"
@@ -11299,7 +11143,7 @@ msgstr "Ingeschakeld"
 msgid "Protocol"
 msgstr "Protocol"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -11313,71 +11157,70 @@ 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."
 
 #. 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
@@ -11385,16 +11228,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
@@ -11402,17 +11244,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
@@ -11420,48 +11260,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"
@@ -11469,7 +11311,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"
@@ -11490,19 +11332,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"
@@ -11571,65 +11413,63 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Onbekende node-type"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Selecteer je humeur uit de lijst"
+msgstr "Selecteer uw stemming uit de lijst"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (optioneel)"
+msgstr "Bericht (optioneel)"
 
 msgid "Edit User Mood"
-msgstr "Humeur instellen"
+msgstr "Stemming instellen"
 
 #. 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"
@@ -11643,13 +11483,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"
@@ -11660,9 +11500,8 @@ msgstr "/Extra/_Voorkeuren"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Extra/_Systeemlogboek"
+msgstr "/Extra/_Stemming instellen "
 
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
@@ -11683,23 +11522,20 @@ msgstr "/_Hulp"
 msgid "/Help/Online _Help"
 msgstr "/Hulp/Online _hulp"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Contactinformatie"
+msgstr "/Help/_Build Informatie"
 
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Server-informatie"
+msgstr "/Hulp/Ont_wikkelaarsinformatie"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Persoonlijke informatie"
+msgstr "/Hulp/_Vertalersinformatie"
 
 msgid "/Help/_About"
-msgstr "/Hulp/_Info"
+msgstr "/Hulp/_Over"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11725,7 +11561,7 @@ msgid "(no topic set)"
 msgstr "(geen onderwerp ingesteld)"
 
 msgid "Buddy Alias"
-msgstr "Contact-alias"
+msgstr "Vriend-alias"
 
 msgid "Logged In"
 msgstr "Ingelogd"
@@ -11743,7 +11579,7 @@ msgid "Rockin'"
 msgstr "Rocken"
 
 msgid "Total Buddies"
-msgstr "Aantal contacten"
+msgstr "Aantal Vrienden"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -11758,22 +11594,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"
@@ -11794,7 +11630,7 @@ msgid "By status"
 msgstr "Op status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Volgens recente log activiteit"
 
 #, c-format
 msgid "%s disconnected"
@@ -11811,7 +11647,7 @@ msgid "Re-enable"
 msgstr "Weer aanzetten"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
 msgid "Welcome back!"
 msgstr "Welkom terug!"
@@ -11821,9 +11657,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>"
@@ -11857,25 +11695,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:"
@@ -11898,7 +11736,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:"
@@ -11906,13 +11744,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."
@@ -11929,25 +11765,23 @@ msgstr "<PurpleMain>/Accounts/"
 msgid "_Edit Account"
 msgstr "_Account bewerken"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Humeur instellen..."
+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"
@@ -11957,8 +11791,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."
@@ -11967,10 +11800,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"
@@ -12023,11 +11856,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..."
@@ -12056,15 +11888,14 @@ msgstr "/Gesprek/Media/Audio\\/Videogesprek"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Gesprek/Info opvragen"
+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..."
@@ -12088,7 +11919,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..."
@@ -12141,15 +11972,14 @@ msgstr "/Gesprek/Media/Audio\\/Videogesprek"
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Gesprek/Info opvragen"
+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..."
@@ -12170,7 +12000,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..."
@@ -12212,13 +12042,11 @@ msgstr "0 personen in ruimte"
 
 # src/bookmarks_editor.c:945
 # src/menubar.c:91
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Dit tabblad sluiten"
+msgstr "Sluit Zoekbalk"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Zoeken"
+msgstr "Zoek:"
 
 #, c-format
 msgid "%d person in room"
@@ -12230,7 +12058,7 @@ msgid "Stopped Typing"
 msgstr "Gestopt met typen"
 
 msgid "Nick Said"
-msgstr "Bijnaam gezegd"
+msgstr "Nick gezegd"
 
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
@@ -12239,13 +12067,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"
@@ -12268,7 +12096,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"
@@ -12292,7 +12120,7 @@ msgid "Invert"
 msgstr "Omkeren"
 
 msgid "Highlight matches"
-msgstr "Overeenkomsten aangeven"
+msgstr "Overeenkomsten markeren"
 
 msgid "_Icon Only"
 msgstr "Alleen _plaatje"
@@ -12332,7 +12160,7 @@ msgid "Fatal Error"
 msgstr "Fatale fout"
 
 msgid "bug master"
-msgstr ""
+msgstr "bug master"
 
 msgid "artist"
 msgstr "artiest"
@@ -12384,6 +12212,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabisch"
 
+msgid "Assamese"
+msgstr "Assamese"
+
 msgid "Belarusian Latin"
 msgstr "Witrussisch Latijn"
 
@@ -12393,6 +12224,9 @@ msgstr "Bulgaars"
 msgid "Bengali"
 msgstr "Bengaals"
 
+msgid "Bengali-India"
+msgstr "Bengaals-Indiaas"
+
 msgid "Bosnian"
 msgstr "Bosnisch"
 
@@ -12427,7 +12261,7 @@ msgid "British English"
 msgstr "Brits Engels"
 
 msgid "Esperanto"
-msgstr "Spaans"
+msgstr "Esperanto"
 
 msgid "Spanish"
 msgstr "Spaans"
@@ -12436,7 +12270,7 @@ msgid "Estonian"
 msgstr "Estlands"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisch"
 
 msgid "Persian"
 msgstr "Perzisch"
@@ -12451,7 +12285,7 @@ msgid "Irish"
 msgstr "Iers"
 
 msgid "Galician"
-msgstr "Galiciaans"
+msgstr "Gallicisch"
 
 msgid "Gujarati"
 msgstr "Gujarati"
@@ -12493,7 +12327,7 @@ msgid "Kannada"
 msgstr "Kannada"
 
 msgid "Kannada Translation team"
-msgstr "Canadees vertaalteam"
+msgstr "Kannada vertaalteam"
 
 msgid "Korean"
 msgstr "Koreaans"
@@ -12507,22 +12341,23 @@ msgstr "Laotiaans"
 msgid "Macedonian"
 msgstr "Macedonisch"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongools"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
+msgstr "Marathi"
 
-#, fuzzy
 msgid "Malay"
-msgstr "Man"
+msgstr "Maleis"
 
 msgid "Bokmål Norwegian"
-msgstr "Noors"
+msgstr "Bokmål Noors"
 
 msgid "Nepali"
-msgstr "Nepals"
+msgstr "Nepalees"
 
 msgid "Dutch, Flemish"
 msgstr "Nederlands & Vlaams"
@@ -12533,9 +12368,8 @@ msgstr "Noors"
 msgid "Occitan"
 msgstr "Occitaans"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12593,9 +12427,8 @@ msgstr "Thais"
 msgid "Turkish"
 msgstr "Turks"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "Armeens"
+msgstr "Ukranian"
 
 msgid "Urdu"
 msgstr "Urdu"
@@ -12621,25 +12454,22 @@ msgstr "Amharic"
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12648,6 +12478,9 @@ msgid ""
 "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 ""
@@ -12659,45 +12492,51 @@ msgid ""
 "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/>"
 
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Contactinformatie"
+msgstr "Build Informatie"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Contactinformatie"
+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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Server-informatie"
+msgstr "%s Info over Ontwikkelaars"
 
 msgid "Current Translators"
-msgstr "Huidige vertalers"
+msgstr "Huidige Vertalers"
 
 msgid "Past Translators"
-msgstr "Gestopte vertalers"
+msgstr "Gestopte Vertalers"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Werkinformatie"
+msgstr "%s Info over Vertalers"
 
 msgid "_Name"
 msgstr "_Naam"
@@ -12706,30 +12545,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"
@@ -12745,17 +12584,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 ""
@@ -12776,8 +12615,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"
@@ -12789,22 +12628,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"
@@ -12819,7 +12658,7 @@ msgid "_Change Status"
 msgstr "Status _wijzigen"
 
 msgid "Show Buddy _List"
-msgstr "Contactenlijst _weergeven"
+msgstr "Vriendenlijst _weergeven"
 
 msgid "_Unread Messages"
 msgstr "_Ongelezen berichten"
@@ -12831,7 +12670,7 @@ msgid "_Accounts"
 msgstr "_Accounts"
 
 msgid "Plu_gins"
-msgstr "Plu_gins"
+msgstr "Plu_g-ins"
 
 msgid "Pr_eferences"
 msgstr "Voork_euren"
@@ -12888,10 +12727,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"
@@ -12901,81 +12740,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"
@@ -13012,7 +12847,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"
@@ -13033,14 +12868,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"
@@ -13057,18 +12892,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"
@@ -13110,11 +12945,10 @@ msgid "Insert IM Image"
 msgstr "Afbeelding invoegen"
 
 msgid "Insert Smiley"
-msgstr "Smiley invoegen"
+msgstr "Emoticon invoegen"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Verzendknop"
+msgstr "Verzend attentie"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vet: </b>"
@@ -13159,10 +12993,10 @@ msgid "_Horizontal rule"
 msgstr "_Horizontale streep"
 
 msgid "_Smile!"
-msgstr "L_achen!"
+msgstr "E_moticons!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Attentie!"
 
 msgid "Log Deletion Failed"
 msgstr "Logboek verwijderen mislukt"
@@ -13175,23 +13009,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?"
@@ -13210,7 +13044,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"
@@ -13221,45 +13055,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"
@@ -13274,33 +13114,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."
@@ -13311,7 +13145,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"
@@ -13352,18 +13186,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"
@@ -13413,34 +13246,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"
@@ -13482,13 +13314,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"
@@ -13512,7 +13344,7 @@ msgid "Signed off"
 msgstr "Afgemeld"
 
 msgid "Became idle"
-msgstr "Werd incatief"
+msgstr "Werd inactief"
 
 msgid "Went away"
 msgstr "Ging weg"
@@ -13524,20 +13356,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Onbekend... Rapporteer dit alsjeblieft!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Aangepast)"
 
 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."
@@ -13548,34 +13379,29 @@ msgstr "Kan thema niet laden."
 msgid "Theme failed to copy."
 msgstr "Kan thema niet kopiëren."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Browser-selectie"
+msgstr "Thema Selecties"
 
 #. 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 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."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Thema contactenlijst"
+msgstr "Thema Vriendenlijst:"
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "Status-pictogrammen"
+msgstr "Statuspictogrammen thema:"
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "Geluidsthema:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Smiley-thema's"
+msgstr "Emoticon thema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
@@ -13597,20 +13423,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"
@@ -13643,25 +13469,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:"
@@ -13689,19 +13515,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>"
@@ -13715,33 +13539,27 @@ 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:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Gebruikersnaam:"
+msgstr "Gebruike_rsnaam:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Wachtwoord: "
+msgstr "Wacht_woord: "
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13780,13 +13598,10 @@ msgid "Manual"
 msgstr "Handmatig"
 
 msgid "Browser Selection"
-msgstr "Browser-selectie"
+msgstr "Browser selectie"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
-"Proxy- en browser-voorkeuren zijn ingesteld\n"
-"in GNOME-instellingen"
+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>"
@@ -13798,10 +13613,10 @@ 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"
@@ -13820,11 +13635,8 @@ msgstr ""
 msgid "Proxy Server"
 msgstr "Proxy-server"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
-"Proxy- en browser-voorkeuren zijn ingesteld\n"
-"in GNOME-instellingen"
+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>"
@@ -13835,34 +13647,31 @@ 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 ""
+msgstr "Gebruik remote _DNS met SOCKS4 proxies"
 
-#, fuzzy
 msgid "Proxy t_ype:"
-msgstr "Proxy_type:"
+msgstr "Proxyt_ype:"
 
 msgid "No proxy"
 msgstr "Geen proxy"
 
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Poort:"
+msgstr "P_oort:"
 
-#, fuzzy
 msgid "User_name:"
-msgstr "Gebruikersnaam:"
+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"
@@ -13912,7 +13721,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:"
@@ -13930,17 +13739,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 voor inactief worden:"
+msgstr "_Minuten alvorens inactief te worden:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Status op afwezig zetten _wanneer ik inactief ben"
+msgstr "_Wanneer ik inactief ben zetten op status"
 
 msgid "_Auto-reply:"
 msgstr "_Automatisch antwoord:"
@@ -13950,10 +13758,10 @@ msgstr "Bij afwezigheid en inactiviteit"
 
 #. 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:"
@@ -13967,18 +13775,17 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Status / inactief"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Smiley-thema's"
+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"
@@ -13990,7 +13797,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:"
@@ -14003,21 +13810,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"
@@ -14064,7 +13871,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"
@@ -14095,24 +13902,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:"
@@ -14122,26 +13928,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"
-
-#, fuzzy
-msgid "Attention received"
-msgstr "Activatie vereist"
+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"
@@ -14153,7 +13955,7 @@ msgid "Saved statuses..."
 msgstr "Opgeslagen statussen..."
 
 msgid "Status Selector"
-msgstr "Statusselectie"
+msgstr "Statusselector"
 
 msgid "Google Talk"
 msgstr "Google talk"
@@ -14178,23 +13980,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?"
@@ -14203,8 +14005,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 "
@@ -14228,7 +14030,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
@@ -14256,7 +14058,7 @@ 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"
@@ -14276,9 +14078,8 @@ msgstr "Geluid afs_pelen"
 msgid "_Save File"
 msgstr "Bestand op_slaan"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u het werkelijk wissen?"
 
 msgid "Select color"
 msgstr "Selecteer kleur"
@@ -14295,7 +14096,7 @@ msgid "Close _tabs"
 msgstr "tabs sluiten"
 
 msgid "_Get Info"
-msgstr "Info ophalen"
+msgstr "_Informatie"
 
 msgid "_Invite"
 msgstr "_Uitnodigen"
@@ -14316,10 +14117,10 @@ msgid "Pidgin Tooltip"
 msgstr "Pidgin-tooltip"
 
 msgid "Pidgin smileys"
-msgstr "Pidgin-smileys"
+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"
@@ -14328,7 +14129,7 @@ msgid "Small"
 msgstr "Klein"
 
 msgid "Smaller versions of the default smilies"
-msgstr "Kleinere versies van de standaard smileys"
+msgstr "Kleinere versies van de standaard emoticons"
 
 msgid "Response Probability:"
 msgstr "Reactiewaarschijnlijkheid:"
@@ -14363,27 +14164,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..."
@@ -14392,11 +14193,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..."
@@ -14416,7 +14217,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 ""
@@ -14424,13 +14225,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"
@@ -14452,58 +14253,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"
@@ -14511,22 +14307,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"
@@ -14540,13 +14335,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
@@ -14569,7 +14364,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"
@@ -14621,7 +14416,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."
@@ -14638,14 +14433,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
@@ -14654,7 +14449,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"
@@ -14663,7 +14458,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"
@@ -14673,13 +14468,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
@@ -14741,7 +14535,7 @@ msgid ""
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Contact opmerking:</b> %s"
+"<b>Vriend opmerking:</b> %s"
 
 msgid "History"
 msgstr "Geschiedenis"
@@ -14760,8 +14554,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"
@@ -14771,8 +14564,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"
@@ -14784,13 +14577,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 "
@@ -14841,17 +14634,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"
@@ -14861,7 +14653,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"
@@ -14875,9 +14667,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"
@@ -14888,7 +14679,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"
@@ -14900,7 +14691,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"
@@ -14932,7 +14723,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
@@ -14957,22 +14748,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"
@@ -14980,9 +14770,8 @@ msgstr "GtkTreeView horizontale scheiding"
 msgid "Conversation Entry"
 msgstr "Tekstinvoer gesprek"
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "Tekstinvoer gesprek"
+msgstr "Gespreksgeschiedenis"
 
 msgid "Request Dialog"
 msgstr "Vraag"
@@ -15008,9 +14797,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"
@@ -15045,14 +14833,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."
 
@@ -15106,10 +14894,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."
@@ -15118,7 +14905,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."
@@ -15127,10 +14914,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"
@@ -15142,21 +14929,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"
@@ -15168,20 +14955,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"
@@ -15196,14 +14983,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"
@@ -15224,22 +15010,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"
@@ -15267,17 +15053,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
@@ -15286,13 +15072,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."
@@ -15302,23 +15088,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
@@ -15333,7 +15128,7 @@ msgstr "_Gesprekslogboeken:"
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Opmaak tijdsaanduiding berichten"
+msgstr "Berichtentijdstempel Formaat"
 
 #  *< name
 #  *< version
@@ -15342,7 +15137,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
@@ -15350,38 +15145,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
@@ -15392,47 +15181,47 @@ msgstr "Apparaat"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Instellingen bewerken"
+msgstr "Voice/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
@@ -15447,7 +15236,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 ""
@@ -15456,8 +15245,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."
 
@@ -15469,35 +15258,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
@@ -15506,7 +15295,7 @@ msgstr "<font color='#777777'>Uitgelogd.</font>"
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr "XMPP-console"
+msgstr "XMPP-Console"
 
 msgid "Account: "
 msgstr "Account:"
@@ -15521,974 +15310,172 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
-
-#, fuzzy
-#~ msgid "Error creating conference."
-#~ msgstr "Fout bij maken verbinding"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Kan socket niet koppelen aan poort: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Kan niet aan socket luisteren: %s"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s heeft u zojuist een duwtje gegeven!"
-
-#~ 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"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-protocol-plug-in"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s is geen geldige groep."
-
-#~ 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 gebruiker niet toevoegen op %s (%s)"
-
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Kan gebruiker niet blokkeren op %s (%s)"
-
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
-
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
-
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s is geen geldig passport-account."
-
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Service momenteel niet beschikbaar."
-
-#~ msgid "Unable to rename group"
-#~ msgstr "Kan groep niet hernoemen"
-
-#~ msgid "Unable to delete group"
-#~ msgstr "Kan groep niet verwijderen"
-
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
-
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
-
-#, 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."
-
-#, fuzzy
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
-
-#, fuzzy
-#~ 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 "Debugging Information"
-#~ msgstr "Debuginformatie"
-
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Onbekend bestandstype\n"
-#~ "\n"
-#~ "PNG wordt gebruikt."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fout bij opslaan afbeelding\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "(standaard)"
-
-#~ msgid "Install Theme"
-#~ msgstr "Installeer thema"
-
-#~ msgid "Icon"
-#~ msgstr "Pictogram"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "Gebruik lettertype uit _thema"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Proxy-server &amp; browser"
-
-#~ msgid "Auto-away"
-#~ msgstr "Automatisch afwezig"
-
-#~ msgid "Change _status to:"
-#~ msgstr "_Status veranderen in: "
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Kan bestand '%s' niet openen: %s"
-
-#~ 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 "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."
-
-#~ 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 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 "Invalid Groupname"
-#~ msgstr "Ongeldige groep"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Verbinding verbroken"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Wacht op antwoord..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Wachtwoord succesvol veranderd"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Directory info ophalen"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Directory info instellen"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Kon %s niet openen om naar te schrijven!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk "
-#~ "afgebroken."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Kan niet verbinden voor overdracht."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
-#~ "worden."
-
-#~ msgid "Save As..."
-#~ msgstr "Opslaan als..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s vraagt aan %s om %d bestand te accepteren: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s vraagt aan %s om %d bestanden te accepteren: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vraagt u om een bestand te verzenden"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "TOC-protocol plug-in"
-
-#~ msgid "%s Options"
-#~ msgstr "%s Opties"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy-opties"
-
-#~ msgid "By log size"
-#~ msgstr "Op logboekgrootte"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "Verwijzing _openen met webbrowser"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Smiley-afbeelding"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Sneltoets smiley"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
-#~ "gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
-
-#~ 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)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Contact toevoegen"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Kan login-antwoord niet decoderen"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Interval(len) om verbinding te behouden fout"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Verbinding verloren met server:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Verbinden met server"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Kan bericht niet verzenden"
-
-#, 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 ""
-#~ "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"
-
-#~ msgid "I am requesting"
-#~ msgstr "Ik doe een aanvraag"
+msgstr ""
+"Deze plug-in is handig voor het fouten oplossen van XMPP servers of cliënten."
 
-#~ msgid "I am the admin"
-#~ msgstr "Ik ben de admin"
+#. $(^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 ""
+"$(^Naam) is uitgegeven onder de GNU Generale Publieke Licentie (GPL). De "
+"licentie wordt hier slechts gegeven voor informatieve doeleinden. $_CLICK"
 
-#~ msgid "Unknown status"
-#~ msgstr "Onbekende status"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Een multi-platform gebruikersinterface, gebruikt door Pidgin"
 
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Groep verwijderen"
+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 "You entered a group ID outside the acceptable range"
-#~ msgstr "Je bent een groep ID binnengekomen buiten de accepteerbare grootte."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin hoofdbestanden en dll's"
 
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Wilt u deze Qun echt verlaten?"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Maak een Start Menu item voor Pidgin"
 
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Wilt u de aanvraag goedkeuren?"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Maak een snelkoppeling naar Pidgin op het bureaublad"
 
-#~ msgid "System Message"
-#~ msgstr "Systeembericht"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug Symbolen (voor herhaalde crashes)"
 
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP laatste aanmelding</b>: %s<br>\n"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Bureaublad"
 
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Laatst aangemald</b>: %s\n"
+#. $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 "Set My Information"
-#~ msgstr "Mijn informatie instellen"
+#. $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 "Leave the QQ Qun"
-#~ msgstr "QQ Qun verlaten"
+#. $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 "Block this buddy"
-#~ msgstr "Contact blokkeren"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ runtime (vereist indien niet aanwezig)"
 
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Ongeldig antwoord-code, 0x%02X"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Localisaties"
 
-#~ msgid "Error password: %s"
-#~ msgstr "Wachtwoord-fout: %s"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Volgende >"
 
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Kan geen verbinding maken met de server"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Cliënt (vereist)"
 
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Verbonden server %s, probeert over %d opnieuw"
+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 "Do you approve the requestion?"
-#~ msgstr "Keur je de aanvraag goed?"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Snelkoppelingen"
 
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Voeg je het contact toe?"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Snelkoppelingen voor Pidgin"
 
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s heeft jou [%s] toegevoegd naar de contactenlijst"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Spellingscontrole"
 
-#~ msgid "QQ Budy"
-#~ msgstr "QQ-contact"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Start Menu"
 
-#~ msgid "Requestion approved by %s"
-#~ msgstr "Aanvraag goedgekeurd door %s"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor "
+"installatie)"
 
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s wil jou [%s] als vriend toevoegen"
+msgid "The installer is already running."
+msgstr "Er is al een installatie actief."
 
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s staat niet in uw contactenlijst"
+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 "Would you add?"
-#~ msgstr "Wil je toevoegen?"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "URI Handlers"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+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 "QQ Server Notice"
-#~ msgstr "QQ Server"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Neem een kijkje op de Pidgin webpagina"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Computer verbroken"
+msgid "You do not have permission to uninstall this application."
+msgstr "U mag dit programma niet verwijderen."
 
-#~ msgid "developer"
-#~ msgstr "ontwikkelaar"
+#~ msgid "The name you entered is invalid."
+#~ msgstr "De naam die u invoerde is ongeldig."
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP-ontwikkelaar"
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/Op_hangen"
 
-#~ msgid "Artists"
-#~ msgstr "Artiesten"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "De bijnaam die u invulde is ongeldig."
 
-#~ 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 bfad49b772..42821657b9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,20 +1,19 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# 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: 2010-04-01 19:19-0700\n"
-"PO-Revision-Date: 2010-03-03 03:58+0100\n"
-"Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"PO-Revision-Date: 2010-08-01 22:11+0200\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -59,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"
 
@@ -785,7 +797,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"
@@ -1264,6 +1276,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"
 
@@ -1357,7 +1372,6 @@ msgid "Saved Statuses"
 msgstr "Lagra tilstandar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tittel"
 
@@ -1560,7 +1574,7 @@ msgstr ""
 msgid "Online"
 msgstr "Tilkopla"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -1653,6 +1667,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"
 
@@ -1673,8 +1693,12 @@ 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."
@@ -1913,7 +1937,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"
 
@@ -2405,7 +2428,7 @@ msgstr "DBus-døme"
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus-tilleggdøme"
+msgstr "DBus-tilleggsdøme"
 
 #. *< type
 #. *< ui_requirement
@@ -3185,6 +3208,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,12 +3816,6 @@ 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"
 
@@ -3826,6 +3846,18 @@ 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"
 
@@ -3833,6 +3865,40 @@ msgstr "SASL-autentiseringa feila"
 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"
 
@@ -3896,6 +3962,7 @@ msgstr "Fylke/region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3910,10 +3977,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"
 
@@ -4131,12 +4202,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 "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."
 
@@ -4233,7 +4313,6 @@ msgstr "Tenaren støttar ikkje blokkering"
 msgid "Not Authorized"
 msgstr "Ikkje godkjent"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Sinnsstemning"
 
@@ -4256,7 +4335,6 @@ msgstr "Til"
 msgid "None (To pending)"
 msgstr "Ingen (ventande)"
 
-#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4277,6 +4355,12 @@ 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"
 
@@ -4447,9 +4531,6 @@ msgstr "Framgangsmåtebrot"
 msgid "Remote Connection Failed"
 msgstr "Feil i fjerntilkoplinga"
 
-msgid "Resource Constraint"
-msgstr "Ressursavgrensing"
-
 msgid "Restricted XML"
 msgstr "Avgrensa XML"
 
@@ -4561,9 +4642,8 @@ msgstr "Vel ein ressurs"
 msgid "Initiate Media"
 msgstr "Klargjer media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Protokollen støttar ikkje praterom."
+msgstr "Kontoen støttar ikkje PEP, klarer ikkje å lagra sinnsstemninga"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
@@ -4617,11 +4697,10 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Vel rett brukar"
+msgstr "mood: lagra den noverande brukarsinnsstemninga"
 
 msgid "Extended Away"
 msgstr "Utvida vekke"
@@ -4705,13 +4784,13 @@ 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 ""
+msgstr "Manglar hovudet til XMPP-straumen"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP-utgåvene samsvarer ikkje"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Manglar ID-en til XMPP-straumen"
 
 msgid "XML Parse error"
 msgstr "Feil i XML-tolkinga"
@@ -4796,7 +4875,6 @@ msgstr "Forbløffa"
 msgid "Amorous"
 msgstr "Amorøs"
 
-#. 1
 msgid "Angry"
 msgstr "Sint"
 
@@ -4875,7 +4953,6 @@ msgstr "Flau"
 msgid "Envious"
 msgstr "Misunneleg"
 
-#. 2
 msgid "Excited"
 msgstr "Oppglødd"
 
@@ -4892,21 +4969,18 @@ msgid "Grieving"
 msgstr "Sørgjer"
 
 # Grinete?
-#. 3
 msgid "Grumpy"
 msgstr "Sur"
 
 msgid "Guilty"
 msgstr "Skuldig"
 
-#. 4
 msgid "Happy"
 msgstr "Glad"
 
 msgid "Hopeful"
 msgstr "Håpefull"
 
-#. 8
 msgid "Hot"
 msgstr "Heit"
 
@@ -4941,7 +5015,6 @@ msgstr "Interessert"
 msgid "Intoxicated"
 msgstr "Forgifta"
 
-#. 6
 msgid "Invincible"
 msgstr "Uovervinneleg"
 
@@ -4993,7 +5066,6 @@ msgstr "Angrande"
 msgid "Restless"
 msgstr "Uroleg"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
@@ -5012,11 +5084,9 @@ msgstr "Sjokkert"
 msgid "Shy"
 msgstr "Sky"
 
-#. 9
 msgid "Sick"
 msgstr "Sjuk"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Søvnig"
@@ -5413,18 +5483,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"
 
@@ -5574,9 +5632,6 @@ msgstr "Jubileum"
 msgid "Work"
 msgstr "Arbeid"
 
-msgid "Job Title"
-msgstr "Jobbtittel"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5664,6 +5719,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"
 
@@ -5855,24 +5913,6 @@ msgstr "Vil du sletta denne vennen frå adresseboka di òg?"
 msgid "The username specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ugyldig."
 
-#. 5
-msgid "In Love"
-msgstr "Forelska"
-
-#. 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."
 
@@ -5885,8 +5925,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'."
@@ -5905,7 +5945,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"
 
@@ -5913,6 +5957,7 @@ msgid "Verify PIN"
 msgstr "Stadfest PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visingsnamn"
 
@@ -5939,10 +5984,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…"
@@ -5976,19 +6017,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"
@@ -6016,11 +6050,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."
@@ -6031,7 +6065,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"
 
@@ -6057,11 +6091,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")
@@ -6075,6 +6113,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."
@@ -6183,6 +6238,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"
 
@@ -6280,8 +6338,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"
@@ -6577,9 +6635,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"
 
@@ -6831,12 +6886,74 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Klarte ikkje å spørja etter %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 "Cannot receive IM due to parental controls"
+msgstr "Får ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
+
+# tekstmeldinga? SMS-en?
+msgid "Cannot send SMS"
+msgstr "Klarer ikkje å senda meldinga"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan ikkje senda meldingar til dette landet"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan ikkje senda meldingar til ukjente land"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot-kontoen har nådd lynmeldingsgrensa"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot-kontoen har nådd dagsgrensa for lynmeldingar"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
+
+msgid "Unable to receive offline messages"
+msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
+
+msgid "Offline message store full"
+msgstr "Fråkopla meldingslager er fullt"
+
+#, 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"
+
 msgid "Thinking"
 msgstr "Tenkjer"
 
@@ -6988,117 +7105,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
-
-# tekstmeldinga? SMS-en?
-msgid "Cannot send SMS"
-msgstr "Klarer ikkje å senda meldinga"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Kan ikkje senda meldingar til dette landet"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Kan ikkje senda meldingar til ukjente land"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
-
-msgid "Bot account cannot IM this user"
-msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
-
-msgid "Bot account reached IM limit"
-msgstr "Bot-kontoen har nådd lynmeldingsgrensa"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Bot-kontoen har nådd dagsgrensa for lynmeldingar"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7445,28 +7451,9 @@ 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"
 
@@ -7891,6 +7878,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vassmannen"
 
@@ -8173,6 +8229,10 @@ msgstr "Spør etter"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Romtittel"
+
 msgid "Notice"
 msgstr "Merk"
 
@@ -10082,9 +10142,6 @@ msgstr "Yahoo-ID …"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-msgid "Pager server"
-msgstr "Søkjetenestetenar"
-
 msgid "Pager port"
 msgstr "S_økjeport"
 
@@ -10100,18 +10157,12 @@ msgstr "Pratero_mslokalitet"
 msgid "Ignore conference and chatroom invitations"
 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…"
 
@@ -10181,6 +10232,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"
@@ -10259,6 +10319,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"
 
@@ -10625,7 +10695,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.
@@ -10639,6 +10709,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"
 
@@ -10685,7 +10759,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"
@@ -10877,12 +10951,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"
@@ -11254,9 +11322,8 @@ msgstr "Ukjend nodetype"
 msgid "Please select your mood from the list"
 msgstr "Vel sinnsstemninga di frå lista"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Kallenamn (valfritt)"
+msgstr "Melding (valfri)"
 
 msgid "Edit User Mood"
 msgstr "Endra brukarsinnsstemninga"
@@ -11340,9 +11407,8 @@ msgstr "/Verktøy/_Innstillingar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Verktøy/System_logg"
+msgstr "/Verktøy/_Bestem sinnstilstand"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
@@ -11373,7 +11439,7 @@ msgid "/Help/De_veloper Information"
 msgstr "/Hjelp/Ut_viklaropplysningar"
 
 msgid "/Help/_Translator Information"
-msgstr "/Hjelp/_Omsetjaropplysningar"
+msgstr "/Hjelp/Om_setjaropplysningar"
 
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
@@ -12043,6 +12109,9 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabisk"
 
+msgid "Assamese"
+msgstr "Assamesisk"
+
 msgid "Belarusian Latin"
 msgstr "Kviterussisk latinsk"
 
@@ -12052,9 +12121,8 @@ msgstr "Bulgarsk"
 msgid "Bengali"
 msgstr "Bengali"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "Bengali"
+msgstr "Bengali (India)"
 
 msgid "Bosnian"
 msgstr "Bosnisk"
@@ -12171,6 +12239,9 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Makedonsk"
 
+msgid "Malayalam"
+msgstr "Malayalam"
+
 msgid "Mongolian"
 msgstr "Mongolsk"
 
@@ -12285,8 +12356,8 @@ msgid ""
 "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>"
+"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 meldingsklient basert på libpurple som er i stand til å kopla seg "
 "opp mot fleire meldingstenester samstundes. %s er skriven i C ved å nytta GTK"
@@ -12321,8 +12392,8 @@ msgstr ""
 "å 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 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 "
+"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
@@ -12562,7 +12633,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"
@@ -12820,8 +12891,9 @@ msgstr "_Horisontal strek"
 msgid "_Smile!"
 msgstr "Smile_fjes"
 
+# var: _NB!
 msgid "_Attention!"
-msgstr "_NB!"
+msgstr "_Merksemd"
 
 msgid "Log Deletion Failed"
 msgstr "Klarte ikkje å sletta loggen"
@@ -12839,16 +12911,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?"
 
@@ -12954,11 +13026,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."
@@ -13134,6 +13206,7 @@ msgstr "_Bla gjennom…"
 msgid "Br_owse..."
 msgstr "Bl_a gjennom…"
 
+# kanskje endra sidan "F_ørehandsvis" òg gjeld lydar?
 msgid "Pre_view"
 msgstr "F_ørehandsvis"
 
@@ -13761,9 +13834,6 @@ msgstr "Snarvegstekst"
 msgid "Custom Smiley Manager"
 msgstr "Smilefjesbehandling"
 
-msgid "Attention received"
-msgstr "Motteke merksemd"
-
 msgid "Select Buddy Icon"
 msgstr "Vel venneikon"
 
@@ -14894,8 +14964,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…"
@@ -15097,398 +15176,212 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Senda og ta i mot reine XMPP-blokker."
 
 #. *  description
-#, fuzzy
 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 "Please select your mood from the list."
-#~ msgstr "Vel sinnsstemninga di frå lista."
+#. $(^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 ""
+"$(^Name) er utgjeve i samsvar med vilkåra i GNU General Public License "
+"(GPL). Lisensen blir  berre vist her for å opplysa. $_CLICK"
 
-#~ msgid "Set Mood..."
-#~ msgstr "Vel sinnsstemning…"
+#. 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 "Friendly name changes too rapidly"
-#~ msgstr "Endrar visingsnamnet for ofte"
+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 "This Hotmail account may not be active."
-#~ msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin kjerne- og biblioteksfiler"
 
-#~ msgid "Profile URL"
-#~ msgstr "Profiladresse"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Før opp Pidgin i startmenyen"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-protokolltillegg"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Lag ein snarveg til Pidgin på skrivebordet"
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s er ikkje ei gyldig gruppe."
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Feilsøkingssymbol (for å rapportera krasjar)"
 
-#~ msgid "Unknown error."
-#~ msgstr "Ukjend feil."
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Skrivebord"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s på %s (%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 ""
+"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 "Unable to add user on %s (%s)"
-#~ msgstr "Klarte ikkje å leggja til brukaren på %s (%s)"
+#. $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 "Unable to block user on %s (%s)"
-#~ msgstr "Klarte ikkje å blokkera brukaren på %s (%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 ""
+"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 "Unable to permit user on %s (%s)"
-#~ msgstr "Klarte ikkje å tillata brukaren på %s (%s)"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+-kjøremiljø (krevst om det ikkje allereie er til stades)"
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "Klarte ikkje å leggja til %s fordi vennelista di er full."
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokaliseringar"
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s er ikkje ein gyldig Passport-konto."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Neste >"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Tenesta er mellombels utilgjengeleg."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin lynmeldingsklient (påkravd)"
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Klarte ikkje å endra namnet til gruppa"
+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?"
+
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Snarvegar"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Snarvegar for å starta Pidgin"
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Stavekontrollstøtte"
+
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Startmeny"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Klarer ikkje å sletta gruppa"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "Stavekontrollstøtte (krev internettsamband under installasjonen)."
+
+msgid "The installer is already running."
+msgstr "Installasjonsprogrammet kjører allereie."
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s har lagt deg til i vennelista si."
+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 "%s has removed you from his or her buddy list."
-#~ msgstr "%s har fjerna deg frå vennelista si."
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Adressehandterarar"
 
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Klarte ikkje å knyta endepunktet til porten: %s"
+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 "Unable to listen on socket: %s"
-#~ msgstr "Klarte ikkje å lytta på endepunktet: %s"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Besøk Pidgin sin nettstad"
 
-#~ msgid "In_love"
-#~ msgstr "Forelska"
+msgid "You do not have permission to uninstall this application."
+msgstr "Du har ikkje rettar til å avinstallera dette programmet."
 
-#~ msgid "Error creating conference."
-#~ msgstr "Klarte ikkje å laga konferansen"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Kallenamnet du skreiv er ugyldig."
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s har nettopp sendt deg ein dytt!"
+#~ msgid "MXit Login Name"
+#~ msgstr "Påloggingsnamn MXit"
 
-#~ 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 "Nick Name"
+#~ msgstr "Kallenamn"
 
-#~ 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 "Your Mobile Number..."
+#~ msgstr "Mobiltelefonnummeret ditt…"
 
-#~ 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 "/Media/_Hangup"
+#~ msgstr "/Media/_Legg på"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Feilsøkingsinformasjon "
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Sertifikatet er ikkje gyldig enno."
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Ukjend filtype\n"
-#~ "\n"
-#~ "Nyttar standardtypen PNG."
+#~ msgid "Rate to host"
+#~ msgstr "Fart mot vert"
 
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Klarte ikkje å lagra biletet\n"
-#~ "\n"
-#~ "%s"
+#~ msgid "Rate to client"
+#~ msgstr "Fart mot klient"
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Klarte ikkje å opna fila '%s': %s"
+#~ msgid "Unknown reason."
+#~ msgstr "Ukjend årsak."
 
-#~ 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 "Current Mood"
+#~ msgstr "Sinnsstemninga no"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Set inn ei <iq/>-blokk."
+#~ msgid "New Mood"
+#~ msgstr "Ny sinnsstemning"
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Set inn ei <presence/>-blokk."
+#~ msgid "Change your Mood"
+#~ msgstr "Endra sinnsstemninga di"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Set inn ei <message/>-blokk."
+#~ msgid "How do you feel right now?"
+#~ msgstr "Korleis kjenner du deg nett no?"
 
-# 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"
+#~ msgid "Change Mood..."
+#~ msgstr "Endra sinnsstemninga…"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Orientation"
+#~ msgstr "Orientering"
 
-#~ 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 "(Default)"
-#~ msgstr "(standard)"
-
-#~ msgid "Install Theme"
-#~ msgstr "Installer drakta"
-
-#~ msgid "Icon"
-#~ msgstr "Ikon"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "Bruk dokumentskrifttype frå _drakta"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Mellomtenar &amp; nettlesar"
-
-#~ msgid "Auto-away"
-#~ msgstr "Automatisk vekke"
-
-#~ msgid "Change _status to:"
-#~ msgstr "Endra _tilstand til:"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Send lynmeldingar over fleire protokollar"
-
-#~ msgid "_Start port:"
-#~ msgstr "_Startport:"
-
-#~ msgid "_End port:"
-#~ msgstr "Sluttp_ort:"
-
-#~ msgid "_User:"
-#~ msgstr "Br_ukar:"
-
-# ?
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet."
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ kjøremiljøutgåve"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Utan dette vil berre den første kontoen bli slått på)."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Ugyldig sertifikatkjede"
-
-#~ 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 "Invalid certificate authority signature"
-#~ msgstr "Ugyldig sertifikatautoritetssignatur"
-
-#, fuzzy
-#~ msgid "Failed to validate expiration time for %s"
-#~ msgstr "Klarte ikkje å velja cmodes for %s"
-
-#~ msgid "Calling ... "
-#~ msgstr "Ringjer…"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Innstilling for å skjula bli med-/forlat-tilstandar"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Minste romstorleik"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Tidsgrense for uverksame brukarar (i minutt)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "Klarte ikkje å opna fila"
-
-#~ 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å."
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Baskisk"
-
-#~ 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/>"
-
-#~ 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 ""
-#~ "%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 ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr ""
-#~ "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "Invitasjonen avvist"
-
-#~ msgid "_Proxy"
-#~ msgstr "_Mellomlager"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "Klarte ikkje å opna endepunkt"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Klarte ikkje å lytta til endepunktet"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Klarte ikkje å lesa endepunkt"
-
-#~ msgid "Connection failed."
-#~ msgstr "Tilkoplinga feila."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Tenaren har kopla frå"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Klarte ikkje å laga endepunkt"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Klarte ikkje å kopla til verten"
-
-#~ msgid "Read error"
-#~ msgstr "Lesefeil"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Klarte ikkje å laga eit samband til tenaren:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Skrivefeil"
-
-#~ msgid "Last Activity"
-#~ msgstr "Siste aktivitet"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Tenesteoppdagingsinfo"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Tenesteoppdagingselement"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Utvida blokkadressering"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Fleirbrukarprat"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
-
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Samtidssamband"
+#~ msgid "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 31347ae100..be96b6b2c5 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 ""
 
@@ -742,7 +754,7 @@ msgstr "Arrestar"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anullat"
 
 msgid "Failed"
@@ -1201,6 +1213,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 +1308,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Títol"
 
@@ -1481,7 +1496,7 @@ msgstr ""
 msgid "Online"
 msgstr "En linha"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconnectat"
 
@@ -1574,6 +1589,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"
 
@@ -1591,7 +1612,9 @@ 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."
@@ -1812,7 +1835,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Rason desconeguda"
 
@@ -3011,6 +3033,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,12 +3601,6 @@ msgstr ""
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3610,6 +3629,15 @@ 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"
@@ -3619,6 +3647,39 @@ msgid "SASL error: %s"
 msgstr ""
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "L'expression es pas valida"
+
+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 "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"
 
@@ -3682,6 +3743,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3696,10 +3758,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr ""
+
 msgid "Role"
 msgstr "Ròtle"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Aniversari"
 
@@ -3916,6 +3982,12 @@ 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"
@@ -3923,6 +3995,9 @@ msgstr "Connectat"
 msgid "Invalid XMPP ID"
 msgstr ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4019,7 +4094,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4041,7 +4115,6 @@ msgstr "A"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "Pas cap"
 
@@ -4063,6 +4136,12 @@ msgstr "Nom de grop"
 msgid "Mood Comment"
 msgstr "Entresenhas"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4233,9 +4312,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4570,7 +4646,6 @@ msgstr "Animar"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4664,7 +4739,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4681,7 +4755,6 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grop"
@@ -4690,14 +4763,12 @@ msgstr "Grop"
 msgid "Guilty"
 msgstr "Ciutat"
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Òste :"
@@ -4736,7 +4807,6 @@ msgstr "Interfaç"
 msgid "Intoxicated"
 msgstr "Convidar"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4800,7 +4870,6 @@ msgstr "Suprimir"
 msgid "Restless"
 msgstr "Enregistrar"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4820,12 +4889,10 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Escais"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5216,18 +5283,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"
@@ -5375,9 +5430,6 @@ msgstr "Aniversari"
 msgid "Work"
 msgstr "Professional"
 
-msgid "Job Title"
-msgstr ""
-
 msgid "Company"
 msgstr "Entrepresa"
 
@@ -5461,6 +5513,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5630,26 +5685,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-msgstr ""
-
-#. show current mood
-msgid "Current Mood"
-msgstr ""
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Mot de pas novèl"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Modificar lo mot de pas"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5682,7 +5717,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 ""
 
@@ -5690,6 +5729,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nom d'ostal"
@@ -5719,11 +5759,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 ""
@@ -5756,21 +5791,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connexion"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Escais"
-
 #. show the form to the user to complete
 msgid "Register New MXit Account"
 msgstr ""
@@ -5797,10 +5827,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."
@@ -5812,7 +5842,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Picatz lo mot de pas"
@@ -5844,10 +5874,15 @@ 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
@@ -5863,6 +5898,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 ""
@@ -5977,6 +6031,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "Segondas"
@@ -6365,9 +6422,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr "Utilizaire pas trobat"
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6606,12 +6660,74 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
+
+msgid "Offline message store full"
+msgstr ""
+
+#, 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"
+
 msgid "Thinking"
 msgstr ""
 
@@ -6770,117 +6886,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 ""
-
-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 ""
-
-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 ""
-
-#, 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 "
@@ -7196,29 +7201,10 @@ 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 ""
 
@@ -7595,6 +7581,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7901,6 +7956,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Títol"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Nòta"
@@ -9726,9 +9786,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr "Protocòl"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9744,18 +9801,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 ""
 
@@ -9816,6 +9867,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"
@@ -9884,6 +9941,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 ""
 
@@ -10241,6 +10306,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"
 
@@ -10473,12 +10542,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 ""
@@ -11626,6 +11689,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arab"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Jòcs"
+
 msgid "Belarusian Latin"
 msgstr "Bielorus latin"
 
@@ -11635,6 +11702,10 @@ msgstr "Bulgar"
 msgid "Bengali"
 msgstr "Bengalí"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengalí"
+
 msgid "Bosnian"
 msgstr "Bosniac"
 
@@ -11753,6 +11824,10 @@ msgid "Macedonian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Òme"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
@@ -11871,8 +11946,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12392,14 +12467,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?"
@@ -12486,10 +12561,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
@@ -13307,10 +13382,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "L'autentificacion a abocat"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Seleccionar una poliça"
 
@@ -14415,7 +14486,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..."
@@ -14617,6 +14697,160 @@ msgstr ""
 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."
+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
+#, 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."
 
diff --git a/po/or.po b/po/or.po
index a50fda2fa8..bdb49bf17e 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 19:20-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -76,12 +77,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 "ନୂଆ ମେଲ ବିଜ୍ଞାପନଗୁଡିକ"
 
@@ -786,7 +799,7 @@ msgstr "ବନ୍ଦକର"
 msgid "Waiting for transfer to begin"
 msgstr "ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ ହେବାକୁ ଅପେକ୍ଷା କରୁଛି"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ବାତିଲ କରାଗଲା"
 
 msgid "Failed"
@@ -1252,6 +1265,9 @@ msgstr "ଅନ୍ଯମାନେ ବାର୍ତ୍ତାଳାପରେ କଥ�
 msgid "Someone says your username in chat"
 msgstr "କେହିଜଣେ ଚାର୍ଟରେ ଆପଣଙ୍କର ଚାଳକନାମ କହିଛି"
 
+msgid "Attention received"
+msgstr "ଧ୍ୟାନ ପ୍ରାପ୍ତ ହୋଇଛି"
+
 msgid "GStreamer Failure"
 msgstr "Gଷ୍ଟ୍ରିମର ବିଫଳ"
 
@@ -1345,7 +1361,6 @@ msgid "Saved Statuses"
 msgstr "ସଂଚିତ ସ୍ଥିତିଗୁଡିକ"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ଶୀର୍ଷକ"
 
@@ -1545,7 +1560,7 @@ msgstr ""
 msgid "Online"
 msgstr "ଅନ ଲାଇନ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ଅଫଲାଇନ"
 
@@ -1638,6 +1653,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 "ଅଜଣା"
 
@@ -1656,8 +1679,10 @@ msgid ""
 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 "ପ୍ରମାଣପତ୍ରର ସମୟ ସମାପ୍ତ ହୋଇଛି ଏବଂ ଏହାକୁ ବୈଧ ଭାବରେ ଗ୍ରହଣ କରିବା ଉଚିତ ନୁହଁ।"
@@ -1894,7 +1919,6 @@ msgstr "%s କୁ punycode ରେ ପରିବର୍ତ୍ତନ କରିବା
 msgid "Thread creation failure: %s"
 msgstr "ସୂତ୍ର ସୃଷ୍ଟି ବିଫଳ : %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "ଅଜ୍ଞାତ କାରଣ"
 
@@ -3141,6 +3165,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 "ପ୍ରଥମ ନାମ"
 
@@ -3739,12 +3766,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 "ସରଭର ଏକ ଅନଇନକ୍ରିପଟେଡ ସ୍ରୋତ ବଦଳରେ ପ୍ରମାଣିତ ସରଳ ଟେକ୍ସଟ ଆବଶ୍ଯକ କରେ ୤"
 
@@ -3775,6 +3796,18 @@ 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 ବୈଧିକରଣ ବିଫଳ ହୋଇଛି"
 
@@ -3782,6 +3815,42 @@ msgstr "SASL ବୈଧିକରଣ ବିଫଳ ହୋଇଛି"
 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 କରିବାରେ ଅସମର୍ଥ"
 
@@ -3845,6 +3914,7 @@ msgstr "ଅଞ୍ଚଳ"
 msgid "Postal Code"
 msgstr "ପୋଷ୍ଟ କୋଡ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ଦେଶ"
 
@@ -3859,10 +3929,14 @@ msgstr "ସଂଗଠନ ନାମ"
 msgid "Organization Unit"
 msgstr "ସଂଗଠନ ଯୁନିଟ "
 
+msgid "Job Title"
+msgstr "କାର୍ଯ୍ଯ ଶୀର୍ଷକ"
+
 msgid "Role"
 msgstr "ଭୂମିକା"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ଜନ୍ମଦିନ"
 
@@ -4078,12 +4152,22 @@ 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. ଡମେନକୁ ସେଟ କରିବା ଉଚିତ।"
 
@@ -4180,7 +4264,6 @@ msgstr "ସର୍ଭର ବ୍ଲକିଙ୍ଗକୁ ସମର୍ଥନ କର
 msgid "Not Authorized"
 msgstr "ଅଧିକୃତ ନୁହେଁ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ଭାବ"
 
@@ -4202,7 +4285,6 @@ msgstr "ଏଠାକୁ"
 msgid "None (To pending)"
 msgstr "କେହି ନୁହେଁ (କୁ ସ୍ଥଗିତ କରିବା)"
 
-#. 0
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
@@ -4222,6 +4304,12 @@ msgstr "ଭାବନା ନାମ"
 msgid "Mood Comment"
 msgstr "ଭାବନା ମନ୍ତବ୍ଯ"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "କଳାକାରକୁ ସମତାଳ କରନ୍ତୁ"
 
@@ -4392,9 +4480,6 @@ msgstr "ନୀତି ଉଲଙ୍ଘନ"
 msgid "Remote Connection Failed"
 msgstr "ଦୂରସ୍ଥ ସଂୟୋଗ ବିଫଳ"
 
-msgid "Resource Constraint"
-msgstr "ସ୍ବମ୍ବଳ ଦମନ"
-
 msgid "Restricted XML"
 msgstr "ସୀମାବଦ୍ଧ XML"
 
@@ -4738,7 +4823,6 @@ msgstr "ଆଚମ୍ବିତ"
 msgid "Amorous"
 msgstr "ଗୌରବାନ୍ବିତ"
 
-#. 1
 msgid "Angry"
 msgstr "କ୍ରୋଧିତ"
 
@@ -4817,7 +4901,6 @@ msgstr "ଲଜ୍ଜିତ"
 msgid "Envious"
 msgstr "ଇର୍ଷାନ୍ୱିତ"
 
-#. 2
 msgid "Excited"
 msgstr "ଉତ୍ତେଜିତ"
 
@@ -4833,21 +4916,18 @@ msgstr "କୃତଜ୍ଞ"
 msgid "Grieving"
 msgstr "ଦୁଃଖିତ"
 
-#. 3
 msgid "Grumpy"
 msgstr "Grumpy"
 
 msgid "Guilty"
 msgstr "ଦୋଷୀ"
 
-#. 4
 msgid "Happy"
 msgstr "ଖୁସି"
 
 msgid "Hopeful"
 msgstr "ଆଶାବାଦୀ"
 
-#. 8
 msgid "Hot"
 msgstr "ଉଷ୍ଣ"
 
@@ -4881,7 +4961,6 @@ msgstr "ଆଗ୍ରହୀ"
 msgid "Intoxicated"
 msgstr "ମଦହୋସ ହୋଇଛି"
 
-#. 6
 msgid "Invincible"
 msgstr "ଅଜେଯ"
 
@@ -4933,7 +5012,6 @@ msgstr "ଅନୁତାପୀ"
 msgid "Restless"
 msgstr "ବ୍ୟାକୁଳ"
 
-#. 7
 msgid "Sad"
 msgstr "ଦୁଃଖିତ"
 
@@ -4952,11 +5030,9 @@ msgstr "ଚକିତ"
 msgid "Shy"
 msgstr "ଲଜ୍ଜିତ"
 
-#. 9
 msgid "Sick"
 msgstr "ଦୁର୍ବଳ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "ନିଦ୍ରିତ"
@@ -5349,18 +5425,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 "ଖେଳ ଶୀର୍ଷକ"
 
@@ -5508,9 +5572,6 @@ msgstr "ବାର୍ଷିକୀ"
 msgid "Work"
 msgstr "କାର୍ଯ୍ଯ"
 
-msgid "Job Title"
-msgstr "କାର୍ଯ୍ଯ ଶୀର୍ଷକ"
-
 msgid "Company"
 msgstr "କମ୍ପାନୀ"
 
@@ -5598,6 +5659,10 @@ msgstr "HTTP ପଦ୍ଧତି ସର୍ଭର"
 msgid "Show custom smileys"
 msgstr "ବ୍ଯବସ୍ଥିତ ସ୍ମାଇଲିଗୁଡିକୁ ଦେଖାଅ"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "ସଂୟୋଗ ସୃଷ୍ଟି କରିବା ପାଇଁ ଅସମର୍ଥ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "ନଡ୍ଜ: ଜଣେ ଉପୟୋଗକର୍ତ୍ତାଙ୍କୁ ତାଙ୍କର ଧ୍ଯାନ ଆକର୍ଷଣ କରିବା ପାଇଁ ନଡ୍ଜ କର ୤"
 
@@ -5788,24 +5853,6 @@ msgstr "ଆପଣ ଏହି ସାଥୀକୁ ଠିକଣା ପୁସ୍ତ�
 msgid "The username specified is invalid."
 msgstr "ଉଲ୍ଲିଖିତ ଠିକଣା ନାମଟି ଅବୈଧ ଅଟେ।"
 
-#. 5
-msgid "In Love"
-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 ଟି ଅବୈଧ ଅଟେ।"
 
@@ -5837,7 +5884,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 "PIN"
 
@@ -5845,6 +5896,7 @@ msgid "Verify PIN"
 msgstr "PIN କୁ ଯାଞ୍ଚ କରନ୍ତୁ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ନାମ ଦର୍ଶାଅ"
 
@@ -5871,10 +5923,6 @@ msgstr "ସେଠାରେ ବର୍ତ୍ତମାନ କୌଣସି splash-sc
 msgid "About"
 msgstr "ବିବରଣୀ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "ଭାବନା ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "ରୂପରେଖା ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
@@ -5906,19 +5954,16 @@ msgstr "MXit ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବାର�
 msgid "Connecting..."
 msgstr "ସଂଯୋଗ କରୁଅଛି..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit ଲଗଇନ ନାମ"
-
-#. nick name
-msgid "Nick Name"
-msgstr "ଉପନାମ"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5947,10 +5992,12 @@ 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 "ଚାଳକନାମ ପୂର୍ବରୁ ପଞ୍ଜିକୃତ ହୋଇଛି। ଦୟାକରି ଅନ୍ୟଏକ ଚାଳକନାମ ବାଛନ୍ତୁ।"
 
 msgid "Internal error. Please try again later."
@@ -5962,7 +6009,7 @@ msgstr "ଆପଣ ସୁରକ୍ଷା ସଂକେତ ଭରଣ କରିନ�
 msgid "Security Code"
 msgstr "ସୁରକ୍ଷା ସଂକେତ"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "ସୁରକ୍ଷା ସଂକେତ ଭରଣ କରନ୍ତୁ"
 
@@ -5988,11 +6035,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")
@@ -6005,6 +6058,28 @@ 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 ରେ ସଂଯୋଗକୁ ହରାଇଛୁ। ଦୟାକରି ପୁଣି ସଂଯୋଗକରନ୍ତୁ।"
@@ -6107,6 +6182,9 @@ msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟି
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit ରେ ଗୋଟିଏ ସଂଯୋଗ ତ୍ରୁଟି ଘଟିଛି। (ପରିସ୍ଥିତି 0x06 କୁ ପଢ଼ନ୍ତୁ)"
 
+msgid "In Love"
+msgstr "ପ୍ରେମରେ"
+
 msgid "Pending"
 msgstr "ବକୟା"
 
@@ -6502,9 +6580,6 @@ msgstr "ଗୁପ୍ତଶବ୍ଦ ସମାପ୍ତ ହୋଇଛି"
 msgid "Incorrect password"
 msgstr "ଅଶୁଦ୍ଧ ଗୁପ୍ତଶବ୍ଦ"
 
-msgid "User not found"
-msgstr "ଉପୟୋଗକର୍ତ୍ତା ମିଳିଲେ ନାହିଁ"
-
 msgid "Account has been disabled"
 msgstr "ଆକାଉଣ୍ଟ ଅକ୍ଷମ ହୋଇଛି"
 
@@ -6608,8 +6683,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)."
@@ -6758,12 +6833,73 @@ 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 "ନିୟମାବଳୀକୁ ଗ୍ରହଣ ନକରି 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 "ଭାବୁଅଛି"
 
@@ -6914,116 +7050,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 "ଅପ୍ରଚଳିତ 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 "ପୈତୃକ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ ହେତୁ 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 "ଅଫଲାଇନ ସନ୍ଦେଶ ସଂରକ୍ଷଣ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା"
-
 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 "
@@ -7365,28 +7391,9 @@ msgstr[0] "ଆପଣ ଏକ ଅଜ୍ଞାତ କାରଣ ପାଇଁ %hu ସ
 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 "ଏପର୍ୟ୍ଯନ୍ତ  ଅନଲାଇନ୍"
 
@@ -7796,6 +7803,75 @@ 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 "କୁମ୍ଭ"
 
@@ -8078,6 +8154,11 @@ msgstr "ଅନୁରୋଧ କରୁଅଛି"
 msgid "Admin"
 msgstr "ପ୍ରଶାସନ"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "କକ୍ଷତାଲିକା"
+
 msgid "Notice"
 msgstr "ଅଧିସୂଚନା"
 
@@ -9959,9 +10040,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! ପ୍ରୋଟକଲ ପ୍ଲଗଇନ"
 
-msgid "Pager server"
-msgstr "ପେଜର ସରଭର"
-
 msgid "Pager port"
 msgstr "ପେଜର ପୋର୍ଟ"
 
@@ -9977,18 +10055,13 @@ 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 "ଯାହୁ ଚାଟ ସରଭର"
-
-msgid "Yahoo Chat port"
-msgstr "ଯାହୁ ଚାଟ ପୋର୍ଟ"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10056,6 +10129,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 "ଚାଳକନାମ ଅଥବା ପ୍ରବେଶ ସଂକେତ ଅନୁପସ୍ଥିତ"
@@ -10130,6 +10212,15 @@ 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 "MXit ସର୍ଭର ସହିତ ସଂଯୁକ୍ତ ହେବାରେ ଅସମର୍ଥ। ଦୟାକରି ଆପଣଙ୍କର ସର୍ଭର ସଂରଚନାକୁ ଯାଞ୍ଚ କରନ୍ତୁ।"
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "ଘରେ ନାହିଁ"
 
@@ -10498,6 +10589,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 "_ସ୍ବୀକାର କର"
 
@@ -10736,12 +10831,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 "ଲଗ-ଇନ୍ ବିକଳ୍ପଗୁଡିକ"
@@ -11895,6 +11984,10 @@ msgstr "ଆଫ୍ରିକାନ"
 msgid "Arabic"
 msgstr "ଆରବୀ"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ଲଜ୍ଜିତ"
+
 msgid "Belarusian Latin"
 msgstr "ବେଲାରୁସିଆନ ଲାଟିନ"
 
@@ -12022,6 +12115,10 @@ msgstr "ଲାଓ"
 msgid "Macedonian"
 msgstr "ମେସୀଡୋନିୟାନ"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ମାଳୟ"
+
 msgid "Mongolian"
 msgstr "ମୋଙ୍ଗୋଲିୟାନ"
 
@@ -12136,8 +12233,8 @@ msgid ""
 "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>"
+"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 "
@@ -12678,16 +12775,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,11 +12888,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ପ୍ରସ୍ଥାନ କରୁଅଛି କାରଣ ଅନ୍ୟ ଏକ libpurple କ୍ଲାଏଣ୍ଟ ପୂର୍ବରୁ ଚାଲୁଅଛି।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ମେଡିଆ (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ମେଡିଆ/ଝୁଲିବା (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "ସଂଯୋଗ ଛିନ୍ନ କରନ୍ତୁ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13591,9 +13690,6 @@ msgstr "ସଂକ୍ଷିପ୍ତ ପଥ ପାଠ୍ୟ"
 msgid "Custom Smiley Manager"
 msgstr "Smiley ପରିଚାଳକଙ୍କୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ"
 
-msgid "Attention received"
-msgstr "ଧ୍ୟାନ ପ୍ରାପ୍ତ ହୋଇଛି"
-
 msgid "Select Buddy Icon"
 msgstr "ସାଥୀ ଚିତ୍ର ସଂକେତ ଚୟନ କରନ୍ତୁ"
 
@@ -14718,8 +14814,20 @@ msgstr "ପ୍ରତି N ମିନିଟରେ iChat-ଶୈଳୀ ସମୟଷ�
 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 "ଡେସ୍କଟପ ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-ଘଣ୍ଟା ସମୟ ଶୈଳୀକୁ ବାଧ୍ଯକରନ୍ତୁ (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24-ଘଣ୍ଟା ସମୟ ଶୈଳୀକୁ ବାଧ୍ଯକରନ୍ତୁ (_F)"
 
 msgid "Show dates in..."
@@ -14922,6 +15030,199 @@ msgstr "ଅପ୍ରସ୍ତୁତ XMPP ପଦଗୁଡିକୁ ପଠାନ�
 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 "/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 "ତାଲିକାରୁ ଆପଣଙ୍କର ଭାବନାକୁ ଦୟାକରି ବାଛନ୍ତୁ।"
 
diff --git a/po/pa.po b/po/pa.po
index 0d0965caf7..64a06f98eb 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-01-26 05:27+0530\n"
+"POT-Creation-Date: 2010-08-07 13:11-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-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"
@@ -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 "ਨਵੀਂ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
@@ -772,7 +784,7 @@ msgstr "ਰੋਕੋ"
 msgid "Waiting for transfer to begin"
 msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ਰੱਦ ਹੈ"
 
 msgid "Failed"
@@ -1238,6 +1250,9 @@ msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਹੋਰ ਵਿਸ਼ੇ"
 msgid "Someone says your username in chat"
 msgstr "ਕਿਸੇ ਨੇ ਤੁਹਾਡਾ ਨਾਂ ਗੱਲਬਾਤ ਦੌਰਾਨ ਲਿਆ ਹੈ"
 
+msgid "Attention received"
+msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ ਹੈ"
+
 msgid "GStreamer Failure"
 msgstr "ਜੀਸਟਰੀਮਰ ਫੇਲ੍ਹ"
 
@@ -1331,7 +1346,6 @@ msgid "Saved Statuses"
 msgstr "ਸੰਭਾਲੇ ਹਾਲਤ"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ਸਿਰਲੇਖ"
 
@@ -1527,7 +1541,7 @@ msgstr "ਜਦੋਂ ਸੁਨੇਹੇ ਵਿੱਚ URL ਮਿਲੇ ਤਾਂ
 msgid "Online"
 msgstr "ਆਨਲਾਈਨ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
@@ -1620,6 +1634,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 "ਅਣਜਾਣ"
 
@@ -1637,8 +1657,10 @@ 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 "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ ਅਤੇ ਜਾਇਜ਼ ਨਹੀਂ ਮੰਨਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
@@ -1875,7 +1897,6 @@ msgstr "%s ਨੂੰ punycode ਵਿੱਚ ਬਦਲਣ ਦੌਰਾਨ ਗਲ�
 msgid "Thread creation failure: %s"
 msgstr "ਥਰਿੱਡ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
@@ -3116,6 +3137,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 "ਪਹਿਲਾਂ ਨਾਂ"
 
@@ -3717,12 +3741,6 @@ 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 "ਸਰਵਰ ਨੂੰ ਇੱਕ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਸਟਰੀਮ ਲਈ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
 
@@ -3753,6 +3771,17 @@ 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 ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
 
@@ -3761,6 +3790,39 @@ 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 ""
+"ਸਰਵਰ ਚੈਨਲ ਬਾਈਡਿੰਗ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ, ਪਰ ਐਲਾਨ ਨਹੀਂ ਕੀਤਾ ਜਾਪਦਾ ਹੈ। ਇਹ 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 "ਯੂਜ਼ਰ ਨਾਂ ਕਨੋਨੀਕਲਾਈਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
@@ -3825,6 +3887,7 @@ msgstr "ਖੇਤਰ"
 msgid "Postal Code"
 msgstr "ਡਾਕ-ਕੋਡ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ਦੇਸ਼"
 
@@ -3839,10 +3902,14 @@ msgstr "ਸੰਗਠਨ ਨਾਂ"
 msgid "Organization Unit"
 msgstr "ਸੰਗਠਨ ਇਕਾਈ"
 
+msgid "Job Title"
+msgstr "ਕੰਮ ਨਾਂ"
+
 msgid "Role"
 msgstr "ਕੰਮ"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "ਜਨਮਦਿਨ"
 
@@ -4057,12 +4124,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 "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 ਹੈ। ਡੋਮੇਨ ਸੈੱਟ ਕਰਨੀ ਲਾਜ਼ਮੀ ਹੈ।"
 
@@ -4159,7 +4235,6 @@ msgstr "ਸਰਵਰ ਪਾਬੰਦੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹ�
 msgid "Not Authorized"
 msgstr "ਪਰਮਾਣਤ ਨਹੀਂ"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "ਮੂਡ"
 
@@ -4181,7 +4256,6 @@ msgstr "ਵੱਲ"
 msgid "None (To pending)"
 msgstr "ਕੋਈ ਨਹੀਂ (ਤੋਂ ਬਕਾਇਆ)"
 
-#. 0
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
@@ -4195,14 +4269,18 @@ msgstr "ਮੂਡ ਟੈਕਸਟ"
 msgid "Allow Buzz"
 msgstr "ਬੱਜ਼ ਮਨਜ਼ੂਰ"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "ਮੱਧ ਨਾਂ"
+msgstr "ਮੂਡ ਨਾਂ"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"
+msgstr "ਮੂਡ ਟਿੱਪਣੀ"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "ਟਿਊਨ ਕਲਾਕਾਰ"
 
@@ -4373,9 +4451,6 @@ msgstr "ਨੀਤੀ ਉਲੰਘਣ"
 msgid "Remote Connection Failed"
 msgstr "ਰਿਮੋਟ ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ"
 
-msgid "Resource Constraint"
-msgstr "ਸਰੋਤ ਪਾਬੰਦੀ"
-
 msgid "Restricted XML"
 msgstr "ਸਖਤ XML"
 
@@ -4492,9 +4567,8 @@ msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"
 msgid "Initiate Media"
 msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂ"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "ਇਹ ਪ੍ਰੋਟੋਕਾਲ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+msgstr "ਅਕਾਊਂਟ PEP ਲਈ ਸਹਾਇਕ ਨਹੀਂ, ਮੂਡ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4548,9 +4622,8 @@ msgstr "ping &lt;jid&gt;:\tਇੱਕ ਯੂਜ਼ਰ/ਭਾਗ/ਸਰਵਰ ਪ�
 msgid "buzz: Buzz a user to get their attention"
 msgstr "ਬੱਜ਼: ਯੂਜ਼ਰ ਦਾ ਧਿਆਨ ਦੁਆਉਣ ਵਾਸਤੇ ਉਸ ਨੂੰ ਬੱਜ਼ ਭੇਜੋ"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "ਠੀਕ ਯੂਜ਼ਰ ਚੁਣੋ"
+msgstr "ਮੂਡ: ਮੌਜੂਦਾ ਯੂਜ਼ਰ ਮੂਡ ਸੈੱਟ ਕਰੋ"
 
 msgid "Extended Away"
 msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
@@ -4628,18 +4701,17 @@ msgstr "XMPP ਗਲਤੀ ਸੁਨੇਹਾ"
 msgid "(Code %s)"
 msgstr "(ਕੋਡ %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਫਲ ਹੈ। ਸੁਨੇਹਾ ਬਹੁਤ ਵੱਡਾ ਹੈ।"
+msgstr "ਸੁਨੇਹੇ 'ਚ ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਬਹੁਤ ਵੱਡਾ ਹੈ।"
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP ਸਟਰੀਮ ਹੈੱਡਰ ਸੰਭਵ ਨਹੀਂ ਹੈ"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP ਵਰਜਨ ਨਹੀਂ ਮਿਲਦਾ"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP ਸਟੀਰਮ ID ਗੁੰਮ ਹੈ"
 
 msgid "XML Parse error"
 msgstr "XML ਪਾਰਸ ਗਲਤੀ"
@@ -4698,7 +4770,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"
@@ -4717,32 +4789,26 @@ msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ,
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੇ %s ਦੇ ਸਰੋਤ ਤੁਸੀਂ ਇੱਕ ਫਾਇਲ ਤੋਂ ਤੁਸੀਂ ਭੇਜਣੇ ਚਾਹੁੰਦੇ ਹੋ"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "ਅਰਬੀ"
+msgstr "ਡਰਿਆ"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "ਸ਼ਰਮਸ਼ਾਰ"
+msgstr "ਡੌਰ-ਭੌਰ"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "ਸ਼ਾਨਦਾਰ"
+msgstr "ਆਸ਼ਕਾਨਾ"
 
-#. 1
 msgid "Angry"
 msgstr "ਗੁੱਸੇ ਵਿੱਚ"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "ਪਾਬੰਦੀਸ਼ੁਦਾ"
+msgstr "ਜ਼ਿੱਦੀ"
 
 msgid "Anxious"
 msgstr "ਬੇਚੈਨ"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "ਤੁਸੀਂ ਭੇਜਿਆ"
+msgstr "ਜਾਗਦਾ"
 
 msgid "Ashamed"
 msgstr "ਸ਼ਰਮਸ਼ਾਰ"
@@ -4750,287 +4816,231 @@ msgstr "ਸ਼ਰਮਸ਼ਾਰ"
 msgid "Bored"
 msgstr "ਅੱਕਿਆ"
 
-#, fuzzy
 msgid "Brave"
-msgstr "ਸੰਭਾਲੋ"
+msgstr "ਦਲੇਰ"
 
-#, fuzzy
 msgid "Calm"
-msgstr "ਰੀਲੇਮ"
+msgstr "ਸ਼ਾਂਤ"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "ਗੱਲਬਾਤ"
+msgstr "ਚੌਕਸ"
 
-#, fuzzy
 msgid "Cold"
-msgstr "ਗੂੜੇ"
+msgstr "ਠੰਡ"
 
-#, fuzzy
 msgid "Confident"
-msgstr "ਟਕਰਾ"
+msgstr "ਹੌਸਲੇ ਨਾਲ"
 
-#, fuzzy
 msgid "Confused"
-msgstr "ਜਾਰੀ ਰੱਖੋ"
+msgstr "ਉਲਝਿਆ"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "ਸੰਪਰਕ"
+msgstr "ਅੰਤਰ ਧਿਆਨ"
 
-#, fuzzy
 msgid "Contented"
-msgstr "ਜੁੜਿਆ"
+msgstr "ਪਰਸੰਨ"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "ਕੰਪਨੀ"
+msgstr "ਵੈਹਮੀ"
 
 msgid "Crazy"
-msgstr ""
+msgstr "ਝੱਲਾ"
 
-#, fuzzy
 msgid "Creative"
-msgstr "ਬਣਾਓ"
+msgstr "ਸਿਰਜਣਸ਼ੀਲ"
 
-#, fuzzy
 msgid "Curious"
-msgstr "ਸ਼ਾਨਦਾਰ"
+msgstr "ਜਿਆਸੂ"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "ਇਨਕਾਰ ਕੀਤਾ"
+msgstr "ਨਿੰਮੌਝੂਣਾ"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "ਹਟਾਇਆ"
+msgstr "ਦੁਖੀ"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੈ।"
+msgstr "ਨਿਰਾਸ਼"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "ਅੱਕਿਆ"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "ਆਯੋਗ ਹੈ"
+msgstr "ਡਰਿਆ"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "ਅੱਡ"
+msgstr "ਬੇਧਿਆਨਾ"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "ਪਰੇਸ਼ਾਨ"
 
-#, fuzzy
 msgid "Envious"
-msgstr "ਬੇਚੈਨ"
+msgstr "ਈਰਖਾਲੂ"
 
-#. 2
 msgid "Excited"
 msgstr "ਜੋਸ਼ ਵਿੱਚ"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "ਸ਼ਾਨਦਾਰ"
+msgstr "ਨਖ਼ਰੇ"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "ਪਹਿਲਾਂ ਨਾਂ"
+msgstr "ਨਿਰਾਸ਼"
 
 msgid "Grateful"
-msgstr ""
+msgstr "ਇਹਸਾਨਮੰਦ"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
+msgstr "ਸੋਗੀ"
 
-#. 3
 msgid "Grumpy"
-msgstr "ਗਰੁੰਪੀ"
+msgstr "ਰੁੱਖਾ"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "ਸ਼ਹਿਰ"
+msgstr "ਸ਼ਰਮਿੰਦਾ"
 
-#. 4
 msgid "Happy"
 msgstr "ਖੁਸ਼"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "ਆਸਵੰਦ"
 
-#. 8
 msgid "Hot"
 msgstr "ਹਾਟ"
 
 msgid "Humbled"
-msgstr ""
+msgstr "ਨਿਮਾਣਾ"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "ਜਲੀਲ ਕੀਤਾ"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "ਗੁੱਸੇ ਵਿੱਚ"
+msgstr "ਭੁੱਖਾ"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "ਹਾਸਾ"
+msgstr "ਬਦਸਲੂਕੀ"
 
 msgid "Impressed"
-msgstr ""
+msgstr "ਪਰਭਾਵਿਤ"
 
-#, fuzzy
 msgid "In awe"
-msgstr "ਪਿਆਰ ਨਾਲ"
+msgstr "ਸਨਮਾਨ 'ਚ"
 
 msgid "In love"
 msgstr "ਪਿਆਰ ਨਾਲ"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
+msgstr "ਰੁੱਸਿਆ"
 
-#, fuzzy
 msgid "Interested"
-msgstr "ਦਿਲਚਸਪੀਆਂ"
+msgstr "ਉਤਸਕ"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "ਸੱਦਾ ਭੇਜਿਆ"
+msgstr "ਮਦਹੋਸ਼"
 
-#. 6
 msgid "Invincible"
 msgstr "ਅਜਿੱਤ"
 
 msgid "Jealous"
-msgstr "ਈਰਖਾਲੂ"
+msgstr "ਈਰਖਈ"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "ਬਾਂਦਰ"
+msgstr "ਇੱਕਲੇ"
 
-#, fuzzy
 msgid "Lost"
-msgstr "ਸਭ ਤੋਂ ਉੱਚੀ"
+msgstr "ਗੁਆਚਿਆ"
 
 msgid "Lucky"
-msgstr ""
+msgstr "ਕਿਸਮਤ ਵਾਲਾ"
 
-#, fuzzy
 msgid "Mean"
-msgstr "ਜਰਮਨ"
+msgstr "ਸ਼ੂਮ"
 
-#, fuzzy
 msgid "Moody"
-msgstr "ਮੂਡ"
+msgstr "ਦਿਲਗੀਰ"
 
 msgid "Nervous"
-msgstr ""
+msgstr "ਬੌਂਦਲਿਆ"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "ਵੇਰਵਾ"
+msgstr "ਅਨਿਸ਼ਚਤ"
 
-#, fuzzy
 msgid "Offended"
-msgstr "ਆਫਲਾਈਨ"
+msgstr "ਦੋਸ਼ੀ"
 
 msgid "Outraged"
-msgstr ""
+msgstr "ਅਤਿੱਆਚਾਰੀ"
 
-#, fuzzy
 msgid "Playful"
-msgstr "ਚਲਾਓ"
+msgstr "ਰੌਣਕੀ"
 
-#, fuzzy
 msgid "Proud"
-msgstr "ਉੱਚੀ"
+msgstr "ਮਜ਼ਾਜੀ"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "ਅਸਲੀ ਨਾਂ"
+msgstr "ਸੁਸਤ"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "ਮਿਲੇ"
+msgstr "ਆਰਾਮ 'ਚ"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "ਹਟਾਓ"
+msgstr "ਪਸ਼ਚਾਤਾਪਪੂਰਨ"
 
-#, fuzzy
 msgid "Restless"
-msgstr "ਰਜਿਸਟਰ"
+msgstr "ਬੇਚੈਨ"
 
-#. 7
 msgid "Sad"
 msgstr "ਉਦਾਸ"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "ਮਰਾਠੀ"
+msgstr "ਵਿਅੰਗਮਈ"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "ਸੰਤੁਸ਼ਟ"
 
-#, fuzzy
 msgid "Serious"
-msgstr "ਸ਼ਾਨਦਾਰ"
+msgstr "ਗੰਭੀਰ"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "ਪਾਬੰਦੀ"
+msgstr "ਸਦਮਾ"
 
 msgid "Shy"
-msgstr ""
+msgstr "ਸੰਗਾਊ"
 
-#. 9
 msgid "Sick"
 msgstr "ਬੀਮਾਰ"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
-msgstr "ਉਬਾਸੀਆਂ"
+msgstr "ਉਨੀਂਦਾ"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "ਲਗਾਤਾਰ"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "ਸਪੀਡ"
+msgstr "ਦਬਾਅ 'ਚ"
 
-#, fuzzy
 msgid "Strong"
-msgstr "ਗੀਤ"
+msgstr "ਮਜ਼ਬੂਤ"
 
 msgid "Surprised"
-msgstr ""
+msgstr "ਹੈਰਾਨ"
 
 msgid "Thankful"
-msgstr ""
+msgstr "ਧੰਨਵਾਦੀ"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "ਇੱਛਕ"
 
-#, fuzzy
 msgid "Tired"
-msgstr "ਫਾਇਰ"
+msgstr "ਥੱਕਿਆ/ਥੱਕੀ"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "ਹੇਠਾਂ ਲਾਈਨ"
+msgstr "ਅਸਪਸ਼ਟ"
 
-#, fuzzy
 msgid "Weak"
-msgstr "ਧੱਫਾ"
+msgstr "ਹਲਕਾ"
 
-#, fuzzy
 msgid "Worried"
-msgstr "ਅੱਕਿਆ"
+msgstr "ਚਿੰਤਾਤੁਰ"
 
 msgid "Set User Nickname"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰੋ"
@@ -5275,12 +5285,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
@@ -5391,18 +5401,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 "ਖੇਡ ਟਾਈਟਲ"
 
@@ -5551,9 +5549,6 @@ msgstr "ਵਰ੍ਹੇ ਗੰਢ"
 msgid "Work"
 msgstr "ਕੰਮ"
 
-msgid "Job Title"
-msgstr "ਕੰਮ ਨਾਂ"
-
 msgid "Company"
 msgstr "ਕੰਪਨੀ"
 
@@ -5639,6 +5634,9 @@ msgstr "HTTP ਢੰਗ ਸਰਵਰ"
 msgid "Show custom smileys"
 msgstr "ਕਸਟਮ ਸਮਾਇਲੀ ਵੇਖੋ"
 
+msgid "Allow direct connections"
+msgstr "ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ ਮਨਜ਼ੂਰ ਹੈ"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: ਯੂਜ਼ਰ ਦਾ ਧਿਆਨ ਖਿੱਚਣ ਵਾਸਤੇ ਸੈਨਤ (ਸੰਕੇਤ) ਮਾਰੋ"
 
@@ -5824,24 +5822,6 @@ msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਬੱਡੀ ਨੂੰ ਆਪਣੀ ਐਡ
 msgid "The username specified is invalid."
 msgstr "ਦਿੱਤਾ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ"
 
-#. 5
-msgid "In Love"
-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 ਗਲਤ ਹੈ।"
 
@@ -5854,8 +5834,8 @@ msgstr "PIN ਗਲਤ ਹੈ। ਇਸ ਵਿੱਚ ਕੇਵਲ ਅੰਕ [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'."
@@ -5873,7 +5853,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 "PIN"
 
@@ -5881,6 +5865,7 @@ msgid "Verify PIN"
 msgstr "PIN ਜਾਂਚ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ਵੇਖਾਉਣ ਲਈ ਨਾਂ"
 
@@ -5907,10 +5892,6 @@ msgstr "ਹਾਲੇ ਕੋਈ ਸਵਾਗਤੀ ਸਕਰੀਨ ਉਪਲੱ�
 msgid "About"
 msgstr "ਇਸ ਬਾਰੇ"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "ਮੂਡ ਬਦਲੋ..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "ਪਰੋਫਾਇਲ ਬਦਲੋ..."
@@ -5941,19 +5922,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 ID"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5981,11 +5955,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 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 "ਅੰਦਰੂਨੀ ਗਲਤੀ। ਬਾਅਦ 'ਚ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
@@ -5996,7 +5970,7 @@ msgstr "ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਕੋਡ ਨਹੀਂ ਦਿੱ�
 msgid "Security Code"
 msgstr "ਸੁਰੱਖਿਆ ਕੋਡ"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "ਸੁਰੱਖਿਆ ਕੋਡ ਦਿਓ"
 
@@ -6022,11 +5996,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 ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6039,6 +6017,24 @@ msgstr "HTTP ਰਾਹੀਂ ਕੁਨੈਕਟ"
 msgid "Enable splash-screen popup"
 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 "ਅਸੀਂ MXit ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਗੁਆ ਲਿਆ ਹੈ। ਫੇਰ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
@@ -6144,6 +6140,9 @@ msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪ�
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit ਤੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ ਆਈ ਹੈ (ਪੜ੍ਹਨ ਸਟੇਜ 0x06)"
 
+msgid "In Love"
+msgstr "ਪਿਆਰ ਨਾਲ"
+
 msgid "Pending"
 msgstr "ਬਾਕੀ ਹੈ"
 
@@ -6538,9 +6537,6 @@ msgstr "ਪਾਸਵਰਡ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
 msgid "Incorrect password"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ"
 
-msgid "User not found"
-msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
 msgid "Account has been disabled"
 msgstr "ਅਕਾਊਂਟ 'ਤੇ ਪਾਬੰਦੀ ਹੈ"
 
@@ -6762,9 +6758,9 @@ msgstr "ਸਰਵਰ ਐਡਰੈੱਸ"
 msgid "Server port"
 msgstr "ਸਰਵਰ ਪੋਰਟ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "%s ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ"
+msgstr "%s ਤੋਂ ਅਚਾਨਕ ਜਵਾਬ ਮਿਲਿਆ: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6788,115 +6784,166 @@ 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 "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 ""
+msgstr "ਸੋਚ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "ਲਿਖਣਾ ਬੰਦ ਕੀਤਾ"
+msgstr "ਖਰੀਦਦਾਰੀ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "ਸਵਾਲ ਡਾਈਲਾਗ"
+msgstr "ਸਵਾਲ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "Eating"
-msgstr "ਪੇਜ਼ਿੰਗ"
+msgstr "ਖਾਣਾ ਖਾ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "ਇੱਕ ਖੇਡ ਖੇਡੀ ਜਾ ਰਹੀ ਹੈ"
+msgstr "ਫਿਲਮ ਦੇ ਰਿਹਾ ਹਾਂ"
 
 msgid "Typing"
 msgstr "ਲਿਖ ਰਿਹਾ/ਰਹੀ ਹੈ"
 
-#, fuzzy
 msgid "At the office"
-msgstr "ਦਫ਼ਤਰ 'ਚ ਨਹੀਂ"
+msgstr "ਦਫ਼ਤਰ 'ਚ ਹਾਂ"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "ਇਸ਼ਨਾਨ ਕਰ ਰਿਹਾ ਹਾਂ"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "TV ਵੇਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "ਹੈਂਡ ਅੱਪ"
+msgstr "ਮੌਜਾਂ ਕਰਦਾ"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "ਉਬਾਸੀਆਂ"
+msgstr "ਸੌ ਰਹੇ"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "PDA ਦੀ ਵਰਤੋਂ"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "IM ਦੋਸਤ"
+msgstr "ਦੋਸਤਾਂ ਨਾਲ ਮਿਲ ਰਹੇ"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "ਫੋਨ ਉੱਤੇ"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "ਆਵਿਰਤੀ"
+msgstr "ਸਰਫ਼ ਕਰ ਰਹੇ"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "ਮੋਬਾਇਲ"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "ਵੈੱਬ ਉੱਤੇ ਖੋਜ ਜਾਰੀ"
 
 msgid "At a party"
-msgstr ""
+msgstr "ਪਾਰਟੀ 'ਚ"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "ਕਾਫ਼ੀ ਪੀ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "ਯੂਜ਼ਰ ਗੇਮ"
+msgstr "ਖੇਡਾਂ"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "ਵੈੱਬ ਬਰਾਊਜ਼ ਕਰੋ"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "ਗੀਤ"
+msgstr "ਸਿਗਰਟ ਪੀ ਰਹੇ"
 
-#, fuzzy
 msgid "Writing"
-msgstr "ਕੰਮ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+msgstr "ਲਿਖ ਰਹੇ"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "ਕੰਮ ਕਰ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
+msgstr "ਪੈੱਗ ਲਾ ਰਹੇ"
 
 msgid "Listening to music"
 msgstr "ਸੰਗੀਤ ਸੁਣ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "Studying"
-msgstr "ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+msgstr "ਪੜ੍ਹ ਰਿਹਾ/ਰਹੀ ਹਾਂ"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "ਦਿਲਚਸਪੀਆਂ"
+msgstr "ਆਰਾਮ-ਕਮਰੇ 'ਚ"
 
 msgid "Received invalid data on connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
@@ -6964,116 +7011,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 "ਮਾਪੇ ਕੰਟਰੋਲ ਕਰਕੇ 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 "ਆਫਲਾਈਨ ਸੁਨੇਹਾ ਸਟੋਰ ਭਰਿਆ"
-
 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 "
@@ -7109,7 +7046,7 @@ msgid "Games"
 msgstr "ਖੇਡਾਂ"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "ਹੋਰ"
@@ -7177,25 +7114,20 @@ msgstr "ਵੈਬ ਜਾਣਕਾਰ"
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"
 
-#, fuzzy
 msgid "Evil"
-msgstr "ਈਮੇਲ"
+msgstr "ਬੁਰਾ"
 
-#, fuzzy
 msgid "Depression"
-msgstr "ਕਿੱਤਾ"
+msgstr "ਉਦਾਸੀ"
 
-#, fuzzy
 msgid "At home"
-msgstr "ਮੇਰੇ ਬਾਰੇ"
+msgstr "ਘਰੇ"
 
-#, fuzzy
 msgid "At work"
-msgstr "ਨੈੱਟਵਰਕ"
+msgstr "ਕੰਮ ਉੱਤੇ"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ ਲਈ ਬਾਹਰ"
+msgstr "ਦੁਪੈਹਰ ਦੇ ਖਾਣੇ ਲਈ"
 
 msgid "IP Address"
 msgstr "IP ਐਡਰੈੱਸ"
@@ -7418,32 +7350,10 @@ msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "ਤੁਸੀਂ %hu ਸੁਨੇਹਾ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 msgstr[1] "ਤੁਸੀਂ %hu ਸੁਨੇਹਿਆਂ %s ਵਲੋਂ ਨੂੰ ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਕੇ ਗੁਆ ਲਿਆ ਹੈ।"
 
-# , 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"
-
 #, c-format
 msgid "User information not available: %s"
 msgstr "ਯੂਜ਼ਰ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ: %s"
 
-msgid "Unknown reason."
-msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-
 msgid "Online Since"
 msgstr "ਆਨਲਾਈਨ ਹੈ"
 
@@ -7694,9 +7604,8 @@ msgstr "ਤੁਹਾਡਾ IM ਭੇਜਿਆ ਨਹੀਂ ਸੀ ਗਿਆ। �
 msgid "iTunes Music Store Link"
 msgstr "iTunes ਸੰਗੀਤ ਸਟੋਰ ਲਿੰਕ"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "ਫਿੰਚ"
+msgstr "ਦੁਪਹਿਰ ਦਾ ਖਾਣਾ"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7730,9 +7639,8 @@ msgstr "AIM ਜਾਣਕਾਰੀ ਲਵੋ"
 msgid "Edit Buddy Comment"
 msgstr "ਬੱਡੀ ਟਿੱਪਣੀ ਸੋਧ"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "ਸਥਿਤੀ ਸੁਨੇਹਾ ਲਵੋ"
+msgstr "X-ਹਾਲਤ ਸੁਨੇਹਾ ਲਵੋ"
 
 msgid "End Direct IM Session"
 msgstr "ਸਿੱਧਾ IM ਸ਼ੈਸ਼ਨ ਬੰਦ ਕੀਤਾ"
@@ -7856,6 +7764,75 @@ 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 ਉੱਤੇ ਨਹੀਂ"
+
 msgid "Aquarius"
 msgstr "ਕੁੰਭ ਰਾਸ਼ੀ"
 
@@ -8138,6 +8115,10 @@ msgstr "ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 msgid "Admin"
 msgstr "ਐਡਮਿਨ"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "ਰੂਮ ਟਾਈਟਲ"
+
 msgid "Notice"
 msgstr "ਨੋਟਿਸ"
 
@@ -10010,9 +9991,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 
-msgid "Pager server"
-msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
-
 msgid "Pager port"
 msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
 
@@ -10028,18 +10006,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 "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
 
-msgid "Yahoo Chat server"
-msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo ਜਾਪਾਨ ID..."
 
@@ -10075,8 +10047,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."
@@ -10104,6 +10076,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 "ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ ਮੌਜੂਦ ਨਹੀਂ"
@@ -10183,6 +10163,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 "ਘਰੇ ਨਹੀਂ"
 
@@ -10559,6 +10547,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)"
 
@@ -10625,9 +10617,8 @@ msgstr "ਤੰਗ ਨਾ ਕਰੋ"
 msgid "Extended away"
 msgstr "ਪਹੁੰਚ ਤੋਂ ਦੂਰ"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "ਮਿਲਿਆ"
+msgstr "ਮਹਿਸੂਸ ਕਰ ਰਹੇ"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10797,12 +10788,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 "ਲਾਗਇਨ ਚੋਣ"
@@ -11164,13 +11149,11 @@ msgstr "ਤੁਸੀਂ ਇਸ ਸਮੇਂ ਇੱਕ ਅਕਾਊਂਟ ਨਾ�
 msgid "Unknown node type"
 msgstr "ਅਣਜਾਣ ਨੋਡ ਟਾਈਪ"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "ਲਿਸਤ ਤੋਂ ਆਪਣਾ ਮੂਡ ਚੁਣੋ ਜੀ।"
+msgstr "ਲਿਸਟ 'ਚੋਂ ਆਪਣਾ ਮੂਡ ਚੁਣੋ"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "ਏਲੀਆਸ (ਚੋਣਵਾਂ)"
+msgstr "ਸੁਨੇਹਾ (ਚੋਣਵਾਂ)"
 
 msgid "Edit User Mood"
 msgstr "ਯੂਜ਼ਰ ਮੋਡ ਸੋਧ"
@@ -11253,9 +11236,8 @@ msgstr "/ਟੂਲ/ਮੇਰੀ ਪਸੰਦ(_e)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/ਟੂਲ/ਪਰਾਈਵੇਸੀ(_i)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/ਟੂਲ/ਸਿਸਟਮ ਲਾਗ ਵੇਖੋ(_L)"
+msgstr "/ਟੂਲ/ਮੂਡ ਸੈੱਟ ਕਰੋ(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/ਟੂਲ/ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
@@ -11276,20 +11258,17 @@ msgstr "/ਮੱਦਦ(_H)"
 msgid "/Help/Online _Help"
 msgstr "/ਮੱਦਦ/ਆਨਲਾਈਨ ਮੱਦਦ(_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "ਬੱਡੀ ਜਾਣਕਾਰੀ"
+msgstr "/ਮੱਦਦ/ਬਿਲਡ ਜਾਣਕਾਰੀ(_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/ਮੱਦਦ/ਡੀਬੱਗ ਵਿੰਡੋ(_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
+msgstr "/ਮੱਦਦ/ਡਿਵੈਲਪਰ ਜਾਣਕਾਰੀ(_v)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "ਪ੍ਰਾਈਵੇਟ ਜਾਣਕਾਰੀ"
+msgstr "/ਮੱਦਦ/ਅਨੁਵਾਦਕ ਜਾਣਕਾਰੀ(_T)"
 
 msgid "/Help/_About"
 msgstr "/ਮੱਦਦ/ਇਸ ਬਾਰੇ(_A)"
@@ -11514,9 +11493,8 @@ msgstr "<PurpleMain>/ਅਕਾਊਂਟ/"
 msgid "_Edit Account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ(_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "ਮੂਡ ਸੈੱਟ ਕਰੋ..."
+msgstr "ਮੂਡ ਸੈੱਟ ਕਰੋ(_M)..."
 
 msgid "No actions available"
 msgstr "ਕੋਈ ਕਾਰਵਾਈ ਉਪਲੱਬਧ ਨਹੀਂ"
@@ -11636,9 +11614,8 @@ msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕ�
 msgid "/Conversation/Se_nd File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ(_n)..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/ਗੱਲਬਾਤ/ਜਾਣਕਾਰੀ ਲਵੋ"
+msgstr "/ਗੱਲਬਾਤ/ਧਿਆਨ ਮੰਗੋ(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/ਗੱਲਬਾਤ/ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ(_P)..."
@@ -11713,17 +11690,16 @@ 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 "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/ਗੱਲਬਾਤ/ਜਾਣਕਾਰੀ ਲਵੋ"
+msgstr "/ਗੱਲਬਾਤ/ਧਿਆਨ ਲਵੋ"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/ਗੱਲਬਾਤ/ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ..."
@@ -11789,13 +11765,11 @@ msgstr "ਭੇਜੋ(_S)"
 msgid "0 people in room"
 msgstr "ਰੂਮ ਵਿੱਚ 0 ਵਿਅਕਤੀ"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "ਇਹ ਟੈਬ ਬੰਦ ਕਰੋ"
+msgstr "ਖੋਜ ਪੱਟੀ ਬੰਦ ਕਰੋ"
 
-#, fuzzy
 msgid "Find:"
-msgstr "ਖੋਜ"
+msgstr "ਖੋਜ:"
 
 #, c-format
 msgid "%d person in room"
@@ -11958,6 +11932,9 @@ msgstr "ਅਫ਼ਰੀਕੀ"
 msgid "Arabic"
 msgstr "ਅਰਬੀ"
 
+msgid "Assamese"
+msgstr "ਆਸਾਮੀ"
+
 msgid "Belarusian Latin"
 msgstr "ਬੇਲਾਰੂਸੀ ਲੈਟਿਨ"
 
@@ -11967,6 +11944,9 @@ msgstr "ਬੁਲਗਾਰੀਆਈ"
 msgid "Bengali"
 msgstr "ਬੰਗਾਲੀ"
 
+msgid "Bengali-India"
+msgstr "ਬੰਗਾਲੀ-ਭਾਰਤੀ"
+
 msgid "Bosnian"
 msgstr "ਬੋਸਨੀਆਈ"
 
@@ -12081,6 +12061,9 @@ msgstr "ਲਾਓ"
 msgid "Macedonian"
 msgstr "ਮੈਕਡੋਨੀਆਈ"
 
+msgid "Malayalam"
+msgstr "ਮਲਿਆਲਮ"
+
 msgid "Mongolian"
 msgstr "ਮੰਗੋਲੀਆਈ"
 
@@ -12105,9 +12088,8 @@ msgstr "ਨਾਰਵੇਗੀਅਨ ਨਯਨੋਰਸਕ"
 msgid "Occitan"
 msgstr "ਅੱਸੀਟਾਨ"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "ਓੜੀਆ"
 
 msgid "Punjabi"
 msgstr "ਪੰਜਾਬੀ"
@@ -12190,22 +12172,22 @@ msgstr "ਅਮਹਾਰਿਕ"
 msgid "Lithuanian"
 msgstr "ਲੀਥੂਵਨੀਆਈ"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12214,8 +12196,11 @@ msgid ""
 "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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12229,20 +12214,19 @@ msgstr ""
 "im\">support@pidgin.im</a><br/>ਇਹ <b>ਪਬਲਿਕ</b> ਮੇਲਿੰਗ ਲਿਸਟ ਹੈ! (<a href="
 "\"http://pidgin.im/pipermail/support/\">ਅਕਾਇਵ</a>) <br/>ਅਸੀਂ ਸੁਤੰਤਰ ਧਿਰ ਪਰੋਟੋਕਾਲ "
 "ਜਾਂ ਪਲੱਗਇਨ ਲਈ ਮੱਦਦ ਨਹੀਂ ਕਰ ਸਕਦੇ!<br/>ਇਹ ਲਿਸਟ ਦੀ ਮੂਲ ਭਾਸ਼ਾ <b>ਅੰਗਰੇਜ਼ੀ</b> ਹੈ। ਤੁਸੀਂ ਹੋਰ "
-"ਭਾਸ਼ਾ ਵਿੱਚ ਪੋਸਟ ਕਰ ਤਾਂ ਸਕਦੇ ਹੋ, ਪਰ ਜਵਾਬ ਘੱਟ ਮਿਲਣ ਦੀ ਸੰਭਵਾਨਾ ਰਹੇਗੀ।<br/><br/>"
+"ਭਾਸ਼ਾ ਵਿੱਚ ਪੋਸਟ ਕਰ ਤਾਂ ਸਕਦੇ ਹੋ, ਪਰ ਜਵਾਬ ਘੱਟ ਮਿਲਣ ਦੀ ਸੰਭਵਾਨਾ ਰਹੇਗੀ।<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "%s ਬਾਰੇ"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "ਬੱਡੀ ਜਾਣਕਾਰੀ"
+msgstr "ਬਿਲਡ ਜਾਣਕਾਰੀ"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "ਬੱਡੀ ਜਾਣਕਾਰੀ"
+msgstr "%s ਬਿਲਡ ਜਾਣਕਾਰੀ"
 
 msgid "Current Developers"
 msgstr "ਮੌਜੂਦਾ ਡੀਵੈਲਪਰ"
@@ -12256,9 +12240,9 @@ msgstr "ਪੁਰਾਣੇ ਖੋਜੀ"
 msgid "Retired Crazy Patch Writers"
 msgstr "ਰਿਟਾਇਰ ਹੋਏ ਪੈਂਚ ਲੇਖਕ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ"
+msgstr "%s ਡਿਵੈਲਪਰ ਜਾਣਕਾਰੀ"
 
 msgid "Current Translators"
 msgstr "ਮੌਜੂਦਾ ਅਨੁਵਾਦਕ"
@@ -12266,9 +12250,9 @@ msgstr "ਮੌਜੂਦਾ ਅਨੁਵਾਦਕ"
 msgid "Past Translators"
 msgstr "ਪੁਰਾਣੀ ਅਨੁਵਾਦਕ"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "ਹੋਰ ਜਾਣਕਾਰੀ"
+msgstr "%s ਅਨੁਵਾਦ ਜਾਣਕਾਰੀ"
 
 msgid "_Name"
 msgstr "ਨਾਂ(_N)"
@@ -12667,9 +12651,8 @@ msgstr "IM ਚਿੱਤਰ ਸ਼ਾਮਿਲ"
 msgid "Insert Smiley"
 msgstr "ਸਮਾਇਲੀ ਸ਼ਾਮਲ ਕਰੋ"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "ਭੇਜੋ ਬਟਨ"
+msgstr "ਧਿਆਨ ਮੰਗੋ"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>ਗੂੜਾ(_B)</b>"
@@ -12717,7 +12700,7 @@ msgid "_Smile!"
 msgstr "ਸਮਾਇਲ(_S)!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "ਧਿਆਨ ਦਿਓ(_A)!"
 
 msgid "Log Deletion Failed"
 msgstr "ਲਾਗਇਨ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ"
@@ -12733,14 +12716,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?"
@@ -12844,11 +12827,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."
@@ -13656,10 +13639,6 @@ msgstr "ਸ਼ਾਰਟਕੱਟ ਟੈਕਸਟ"
 msgid "Custom Smiley Manager"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਮੈਨੇਜਰ"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ"
-
 msgid "Select Buddy Icon"
 msgstr "ਬੱਡੀ ਆਈਕਾਨ ਚੁਣੋ"
 
@@ -13798,9 +13777,8 @@ msgstr "ਸਾਊਂਡ ਚਲਾਓ(_P)"
 msgid "_Save File"
 msgstr "ਫਾਇਲ ਸੰਭਾਲੋ(_S)"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "ਕੀ ਤੁਸੀਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸਾਫ਼ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 msgid "Select color"
 msgstr "ਰੰਗ ਚੁਣੋ"
@@ -14768,8 +14746,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 "ਮਿਤੀ ਵੇਖੋ..."
@@ -14964,10 +14951,214 @@ 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 ""
+"$(^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 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 "ਕਨਫਰੰਸ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
@@ -15137,9 +15328,6 @@ msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ �
 #~ msgid "_User:"
 #~ msgstr "ਯੂਜ਼ਰ(_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime ਵਰਜਨ"
-
 #~ msgid "Calling ... "
 #~ msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ ... "
 
@@ -15703,7 +15891,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 eea8daa783..b257114d4d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,16 +8,16 @@
 # Copyright (C) Piotr Makowski <pmakowski@aviary.pl>, 2008.
 # -----------------------------------------------------------------
 # Copyright (C) Piotr Drąg <piotrdrag@gmail.com>, 2009.
-# Review całości - 23.11.2009 Joanna Mazgaj
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin polish translation\n"
+"Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-10 16:27+0100\n"
+"POT-Creation-Date: 2010-08-07 13:11-0400\n"
+"PO-Revision-Date: 2010-08-06 20:24+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"
@@ -68,12 +68,26 @@ msgstr ""
 msgid "Error"
 msgstr "Błąd"
 
+msgid "Account was not modified"
+msgstr "Nie zmodyfikowano konta"
+
 msgid "Account was not added"
 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"
 
@@ -429,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"
@@ -470,7 +484,7 @@ msgid "Certificate Import Error"
 msgstr "Błąd podczas importowania certyfikatu"
 
 msgid "X.509 certificate import failed"
-msgstr "Nieudany import certyfikatu X.509"
+msgstr "Zaimportowanie certyfikatu X.509 się nie powiodło"
 
 msgid "Select a PEM certificate"
 msgstr "Wybór certyfikatu PEM"
@@ -480,7 +494,7 @@ 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"
 
@@ -488,7 +502,7 @@ msgid "Certificate Export Error"
 msgstr "Błąd podczas eksportowania certyfikatu"
 
 msgid "X.509 certificate export failed"
-msgstr "Nieudany eksport certyfikatu X.509"
+msgstr "Wyeksportowanie certyfikatu X.509 się nie powiodło"
 
 msgid "PEM X.509 Certificate Export"
 msgstr "Eksport certyfikatu PEM X.509"
@@ -804,7 +818,7 @@ msgstr "Zatrzymaj"
 msgid "Waiting for transfer to begin"
 msgstr "Oczekiwanie na rozpoczęcie przesyłu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulowano"
 
 msgid "Failed"
@@ -973,10 +987,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 ""
@@ -1275,11 +1289,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)"
@@ -1368,7 +1385,6 @@ msgid "Saved Statuses"
 msgstr "Zapisane stany"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1569,7 +1585,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1662,6 +1678,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"
 
@@ -1683,8 +1705,12 @@ msgstr ""
 "Certyfikat nie jest zaufany, ponieważ żaden certyfikat, który może go "
 "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."
@@ -1867,15 +1893,15 @@ msgstr ""
 
 #, 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 ""
@@ -1920,9 +1946,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"
 
@@ -2033,11 +2058,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"
@@ -2190,7 +2215,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"
@@ -2293,7 +2318,7 @@ 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"
@@ -2726,8 +2751,8 @@ 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ść w trybie offline"
@@ -3206,6 +3231,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ę"
 
@@ -3249,7 +3277,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"
@@ -3329,7 +3357,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."
@@ -3368,7 +3396,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"
@@ -3811,18 +3839,11 @@ 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 ich obsługa nie została odnaleziona."
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"Wymagana jest szyfrowanie, ale obsługa TLS/SSL nie została odnaleziona."
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Serwer wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
@@ -3855,13 +3876,60 @@ 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 nie powiodło się"
+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"
 
@@ -3925,6 +3993,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Kraj"
 
@@ -3939,10 +4008,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"
 
@@ -4051,7 +4124,7 @@ msgstr ""
 "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."
@@ -4161,12 +4234,23 @@ msgstr "Nie odnaleziono użytkowników"
 msgid "Roles:"
 msgstr "Role:"
 
+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 "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+"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. Należy ustawić domenę."
 
@@ -4185,7 +4269,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"
@@ -4195,7 +4279,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"
@@ -4263,7 +4347,6 @@ msgstr "Serwer nie obsługuje blokowania"
 msgid "Not Authorized"
 msgstr "Nie upoważniono"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nastrój"
 
@@ -4285,7 +4368,6 @@ msgstr "Do"
 msgid "None (To pending)"
 msgstr "Brak (do oczekuje na upoważnienie)"
 
-#. 0
 msgid "None"
 msgstr "Brak"
 
@@ -4299,14 +4381,18 @@ msgstr "Tekst nastroju"
 msgid "Allow Buzz"
 msgstr "Pozwolenie na szeptanie"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Drugie imię"
+msgstr "Nazwa nastroju"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Komentarz o znajomym"
+msgstr "Komentarz nastroju"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Wykonawca utworu"
 
@@ -4433,10 +4519,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 "Uwierzytelnienie nie powiodło się"
+msgstr "Uwierzytelnienie się nie powiodło"
 
 msgid "Bad Format"
 msgstr "Błędny format"
@@ -4475,10 +4561,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"
@@ -4583,7 +4666,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 ""
@@ -4598,9 +4681,8 @@ msgstr "Wybór Zasobu"
 msgid "Initiate Media"
 msgstr "Zainicjuj multimedia"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Ten protokół nie obsługuje pokojów konferencji."
+msgstr "Konto nie obsługuje PEP, nie można ustawić nastroju"
 
 msgid "config:  Configure a chat room."
 msgstr "config: konfiguruje pokój konferencji."
@@ -4659,9 +4741,8 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: szepcze do użytkownika, aby uzyskać jego uwagę"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Wybór właściwego użytkownika"
+msgstr "mood: ustawia bieżący nastrój użytkownika"
 
 msgid "Extended Away"
 msgstr "Wrócę później"
@@ -4731,7 +4812,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"
@@ -4744,13 +4825,13 @@ 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 ""
+msgstr "Brak nagłówka strumienia XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Wersja XMPP się nie zgadza"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Brak identyfikatora strumienia XMPP"
 
 msgid "XML Parse error"
 msgstr "Błąd podczas przetwarzania XML"
@@ -4800,7 +4881,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"
@@ -4808,7 +4889,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"
@@ -4828,32 +4909,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "arabski"
+msgstr "Przestraszony"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Zawstydzony"
+msgstr "Zdumiony"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Wspaniały"
+msgstr "Miłosny"
 
-#. 1
 msgid "Angry"
-msgstr "Zły"
+msgstr "Rozgniewany"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Zablokowany"
+msgstr "Zirytowany"
 
 msgid "Anxious"
 msgstr "Zaniepokojony"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Wysłane"
+msgstr "Rozbudzony"
 
 msgid "Ashamed"
 msgstr "Zawstydzony"
@@ -4861,287 +4936,231 @@ msgstr "Zawstydzony"
 msgid "Bored"
 msgstr "Znudzony"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Zapisz"
+msgstr "Dzielny"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Obszar"
+msgstr "Spokojny"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Konferencje"
+msgstr "Ostrożny"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Pogrubienie"
+msgstr "Zimny"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflikt"
+msgstr "Pewny siebie"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Kontynuuj"
+msgstr "Zdezorientowany"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontakt"
+msgstr "Kontemplacyjny"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Połączono"
+msgstr "Zadowolony"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Firma"
+msgstr "Marudny"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Szalony"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Utwórz"
+msgstr "Twórczy"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Wspaniały"
+msgstr "Ciekawy"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Odrzuceni"
+msgstr "Przygnębiony"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Usunięci"
+msgstr "Przybity"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Rozłączono."
+msgstr "Rozczarowany"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Zniesmaczony"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Wyłączone"
+msgstr "Skonsternowany"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Oderwany"
+msgstr "Rozkojarzony"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Zawstydzony"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Zaniepokojony"
+msgstr "Zazdrosny"
 
-#. 2
 msgid "Excited"
 msgstr "Podekscytowany"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Wspaniały"
+msgstr "Zalotny"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Imię"
+msgstr "Sfrustrowany"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Wdzięczny"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Pobieranie..."
+msgstr "Opłakujący"
 
-#. 3
 msgid "Grumpy"
 msgstr "Zrzędliwy"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Miasto"
+msgstr "Żałuje"
 
-#. 4
 msgid "Happy"
 msgstr "Wesoły"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Optymistyczny"
 
-#. 8
 msgid "Hot"
 msgstr "Sexy"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Skromny"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Upokorzony"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Zły"
+msgstr "Głodny"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Zraniony"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Zaimponowany"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Zakochany"
+msgstr "Zachwycony"
 
 msgid "In love"
 msgstr "Zakochany"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "indonezyjski"
+msgstr "Obrażony"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Zainteresowania"
+msgstr "Zainteresowany"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Zaproszeni"
+msgstr "Pijany"
 
-#. 6
 msgid "Invincible"
 msgstr "Niezwyciężony"
 
 msgid "Jealous"
 msgstr "Zazdrosny"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Małpa"
+msgstr "Samotny"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Najgłośniej"
+msgstr "Zagubiony"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Ma szczęście"
 
-#, fuzzy
 msgid "Mean"
-msgstr "niemiecki"
+msgstr "Podły"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Nastrój"
+msgstr "Ponury"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nerwowy"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Szczegół"
+msgstr "Neutralny"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Offline"
+msgstr "Urażony"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Oburzony"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Odtwórz"
+msgstr "Figlarny"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Głośno"
+msgstr "Dumny"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Imię i nazwisko"
+msgstr "Rozluźniony"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Odebrano"
+msgstr "Czuje ulgę"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Usuń"
+msgstr "Skruszony"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Zarejestruj"
+msgstr "Niespokojny"
 
-#. 7
 msgid "Sad"
 msgstr "Smutny"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "marathi"
+msgstr "Sarkastyczny"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Zadowolony"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Wspaniały"
+msgstr "Poważny"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Zablokowano"
+msgstr "Zszokowany"
 
 msgid "Shy"
-msgstr ""
+msgstr "Nieśmiały"
 
-#. 9
 msgid "Sick"
 msgstr "Chory"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
-msgstr "Śpiący"
+msgstr "Śenny"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontaniczny"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Prędkość"
+msgstr "Zestresowany"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Utwór"
+msgstr "Silny"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Zaskoczony"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Wdzięczny"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Spragniony"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Zmęczony"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Podkreślenie"
+msgstr "Nieokreślony"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Uderz"
+msgstr "Słaby"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Znudzony"
+msgstr "Zmartwiony"
 
 msgid "Set User Nickname"
 msgstr "Ustaw pseudonim użytkownika"
@@ -5262,10 +5281,10 @@ 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"
 
 msgid "Switchboard failed"
-msgstr "Centrala nie powiodła się"
+msgstr "Centrala się nie powiodła"
 
 msgid "Notify transfer failed"
-msgstr "Powiadomienie o przesyłaniu nie powiodło się"
+msgstr "Powiadomienie o przesyłaniu się nie powiodło"
 
 msgid "Required fields missing"
 msgstr "Brak wymaganych pól"
@@ -5343,7 +5362,7 @@ msgid "Server too busy"
 msgstr "Serwer jest zbyt zajęty"
 
 msgid "Authentication failed"
-msgstr "Uwierzytelnienie nie powiodło się"
+msgstr "Uwierzytelnienie się nie powiodło"
 
 msgid "Not allowed when offline"
 msgstr "Niedozwolone w trybie offline"
@@ -5506,18 +5525,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"
 
@@ -5666,9 +5673,6 @@ msgstr "Rocznica"
 msgid "Work"
 msgstr "Praca"
 
-msgid "Job Title"
-msgstr "Stanowisko"
-
 msgid "Company"
 msgstr "Firma"
 
@@ -5756,6 +5760,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ę"
 
@@ -5958,24 +5965,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."
 
-#. 5
-msgid "In Love"
-msgstr "Zakochany"
-
-#. 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ń nastró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."
 
@@ -5988,8 +5977,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'."
@@ -6009,7 +5998,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"
 
@@ -6017,6 +6010,7 @@ msgid "Verify PIN"
 msgstr "Sprawdź kod PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Wyświetl nazwę"
 
@@ -6043,10 +6037,6 @@ msgstr "Żaden ekran powitalny nie jest obecnie dostępny"
 msgid "About"
 msgstr "O wtyczce"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Zmień nastrój..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Zmień profil..."
@@ -6080,19 +6070,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"
@@ -6123,12 +6106,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."
@@ -6139,7 +6123,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"
 
@@ -6165,11 +6149,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")
@@ -6182,6 +6170,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."
@@ -6286,6 +6291,9 @@ msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x05)."
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x06)."
 
+msgid "In Love"
+msgstr "Zakochany"
+
 msgid "Pending"
 msgstr "Oczekujący"
 
@@ -6400,22 +6408,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"
@@ -6434,7 +6442,7 @@ msgid "Add friends from 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..."
@@ -6685,9 +6693,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"
 
@@ -6946,111 +6951,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL nie umożliwia uwierzytelnienia nazwy użytkownika w tym miejscu"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Błąd podczas żądania %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 "Cannot receive IM due to parental controls"
+msgstr "Nie można odebrać wiadomości z powodu kontroli rodzicielskiej"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nie można wysłać wiadomości SMS bez zaakceptowania warunków"
+
+msgid "Cannot send SMS"
+msgstr "Nie można wysłać wiadomości SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nie można wysłać wiadomości SMS do tego kraju"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nie można wysłać wiadomości SMS do nieznanego kraju"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Konta botów nie mogą inicjować wiadomości"
+
+msgid "Bot account cannot IM this user"
+msgstr "Konto bota nie może wysłać wiadomości do tego użytkownika"
+
+msgid "Bot account reached IM limit"
+msgstr "Konto bota osiągnęło ograniczenie liczby wiadomości"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Konto bota osiągnęło dzienne ograniczenie liczby wiadomości"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Konto bota osiągnęło miesięczne ograniczenie liczby wiadomości"
+
+msgid "Unable to receive offline messages"
+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"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Myśli"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Kończy pisanie"
+msgstr "Robi zakupy"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Okno dialogowe pytania"
+msgstr "Badawczy"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Stronicowanie"
+msgstr "Je"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Gra"
+msgstr "Ogląda film"
 
 msgid "Typing"
-msgstr "Pisanie"
+msgstr "Pisze"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Poza biurem"
+msgstr "W biurze"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Bierze kąpiel"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Ogląda telewizję"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Rozłącz się"
+msgstr "Bawi się"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Śpiący"
+msgstr "Śpi"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Używa palmtopa"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Znajomi"
+msgstr "Spotyka się z przyjaciółmi"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Przy telefonie"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Powtarzanie"
+msgstr "Serfuje"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
-msgstr "Telefon komórkowy"
+msgstr "Ruchliwy"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Szuka w sieci"
 
 msgid "At a party"
-msgstr ""
+msgstr "Na imprezie"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Na kawie"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Bliźnięta"
+msgstr "Gra"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Przegląda sieć"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Utwór"
+msgstr "Pali"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Pracuje"
+msgstr "Pisze"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Pracuje"
+msgstr "Pije"
 
 msgid "Listening to music"
-msgstr "Słucham muzyki"
+msgstr "Słucha muzyki"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Wysyłanie"
+msgstr "Uczy się"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Zainteresowania"
+msgstr "W łazience"
 
 msgid "Received invalid data on connection with server"
 msgstr "Odebrano nieprawidłowe dane na połączeniu z serwerem"
@@ -7118,116 +7168,6 @@ msgstr ""
 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 "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 "Żądanie zostało odrzucone"
-
-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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nie można wysłać wiadomości SMS bez zaakceptowania warunków"
-
-msgid "Cannot send SMS"
-msgstr "Nie można wysłać wiadomości SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nie można wysłać wiadomości SMS do tego kraju"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nie można wysłać wiadomości SMS do nieznanego kraju"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Konta botów nie mogą inicjować wiadomości"
-
-msgid "Bot account cannot IM this user"
-msgstr "Konto bota nie może wysłać wiadomości do tego użytkownika"
-
-msgid "Bot account reached IM limit"
-msgstr "Konto bota osiągnęło ograniczenie liczby wiadomości"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Konto bota osiągnęło dzienne ograniczenie liczby wiadomości"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Konto bota osiągnęło miesięczne ograniczenie liczby wiadomości"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7263,7 +7203,7 @@ msgid "Games"
 msgstr "Gry"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Dodatki"
@@ -7331,23 +7271,18 @@ msgstr "Na stronie WWW"
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Adres e-mail"
+msgstr "Zły"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Zawód"
+msgstr "Depresja"
 
-#, fuzzy
 msgid "At home"
-msgstr "O mnie"
+msgstr "W domu"
 
-#, fuzzy
 msgid "At work"
-msgstr "Sieć"
+msgstr "W pracy"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "Na obiedzie"
 
@@ -7604,28 +7539,9 @@ 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"
 
@@ -7897,9 +7813,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Odnośnik do sklepu muzycznego iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Obiad"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7932,9 +7847,8 @@ msgstr "Pobierz informacje AIM"
 msgid "Edit Buddy Comment"
 msgstr "Zmodyfikuj komentarz o znajomym"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Pobierz wiadomość stanu"
+msgstr "Pobierz wiadomość X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Zakończ sesję bezpośredniego połączenia"
@@ -8064,6 +7978,75 @@ msgstr ""
 "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"
+
 msgid "Aquarius"
 msgstr "Wodnik"
 
@@ -8287,15 +8270,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"
@@ -8346,6 +8329,10 @@ msgstr "Wysyłanie prośby"
 msgid "Admin"
 msgstr "Administrator"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Tytuł pokoju"
+
 msgid "Notice"
 msgstr "Uwaga"
 
@@ -8428,13 +8415,13 @@ 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>"
@@ -8637,7 +8624,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"
@@ -8664,7 +8651,7 @@ msgid "Checking captcha"
 msgstr "Sprawdzanie pola CAPTCHA"
 
 msgid "Failed captcha verification"
-msgstr "Sprawdzenie pola CAPTCHA nie powiodło się"
+msgstr "Sprawdzenie pola CAPTCHA się nie powiodło"
 
 msgid "Captcha Image"
 msgstr "Obraz CAPTCHA"
@@ -8917,8 +8904,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"
@@ -9127,7 +9114,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"
@@ -9464,13 +9451,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"
@@ -9579,7 +9566,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"
@@ -9646,7 +9633,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"
@@ -9712,12 +9699,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"
@@ -9812,7 +9799,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"
@@ -9862,7 +9849,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)"
@@ -10163,7 +10150,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"
@@ -10248,9 +10235,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"
 
@@ -10266,18 +10250,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..."
 
@@ -10344,6 +10322,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"
@@ -10359,7 +10346,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 ""
@@ -10421,6 +10408,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"
 
@@ -10585,7 +10581,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"
@@ -10611,13 +10607,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"
@@ -10669,7 +10665,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"
@@ -10804,6 +10800,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"
 
@@ -10850,10 +10850,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"
@@ -10870,9 +10870,8 @@ msgstr "Nie przeszkadzać"
 msgid "Extended away"
 msgstr "Wrócę później"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Odbieranie"
+msgstr "Odczuwa"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11051,12 +11050,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"
@@ -11425,16 +11418,14 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Nieznany typ węzła"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Proszę wybrać nastrój z listy."
+msgstr "Proszę wybrać nastrój z listy"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (opcjonalny)"
+msgstr "Wiadomość (opcjonalna)"
 
 msgid "Edit User Mood"
-msgstr "Zmień nastrój użytkownika"
+msgstr "Zmiana nastroju użytkownika"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -11471,7 +11462,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..."
@@ -11514,9 +11505,8 @@ msgstr "/Narzędzia/_Preferencje"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Narzędzia/Prywa_tność"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Narzędzia/_Dziennik systemowy"
+msgstr "/Narzędzia/_Ustaw nastrój"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Narzędzia/Przesyłanie p_lików"
@@ -11537,20 +11527,17 @@ msgstr "/Pomo_c"
 msgid "/Help/Online _Help"
 msgstr "/Help/Pomo_c online"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informacje o znajomym"
+msgstr "/Pomoc/I_nformacje programistyczne"
 
 msgid "/Help/_Debug Window"
 msgstr "/Pomoc/Okno _debugowania"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informacje o serwerze"
+msgstr "/Pomoc/Infor_macje o programistach"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Informacje osobiste"
+msgstr "/Pomoc/Inform_acje o tłumaczach"
 
 msgid "/Help/_About"
 msgstr "/Pomoc/_O programie"
@@ -11781,9 +11768,8 @@ msgstr "<PurpleMain>/Konta/"
 msgid "_Edit Account"
 msgstr "Zm_odyfikuj konto"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Ustaw nastrój..."
+msgstr "Ustaw _nastrój..."
 
 msgid "No actions available"
 msgstr "Brak dostępnych czynności"
@@ -11795,7 +11781,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."
@@ -11904,9 +11890,8 @@ msgstr "/Rozmowa/Multimedia/_Rozmowa głosowa\\/wideo"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozmowa/Wyślij p_lik..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Rozmowa/Pobierz informacje"
+msgstr "/Rozmowa/Zw_róć uwagę"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Rozmowa/Dodaj przechwytywanie _zdarzeń..."
@@ -11989,9 +11974,8 @@ msgstr "/Rozmowa/Multimedia/Rozmowa głosowa\\/wideo"
 msgid "/Conversation/Send File..."
 msgstr "/Rozmowa/Wyślij plik..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Rozmowa/Pobierz informacje"
+msgstr "/Rozmowa/Zwróć uwagę"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Rozmowa/Dodaj przechwytywanie zdarzeń..."
@@ -12057,13 +12041,11 @@ msgstr "_Wyślij"
 msgid "0 people in room"
 msgstr "Brak osób w pokoju"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Zamknij tę kartę"
+msgstr "Zamknij pasek wyszukiwania"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Znajdź"
+msgstr "Znajdź:"
 
 #, c-format
 msgid "%d person in room"
@@ -12227,6 +12209,9 @@ msgstr "afrykanerski"
 msgid "Arabic"
 msgstr "arabski"
 
+msgid "Assamese"
+msgstr "asamski"
+
 msgid "Belarusian Latin"
 msgstr "białoruski (alfabet łaciński)"
 
@@ -12236,6 +12221,9 @@ msgstr "bułgarski"
 msgid "Bengali"
 msgstr "bengalski"
 
+msgid "Bengali-India"
+msgstr "bengalski (Indie)"
+
 msgid "Bosnian"
 msgstr "bośniacki"
 
@@ -12350,6 +12338,9 @@ msgstr "laotański"
 msgid "Macedonian"
 msgstr "macedoński"
 
+msgid "Malayalam"
+msgstr "malajalam"
+
 msgid "Mongolian"
 msgstr "mongolski"
 
@@ -12458,25 +12449,23 @@ msgstr "amharski"
 msgid "Lithuanian"
 msgstr "litewski"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12485,8 +12474,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12496,26 +12489,25 @@ msgid ""
 "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 "About %s"
 msgstr "O programie %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informacje o znajomym"
+msgstr "Informacje programistyczne"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informacje o znajomym"
+msgstr "Informacje programistyczne o programie %s"
 
 msgid "Current Developers"
 msgstr "Obecni programiści"
@@ -12529,9 +12521,9 @@ msgstr "Poprzedni programiści"
 msgid "Retired Crazy Patch Writers"
 msgstr "Poprzedni twórcy łat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informacje o serwerze"
+msgstr "Informacje o programistach programu %s"
 
 msgid "Current Translators"
 msgstr "Obecni tłumacze"
@@ -12539,9 +12531,9 @@ msgstr "Obecni tłumacze"
 msgid "Past Translators"
 msgstr "Poprzedni tłumacze"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Więcej informacji"
+msgstr "Informacje o tłumaczach programu %s"
 
 msgid "_Name"
 msgstr "_Nazwa"
@@ -12889,7 +12881,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"
@@ -12954,9 +12946,8 @@ msgstr "Wstaw obraz"
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonę"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Przycisk Wyślij"
+msgstr "Wyślij uwagę"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>Pogru_bienie</b>"
@@ -13004,10 +12995,10 @@ msgid "_Smile!"
 msgstr "_Uśmiech!"
 
 msgid "_Attention!"
-msgstr ""
+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."
@@ -13022,14 +13013,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?"
@@ -13135,11 +13126,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."
@@ -13229,13 +13220,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>"
@@ -13377,13 +13368,13 @@ 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 motywów"
@@ -13942,10 +13933,6 @@ msgstr "Tekst skrótu"
 msgid "Custom Smiley Manager"
 msgstr "Menadżer własnych emotikon"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Wymagana jest aktywacja"
-
 msgid "Select Buddy Icon"
 msgstr "Wybór ikony znajomego"
 
@@ -13975,7 +13962,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."
@@ -15086,8 +15073,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..."
@@ -15289,127 +15285,154 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Wysyłanie i odbieranie surowych strof XMPP."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
-
-#~ msgid "Error creating conference."
-#~ msgstr "Błąd podczas tworzenia konferencji."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Nie można dowiązać gniazda do portu: %s"
+msgstr "Ta wtyczka jest przydatna do debugowania serwerów lub klientów XMPP."
 
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Nie można nasłuchiwać na gnieździe: %s"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "Użytkownik %s wysłał szturchnięcie."
-
-#~ 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."
+#. $(^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 ""
+"Program $(^Name) jest rozpowszechniany na warunkach Powszechnej Licencji "
+"Publicznej GNU (GPL). Licencja jest tu podana wyłącznie w celach "
+"informacyjnych. $_CLICK"
 
-#~ msgid "Profile URL"
-#~ msgstr "Adres URL profilu"
+#. 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 "MSN Protocol Plugin"
-#~ msgstr "Wtyczka protokołu MSN"
+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."
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s nie jest prawidłową grupą."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Główne pliki programu Pidgin i biblioteki DLL"
 
-#~ msgid "Unknown error."
-#~ msgstr "Nieznany błąd."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Utworzenie wpisu w menu Start dla programu Pidgin"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s na %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Utworzenie skrótu do programu Pidgin na pulpicie"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Nie można dodać użytkownika na %s (%s)"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Symbole debugowania (do zgłaszania awarii)"
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Nie można zablokować użytkownika na %s (%s)"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Pulpit"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Nie można zezwolić użytkownikowi na %s (%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 ""
+"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/ ."
 
-#~ 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."
+#. $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/ ."
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s nie jest prawidłowym kontem Passport."
+#. $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"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Usługa jest tymczasowo niedostępna."
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Biblioteka GTK+ (wymagana, jeśli nie jest obecna)"
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Nie można zmienić nazwy grupy"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Tłumaczenia"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Nie można usunąć grupy"
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Dalej >"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "Użytkownik %s dodał użytkownika do swojej listy znajomych."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Klient komunikatora Pidgin (wymagane)"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "Użytkownik %s usunął użytkownika ze swojej listy znajomych."
+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+?"
 
-#~ 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/>"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Skróty"
 
-#~ 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>"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Skróty do uruchamiania programu Pidgin"
 
-#~ 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>"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Obsługa sprawdzania pisowni"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Informacje debugowania"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Menu Start"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Nierozpoznany typ pliku\n"
-#~ "\n"
-#~ "Domyślnie przyjmuje się format PNG."
+#. 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 ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Błąd podczas zapisywania obrazu\n"
-#~ "\n"
-#~ "%s"
+msgid "The installer is already running."
+msgstr "Instalator jest już uruchomiony."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Otwarcie pliku \"%s\" nie powiodło się: %s"
+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."
 
-#~ 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"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Obsługa adresów URI"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Wstaw strofę <iq/>."
+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."
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Wstaw strofę <presence/>."
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Odwiedź stronę WWW programu Pidgin"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Wstaw strofę <message/>."
+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 5656e07c5e..a7384ab427 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "د نوی برېشناليک خبرتيا"
 
@@ -766,7 +779,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "فسخ شوه"
 
 msgid "Failed"
@@ -1258,6 +1271,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "کره کول ناکام شو"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1354,7 +1371,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr ""
 
@@ -1544,7 +1560,7 @@ msgstr ""
 msgid "Online"
 msgstr "په ليکه"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ليکه نه لرې"
 
@@ -1641,6 +1657,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 "نااشنا"
 
@@ -1658,7 +1680,9 @@ 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."
@@ -1886,7 +1910,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr ""
 
@@ -3094,6 +3117,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 "لومړی نوم"
 
@@ -3665,12 +3691,6 @@ msgstr ""
 msgid "execute"
 msgstr "اوبسه"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3700,6 +3720,15 @@ 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 "کره کول ناکام شو"
@@ -3709,6 +3738,42 @@ msgid "SASL error: %s"
 msgstr "خادم"
 
 #, 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 "د %s سره رابطه نه و شوه"
 
@@ -3781,6 +3846,7 @@ msgstr "سیمه"
 msgid "Postal Code"
 msgstr "پوست رمز"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "هیواد"
 
@@ -3795,10 +3861,14 @@ msgstr ""
 msgid "Organization Unit"
 msgstr ""
 
+msgid "Job Title"
+msgstr "دنده عنوان"
+
 msgid "Role"
 msgstr ""
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "د زیږېدنې ورځ"
 
@@ -4017,6 +4087,12 @@ 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 "رابطه ناکامه شوه"
@@ -4025,6 +4101,9 @@ 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 ""
 
@@ -4127,7 +4206,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "طبیعت"
 
@@ -4149,7 +4227,6 @@ msgstr ""
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "هیڅ نه"
 
@@ -4173,6 +4250,12 @@ msgstr "طبیعت"
 msgid "Mood Comment"
 msgstr "د ملګری تبصره:"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4346,9 +4429,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "د لیری رابطه ناکامه شوه"
 
-msgid "Resource Constraint"
-msgstr "د څوري محدودول"
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4692,7 +4772,6 @@ msgstr "شرمېدلی"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "په غوسه"
 
@@ -4789,7 +4868,6 @@ msgstr ""
 msgid "Envious"
 msgstr "اندېښمن"
 
-#. 2
 msgid "Excited"
 msgstr "پارېدلی"
 
@@ -4807,7 +4885,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "ډاله"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "ډاله"
@@ -4816,14 +4893,12 @@ msgstr "ډاله"
 msgid "Guilty"
 msgstr "ښار"
 
-#. 4
 msgid "Happy"
 msgstr "خوشاله"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr ""
 
@@ -4862,7 +4937,6 @@ msgstr "مخ"
 msgid "Intoxicated"
 msgstr "بلل"
 
-#. 6
 msgid "Invincible"
 msgstr "نه مغلوب کیدونکی"
 
@@ -4925,7 +4999,6 @@ msgstr "خوځول"
 msgid "Restless"
 msgstr "ثبت کول"
 
-#. 7
 msgid "Sad"
 msgstr "خپه"
 
@@ -4946,12 +5019,10 @@ msgstr "مانع کړی"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "کمکی نوم"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "خوبجن"
@@ -5354,20 +5425,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 "دنده عنوان"
@@ -5516,9 +5573,6 @@ msgstr ""
 msgid "Work"
 msgstr "کار"
 
-msgid "Job Title"
-msgstr "دنده عنوان"
-
 msgid "Company"
 msgstr "شرکت"
 
@@ -5605,6 +5659,10 @@ msgstr "وکیل خادم"
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "خادم رابطه قطع کړه."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5780,28 +5838,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 PIN you entered is invalid."
 msgstr ""
 
@@ -5834,7 +5870,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 "یوائن"
@@ -5843,6 +5883,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "لومړی نوم"
@@ -5873,11 +5914,6 @@ msgstr ""
 msgid "About"
 msgstr "ګېم باره کې"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "پټ ټکی بدلول..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5917,21 +5953,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "رابطه"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+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"
@@ -5959,10 +5990,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."
@@ -5974,7 +6005,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "مخ"
@@ -6008,12 +6039,17 @@ 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")
@@ -6028,6 +6064,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 ""
@@ -6146,6 +6203,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "مینه لرل"
+
 #, fuzzy
 msgid "Pending"
 msgstr "استول"
@@ -6554,9 +6614,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6795,6 +6852,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "پاتی دی"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ګپ شپ نښلول ناکام شو"
@@ -6803,6 +6864,66 @@ 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 ""
+
+#, fuzzy
+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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "په دوسیه %s باندی لیک نه و شول."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "د لیکه نه لیری پیغام"
+
+#, 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"
+
 msgid "Thinking"
 msgstr ""
 
@@ -6969,119 +7090,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 ""
-
-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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-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 ""
-
-#, 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 "
@@ -7402,29 +7410,10 @@ 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 "په ليکه د"
 
@@ -7808,6 +7797,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr "دلو"
 
@@ -8119,6 +8177,11 @@ msgstr "پاتی دی"
 msgid "Admin"
 msgstr "اډیام"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "د کوټه فهرست"
+
 #, fuzzy
 msgid "Notice"
 msgstr "یادونه"
@@ -9965,9 +10028,6 @@ msgstr "د یاهو هویت"
 msgid "Yahoo! Protocol Plugin"
 msgstr "د بانجوړ نښلولي"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9983,18 +10043,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 "د یاهو هویت"
@@ -10056,6 +10110,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"
@@ -10129,6 +10189,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 "په کور شی نه یم"
 
@@ -10489,6 +10560,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 "قبلول"
 
@@ -10726,12 +10801,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 "ننوتو ټاکل"
@@ -11936,6 +12005,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "عربي"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "شرمېدلی"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -11945,6 +12018,10 @@ msgstr "بلغاري"
 msgid "Bengali"
 msgstr "بنګالي"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنګالي"
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12064,6 +12141,10 @@ msgstr "اسد"
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "نر"
+
 msgid "Mongolian"
 msgstr ""
 
@@ -12183,8 +12264,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12725,14 +12806,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
@@ -12821,10 +12902,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
@@ -13667,10 +13748,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "کره کول ناکام شو"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ملګری خواښ که"
 
@@ -14797,7 +14874,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..."
@@ -15000,6 +15087,173 @@ msgstr ""
 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."
+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 ""
+
+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 "د ګرځنده پون شمېره مقررول..."
+
+#, 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 "دوسیه بدلونه شی خطا"
diff --git a/po/pt.po b/po/pt.po
index 9f6beb33a2..bc376470d0 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -830,7 +843,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 +1359,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 +1469,6 @@ msgid "Saved Statuses"
 msgstr "Estados Guardados"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1665,7 +1681,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ligado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desligado"
 
@@ -1763,6 +1779,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"
 
@@ -1780,9 +1804,10 @@ 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."
 msgstr ""
@@ -2020,7 +2045,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."
@@ -3290,6 +3314,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"
 
@@ -3912,18 +3939,6 @@ 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 "
@@ -3958,6 +3973,20 @@ 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"
 
@@ -3966,6 +3995,42 @@ msgid "SASL error: %s"
 msgstr "Erro SASL"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Terminando ligação"
+
+#, 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 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"
 
@@ -4038,6 +4103,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"
 
@@ -4052,10 +4118,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"
 
@@ -4286,6 +4356,18 @@ msgid "Roles:"
 msgstr "Função"
 
 #, 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."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Texto simples"
 
@@ -4293,6 +4375,9 @@ msgstr "Texto simples"
 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 ""
 
@@ -4401,7 +4486,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Disposição"
 
@@ -4423,7 +4507,6 @@ msgstr "Para"
 msgid "None (To pending)"
 msgstr "Nada (Para pendente)"
 
-#. 0
 msgid "None"
 msgstr "Nenhuma"
 
@@ -4447,6 +4530,12 @@ msgstr "Nome do meio"
 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 ""
 
@@ -4621,9 +4710,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"
 
@@ -5001,7 +5087,6 @@ msgstr "Envergonhado"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Zangado"
 
@@ -5100,7 +5185,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Ansioso"
 
-#. 2
 msgid "Excited"
 msgstr "Excitado"
 
@@ -5118,7 +5202,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "O utilizador está digitando..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo:"
@@ -5127,14 +5210,12 @@ msgstr "Grupo:"
 msgid "Guilty"
 msgstr "Cidade"
 
-#. 4
 msgid "Happy"
 msgstr "Feliz"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5175,7 +5256,6 @@ msgstr "Inverter"
 msgid "Intoxicated"
 msgstr "Convidar"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencível"
 
@@ -5239,7 +5319,6 @@ msgstr "Remover"
 msgid "Restless"
 msgstr "Registar"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
@@ -5260,12 +5339,10 @@ msgstr "Bloqueado"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nome"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sonolento"
@@ -5685,20 +5762,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"
@@ -5866,9 +5929,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Título"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5968,6 +6028,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"
 
@@ -6176,28 +6240,6 @@ msgstr "Quer adicionar este contacto à sua lista de contactos?"
 msgid "The username specified is invalid."
 msgstr "O nome de utilizador especificado é inválido."
 
-#. 5
-msgid "In Love"
-msgstr "Apaixonado"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "A Sua Disposição Actual"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "A chave SecurID inserida é inválida."
@@ -6235,7 +6277,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"
@@ -6244,6 +6290,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelido"
@@ -6275,11 +6322,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..."
@@ -6323,7 +6365,7 @@ msgid "Connecting..."
 msgstr "Ligando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID inserida é inválida."
 
 #, fuzzy
@@ -6331,14 +6373,9 @@ 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"
@@ -6367,10 +6404,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
@@ -6384,7 +6421,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"
@@ -6418,12 +6455,17 @@ 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")
@@ -6438,6 +6480,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."
@@ -6558,6 +6622,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Apaixonado"
+
 #, fuzzy
 msgid "Pending"
 msgstr "_Enviar"
@@ -6980,9 +7047,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"
 
@@ -7243,6 +7307,10 @@ 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"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Não foi possível ligar"
@@ -7251,6 +7319,67 @@ msgstr "Não foi possível ligar"
 msgid "Invalid chat room name"
 msgstr "Nome de Sala Inválido"
 
+msgid "Invalid error"
+msgstr "Erro inválido"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Impossível enviar ficheiro"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Não é possível enviar uma directoria."
+
+#. 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 "Impossível enviar mensagem."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Mensagens Por Ler"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7422,120 +7551,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-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 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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Impossível enviar ficheiro"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Não é possível enviar uma directoria."
-
-#. 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 "Impossível enviar mensagem."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Mensagens Por Ler"
-
 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 "
@@ -7893,29 +7908,10 @@ 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"
 
@@ -8357,6 +8353,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8700,6 +8765,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"
@@ -10675,10 +10745,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"
 
@@ -10695,19 +10761,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!"
@@ -10779,6 +10838,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"
@@ -10861,6 +10929,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"
 
@@ -11251,6 +11330,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"
@@ -11498,12 +11581,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"
@@ -12752,6 +12829,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "Amhárico"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Envergonhado"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12761,6 +12842,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bósnio"
 
@@ -12884,6 +12969,10 @@ msgid "Macedonian"
 msgstr "Macedónio"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Masculino"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedónio"
 
@@ -13008,8 +13097,8 @@ msgid ""
 "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>"
+"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 "
@@ -13594,14 +13683,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
@@ -13707,10 +13796,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
@@ -14592,10 +14681,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registar Obrigatório"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Escolher Contacto"
 
@@ -15829,7 +15914,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..."
@@ -16044,6 +16141,206 @@ msgstr ""
 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."
+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 ""
+
+#. $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 Execução GTK+ (obrigatório)"
+
+#. 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 ""
+
+#. 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 "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"
@@ -16187,9 +16484,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..."
@@ -16735,7 +17029,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."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 41229ab7d1..f5720dbdbc 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -791,7 +804,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 +1274,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 +1371,6 @@ msgid "Saved Statuses"
 msgstr "Status salvos"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Título"
 
@@ -1557,7 +1573,7 @@ msgstr ""
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1650,6 +1666,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"
 
@@ -1669,8 +1693,10 @@ 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."
 msgstr "O certificado expirou e não deve ser considerado válido."
@@ -1907,7 +1933,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"
 
@@ -3203,6 +3228,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,14 +3838,6 @@ 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"
@@ -3849,6 +3869,19 @@ 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"
 
@@ -3857,6 +3890,42 @@ 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"
 
@@ -3923,6 +3992,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"
 
@@ -3937,10 +4007,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"
 
@@ -4160,12 +4234,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 "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."
 
@@ -4264,7 +4350,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"
 
@@ -4286,7 +4371,6 @@ msgstr "Para"
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#. 0
 msgid "None"
 msgstr "Nenhuma"
 
@@ -4308,6 +4392,12 @@ msgstr "Nome do meio"
 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"
 
@@ -4478,9 +4568,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"
 
@@ -4843,7 +4930,6 @@ msgstr "Envergonhado"
 msgid "Amorous"
 msgstr "Glorioso"
 
-#. 1
 msgid "Angry"
 msgstr "Furioso"
 
@@ -4941,7 +5027,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Ansioso"
 
-#. 2
 msgid "Excited"
 msgstr "Empolgado"
 
@@ -4960,7 +5045,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Obtendo..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
@@ -4969,14 +5053,12 @@ msgstr "Grupo"
 msgid "Guilty"
 msgstr "Cidade"
 
-#. 4
 msgid "Happy"
 msgstr "Feliz"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5017,7 +5099,6 @@ msgstr "Interesses"
 msgid "Intoxicated"
 msgstr "Convidar"
 
-#. 6
 msgid "Invincible"
 msgstr "Invencível"
 
@@ -5081,7 +5162,6 @@ msgstr "Remover"
 msgid "Restless"
 msgstr "Registrar"
 
-#. 7
 msgid "Sad"
 msgstr "Triste"
 
@@ -5102,12 +5182,10 @@ msgstr "Bloqueado"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Apelido"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sonolento"
@@ -5511,18 +5589,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"
 
@@ -5672,9 +5738,6 @@ msgstr "Aniversário de casamento"
 msgid "Work"
 msgstr "Negócios"
 
-msgid "Job Title"
-msgstr "Título de trabalho"
-
 msgid "Company"
 msgstr "Empresa"
 
@@ -5763,6 +5826,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"
 
@@ -5962,28 +6029,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Apaixonado"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Seu humor atual"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "A chave SecurID digitada é inválida"
@@ -6020,7 +6065,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"
@@ -6029,6 +6078,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sobrenome"
@@ -6059,11 +6109,6 @@ msgstr ""
 msgid "About"
 msgstr "Sobre mim"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Alterar senha..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6107,7 +6152,7 @@ msgid "Connecting..."
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID digitada é inválida"
 
 #, fuzzy
@@ -6115,14 +6160,9 @@ 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"
@@ -6151,10 +6191,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
@@ -6168,7 +6208,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"
@@ -6202,12 +6242,17 @@ 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")
@@ -6222,6 +6267,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 ""
@@ -6342,6 +6409,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Apaixonado"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Enviando"
@@ -6744,9 +6814,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"
 
@@ -7007,12 +7074,77 @@ 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"
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Erro solicitando %s: %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 "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Não foi possível enviar o arquivo"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Não foi possível enviar um diretório."
+
+#. 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 "Não foi possível enviar mensagem."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Mensagem desconectada"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7179,120 +7311,6 @@ msgstr ""
 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 "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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Não foi possível enviar o arquivo"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Não foi possível enviar um diretório."
-
-#. 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 "Não foi possível enviar mensagem."
-
-#, fuzzy
-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 "
@@ -7498,8 +7516,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
@@ -7655,29 +7673,10 @@ 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"
 
@@ -8108,6 +8107,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Aquário"
 
@@ -8390,6 +8458,11 @@ msgstr "Requisitando"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Lista de salas"
+
 msgid "Notice"
 msgstr "Aviso"
 
@@ -10295,9 +10368,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"
 
@@ -10313,18 +10383,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..."
 
@@ -10393,6 +10458,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"
@@ -10473,6 +10547,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"
 
@@ -10856,6 +10941,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"
 
@@ -11093,12 +11182,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"
@@ -12269,6 +12352,10 @@ msgstr "Africâner"
 msgid "Arabic"
 msgstr "Árabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Envergonhado"
+
 msgid "Belarusian Latin"
 msgstr "Latim bielorrusso"
 
@@ -12278,6 +12365,10 @@ msgstr "Búlgaro"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bósnio"
 
@@ -12392,6 +12483,10 @@ msgstr "Laociano"
 msgid "Macedonian"
 msgstr "Macedônio"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Masculino"
+
 msgid "Mongolian"
 msgstr "Mongol"
 
@@ -12510,8 +12605,8 @@ msgid ""
 "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>"
+"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, "
@@ -13065,16 +13160,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?"
@@ -13181,11 +13276,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."
@@ -14015,10 +14112,6 @@ msgstr "Texto de Atalho"
 msgid "Custom Smiley Manager"
 msgstr "Gerenciador de emoticons personalizados"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Ativação necessária"
-
 msgid "Select Buddy Icon"
 msgstr "Selecionar Ícone do amigo"
 
@@ -15167,8 +15260,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..."
@@ -15374,6 +15479,213 @@ msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 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."
+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 "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"
 
@@ -15548,9 +15860,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)."
 
@@ -16123,7 +16432,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."
 
@@ -16175,8 +16484,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"
@@ -16188,8 +16497,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"
diff --git a/po/ro.po b/po/ro.po
index 2c424a69f7..e7fa1863db 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,17 +1,18 @@
 # 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.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2009-09-02 22:53+0300\n"
-"Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-05-11 00:25+0300\n"
+"Last-Translator: Mișu Moldovan <dumol@gnome.org>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"Language: ro\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 "Eroare"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Contul nu a fost adăugat"
+
 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 ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
 
@@ -74,7 +87,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 +139,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 +154,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 +175,7 @@ msgid ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"Conectați: %d\n"
+"Online: %d\n"
 "Total: %d"
 
 #, c-format
@@ -190,7 +203,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 +221,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 +243,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 +255,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 +291,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 +304,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 +384,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 +432,7 @@ msgid "Empty groups"
 msgstr "Grupuri fără contacte"
 
 msgid "Offline buddies"
-msgstr "Contacte deconectate"
+msgstr "Contacte offline"
 
 msgid "Sort"
 msgstr "Sortare"
@@ -446,11 +459,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 +526,11 @@ 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 +583,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 +608,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 +629,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 +646,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 +659,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 +695,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 +706,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 +767,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 +805,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 +868,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 +922,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 +1011,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 +1172,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 +1184,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 +1217,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 +1238,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 +1277,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 +1296,7 @@ msgid "Sound Preferences"
 msgstr "Preferințe sunet"
 
 msgid "Profiles"
-msgstr "Profile"
+msgstr "Profiluri"
 
 msgid "Automatic"
 msgstr "Automat"
@@ -1293,10 +1308,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 +1321,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 +1373,6 @@ msgid "Saved Statuses"
 msgstr "Statusuri salvate"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titlu"
 
@@ -1405,7 +1419,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 +1429,7 @@ msgid "Certificates"
 msgstr "Certificate"
 
 msgid "Sounds"
-msgstr "Sunete"
+msgstr "Alerte"
 
 msgid "Statuses"
 msgstr "Statusuri"
@@ -1424,7 +1438,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 +1536,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 +1549,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,20 +1572,20 @@ msgstr ""
 "ușoară"
 
 msgid "Online"
-msgstr "Conectat"
+msgstr "Online"
 
-#. primative,						no,							id,			name
+#. 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"
@@ -1583,7 +1597,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."
@@ -1653,6 +1667,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"
 
@@ -1670,9 +1690,13 @@ 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 ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certificatul a expirat și nu ar trebui considerat valid."
@@ -1689,7 +1713,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."
@@ -1807,7 +1831,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."
@@ -1843,7 +1867,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 ""
@@ -1901,15 +1925,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"
 
@@ -1950,9 +1973,8 @@ 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"
 
-#, fuzzy
 msgid "File is not readable."
-msgstr "Nu se poate scrie în director."
+msgstr "Fișierul nu poate fi citit."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
@@ -2016,7 +2038,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."
@@ -2024,58 +2046,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\" "
@@ -2184,7 +2206,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."
@@ -2209,7 +2231,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>"
@@ -2223,29 +2245,26 @@ 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 "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ă"
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Eroare de conferință."
+msgstr "Eroare de conferință"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -2552,7 +2571,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:"
@@ -2705,7 +2724,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 "
@@ -2719,7 +2738,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?"
 
@@ -2740,7 +2759,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ță"
@@ -3121,7 +3140,7 @@ msgid "Female"
 msgstr "Feminin"
 
 msgid "Only online"
-msgstr "Doar conectate"
+msgstr "Doar online"
 
 msgid "Find buddies"
 msgstr "Căutare contacte"
@@ -3193,6 +3212,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 +3480,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,13 +3825,6 @@ 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ă"
 
@@ -3838,7 +3853,19 @@ 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"
+
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
 msgstr ""
+"%s necesită autentificare în clar printr-o conexiune necriptată. Permiteți "
+"autentificarea în aceste condiții?"
 
 msgid "SASL authentication failed"
 msgstr "Autentificare SASL eșuată"
@@ -3847,21 +3874,51 @@ msgstr "Autentificare SASL eșuată"
 msgid "SASL error: %s"
 msgstr "Eroare SASL: %s"
 
-#, fuzzy
+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 "Configurare nereușită"
+msgstr "Nu s-a putut canoniza numele de utilizator"
 
-#, fuzzy
 msgid "Unable to canonicalize password"
-msgstr "Nu s-a putut deschide un port pentru ascultare."
+msgstr "Nu s-a putut canoniza parola."
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "Cerere nevalidă de la server"
+msgstr "Cerere malițioasă de la server"
 
-#, fuzzy
 msgid "Unexpected response from server"
-msgstr "S-a primit un răspuns HTTP neașteptat de la 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."
@@ -3914,6 +3971,7 @@ msgstr "Regiune"
 msgid "Postal Code"
 msgstr "Cod poștal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Țară"
 
@@ -3928,10 +3986,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"
 
@@ -3963,9 +4025,8 @@ msgstr "Prioritate"
 msgid "Resource"
 msgstr "Resursă"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Actualizare"
+msgstr "Timp de la pornire"
 
 msgid "Logged Off"
 msgstr "Deconectat"
@@ -4017,7 +4078,7 @@ msgid "Initiate _Chat"
 msgstr "Inițiază o _discuție"
 
 msgid "Log In"
-msgstr "Conectare"
+msgstr "Autentificare"
 
 msgid "Log Out"
 msgstr "Deconectare"
@@ -4151,12 +4212,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 "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."
 
@@ -4254,7 +4327,6 @@ msgstr "Serverul nu permite blocarea"
 msgid "Not Authorized"
 msgstr "Neautorizat"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Dispoziție"
 
@@ -4276,7 +4348,6 @@ msgstr "Destinatar"
 msgid "None (To pending)"
 msgstr "Niciunul (în așteptare)"
 
-#. 0
 msgid "None"
 msgstr "Fără"
 
@@ -4290,14 +4361,18 @@ msgstr "Text dispoziție"
 msgid "Allow Buzz"
 msgstr "Permite „buzz”"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Inițială"
+msgstr "Nume dispoziție"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Comentariu contact"
+msgstr "Comentariu dispoziție"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Artist piesă curentă"
 
@@ -4468,9 +4543,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"
 
@@ -4532,16 +4604,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."
+"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.
@@ -4562,7 +4633,7 @@ 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"
@@ -4584,9 +4655,8 @@ msgstr "Selectați o resursă"
 msgid "Initiate Media"
 msgstr "Inițiază media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Acest protocol nu suportă camere de chat."
+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."
@@ -4594,9 +4664,8 @@ 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."
@@ -4645,9 +4714,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Selectați utilizatorul corect"
+msgstr "mood: Alegeți o stare de moment"
 
 msgid "Extended Away"
 msgstr "Demult absent"
@@ -4725,18 +4793,19 @@ msgstr "Eroare de mesaj XMPP"
 msgid "(Code %s)"
 msgstr "(Cod %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Nu s-a putut trimite mesajul: Mesajul este prea mare."
+msgstr ""
+"O iconiță simbolică personalizată din mesaj este prea mare pentru a fi "
+"trimisă."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Lipsește antetul fluxului XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Nepotrivire de versiune XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Lipsește ID-ul fluxului XMPP"
 
 msgid "XML Parse error"
 msgstr "Eroare la analiza XML"
@@ -4802,7 +4871,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"
@@ -4813,32 +4882,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabă"
+msgstr "Temător"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Rușinat"
+msgstr "Uluit"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Glorios"
+msgstr "Drăgăstos"
 
-#. 1
 msgid "Angry"
 msgstr "Supărat"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Blocat"
+msgstr "Enervat"
 
 msgid "Anxious"
 msgstr "Stresat"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Se va trimite"
+msgstr "Stârnit"
 
 msgid "Ashamed"
 msgstr "Rușinat"
@@ -4846,302 +4909,244 @@ msgstr "Rușinat"
 msgid "Bored"
 msgstr "Plictisit"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Salvează"
+msgstr "Curajos"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Domeniu"
+msgstr "Calm"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chat-uri"
+msgstr "Precaut"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Aldin"
+msgstr "Înfrigurat"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Conflict"
+msgstr "Încrezător"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Continuă"
+msgstr "Derutat"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Contact"
+msgstr "Meditativ"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Conectat"
+msgstr "Mulțumit"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Companie"
+msgstr "Irascibil"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Nebun"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Creează"
+msgstr "Creativ"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Glorios"
+msgstr "Curios"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Respingere"
+msgstr "Necăjit"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Șterge"
+msgstr "Deprimat"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Deconectat."
+msgstr "Dezamăgit"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Dezgustat"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "_Dezactivare"
+msgstr "Îngrozit"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Detașat"
+msgstr "Zăpăcit"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Rușinat"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Stresat"
+msgstr "Invidios"
 
-#. 2
 msgid "Excited"
 msgstr "Entuziast"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorios"
+msgstr "Cu chef de flirt"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Prenume"
+msgstr "Frustrat"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Recunoscător"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Descărcare..."
+msgstr "Îndurerat"
 
-#. 3
-#, fuzzy
 msgid "Grumpy"
-msgstr "Grup"
+msgstr "Morocănos"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Oraș"
+msgstr "Vinovat"
 
-#. 4
 msgid "Happy"
 msgstr "Fericit"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Încrezător"
 
-#. 8
-#, fuzzy
 msgid "Hot"
-msgstr "Ser_ver:"
+msgstr "Încins"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Umilit"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Umilit"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Supărat"
+msgstr "Flămând"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Umor"
+msgstr "Rănit"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Impresionat"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Îndrăgostit"
+msgstr "Uimit"
 
 msgid "In love"
 msgstr "Îndrăgostit"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indoneziană"
+msgstr "Revoltat"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Domenii de interes"
+msgstr "Interesat"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Invită"
+msgstr "Intoxicat"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincibil"
 
 msgid "Jealous"
-msgstr "Gelos/Geloasă"
+msgstr "Gelos"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Maimuță"
+msgstr "Singuratic"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Foarte tare"
+msgstr "Rătăcit"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Noroos"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Germană"
+msgstr "Meschin"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Dispoziție"
+msgstr "Capricios"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervos"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detaliu"
+msgstr "Neutru"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Deconectat"
+msgstr "Ofensat"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Înfuriat"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Redare"
+msgstr "Jucăuș"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Tare"
+msgstr "Mândru"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Nume real"
+msgstr "Relaxat"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Primit"
+msgstr "Ușurat"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Ștergere"
+msgstr "Pocăit"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Înregistrare cont"
+msgstr "Neobosit"
 
-#. 7
 msgid "Sad"
 msgstr "Trist"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarcastic"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Satisfăcut"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Glorios"
+msgstr "Serios"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blocat"
+msgstr "Șocat"
 
 msgid "Shy"
-msgstr ""
+msgstr "Timid"
 
-#. 9
-#, fuzzy
 msgid "Sick"
-msgstr "Pseudonim"
+msgstr "Bolnav"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Adormit"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Viteză"
+msgstr "Stresat"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Melodie"
+msgstr "Puternic"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Surprins"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Recunoscător"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Însetat"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Obosit"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Subliniat"
+msgstr "Nedefinită"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Pocnește"
+msgstr "Slăbit"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Plictisit"
+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"
@@ -5222,7 +5227,7 @@ msgid "Not on list"
 msgstr "Nu este în listă"
 
 msgid "User is offline"
-msgstr "Utilizatorul este deconectat"
+msgstr "Utilizatorul este offline"
 
 msgid "Already in the mode"
 msgstr "Sunteți deja în respectiva stare"
@@ -5333,7 +5338,7 @@ msgid "Authentication failed"
 msgstr "Autentificare eșuată"
 
 msgid "Not allowed when offline"
-msgstr "Permis doar la autentificare"
+msgstr "Nu se permite asta în modul offline"
 
 msgid "Not accepting new users"
 msgstr "Nu acceptă utilizatori noi"
@@ -5405,9 +5410,9 @@ msgstr "Adresă de mail..."
 msgid "Your new MSN friendly name is too long."
 msgstr "Noul pseudonim propriu MSN este prea lung."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Alegeți-vă un pseudonim propriu."
+msgstr "Alegeți un pseudonim pentru %s."
 
 msgid "Set your friendly name."
 msgstr "Alegeți-vă un pseudonim propriu."
@@ -5445,7 +5450,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 ""
@@ -5492,18 +5497,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"
 
@@ -5541,13 +5534,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ă"
@@ -5652,9 +5645,6 @@ msgstr "Aniversare"
 msgid "Work"
 msgstr "Serviciu"
 
-msgid "Job Title"
-msgstr "Titlu"
-
 msgid "Company"
 msgstr "Companie"
 
@@ -5716,7 +5706,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"
@@ -5743,6 +5733,10 @@ msgstr "Server pentru metoda HTTP"
 msgid "Show custom smileys"
 msgstr "Arată iconițe simbolice personalizate"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Nu se poate crea o nouă conexiune"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:  Sâcâiți un utilizator pentru a-i atrage atenția"
 
@@ -5767,9 +5761,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."
@@ -5884,13 +5877,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"
@@ -5910,7 +5903,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:"
@@ -5943,50 +5936,26 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Îndrăgostit"
-
-#. 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"
-
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgstr "PIN-ul introdus este nevalid."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgstr "PIN-ul introdus are o lungime nevalidă [4-10]."
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
+msgstr "PIN-ul nu este valid. Ar trebui să conțină doar cifre [0-9]."
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "Noua parolă a fost confirmată greșit."
+msgstr "Cele două PIN-uri introduse nu se potrivesc."
 
-#, fuzzy
 msgid "The name you entered is invalid."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgstr "Numele introdus este nevalid."
 
+#, fuzzy
 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
@@ -6001,7 +5970,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"
@@ -6010,6 +5983,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nume de familie"
@@ -6040,11 +6014,6 @@ msgstr ""
 msgid "About"
 msgstr "Despre mine"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Schimbare parolă..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6088,22 +6057,17 @@ msgid "Connecting..."
 msgstr "Autentificare"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgid "The Display Name you entered is invalid."
+msgstr "Numele introdus este nevalid."
 
 #, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Cheia SecurID introdusă este nevalidă."
 
 #. mxit login name
-msgid "MXit Login Name"
+msgid "MXit ID"
 msgstr ""
 
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Pseudonim"
-
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
@@ -6132,10 +6096,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
@@ -6149,7 +6113,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Securitate activată"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Introduceți codul"
@@ -6183,12 +6147,17 @@ msgid "Status Message"
 msgstr "Mesaje trimise"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Mesaje primite"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Inițială"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Introducere număr telefon mobil..."
+msgid "Your MXit ID..."
+msgstr "Identitate Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6203,6 +6172,28 @@ msgstr "Conectare folosind TCP"
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Ați fost dat afară: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bilet (ticket) greșit"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "Ca_meră:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Aveți mail nou!"
+
+#, 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 ""
@@ -6260,9 +6251,8 @@ msgstr "Eroare de mesaj XMPP"
 msgid "Status Error"
 msgstr "Eroare de flux"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Eroare iconiță"
+msgstr "Eroare privind dispoziția"
 
 #, fuzzy
 msgid "Invitation Error"
@@ -6323,6 +6313,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Îndrăgostit"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Se trimite"
@@ -6726,9 +6719,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"
 
@@ -6786,7 +6776,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"
@@ -6925,7 +6915,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 "
@@ -6956,9 +6947,9 @@ msgstr "Adresă server"
 msgid "Server port"
 msgstr "Port server"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "S-a primit un răspuns neașteptat de la %s"
+msgstr "S-a primit un răspuns neașteptat de la %s: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6981,115 +6972,162 @@ 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 "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 ""
+msgstr "Mă gândesc"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Oprirea din tastare"
+msgstr "La cumpărături"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Dialog de interogare"
+msgstr "Pun întrebări"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Pager"
+msgstr "Mănânc"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Joacă ceva"
+msgstr "Văd un film"
 
 msgid "Typing"
-msgstr "Scriu"
+msgstr "Tastez"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nu-s la serviciu"
+msgstr "La serviciu"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Fac o baie"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "La TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Închide"
+msgstr "Mă distrez"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Adormit"
+msgstr "Dorm"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Folosesc un PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Prieteni IM"
+msgstr "Cu prietenii"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "La telefon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Recurentă"
+msgstr "La surfing"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Caut pe net"
 
 msgid "At a party"
-msgstr ""
+msgstr "La o petrecere"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "La o cafea"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Gemeni"
+msgstr "Mă joc"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Mă dau pe net"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Melodie"
+msgstr "La o țigară"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Lucrează"
+msgstr "Scriu"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Lucrează"
+msgstr "La o băută"
 
 msgid "Listening to music"
-msgstr "Audiție muzicală"
+msgstr "Ascult muzică"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Se trimite"
+msgstr "Învăț"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Domenii de interes"
+msgstr "La baie"
 
 msgid "Received invalid data on connection with server"
 msgstr "S-au primit date nevalide la conectarea la server."
@@ -7158,120 +7196,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 "
@@ -7308,7 +7232,7 @@ msgid "Games"
 msgstr "Jocuri"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Adăugiri"
@@ -7371,28 +7295,23 @@ msgid "Occupied"
 msgstr "Ocupat"
 
 msgid "Web Aware"
-msgstr "Prezent online"
+msgstr "Prezență pe web"
 
 msgid "Invisible"
 msgstr "Invizibil"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Mail"
+msgstr "Malefic"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Profesie"
+msgstr "Depresie"
 
-#, fuzzy
 msgid "At home"
-msgstr "Despre mine"
+msgstr "Acasă"
 
-#, fuzzy
 msgid "At work"
-msgstr "Rețea"
+msgstr "La serviciu"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "La masă"
 
@@ -7464,14 +7383,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ă continuați să încercați, va trebui să așteptați chiar mai mult "
+"de atât."
 
 #. client too old
 #, c-format
@@ -7479,14 +7398,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ă."
@@ -7642,31 +7561,12 @@ 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"
+msgstr "Online din"
 
 msgid "Member Since"
 msgstr "Membru din"
@@ -7727,7 +7627,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."
@@ -7937,9 +7837,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Link către magazinul iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Prânz"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7972,9 +7871,8 @@ msgstr "Detalii AIM"
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Arată mesajul de status"
+msgstr "Obținere Msg X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Termină discuția directă"
@@ -7989,7 +7887,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"
@@ -8006,7 +7904,7 @@ 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>"
+msgstr "<i>nu așteptați nicio autorizare</i>"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care așteptați autorizarea"
@@ -8080,7 +7978,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."
@@ -8102,6 +8001,75 @@ 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 ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+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)"
+
 msgid "Aquarius"
 msgstr "Vărsător"
 
@@ -8384,6 +8352,10 @@ msgstr "Se cere"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Numele camerei"
+
 msgid "Notice"
 msgstr "Notificare"
 
@@ -8523,7 +8495,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"
@@ -8953,7 +8925,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"
@@ -9000,7 +8972,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
@@ -9074,7 +9046,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"
@@ -9105,16 +9077,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"
@@ -9492,7 +9464,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ă"
@@ -9510,7 +9482,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"
@@ -9625,7 +9597,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"
@@ -9805,7 +9777,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"
@@ -9820,14 +9792,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."
 
@@ -9865,7 +9837,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"
@@ -9893,7 +9865,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"
@@ -9939,7 +9911,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"
@@ -10161,7 +10133,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"
@@ -10292,9 +10264,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"
 
@@ -10310,18 +10279,13 @@ 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"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Utilizează proxy-ul contului pentru conexiuni SSL"
 
 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..."
 
@@ -10341,7 +10305,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"
@@ -10391,6 +10355,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ă."
@@ -10470,6 +10443,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ă"
 
@@ -10489,19 +10471,19 @@ msgid "Not on server list"
 msgstr "Nu este în lista de pe server"
 
 msgid "Appear Online"
-msgstr "Apar autentificat(ă)"
+msgstr "Apar online"
 
 msgid "Appear Permanently Offline"
-msgstr "Par totdeauna deconectat(ă)"
+msgstr "Par totdeauna offline"
 
 msgid "Presence"
 msgstr "Prezență"
 
 msgid "Appear Offline"
-msgstr "Apar deconectat(ă)"
+msgstr "Apar offline"
 
 msgid "Don't Appear Permanently Offline"
-msgstr "Nu par totdeauna deconectat(ă)"
+msgstr "Nu par totdeauna offline"
 
 msgid "Join in Chat"
 msgstr "Intră în chat"
@@ -10531,13 +10513,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
@@ -10661,7 +10643,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."
@@ -10696,7 +10678,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"
@@ -10853,6 +10835,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ă"
 
@@ -10919,9 +10905,8 @@ msgstr "Nu deranjați"
 msgid "Extended away"
 msgstr "Absență prelungită"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Se primește"
+msgstr "Sentiment"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11090,6 +11075,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"
@@ -11097,12 +11083,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"
@@ -11194,7 +11174,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"
@@ -11294,7 +11274,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
@@ -11307,10 +11287,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
@@ -11408,10 +11388,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..."
@@ -11462,7 +11442,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
@@ -11471,16 +11451,14 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Tip necunoscut de nod"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Selectați dispoziția de moment din listă."
+msgstr "Selectați dispoziția de moment din listă"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (opțional)"
+msgstr "Mesaj (opțional)"
 
 msgid "Edit User Mood"
-msgstr "Editare dispoziție utilizator"
+msgstr "Schimbare a propriei dispoziții"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -11502,7 +11480,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"
@@ -11514,7 +11492,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"
@@ -11560,9 +11538,8 @@ msgstr "/Unelte/_Preferințe"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Unelte/În_registrări de sistem"
+msgstr "/Unelte/_Dispoziție"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fișiere"
@@ -11583,20 +11560,17 @@ msgstr "/_Ajutor"
 msgid "/Help/Online _Help"
 msgstr "/Ajutor/Ajutor _online"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Detalii contact"
+msgstr "/Ajutor/Informații de _versiune"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ajutor/_Fereastră de depanare"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informații server"
+msgstr "/Ajutor/Informații despre de_zvoltatori"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Detalii personale"
+msgstr "/Ajutor/Informații despre _traducători"
 
 msgid "/Help/_About"
 msgstr "/Ajutor/_Despre"
@@ -11752,7 +11726,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."
 
@@ -11760,7 +11734,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"
@@ -11829,12 +11803,11 @@ msgstr "<PurpleMain>/Conturi/"
 msgid "_Edit Account"
 msgstr "_Editare cont"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Alegere dispoziție..."
+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"
@@ -11861,7 +11834,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"
@@ -11953,9 +11926,8 @@ msgstr "/Discuție/Media/Ap_el audio\\/video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Discuție/Caută detalii"
+msgstr "/Discuție/Cere _atenție"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
@@ -12038,9 +12010,8 @@ msgstr "/Discuție/Media/Apel audio\\/video"
 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Discuție/Caută detalii"
+msgstr "/Discuție/Cere atenție"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Discuție/Adaugă o întâmpinare..."
@@ -12104,15 +12075,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"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Închide acest tab"
+msgstr "Închide bara de căutare"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Caută"
+msgstr "Caută:"
 
 #, c-format
 msgid "%d person in room"
@@ -12276,6 +12245,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabă"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Rușinat"
+
 msgid "Belarusian Latin"
 msgstr "Bielorusă (alfabet latin)"
 
@@ -12285,6 +12258,9 @@ msgstr "Bulgară"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Bosniacă"
 
@@ -12399,16 +12375,18 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Macedoneană"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malay"
+
 msgid "Mongolian"
 msgstr "Mongoleză"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
+msgstr "Marathi"
 
-#, fuzzy
 msgid "Malay"
-msgstr "Masculin"
+msgstr "Malay"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
@@ -12425,9 +12403,8 @@ msgstr "Norvegiană (Nynorsk)"
 msgid "Occitan"
 msgstr "Occitană"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12483,9 +12460,8 @@ msgstr "Thailandeză"
 msgid "Turkish"
 msgstr "Turcă"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "Armeană"
+msgstr "Ucrainiană"
 
 msgid "Urdu"
 msgstr "Urdu"
@@ -12511,24 +12487,22 @@ msgstr "Amharic"
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12537,8 +12511,11 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12548,25 +12525,25 @@ msgid ""
 "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 "About %s"
 msgstr "Despre %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Detalii contact"
+msgstr "Informații de versiune"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Detalii contact"
+msgstr "Informații de versiune %s"
 
 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -12580,9 +12557,9 @@ msgstr "Programatori inactivi"
 msgid "Retired Crazy Patch Writers"
 msgstr "Autori inactivi de patch-uri"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informații server"
+msgstr "Informații despre dezvoltatorii %s"
 
 msgid "Current Translators"
 msgstr "Traducători activi"
@@ -12590,9 +12567,9 @@ msgstr "Traducători activi"
 msgid "Past Translators"
 msgstr "Traducători inactivi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Informații serviciu"
+msgstr "Informații despre traducătorii %s"
 
 msgid "_Name"
 msgstr "_Nume"
@@ -12753,10 +12730,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."
@@ -12795,7 +12772,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"
@@ -13005,9 +12982,8 @@ msgstr "Inserare imagine IM"
 msgid "Insert Smiley"
 msgstr "Inserare iconiță simbolică"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Buton de trimitere"
+msgstr "Trimite atenționare"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Aldin</b>"
@@ -13034,7 +13010,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"
@@ -13055,7 +13031,7 @@ msgid "_Smile!"
 msgstr "Iconițe _simbolice"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Atențiune!"
 
 msgid "Log Deletion Failed"
 msgstr "Ștergerea înregistrărilor a eșuat"
@@ -13073,19 +13049,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?"
@@ -13118,7 +13094,7 @@ msgstr ""
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
 msgstr "utilizează calea DIR pentru fișierele de configurare"
@@ -13127,7 +13103,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"
@@ -13139,16 +13115,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"
@@ -13188,11 +13164,13 @@ 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"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/Înc_hide"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Închide"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13240,7 +13218,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"
@@ -13415,20 +13393,19 @@ msgid "Unknown.... Please report this!"
 msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Personalizat)"
 
 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ă."
@@ -13439,35 +13416,29 @@ msgstr "Tema nu a putut fi încărcată."
 msgid "Theme failed to copy."
 msgstr "Tema nu a putut fi copiată."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Navigator preferat"
+msgstr "Selectare teme"
 
 #. 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 ""
-"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ă."
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Tema listei de contacte"
+msgstr "Tema listei de contacte:"
 
-#, fuzzy
 msgid "Status Icon Theme:"
-msgstr "Iconițe de status"
+msgstr "Tema iconiței de stare:"
 
 msgid "Sound Theme:"
-msgstr ""
+msgstr "Tema de alerte sonore:"
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Teme iconițe"
+msgstr "Tema de iconițe simbolice:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Combinații de taste"
@@ -13583,17 +13554,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>"
@@ -13605,35 +13574,29 @@ 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:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Nume utilizator:"
+msgstr "_Nume utilizator:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Parolă:"
+msgstr "_Parolă:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13651,7 +13614,7 @@ msgid "Konqueror"
 msgstr "Konqueror"
 
 msgid "Desktop Default"
-msgstr "Navigatorul implicit"
+msgstr "Implicit"
 
 msgid "GNOME Default"
 msgstr "Navigatorul Gnome"
@@ -13674,11 +13637,8 @@ msgstr "Manual"
 msgid "Browser Selection"
 msgstr "Navigator preferat"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
-"Opțiunile pentru proxy și navigator pot fi\n"
-"schimbate în Preferințele GNOME"
+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>"
@@ -13712,11 +13672,8 @@ msgstr ""
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
-"Opțiunile pentru proxy și navigator pot fi\n"
-"schimbate în Preferințele GNOME"
+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>"
@@ -13726,27 +13683,23 @@ msgstr "Opțiuni _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"
+msgstr "Rezolvă cererile _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 "_Nume utilizator:"
 
 msgid "Log _format:"
-msgstr "_Format înregistrări:"
+msgstr "_Formatul înregistrărilor:"
 
 msgid "Log all _instant messages"
 msgstr "Înregistrează toate _mesajele"
@@ -13826,14 +13779,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:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Schimbă statusul în _inactivitate"
+msgstr "Schimbă statusul în _inactivitate:"
 
 msgid "_Auto-reply:"
 msgstr "Răspunsuri _automate:"
@@ -13849,7 +13801,7 @@ 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ță"
@@ -13860,9 +13812,8 @@ msgstr "Navigator"
 msgid "Status / Idle"
 msgstr "Statusuri"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Teme iconițe"
+msgstr "Teme"
 
 msgid "Allow all users to contact me"
 msgstr "Permite tuturor să mă contacteze"
@@ -14021,10 +13972,6 @@ msgstr "Textul combinației de semne"
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Necesită activare"
-
 msgid "Select Buddy Icon"
 msgstr "Selectare iconiță contact"
 
@@ -14143,7 +14090,7 @@ msgid "Could not set icon"
 msgstr "Nu s-a putut utiliza iconița"
 
 msgid "_Open Link"
-msgstr "_Deschide linkul:"
+msgstr "_Deschide linkul"
 
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
@@ -14166,9 +14113,8 @@ msgstr "_Redare sunet"
 msgid "_Save File"
 msgstr "_Salvare fișier"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Sigur doriți să ștergeți %s?"
+msgstr "Sigur doriți să curățați?"
 
 msgid "Select color"
 msgstr "Selectare culoare"
@@ -14273,7 +14219,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..."
@@ -14312,8 +14258,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"
@@ -14843,9 +14789,8 @@ msgstr "Separare orizontală GtkTreeView"
 msgid "Conversation Entry"
 msgstr "Introducere text"
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "Introducere text"
+msgstr "Istoricul discuției"
 
 msgid "Request Dialog"
 msgstr "Dialog cerere"
@@ -15158,8 +15103,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..."
@@ -15238,13 +15192,13 @@ 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:"
@@ -15310,9 +15264,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"
@@ -15362,186 +15315,179 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Trimitere și primire blocuri XMPP brute"
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#~ msgid "Error creating conference."
-#~ msgstr "Eroare la inițierea conferinței"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Nu s-a putut lega socketul de port: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Nu se poate asculta la socketul: %s"
+#. $(^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 ""
+"$(^Name) are licenţă GPL (GNU Public License). Licenţa este inclusă aici "
+"doar pentru scopuri informative. $_CLICK"
 
-#~ 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."
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Un mediu de dezvoltare multiplatformă utilizat de Pidgin"
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s vă sâcâie cu un „nudge”!"
+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."
 
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "Pseudonimul a fost schimbat prea rapid"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Fişiere Pidgin şi dll-uri"
 
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Creează o intrare Pidgin în meniul Start"
 
-#~ msgid "Profile URL"
-#~ msgstr "Adresă profil"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Creează iconiţe Pidgin pe Desktop"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Modul de protocol MSN"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s nu este un nume valid de grup."
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Desktop"
 
-#~ msgid "Unknown error."
-#~ msgstr "Eroare necunoscută."
+#. $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 "%s on %s (%s)"
-#~ msgstr "%s în %s (%s)"
+#. $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 "Unable to add user on %s (%s)"
-#~ msgstr "Nu se poate adăuga utilizatorul în %s (%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 ""
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Nu se poate bloca utilizatorul în %s (%s)"
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Mediu GTK+ (obligatoriu)"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Nu se poate permite utilizatorul în %s (%s)"
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Loc"
 
-#~ 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ă."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Înainte >"
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s nu este un nume de cont „passport” valid."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Client de mesagerie instant (obligatoriu)"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Serviciu temporar indisponibil."
+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 "Unable to rename group"
-#~ msgstr "Grupul nu poate fi redenumit"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Scurtături"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Grupul nu poate fi șters"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Scurtături pentru pornirea Pidgin"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s v-a adăugat în lista sa de contacte."
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s v-a șters din lista sa de contacte."
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Meniu Start"
 
-#, 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."
-
-#~ 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 IRC:</FONT> #pidgin pe 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 "Informații de depanare"
-
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Tip necunoscut de fișier\n"
-#~ "\n"
-#~ "Se utilizează tipul implicit: PNG."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Eroare la salvarea imaginii\n"
-#~ "\n"
-#~ "%s"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "(implicit)"
+msgid "The installer is already running."
+msgstr "Instalarea este deja pornită."
 
-#~ msgid "Install Theme"
-#~ msgstr "Instalare temă"
+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."
 
-#~ msgid "Icon"
-#~ msgstr "Iconiță"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr ""
 
-#~ msgid "Use document font from _theme"
-#~ msgstr "Utilizează fontul precizat în _temă pentru documente"
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
 
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Server proxy &amp; navigator"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Vizitaţi pagina de web Pidgin"
 
-#~ msgid "Auto-away"
-#~ msgstr "Absențe automate"
+msgid "You do not have permission to uninstall this application."
+msgstr "Nu aveţi drepturile de acces necesare dezinstalării acestei aplicaţii."
 
-#~ msgid "Change _status to:"
-#~ msgstr "Schimbă _statusul în:"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certificatul nu este încă valid."
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Nu s-a putut deschide fișierul „%s”: %s"
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Cheia SecurID introdusă este nevalidă."
 
-#~ 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"
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Pseudonim"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Inserează un bloc brut <iq/>."
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Introducere număr telefon mobil..."
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Inserează un bloc brut <presence/>."
+#~ msgid "Rate to host"
+#~ msgstr "Limitare către server"
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Inserează un bloc brut <message/>."
+#~ msgid "Rate to client"
+#~ msgstr "Limitare către client"
 
-#, 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."
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/Înc_hide"
 
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Trimiteți mesaje instant prin orice protocol IM"
+#~ msgid "Unknown reason."
+#~ msgstr "Motiv necunoscut."
 
-#~ msgid "_Start port:"
-#~ msgstr "_De la:"
+#~ msgid "Current Mood"
+#~ msgstr "Dispoziție curentă"
 
-#~ msgid "_End port:"
-#~ msgstr "_Până la:"
+#~ msgid "New Mood"
+#~ msgstr "Dispoziție nouă"
 
-#~ msgid "_User:"
-#~ msgstr "Utili_zator:"
+#~ msgid "Change your Mood"
+#~ msgstr "Schimbați-vă dispoziția"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Versiune GTK+ utilizată"
+#~ msgid "How do you feel right now?"
+#~ msgstr "Cum vă simțiți pe moment?"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Altfel doar primul cont va fi activat.)"
+#~ msgid "Change Mood..."
+#~ msgstr "Schimbare dispoziție..."
diff --git a/po/ru.po b/po/ru.po
index ce9cf95315..90f4eb49b1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,15 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-08 19:19-0700\n"
+"POT-Creation-Date: 2010-07-27 02:16-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 "Уведомления о новой почте"
 
@@ -793,7 +807,7 @@ msgstr "Остановить"
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отменено"
 
 msgid "Failed"
@@ -1264,6 +1278,10 @@ msgstr "Другие говорят в чате"
 msgid "Someone says your username in chat"
 msgstr "Кто-то произносит ваше имя пользователя в чате"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Требуется активация"
+
 msgid "GStreamer Failure"
 msgstr "Ошибка GStreamer"
 
@@ -1356,6 +1374,7 @@ msgstr "Удалить статус"
 msgid "Saved Statuses"
 msgstr "Сохранённые статусы"
 
+#. title
 msgid "Title"
 msgstr "Название"
 
@@ -1556,7 +1575,7 @@ msgstr ""
 msgid "Online"
 msgstr "В сети"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Не в сети"
 
@@ -1649,6 +1668,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 "Неизвестно"
 
@@ -1669,8 +1696,12 @@ 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 ""
@@ -1908,7 +1939,6 @@ msgstr "Ошибка конвертирования %s в punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Ошибка создания нити: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Причина неизвестна"
 
@@ -3189,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 "Имя"
 
@@ -3798,12 +3831,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 ""
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
@@ -3835,6 +3862,19 @@ 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 провалилась"
 
@@ -3842,6 +3882,40 @@ 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 "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 "Не удаётся утвердить это имя пользователя"
 
@@ -3905,6 +3979,7 @@ msgstr "Регион"
 msgid "Postal Code"
 msgstr "Почтовый код"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Страна"
 
@@ -3919,8 +3994,6 @@ msgstr "Название организации"
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Название работы"
 
@@ -3928,6 +4001,7 @@ msgid "Role"
 msgstr "Должность"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Дата рождения"
 
@@ -4145,12 +4219,22 @@ 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. Должен быть задан домен."
 
@@ -4248,7 +4332,6 @@ msgstr "Сервер не поддерживает блокировку"
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настроение"
 
@@ -4270,7 +4353,6 @@ msgstr "Для"
 msgid "None (To pending)"
 msgstr "Нет (Ожидать)"
 
-#. 0
 msgid "None"
 msgstr "Нет"
 
@@ -4468,9 +4550,6 @@ msgstr "Нарушение правил"
 msgid "Remote Connection Failed"
 msgstr "Не удалось установить удалённое соединение"
 
-msgid "Resource Constraint"
-msgstr "Недостаток ресурсов"
-
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
@@ -4528,32 +4607,32 @@ msgstr "Не могу прозвонить пользователя %s"
 
 #, 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 не поддерживает это или не желает сейчас "
-"сплетничать."
+"Не могу позвать, потому что %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 позвал вас!"
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr "Треплю про %s..."
+msgstr "Зову %s..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4667,21 +4746,6 @@ msgstr "Модуль протокола XMPP"
 msgid "Domain"
 msgstr "Домен"
 
-#, fuzzy
-msgid "Require STARTTLS"
-msgstr "Требовать SSL/TLS"
-
-#, fuzzy
-msgid "Require old (port 5223) SSL"
-msgstr "Принудительно использовать старый (порт 5223) SSL"
-
-msgid "Use STARTTLS (if available)"
-msgstr ""
-
-#, fuzzy
-msgid "SSL/TLS"
-msgstr "Требовать SSL/TLS"
-
 msgid "Require SSL/TLS"
 msgstr "Требовать SSL/TLS"
 
@@ -4738,18 +4802,17 @@ msgstr "Ошибка сообщения XMPP"
 msgid "(Code %s)"
 msgstr "(Код %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Не удаётся отправить сообщение: Сообщение слишком велико."
+msgstr "Ваш смайлик в сообщении очень большой для отправки."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Пропущен заголовок потока XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Несовпадение версии XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "ID пропуска потока XMPP"
 
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
@@ -4839,7 +4902,6 @@ msgstr "Стыдящийся"
 msgid "Amorous"
 msgstr "Великолепный"
 
-#. 1
 msgid "Angry"
 msgstr "Рассерженный"
 
@@ -4937,220 +4999,177 @@ msgstr ""
 msgid "Envious"
 msgstr "Озабоченный"
 
-#. 2
 msgid "Excited"
 msgstr "Возбуждённый"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Великолепный"
+msgstr "Кокетливый"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Имя"
+msgstr "Разочарованный"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Признательный"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Загрузка..."
+msgstr "Скорбящий"
 
-#. 3
-#, fuzzy
 msgid "Grumpy"
-msgstr "Группа"
+msgstr "Сварливый"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Город"
+msgstr "Повинный"
 
-#. 4
 msgid "Happy"
 msgstr "Счастливый"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Надеящийся"
 
-#. 8
-#, fuzzy
 msgid "Hot"
-msgstr "_Узел:"
+msgstr "Горячий"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Приниженный"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Униженный"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Рассерженный"
+msgstr "Голодный"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Юмор"
+msgstr "Раненый"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Впечатлённый"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Влюблённый"
+msgstr "В страхе"
 
 msgid "In love"
 msgstr "Влюблённый"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Индонезийский"
+msgstr "Возмущённый"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Интересы"
+msgstr "Интересующийся"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Приглашено"
+msgstr "Пьяный"
 
-#. 6
 msgid "Invincible"
 msgstr "Непобедимый"
 
 msgid "Jealous"
 msgstr "Ревнующий"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Обезьяна"
+msgstr "Одинокий"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Очень громко"
+msgstr "Потерянный"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Удачливый"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Немецкий"
+msgstr "Скромный"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Настроение"
+msgstr "Угрюмый"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Нервный"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Подробности"
+msgstr "Нейтральный"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Не в сети"
+msgstr "Обиженный"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Возмущённый"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Воспроизводить"
+msgstr "Игривый"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Выше среднего"
+msgstr "Гордый"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Настоящее имя"
+msgstr "Расслабленный"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Получено"
+msgstr "Облегчённый"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Удалить"
+msgstr "Угрызаемый совестью"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Зарегистрировать"
+msgstr "Беспокойный"
 
-#. 7
 msgid "Sad"
 msgstr "Печальный"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Маратхи"
+msgstr "Саркастический"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Удовлетворённый"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Великолепный"
+msgstr "Серьёзный"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Заблокирован"
+msgstr "Шокированный"
 
 msgid "Shy"
-msgstr ""
+msgstr "Застенчивый"
 
-#. 9
-#, fuzzy
 msgid "Sick"
 msgstr "Больной"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Сонный"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Спонтанный"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Успешно:"
+msgstr "В стрессе"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Песня"
+msgstr "Сильный"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Удивлённый"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Благодарный"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Жаждущий"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Усталый"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Подчёркнутый"
+msgstr "Неопределённый"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Тюкнуть по бошке"
+msgstr "Слабый"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Скучающий"
+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 "
@@ -5399,14 +5418,14 @@ msgstr ""
 "%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 прислал вам приглашение к голосовому общению, что ещё не поддерживается."
+"%s послал вам приглашение к голосовому общению, что ещё не поддерживается."
 
 msgid "Nudge"
 msgstr "Подтолкнуть"
@@ -5419,14 +5438,13 @@ msgstr "%s подтолкнул вас!"
 msgid "Nudging %s..."
 msgstr "Подталкивание %s..."
 
-#, fuzzy
 msgid "Email Address..."
 msgstr "Адрес эл.почты..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
 msgstr "Установите дружеское имя для %s."
 
@@ -5512,7 +5530,6 @@ msgstr "Разговариваю по телефону"
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#, fuzzy
 msgid "Game Title"
 msgstr "Название игры"
 
@@ -5550,12 +5567,12 @@ 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"
@@ -5749,6 +5766,10 @@ msgstr "Сервер методов HTTP"
 msgid "Show custom smileys"
 msgstr "Показать свои смайлики"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Не удаётся создать соединение"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "подталкивание: подтолкнуть пользователя, чтобы привлечь его внимание"
 
@@ -5961,24 +5982,6 @@ msgstr "Вы хотите удалить также и этого собесед
 msgid "The username specified is invalid."
 msgstr "Указанное имя пользователя некорректно."
 
-#. 5
-msgid "In Love"
-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-код неправильный."
 
@@ -6011,7 +6014,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"
 
@@ -6019,6 +6026,7 @@ msgid "Verify PIN"
 msgstr "Проверьте PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Показать имя"
 
@@ -6045,10 +6053,6 @@ msgstr "Сейчас нет доступных экранов-заставок"
 msgid "About"
 msgstr "Про"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Изменить настроение..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Изменить профиль..."
@@ -6085,20 +6089,16 @@ msgid "Connecting..."
 msgstr "Соединение..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Введённый вами псевдоним некорректен."
+msgid "The Display Name you entered is invalid."
+msgstr "Введённое имя неправильное."
 
 #, 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
@@ -6127,11 +6127,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 ""
 "Имя пользователя уже зарегистрировано. Пожалуйста, выберите другое имя."
 
@@ -6144,7 +6146,7 @@ msgstr "Вы не ввели код безопасности"
 msgid "Security Code"
 msgstr "Код безопасности"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Введите код безопасности"
 
@@ -6170,11 +6172,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")
@@ -6187,6 +6195,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. Пожалуйста, пересоединитесь."
@@ -6302,6 +6332,9 @@ msgstr "Возникла ошибка соединения с MXit. (этап ч
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x06)"
 
+msgid "In Love"
+msgstr "Влюблённый"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Рассмотрение"
@@ -6706,9 +6739,6 @@ msgstr "Срок действия пароля истёк"
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-msgid "User not found"
-msgstr "Пользователь не найден"
-
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
@@ -6966,16 +6996,81 @@ 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
+msgid "Error requesting %s"
+msgstr "Ошибка запроса %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 "Не могу отправить SMS без принятия условий"
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Не могу отправить SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+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 "Учётные записи-боты не могут порождать сообщения"
+
+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 "Хранилище оффлайн-сообщений заполнено"
+
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не удаётся отправить сообщение %s (%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: %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не удаётся отправить сообщение %s: %s"
+
 msgid "Thinking"
 msgstr "Думаю"
 
@@ -7127,118 +7222,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 "Устаревший 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 "Не могу отправить SMS без принятия условий"
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Не могу отправить SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-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 "Учётные записи-боты не могут порождать сообщения"
-
-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 "Хранилище оффлайн-сообщений заполнено"
-
 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 "
@@ -7275,7 +7258,7 @@ msgid "Games"
 msgstr "Игры"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Дополнения"
@@ -7608,29 +7591,10 @@ msgstr[0] "Вы не получили %hu сообщение от %s по неи
 msgstr[1] "Вы не получили %hu сообщения от %s по неизвестной причине."
 msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не удаётся отправить сообщение %s (%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: %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 "В сети с"
 
@@ -8069,6 +8033,75 @@ 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 "Водолей"
 
@@ -8968,8 +9001,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"
@@ -10349,7 +10382,8 @@ 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"
@@ -10505,28 +10539,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 потеряно: %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. Пожалуйста, проверьте ваши настройки "
-"сервера."
+msgstr "Не удаётся соединиться: сервер вернул пустой ответ."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
-msgstr ""
+msgstr "Не удаётся соединиться: в ответе сервера нет нужной информации"
 
 msgid "Not at Home"
 msgstr "Не дома"
@@ -10915,6 +10945,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 "_Принять"
 
@@ -11160,12 +11194,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 "Параметры входа"
@@ -12024,7 +12052,7 @@ msgid "/Conversation/Se_nd File..."
 msgstr "/Беседа/Отправить _файл..."
 
 msgid "/Conversation/Get _Attention"
-msgstr "/Беседа/Обрести _внимание"
+msgstr "/Беседа/Привлечь _внимание"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
@@ -12107,9 +12135,8 @@ msgstr "/Беседа/Медиа/Аудио\\/Видеозвонок"
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Беседа/Получить информацию"
+msgstr "/Беседа/Привлечь внимание"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
@@ -12345,6 +12372,10 @@ msgstr "Африкаанс"
 msgid "Arabic"
 msgstr "Арабский"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Стыдящийся"
+
 msgid "Belarusian Latin"
 msgstr "Белорусская латиница"
 
@@ -12472,6 +12503,10 @@ msgstr "Лаосский"
 msgid "Macedonian"
 msgstr "Македонский"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Малайский"
+
 msgid "Mongolian"
 msgstr "Монгольский"
 
@@ -12587,8 +12622,8 @@ msgid ""
 "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>"
+"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, "
@@ -13128,7 +13163,7 @@ msgid "_Smile!"
 msgstr "_Смайлик!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Внимание!"
 
 msgid "Log Deletion Failed"
 msgstr "Удаление журнала не удалось"
@@ -13141,21 +13176,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?"
 
@@ -13259,11 +13294,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."
@@ -14068,10 +14105,6 @@ msgstr "Текст сочетания клавиш"
 msgid "Custom Smiley Manager"
 msgstr "Управление своими смайликами"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Требуется активация"
-
 msgid "Select Buddy Icon"
 msgstr "Выбрать иконку собеседника"
 
@@ -15230,8 +15263,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..."
@@ -15281,22 +15326,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 "У_стройство"
 
@@ -15309,9 +15350,8 @@ msgstr "У_стройство"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Голосовые/видео настройки"
+msgstr "Голосовые/Видео настройки"
 
 #. *< name
 #. *< version
@@ -15398,7 +15438,7 @@ msgstr "Держать окно списка собеседников _наве�
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Только тогда, когда закреплено"
+msgstr "Только когда закреплено"
 
 msgid "Windows Pidgin Options"
 msgstr "Параметры Pidgin для Windows"
@@ -15406,12 +15446,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>"
@@ -15438,10 +15477,208 @@ 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 ""
+"$(^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 "У Вас нет прав на удаление этого приложения."
+
+#, 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 "Художник"
 
@@ -15635,9 +15872,6 @@ msgstr "Этот модуль полезен для отладки XMPP серв
 #~ msgid "_User:"
 #~ msgstr "_Пользователь:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Версия GTK+"
-
 #~ msgid "Calling ... "
 #~ msgstr "Идёт вызов ... "
 
@@ -15758,8 +15992,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 "Приглашение отвергнуто"
@@ -16212,7 +16446,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 ""
 #~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
 
diff --git a/po/si.po b/po/si.po
index b44abaccc1..bad54e72aa 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "නව තැපැල් දැන්වීම"
 
@@ -744,7 +757,7 @@ msgstr "නවතන්න"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "අහෝසි කරන්න"
 
 msgid "Failed"
@@ -1213,6 +1226,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "සත්‍යාපනය අසමත් විය"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1304,7 +1321,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "සිරස්තලය"
 
@@ -1493,7 +1509,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "නොබැඳි"
 
@@ -1590,6 +1606,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 "නොදන්නා"
 
@@ -1607,7 +1629,9 @@ 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."
@@ -1829,7 +1853,6 @@ msgstr "%s ආරම්භ කිරීමේ දෝශයක්: %s"
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "නොදන්නා හේතුවක්"
 
@@ -3027,6 +3050,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 "පළමු නම"
 
@@ -3593,12 +3619,6 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3628,6 +3648,15 @@ 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 "සත්‍යාපනය අසමත් විය"
@@ -3636,6 +3665,38 @@ msgstr "සත්‍යාපනය අසමත් විය"
 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 ""
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "සාවද්‍ය රහස්පදයකී."
+
+msgid "Resource Constraint"
+msgstr ""
+
 #, fuzzy
 msgid "Unable to canonicalize username"
 msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
@@ -3703,6 +3764,7 @@ msgstr "කළාපය"
 msgid "Postal Code"
 msgstr "තැපැල් අංකය"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "රට"
 
@@ -3717,10 +3779,14 @@ msgstr "ආයතන නම"
 msgid "Organization Unit"
 msgstr "ආයතන ඒකකය"
 
+msgid "Job Title"
+msgstr "රැකියා තනතුර"
+
 msgid "Role"
 msgstr "කාර්‍යය"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "උපන්දිනය"
 
@@ -3939,12 +4005,21 @@ 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 ""
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4041,7 +4116,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4063,7 +4137,6 @@ msgstr "වෙත"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "කිසිවක් නැත"
 
@@ -4085,6 +4158,12 @@ msgstr "නමක් නැත"
 msgid "Mood Comment"
 msgstr "ගිණුම වෙනස් කරන්න"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4255,9 +4334,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4593,7 +4669,6 @@ msgstr "සජිවිකරණය"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4687,7 +4762,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4705,7 +4779,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "ලබාගනිමින්"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "සමුහය"
@@ -4714,14 +4787,12 @@ msgstr "සමුහය"
 msgid "Guilty"
 msgstr "නගරය"
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr ""
 
@@ -4759,7 +4830,6 @@ msgstr "අතුරු මූණත"
 msgid "Intoxicated"
 msgstr "ඇරයුම"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4823,7 +4893,6 @@ msgstr "ඉවත් කරන්න"
 msgid "Restless"
 msgstr "මුල්ම තත්වයට සකසන්න"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -4842,11 +4911,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5240,18 +5307,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 "සිරස්තලය"
@@ -5400,9 +5455,6 @@ msgstr "සාංවත්සරික"
 msgid "Work"
 msgstr "වැඩ"
 
-msgid "Job Title"
-msgstr "රැකියා තනතුර"
-
 msgid "Company"
 msgstr "සේවාස්ථානය"
 
@@ -5487,6 +5539,9 @@ msgstr ""
 msgid "Show custom smileys"
 msgstr ""
 
+msgid "Allow direct connections"
+msgstr ""
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5658,27 +5713,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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?"
-msgstr ""
-
 msgid "The PIN you entered is invalid."
 msgstr ""
 
@@ -5711,7 +5745,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"
@@ -5720,6 +5758,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "පෙලපත් නාමය"
@@ -5749,11 +5788,6 @@ msgstr ""
 msgid "About"
 msgstr "%s සම්බන්ධව"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "රහස්පදය වෙනස් කරන්න"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5789,21 +5823,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "සම්බන්ධ (_o)"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+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"
@@ -5831,10 +5860,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."
@@ -5846,7 +5875,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "රහස්පදය ඇතුළත් කරන්න"
@@ -5880,12 +5909,17 @@ 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")
@@ -5900,6 +5934,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 ""
@@ -6014,6 +6069,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "යවන්න"
@@ -6403,9 +6461,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr ""
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6644,12 +6699,74 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "%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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
+msgid "Offline message store full"
+msgstr ""
+
+#, 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 "කෙවෙනියට සම්බන්ධවිය නොහැක"
+
 msgid "Thinking"
 msgstr ""
 
@@ -6809,117 +6926,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 ""
-
-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 ""
-
-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 ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-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 "
@@ -7235,29 +7241,10 @@ 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 ""
 
@@ -7636,6 +7623,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -7944,6 +8000,11 @@ msgstr "ඉතිරිය"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "කාමර ලැයිස්තුව"
+
 #, fuzzy
 msgid "Notice"
 msgstr "සටහන"
@@ -9777,9 +9838,6 @@ msgstr "තෝරන්න..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "නියමාවලිය"
 
-msgid "Pager server"
-msgstr ""
-
 msgid "Pager port"
 msgstr ""
 
@@ -9795,18 +9853,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 "තෝරන්න..."
@@ -9868,6 +9920,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"
@@ -9937,6 +9995,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 ""
 
@@ -10294,6 +10360,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 ""
 
@@ -10527,12 +10597,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 ""
@@ -11687,6 +11751,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "අරාබී"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ක්‍රිඩා"
+
 msgid "Belarusian Latin"
 msgstr "බෙලරුසියානු ලතින්"
 
@@ -11696,6 +11764,10 @@ msgstr "බල්ගේරියානු"
 msgid "Bengali"
 msgstr "බෙන්ගාලි"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "බෙන්ගාලි"
+
 msgid "Bosnian"
 msgstr "බොස්නියානු"
 
@@ -11814,6 +11886,10 @@ msgid "Macedonian"
 msgstr "මැසඩෝනියානු"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "පුරුෂ"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "මැසඩෝනියානු"
 
@@ -11932,8 +12008,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12468,14 +12544,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
@@ -12564,10 +12640,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
@@ -13395,10 +13471,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "සත්‍යාපනය අසමත් විය"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "මිතුරෙකු තෝරන්න"
 
@@ -14518,7 +14590,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..."
@@ -14726,6 +14808,167 @@ msgstr ""
 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
+#, 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 "කෙවෙනියට සම්බන්ධවිය නොහැක"
@@ -14764,9 +15007,6 @@ msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හ�
 #~ msgid "_User:"
 #~ msgstr "පරිශීලක (_U):"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ ධාවනකාල අනුවාදය"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "ගණනය කරමින්..."
diff --git a/po/sk.po b/po/sk.po
index 6e5e93d0b5..fbc84e3f45 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-15 21:06+0100\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -790,7 +803,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"
@@ -1260,6 +1273,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"
 
@@ -1353,7 +1369,6 @@ msgid "Saved Statuses"
 msgstr "Uložené statusy"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Nadpis"
 
@@ -1550,7 +1565,7 @@ msgstr "Použiť TinyURL pre ľahšie kopírovanie v správach s adresami"
 msgid "Online"
 msgstr "Prihlásený"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Odhlásený"
 
@@ -1643,6 +1658,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"
 
@@ -1663,8 +1684,10 @@ 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."
 msgstr "Certifikát vypršal a nie je platný."
@@ -1901,7 +1924,6 @@ msgstr "Chyba pri preklade %s na punycode: %d"
 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"
 
@@ -3159,6 +3181,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"
 
@@ -3766,12 +3791,6 @@ 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"
 
@@ -3802,6 +3821,18 @@ 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"
 
@@ -3809,6 +3840,39 @@ msgstr "SASL autentifikácia zlyhala"
 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"
 
@@ -3872,6 +3936,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"
 
@@ -3886,10 +3951,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"
 
@@ -4107,14 +4176,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 "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 +4290,6 @@ msgstr "Server nepodporuje blokovanie"
 msgid "Not Authorized"
 msgstr "Neautorizovaný"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nálada"
 
@@ -4234,7 +4311,6 @@ msgstr "Pre"
 msgid "None (To pending)"
 msgstr "Žiadny (Čaká sa)"
 
-#. 0
 msgid "None"
 msgstr "Žiadne"
 
@@ -4248,14 +4324,18 @@ msgstr "Popis nálady"
 msgid "Allow Buzz"
 msgstr "Povoliť Bzzz"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Prostredné meno"
+msgstr "Názov nálady"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Komentár priateľa"
+msgstr "Komentár nálady"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Tune interpret"
 
@@ -4426,9 +4506,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"
 
@@ -4544,9 +4621,8 @@ msgstr "Vyberte zdroj"
 msgid "Initiate Media"
 msgstr "Začať médium"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Tento protokol nepodporuje miestnosti chatu."
+msgstr "Účet nepodporuje PEP, nedá sa nastavovať nálada."
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavenie miestnosti chatu."
@@ -4602,9 +4678,8 @@ 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ť"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Vyberte správneho používateľa"
+msgstr "mood: Zvoliť náladu používateľa"
 
 msgid "Extended Away"
 msgstr "Dlhšie neprítomný"
@@ -4686,13 +4761,13 @@ 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 ""
+msgstr "XMPP toku chýba hlavička"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP nezhoda verzií"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP toku chýba ID"
 
 msgid "XML Parse error"
 msgstr "Chyba pri spracovaní XML"
@@ -4769,320 +4844,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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "arabčina"
+msgstr "Ustráchaný"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Zahanbený"
+msgstr "Užasnutý"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Skvelé"
+msgstr "Zamilovaný"
 
-#. 1
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Zakázaný vstup"
+msgstr "Mrzutý"
 
 msgid "Anxious"
-msgstr "Ustarostený"
+msgstr "Úzkostlivý"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Odosielate"
+msgstr "Vybudený"
 
 msgid "Ashamed"
 msgstr "Zahanbený"
 
 msgid "Bored"
-msgstr "Unudený"
+msgstr "Znudený"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Uložiť"
+msgstr "Odvážny"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Realm"
+msgstr "Pokojný"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chaty"
+msgstr "Opatrný"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Tučné"
+msgstr "Chladný"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflikt"
+msgstr "Sebaistý"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Pokračovať"
+msgstr "Zmätený"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontakt"
+msgstr "Zamyslený"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Prihlásený"
+msgstr "Spokojný"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Spoločnosť"
+msgstr "Vratký"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Bláznivý"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Vytvoriť"
+msgstr "Tvorivý"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Skvelé"
+msgstr "Zvedavý"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Odmietnutý"
+msgstr "Skľúčený"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Odstránený"
+msgstr "Deprimovaný"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Odpojený."
+msgstr "Sklamaný"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Zhnusený"
 
-#, fuzzy
 msgid "Dismayed"
 msgstr "Vypnuté"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Odlúčený"
+msgstr "Rozrušený"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Rozpačitý"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Ustarostený"
+msgstr "Závistlivý"
 
-#. 2
 msgid "Excited"
 msgstr "Vzrušený"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Skvelé"
+msgstr "Záletný"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Krstné meno"
+msgstr "Frustrovaný"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Vďačný"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Prijíma sa..."
+msgstr "Trúchlenie"
 
-#. 3
 msgid "Grumpy"
-msgstr "Urazený"
+msgstr "Mrzutý"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Mesto"
+msgstr "Vinný"
 
-#. 4
 msgid "Happy"
-msgstr "Šťastný"
+msgstr "Veselý"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Sľubný"
 
-#. 8
 msgid "Hot"
-msgstr "Horúčava"
+msgstr "Horlivý"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Pokorný"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Ponížený"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Nahnevaný"
+msgstr "Hladný"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Zranený"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Dojatý"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Zaľúbený"
+msgstr "Zhrozený"
 
 msgid "In love"
 msgstr "Zaľúbený"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "indonézština"
+msgstr "Rozhorčený"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Záujmy"
+msgstr "Zaujatý"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Pozvaný"
+msgstr "Pod vplyvom"
 
-#. 6
 msgid "Invincible"
 msgstr "Neprekonateľný"
 
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Opica"
+msgstr "Osamelý"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Najhlasnejšia"
+msgstr "Stratený"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Šťastný"
 
-#, fuzzy
 msgid "Mean"
-msgstr "nemčina"
+msgstr "Zlý"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Nálada"
+msgstr "Náladový"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervózny"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detail"
+msgstr "Neutrálny"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Odhlásený"
+msgstr "Urazený"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Pobúrený"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Prehrať"
+msgstr "Hravý"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Hlasná"
+msgstr "Hrdý"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Skutočné meno"
+msgstr "Oddýchnutý"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Prijaté"
+msgstr "Uvoľnený"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Odstrániť"
+msgstr "Utrápený"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registrovať"
+msgstr "Nepokojný"
 
-#. 7
 msgid "Sad"
 msgstr "Smutný"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "maráthčina"
+msgstr "Sarkastický"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Spokojný"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Skvelé"
+msgstr "Vážny"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blokovaný"
+msgstr "Šokovaný"
 
 msgid "Shy"
-msgstr ""
+msgstr "Hamblivý"
 
-#. 9
 msgid "Sick"
 msgstr "Chorý"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Ospalý"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontánny"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Uspelo:"
+msgstr "Vystresovaný"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Pesnička"
+msgstr "Silný"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Prekvapený"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Povďačný"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Smädný"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Unavený"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Podčiarknuté"
+msgstr "Nedefinované"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Buchnúť"
+msgstr "Slabý"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Unudený"
+msgstr "Ustarostený"
 
 msgid "Set User Nickname"
 msgstr "Nastaviť prezývku používateľa"
@@ -5442,18 +5455,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"
 
@@ -5603,9 +5604,6 @@ msgstr "Výročie"
 msgid "Work"
 msgstr "Práca"
 
-msgid "Job Title"
-msgstr "Názov zamestnania"
-
 msgid "Company"
 msgstr "Spoločnosť"
 
@@ -5693,6 +5691,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"
 
@@ -5883,24 +5885,6 @@ 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é."
 
-#. 5
-msgid "In Love"
-msgstr "Zaľúbený"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Aktuálna nálada"
-
-#. add all moods to list
-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 "The PIN you entered is invalid."
 msgstr "Zadaný PIN je neplatný"
 
@@ -5932,7 +5916,11 @@ 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
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5940,6 +5928,7 @@ msgid "Verify PIN"
 msgstr "Overiť PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Používateľské meno"
 
@@ -5966,10 +5955,6 @@ msgstr "Nie je dostupná žiadna úvodná obrazovka"
 msgid "About"
 msgstr "O module"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Zmeniť náladu..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Zmeniť profil..."
@@ -6004,19 +5989,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Zadaná prezývka je neplatná."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Zadané meno je neplatné"
 
 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"
-msgstr "MXit prihlasovacie meno"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Prezývka"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6046,11 +6028,13 @@ msgstr "Vaše prihlásenie vypršalo. Prosím, skúste to znovu neskôr."
 msgid "Invalid country selected. Please try again."
 msgstr "Vybraná chybná krajina. Prosím, skúste to znovu neskôr."
 
-msgid "Username is not registered. Please register first."
+#, 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."
 
-msgid "Username is already registered. Please choose another username."
+#, 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."
@@ -6062,7 +6046,7 @@ msgstr "Nezadali ste bezpečnostný kód"
 msgid "Security Code"
 msgstr "Bezpečnostný kód"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Zadajte bezpečnostný kód"
 
@@ -6088,11 +6072,17 @@ msgstr "Načítava sa ponuka..."
 msgid "Status Message"
 msgstr "Správa statusu"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Prijaté správy"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skryté číslo"
 
-msgid "Your Mobile Number..."
-msgstr "Vaše mobilné číslo..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6105,6 +6095,28 @@ msgstr "Pripojiť sa cez HTTP"
 msgid "Enable splash-screen popup"
 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 "Stratili sme pripojenie na MXit. Prosím, pripojte sa znovu."
@@ -6207,6 +6219,9 @@ msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Na MXit sa vyskytla chyba pripojenia. (štádium čítania 0x06)"
 
+msgid "In Love"
+msgstr "Zaľúbený"
+
 msgid "Pending"
 msgstr "Čaká sa"
 
@@ -6606,9 +6621,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ý"
 
@@ -6868,111 +6880,156 @@ msgstr ""
 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 "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 ""
+msgstr "Rozmýšľa"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Prestane písať"
+msgstr "Nakupuje"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Dialóg otázky"
+msgstr "Spochybňuje"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Stránkovanie"
+msgstr "Je"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Hrá hru"
+msgstr "Pozerá film"
 
 msgid "Typing"
 msgstr "Píše"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nie som v kancelárii"
+msgstr "V kancelárii"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Kúpe sa"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Pozerá televíziu"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Zložiť"
+msgstr "Baví sa"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Ospalý"
+msgstr "Spí"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Používa PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "IM Priateľov"
+msgstr "S priateľmi"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "Telefonujem"
+msgstr "Na telefóne"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Opakujúci sa"
+msgstr "Surfuje"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobilný"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Vyhľadáva na webe"
 
 msgid "At a party"
-msgstr ""
+msgstr "Na oslave"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Pije kávu"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Používateľ hrá"
+msgstr "Hrá"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Prezerá web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Pesnička"
+msgstr "Fajčí"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Pracuje"
+msgstr "Píše"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Pracuje"
+msgstr "Pije"
 
 msgid "Listening to music"
 msgstr "Počúva hudbu"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Odosiela sa"
+msgstr "Študuje"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Záujmy"
+msgstr "Na toalete"
 
 msgid "Received invalid data on connection with server"
 msgstr "Počas spojenia so serverom boli prijaté neplatné dáta"
@@ -7040,116 +7097,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 "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é"
-
 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 "
@@ -7185,7 +7132,7 @@ msgid "Games"
 msgstr "Hry"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Doplnky"
@@ -7253,23 +7200,18 @@ msgstr "Na webe"
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-mail"
+msgstr "Zákerný"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Profesia"
+msgstr "Depresia"
 
-#, fuzzy
 msgid "At home"
-msgstr "O mne"
+msgstr "Doma"
 
-#, fuzzy
 msgid "At work"
-msgstr "Sieť"
+msgstr "V práci"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "Na obede"
 
@@ -7512,28 +7454,9 @@ 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."
 
 #, 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"
-
-#, 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"
 
@@ -7804,9 +7727,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Odkaz na hudobný obchod iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Obed"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7839,9 +7761,8 @@ msgstr "Získať info AIM"
 msgid "Edit Buddy Comment"
 msgstr "Upraviť komentár priateľa"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Získať správu o statuse"
+msgstr "Získať x-správu stavu"
 
 msgid "End Direct IM Session"
 msgstr "Ukončiť sedenie priamej komunikácie"
@@ -7968,6 +7889,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vodnár"
 
@@ -8250,6 +8240,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"
 
@@ -10148,9 +10142,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"
 
@@ -10166,18 +10157,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..."
 
@@ -10245,6 +10231,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"
@@ -10323,6 +10317,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"
 
@@ -10707,6 +10710,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ť"
 
@@ -10773,9 +10780,8 @@ msgstr "Nerušiť"
 msgid "Extended away"
 msgstr "Dlhšie neprítomný"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Prijíma sa"
+msgstr "Pocit"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10951,12 +10957,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"
@@ -11327,13 +11327,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Neznámy typ uzlu"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Prosím, vyberte vašu náladu zo zoznamu."
+msgstr "Prosím, vyberte svoju náladu zo zoznamu"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Prezývka (voliteľná)"
+msgstr "Správa (voliteľná)"
 
 msgid "Edit User Mood"
 msgstr "Zmeniť náladu používateľa"
@@ -11416,9 +11414,8 @@ msgstr "/Nástroje/_Nastavenia"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Nástroje/_Súkromie"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Nástroje/Systémový _záznam"
+msgstr "/Nástroje/Vybrať ná_ladu"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Nástroje/_Prenosy súborov"
@@ -11437,25 +11434,22 @@ msgid "/_Help"
 msgstr "/_Pomocník"
 
 msgid "/Help/Online _Help"
-msgstr "/Pomoc/Online _pomocník"
+msgstr "/Pomocník/Online _pomocník"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Podrobnosti o priateľovi"
+msgstr "/Pomocník/Informácie o _zostave"
 
 msgid "/Help/_Debug Window"
-msgstr "/Pomoc/_Ladiace okno"
+msgstr "/Pomocník/_Ladiace okno"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Podrobnosti o serveri"
+msgstr "/Pomocník/Informácie o _vývojarovi"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Osobné informácie"
+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"
@@ -11681,9 +11675,8 @@ msgstr "<PurpleMain>/Účty/"
 msgid "_Edit Account"
 msgstr "_Upraviť účet"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Nastaviť náladu..."
+msgstr "Nastaviť _náladu..."
 
 msgid "No actions available"
 msgstr "Nie sú dostupné žiadne akcie"
@@ -11804,9 +11797,8 @@ msgstr "/Rozhovor/Médiá/Hlasový\\/_Videohovor"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Rozhovor/_Zobraziť podrobnosti"
+msgstr "/Rozhovor/_Získať pozornosť"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Rozhovor/Pridať _sledovanie priateľa..."
@@ -11889,9 +11881,8 @@ msgstr "/Rozhovor/Médiá/Hlasový\\/Videohovor"
 msgid "/Conversation/Send File..."
 msgstr "/Rozhovor/Odos_lať súbor..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Rozhovor/_Zobraziť podrobnosti"
+msgstr "/Rozhovor/_Získať pozornosť"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Rozhovor/Pridať _sledovanie priateľa..."
@@ -11957,13 +11948,11 @@ msgstr "Odo_slať"
 msgid "0 people in room"
 msgstr "V miestnosti je 0 osôb"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Zavrieť túto kartu"
+msgstr "Zavrieť panel hľadanie"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Nájsť"
+msgstr "Hľadať:"
 
 #, c-format
 msgid "%d person in room"
@@ -12127,6 +12116,10 @@ msgstr "afrikánčina"
 msgid "Arabic"
 msgstr "arabčina"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Zahanbený"
+
 msgid "Belarusian Latin"
 msgstr "bieloruština, latinka"
 
@@ -12136,6 +12129,9 @@ msgstr "bulharčina"
 msgid "Bengali"
 msgstr "bengálčina"
 
+msgid "Bengali-India"
+msgstr "bengálčina-India"
+
 msgid "Bosnian"
 msgstr "bosniačtina"
 
@@ -12250,6 +12246,10 @@ msgstr "laoština"
 msgid "Macedonian"
 msgstr "macedónčina"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "malajčina"
+
 msgid "Mongolian"
 msgstr "mongolčina"
 
@@ -12358,24 +12358,22 @@ msgstr "amharčina"
 msgid "Lithuanian"
 msgstr "litovčina"
 
-#, fuzzy, c-format
+#, 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>"
+"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, 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>"
+"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 ""
@@ -12384,8 +12382,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12395,25 +12397,25 @@ msgid ""
 "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 "About %s"
 msgstr "O programe %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Podrobnosti o priateľovi"
+msgstr "Informácie o zostave"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Podrobnosti o priateľovi"
+msgstr "Informácie o zostave %s"
 
 msgid "Current Developers"
 msgstr "Aktívni vývojári"
@@ -12427,9 +12429,9 @@ msgstr "Vývojári v ústraní"
 msgid "Retired Crazy Patch Writers"
 msgstr "Blázniví autori patchov v ústraní"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Podrobnosti o serveri"
+msgstr "Informácie o vývojárovi %s"
 
 msgid "Current Translators"
 msgstr "Súčasní prekladatelia"
@@ -12437,9 +12439,9 @@ msgstr "Súčasní prekladatelia"
 msgid "Past Translators"
 msgstr "Bývalí prekladatelia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Viac informácií"
+msgstr "Informácie o prekladateľovi %s"
 
 msgid "_Name"
 msgstr "_Meno"
@@ -12686,7 +12688,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."
@@ -12848,9 +12850,8 @@ msgstr "Vložiť obrázok"
 msgid "Insert Smiley"
 msgstr "Vložiť smajlíka"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Pozor!"
+msgstr "Poslať pozornosť"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Tučné:</b>"
@@ -12897,9 +12898,8 @@ msgstr "_Vodorovná čiara"
 msgid "_Smile!"
 msgstr "_Smajlík!"
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Pozor!"
+msgstr "Pozornosť!"
 
 msgid "Log Deletion Failed"
 msgstr "Detekcia záznamov zlyhala"
@@ -12917,15 +12917,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?"
@@ -13027,11 +13027,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."
@@ -13829,10 +13831,6 @@ msgstr "Text odkazu"
 msgid "Custom Smiley Manager"
 msgstr "Správca vlastných smajlíkov"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Je vyžadovaná aktivácia"
-
 msgid "Select Buddy Icon"
 msgstr "Vybrať ikonu priateľa"
 
@@ -14966,8 +14964,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..."
@@ -15167,9 +15174,200 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Odosielanie a prijímanie nespracovaných XMPP slôh."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
+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."
+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 "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."
@@ -15366,9 +15564,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)."
 
@@ -15929,7 +16124,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."
@@ -15944,14 +16139,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"
@@ -16384,8 +16579,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ť?"
diff --git a/po/sl.po b/po/sl.po
index 32b3bf2de6..55d8417e36 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-11 16:48+0100\n"
+"POT-Creation-Date: 2010-08-07 13:11-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"
 
@@ -659,7 +674,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 +706,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 +812,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 +1283,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 +1379,6 @@ msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Naziv"
 
@@ -1559,7 +1576,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 +1669,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,8 +1696,12 @@ 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."
 msgstr ""
@@ -1913,7 +1940,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"
 
@@ -3208,6 +3234,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"
 
@@ -3608,7 +3637,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 "
@@ -3814,14 +3843,6 @@ 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"
@@ -3853,6 +3874,19 @@ 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"
 
@@ -3860,6 +3894,39 @@ msgstr "Overovitev SASL ni uspela"
 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"
 
@@ -3923,6 +3990,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"
 
@@ -3937,10 +4005,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"
 
@@ -4156,12 +4228,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 "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."
 
@@ -4259,7 +4342,6 @@ msgstr "Strežnik ne podpira blokiranja"
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Razpoloženje"
 
@@ -4281,7 +4363,6 @@ msgstr "Za"
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#. 0
 msgid "None"
 msgstr "brez"
 
@@ -4295,14 +4376,18 @@ msgstr "Besedilo razpoloženja"
 msgid "Allow Buzz"
 msgstr "Dovoli stresanje"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Drugo ime"
+msgstr "Ime razpoloženja"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Komentar prijatelja"
+msgstr "Komentar razpoloženja"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Izvajalec/skladatelj"
 
@@ -4473,9 +4558,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"
 
@@ -4589,9 +4671,8 @@ msgstr "Izberite vir"
 msgid "Initiate Media"
 msgstr "Iniciiraj medij"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Ta protokol ne podpira klepetalnic."
+msgstr "Ta račun ne podpira PEP, razpoloženja ni mogoče nastaviti."
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
@@ -4646,9 +4727,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Izberite ustreznega uporabnika"
+msgstr "mood: Določite trenutno počutje uporabnika"
 
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
@@ -4730,13 +4810,13 @@ 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 ""
+msgstr "Manjkajoča glava toka XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Neujemanje različice XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Manjkajoči ID toka XMPP"
 
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
@@ -4814,32 +4894,26 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "arabsko"
+msgstr "Boječ"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Osramočen"
+msgstr "Osupel"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Supersploh"
+msgstr "Zaljubljen"
 
-#. 1
 msgid "Angry"
 msgstr "Jezen"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Prepovedani"
+msgstr "Vznejevoljen"
 
 msgid "Anxious"
 msgstr "Vznemirjen"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Jaz pošljem"
+msgstr "Vzburjen"
 
 msgid "Ashamed"
 msgstr "Osramočen"
@@ -4847,287 +4921,231 @@ msgstr "Osramočen"
 msgid "Bored"
 msgstr "Zdolgočasen"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Shrani"
+msgstr "Pogumen"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Področje"
+msgstr "Miren"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Pomenki"
+msgstr "Previden"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Krepko"
+msgstr "Zebe me"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Spor"
+msgstr "Zaupljiv"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Nadaljuj"
+msgstr "Zmešan"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Stik"
+msgstr "Globokomiseln"
 
-#, fuzzy
 msgid "Contented"
-msgstr "Povezano"
+msgstr "Zadovoljen"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Podjetje"
+msgstr "Razdražljiv"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Nor"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Ustvari"
+msgstr "Ustvarjalen"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Supersploh"
+msgstr "Radoveden"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Zavrnjeni"
+msgstr "Malosrčen"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Izbrisani"
+msgstr "Depresiven"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Povezava prekinjena."
+msgstr "Razočaran"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "V gnusu"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Onemogočeno"
+msgstr "Potrt"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Odpeto"
+msgstr "Raztresen"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "V zadregi"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Vznemirjen"
+msgstr "Nevoščljiv"
 
-#. 2
 msgid "Excited"
 msgstr "Razburjen"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Supersploh"
+msgstr "Spogledljiv"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Ime"
+msgstr "Frustriran"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Hvaležen"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Pridobivanje poteka ..."
+msgstr "Žalujoč"
 
-#. 3
 msgid "Grumpy"
 msgstr "Tečno"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Kraj"
+msgstr "Kriv"
 
-#. 4
 msgid "Happy"
 msgstr "Vesel"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Upajoč"
 
-#. 8
 msgid "Hot"
 msgstr "Vroče"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Ponižen"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Ponižan"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Jezen"
+msgstr "Lačen"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Prizadet"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Prevzet"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Zaljubljen"
+msgstr "Zgrožen"
 
 msgid "In love"
 msgstr "Zaljubljen"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "indonezijsko"
+msgstr "Razkačen"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Zanimanja"
+msgstr "Zavzet"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Povabljeni"
+msgstr "Omamljen"
 
-#. 6
 msgid "Invincible"
 msgstr "Nepremagljiv"
 
 msgid "Jealous"
 msgstr "Ljubosumen"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Opica"
+msgstr "Osamljen"
 
-#, fuzzy
 msgid "Lost"
-msgstr "najglasneje"
+msgstr "Izgubljen"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Srečko"
 
-#, fuzzy
 msgid "Mean"
-msgstr "nemško"
+msgstr "Zloben"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Razpoloženje"
+msgstr "Muhast"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Živčen"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Podrobno"
+msgstr "Neopredeljen"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Brez povezave"
+msgstr "Užaljen"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Razbesnel"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Predvajaj"
+msgstr "Razigran"
 
-#, fuzzy
 msgid "Proud"
-msgstr "glasno"
+msgstr "Ponosen"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Resnično ime"
+msgstr "Sproščen"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Prejeto"
+msgstr "Odleglo mi je"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Odstrani"
+msgstr "Skesan"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registriraj se"
+msgstr "Nemiren"
 
-#. 7
 msgid "Sad"
 msgstr "Žalosten"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "maratsko"
+msgstr "Sarkastičen"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Zadovoljen"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Supersploh"
+msgstr "Resen"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Zavrnjeno"
+msgstr "Ogorčen"
 
 msgid "Shy"
-msgstr ""
+msgstr "Sramežljiv"
 
-#. 9
 msgid "Sick"
 msgstr "Bolno"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Zaspan"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Hitrost"
+msgstr "Pod stresom"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Skladba"
+msgstr "Močan"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Presenečen"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Hvaležen"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Žejen"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Utrujen"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Podčrtano"
+msgstr "Nedoločen"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Pribij"
+msgstr "Šibak"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Zdolgočasen"
+msgstr "Zaskrbljen"
 
 msgid "Set User Nickname"
 msgstr "Nastavi uporabniški vzdevek"
@@ -5490,18 +5508,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"
 
@@ -5650,9 +5656,6 @@ msgstr "Obletnica"
 msgid "Work"
 msgstr "Službeno"
 
-msgid "Job Title"
-msgstr "Naziv službe"
-
 msgid "Company"
 msgstr "Podjetje"
 
@@ -5747,6 +5750,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"
 
@@ -5947,24 +5953,6 @@ msgstr "Ali želite izbrisati tega prijatelja tudi iz adresarja?"
 msgid "The username specified is invalid."
 msgstr "Navedeno uporabniško ime ni veljavno."
 
-#. 5
-msgid "In Love"
-msgstr "Zaljubljen"
-
-#. 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."
 
@@ -5977,8 +5965,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'."
@@ -5996,7 +5984,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"
 
@@ -6004,6 +5996,7 @@ msgid "Verify PIN"
 msgstr "Preveri PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Pojavno ime"
 
@@ -6030,10 +6023,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 ..."
@@ -6068,19 +6057,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"
@@ -6109,11 +6091,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."
@@ -6124,7 +6107,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"
 
@@ -6150,11 +6133,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")
@@ -6167,6 +6154,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."
@@ -6269,6 +6273,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"
 
@@ -6670,9 +6677,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"
 
@@ -6929,111 +6933,157 @@ msgstr ""
 "AOL ne dovoljuje, da bi se vaše pojavno ime overjalo prek tega spletnega "
 "mesta"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Napaka pri zahtevanju %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 "Cannot receive IM due to parental controls"
+msgstr "Sporočila ne morete prejeti zaradi starševskega nadzora"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "SMS ni mogoče poslati brez sprejetja pogojev"
+
+msgid "Cannot send SMS"
+msgstr "Ni mogoče poslati SMS-a"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "SMS-a v to državo ni mogoče poslati."
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "SMS ni mogoče poslati v neznano državo"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Računi bot ne morejo začeti klepetov"
+
+msgid "Bot account cannot IM this user"
+msgstr "Račun bot ne more klepetati s tem uporabnikom"
+
+msgid "Bot account reached IM limit"
+msgstr "Račun bot je dosegel številsko omejitev sporočil"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Račun bot je dosegel dnevno omejitev sporočil"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Račun bot je dosegel mesečno omejitev sporočil"
+
+msgid "Unable to receive offline messages"
+msgstr "Sporočil stanja nepovezanosti ni mogoče prejemati."
+
+msgid "Offline message store full"
+msgstr "Shramba sporočil ob nepovezanosti je polna"
+
+#, 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"
+
 msgid "Thinking"
-msgstr ""
+msgstr "Razmišlja"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "preneha tipkati"
+msgstr "Nakupujem"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Vprašalno pogovorno okno"
+msgstr "Vprašujoč"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Ostranjevanje"
+msgstr "Jem"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Igram igro"
+msgstr "Gledam film"
 
 msgid "Typing"
 msgstr "Tipka"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Nisem v pisarni"
+msgstr "V pisarni"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Se kopa"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Gleda TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Odloži"
+msgstr "Se zabavam"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Zaspan"
+msgstr "Spim"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Uporablja PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Prijatelji za klepet"
+msgstr "S prijatelji"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Na telefonu"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Ponavljajoč"
+msgstr "Deskam"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobilec"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Išče po spletu"
 
 msgid "At a party"
-msgstr ""
+msgstr "Na zabavi"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Na kavi"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Dvojčka"
+msgstr "Igram igrice"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Brska po spletu"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Skladba"
+msgstr "Kadim"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Delam"
+msgstr "Pišem"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Delam"
+msgstr "Pijem"
 
 msgid "Listening to music"
 msgstr "Posluša glasbo"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Pošiljanje"
+msgstr "Se učim"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Zanimanja"
+msgstr "Na stranišču"
 
 msgid "Received invalid data on connection with server"
 msgstr "Na povezavi s strežnikom prejeti neveljavni podatki"
@@ -7102,116 +7152,6 @@ msgstr ""
 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 "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"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "SMS ni mogoče poslati brez sprejetja pogojev"
-
-msgid "Cannot send SMS"
-msgstr "Ni mogoče poslati SMS-a"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "SMS-a v to državo ni mogoče poslati."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "SMS ni mogoče poslati v neznano državo"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Računi bot ne morejo začeti klepetov"
-
-msgid "Bot account cannot IM this user"
-msgstr "Račun bot ne more klepetati s tem uporabnikom"
-
-msgid "Bot account reached IM limit"
-msgstr "Račun bot je dosegel številsko omejitev sporočil"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Račun bot je dosegel dnevno omejitev sporočil"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Račun bot je dosegel mesečno omejitev sporočil"
-
-msgid "Unable to receive offline messages"
-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 "
@@ -7248,7 +7188,7 @@ msgid "Games"
 msgstr "Igre"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "Xtraz ICQ"
 
 msgid "Add-Ins"
 msgstr "Dodatki"
@@ -7316,23 +7256,18 @@ msgstr "Zaveden interneta"
 msgid "Invisible"
 msgstr "Neviden"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-pošta"
+msgstr "Zloben"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Poklic"
+msgstr "Depresija"
 
-#, fuzzy
 msgid "At home"
-msgstr "O meni"
+msgstr "Doma"
 
-#, fuzzy
 msgid "At work"
-msgstr "Omrežje"
+msgstr "Na delu"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "Na kosilu"
 
@@ -7585,29 +7520,9 @@ 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"
 
@@ -7884,9 +7799,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Kosilo"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7919,9 +7833,8 @@ msgstr "Dobi podatke AIM"
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Poizvedi o stanju"
+msgstr "Pridobi sporočilo o stanju X-status"
 
 msgid "End Direct IM Session"
 msgstr "Končaj sejo neposrednega sporočanja"
@@ -8049,6 +7962,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vodnar"
 
@@ -8331,6 +8313,10 @@ msgstr "Zahteva v teku"
 msgid "Admin"
 msgstr "Upravitelj"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Ime sobe"
+
 msgid "Notice"
 msgstr "Obvestilo"
 
@@ -9880,7 +9866,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"
@@ -10221,9 +10207,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"
 
@@ -10239,18 +10222,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 ..."
 
@@ -10317,6 +10294,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"
@@ -10374,8 +10359,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"
@@ -10395,6 +10380,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"
 
@@ -10648,7 +10642,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"
@@ -10755,8 +10749,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"
@@ -10782,6 +10776,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"
 
@@ -10848,9 +10846,8 @@ msgstr "Ne moti"
 msgid "Extended away"
 msgstr "Obsežneje odsoten"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Sprejemanje"
+msgstr "Razpoloženje"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11033,12 +11030,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"
@@ -11338,7 +11329,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"
@@ -11365,7 +11356,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"
@@ -11406,13 +11397,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Neznana vrsta vozlišča"
 
-#, fuzzy
 msgid "Please select your mood from the list"
 msgstr "Izberite svoje razpoloženje s seznama."
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Psevdonim (neobvezno)"
+msgstr "Sporočilo (neobvezno)"
 
 msgid "Edit User Mood"
 msgstr "Uredi razpoloženje uporabnika"
@@ -11495,9 +11484,8 @@ msgstr "/Orodja/_Nastavitve"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Orodja/Siste_mski dnevnik"
+msgstr "/Orodja/Nastavi _razpoloženje"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
@@ -11518,20 +11506,17 @@ msgstr "/Po_moč"
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Informacije o prijatelju"
+msgstr "/Pomoč/Podatki o _gradnji"
 
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Informacije o strežniku"
+msgstr "/Pomoč/Podatki o _razvijalcih"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Osebni podatki"
+msgstr "/Pomoč/Podatki o _prevajalcih"
 
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
@@ -11766,9 +11751,8 @@ msgstr "<PurpleMain>/Računi/"
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Nastavi razpoloženje ..."
+msgstr "Nastavi _razpoloženje ..."
 
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
@@ -11889,9 +11873,8 @@ msgstr "/Pogovor/Mediji/Zvočni\\/Video _klic"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Pogovor/_Pošlji datoteko ..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Pogovor/Informacije"
+msgstr "/Pogovor/Pridobi _pozornost"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
@@ -11974,9 +11957,8 @@ msgstr "/Pogovor/Mediji/Zvočni\\/Video klic"
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Pogovor/Informacije"
+msgstr "/Pogovor/Pridobi pozornost"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
@@ -12042,13 +12024,11 @@ msgstr "_Pošlji"
 msgid "0 people in room"
 msgstr "0 oseb v sobi"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Zapri ta zavihek"
+msgstr "Zapri iskalno vrstico"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Najdi"
+msgstr "Najdi:"
 
 #, c-format
 msgid "%d person in room"
@@ -12213,6 +12193,9 @@ msgstr "afrikansko"
 msgid "Arabic"
 msgstr "arabsko"
 
+msgid "Assamese"
+msgstr "asamsko"
+
 msgid "Belarusian Latin"
 msgstr "belorusko (latinica)"
 
@@ -12222,6 +12205,9 @@ msgstr "bolgarsko"
 msgid "Bengali"
 msgstr "bengalsko"
 
+msgid "Bengali-India"
+msgstr "bengalsko (Indija)"
+
 msgid "Bosnian"
 msgstr "bosansko"
 
@@ -12336,6 +12322,9 @@ msgstr "laoško"
 msgid "Macedonian"
 msgstr "makedonsko"
 
+msgid "Malayalam"
+msgstr "malajalamsko"
+
 msgid "Mongolian"
 msgstr "mongolsko"
 
@@ -12444,24 +12433,21 @@ msgstr "amharsko"
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12470,8 +12456,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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 />"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12481,25 +12471,25 @@ msgid ""
 "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 "About %s"
 msgstr "O programu %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Informacije o prijatelju"
+msgstr "Informacije o gradnji"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Informacije o prijatelju"
+msgstr "Podatki o gradnji %s"
 
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
@@ -12513,9 +12503,9 @@ msgstr "Upokojeni razvijalci"
 msgid "Retired Crazy Patch Writers"
 msgstr "Upokojeni nori pisci obližev"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Informacije o strežniku"
+msgstr "Podatki o razvijalcih %s"
 
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
@@ -12523,9 +12513,9 @@ msgstr "Trenutni prevajalci"
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Več informacij"
+msgstr "Podatki o prevajalcih %s"
 
 msgid "_Name"
 msgstr "_Ime"
@@ -12934,9 +12924,8 @@ msgstr "Vstavi sliko IM"
 msgid "Insert Smiley"
 msgstr "Vstavi smejčka"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Gumb Pošlji"
+msgstr "Pošlji pozornost"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Krepko</b>"
@@ -12984,7 +12973,7 @@ msgid "_Smile!"
 msgstr "_Nasmeh!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Pozor!"
 
 msgid "Log Deletion Failed"
 msgstr "Brisanje dnevnika ni uspelo"
@@ -13002,16 +12991,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?"
@@ -13117,11 +13106,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."
@@ -13926,10 +13915,6 @@ msgstr "Besedilo za bližnjico"
 msgid "Custom Smiley Manager"
 msgstr "Upravitelj smejčkov po meri"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Zahtevana aktivacija"
-
 msgid "Select Buddy Icon"
 msgstr "Izberite ikono prijatelja"
 
@@ -15067,8 +15052,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 ..."
@@ -15270,186 +15264,178 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Pošlijaj in sprejemaj surove vrstice XMPP."
 
 #. *  description
-#, fuzzy
 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 "Error creating conference."
-#~ msgstr "Napaka pri ustvarjanju konference."
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Vtičnice z vrati ni mogoče povezati: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Na vtičnici ni mogoče prisluhniti: %s"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
+#. $(^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 ""
+"$(^Name) je izdan pod licenco GPL. Ta licenca je tu na voljo le v "
+"informativne namene. $_CLICK"
 
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "Prijateljsko ime se spreminja preveč pogosto"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Več-platformsko orodje za vmesnike, ki ga uporablja Pidgin"
 
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "Ta račun Hotmail morda ni aktiven."
+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 "Profile URL"
-#~ msgstr "URL profila"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Temeljne datoteke in knjižnice za Pidgin"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Vtičnik za protokol MSN"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Ustvari izbiro Pidgin v meniju Start"
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s ni veljavna skupina."
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Ustvari bližnjico za Pidgin na namizju"
 
-#~ msgid "Unknown error."
-#~ msgstr "Neznana napaka."
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Simboli razhroščevanja (za poročanje o sesutjih)"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s na %s (%s)"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Namizje"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Uporabnika ni mogoče dodati na %s (%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 ""
+"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/"
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Ni mogoče blokirati uporabnika %s (%s)"
+#. $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/"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Uporabniku ni mogoče dovoliti na %s (%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 ""
+"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"
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "%s ni mogoče dodati, saj je vaš seznam prijateljev poln."
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Izvajalno okolje GTK+ (obvezno, če manjka)"
 
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s ni veljaven račun potnega lista."
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Lokalizacije"
 
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Storitev je trenutno nedosegljiva."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Naprej >"
 
-#~ msgid "Unable to rename group"
-#~ msgstr "Skupine ni mogoče preimenovati"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin - odjemalec za klepet (zahtevano)"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Skupine ni mogoče izbrisati"
+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+?"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s vas je dodal(a) na svoj seznam prijateljev."
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Tipke za bližnjice"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Bližnjice za zagon Pidgina"
 
-#~ 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\">Pogosto zastavljena vprašanja (ang.):</FONT> <A HREF="
-#~ "\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/"
-#~ "FAQ</A><BR/><BR/>"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Podpora preverjanja črkovanja"
 
-#~ 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>"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Začetni meni"
 
-#~ 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>"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Podpora preverjanja črkovanja.  (Za namestitev je potrebna spletna povezava)"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Informacije za razhroščevanje"
+msgid "The installer is already running."
+msgstr "Nameščanje že poteka."
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Neprepoznana vrsta datoteke\n"
-#~ "\n"
-#~ "Uporabljena bo privzeta vrednost PNG."
+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."
 
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Napaka pri shranjevanju slike\n"
-#~ "\n"
-#~ "%s"
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Upravljalnik URI"
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Datoteke '%s' ni mogoče odpreti: %s"
+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."
 
-#~ 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"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Obiščite spletno stran Pidgin"
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Vstavi vrstico <iq/>."
+msgid "You do not have permission to uninstall this application."
+msgstr "Za odstranitev programa nimate ustreznih pravic."
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Vstavi vrstico <presence/>."
+#~ msgid "The name you entered is invalid."
+#~ msgstr "Vneseno ime ni veljavno."
 
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Vstavi vrstico <message/>."
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Digitalno potrdilo še ni veljavno."
 
-#~ 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 "The nick name you entered is invalid."
+#~ msgstr "Vneseni vzdevek ni veljaven."
 
-#~ 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"
+#~ msgid "MXit Login Name"
+#~ msgstr "Prijavno ime MXit"
 
-#~ msgid "(Default)"
-#~ msgstr "(privzeto)"
+#~ msgid "Nick Name"
+#~ msgstr "Vzdevek"
 
-#~ msgid "Install Theme"
-#~ msgstr "Namesti temo"
-
-#~ msgid "Icon"
-#~ msgstr "Ikona"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "Uporabi pisavo dokumenta iz _teme"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Posredovalni strežnik in brskalnik"
-
-#~ msgid "Auto-away"
-#~ msgstr "Samodejna odsotnost"
-
-#~ msgid "Change _status to:"
-#~ msgstr "Spremeni _stanje v:"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaša mobilna številka ..."
 
 #, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
-#~ "Pidginu neznano."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Pošlji neposredna sporočila prek več protokolov"
+#~ msgid "Rate to host"
+#~ msgstr "Povabi na klepet"
 
-#~ msgid "_Start port:"
-#~ msgstr "_Začetna vrata:"
-
-#~ msgid "_End port:"
-#~ msgstr "_Končna vrata:"
-
-#~ msgid "_User:"
-#~ msgstr "_Uporabnik:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Nastavitve GTK+"
+#, 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 fc14f47bfd..c151213c18 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2009-12-29 11:27+0200\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -64,12 +65,24 @@ msgstr ""
 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"
 
@@ -801,7 +814,7 @@ msgstr "Ndal"
 msgid "Waiting for transfer to begin"
 msgstr "Po pritet të fillojë shpërngulja"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anuluar"
 
 msgid "Failed"
@@ -1286,6 +1299,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"
 
@@ -1379,7 +1395,6 @@ msgid "Saved Statuses"
 msgstr "Gjendje të Ruajtura"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titull"
 
@@ -1504,7 +1519,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 ""
@@ -1584,7 +1599,7 @@ msgstr "Kur merret mesazh me URL(ra), përdor TinyURL për kopjim më të lehtë
 msgid "Online"
 msgstr "I lidhur"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Jo i lidhur"
 
@@ -1683,6 +1698,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"
 
@@ -1702,8 +1723,10 @@ 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."
 msgstr "Dëshmia ka skaduar dhe nuk duhet marrë si e vlefshme."
@@ -1938,13 +1961,12 @@ msgstr "Procesi përgjegjës u mbyll pa iu përgjigjur kërkesës sonë"
 
 #, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr ""
+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"
 
@@ -3376,6 +3398,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"
 
@@ -3634,7 +3659,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"
@@ -4012,12 +4037,6 @@ 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ë "
@@ -4052,6 +4071,20 @@ 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"
 
@@ -4059,6 +4092,41 @@ msgstr "Mirëfilltësimi SASL dështoi"
 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 ""
 
@@ -4123,6 +4191,7 @@ msgid "Postal Code"
 msgstr "Kod Postal"
 
 #  Country
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Vend"
 
@@ -4137,10 +4206,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"
 
@@ -4367,12 +4440,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 "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."
 
@@ -4476,7 +4558,6 @@ msgstr "Shërbyesi nuk mbulon bblokime"
 msgid "Not Authorized"
 msgstr "I pa Autorizuar"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humor"
 
@@ -4498,7 +4579,6 @@ msgstr "Për"
 msgid "None (To pending)"
 msgstr "Askujt (Në pritje)"
 
-#. 0
 msgid "None"
 msgstr "Asnjë"
 
@@ -4512,14 +4592,18 @@ msgstr "Tekst Humori"
 msgid "Allow Buzz"
 msgstr "Lejo Buzz"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Emër i Mesit"
+msgstr "Emër Humori"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Koment Shoku"
+msgstr "Koment Humori"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Autor Melodie "
 
@@ -4691,9 +4775,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"
 
@@ -4810,9 +4891,8 @@ msgstr "Përzgjidhni Burim"
 msgid "Initiate Media"
 msgstr "Nis Media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Ky protokoll nuk mbulon dhoma fjalosjeje."
+msgstr "Llogaria nuk mbulon PEP, s'caktohet dot humori"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Formëso një dhomë fjalosjeje."
@@ -4868,9 +4948,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Përzgjidhni përdoruesin e duhur"
+msgstr "mood: Cakto humorin e tanishëm të përdoruesit"
 
 msgid "Extended Away"
 msgstr "Larguar e Zgjeruar"
@@ -4960,18 +5039,18 @@ msgstr "Gabim Mesazhi XMPP"
 msgid "(Code %s)"
 msgstr " (Kod %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "I pazoti të dërgojë mesazh: Mesazhi është shumë i madh."
+msgstr ""
+"Mesazhi përmban një emotikon të personalizuar shumë të madh për dërgim."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Rrëkesë XMPP i mungon titulli"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Mospërputhje Versioni XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Rrëkesë XMPP i mungon ID-ja"
 
 msgid "XML Parse error"
 msgstr "Gabim përtypjeje XML"
@@ -5050,32 +5129,26 @@ 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ë"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabe"
+msgstr "I frikësuar"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "I turpëruar"
+msgstr "I mahnitur"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "I lavdishëm"
+msgstr "I dashurueshëm"
 
-#. 1
 msgid "Angry"
 msgstr "I nxehur"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "I ndaluar"
+msgstr "I bezdisur"
 
 msgid "Anxious"
 msgstr "I merakosur"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Dërgoni"
+msgstr "I eksituar"
 
 msgid "Ashamed"
 msgstr "I turpëruar"
@@ -5083,292 +5156,236 @@ msgstr "I turpëruar"
 msgid "Bored"
 msgstr "I mërzitur"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Ruaj"
+msgstr "Trim"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Emër i vërtetë"
+msgstr "I qetë"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Fjalosje"
+msgstr "I matur"
 
-#, fuzzy
 msgid "Cold"
-msgstr "të Trasha"
+msgstr "I ftohtë"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Kundërshti"
+msgstr "Me vetëbesim"
 
 #  connect to the server
-#, fuzzy
 msgid "Confused"
-msgstr "Vazhdo"
+msgstr "Toruahumbur"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Kontakt"
+msgstr "Soditës"
 
-#, fuzzy
 msgid "Contented"
-msgstr "I lidhur"
+msgstr "I kënaqur"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Shoqëri"
+msgstr "Zevzek"
 
 msgid "Crazy"
-msgstr ""
+msgstr "I lojtur"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Krijo"
+msgstr "Krijues"
 
-#, fuzzy
 msgid "Curious"
-msgstr "I lavdishëm"
+msgstr "Kureshtar"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "U hodh poshtë"
+msgstr "I dëshpëruar"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "U Fshi"
+msgstr "I ligështuar"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "I shkëputur."
+msgstr "I zhgënjyer"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "I neveritur"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Çaktivizuar"
+msgstr "I tronditur"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Shkëputur"
+msgstr "I shpërqendruar"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "I turpëruar"
 
-#, fuzzy
 msgid "Envious"
-msgstr "I merakosur"
+msgstr "Ziliqar"
 
-#. 2
 msgid "Excited"
 msgstr "I eksituar"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "I lavdishëm"
+msgstr "Ndjellës"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Emër"
+msgstr ""
 
 msgid "Grateful"
-msgstr ""
+msgstr "Mirënjohës"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Po merret..."
+msgstr "I pikëlluar"
 
-#. 3
 msgid "Grumpy"
 msgstr "Gërnjarçe"
 
 #  City
-#, fuzzy
 msgid "Guilty"
-msgstr "Qytet"
+msgstr "Fajtor"
 
-#. 4
 msgid "Happy"
 msgstr "I lumtur"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Optimist"
 
-#. 8
 msgid "Hot"
 msgstr "Vapë"
 
 msgid "Humbled"
-msgstr ""
+msgstr "I përulur"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "I poshtëruar"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "I nxehur"
+msgstr "I uritur"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "I lënduar"
 
 msgid "Impressed"
 msgstr ""
 
-#, fuzzy
 msgid "In awe"
-msgstr "I dashuruar"
+msgstr "I mahnitur"
 
 msgid "In love"
 msgstr "I dashuruar"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indoneziane"
+msgstr "I zemëruar"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Interesa"
+msgstr "I interesuar"
 
 #  Invite
-#, fuzzy
 msgid "Intoxicated"
-msgstr "U ftua"
+msgstr "I helmuar"
 
-#. 6
 msgid "Invincible"
 msgstr "I pamposhtur"
 
 msgid "Jealous"
 msgstr "Xheloz"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Majmuni"
+msgstr "I vetmuar"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Më i forti"
+msgstr "I humbur"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Fatlum"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Gjermane"
+msgstr "Koprac"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Humor"
+msgstr "I zymtë"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nervoz"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Hollësi"
+msgstr "Asnjanës"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Jo i lidhur"
+msgstr "I fyer"
 
 msgid "Outraged"
-msgstr ""
+msgstr "I cënuar"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Luaj"
+msgstr "Lodrues"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Fort"
+msgstr "Krenar"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Emër i vërtetë"
+msgstr "I shlodhur"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Marrë"
+msgstr "I lehtësuar"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Hiqe"
+msgstr "Ndërgjegjebrerë"
 
 #  Register button
-#, fuzzy
 msgid "Restless"
-msgstr "Regjistrohuni"
+msgstr "I palodhur"
 
-#. 7
 msgid "Sad"
 msgstr "I trishtuar"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Gujarati"
+msgstr "Sarkastik"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "I kënaqur"
 
-#, fuzzy
 msgid "Serious"
-msgstr "I lavdishëm"
+msgstr "Serioz"
 
 #  Block button
-#, fuzzy
 msgid "Shocked"
-msgstr "Bllokuar"
+msgstr "I tronditur"
 
 msgid "Shy"
-msgstr ""
+msgstr "I turpshëm"
 
-#. 9
 msgid "Sick"
 msgstr "Sëmurë"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Përgjumësh"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Shpejtësi"
+msgstr ""
 
-#, fuzzy
 msgid "Strong"
-msgstr "Këngë"
+msgstr "I fortë"
 
 msgid "Surprised"
-msgstr ""
+msgstr "I befasuar"
 
 msgid "Thankful"
 msgstr ""
 
 msgid "Thirsty"
-msgstr ""
+msgstr "I etur"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Zjarr"
+msgstr "I lodhur"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "të Nënvizuara"
+msgstr "E papërcaktuar"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Qëlloje"
+msgstr "I dobët"
 
-#, fuzzy
 msgid "Worried"
-msgstr "I mërzitur"
+msgstr "I shqetësuar"
 
 msgid "Set User Nickname"
 msgstr "Caktoni Nofkë Përdoruesi"
@@ -5733,18 +5750,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"
 
@@ -5895,9 +5900,6 @@ msgstr "Përvjetor"
 msgid "Work"
 msgstr "Punë"
 
-msgid "Job Title"
-msgstr "Vend Pune"
-
 msgid "Company"
 msgstr "Shoqëri"
 
@@ -6006,6 +6008,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"
 
@@ -6195,25 +6201,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "I dashuruar"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Humori i Çastit"
-
-#. add all moods to list
-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 "The PIN you entered is invalid."
 msgstr "PIN-i që dhatë është i mangët."
 
@@ -6222,8 +6209,8 @@ msgstr "PIN-i që dhatë ka gjatësi të pavlefshme [4-10]."
 
 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]."
+"PIN-i që dhatë është i pavlefshëm. Do të duhej të përbëhej prej shifrash "
+"[0-9]."
 
 msgid "The two PINs you entered do not match."
 msgstr "Dy PIN-et që dhatë nuk përputhen."
@@ -6249,7 +6236,11 @@ 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
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6257,6 +6248,7 @@ msgid "Verify PIN"
 msgstr "Verifikoni PIN-in"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Emër në Ekran"
 
@@ -6283,10 +6275,6 @@ msgstr "Hëpëhrë nuk ka shfaqje sigle të mundshme"
 msgid "About"
 msgstr "Rreth"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Ndryshoni Humor..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Ndryshoni Profil..."
@@ -6328,19 +6316,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Po lidhet..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Nofka që dhatë është e mangët."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Emri që dhatë është i pavlefshëm."
 
 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"
-msgstr "Emër Hyrjeje MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Nofkë"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6370,12 +6355,14 @@ msgstr "Sesioni juaj ka skaduar. Ju lutem,, riprovoni më vonë."
 msgid "Invalid country selected. Please try again."
 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."
@@ -6390,7 +6377,7 @@ msgid "Security Code"
 msgstr "Kod Sigurie"
 
 #  if (js->protocol_options & CHANGE_PASSWORD) {
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Jepni Kodin e Sigurisë"
 
@@ -6417,11 +6404,17 @@ msgstr "Po ngarkohet menuja"
 msgid "Status Message"
 msgstr "Mesazh Gjendjeje"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "Mesazhe të Marrë"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Numër i Fshehur"
 
-msgid "Your Mobile Number..."
-msgstr "Numri i Celularit Tuaj..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "ID Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6435,6 +6428,28 @@ msgstr "Lidhu përmes HTTP-je"
 msgid "Enable splash-screen popup"
 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 "E kemi humbur lidhjen me MXit. Ju lutem,, rilidhuni."
@@ -6537,6 +6552,9 @@ msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Ndodhi një gabim lidhjeje te MXit. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "I dashuruar"
+
 msgid "Pending"
 msgstr "Në pritje"
 
@@ -6936,9 +6954,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"
 
@@ -7186,9 +7201,9 @@ msgstr "Vendndodhje shërbyesi"
 msgid "Server port"
 msgstr "Portë Shërbyesi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "U mor përgjigje e papritur prej %s"
+msgstr "U mor përgjigje e papritur prej %s: %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -7211,114 +7226,166 @@ 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 "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 ""
+msgstr "Duke u menduar"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Resht së shtypuri"
+msgstr "Duke bërë pazaret"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Dialog pyetje"
+msgstr ""
 
-#, fuzzy
 msgid "Eating"
-msgstr "Nr. faquesi"
+msgstr "Duke ngrënë"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Po luan një lojë"
+msgstr "Duke parë një film"
 
 msgid "Typing"
 msgstr "Shkrim"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Jo Në Zyrë"
+msgstr "Në zyrë"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Duke bërë banjë"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Duke parë TV"
 
 msgid "Having fun"
-msgstr ""
+msgstr "Duke u dëfryer"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Përgjumësh"
+msgstr "Duke fjetur"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Duke përdorur një PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Miq MA"
+msgstr "Në takim me shokët"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "Në Telefon"
+msgstr "Në telefon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "E ripërsëritshme"
+msgstr ""
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Telefon Celular"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Duke kërkuar në Web"
 
 msgid "At a party"
-msgstr ""
+msgstr "Në një mbrëmje"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Duke pirë Kafe"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Lojë Përdoruesi"
+msgstr "Duke luajtur"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Duke shfletuar në Web"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Këngë"
+msgstr "Duke tymosur"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Po punon"
+msgstr "Duke shkruajtur"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Po punon"
+msgstr "Duke pirë"
 
 msgid "Listening to music"
 msgstr "Dëgjim muzike"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Po dërgohet"
+msgstr "Duke mësuar"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Interesa"
+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"
@@ -7408,116 +7475,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 "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"
-
 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 "
@@ -7554,7 +7511,7 @@ msgid "Games"
 msgstr "Lojra"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Shtesa"
@@ -7622,25 +7579,20 @@ msgstr "Me Web-in  Parasysh"
 msgid "Invisible"
 msgstr "I padukshëm"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Email"
+msgstr ""
 
-#, fuzzy
 msgid "Depression"
-msgstr "Zanat"
+msgstr "Depresion"
 
-#, fuzzy
 msgid "At home"
-msgstr "Rreth meje"
+msgstr "Në shtëpi"
 
-#, fuzzy
 msgid "At work"
-msgstr "Rrjet"
+msgstr "Në punë"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Jashtë Për Drekë"
+msgstr "Për drekë"
 
 msgid "IP Address"
 msgstr "Vendndodhje IP"
@@ -7881,33 +7833,10 @@ 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?
-#, 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"
-
 #, 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"
 
@@ -8177,9 +8106,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Lidhje për te iTunes Music Store"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "\"Finch\""
+msgstr "Drekë"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -8212,9 +8140,8 @@ msgstr "Merr Të dhëna AIM"
 msgid "Edit Buddy Comment"
 msgstr "Përpuno Koment Shoku"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Ki Mszh Gjendjeje"
+msgstr "Merr Mesazh X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Përfundo Sesionin e Drejtpërdrejtë MA"
@@ -8342,6 +8269,75 @@ msgstr ""
 "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"
+
 msgid "Aquarius"
 msgstr "Ujori"
 
@@ -8629,6 +8625,10 @@ msgstr "Kërkesë"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Titull Dhome"
+
 msgid "Notice"
 msgstr "Njofto"
 
@@ -10592,9 +10592,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"
 
@@ -10610,18 +10607,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ë..."
 
@@ -10700,6 +10692,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"
@@ -10711,8 +10712,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"
@@ -10780,6 +10781,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"
 
@@ -11182,6 +11196,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"
 
@@ -11248,9 +11266,8 @@ msgstr "Mos më bezdis"
 msgid "Extended away"
 msgstr "Largim i zgjeruar"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Po merret"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11421,12 +11438,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"
@@ -11800,13 +11811,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Lloj i panjohur nyjeje"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Ju lutem, përzgjidhni  prej listës humorin tuaj."
+msgstr "Ju lutem, përzgjidhni  prej listës humorin tuaj"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (opsional)"
+msgstr "Mesazh (opsional)"
 
 msgid "Edit User Mood"
 msgstr "Përpunoni Humor Përdoruesi"
@@ -11892,9 +11901,8 @@ msgstr "/Mjete/Par_apëlqime"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Mjete/Vetës_i"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Mjete/_Regjistrime Sistemi"
+msgstr "/Mjete/Caktoji _Humorin"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Mjete/Shpërngulje _Kartelash"
@@ -11916,20 +11924,17 @@ msgid "/Help/Online _Help"
 msgstr "/Ndihmë/Ndihmë Online"
 
 #  res[0] == username
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Të dhëna Shoku"
+msgstr "/Ndihmë/Të dhëna _Montimi"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ndihmë/Dritare _Debug"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Të dhëna Shërbyesi"
+msgstr "/Ndihmë/Të dhëna _Zhvilluesi"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Të dhëna Vetjake"
+msgstr "/Ndihmë/Të dhëna _Përkthyesi"
 
 msgid "/Help/_About"
 msgstr "/Ndihmë/_Rreth"
@@ -12159,9 +12164,8 @@ msgstr "<PurpleMain>/Llogarira/"
 msgid "_Edit Account"
 msgstr "_Përpunoni Llogari"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Caktoni Humor..."
+msgstr "Caktoji _Humorin..."
 
 msgid "No actions available"
 msgstr "Pa veprime të mundshëm"
@@ -12285,9 +12289,8 @@ msgstr "/Bashkëbisedim/Media/Audio\\/_Thirrje Video"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Bashkëbisedim/Dë_rgo Kartelë..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Bashkëbisedim/Ki Të dhëna"
+msgstr "/Bashkëbisedim/Tërhiqi _Vëmendjen"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Bashkëbisedim/Shto _Cytje Shoku..."
@@ -12373,9 +12376,8 @@ msgstr "/Bashkëbisedim/Media/Audio\\/Thirrje Video"
 msgid "/Conversation/Send File..."
 msgstr "/Bashkëbisedim/Dërgo Kartelë..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Bashkëbisedim/Ki Të dhëna"
+msgstr "/Bashkëbisedim/Tërhiqi Vëmendjen"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Bashkëbisedim/Shto Cytje Shoku..."
@@ -12442,13 +12444,11 @@ msgstr "_Dërgo"
 msgid "0 people in room"
 msgstr "0 vetë në dhomë"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Mbylle këtë skedë"
+msgstr "Mbylle shtyllën Gjej"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Gjej"
+msgstr "Gjej:"
 
 #  Setup the label telling how many people are in the room.
 #, c-format
@@ -12612,6 +12612,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabe"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "I turpëruar"
+
 msgid "Belarusian Latin"
 msgstr "Bjelloruse Latine"
 
@@ -12621,6 +12625,9 @@ msgstr "Bulgare"
 msgid "Bengali"
 msgstr "Bengali"
 
+msgid "Bengali-India"
+msgstr "Bengali-India"
+
 msgid "Bosnian"
 msgstr "Boshnjake"
 
@@ -12735,12 +12742,15 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Maqedone"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malaje"
+
 msgid "Mongolian"
 msgstr "Mongole"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
+msgstr "Marati"
 
 msgid "Malay"
 msgstr "Malaje"
@@ -12760,9 +12770,8 @@ msgstr "Norvegjeze Nynorsk"
 msgid "Occitan"
 msgstr "Oçitane"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Orija"
 
 msgid "Punjabi"
 msgstr "Panxhabe"
@@ -12845,25 +12854,22 @@ msgstr "Amharike"
 msgid "Lithuanian"
 msgstr "Lituaneze"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12872,8 +12878,12 @@ msgid ""
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<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>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12883,28 +12893,27 @@ msgid ""
 "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 "About %s"
 msgstr "Rreth %s"
 
 #  res[0] == username
-#, fuzzy
 msgid "Build Information"
-msgstr "Të dhëna Shoku"
+msgstr "Të dhëna Montimi"
 
 #  res[0] == username
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Të dhëna Shoku"
+msgstr ""
 
 msgid "Current Developers"
 msgstr "Zhvilluesa Veprues"
@@ -12918,9 +12927,9 @@ msgstr "Zhvilluesa Jo më Veprues"
 msgid "Retired Crazy Patch Writers"
 msgstr "Krijues të Lojtur Arnash në Pension"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Të dhëna Shërbyesi"
+msgstr "Të dhëna Zhvilluesi %s"
 
 msgid "Current Translators"
 msgstr "Përkthyesa të Çastit"
@@ -12928,9 +12937,9 @@ msgstr "Përkthyesa të Çastit"
 msgid "Past Translators"
 msgstr "Përkthyesa të Dikurshëm"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Më Tepër të Dhëna"
+msgstr "Të dhëna Përkthyesi %s"
 
 msgid "_Name"
 msgstr "_Emër"
@@ -13342,9 +13351,8 @@ msgstr "Fut Figurë MA"
 msgid "Insert Smiley"
 msgstr "Fut Zgërdhimje"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Buton Dërgimi"
+msgstr "Jepi Vëmendje"
 
 #  put a link to the actual profile URL
 msgid "<b>_Bold</b>"
@@ -13395,7 +13403,7 @@ msgid "_Smile!"
 msgstr "Buzëqesh!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Kujdes!"
 
 msgid "Log Deletion Failed"
 msgstr "Dështoi Fshirja e Regjistrit"
@@ -13413,16 +13421,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?"
@@ -13529,10 +13537,11 @@ msgstr ""
 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
@@ -14343,10 +14352,6 @@ msgstr "Tekst Shkurtoreje"
 msgid "Custom Smiley Manager"
 msgstr "Përgjegjës Emotikonesh Vetjake"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Lypset aktivizim"
-
 msgid "Select Buddy Icon"
 msgstr "Përzgjidhni Ikonë Shoku"
 
@@ -14490,9 +14495,8 @@ msgstr "_Luaj një Tingull"
 msgid "_Save File"
 msgstr "_Ruaje Kartelën"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "jeni të sigurtë se doni të fshini %s?"
+msgstr "Doni vërtet të pastrohet?"
 
 msgid "Select color"
 msgstr "Përzgjidhni ngjyrë"
@@ -15648,8 +15652,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ë..."
@@ -15865,11 +15878,181 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Dërgo dhe prano stanza XMPP të papërpunuara."
 
 #. *  description
-#, fuzzy
 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."
+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 "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."
 
@@ -15879,6 +16062,12 @@ msgstr ""
 #~ 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!"
 
@@ -15944,12 +16133,20 @@ msgstr ""
 #~ 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 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 "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"
@@ -16010,6 +16207,13 @@ msgstr ""
 #~ 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 ""
@@ -16056,9 +16260,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ë)."
 
diff --git a/po/sr.po b/po/sr.po
index 26b8cc9fb4..474cfc09f1 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "Обавештења о новој е-пошти"
 
@@ -778,7 +791,7 @@ msgstr "Заустави"
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да пренос почне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажи"
 
 msgid "Failed"
@@ -1248,6 +1261,10 @@ msgstr "Остали су гласнији тренутно у ћаскању"
 msgid "Someone says your username in chat"
 msgstr "Неко је рекао ваше име у ћаскању"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна је активација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer пад"
 
@@ -1341,7 +1358,6 @@ msgid "Saved Statuses"
 msgstr "Сачувана стања"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Титула"
 
@@ -1535,7 +1551,7 @@ msgstr ""
 msgid "Online"
 msgstr "На вези"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Неповезан"
 
@@ -1628,6 +1644,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 "Непознато"
 
@@ -1647,9 +1671,10 @@ 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."
@@ -1893,7 +1918,6 @@ msgstr "Грешка pri решавању %s: %d"
 msgid "Thread creation failure: %s"
 msgstr "Неуспело прављење нити: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
@@ -3153,6 +3177,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 "Име"
 
@@ -3765,14 +3792,6 @@ 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 ""
 "Сервер захтева слање лозинке у обичном тексту преко везе која није шифрована."
@@ -3806,6 +3825,19 @@ 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 "Неуспешна идентификација"
 
@@ -3814,6 +3846,42 @@ msgid "SASL error: %s"
 msgstr "САСЛ грешка"
 
 #, 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 "Подешавање није успело"
 
@@ -3888,6 +3956,7 @@ msgstr "Област"
 msgid "Postal Code"
 msgstr "Поштански број"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Држава"
 
@@ -3902,12 +3971,16 @@ msgstr "Назив организације"
 msgid "Organization Unit"
 msgstr "Одељење у организацији"
 
+msgid "Job Title"
+msgstr "Титула"
+
 # „радно место‟ у организацији?
 # Улога је званични термин и у УМЛ-у, прим. прев.
 msgid "Role"
 msgstr "Улога"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -4137,12 +4210,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 "Invalid XMPP ID"
 msgstr "Неисправна Џабер адреса"
 
+#, fuzzy
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr "Неисправна Џабер адреса. Морате унети домен."
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Неисправна Џабер адреса. Морате унети домен."
 
@@ -4240,7 +4325,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Неовлашћен"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Расположење"
 
@@ -4262,7 +4346,6 @@ msgstr "За"
 msgid "None (To pending)"
 msgstr "Ниједан (чекање)"
 
-#. 0
 msgid "None"
 msgstr "Ништа"
 
@@ -4289,6 +4372,12 @@ msgstr "Средње име"
 msgid "Mood Comment"
 msgstr "Примедба за другара:"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Извођач мелодије"
 
@@ -4459,9 +4548,6 @@ msgstr "Прекорачење овлашћења"
 msgid "Remote Connection Failed"
 msgstr "Удаљена веза неуспешна"
 
-msgid "Resource Constraint"
-msgstr "Ограничење ресурса"
-
 msgid "Restricted XML"
 msgstr "Ограничени XML"
 
@@ -4816,7 +4902,6 @@ msgstr "Стидан"
 msgid "Amorous"
 msgstr "Величанствено"
 
-#. 1
 msgid "Angry"
 msgstr "Љут"
 
@@ -4914,7 +4999,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Нервозан"
 
-#. 2
 msgid "Excited"
 msgstr "Узбуђен"
 
@@ -4933,7 +5017,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Достављам..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
@@ -4942,14 +5025,12 @@ msgstr "Група"
 msgid "Guilty"
 msgstr "Град"
 
-#. 4
 msgid "Happy"
 msgstr "Срећан"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Сервер:"
@@ -4990,7 +5071,6 @@ msgstr "Интересовања"
 msgid "Intoxicated"
 msgstr "Позови"
 
-#. 6
 msgid "Invincible"
 msgstr "Непобедив"
 
@@ -5054,7 +5134,6 @@ msgstr "Уклони"
 msgid "Restless"
 msgstr "Региструј се"
 
-#. 7
 msgid "Sad"
 msgstr "Тужан"
 
@@ -5075,12 +5154,10 @@ msgstr "Забрањен"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Надимак"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Поспан"
@@ -5485,18 +5562,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 "Назив игре"
 
@@ -5647,9 +5712,6 @@ msgstr "Годишњица"
 msgid "Work"
 msgstr "Посао"
 
-msgid "Job Title"
-msgstr "Титула"
-
 msgid "Company"
 msgstr "Предузеће"
 
@@ -5738,6 +5800,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: потапшај другара да би привукао његову пажњу"
 
@@ -5942,28 +6008,6 @@ msgstr "Да ли желите да обришете овог другара и
 msgid "The username specified is invalid."
 msgstr "Унето корисничко име је неисправно."
 
-#. 5
-msgid "In Love"
-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 кључ је неисправан."
@@ -6000,7 +6044,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 "Кориснички број"
@@ -6009,6 +6057,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -6039,11 +6088,6 @@ msgstr ""
 msgid "About"
 msgstr "О мени"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Промени лозинку..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6087,7 +6131,7 @@ msgid "Connecting..."
 msgstr "Успостављање везе"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Унети SecurID кључ је неисправан."
 
 #, fuzzy
@@ -6095,14 +6139,9 @@ 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"
@@ -6131,10 +6170,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
@@ -6148,7 +6187,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Безбедност укључена"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Унесите код"
@@ -6181,18 +6220,23 @@ msgstr "Повезујем се"
 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")
@@ -6207,6 +6251,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 ""
@@ -6328,6 +6394,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Заљубљен"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Шаљем"
@@ -6731,9 +6800,6 @@ msgstr "Лозинка је истекла"
 msgid "Incorrect password"
 msgstr "Неисправна лозинка"
 
-msgid "User not found"
-msgstr "Корисник није пронађен"
-
 msgid "Account has been disabled"
 msgstr "Налог је искључен"
 
@@ -6988,12 +7054,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+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 ""
+
+#, 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 "Порука ван мреже"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7159,120 +7290,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 "Превазиђени 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 "Не док је на АОЛ-у"
-
-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 "
@@ -7637,29 +7654,10 @@ 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 "На вези од"
 
@@ -8101,6 +8099,75 @@ 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 "Не док је на АОЛ-у"
+
 msgid "Aquarius"
 msgstr "Водолија"
 
@@ -8390,6 +8457,11 @@ msgstr "Захтевам"
 msgid "Admin"
 msgstr "Администратор"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Списак соба"
+
 msgid "Notice"
 msgstr "Објава"
 
@@ -10294,9 +10366,6 @@ msgstr "Јаху ИБ..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Додатак за Јаху протокол"
 
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
 msgid "Pager port"
 msgstr "Порт за пејџер"
 
@@ -10312,18 +10381,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 "Јаху ИБ..."
@@ -10393,6 +10456,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"
@@ -10472,6 +10542,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 "Нисам код куће"
 
@@ -10854,6 +10935,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 "П_рихвати"
 
@@ -11104,12 +11189,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 "Избори пријава"
@@ -11225,8 +11304,8 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>Добродошли у %s!</span>\n"
 "\n"
-"Још увек немате подешених налога за брзе поруке. Да би почели повезивање са %"
-"s изаберите дугме <b>Додај...</b> и подесите ваш први налог. Уколико желите "
+"Још увек немате подешених налога за брзе поруке. Да би почели повезивање са "
+"%s изаберите дугме <b>Додај...</b> и подесите ваш први налог. Уколико желите "
 "да се %s повеже на више налога за брзие поруке, идите поново на <b>Додај...</"
 "b> и подесите налоге.\n"
 "\n"
@@ -12310,6 +12389,10 @@ msgstr "афрички"
 msgid "Arabic"
 msgstr "арапски"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Стидан"
+
 msgid "Belarusian Latin"
 msgstr "белоруски латиница"
 
@@ -12319,6 +12402,10 @@ msgstr "бугарски"
 msgid "Bengali"
 msgstr "бенгалски"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "бенгалски"
+
 msgid "Bosnian"
 msgstr "босански"
 
@@ -12435,6 +12522,10 @@ msgstr "лао"
 msgid "Macedonian"
 msgstr "македонски"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Мушки"
+
 msgid "Mongolian"
 msgstr "монголски"
 
@@ -12553,8 +12644,8 @@ msgid ""
 "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>"
+"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, Новел "
@@ -13103,16 +13194,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?"
@@ -13211,10 +13302,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
@@ -14056,10 +14147,6 @@ msgid "Custom Smiley Manager"
 msgstr "Уређивање произвољних смешака"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Потребна је активација"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Изабери другара"
 
@@ -15228,8 +15315,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..."
@@ -15442,6 +15541,203 @@ 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."
+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 ""
+
+#, 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 "Грешка при успостављању везе"
@@ -15612,9 +15908,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Корисник:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ГТК+ библиотека издање"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Рачунам..."
@@ -16160,7 +16453,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."
@@ -16286,8 +16579,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 aed8cbd8a3..22d8547ed2 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -779,7 +792,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 +1263,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 +1360,6 @@ msgid "Saved Statuses"
 msgstr "Sačuvana stanja"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titula"
 
@@ -1537,7 +1553,7 @@ msgstr ""
 msgid "Online"
 msgstr "Na vezi"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Nepovezan"
 
@@ -1630,6 +1646,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"
 
@@ -1649,9 +1673,10 @@ 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."
@@ -1895,7 +1920,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"
 
@@ -3157,6 +3181,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"
 
@@ -3769,14 +3796,6 @@ 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 "
@@ -3811,6 +3830,20 @@ 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"
 
@@ -3819,6 +3852,42 @@ msgid "SASL error: %s"
 msgstr "SASL greška"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Pogrešan ulazni uslov"
+
+#, 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"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Nepodržano kodiranje"
+
+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"
 
@@ -3893,6 +3962,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"
 
@@ -3907,12 +3977,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"
 
@@ -4142,12 +4216,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 "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."
 
@@ -4245,7 +4331,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Neovlašćen"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -4267,7 +4352,6 @@ msgstr "Za"
 msgid "None (To pending)"
 msgstr "Nijedan (čekanje)"
 
-#. 0
 msgid "None"
 msgstr "Ništa"
 
@@ -4294,6 +4378,12 @@ msgstr "Srednje ime"
 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"
 
@@ -4464,9 +4554,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"
 
@@ -4823,7 +4910,6 @@ msgstr "Stidan"
 msgid "Amorous"
 msgstr "Veličanstveno"
 
-#. 1
 msgid "Angry"
 msgstr "Ljut"
 
@@ -4921,7 +5007,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Nervozan"
 
-#. 2
 msgid "Excited"
 msgstr "Uzbuđen"
 
@@ -4940,7 +5025,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Dostavljam..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupa"
@@ -4949,14 +5033,12 @@ msgstr "Grupa"
 msgid "Guilty"
 msgstr "Grad"
 
-#. 4
 msgid "Happy"
 msgstr "Srećan"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Server:"
@@ -4997,7 +5079,6 @@ msgstr "Interesovanja"
 msgid "Intoxicated"
 msgstr "Pozovi"
 
-#. 6
 msgid "Invincible"
 msgstr "Nepobediv"
 
@@ -5061,7 +5142,6 @@ msgstr "Ukloni"
 msgid "Restless"
 msgstr "Registruj se"
 
-#. 7
 msgid "Sad"
 msgstr "Tužan"
 
@@ -5082,12 +5162,10 @@ msgstr "Zabranjen"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nadimak"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Pospan"
@@ -5492,18 +5570,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"
 
@@ -5654,9 +5720,6 @@ msgstr "Godišnjica"
 msgid "Work"
 msgstr "Posao"
 
-msgid "Job Title"
-msgstr "Titula"
-
 msgid "Company"
 msgstr "Preduzeće"
 
@@ -5745,6 +5808,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"
 
@@ -5949,28 +6016,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Zaljubljen"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Trenutno raspoloženje"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Uneti SecurID ključ je neispravan."
@@ -6007,7 +6052,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"
@@ -6016,6 +6065,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prezime"
@@ -6046,11 +6096,6 @@ msgstr ""
 msgid "About"
 msgstr "O meni"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Promeni lozinku..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6094,7 +6139,7 @@ msgid "Connecting..."
 msgstr "Uspostavljanje veze"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Uneti SecurID ključ je neispravan."
 
 #, fuzzy
@@ -6102,14 +6147,9 @@ 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"
@@ -6138,10 +6178,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
@@ -6155,7 +6195,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Bezbednost uključena"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Unesite kod"
@@ -6188,18 +6228,23 @@ msgstr "Povezujem se"
 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")
@@ -6214,6 +6259,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 ""
@@ -6335,6 +6402,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Zaljubljen"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Šaljem"
@@ -6738,9 +6808,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"
 
@@ -6996,12 +7063,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Greška u zahtevu tokena za prijavu"
+
 msgid "Could not join chat room"
 msgstr "Ne mogu da se povežem na pričaonicu"
 
 msgid "Invalid chat room name"
 msgstr "Neispravno ime pričaonice"
 
+msgid "Invalid error"
+msgstr "Neispravna greška (!!!)"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Ne mogu da pošaljem datoteku"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Ne mogu da pošaljem direktorijum."
+
+#. 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 "Ne mogu da pošaljem poruku."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Poruka van mreže"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7167,120 +7299,6 @@ msgstr ""
 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)"
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Ne mogu da pošaljem datoteku"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Ne mogu da pošaljem direktorijum."
-
-#. 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 "Ne mogu da pošaljem poruku."
-
-#, fuzzy
-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 "
@@ -7649,29 +7667,10 @@ 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"
 
@@ -8113,6 +8112,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vodolija"
 
@@ -8402,6 +8470,11 @@ msgstr "Zahtevam"
 msgid "Admin"
 msgstr "Administrator"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Spisak soba"
+
 msgid "Notice"
 msgstr "Objava"
 
@@ -10308,9 +10381,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"
 
@@ -10326,18 +10396,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..."
@@ -10407,6 +10471,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"
@@ -10486,6 +10557,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"
 
@@ -10869,6 +10951,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"
 
@@ -11119,12 +11205,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"
@@ -12325,6 +12405,10 @@ msgstr "afrički"
 msgid "Arabic"
 msgstr "arapski"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Stidan"
+
 msgid "Belarusian Latin"
 msgstr "beloruski latinica"
 
@@ -12334,6 +12418,10 @@ msgstr "bugarski"
 msgid "Bengali"
 msgstr "bengalski"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "bengalski"
+
 msgid "Bosnian"
 msgstr "bosanski"
 
@@ -12450,6 +12538,10 @@ msgstr "lao"
 msgid "Macedonian"
 msgstr "makedonski"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Muški"
+
 msgid "Mongolian"
 msgstr "mongolski"
 
@@ -12568,8 +12660,8 @@ msgid ""
 "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>"
+"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 "
@@ -13118,16 +13210,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?"
@@ -13226,10 +13318,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
@@ -14071,10 +14163,6 @@ msgid "Custom Smiley Manager"
 msgstr "Uređivanje proizvoljnih smešaka"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Potrebna je aktivacija"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Izaberi drugara"
 
@@ -15244,8 +15332,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..."
@@ -15459,6 +15559,203 @@ 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."
+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."
+
+#, 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"
@@ -15629,9 +15926,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Korisnik:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ biblioteka izdanje"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Računam..."
@@ -16177,7 +16471,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."
diff --git a/po/sv.po b/po/sv.po
index 4dea9b3e96..d287a4b414 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: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-01-13 13:48+0100\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -784,7 +797,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"
@@ -1253,6 +1266,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"
 
@@ -1346,7 +1363,6 @@ msgid "Saved Statuses"
 msgstr "Sparade statusar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Titel"
 
@@ -1547,7 +1563,7 @@ msgstr ""
 msgid "Online"
 msgstr "Ansluten"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Frånkopplad"
 
@@ -1640,6 +1656,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"
 
@@ -1660,8 +1682,10 @@ 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."
 msgstr "Certifikatet är för gammalt och bör inte anses giltigt."
@@ -1902,7 +1926,6 @@ msgstr "Fel vid konvertering av %s till punykod: %d"
 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"
 
@@ -3164,6 +3187,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,12 +3801,6 @@ 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"
 
@@ -3811,6 +3831,18 @@ 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"
 
@@ -3818,6 +3850,40 @@ msgstr "SASL Autentisering misslyckades"
 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"
 
@@ -3881,6 +3947,7 @@ msgstr "Region"
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3895,10 +3962,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"
 
@@ -4124,12 +4195,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 "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."
 
@@ -4226,7 +4306,6 @@ msgstr "Servern stödjer inte blockering"
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Humör"
 
@@ -4248,7 +4327,6 @@ msgstr "Till"
 msgid "None (To pending)"
 msgstr "Ingen (till väntande)"
 
-#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4262,14 +4340,18 @@ msgstr "Humörstext"
 msgid "Allow Buzz"
 msgstr "Tillåt Surr"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Andranamn"
+msgstr "Humörsnamn"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Kompiskommentar"
+msgstr "Humörskommentar"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "Låtartist"
 
@@ -4440,9 +4522,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"
 
@@ -4557,9 +4636,8 @@ msgstr "Välj en tillflykt"
 msgid "Initiate Media"
 msgstr "Påbörja Media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Protokollet stödjer inte chattrum."
+msgstr "Kontot stödjer inte PEP, kan inte ange ett humör"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
@@ -4617,9 +4695,8 @@ 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"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Välj rätt användare"
+msgstr "mood: anger användarens nuvarande humör"
 
 msgid "Extended Away"
 msgstr "Utökad frånvaro"
@@ -4697,18 +4774,17 @@ msgstr "XMPP meddelandefel"
 msgid "(Code %s)"
 msgstr "(Kod %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Kan inte skicka meddelandet: Det är för stort."
+msgstr "En egenvald smilie i meddelandet var för stor för att skickas."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP-strömhuvud saknas"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP-versioner matchar inte"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP-strömmen saknar ID"
 
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
@@ -4784,9 +4860,8 @@ 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"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabiska"
+msgstr "Rädd"
 
 #, fuzzy
 msgid "Amazed"
@@ -4796,13 +4871,11 @@ msgstr "Skäms"
 msgid "Amorous"
 msgstr "Strålande"
 
-#. 1
 msgid "Angry"
 msgstr "Arg"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Bannlyst"
+msgstr "Irriterad"
 
 msgid "Anxious"
 msgstr "Orolig"
@@ -4817,29 +4890,23 @@ msgstr "Skäms"
 msgid "Bored"
 msgstr "Uttråkad"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Spara"
+msgstr "Modig"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Kungarike"
+msgstr "Lugn"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Chattar"
+msgstr "Försiktig"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Fet"
+msgstr "Kall"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Konflikt"
+msgstr "Självsäker"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Fortsätt"
+msgstr "Förvirrad"
 
 #, fuzzy
 msgid "Contemplative"
@@ -4849,52 +4916,44 @@ msgstr "Kontakt"
 msgid "Contented"
 msgstr "Ansluten"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Företag"
+msgstr "Grinig"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Galen"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Skapa"
+msgstr "Kreativ"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Strålande"
+msgstr "Nyfiken"
 
 #, fuzzy
 msgid "Dejected"
 msgstr "Avslagen"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Borttagen"
+msgstr "Deprimerad"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Frånkopplad."
+msgstr "Besviken"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Äcklad"
 
 #, fuzzy
 msgid "Dismayed"
 msgstr "Avaktiverad"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Frånskild"
+msgstr "Distraherad"
 
 msgid "Embarrassed"
 msgstr ""
 
-#, fuzzy
 msgid "Envious"
-msgstr "Orolig"
+msgstr "Avundsjuk"
 
-#. 2
 msgid "Excited"
 msgstr "Upphetsad"
 
@@ -4902,33 +4961,27 @@ msgstr "Upphetsad"
 msgid "Flirtatious"
 msgstr "Strålande"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Förnamn"
+msgstr "Frustrerad"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Tacksam"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Hämtar..."
+msgstr "Sörjer"
 
-#. 3
 msgid "Grumpy"
 msgstr "Tjurig"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Stad"
+msgstr "Skyldig"
 
-#. 4
 msgid "Happy"
 msgstr "Glad"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Hoppfull"
 
-#. 8
 msgid "Hot"
 msgstr "Het"
 
@@ -4936,18 +4989,16 @@ msgid "Humbled"
 msgstr ""
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Förnedrad"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Arg"
+msgstr "Hungrig"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Sårad"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Imponerad"
 
 #, fuzzy
 msgid "In awe"
@@ -4960,143 +5011,118 @@ msgstr "Kär"
 msgid "Indignant"
 msgstr "Indonesiska"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Intressen"
+msgstr "Intresserad"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Inbjuden"
+msgstr "Full"
 
-#. 6
 msgid "Invincible"
 msgstr "Osårbar"
 
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Apa"
+msgstr "Ensam"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Högst"
+msgstr "Förlorad"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Tursam"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Tyska"
+msgstr "Elak"
 
 #, fuzzy
 msgid "Moody"
 msgstr "Humör"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Nevös"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Detaljer"
+msgstr "Neutral"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Frånkopplad"
+msgstr "Stött"
 
 msgid "Outraged"
 msgstr ""
 
-#, fuzzy
 msgid "Playful"
-msgstr "Spela upp"
+msgstr "Lekfull"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Högt"
+msgstr "Stolt"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Fullständigt namn"
+msgstr "Avslappnad"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Mottaget"
+msgstr "Lättad"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Ta bort"
+msgstr "Ångerfull"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Registrera"
+msgstr "Rastlös"
 
-#. 7
 msgid "Sad"
 msgstr "Ledsen"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarkastisk"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Tillfreds"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Strålande"
+msgstr "Seriös"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Blockerad"
+msgstr "Shockad"
 
 msgid "Shy"
-msgstr ""
+msgstr "Blyg"
 
-#. 9
 msgid "Sick"
 msgstr "Sjuk"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sömnig"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Spontan"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Hastighet:"
+msgstr "Stressad"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Sång"
+msgstr "Stark"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Överraskad"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Tacksam"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Törstig"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Trött"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Understruken"
+msgstr "Odefenierad"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Banka på"
+msgstr "Svag"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Uttråkad"
+msgstr "Oroad"
 
 msgid "Set User Nickname"
 msgstr "Sätt användarsmeknamn"
@@ -5463,18 +5489,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"
 
@@ -5624,9 +5638,6 @@ msgstr "Högtid"
 msgid "Work"
 msgstr "Arbete"
 
-msgid "Job Title"
-msgstr "Jobbtitel"
-
 msgid "Company"
 msgstr "Företag"
 
@@ -5714,6 +5725,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"
 
@@ -5908,24 +5922,6 @@ 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."
 
-#. 5
-msgid "In Love"
-msgstr "Kär"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Nuvarande humör"
-
-#. add all moods to list
-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 "The PIN you entered is invalid."
 msgstr "Det PIN du uppgav är felaktigt."
 
@@ -5957,7 +5953,12 @@ msgstr "Profil"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Din profilinformation har inte hämtats än. Var god försök igen senare."
 
+#, fuzzy
+msgid "Your UID"
+msgstr "Din MXitID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5965,6 +5966,7 @@ msgid "Verify PIN"
 msgstr "Verifiera PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visningsnamn"
 
@@ -5991,10 +5993,6 @@ msgstr "Det finns för närvarande ingen Splash-skärm tillgänglig"
 msgid "About"
 msgstr "Om"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Ändra humör..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Ändra profil..."
@@ -6029,19 +6027,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Smeknamnet du uppgav är ogiltigt."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Namnet är ogiltigt."
 
 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"
-msgstr "MXit loginnamn"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Smeknamn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6070,10 +6065,12 @@ msgstr "Din session har gått ut. Försök igen senare."
 msgid "Invalid country selected. Please try again."
 msgstr "Ogiltigt land uppgivet. Försök igen senare."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Användarnamnet är inte registrerat. Registrera dig först."
 
-msgid "Username is already registered. Please choose another username."
+#, 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."
@@ -6085,7 +6082,7 @@ msgstr "Du angav inte säkerhetskoden"
 msgid "Security Code"
 msgstr "Säkerhetskod"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Ange säkerhetskod"
 
@@ -6111,11 +6108,16 @@ msgstr "Laddar meny..."
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
+msgid "Rejection Message"
+msgstr "Avslagsmeddelande"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Dolt nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ditt mobilnummer..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Din MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6128,6 +6130,25 @@ msgstr "Anslut via HTTP"
 msgid "Enable splash-screen popup"
 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 "Vi har tappat uppkopplingen till MXit. Var god anslut igen."
@@ -6233,6 +6254,9 @@ msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Ett anslutningsproblem uppstod till MXit. (läsläge 0x06)"
 
+msgid "In Love"
+msgstr "Kär"
+
 msgid "Pending"
 msgstr "Väntar"
 
@@ -6633,9 +6657,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"
 
@@ -6862,9 +6883,9 @@ msgstr "Serveradress"
 msgid "Server port"
 msgstr "Serverport"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Mottog oväntat svar från %s"
+msgstr "Mottog oväntat svar från %s; %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6887,115 +6908,162 @@ 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 "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 ""
+msgstr "Tänker"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Slutar skriva"
+msgstr "Handlar"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Förfrågningsdialog"
+msgstr "Ifrågasätter"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Sökare"
+msgstr "Äter"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Spelar ett spel"
+msgstr "Tittar på film"
 
 msgid "Typing"
 msgstr "Skriver"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Inte på kontoret"
+msgstr "På kontoret"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Tar ett bad"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Tittar på TV"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "La på"
+msgstr "Har roligt"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Sömnig"
+msgstr "Sover"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Använder en PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Snabbmeddelandevänner"
+msgstr "Möter vänner"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Pratar i telefon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Återkommande"
+msgstr "Surfar"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Söker på webben"
 
 msgid "At a party"
-msgstr ""
+msgstr "På fest"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Dricker kaffe"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Användarspelning"
+msgstr "Spelar"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Surfar på webben"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Sång"
+msgstr "Röker"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Arbetar"
+msgstr "Skriver"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Arbetar"
+msgstr "Dricker"
 
 msgid "Listening to music"
 msgstr "Lyssnar på musik"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Skickar"
+msgstr "Studerar"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Intressen"
+msgstr "På toa"
 
 msgid "Received invalid data on connection with server"
 msgstr "Tog emot felaktig data vid anslutning till server"
@@ -7064,116 +7132,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 "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"
-
 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 "
@@ -7210,7 +7168,7 @@ msgid "Games"
 msgstr "Spel"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Lägg till"
@@ -7278,23 +7236,18 @@ msgstr "Webbmedveten"
 msgid "Invisible"
 msgstr "Osynlig"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-post"
+msgstr "Ond"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Yrke"
+msgstr "Depression"
 
-#, fuzzy
 msgid "At home"
-msgstr "Om mig"
+msgstr "Hemma"
 
-#, fuzzy
 msgid "At work"
-msgstr "Nätverk"
+msgstr "På jobbet"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "På lunch"
 
@@ -7533,28 +7486,9 @@ 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."
 
 #, 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"
-
-#, 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"
 
@@ -7821,9 +7755,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Lunch"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7857,9 +7790,8 @@ msgstr "Hämta AIM-info"
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Hämta statusmeddelande"
+msgstr "Hämta X-statusmeddelande"
 
 msgid "End Direct IM Session"
 msgstr "Avsluta direkt-IM session"
@@ -7987,6 +7919,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Vattumanen"
 
@@ -8269,6 +8270,10 @@ msgstr "Efterfrågar"
 msgid "Admin"
 msgstr "Admin"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Rumstitel"
+
 msgid "Notice"
 msgstr "Notering"
 
@@ -10170,9 +10175,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"
 
@@ -10188,18 +10190,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..."
 
@@ -10266,6 +10262,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"
@@ -10342,6 +10346,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"
 
@@ -10718,6 +10731,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"
 
@@ -10784,9 +10801,8 @@ msgstr "Stör inte"
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Tar emot"
+msgstr "Mår"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10885,8 +10901,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"
@@ -10958,12 +10974,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"
@@ -11331,13 +11341,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Okänd nodtyp"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Ange ditt humör från listan."
+msgstr "Ange ditt humör från listan"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Alias (valfritt)"
+msgstr "Meddelande (valfritt)"
 
 msgid "Edit User Mood"
 msgstr "Redigera användarhumör"
@@ -11420,9 +11428,8 @@ msgstr "/Verktyg/_Inställningar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Verktyg/Visa _systemlogg"
+msgstr "/Verktyg/Ange Hu_mör"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
@@ -11686,9 +11693,8 @@ msgstr "<PurpleMain>/Konton/"
 msgid "_Edit Account"
 msgstr "_Ändra konto"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Ange humör..."
+msgstr "Ange hu_mör..."
 
 msgid "No actions available"
 msgstr "Inga åtgärder tillgängliga"
@@ -11965,13 +11971,11 @@ msgstr "_Skicka"
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Stäng denna flik"
+msgstr "Stäng sökfält"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Sök"
+msgstr "Sök:"
 
 #, c-format
 msgid "%d person in room"
@@ -12140,6 +12144,10 @@ msgstr "Afrikaans"
 msgid "Arabic"
 msgstr "Arabiska"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Skäms"
+
 msgid "Belarusian Latin"
 msgstr "Vitryska Latin"
 
@@ -12149,6 +12157,10 @@ msgstr "Bulgariska"
 msgid "Bengali"
 msgstr "Bengali"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengali"
+
 msgid "Bosnian"
 msgstr "Bostniska"
 
@@ -12263,6 +12275,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Makedonska"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Malay"
+
 msgid "Mongolian"
 msgstr "Mongoliska"
 
@@ -12374,23 +12390,21 @@ msgstr "Amhariska"
 msgid "Lithuanian"
 msgstr "Lettländska"
 
-#, fuzzy, c-format
+#, 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>"
+"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 ""
@@ -12400,7 +12414,7 @@ msgid ""
 "im<BR><BR>"
 msgstr ""
 
-#, fuzzy, c-format
+#, 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/"
@@ -12410,25 +12424,25 @@ msgid ""
 "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 "About %s"
 msgstr "Om %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Information om kompis"
+msgstr "Bygg-information"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Information om kompis"
+msgstr "%s Bygg-information"
 
 msgid "Current Developers"
 msgstr "Nuvarande utvecklare"
@@ -12442,9 +12456,9 @@ msgstr "Före detta utvecklare"
 msgid "Retired Crazy Patch Writers"
 msgstr "Före detta galna patchskrivare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Serverinformation"
+msgstr "%s utvecklarinformation"
 
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
@@ -12452,9 +12466,9 @@ msgstr "Nuvarande översättare"
 msgid "Past Translators"
 msgstr "Före detta översättare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Mer information"
+msgstr "%s översättarinformation"
 
 msgid "_Name"
 msgstr "_Namn"
@@ -12933,16 +12947,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?"
@@ -13049,11 +13063,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."
@@ -13852,10 +13868,6 @@ msgstr "Genvägstext"
 msgid "Custom Smiley Manager"
 msgstr "Hanterare för egna smileys"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Registrering krävs"
-
 msgid "Select Buddy Icon"
 msgstr "Välj kompisikon"
 
@@ -13996,9 +14008,8 @@ msgstr "S_pela upp ljud"
 msgid "_Save File"
 msgstr "_Spara fil"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Är du säker på att du vill ta bort %s?"
+msgstr "Är du säker på att du vill rensa?"
 
 msgid "Select color"
 msgstr "Välj färg"
@@ -14992,8 +15003,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..."
@@ -15194,10 +15214,206 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "Skicka och ta emot råa XMPP strofer."
 
 #. *  description
-#, fuzzy
 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."
+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 "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."
 
@@ -15369,9 +15585,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..."
 
@@ -15922,7 +16135,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."
 
@@ -16002,8 +16215,8 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ "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"
diff --git a/po/sw.po b/po/sw.po
index 3a041dbd00..219cc08ecc 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -772,7 +784,7 @@ msgstr "&Simama"
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Imeghairishwa"
 
 msgid "Failed"
@@ -1249,6 +1261,10 @@ msgstr ""
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Uthibitisho unatakiwa"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1348,7 +1364,6 @@ msgid "Saved Statuses"
 msgstr ""
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Jina"
 
@@ -1545,7 +1560,7 @@ msgstr ""
 msgid "Online"
 msgstr "Nenda mkondoni"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1644,6 +1659,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"
 
@@ -1661,9 +1682,10 @@ 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."
 msgstr ""
@@ -1893,7 +1915,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"
@@ -3121,6 +3142,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"
@@ -3704,12 +3728,6 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3740,6 +3758,15 @@ 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"
@@ -3749,6 +3776,43 @@ msgid "SASL error: %s"
 msgstr "SSL Seva"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Jina la profaili ni batili"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Kivunge kisichokubaliwa"
+
+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 "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
 msgid "Unable to canonicalize username"
 msgstr "Haikuweza kuunganishwa"
 
@@ -3821,6 +3885,7 @@ msgstr "Reunion"
 msgid "Postal Code"
 msgstr ""
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 #, fuzzy
 msgid "Country"
 msgstr "Hesabu"
@@ -3838,10 +3903,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 ""
 
@@ -4076,6 +4146,12 @@ 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"
@@ -4084,6 +4160,9 @@ msgstr "Muunganiko umepita muda"
 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 ""
 
@@ -4188,7 +4267,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4212,7 +4290,6 @@ msgstr "Kwa:"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr "Bila"
 
@@ -4234,6 +4311,12 @@ 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 ""
 
@@ -4426,9 +4509,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr "Muunganiko salama umeshindikana"
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4769,7 +4849,6 @@ msgstr "Kiassame"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4864,7 +4943,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4882,7 +4960,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Hakuna Mpangilio"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Kusanya kwa:"
@@ -4890,14 +4967,12 @@ msgstr "Kusanya kwa:"
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "Mwenyeji:"
@@ -4935,7 +5010,6 @@ msgstr ""
 msgid "Intoxicated"
 msgstr "Kizuizi batili"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4998,7 +5072,6 @@ msgstr "Ondoa"
 msgid "Restless"
 msgstr "Mwandishi wa habari"
 
-#. 7
 #, fuzzy
 msgid "Sad"
 msgstr "Jm"
@@ -5019,12 +5092,10 @@ msgstr "Imezuiliwa"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Bofya"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5435,18 +5506,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"
@@ -5600,10 +5659,6 @@ msgstr "Universal"
 msgid "Work"
 msgstr ""
 
-#, fuzzy
-msgid "Job Title"
-msgstr "Cheo cha &kazi:"
-
 msgid "Company"
 msgstr ""
 
@@ -5692,6 +5747,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 ""
 
@@ -5866,27 +5925,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
-#. 5
-msgid "In Love"
-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"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "Badil &Nywila"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
@@ -5923,7 +5961,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"
@@ -5932,6 +5974,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Ukurasa wa kwanza"
@@ -5962,11 +6005,6 @@ msgstr ""
 msgid "About"
 msgstr "Kuhusu %S"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Badil &Nywila"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6003,7 +6041,7 @@ msgid "Connecting..."
 msgstr "Inaunganisha…"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
 #, fuzzy
@@ -6011,14 +6049,9 @@ 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 ""
@@ -6045,10 +6078,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."
@@ -6061,7 +6094,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Levo ya Usalama"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr ""
 
@@ -6093,10 +6126,15 @@ 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
@@ -6112,6 +6150,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 ""
@@ -6229,6 +6286,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "kuumbia"
@@ -6632,10 +6692,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 ""
 
@@ -6876,12 +6932,77 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Hitilafu katika kuhifadhi %S"
+
 msgid "Could not join chat room"
 msgstr ""
 
 msgid "Invalid chat room name"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid error"
+msgstr "Kizuizi batili"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "\"Haikuweza kupakia: \""
+
+#. 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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Haiwezi kuongeza moduli"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Hifadhi ya nje ya Mkondo"
+
+#, 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"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7045,123 +7166,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#, fuzzy
-msgid "Invalid error"
-msgstr "Kizuizi batili"
-
-#, fuzzy
-msgid "Invalid SNAC"
-msgstr "Kizuizi batili"
-
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
-msgstr ""
-
-msgid "Service unavailable"
-msgstr ""
-
-msgid "Service not defined"
-msgstr ""
-
-msgid "Obsolete SNAC"
-msgstr ""
-
-msgid "Not supported by host"
-msgstr ""
-
-msgid "Not supported by client"
-msgstr ""
-
-msgid "Refused by client"
-msgstr ""
-
-msgid "Reply too big"
-msgstr ""
-
-msgid "Responses lost"
-msgstr ""
-
-#, fuzzy
-msgid "Request denied"
-msgstr "Ufikio umekataliwa"
-
-msgid "Busted SNAC payload"
-msgstr ""
-
-msgid "Insufficient rights"
-msgstr ""
-
-msgid "In local permit/deny"
-msgstr ""
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
-msgstr ""
-
-msgid "User temporarily unavailable"
-msgstr ""
-
-#, fuzzy
-msgid "No match"
-msgstr "%S oanisho"
-
-msgid "List overflow"
-msgstr ""
-
-msgid "Request ambiguous"
-msgstr ""
-
-msgid "Queue full"
-msgstr ""
-
-msgid "Not while on AOL"
-msgstr ""
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "\"Haikuweza kupakia: \""
-
-#. 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 ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Haiwezi kuongeza moduli"
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Hifadhi ya nje ya Mkondo"
-
 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 "
@@ -7488,30 +7492,10 @@ 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 ""
 
@@ -7900,6 +7884,78 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8212,6 +8268,11 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Cheo cha &kazi:"
+
 msgid "Notice"
 msgstr ""
 
@@ -10084,9 +10145,6 @@ msgstr ""
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! Barua"
 
-msgid "Pager server"
-msgstr ""
-
 #, fuzzy
 msgid "Pager port"
 msgstr "Page Down"
@@ -10103,18 +10161,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"
@@ -10175,6 +10227,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 ""
@@ -10244,6 +10302,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 ""
 
@@ -10618,6 +10685,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 ""
 
@@ -10855,13 +10926,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 ""
@@ -12063,6 +12127,10 @@ msgid "Arabic"
 msgstr "Kiarabu"
 
 #, fuzzy
+msgid "Assamese"
+msgstr "Kiassame"
+
+#, fuzzy
 msgid "Belarusian Latin"
 msgstr "Kibelarusi"
 
@@ -12072,6 +12140,10 @@ msgstr "Kibulgaria"
 msgid "Bengali"
 msgstr "Kibengalia"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Kibengalia"
+
 msgid "Bosnian"
 msgstr "Kibosnia"
 
@@ -12187,6 +12259,10 @@ msgstr "Lao"
 msgid "Macedonian"
 msgstr "Kimacedonia"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "Mali"
+
 msgid "Mongolian"
 msgstr "Kimongolia"
 
@@ -12305,8 +12381,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12840,14 +12916,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
@@ -12937,10 +13013,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
@@ -13785,10 +13861,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Uthibitisho unatakiwa"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "&Uchanguzi"
 
@@ -14928,7 +15000,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..."
@@ -15132,6 +15214,169 @@ msgstr ""
 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."
+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 "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 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:"
diff --git a/po/ta.po b/po/ta.po
index 5e5853276e..eb702e0dd3 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-01-05 14:58+0530\n"
 "Last-Translator: \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"
@@ -65,12 +66,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 "புதிய அஞ்சல் அறவிப்புகள்"
 
@@ -782,7 +795,7 @@ msgstr "நிறுத்து"
 msgid "Waiting for transfer to begin"
 msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "தவிர்க்கப்பட்டது"
 
 msgid "Failed"
@@ -1250,6 +1263,10 @@ msgstr "மற்றவர்கள் அரட்டையில் பேச�
 msgid "Someone says your username in chat"
 msgstr "அரட்டையில் உங்கள் பயனர்பெயரை யாரோ சொல்கிறார்கள்"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "செயல்பாடு தேவைப்படுகிறது"
+
 msgid "GStreamer Failure"
 msgstr "Gஸ்ட்டீமர் தோல்வியுற்றது"
 
@@ -1343,7 +1360,6 @@ msgid "Saved Statuses"
 msgstr "சேமித்த நிலைகள்"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "தலைப்பு"
 
@@ -1543,7 +1559,7 @@ msgstr ""
 msgid "Online"
 msgstr "இணைப்புடன்"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
@@ -1636,6 +1652,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 "தெரியாத"
 
@@ -1655,8 +1679,10 @@ 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 "இந்த சான்றிதழ் முடிவடைந்தது மற்றும் இதை மதிப்புடையதாக ஏற்றுக் கொள்ள முடியவில்லை."
@@ -1893,7 +1919,6 @@ msgstr "சிறிய குறியீட்டுக்கு %sஐ பி�
 msgid "Thread creation failure: %s"
 msgstr "வரிசையை உருவாக்க முடியவில்லை: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "தெரியாத காரணம்"
 
@@ -3160,6 +3185,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 "முதற்பெயர்"
 
@@ -3763,12 +3791,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 ""
 "குறியீடு செய்யப்படாத ஒடையில் சாதாரண வாக்கிய அனுமதியாக்கலை சேவையகம் விரும்புகிறது"
@@ -3801,6 +3823,19 @@ 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 அங்கீகரிக்க முடியவில்லை"
 
@@ -3808,6 +3843,42 @@ msgstr "SASL அங்கீகரிக்க முடியவில்லை
 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 "பயனர்பெயரை வரையறுக்க முடியவில்லை"
 
@@ -3871,6 +3942,7 @@ msgstr "மண்டலம்"
 msgid "Postal Code"
 msgstr "அஞ்சல் குறியீடு"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "நாடு"
 
@@ -3885,10 +3957,14 @@ msgstr "நிறுவன பெயர்"
 msgid "Organization Unit"
 msgstr "நிறுவன பிரிவு"
 
+msgid "Job Title"
+msgstr "வேலையின் தலைப்பு"
+
 msgid "Role"
 msgstr "பங்கு"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "பிறந்தநாள்"
 
@@ -4103,12 +4179,22 @@ 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. டொமைன் அமைக்கப்பட வேண்டும்."
 
@@ -4205,7 +4291,6 @@ msgstr "சேவையகம் தடுப்பதை துணைபுர�
 msgid "Not Authorized"
 msgstr "அனுமதியில்லை"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "மன நிலை"
 
@@ -4227,7 +4312,6 @@ msgstr "பெறுநர்"
 msgid "None (To pending)"
 msgstr "ஒன்றுமில்லை (நிலுவையிலுள்ளதற்கு)"
 
-#. 0
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
@@ -4249,6 +4333,12 @@ msgstr "நடுப் பெயர்"
 msgid "Mood Comment"
 msgstr "நண்பர் விமரிசனம்"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "டியூன் ஆர்டிஸ்ட்"
 
@@ -4419,9 +4509,6 @@ msgstr "சாசன மீறல்"
 msgid "Remote Connection Failed"
 msgstr "தொலைவு இணைப்பு தவறியது"
 
-msgid "Resource Constraint"
-msgstr "வளம் பற்றாமை"
-
 msgid "Restricted XML"
 msgstr "தடைசெய்யப்பட்ட எக்ஸ்எம்எல்"
 
@@ -4769,7 +4856,6 @@ msgstr "அவமானப் படும்"
 msgid "Amorous"
 msgstr "புகழ்பெற்ற"
 
-#. 1
 msgid "Angry"
 msgstr "கோபம்"
 
@@ -4867,7 +4953,6 @@ msgstr ""
 msgid "Envious"
 msgstr "பதட்டத்தில்"
 
-#. 2
 msgid "Excited"
 msgstr "பரபரப்பான"
 
@@ -4886,7 +4971,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "திரும்ப எடுக்கிறது..."
 
-#. 3
 msgid "Grumpy"
 msgstr "ஏறுமாறான"
 
@@ -4894,14 +4978,12 @@ msgstr "ஏறுமாறான"
 msgid "Guilty"
 msgstr "நகரம்"
 
-#. 4
 msgid "Happy"
 msgstr "மகிழ்ச்சி"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "சூடான"
 
@@ -4941,7 +5023,6 @@ msgstr "பொழுதுபோக்கு மற்றும் விரு�
 msgid "Intoxicated"
 msgstr "அழைக்கப்பட்டது"
 
-#. 6
 msgid "Invincible"
 msgstr "தோற்கடிக்க முடியாத"
 
@@ -5005,7 +5086,6 @@ msgstr "நீக்குக"
 msgid "Restless"
 msgstr "பதிவு"
 
-#. 7
 msgid "Sad"
 msgstr "சோகம்"
 
@@ -5027,11 +5107,9 @@ msgstr "தடுக்கப்பட்டது"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "நோயுற்ற"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "தூக்க கலக்கம்"
@@ -5431,18 +5509,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 "விளையாட்டு தலைப்பு"
 
@@ -5591,9 +5657,6 @@ msgstr "ஆண்டுவிழா"
 msgid "Work"
 msgstr "பணி"
 
-msgid "Job Title"
-msgstr "வேலையின் தலைப்பு"
-
 msgid "Company"
 msgstr "நிறுவனம்"
 
@@ -5681,6 +5744,10 @@ msgstr "HTTP முறை சேவையகம்"
 msgid "Show custom smileys"
 msgstr "தனிப்பயன் குறு நகையிகளை காட்டுக"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "சீண்டல்: தொடர்பாளரின் கவனத்தை பெற சீண்டுங்கள்."
 
@@ -5872,24 +5939,6 @@ msgstr "இந்த நண்பரை உங்கள் முகவரி �
 msgid "The username specified is invalid."
 msgstr "குறிப்பிட்ட பயனர்பெயர் தவறானது."
 
-#. 5
-msgid "In Love"
-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 தவறானது."
 
@@ -5923,7 +5972,11 @@ msgstr ""
 "உங்கள் விவரக்குறிப்பு தகவல் இன்னும் திருப்பி எடுக்க முடியவில்லை. மீண்டும் பின்னர் "
 "முயற்சிக்கவும்."
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5931,6 +5984,7 @@ msgid "Verify PIN"
 msgstr "PINஐ சரிபார்"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "பெயரை காட்டு"
 
@@ -5957,10 +6011,6 @@ msgstr "ஸ்பாலாஷ்-திரை தற்போது கிடை
 msgid "About"
 msgstr "பற்றி"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "மனநிலையை மாற்று..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "விவரக்குறிப்பை மாற்று..."
@@ -5991,19 +6041,16 @@ msgstr "MXit சேவையகத்துடன் இணைக்க மு�
 msgid "Connecting..."
 msgstr "இணைக்கிறது..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit உட்புகு பெயர் "
-
-#. nick name
-msgid "Nick Name"
-msgstr "புனைப் பெயர்"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6032,10 +6079,12 @@ 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 "பயனர்பெயர் ஏற்கனவே பதிவு செய்யப்பட்டுவிட்டது. மற்றொரு பயனர்பெயரை தேர்ந்தெடு."
 
 msgid "Internal error. Please try again later."
@@ -6047,7 +6096,7 @@ msgstr "பாதுகாப்பு குறியீட்டை நீங�
 msgid "Security Code"
 msgstr "பாதுகாப்பு குறியீடு"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "பாதுகாப்பு குறியீட்டை உள்ளிடு"
 
@@ -6073,11 +6122,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")
@@ -6090,6 +6145,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க்கு நாம் இணைப்பை தொலைத்துவிட்டோம். மீண்டும் இணை."
@@ -6194,6 +6271,9 @@ msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்�
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXitக்கு ஒரு இணைப்பு பிழை ஏற்பட்டது. (வாசிக்கும் நிலை 0x06)"
 
+msgid "In Love"
+msgstr "காதலில்"
+
 msgid "Pending"
 msgstr "மீதமுள்ளது"
 
@@ -6588,9 +6668,6 @@ msgstr "கடவுச்சொல் காலம் முடிந்தத�
 msgid "Incorrect password"
 msgstr "தவறான கடவுச்சொல்"
 
-msgid "User not found"
-msgstr "பயனாளர் காணப்படவில்லை"
-
 msgid "Account has been disabled"
 msgstr "கணக்கு செயலிழக்கப்பட்டது"
 
@@ -6693,8 +6770,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)."
@@ -6843,12 +6920,73 @@ 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 "ஏற்றக் கொள்ளும் நிபந்தனைகள் இல்லாமல் 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 "பாட் கணக்குகளை IMsல் துவக்க முடியவில்லை"
+
+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
+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 ""
 
@@ -7016,116 +7154,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 "செல்லுபடியாகாத எஸ்என்ஏசி"
-
-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 "உடைந்த எஸ்என்ஏசி (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 "ஏஓஎல் இல் உள்ள போது இல்லை"
-
-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 "பாட் கணக்குகளை IMsல் துவக்க முடியவில்லை"
-
-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 "ஆஃப்லைன் செய்தி சேமிப்பகம் நிரம்பியது"
-
 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 "
@@ -7475,28 +7503,9 @@ msgstr[0] "தெரியாத காரணங்களால் நீங்�
 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 "இன்னும் இணைப்புடன்"
 
@@ -7919,6 +7928,75 @@ 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 "உடைந்த எஸ்என்ஏசி (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 "ஏஓஎல் இல் உள்ள போது இல்லை"
+
 msgid "Aquarius"
 msgstr "மீனம்"
 
@@ -8201,6 +8279,11 @@ msgstr "கோருகிறது"
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "அறை பட்டியல்"
+
 msgid "Notice"
 msgstr "அறிக்கை"
 
@@ -10091,9 +10174,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo! நெறிமுறை செருகி"
 
-msgid "Pager server"
-msgstr "பேஜர் சேவையகம்"
-
 msgid "Pager port"
 msgstr "அழைப்பி தளம்"
 
@@ -10109,18 +10189,13 @@ 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 "அரட்டைஅறை பட்டியல் யுஆர்எல் "
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo அரட்டை சேவையகம்"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo அரட்டை துறை"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10187,6 +10262,15 @@ msgid ""
 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 "பயனர்பெயர் அல்லது கடவுச்சொல் விடுபட்டது"
@@ -10261,6 +10345,15 @@ msgstr "%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 "MXit சேவையகத்துடன் இணைக்க முடியவில்லை. உங்கள் சேவையக அமைவுகளை சரிபார்."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
 msgid "Not at Home"
 msgstr "வீட்டில் இல்லை"
 
@@ -10636,6 +10729,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 "_ஏற்றுக் கொள்க"
 
@@ -10875,12 +10972,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 "நுழையும் விருப்பங்கள்"
@@ -12044,6 +12135,10 @@ msgstr "ஆப்ரிக்கன்ஸ்"
 msgid "Arabic"
 msgstr "அராபிக்"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "அவமானப் படும்"
+
 msgid "Belarusian Latin"
 msgstr "பெலாருசியன் லத்தீன்"
 
@@ -12053,6 +12148,10 @@ msgstr "பல்கேரியன்"
 msgid "Bengali"
 msgstr "பெங்காலி"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "பெங்காலி"
+
 msgid "Bosnian"
 msgstr "போஸ்னியன்"
 
@@ -12167,6 +12266,10 @@ msgstr "லௌ"
 msgid "Macedonian"
 msgstr "மெர்ஸிடோனியன்"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "மலாய்"
+
 msgid "Mongolian"
 msgstr "மங்கோலியன்"
 
@@ -12284,8 +12387,8 @@ msgid ""
 "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>"
+"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, "
@@ -12834,15 +12937,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 ""
 "%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?"
@@ -12948,11 +13051,13 @@ msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 "மற்றொரு libpurple வாடிக்கையாளர் ஏற்கனவே இயங்கிக் கொண்டிருப்பபதால் வெளியேறுகிறது.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ஊடகம் (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ஊடகம்/தொங்குதல் (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "துணிடித்தல்"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13749,10 +13854,6 @@ msgstr "குறுக்குவழி உரை"
 msgid "Custom Smiley Manager"
 msgstr "தனிபயன் ஸ்மைலி மேலாளர்"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "செயல்பாடு தேவைப்படுகிறது"
-
 msgid "Select Buddy Icon"
 msgstr "நண்பரை சின்னத்தை தேர்ந்தெடு"
 
@@ -14883,8 +14984,20 @@ msgstr "ஒவ்வொரு 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 "பணிமேடை முன்னிருப்பு"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-மணி நேர வடிவ செயல்திறம் (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24-மணி நேர வடிவ செயல்திறம் (_F)"
 
 msgid "Show dates in..."
@@ -15090,6 +15203,200 @@ 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
+#, 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 "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 "Error creating conference."
 #~ msgstr "உரையாடலை உருவாக்குவதில் பிழை."
 
@@ -15247,9 +15554,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_பயனாளர்:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "ஜிடிகே+ ஒடும் நேரம் பதிப்பு"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "கணக்கிடல்..."
@@ -15797,7 +16101,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."
diff --git a/po/te.po b/po/te.po
index 14bb3dd4f0..86d490be5d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-08 19:22-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -61,12 +62,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 "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
@@ -774,7 +787,7 @@ msgstr "ఆపుము"
 msgid "Waiting for transfer to begin"
 msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ "
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "రద్దుచేయి"
 
 msgid "Failed"
@@ -1237,6 +1250,9 @@ msgstr "ఇతరులు చాట్‌లో సంభాషిస్తు�
 msgid "Someone says your username in chat"
 msgstr "మీ వినియోగదారిపేరు చాట్‌నందు వున్నదని యేవరో అనుచున్నారు"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr "Gస్ట్రీమర్ వైఫల్యం"
 
@@ -1329,6 +1345,7 @@ msgstr "స్థాయిని తొలగించు"
 msgid "Saved Statuses"
 msgstr "దాచిన స్థాయిలు"
 
+#. title
 msgid "Title"
 msgstr "శీర్షిక"
 
@@ -1524,7 +1541,7 @@ msgstr ""
 msgid "Online"
 msgstr "ఆన్‌లైన్ "
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "లైనువెలుపల"
 
@@ -1617,6 +1634,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 "తెలియని"
 
@@ -1636,8 +1661,10 @@ 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 "ధృవీకరణపత్రము కాలముమించినది మరియు చెల్లునదిగా పరిగణించబడకూడదు."
@@ -1870,7 +1897,6 @@ msgstr "%sను punycodeనకు మార్చుటలో దోషము:
 msgid "Thread creation failure: %s"
 msgstr "Thread ను సృష్టించడంలో వైఫల్యం: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -3108,6 +3134,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 "మొదటి నామము"
 
@@ -3700,12 +3729,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 "సర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదాలు అవసరం."
 
@@ -3736,6 +3759,18 @@ 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 ధృవీకరణ విఫలమైంది"
 
@@ -3743,6 +3778,42 @@ msgstr "SASL ధృవీకరణ విఫలమైంది"
 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 "వినియోగదారిపేరును సూత్రబద్దం సాధ్యపడదు"
 
@@ -3806,6 +3877,7 @@ msgstr "ప్రాంతము"
 msgid "Postal Code"
 msgstr "పోస్టల్ కోడ్ "
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "దేశము"
 
@@ -3820,8 +3892,6 @@ msgstr "సంస్థ పేరు "
 msgid "Organization Unit"
 msgstr "విభాగం పేరు "
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "పని శీర్షిక"
 
@@ -3829,6 +3899,7 @@ msgid "Role"
 msgstr "పాత్ర"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "పుట్టినరోజు "
 
@@ -4042,12 +4113,22 @@ 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. డొమైన్ తప్పక అమర్చవలెను."
 
@@ -4144,7 +4225,6 @@ msgstr "సేవిక బ్లాకింగ్‌ను మద్దిత�
 msgid "Not Authorized"
 msgstr "ప్రమాణీకరణ జరగలేదు "
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "స్వభావం "
 
@@ -4166,7 +4246,6 @@ msgstr "కు"
 msgid "None (To pending)"
 msgstr "ఎవరూ లేరు (To pending)"
 
-#. 0
 msgid "None"
 msgstr "ఏదీ కాదు"
 
@@ -4362,9 +4441,6 @@ msgstr "విధాన ఉల్లంఘన "
 msgid "Remote Connection Failed"
 msgstr "రిమోట్ కనెక్షన్ వైఫల్యం "
 
-msgid "Resource Constraint"
-msgstr "మూలాధారానికి ఆటంకం "
-
 msgid "Restricted XML"
 msgstr "నియంత్రిత XML"
 
@@ -4554,21 +4630,6 @@ msgstr "XMPP ప్రొటోకాల్ ప్లగిన్"
 msgid "Domain"
 msgstr "డొమైన్"
 
-#, fuzzy
-msgid "Require STARTTLS"
-msgstr "SSL/TLS అవసరము"
-
-#, fuzzy
-msgid "Require old (port 5223) SSL"
-msgstr "Force old (port 5223) SSL"
-
-msgid "Use STARTTLS (if available)"
-msgstr ""
-
-#, fuzzy
-msgid "SSL/TLS"
-msgstr "SSL/TLS అవసరము"
-
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS అవసరము"
 
@@ -4717,7 +4778,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "కోపము "
 
@@ -4796,7 +4856,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr "ఉత్సాహముతో "
 
@@ -4812,21 +4871,18 @@ msgstr ""
 msgid "Grieving"
 msgstr ""
 
-#. 3
 msgid "Grumpy"
 msgstr "గ్రుమ్పి"
 
 msgid "Guilty"
 msgstr ""
 
-#. 4
 msgid "Happy"
 msgstr "సంతోషం "
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 msgid "Hot"
 msgstr "హాట్"
 
@@ -4860,7 +4916,6 @@ msgstr ""
 msgid "Intoxicated"
 msgstr ""
 
-#. 6
 msgid "Invincible"
 msgstr "అజేయమైన "
 
@@ -4912,7 +4967,6 @@ msgstr ""
 msgid "Restless"
 msgstr ""
 
-#. 7
 msgid "Sad"
 msgstr "దుఃఖము "
 
@@ -4931,11 +4985,9 @@ msgstr ""
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr "సిక్"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "నిద్రతో"
@@ -5555,6 +5607,10 @@ msgstr "HTTP మెథడ్‌ సర్వర్"
 msgid "Show custom smileys"
 msgstr "కస్టమ్ స్మైలీలను చూపించు"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "పలకరించు: వినియోగదారును ఆకట్టుకోవడానికి పలకరించు"
 
@@ -5738,24 +5794,6 @@ msgstr "మీరు ఈ మిత్రుని మీ చిరునామ�
 msgid "The username specified is invalid."
 msgstr "సూచించిన వినియోగదారిపేరుకు విలువలేదు."
 
-#. 5
-msgid "In Love"
-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 చెల్లనిది."
 
@@ -5787,7 +5825,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 "PIN"
 
@@ -5795,6 +5837,7 @@ msgid "Verify PIN"
 msgstr "PIN నిర్ధారించుము"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "నామ ప్రదర్శన"
 
@@ -5821,10 +5864,6 @@ msgstr "అక్కడ యెటువంటి స్ప్లాష్-స్
 msgid "About"
 msgstr "గురించి"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "మూడ్‌ను మార్చుము..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "ప్రొఫైల్ మార్చుము..."
@@ -5855,19 +5894,16 @@ msgstr "MXit సేవికకు అనుసంధానము కాలే�
 msgid "Connecting..."
 msgstr "అనుసంధానించబడుతున్నది ..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit లాగిన్ పేరు"
-
-#. nick name
-msgid "Nick Name"
-msgstr "ముద్దుపేరు"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5895,10 +5931,12 @@ 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 "వినియోగదారిపేరు యిప్పటికే నమోదైంది. దయచేసి వేరొక వినియోగదారిపేరును యెంచుకొనుము."
 
 msgid "Internal error. Please try again later."
@@ -5910,7 +5948,7 @@ msgstr "మీరు రక్షణ కోడ్‌ను ప్రవేశప
 msgid "Security Code"
 msgstr "రక్షణ కోడ్"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "రక్షణ కోడ్‌ను ప్రవేశపెట్టుము"
 
@@ -5936,11 +5974,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 "యాహూ ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5953,6 +5997,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 "గది (_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కు అనుసంధానమును పోగొట్టుకున్నాము. దయచేసి అనుసంధానమవ్వు."
@@ -6055,6 +6121,9 @@ msgstr "MXitకు వొక అనుసంధానము యెదురై�
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXitకు వొక అనుసంధానము యెదురైంది. (0x06 స్టేజీ చదువుము)"
 
+msgid "In Love"
+msgstr "ప్రేమతో "
+
 msgid "Pending"
 msgstr "వాయిదావున్న"
 
@@ -6447,9 +6516,6 @@ msgstr "పాస్‌వర్డ్ కాలం ముగిసినది.
 msgid "Incorrect password"
 msgstr "సరికాని సంకేతపదము"
 
-msgid "User not found"
-msgstr "వినియోగదారుడు కనబడలేదు"
-
 msgid "Account has been disabled"
 msgstr "ఖాతా అచేతనము అయినది"
 
@@ -6701,12 +6767,73 @@ 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 "నియమాలను ఆమోదించకుండా 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
+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 ""
 
@@ -6857,116 +6984,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 "అప్రచలిత 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 ఉన్నప్పుడు కాదు "
-
-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 "ఆఫ్‌లైన్ సందేశ నిల్వ నిండినది"
-
 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 "
@@ -7305,28 +7322,9 @@ msgstr[0] "ఒక తెలియని కారణం చేత మీరు %
 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 "నుండి ఆన్‌లైన్. "
 
@@ -7733,6 +7731,75 @@ 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 ఉన్నప్పుడు కాదు "
+
 msgid "Aquarius"
 msgstr "కుంభం"
 
@@ -9903,7 +9970,8 @@ 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"
@@ -10433,6 +10501,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)"
 
@@ -10670,12 +10742,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 "ఐచ్చికములును లాగిన్ చేయండి. "
@@ -11821,6 +11887,10 @@ msgstr "ఆఫ్రికాన్స్"
 msgid "Arabic"
 msgstr "అరబిక్"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "సిగ్గుపడిన"
+
 msgid "Belarusian Latin"
 msgstr "బెలూరూసియన్ లాటిన్"
 
@@ -11948,6 +12018,10 @@ msgstr "లావో"
 msgid "Macedonian"
 msgstr "Macedonian"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "మలయ"
+
 msgid "Mongolian"
 msgstr "మంగోలియన్"
 
@@ -12062,8 +12136,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12585,14 +12659,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?"
@@ -12694,11 +12768,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "వేరొక libpurple క్లైంట్ యిప్పటికే నడుచుచున్నది కావున నిష్క్రమించుచున్నది.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/మాధ్యమం (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/మాధ్యమం/హాంగప్ (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "హెంగ్ అప్"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13495,9 +13571,6 @@ msgstr "లఘువు పాఠ్యము"
 msgid "Custom Smiley Manager"
 msgstr "మలచుకొనిన స్మైలీ నిర్వాహిక"
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr "మిత్రుని ప్రతిమను యెంపికచేయి"
 
@@ -14607,8 +14680,20 @@ msgstr "ఐచాట్-స్టైల్ టైమ్ స్టాంపుల
 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 "డెస్కుటాప్ అప్రమేయం"
+
+#, fuzzy
+msgid "12 hour time format"
+msgstr "24-గంటల సమయ విధానాన్ని అనుకరించు (_F)"
+
+#, fuzzy
+msgid "24 hour time format"
 msgstr "24-గంటల సమయ విధానాన్ని అనుకరించు (_F)"
 
 msgid "Show dates in..."
@@ -14809,6 +14894,196 @@ msgstr "కొత్త raw XMPP స్టాంజాలను పంపిం�
 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."
+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 "/Media/_Hangup"
+#~ msgstr "/మాధ్యమం/హాంగప్ (_H)"
+
+#~ msgid "Unknown reason."
+#~ msgstr "కారణం తెలియదు. "
+
+#, fuzzy
+#~ msgid "Require STARTTLS"
+#~ msgstr "SSL/TLS అవసరము"
+
+#, fuzzy
+#~ msgid "Require old (port 5223) SSL"
+#~ msgstr "Force old (port 5223) SSL"
+
+#, fuzzy
+#~ 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 "కళాకారి"
 
diff --git a/po/th.po b/po/th.po
index ce084c977a..3e3ab401db 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "แจ้งเตือนเมลใหม่"
 
@@ -792,7 +804,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr "กำลังรอการรับส่งแฟ้ม"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ยกเลิก"
 
 msgid "Failed"
@@ -1296,6 +1308,9 @@ msgstr "คนอื่นคุยในการสนทนากลุ่ม
 msgid "Someone says your username in chat"
 msgstr "มีคนเอ่ยถึงชื่อคุณในการสนทนากลุ่ม"
 
+msgid "Attention received"
+msgstr ""
+
 #, fuzzy
 msgid "GStreamer Failure"
 msgstr "บันทึกแฟ้ม"
@@ -1402,7 +1417,6 @@ msgid "Saved Statuses"
 msgstr "สถานะที่เคยบันทึกไว้"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "ชื่อ"
 
@@ -1604,7 +1618,7 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ออฟไลน์"
 
@@ -1701,6 +1715,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 "ไม่มีข้อมูล"
 
@@ -1718,7 +1738,9 @@ 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."
@@ -1951,7 +1973,6 @@ msgstr ""
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
@@ -3172,6 +3193,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 ""
 
@@ -3743,12 +3767,6 @@ msgstr ""
 msgid "execute"
 msgstr "ลบ"
 
-msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
@@ -3779,6 +3797,16 @@ 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 "เชื่อมต่อล้มเหลว"
 
@@ -3787,6 +3815,40 @@ msgid "SASL error: %s"
 msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
+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 ""
+
+#, 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 "ไม่สามารถส่งข้อความได้"
 
@@ -3855,6 +3917,7 @@ msgstr ""
 msgid "Postal Code"
 msgstr "รหัสไปรษณีย์"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ประเทศ"
 
@@ -3869,10 +3932,14 @@ msgstr "องค์กร"
 msgid "Organization Unit"
 msgstr "หน่วยงานภายใน"
 
+msgid "Job Title"
+msgstr "ตำแหน่ง"
+
 msgid "Role"
 msgstr "ตำแหน่ง"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "วันเกิด"
 
@@ -4095,6 +4162,12 @@ 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 "ข้อความปกติ"
@@ -4102,6 +4175,9 @@ 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 ""
 
@@ -4204,7 +4280,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr ""
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr ""
 
@@ -4226,7 +4301,6 @@ msgstr "ถึง"
 msgid "None (To pending)"
 msgstr ""
 
-#. 0
 msgid "None"
 msgstr ""
 
@@ -4249,6 +4323,12 @@ msgstr "ชื่อกลาง"
 msgid "Mood Comment"
 msgstr "แก้ไขบัญชีผู้ใช้"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4421,9 +4501,6 @@ msgstr ""
 msgid "Remote Connection Failed"
 msgstr ""
 
-msgid "Resource Constraint"
-msgstr ""
-
 msgid "Restricted XML"
 msgstr ""
 
@@ -4766,7 +4843,6 @@ msgstr ""
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr ""
 
@@ -4859,7 +4935,6 @@ msgstr ""
 msgid "Envious"
 msgstr ""
 
-#. 2
 msgid "Excited"
 msgstr ""
 
@@ -4877,7 +4952,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "คู่สนทนากำลังพิมพ์..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "กลุ่ม:"
@@ -4886,14 +4960,12 @@ msgstr "กลุ่ม:"
 msgid "Guilty"
 msgstr "เมือง"
 
-#. 4
 msgid "Happy"
 msgstr ""
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "โ_ฮสต์:"
@@ -4931,7 +5003,6 @@ msgstr "ความสนใจ"
 msgid "Intoxicated"
 msgstr "เ_ชิญ"
 
-#. 6
 msgid "Invincible"
 msgstr ""
 
@@ -4995,7 +5066,6 @@ msgstr "ลบคู่สนทนา"
 msgid "Restless"
 msgstr "ลงทะเบียน"
 
-#. 7
 msgid "Sad"
 msgstr ""
 
@@ -5016,11 +5086,9 @@ msgstr "ถูกบล็อค"
 msgid "Shy"
 msgstr ""
 
-#. 9
 msgid "Sick"
 msgstr ""
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr ""
@@ -5424,19 +5492,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 "ชื่อ"
@@ -5589,9 +5644,6 @@ msgstr ""
 msgid "Work"
 msgstr "IM ที่ทำงาน"
 
-msgid "Job Title"
-msgstr "ตำแหน่ง"
-
 msgid "Company"
 msgstr "บริษัท"
 
@@ -5679,6 +5731,10 @@ msgstr "ล็อกอินผ่าน HTTP"
 msgid "Show custom smileys"
 msgstr "แสดงหน้าแสดงอารมณ์พิเศษที่คู่สนทนาส่งมา"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -5852,28 +5908,6 @@ msgstr ""
 msgid "The username specified is invalid."
 msgstr ""
 
-#. 5
-msgid "In Love"
-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 PIN you entered is invalid."
 msgstr ""
 
@@ -5907,7 +5941,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 ""
 
@@ -5915,6 +5953,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "นามสกุล"
@@ -5945,11 +5984,6 @@ msgstr ""
 msgid "About"
 msgstr "เกี่ยวกับ Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "เปลี่ยนรหัสผ่าน..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -5987,21 +6021,16 @@ msgstr "ไม่สามารถติดต่อไปยังโฮสต
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display 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"
+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"
@@ -6029,10 +6058,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."
@@ -6044,7 +6073,7 @@ msgstr ""
 msgid "Security Code"
 msgstr ""
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "ใส่รหัสผ่าน"
@@ -6077,12 +6106,17 @@ 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")
@@ -6097,6 +6131,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 ""
@@ -6214,6 +6269,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr ""
+
 #, fuzzy
 msgid "Pending"
 msgstr "_ส่ง"
@@ -6619,9 +6677,6 @@ msgstr ""
 msgid "Incorrect password"
 msgstr "รหัสผ่านใหม่"
 
-msgid "User not found"
-msgstr ""
-
 msgid "Account has been disabled"
 msgstr ""
 
@@ -6860,6 +6915,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
@@ -6868,6 +6927,66 @@ 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 ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "ไม่สามารถส่งโฟลเดอร์ %s"
+
+#. 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 ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "ไม่สามารถส่งข้อความได้"
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#, 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 ได้"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7035,119 +7154,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 ""
-
-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 ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "ไม่สามารถส่งโฟลเดอร์ %s"
-
-#. 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 ""
-
-#, 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 "
@@ -7464,29 +7470,10 @@ 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 ""
 
@@ -7869,6 +7856,75 @@ 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 ""
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8196,6 +8252,11 @@ msgstr "เหลืออีก"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "รายชื่อห้อง"
+
 #, fuzzy
 msgid "Notice"
 msgstr "บันทึก"
@@ -10056,10 +10117,6 @@ msgstr "เลือก..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "ปลั๊กอิน Jabber"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "เซิร์ฟเวอร์พร็อกซี"
-
 msgid "Pager port"
 msgstr ""
 
@@ -10076,18 +10133,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 "เลือก..."
@@ -10149,6 +10200,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"
@@ -10218,6 +10275,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 ""
 
@@ -10581,6 +10647,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 "_ตอบรับ"
 
@@ -10824,12 +10894,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 "ตัวเลือกการล็อกอิน"
@@ -12056,6 +12120,10 @@ msgstr ""
 msgid "Arabic"
 msgstr ""
 
+#, fuzzy
+msgid "Assamese"
+msgstr "ข้อความถูกส่ง"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12065,6 +12133,9 @@ msgstr ""
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 msgid "Bosnian"
 msgstr ""
 
@@ -12182,6 +12253,10 @@ msgstr ""
 msgid "Macedonian"
 msgstr ""
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "ชาย"
+
 msgid "Mongolian"
 msgstr ""
 
@@ -12301,8 +12376,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -12859,14 +12934,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
@@ -12955,10 +13030,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
@@ -13817,9 +13892,6 @@ msgstr "พอร์ต"
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ไอคอนในการสนทนา"
@@ -14964,7 +15036,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..."
@@ -15167,6 +15249,170 @@ msgstr ""
 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."
+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 "ค่าปริยายของ 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 "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 "เกิดปัญหาในการอ่านแฟ้มประวัติ"
diff --git a/po/tr.po b/po/tr.po
index ff1ef2a3c8..8318f1819d 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -792,7 +805,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 +1283,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 +1380,6 @@ msgid "Saved Statuses"
 msgstr "Kaydedilmiş Durumlar"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Başlık"
 
@@ -1559,7 +1575,7 @@ msgstr ""
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Çevrimdışı"
 
@@ -1657,6 +1673,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"
 
@@ -1674,9 +1698,10 @@ 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."
 msgstr ""
@@ -1905,7 +1930,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"
 
@@ -3160,6 +3184,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"
 
@@ -3767,16 +3794,6 @@ 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 "
@@ -3809,6 +3826,21 @@ 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"
 
@@ -3817,6 +3849,42 @@ msgid "SASL error: %s"
 msgstr "SASL hatası"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Geçersiz girdi durumu"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Desteklenmeyen Sürüm"
+
+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 "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"
 
@@ -3891,6 +3959,7 @@ msgstr "Bölge"
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ülke"
 
@@ -3905,10 +3974,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ü"
 
@@ -4131,12 +4204,26 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, 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ı."
+
+#, 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ı."
 
@@ -4234,7 +4321,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Yetki Verilmemiş"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Ruh Hali"
 
@@ -4256,7 +4342,6 @@ msgstr "Kime"
 msgid "None (To pending)"
 msgstr "Hiçbiri (bekletiliyor)"
 
-#. 0
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -4278,6 +4363,12 @@ msgstr "İkinci İsim"
 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 ""
 
@@ -4448,9 +4539,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"
 
@@ -4812,7 +4900,6 @@ msgstr "Mahçup"
 msgid "Amorous"
 msgstr "Harika"
 
-#. 1
 msgid "Angry"
 msgstr "Kızgın"
 
@@ -4910,7 +4997,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Sıkıntılı"
 
-#. 2
 msgid "Excited"
 msgstr "Heyecanlı"
 
@@ -4929,7 +5015,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Alınıyor..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grup"
@@ -4938,14 +5023,12 @@ msgstr "Grup"
 msgid "Guilty"
 msgstr "Şehir"
 
-#. 4
 msgid "Happy"
 msgstr "Mutlu"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host"
@@ -4986,7 +5069,6 @@ msgstr "İlgiler"
 msgid "Intoxicated"
 msgstr "Davet Et"
 
-#. 6
 msgid "Invincible"
 msgstr "Yenilmez"
 
@@ -5050,7 +5132,6 @@ msgstr "Kaldır"
 msgid "Restless"
 msgstr "Kayıt Ol"
 
-#. 7
 msgid "Sad"
 msgstr "Üzgün"
 
@@ -5071,12 +5152,10 @@ msgstr "Engellenmiş"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Takma isim"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Uykulu"
@@ -5478,20 +5557,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"
@@ -5642,9 +5707,6 @@ msgstr "Yıldönümü"
 msgid "Work"
 msgstr "İş"
 
-msgid "Job Title"
-msgstr "İşi"
-
 msgid "Company"
 msgstr "Şirket"
 
@@ -5731,6 +5793,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ı"
 
@@ -5922,28 +5988,6 @@ msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
 msgid "The username specified is invalid."
 msgstr "Belirlenen görüntü adı geçersiz."
 
-#. 5
-msgid "In Love"
-msgstr "Aşık"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Ruh Haliniz"
-
-#. add all moods to list
-#, 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 "The PIN you entered is invalid."
 msgstr "Girilen SecurID anahtarı geçersiz."
@@ -5980,7 +6024,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"
@@ -5989,6 +6037,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Soyad"
@@ -6019,11 +6068,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..."
@@ -6063,7 +6107,7 @@ msgid "Connecting..."
 msgstr "Bağlanılıyor"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 #, fuzzy
@@ -6071,14 +6115,9 @@ 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"
@@ -6107,10 +6146,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 +6163,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "Güvenlik Aktif"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Parola"
@@ -6158,12 +6197,17 @@ 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")
@@ -6178,6 +6222,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 ""
@@ -6297,6 +6363,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Aşık"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Gönder"
@@ -6691,9 +6760,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"
 
@@ -6948,6 +7014,10 @@ 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ı"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Bağlanılamadı"
@@ -6956,6 +7026,67 @@ msgstr "Bağlanılamadı"
 msgid "Invalid chat room name"
 msgstr "Geçersiz Oda İsmi"
 
+msgid "Invalid error"
+msgstr "Geçersiz hata"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Dosya gönderilemiyor"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Bir dizin gönderemezsiniz."
+
+#. 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 "Mesaj gönderilemedi."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Çevrimdışı İletisi"
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7121,120 +7252,6 @@ 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 "Invalid error"
-msgstr "Geçersiz hata"
-
-msgid "Invalid SNAC"
-msgstr "Geçersiz SNAC"
-
-msgid "Rate to host"
-msgstr "Hostu değerlendir"
-
-msgid "Rate to client"
-msgstr "İstemciyi değerlendir"
-
-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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Dosya gönderilemiyor"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Bir dizin gönderemezsiniz."
-
-#. 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 "Mesaj gönderilemedi."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Çevrimdışı İletisi"
-
 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 "
@@ -7579,29 +7596,10 @@ 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:"
 
@@ -8018,6 +8016,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Kova"
 
@@ -8338,6 +8405,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"
@@ -10244,9 +10316,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"
 
@@ -10262,18 +10331,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"
@@ -10338,6 +10401,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"
@@ -10416,6 +10486,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"
 
@@ -10790,6 +10869,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"
 
@@ -11024,12 +11107,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"
@@ -12240,6 +12317,10 @@ msgstr "Afrikaanca (Hollanda Lehçesi)"
 msgid "Arabic"
 msgstr "Arapça"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Mahçup"
+
 msgid "Belarusian Latin"
 msgstr "Belarusça Latin"
 
@@ -12249,6 +12330,10 @@ msgstr "Bulgarca"
 msgid "Bengali"
 msgstr "Bengal Dili"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "Bengal Dili"
+
 msgid "Bosnian"
 msgstr "Boşnakça"
 
@@ -12367,6 +12452,10 @@ msgid "Macedonian"
 msgstr "Makedonca"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr " Bay"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Makedonca"
 
@@ -12486,8 +12575,8 @@ msgid ""
 "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>"
+"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 "
@@ -13047,16 +13136,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?"
 
@@ -13146,10 +13235,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
@@ -14007,10 +14096,6 @@ msgid "Custom Smiley Manager"
 msgstr "Sertifika Yöneticisi"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Kayıt Gerekli"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Kişi Seçin"
 
@@ -15194,8 +15279,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..."
@@ -15408,6 +15505,205 @@ 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."
+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 ""
+
+#, 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ı"
@@ -15566,9 +15862,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Kullanıcı:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Sürümü"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Hesaplanıyor..."
@@ -16074,7 +16367,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."
 
@@ -16304,14 +16597,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 26b84607a4..1445939661 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-10 11:52+0300\n"
+"POT-Creation-Date: 2010-08-09 21:57-0700\n"
+"PO-Revision-Date: 2010-08-09 00:28+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\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"
-"X-Language: uk_UA\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -63,12 +63,27 @@ 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 "Сповіщення про нову пошту"
 
@@ -79,7 +94,7 @@ msgid "There are no protocol plugins installed."
 msgstr "Не встановлений жодний з додатків протоколів."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Можливо, ви забули зробити 'make install'.)"
+msgstr "(Можливо, ви забули виконати \"make install\".)"
 
 msgid "Modify Account"
 msgstr "Змінити обліковий запис"
@@ -430,13 +445,13 @@ msgid "By Status"
 msgstr "За станом"
 
 msgid "Alphabetically"
-msgstr "За алфавітом"
+msgstr "За абеткою"
 
 msgid "By Log Size"
 msgstr "За розміром журналу"
 
 msgid "Buddy"
-msgstr "Приятель"
+msgstr "Контакт"
 
 msgid "Chat"
 msgstr "Балачка"
@@ -448,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 ""
@@ -465,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"
@@ -485,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"
@@ -794,7 +809,7 @@ msgstr "Зупинити"
 msgid "Waiting for transfer to begin"
 msgstr "Очікування початку передачі"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Скасовано"
 
 msgid "Failed"
@@ -1264,6 +1279,9 @@ msgstr "Інші розмовляють у балачці"
 msgid "Someone says your username in chat"
 msgstr "Хтось назвав ваше ім'я у балачці"
 
+msgid "Attention received"
+msgstr "Отриманий сигнал уваги"
+
 msgid "GStreamer Failure"
 msgstr "Помилка GStreamer"
 
@@ -1357,7 +1375,6 @@ msgid "Saved Statuses"
 msgstr "Збережені стани"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Назва"
 
@@ -1383,7 +1400,7 @@ msgid "Invalid title"
 msgstr "Невірний заголовок"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Будь ласка, введіть назву для стану."
+msgstr "Будь ласка, введіть непорожню назву для стану."
 
 msgid "Duplicate title"
 msgstr "Подвоїти назву"
@@ -1557,7 +1574,7 @@ msgstr ""
 msgid "Online"
 msgstr "У мережі"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Поза мережею"
 
@@ -1650,6 +1667,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 "Невідомо"
 
@@ -1670,8 +1693,12 @@ 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 "Термін дії сертифікату закінчився і його не слід вважати дійсним."
@@ -1908,7 +1935,6 @@ msgstr "Помилка перетворення %s у punycode: %d"
 msgid "Thread creation failure: %s"
 msgstr "Помилка створення потоку : %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -3189,6 +3215,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,12 +3825,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 ""
 "Сервер вимагає автентифікацію звичайним текстом через нешифрований потік"
@@ -3833,6 +3856,19 @@ 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"
 
@@ -3840,6 +3876,40 @@ 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 ""
+"Сервер не підтримує зв'язування каналів, але не заявив про це. Це свідчить "
+"про можливу атаку 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 "Не вдається привести ім'я користувача до правильного вигляду"
 
@@ -3903,6 +3973,7 @@ msgstr "Регіон"
 msgid "Postal Code"
 msgstr "Поштовий індекс"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Країна"
 
@@ -3917,10 +3988,14 @@ msgstr "Назва організації"
 msgid "Organization Unit"
 msgstr "Відділок"
 
+msgid "Job Title"
+msgstr "Назва роботи"
+
 msgid "Role"
 msgstr "Посада"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "День народження"
 
@@ -4134,12 +4209,22 @@ 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. Має бути вказаний домен."
 
@@ -4238,7 +4323,6 @@ msgstr "Сервер не підтримує блокування"
 msgid "Not Authorized"
 msgstr "Не авторизований"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Настрій"
 
@@ -4260,7 +4344,6 @@ msgstr "Для"
 msgid "None (To pending)"
 msgstr "Немає (для очікування)"
 
-#. 0
 msgid "None"
 msgstr "Немає"
 
@@ -4274,40 +4357,44 @@ msgstr "Настрій"
 msgid "Allow Buzz"
 msgstr "Дозволити плітки"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Прізвище"
+msgstr "Назва настрою"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "Коментар користувача"
+msgstr "Примітка настрою"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
-msgstr "Налаштувати виконавця"
+msgstr "Виконавець"
 
 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 "Налаштувати посилання URL"
+msgstr "Посилання URL"
 
 msgid "Password Changed"
 msgstr "Пароль змінено"
@@ -4452,9 +4539,6 @@ msgstr "Порушення правил"
 msgid "Remote Connection Failed"
 msgstr "Помилка встановлення віддаленого з'єднання"
 
-msgid "Resource Constraint"
-msgstr "Брак ресурсів"
-
 msgid "Restricted XML"
 msgstr "Обмежений XML"
 
@@ -4471,7 +4555,7 @@ msgid "Unsupported Encoding"
 msgstr "Непідтримуване кодування"
 
 msgid "Unsupported Stanza Type"
-msgstr "Непідтримуваний тип строфи"
+msgstr "Непідтримуваний тип рядка"
 
 msgid "Unsupported Version"
 msgstr "Непідтримувана версія"
@@ -4568,9 +4652,8 @@ msgstr "Виберіть ресурс"
 msgid "Initiate Media"
 msgstr "Розпочати медіа"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Цей протокол не підтримує кімнати балачок."
+msgstr "Обліковий запис не підтримує PEP, неможливо встановити настрій"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Налаштувати кімнату балачки."
@@ -4628,9 +4711,8 @@ 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 "Виберіть коректного користувача"
+msgstr "mood: встановити поточний настрій користувача"
 
 msgid "Extended Away"
 msgstr "Розширений стан \"Відійшов\""
@@ -4712,13 +4794,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "Нетипова усмішка у повідомленні завелика, щоб її надіслати."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Бракує заголовка потоку XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Версія XMPP не збігається"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Бракує ID потоку XMPP"
 
 msgid "XML Parse error"
 msgstr "Помилка аналізу XML"
@@ -4796,32 +4878,26 @@ msgstr "Не вдалося надіслати файл до %s, не підпи
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Будь ласка, виберіть ресурс %s, до якого ви хочете надіслати файл"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Арабська"
+msgstr "Боюся"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Присоромлений"
+msgstr "Вражений"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "Чудовий"
+msgstr "Закоханий"
 
-#. 1
 msgid "Angry"
 msgstr "Розлючений"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Заборонено"
+msgstr "Роздратований"
 
 msgid "Anxious"
 msgstr "Стурбований"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Надсилається"
+msgstr "Збуджений"
 
 msgid "Ashamed"
 msgstr "Присоромлений"
@@ -4829,287 +4905,231 @@ msgstr "Присоромлений"
 msgid "Bored"
 msgstr "Нудьгуючий"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Зберегти"
+msgstr "Хоробрий"
 
-#, fuzzy
 msgid "Calm"
-msgstr "Сфера"
+msgstr "Спокійний"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "Балачки"
+msgstr "Обережний"
 
-#, fuzzy
 msgid "Cold"
-msgstr "Жирний"
+msgstr "Холодно"
 
-#, fuzzy
 msgid "Confident"
-msgstr "Конфлікт"
+msgstr "Довірливий"
 
-#, fuzzy
 msgid "Confused"
-msgstr "Продовжити"
+msgstr "Збитий з пантелику"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "Контакт"
+msgstr "Споглядаю"
 
-#, fuzzy
 msgid "Contented"
-msgstr "З'єднаний"
+msgstr "Задоволений"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Компанія"
+msgstr "Слабкий"
 
 msgid "Crazy"
-msgstr ""
+msgstr "Божевільний"
 
-#, fuzzy
 msgid "Creative"
-msgstr "Створити"
+msgstr "Творчий"
 
-#, fuzzy
 msgid "Curious"
-msgstr "Чудовий"
+msgstr "Допитливий"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "Відхилений"
+msgstr "Засмучений"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Видалений"
+msgstr "Пригнічений"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "Від'єднано."
+msgstr "Розчарований"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Огидно"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "Вимкнений"
+msgstr "Збентежений"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Незалежний"
+msgstr "Спантеличений"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "Соромно"
 
-#, fuzzy
 msgid "Envious"
-msgstr "Стурбований"
+msgstr "Заздрісний"
 
-#. 2
 msgid "Excited"
 msgstr "Схвильований"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Чудовий"
+msgstr "Фліртую"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Ім'я"
+msgstr "Розчарований у собі"
 
 msgid "Grateful"
-msgstr ""
+msgstr "Вдячний"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "Отримання..."
+msgstr "Сумую"
 
-#. 3
 msgid "Grumpy"
 msgstr "Сердитий"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Місто"
+msgstr "Винуватий"
 
-#. 4
 msgid "Happy"
 msgstr "Щасливий"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Маю надію"
 
-#. 8
 msgid "Hot"
 msgstr "Гарячий"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Скромний"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "Ображений"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Розлючений"
+msgstr "Голодний"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "Гумор"
+msgstr "Ображений"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Вражений"
 
-#, fuzzy
 msgid "In awe"
-msgstr "Закоханий"
+msgstr "Наляканий"
 
 msgid "In love"
 msgstr "Закоханий"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Індонезійська"
+msgstr "Обурений"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Зацікавленості"
+msgstr "Зацікавлений"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "Запрошений"
+msgstr "П'яний"
 
-#. 6
 msgid "Invincible"
 msgstr "Непереможний"
 
 msgid "Jealous"
 msgstr "Ревнивий"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Мавпа"
+msgstr "Одинокий"
 
-#, fuzzy
 msgid "Lost"
-msgstr "Найгучніше"
+msgstr "Загублений"
 
 msgid "Lucky"
-msgstr ""
+msgstr "Щасливий"
 
-#, fuzzy
 msgid "Mean"
-msgstr "Німецька"
+msgstr "Скромний"
 
-#, fuzzy
 msgid "Moody"
-msgstr "Настрій"
+msgstr "У гуморі"
 
 msgid "Nervous"
-msgstr ""
+msgstr "Нервовий"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Подробиці"
+msgstr "Нейтральний"
 
-#, fuzzy
 msgid "Offended"
-msgstr "Поза мережею"
+msgstr "Скривджений"
 
 msgid "Outraged"
-msgstr ""
+msgstr "Обурений"
 
-#, fuzzy
 msgid "Playful"
-msgstr "Відтворення"
+msgstr "Грайливий"
 
-#, fuzzy
 msgid "Proud"
-msgstr "Гучно"
+msgstr "Пишаюся"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "Справжнє ім'я"
+msgstr "Розслаблений"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "Отримані"
+msgstr "Заспокоєний"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "Видалити"
+msgstr "Жалісливий"
 
-#, fuzzy
 msgid "Restless"
-msgstr "Зареєструвати"
+msgstr "Невгамовний"
 
-#. 7
 msgid "Sad"
 msgstr "Сумний"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Мараті"
+msgstr "Саркастичний"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "Задоволений"
 
-#, fuzzy
 msgid "Serious"
-msgstr "Чудовий"
+msgstr "Серйозний"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "Заблокований"
+msgstr "Вражений"
 
 msgid "Shy"
-msgstr ""
+msgstr "Сором'язливий"
 
-#. 9
 msgid "Sick"
 msgstr "Хворий"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Сонливий"
 
 msgid "Spontaneous"
-msgstr ""
+msgstr "Мимовільний"
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Швидкість"
+msgstr "Напружений"
 
-#, fuzzy
 msgid "Strong"
-msgstr "Пісня"
+msgstr "Сильний"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Здивований"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Вдячний"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "Спраглий"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "Втомлений"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "Підкреслений"
+msgstr "Невизначений"
 
-#, fuzzy
 msgid "Weak"
-msgstr "Стукнути"
+msgstr "Слабкий"
 
-#, fuzzy
 msgid "Worried"
-msgstr "Нудьгуючий"
+msgstr "Занепокоєний"
 
 msgid "Set User Nickname"
 msgstr "Встановити прізвисько користувача"
@@ -5474,18 +5494,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 "Назва гри"
 
@@ -5635,9 +5643,6 @@ msgstr "Річниця"
 msgid "Work"
 msgstr "Робота"
 
-msgid "Job Title"
-msgstr "Назва роботи"
-
 msgid "Company"
 msgstr "Компанія"
 
@@ -5726,6 +5731,9 @@ msgstr "Спосіб сервера HTTP"
 msgid "Show custom smileys"
 msgstr "Показати нетипові усмішки"
 
+msgid "Allow direct connections"
+msgstr "Дозволити прямі з'єднання"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: штовхнути користувача, щоб привернути його увагу"
 
@@ -5922,24 +5930,6 @@ msgstr "Хочете також видалити цей контакт з адр
 msgid "The username specified is invalid."
 msgstr "Вказане ім'я користувача неправильне."
 
-#. 5
-msgid "In Love"
-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 неправильний."
 
@@ -5952,8 +5942,8 @@ msgstr "PIN неправильний. Він може складатися ті�
 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'."
@@ -5972,7 +5962,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 "PIN"
 
@@ -5980,6 +5974,7 @@ msgid "Verify PIN"
 msgstr "Перевірити PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Відображуване ім'я"
 
@@ -6006,10 +6001,6 @@ msgstr "Немає наявних заставок на цей час"
 msgid "About"
 msgstr "Про"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Змінити настрій..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Змінити профіль..."
@@ -6044,19 +6035,12 @@ 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 "Введений PIN має неправильну довжину [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Ім'я входу MXit"
-
-#. 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"
@@ -6084,11 +6068,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 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 "Внутрішня помилка. Будь ласка, спробуйте пізніше."
@@ -6099,7 +6083,7 @@ msgstr "Ви не ввели код безпеки"
 msgid "Security Code"
 msgstr "Код безпеки"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Введіть код безпеки"
 
@@ -6125,11 +6109,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 ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6142,6 +6130,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. Будь ласка, підключіться ще раз."
@@ -6246,6 +6251,9 @@ msgstr "Трапилась помилка з'єднання з MXit. (read stage
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "Трапилась помилка з'єднання з MXit. (read stage 0x06)"
 
+msgid "In Love"
+msgstr "Закоханий"
+
 msgid "Pending"
 msgstr "Очікує"
 
@@ -6646,9 +6654,6 @@ msgstr "Термін дії паролю вийшов"
 msgid "Incorrect password"
 msgstr "Неправильний пароль"
 
-msgid "User not found"
-msgstr "Користувач не знайдений"
-
 msgid "Account has been disabled"
 msgstr "Обліковий запис була вимкнена"
 
@@ -6798,7 +6803,7 @@ msgid "Telephone Number"
 msgstr "Номер телефон"
 
 msgid "Personal Title"
-msgstr "Особиста сторінка тенет"
+msgstr "Особиста назва"
 
 msgid "Mailstop"
 msgstr "Пошта"
@@ -6913,111 +6918,160 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL не дозволяє автентифікуватись тут з відображуваним ім'ям"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "Помилка запиту %s"
+
 msgid "Could not join chat room"
 msgstr "Не вдалося приєднатися до кімнати балачки"
 
 msgid "Invalid chat room name"
 msgstr "Неправильна назва кімнати балачки"
 
-msgid "Thinking"
+msgid "Invalid error"
+msgstr "Недопустима помилка"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Неможливо прийняти миттєве повідомлення із-за нагляду батьків"
+
+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 "Обліковий запис робота не може розпочати миттєве повідомлення"
+
+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 "Думаю"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "Закінчив писати"
+msgstr "Роблю покупки"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "Діалог запитання"
+msgstr "Допитливий"
 
-#, fuzzy
 msgid "Eating"
-msgstr "Пейджер"
+msgstr "Їм"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "Граю у гру"
+msgstr "Дивлюсь кіно"
 
 msgid "Typing"
 msgstr "Пише"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Не в офісі"
+msgstr "В офісі"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Миюся"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "Дивлюсь телевізор"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "Завершити"
+msgstr "Дурію"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Сонливий"
+msgstr "Сплю"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "Використовую КПК"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "Друзі по балачкам миттєвими повідомленнями"
+msgstr "Зустрічаюсь з друзями"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "Розмовляю по телефону"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Періодичний"
+msgstr "Серфінг"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Мобільний"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Шукаю в тенетах"
 
 msgid "At a party"
-msgstr ""
+msgstr "На вечірці"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "П'ю каву"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Близнюки"
+msgstr "Граю гру"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "Переглядаю тенета"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Пісня"
+msgstr "Палю"
 
-#, fuzzy
 msgid "Writing"
-msgstr "Працюю"
+msgstr "Пишу"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Працюю"
+msgstr "П'ю"
 
 msgid "Listening to music"
 msgstr "Слухаю музику"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Надсилання"
+msgstr "Вчуся"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "Зацікавленості"
+msgstr "У вбиральній"
 
 msgid "Received invalid data on connection with server"
 msgstr "Отримані неправильні дані під час з'єдання з сервером"
@@ -7086,120 +7140,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 "Застарілий 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 "Неможливо надіслати 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 "Обліковий запис робота не може розпочати миттєве повідомлення"
-
-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 "Сховище повідомлень \"поза мережею\" заповнене"
-
 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 "
@@ -7236,7 +7176,7 @@ msgid "Games"
 msgstr "Ігри"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Доповнення"
@@ -7304,25 +7244,20 @@ msgstr "Підтримується Web"
 msgid "Invisible"
 msgstr "Невидимий"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Ел.пошта"
+msgstr "Злий"
 
-#, fuzzy
 msgid "Depression"
-msgstr "Фах"
+msgstr "Пригнічення"
 
-#, fuzzy
 msgid "At home"
-msgstr "Про мене"
+msgstr "Вдома"
 
-#, fuzzy
 msgid "At work"
-msgstr "Мережа"
+msgstr "На роботі"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "Відійшов на обід"
+msgstr "Обідаю"
 
 msgid "IP Address"
 msgstr "IP Адреса"
@@ -7577,28 +7512,9 @@ msgstr[1] "Ви не отримали %hu повідомлення від %s, з
 msgstr[2] "Ви не отримали %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 "У мережі з"
 
@@ -7624,7 +7540,7 @@ msgid "You have been disconnected from chat room %s."
 msgstr "Вас було від'єднано від кімнати балачки %s."
 
 msgid "Mobile Phone"
-msgstr "Мобільний Телефон"
+msgstr "Мобільний телефон"
 
 msgid "Personal Web Page"
 msgstr "Особиста сторінка тенет"
@@ -7638,7 +7554,7 @@ msgid "Zip Code"
 msgstr "Поштовий індекс"
 
 msgid "Work Information"
-msgstr "Дані про роботу"
+msgstr "Відомості про роботу"
 
 msgid "Division"
 msgstr "Відділ"
@@ -7862,9 +7778,8 @@ msgstr ""
 msgid "iTunes Music Store Link"
 msgstr "Посилання до музичної крамниці iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Обід"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7897,15 +7812,14 @@ msgstr "Отримати відомості AIM"
 msgid "Edit Buddy Comment"
 msgstr "Змінити коментар користувача"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Отримати повідомлення про стан"
+msgstr "Отримати повідомлення X-Status"
 
 msgid "End Direct IM Session"
 msgstr "Закінчити прямий сеанс миттєвих повідомлень"
 
 msgid "Direct IM"
-msgstr "Пряме з'єднання"
+msgstr "Пряме миттєве повідомлення"
 
 msgid "Re-request Authorization"
 msgstr "Повторний запит авторизації"
@@ -8026,6 +7940,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Водолій"
 
@@ -8308,6 +8291,10 @@ msgstr "Запитується"
 msgid "Admin"
 msgstr "Адміністратор"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "Назва кімнати"
+
 msgid "Notice"
 msgstr "Примітки"
 
@@ -10215,9 +10202,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Додаток протоколу Yahoo!"
 
-msgid "Pager server"
-msgstr "Сервер пейджера"
-
 msgid "Pager port"
 msgstr "Порт пейджера"
 
@@ -10233,18 +10217,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 "URL переліку балачок"
 
-msgid "Yahoo Chat server"
-msgstr "Сервер Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Порт Yahoo Chat"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN ID..."
 
@@ -10310,6 +10288,15 @@ 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 "Відсутнє ім'я користувача або пароль"
@@ -10391,6 +10378,15 @@ 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 "Не вдома"
 
@@ -10777,6 +10773,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 "_Прийняти"
 
@@ -10843,9 +10843,8 @@ msgstr "Не турбувати"
 msgid "Extended away"
 msgstr "Розширений стан \"Відійшов\""
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Отримання"
+msgstr "Почуття"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11022,12 +11021,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 "Параметри входу"
@@ -11398,13 +11391,11 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Невідомий тип вузла"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Будь ласка, виберіть ваш настрій з переліку."
+msgstr "Будь ласка, виберіть ваш настрій з переліку"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Прізвисько (не обов'язково)"
+msgstr "Повідомлення (не обов'язково)"
 
 msgid "Edit User Mood"
 msgstr "Редагувати настрій користувача"
@@ -11487,9 +11478,8 @@ msgstr "/Засоби/_Налаштування"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Засоби/_Конфіденційність"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Засоби/Системний _журнал"
+msgstr "/Засоби/Встановити _настрій"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Засоби/Передавання _файлів"
@@ -11510,20 +11500,17 @@ msgstr "/_Довідка"
 msgid "/Help/Online _Help"
 msgstr "/Довідка/Довідка у _мережі"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Відомості про користувача"
+msgstr "Довідка/Відомості про _збірку"
 
 msgid "/Help/_Debug Window"
 msgstr "/Довідка/Вікно _зневадження"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Відомості про сервер"
+msgstr "Довідка/Відомості про _розробників"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "Особисті відомості"
+msgstr "Довідка/Відомості про _перекладачів"
 
 msgid "/Help/_About"
 msgstr "/Довідка/_Про програму"
@@ -11755,9 +11742,8 @@ msgstr "<PurpleMain>/Обл. записи/"
 msgid "_Edit Account"
 msgstr "_Редагувати обліковий запис"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Встановити настрій..."
+msgstr "Встановити _настрій..."
 
 msgid "No actions available"
 msgstr "Немає доступних дій"
@@ -11879,9 +11865,8 @@ msgstr "/Розмова/Медіа/_Аудіо\\/Відеовиклик"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Розмова/Наді_слати файл..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Розмова/Отримати відомості"
+msgstr "/Розмова/Отримати сигнал _уваги"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Розмова/Додати _правило стеження..."
@@ -11964,9 +11949,8 @@ msgstr "/Розмова/Аудіо та відеовиклик"
 msgid "/Conversation/Send File..."
 msgstr "/Розмова/Надіслати файл..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Розмова/Отримати відомості"
+msgstr "/Розмова/Отримати сигнал уваги"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Розмова/Додати правило стеження..."
@@ -12032,13 +12016,11 @@ msgstr "_Надіслати"
 msgid "0 people in room"
 msgstr "0 користувачів у кімнаті"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Закрити цю вкладку"
+msgstr "Закрити панель пошуку"
 
-#, fuzzy
 msgid "Find:"
-msgstr "Знайти"
+msgstr "Знайти:"
 
 #, c-format
 msgid "%d person in room"
@@ -12126,7 +12108,7 @@ msgid "Filter"
 msgstr "Фільтр"
 
 msgid "Right click for more options."
-msgstr "Права кнопка миші для більших опцій."
+msgstr "Права кнопка миші для ще опцій."
 
 msgid "Level "
 msgstr "Рівень"
@@ -12178,7 +12160,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]"
@@ -12202,6 +12184,9 @@ msgstr "Афріканс"
 msgid "Arabic"
 msgstr "Арабська"
 
+msgid "Assamese"
+msgstr "Асамська"
+
 msgid "Belarusian Latin"
 msgstr "Білоруська (латиниця)"
 
@@ -12211,6 +12196,9 @@ msgstr "Болгарська"
 msgid "Bengali"
 msgstr "Бенгальська"
 
+msgid "Bengali-India"
+msgstr "Бенгальська Індія"
+
 msgid "Bosnian"
 msgstr "Боснійська"
 
@@ -12325,6 +12313,9 @@ msgstr "Лао"
 msgid "Macedonian"
 msgstr "Македонська"
 
+msgid "Malayalam"
+msgstr "Малаялам"
+
 msgid "Mongolian"
 msgstr "Монгольська"
 
@@ -12433,7 +12424,7 @@ msgstr "Амхарська"
 msgid "Lithuanian"
 msgstr "Литовська"
 
-#, fuzzy, c-format
+#, 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 "
@@ -12442,15 +12433,13 @@ msgid ""
 "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 ""
@@ -12459,8 +12448,11 @@ msgid ""
 "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>\tКанал IRC: #pidgin на "
+"irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12470,25 +12462,25 @@ msgid ""
 "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\"><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"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Відомості про користувача"
+msgstr "Відомості про збірку"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Відомості про користувача"
+msgstr "Відомості про збірку %s"
 
 msgid "Current Developers"
 msgstr "Поточні розробники"
@@ -12502,9 +12494,9 @@ msgstr "Колишні розробники"
 msgid "Retired Crazy Patch Writers"
 msgstr "Одержимі автори латок"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Відомості про сервер"
+msgstr "Відомості про розробників %s"
 
 msgid "Current Translators"
 msgstr "Поточні перекладачі"
@@ -12512,9 +12504,9 @@ msgstr "Поточні перекладачі"
 msgid "Past Translators"
 msgstr "Попередні перекладачі"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Більше відомостей"
+msgstr "Відомості про перекладачів %s"
 
 msgid "_Name"
 msgstr "_Ім'я"
@@ -12920,9 +12912,8 @@ msgstr "Вставити зображення"
 msgid "Insert Smiley"
 msgstr "Вставити усмішку"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Кнопка \"Надіслати\""
+msgstr "Надіслати сигнал уваги"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Жирний</b>"
@@ -12970,7 +12961,7 @@ msgid "_Smile!"
 msgstr "_Усмішка!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Увага!"
 
 msgid "Log Deletion Failed"
 msgstr "Помилка видалення журналу"
@@ -13101,11 +13092,11 @@ 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."
@@ -13453,7 +13444,7 @@ msgid "_Notify buddies that you are typing to them"
 msgstr "_Сповіщати користувачів, що ви їм пишете"
 
 msgid "Highlight _misspelled words"
-msgstr "Підсвітити _слова з орфографічними помилками"
+msgstr "Підсвітити _слова з помилками правопису"
 
 msgid "Use smooth-scrolling"
 msgstr "Використати плавне прокручування"
@@ -13907,10 +13898,6 @@ msgstr "Текст скорочення"
 msgid "Custom Smiley Manager"
 msgstr "Керування нетиповими усмішками"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Необхідна активація"
-
 msgid "Select Buddy Icon"
 msgstr "Виберіть значок контакту"
 
@@ -15044,8 +15031,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 "Показувати дати у..."
@@ -15243,147 +15239,151 @@ msgstr "<font color='#777777'>Не з'єднаний з XMPP</font>"
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Надіслати та отримати сирі строфи XMPP."
+msgstr "Надіслати та отримати сирі рядки XMPP."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Додаток корисний для зневадження серверів або клієнтів XMPP."
 
-#~ 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 профілю"
+#. $(^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 ""
+"$(^Name) випущений під ліцензією GNU General Public License (GPL). Ліцензія "
+"подана тут тільки з метою ознайомлення. $_CLICK"
 
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Додаток протоколу MSN"
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Багатоплатформена графічна бібліотека, що використовується Pidgin"
 
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s не є правильною назвою групи."
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+"Запущений екземпляр Pidgin. Будь ласка, вийдіть з Pidgin та спробуйте знову."
 
-#~ msgid "Unknown error."
-#~ msgstr "Невідома помилка."
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Основні файли Pidgin та dll"
 
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s на %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Створити запис у меню \"Пуск\" для Pidgin"
 
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Не вдається додати користувача %s (%s)"
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Створити значок Pidgin на стільниці"
 
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Не вдається заблокувати користувача %s (%s)"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Debug Symbols (для звітування вад)"
 
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Не вдається дозволити користувача %s (%s)"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "Стільниця"
 
-#~ msgid "%s could not be added because your buddy list is full."
-#~ 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 "%s is not a valid passport account."
-#~ msgstr "%s не є допустимим паспортним обліковим записом."
+#. $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 "Service Temporarily Unavailable."
-#~ 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 "Unable to rename group"
-#~ msgstr "Не вдається змінити назву групи"
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "Бібліотека GTK+ (необхідна, якщо не вcтановлена)"
 
-#~ msgid "Unable to delete group"
-#~ msgstr "Не вдається видалити групу"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "Локалізації"
 
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s додав вас до своєї адресної книги."
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "Наступне >"
 
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s вилучив вас зі своєї адресної книги."
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Клієнт обміну миттєвими повідомленнями Pidgin (необхідно)"
 
-#~ 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 ""
+"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 ""
-#~ "<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>"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "Комбінації клавіш"
 
-#~ 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>"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "Значки для запуску Pidgin"
 
-#~ msgid "Debugging Information"
-#~ msgstr "Відомості зневадження"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "Підтримка перевірки правопису"
 
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Невідомий тип файлу\n"
-#~ "\n"
-#~ "Вважається, що PNG."
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "Меню 'Пуск'"
 
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Помилка збереження зображення\n"
-#~ "\n"
-#~ "%s"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+"Підтримка перевірки правопису. (Необхідне з'єднання з Інтернетом для "
+"встановлення)"
 
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Не вдається відкрити файл '%s': %s"
+msgid "The installer is already running."
+msgstr "Встановлювач вже запущений."
 
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr ""
-#~ "Помилка завантаження зображення '%s': причина невідома, можливо, "
-#~ "пошкоджений файл зображення"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Видаляч не може знайти записів для Pidgin у реєстрі.$\\rСхоже, що цю "
+"програму встановив інший користувач."
 
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Вставити строфу <iq/>."
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "Обробники посилань URI"
 
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Вставити строфу <presence/>."
+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 "Insert a <message/> stanza."
-#~ msgstr "Вставити строфу <message/>."
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "Відвідати сторінку тенет Pidgin"
 
-#~ 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 "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr ""
-#~ "Не вдалося знайти додатковий спосіб з'єднання XMPP після невдачі з'єдання "
-#~ "безпосередньо."
-
-#~ msgid "CAPTCHA requested. Logging into the AIM/ICQ website may fix this."
-#~ msgstr "Запитана CAPTCHA. Вхід на сторінку тенет AIM/ICQ може виправити це."
+msgid "You do not have permission to uninstall this application."
+msgstr "Ви не маєте права на видалення цієї програми."
diff --git a/po/ur.po b/po/ur.po
index 98954959e1..97835c9de8 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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 "نئی میل اطلاعات"
 
@@ -802,7 +815,7 @@ msgstr "سیٹ اپ "
 msgid "Waiting for transfer to begin"
 msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr " منسوخ کیا گیا"
 
 msgid "Failed"
@@ -1308,6 +1321,10 @@ msgstr "دوسرے گفتگو میں بات کرتے ہیں"
 msgid "Someone says your username in chat"
 msgstr " كسی نے آپ كا نام چیٹ میں كہا ہے"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "رجسٹریشن کی ضروت تھی"
+
 msgid "GStreamer Failure"
 msgstr "GSٹریمر نا كامیاب"
 
@@ -1414,7 +1431,6 @@ msgid "Saved Statuses"
 msgstr "حالات محفوظ کئے گئے"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "عنوان"
 
@@ -1611,7 +1627,7 @@ msgstr ""
 msgid "Online"
 msgstr "آن لائن"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr " آف لائن  "
 
@@ -1710,6 +1726,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 "نامعلوم"
 
@@ -1727,9 +1751,10 @@ 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."
 msgstr ""
@@ -1962,7 +1987,6 @@ msgstr "خامی دوبارہ حل كررہا ہے%s: %d"
 msgid "Thread creation failure: %s"
 msgstr "تھریڈ كی تخلیق نا كامیاب: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "نا معلوم وجہ"
 
@@ -3245,6 +3269,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 "ابتدائی نام"
 
@@ -3863,14 +3890,6 @@ 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 لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "سرور کو ان اینکریپٹیڈ اسٹریم پر سادہ متن تصدیق کی ضرورت ہے "
 
@@ -3902,6 +3921,18 @@ 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 "تصدیق نا کام"
 
@@ -3910,6 +3941,42 @@ 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 "وضع کرنے میں نا قابل"
 
@@ -3984,6 +4051,7 @@ msgstr "  ریاست"
 msgid "Postal Code"
 msgstr "پوسٹل کوڈ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "ملک"
 
@@ -3998,10 +4066,14 @@ msgstr "تنظیم کا نام"
 msgid "Organization Unit"
 msgstr "تنظیم یونٹ"
 
+msgid "Job Title"
+msgstr "جاب عنوان"
+
 msgid "Role"
 msgstr "رول"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "سالگرہ"
 
@@ -4230,6 +4302,14 @@ 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 "سادہ متن"
 
@@ -4237,6 +4317,9 @@ msgstr "سادہ متن"
 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 ""
 
@@ -4343,7 +4426,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "تصدیق نہيں کیا گیا"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "موڈ"
 
@@ -4365,7 +4447,6 @@ msgstr "کو"
 msgid "None (To pending)"
 msgstr "کوئی نہیں(پینڈینک کے لئے)"
 
-#. 0
 msgid "None"
 msgstr "کوئی نہیں"
 
@@ -4389,6 +4470,12 @@ msgstr "درمیانی نام"
 msgid "Mood Comment"
 msgstr "بڈی رائے"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4563,9 +4650,6 @@ msgstr "پالیسی خلاف ورزی"
 msgid "Remote Connection Failed"
 msgstr "ریموٹ کنیکشن ناکام ہوا"
 
-msgid "Resource Constraint"
-msgstr "ذرائع جبر"
-
 msgid "Restricted XML"
 msgstr "محدودXML"
 
@@ -4932,7 +5016,6 @@ msgstr "شرمندہ"
 msgid "Amorous"
 msgstr "گلوریس"
 
-#. 1
 msgid "Angry"
 msgstr "غصہ"
 
@@ -5030,7 +5113,6 @@ msgstr ""
 msgid "Envious"
 msgstr "متفکر"
 
-#. 2
 msgid "Excited"
 msgstr "پر جوش "
 
@@ -5049,7 +5131,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "گروپ"
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "گروپ"
@@ -5058,14 +5139,12 @@ msgstr "گروپ"
 msgid "Guilty"
 msgstr "شہر"
 
-#. 4
 msgid "Happy"
 msgstr "خوش"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_ ہوسٹ:"
@@ -5106,7 +5185,6 @@ msgstr "دلچسپیاں"
 msgid "Intoxicated"
 msgstr "مدعوكریں"
 
-#. 6
 msgid "Invincible"
 msgstr " نا قابل فتح"
 
@@ -5170,7 +5248,6 @@ msgstr "نکالو"
 msgid "Restless"
 msgstr "رجسٹر"
 
-#. 7
 msgid "Sad"
 msgstr "غمگین"
 
@@ -5191,12 +5268,10 @@ msgstr "بلاک کیا گیا"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "نک"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "نیند"
@@ -5610,20 +5685,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 "عنوان"
@@ -5662,8 +5723,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 ""
@@ -5779,9 +5840,6 @@ msgstr "شادی كی سالگرہ"
 msgid "Work"
 msgstr "كام"
 
-msgid "Job Title"
-msgstr "جاب عنوان"
-
 msgid "Company"
 msgstr "ادارہ"
 
@@ -5873,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 "نج:صارف كی توجہ دلانےكےلیے اسےنج كریں"
 
@@ -6073,28 +6135,6 @@ msgstr "کیا آپ اس بڈی کو اپنی بڈی لسٹ میں شامل کر
 msgid "The username specified is invalid."
 msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
 
-#. 5
-msgid "In Love"
-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 "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
@@ -6131,7 +6171,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"
@@ -6140,6 +6184,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "خاندان کا نام"
@@ -6170,11 +6215,6 @@ msgstr ""
 msgid "About"
 msgstr "Adium"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "خفیہ لفظ تبدیل كریں۔۔۔"
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6218,7 +6258,7 @@ msgid "Connecting..."
 msgstr "کنیکٹ کررہا ہے"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
 #, fuzzy
@@ -6226,14 +6266,9 @@ 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"
@@ -6262,10 +6297,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
@@ -6279,7 +6314,7 @@ msgstr ""
 msgid "Security Code"
 msgstr "حفاظتی قابل کی گئی"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "خفیہ لفظ داخل کرو"
@@ -6313,12 +6348,17 @@ 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")
@@ -6333,6 +6373,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 ""
@@ -6452,6 +6514,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "محبت میں"
+
 #, fuzzy
 msgid "Pending"
 msgstr "بھیجو"
@@ -6868,9 +6933,6 @@ msgstr "خفیہ لفظ ختم ہوچکا"
 msgid "Incorrect password"
 msgstr "غیر  صحیح پاس ورڈ"
 
-msgid "User not found"
-msgstr "صارف نہیں ملا"
-
 msgid "Account has been disabled"
 msgstr "اکاؤنٹ ناقابل کیا گیا"
 
@@ -7128,6 +7190,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "خامی رابطہ قائم کررہی ہے"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "كنیكٹ نہیں ہوسكا"
@@ -7136,6 +7202,68 @@ 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 ""
+
+#, 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 "آف لائن"
+
+#, 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کو پیام بھیجنے میں ناقابل:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7304,120 +7432,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 "یقینی  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 "
@@ -7775,30 +7789,10 @@ 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 "آن لائن جب تک "
 
@@ -8083,8 +8077,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"
@@ -8237,6 +8231,75 @@ 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کے دوران نہیں"
+
 msgid "Aquarius"
 msgstr "برج دلو"
 
@@ -8560,6 +8623,11 @@ msgstr "درخواست ڈائیلاگ"
 msgid "Admin"
 msgstr "Adium"
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "کمرہ فہرست"
+
 #, fuzzy
 msgid "Notice"
 msgstr "نوٹ"
@@ -10507,9 +10575,6 @@ msgstr "یا ہو! ID"
 msgid "Yahoo! Protocol Plugin"
 msgstr "یا ہو پروٹوکال پلگ ان"
 
-msgid "Pager server"
-msgstr "پیجرسرور"
-
 msgid "Pager port"
 msgstr "پیج رپورٹ"
 
@@ -10525,18 +10590,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"
@@ -10607,6 +10666,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"
@@ -10689,6 +10756,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"
@@ -10967,8 +11045,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;"
@@ -11073,6 +11151,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 "_قبول كریں"
 
@@ -11322,12 +11404,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 "لاگ ان آپشنس"
@@ -12571,6 +12647,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "عربی"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "شرمندہ"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12580,6 +12660,10 @@ msgstr "بلغاری"
 msgid "Bengali"
 msgstr "بنگالی"
 
+#, fuzzy
+msgid "Bengali-India"
+msgstr "بنگالی"
+
 msgid "Bosnian"
 msgstr "بوسنییائی"
 
@@ -12701,6 +12785,10 @@ msgid "Macedonian"
 msgstr "میسی ڈونین"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "مرد"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "میسی ڈونین"
 
@@ -12823,8 +12911,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13394,14 +13482,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
@@ -13491,10 +13579,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
@@ -14365,10 +14453,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "رجسٹریشن کی ضروت تھی"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "بڈی منتخب کرو"
 
@@ -15617,7 +15701,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..."
@@ -15830,6 +15926,205 @@ msgstr ""
 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."
+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
+#, 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 "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 "خامی رابطہ قائم کررہی ہے"
@@ -15977,9 +16272,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_صارف    :"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ رن ٹائم ورجن"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "شمارکررہا ہے۔۔۔"
@@ -16508,7 +16800,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."
@@ -16744,13 +17036,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 7ee2fe29a4..a3a230032b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-01 19:22-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -792,7 +805,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"
@@ -848,8 +861,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"
@@ -1258,6 +1271,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"
 
@@ -1351,7 +1367,6 @@ msgid "Saved Statuses"
 msgstr "Trạng thái đã lưu"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Tên"
 
@@ -1553,7 +1568,7 @@ msgstr ""
 msgid "Online"
 msgstr "Trực tuyến"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
@@ -1648,6 +1663,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õ"
 
@@ -1667,8 +1690,10 @@ 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."
 msgstr ""
@@ -1904,7 +1929,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õ"
 
@@ -2075,57 +2099,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 "
@@ -2957,8 +2981,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"
@@ -3187,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 "Tên"
 
@@ -3796,13 +3823,6 @@ 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ã"
@@ -3834,6 +3854,19 @@ 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"
 
@@ -3841,6 +3874,42 @@ msgstr "Lỗi xác thực SASL"
 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"
 
@@ -3904,6 +3973,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"
 
@@ -3918,10 +3988,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"
 
@@ -4139,12 +4213,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 "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)."
 
@@ -4243,7 +4328,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"
 
@@ -4265,7 +4349,6 @@ msgstr "Cho"
 msgid "None (To pending)"
 msgstr "Không (chưa điền Cho)"
 
-#. 0
 msgid "None"
 msgstr "Không"
 
@@ -4285,6 +4368,12 @@ 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"
 
@@ -4455,9 +4544,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ế"
 
@@ -4820,7 +4906,6 @@ msgstr "Kinh ngạc"
 msgid "Amorous"
 msgstr "Đa tình"
 
-#. 1
 msgid "Angry"
 msgstr "Giận dữ"
 
@@ -4899,7 +4984,6 @@ msgstr "Lúng túng"
 msgid "Envious"
 msgstr "Thèm muốn"
 
-#. 2
 msgid "Excited"
 msgstr "Hào hứng"
 
@@ -4915,21 +4999,18 @@ msgstr "Biết ơn"
 msgid "Grieving"
 msgstr "Đau buồn"
 
-#. 3
 msgid "Grumpy"
 msgstr "Gắt gỏng"
 
 msgid "Guilty"
 msgstr "Có tội"
 
-#. 4
 msgid "Happy"
 msgstr "Vui"
 
 msgid "Hopeful"
 msgstr "Đầy hy vọng"
 
-#. 8
 msgid "Hot"
 msgstr "Nóng"
 
@@ -4963,7 +5044,6 @@ msgstr "Quan tâm"
 msgid "Intoxicated"
 msgstr "Say"
 
-#. 6
 msgid "Invincible"
 msgstr "Vô địch"
 
@@ -5015,7 +5095,6 @@ msgstr "Ăn năn"
 msgid "Restless"
 msgstr "Không nghỉ"
 
-#. 7
 msgid "Sad"
 msgstr "Buồn"
 
@@ -5034,11 +5113,9 @@ msgstr "Bị sốc"
 msgid "Shy"
 msgstr "Nhút nhát"
 
-#. 9
 msgid "Sick"
 msgstr "Bị bịnh"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Buồn ngủ"
@@ -5120,8 +5197,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 ""
@@ -5433,19 +5510,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"
 
@@ -5593,9 +5657,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"
 
@@ -5683,6 +5744,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ú ý"
 
@@ -5863,24 +5928,6 @@ 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ệ."
 
-#. 5
-msgid "In Love"
-msgstr "Yêu"
-
-#. show current mood
-msgid "Current Mood"
-msgstr "Tâm trạng hiện thời"
-
-#. add all moods to list
-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 "The PIN you entered is invalid."
 msgstr "Bạn đã gõ một mã PIN không đúng."
 
@@ -5898,7 +5945,8 @@ msgstr "Bạn đã gõ một tên không đúng."
 
 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 »."
+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
 msgid "Profile Update Error"
@@ -5912,7 +5960,11 @@ 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
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5920,6 +5972,7 @@ msgid "Verify PIN"
 msgstr "Thẩm tra PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
@@ -5946,10 +5999,6 @@ msgstr "Hiện thời không có màn hình giật gân sẵn sàng"
 msgid "About"
 msgstr "Giới thiệu"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "Đổi tâm trạng..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "Đổi hồ sơ..."
@@ -5984,19 +6033,16 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Bạn đã gõ một tên hiệu không đúng."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Bạn đã gõ một tên không đúng."
 
 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"
-msgstr "Tên đăng nhập MXit"
-
-#. nick name
-msgid "Nick Name"
-msgstr "Tên hiệu"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6024,10 +6070,12 @@ 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 "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."
+#, 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."
@@ -6041,7 +6089,7 @@ msgstr "Bạn chưa gõ mã bảo mật"
 msgid "Security Code"
 msgstr "Mã bảo mật"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Gõ mã bảo mật"
 
@@ -6067,11 +6115,17 @@ msgstr "Đang nạp trình đơn..."
 msgid "Status Message"
 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 "Con số bị ẩn"
 
-msgid "Your Mobile Number..."
-msgstr "Số điện thoại di động của bạn..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6084,6 +6138,28 @@ msgstr "Kết nối qua HTTP"
 msgid "Enable splash-screen popup"
 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 "Kết nối tới MXit bị mất. Hãy tái kết nối."
@@ -6188,6 +6264,9 @@ msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "MXit đã gặp một lỗi kết nối. (giai đoạn đọc 0x06)"
 
+msgid "In Love"
+msgstr "Yêu"
+
 msgid "Pending"
 msgstr "Bị hoãn"
 
@@ -6583,9 +6662,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"
 
@@ -6842,12 +6918,73 @@ msgstr ""
 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 "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ĩ"
 
@@ -7001,116 +7138,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 "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"
-
 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 "
@@ -7450,28 +7477,9 @@ 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."
 
 #, 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"
-
-#, 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ừ"
 
@@ -7882,6 +7890,75 @@ 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"
+
 msgid "Aquarius"
 msgstr "Bảo Bình"
 
@@ -8164,6 +8241,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"
 
@@ -8707,8 +8789,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"
@@ -8779,8 +8861,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 ""
@@ -8889,8 +8971,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"
@@ -9536,8 +9618,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á"
@@ -10077,9 +10159,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"
 
@@ -10095,18 +10174,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..."
 
@@ -10174,6 +10248,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"
@@ -10253,6 +10336,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à"
 
@@ -10632,6 +10726,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"
 
@@ -10864,12 +10962,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"
@@ -12021,6 +12113,10 @@ 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"
 
@@ -12148,6 +12244,10 @@ msgstr "Tiếng Lào"
 msgid "Macedonian"
 msgstr "Tiếng Ma-xê-đô-ni"
 
+#, fuzzy
+msgid "Malayalam"
+msgstr "TIếng Mã Lai"
+
 msgid "Mongolian"
 msgstr "Tiếng Mông Cổ"
 
@@ -12262,8 +12362,8 @@ msgid ""
 "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>"
+"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 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 "
@@ -12810,16 +12910,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"
 
@@ -12925,11 +13025,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."
@@ -13734,9 +13836,6 @@ msgstr "Chuỗi lối tắt"
 msgid "Custom Smiley Manager"
 msgstr "Bộ Quản lý Hình cười Riêng"
 
-msgid "Attention received"
-msgstr "Nhận được sự chú ý"
-
 msgid "Select Buddy Icon"
 msgstr "Chọn biểu tượng bạn chát"
 
@@ -14869,8 +14968,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..."
@@ -15078,6 +15189,200 @@ 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."
+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 "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"
 
diff --git a/po/xh.po b/po/xh.po
index fb9ddfb859..aa4c2e45e2 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: 2010-03-29 00:17-0700\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
 
@@ -830,7 +843,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 +1354,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 +1465,6 @@ msgid "Saved Statuses"
 msgstr "Izibalo ngeSeva"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Isihloko"
 
@@ -1656,7 +1672,7 @@ msgstr ""
 msgid "Online"
 msgstr "Lukhona unxibelelwano"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Akukho lunxibelelwano"
 
@@ -1758,6 +1774,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"
 
@@ -1776,9 +1800,10 @@ 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."
 msgstr ""
@@ -2016,7 +2041,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."
@@ -3317,6 +3341,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"
 
@@ -3975,14 +4002,6 @@ 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"
-
-#, fuzzy
-msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Iseva ifuna i-SSL ukuze ingene"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Iseva ifuna uqinisekiso lombhalo ocacileyo kunohlobo oluntsonkothileyo"
 
@@ -4015,6 +4034,18 @@ 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"
 
@@ -4023,6 +4054,42 @@ msgid "SASL error: %s"
 msgstr "ImPazamo efundiweyo"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Ukugqibezela uNxulumano"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "INguqulelo engaXhaswanga"
+
+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 "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"
 
@@ -4093,6 +4160,7 @@ msgstr "Ummandla"
 msgid "Postal Code"
 msgstr "iKhowudi yePosi"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ilizwe"
 
@@ -4107,10 +4175,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"
 
@@ -4346,6 +4418,14 @@ 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"
 
@@ -4353,6 +4433,9 @@ msgstr "Umbhalo ocacileyo"
 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 ""
 
@@ -4459,7 +4542,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "Engagunyaziswanga"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Isimo"
 
@@ -4481,7 +4563,6 @@ msgstr "Ku-"
 msgid "None (To pending)"
 msgstr "Akukho nto (Ukuya kuxhomekeko)"
 
-#. 0
 msgid "None"
 msgstr "Akukho nto"
 
@@ -4505,6 +4586,12 @@ msgstr "iGama eliPhakathi"
 msgid "Mood Comment"
 msgstr "Izimvo zomHlobo"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4681,9 +4768,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"
 
@@ -5056,7 +5140,6 @@ msgstr "Oneentloni"
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Onomsindo"
 
@@ -5154,7 +5237,6 @@ msgstr ""
 msgid "Envious"
 msgstr "Oxhalabileyo"
 
-#. 2
 msgid "Excited"
 msgstr "Onemincili"
 
@@ -5172,7 +5254,6 @@ msgstr ""
 msgid "Grieving"
 msgstr "Ukunxulumana..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Iqela:"
@@ -5181,14 +5262,12 @@ msgstr "Iqela:"
 msgid "Guilty"
 msgstr "Isixeko"
 
-#. 4
 msgid "Happy"
 msgstr "Ovuyayo"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Umququzeleli:"
@@ -5229,7 +5308,6 @@ msgstr "_Fakela"
 msgid "Intoxicated"
 msgstr "Mema"
 
-#. 6
 msgid "Invincible"
 msgstr "Ongoyiswayo"
 
@@ -5293,7 +5371,6 @@ msgstr "Susa"
 msgid "Restless"
 msgstr "Bhalisa"
 
-#. 7
 msgid "Sad"
 msgstr "Olusizi"
 
@@ -5314,12 +5391,10 @@ msgstr "Thintelwe"
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Isikhewu"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Owozelayo"
@@ -5745,19 +5820,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"
@@ -5932,9 +5994,6 @@ msgstr ""
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Isihloko somsebenzi"
-
 msgid "Company"
 msgstr "Inkampani"
 
@@ -6034,6 +6093,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 ""
 
@@ -6246,27 +6309,6 @@ msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
 msgid "The username specified is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
-#. 5
-msgid "In Love"
-msgstr "Ngothando"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Imo yaKho yaNgoku"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "Izimo zomSebenzisi"
-
-#, fuzzy
-msgid "Change your Mood"
-msgstr "UkuTshintsha i-Password"
-
-msgid "How do you feel right now?"
-msgstr ""
-
 #, fuzzy
 msgid "The PIN you entered is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
@@ -6303,7 +6345,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"
@@ -6312,6 +6358,7 @@ msgid "Verify PIN"
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Okuseskrinini"
@@ -6343,11 +6390,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..."
@@ -6391,7 +6433,7 @@ msgid "Connecting..."
 msgstr "Ukunxulumana"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
 #, fuzzy
@@ -6399,14 +6441,9 @@ 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"
@@ -6443,10 +6480,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
@@ -6460,7 +6497,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"
@@ -6494,12 +6531,17 @@ 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")
@@ -6514,6 +6556,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."
@@ -6634,6 +6698,9 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "Ngothando"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Thumela"
@@ -7055,9 +7122,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"
 
@@ -7321,6 +7385,10 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Impazamo yokudala unxibelelwano"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Akukwazeki ukunxulumana"
@@ -7329,6 +7397,67 @@ msgstr "Akukwazeki ukunxulumana"
 msgid "Invalid chat room name"
 msgstr "iGama elingaSebenziyo leGumbi"
 
+msgid "Invalid error"
+msgstr "Impazamo engasebenziyo"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Akukwazeki ukuthumela ifayili"
+
+#. 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 "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 "Akukwazeki ukuthumela umyalezo."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Akukho lunxibelelwano "
+
+#, 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:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7502,120 +7631,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 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 "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"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Akukwazeki ukuthumela ifayili"
-
-#. 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 "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 "Akukwazeki ukuthumela umyalezo."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Akukho lunxibelelwano "
-
 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 "
@@ -7977,29 +7992,10 @@ 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"
 
@@ -8448,6 +8444,75 @@ 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"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8789,6 +8854,11 @@ msgstr "Isicelo simbaxa"
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Uluhlu lweGumbi"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Inqaku"
@@ -10826,10 +10896,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"
 
@@ -10847,20 +10913,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!"
@@ -10933,6 +10992,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"
@@ -10992,8 +11060,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"
@@ -11016,6 +11084,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"
 
@@ -11420,6 +11499,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"
@@ -11669,13 +11752,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"
@@ -12965,6 +13041,10 @@ msgstr ""
 msgid "Arabic"
 msgstr "IsiAmharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Oneentloni"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12974,6 +13054,9 @@ msgstr "IsiBulgaria"
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "IsiRomania"
@@ -13101,6 +13184,10 @@ msgid "Macedonian"
 msgstr "IsiMacedonia"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Indoda"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "IsiMacedonia"
 
@@ -13224,8 +13311,8 @@ msgid ""
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13807,14 +13894,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
@@ -13909,10 +13996,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
@@ -14826,10 +14913,6 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Kufuneka uBhaliso"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Khetha umHlobo"
 
@@ -16070,7 +16153,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
@@ -16290,6 +16383,195 @@ msgstr ""
 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."
+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 "Yamkela eziMiselweyo"
+
+#. $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 "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 "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"
@@ -16435,9 +16717,6 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "_Umsebenzisi:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "I-GTK+ iNguqulelo yeXesha lokuSebenza"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Ukubala..."
@@ -16913,7 +17192,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."
 
@@ -18291,9 +18570,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 460e299753..c268909fec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-01-13 01:15+0800\n"
+"POT-Creation-Date: 2010-07-27 02:13-0400\n"
+"PO-Revision-Date: 2010-07-19 19:31+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 "新邮件通知"
 
@@ -765,7 +777,7 @@ msgstr "停止"
 msgid "Waiting for transfer to begin"
 msgstr "正在等待传送开始"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -828,7 +840,7 @@ msgstr "总计聊天记录大小："
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "搜索："
 
 #, c-format
 msgid "Conversations in %s"
@@ -1226,6 +1238,9 @@ msgstr "别人在聊天中发言"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天中提到您的名字"
 
+msgid "Attention received"
+msgstr "收到提示"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 错误"
 
@@ -1319,7 +1334,6 @@ msgid "Saved Statuses"
 msgstr "已存状态"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "标题"
 
@@ -1394,7 +1408,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 +1457,7 @@ msgid "Beep too!"
 msgstr "同时发出声音！"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "为终端窗口设置 URGENT。"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1512,7 +1526,7 @@ msgstr "当接收到带有 URL 的消息时将其转换到 TinyURL 以方便复�
 msgid "Online"
 msgstr "在线"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "离线"
 
@@ -1605,6 +1619,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 "未知"
 
@@ -1622,8 +1642,10 @@ 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 "此证书已过期，故不被认为有效。"
@@ -1652,7 +1674,7 @@ msgstr "(不匹配)"
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s 已办法了以下一次性证书："
 
 #, c-format
 msgid ""
@@ -1813,7 +1835,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 "无名称"
@@ -1856,7 +1878,6 @@ msgstr "转换 %s 为微代码时出错：%d"
 msgid "Thread creation failure: %s"
 msgstr "创建线程失败：%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -2175,11 +2196,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 ""
@@ -2254,6 +2275,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 "为每个用户创建新目录"
@@ -2459,7 +2482,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 "您已经断开与服务器的连接。"
@@ -2645,7 +2668,7 @@ msgstr "一次性密码支持"
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "强制密码仅能使用一次。"
 
 #. *  description
 msgid ""
@@ -3071,6 +3094,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 "名"
 
@@ -3643,12 +3669,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 登录，但未找到 TLS/SSL 支持。"
-
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
@@ -3675,7 +3695,16 @@ msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
 msgid "Server thinks authentication is complete, but client does not"
-msgstr ""
+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 "认证失败"
@@ -3684,6 +3713,37 @@ msgstr "认证失败"
 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 "无法对用户名进行规范化处理"
 
@@ -3698,7 +3758,7 @@ msgid "Unexpected response from server"
 msgstr "从服务器收到了意外的响应"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "BOSH 连接管理器终止了您的会话。"
 
 msgid "No session ID given"
 msgstr "没有给出会话 ID"
@@ -3748,6 +3808,7 @@ msgstr "区域"
 msgid "Postal Code"
 msgstr "邮政编码"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "国家"
 
@@ -3762,10 +3823,14 @@ msgstr "组织名称"
 msgid "Organization Unit"
 msgstr "组织单元"
 
+msgid "Job Title"
+msgstr "职称"
+
 msgid "Role"
 msgstr "职务"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -3979,17 +4044,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 "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 ""
+msgstr "畸形的 BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4081,7 +4156,6 @@ msgstr ""
 msgid "Not Authorized"
 msgstr "未认证"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4103,7 +4177,6 @@ msgstr "到"
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#. 0
 msgid "None"
 msgstr "无"
 
@@ -4117,14 +4190,18 @@ msgstr "心情文字"
 msgid "Allow Buzz"
 msgstr "允许屏幕振动"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "教名"
+msgstr "心情名称"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "好友注释"
+msgstr "心情注释"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "歌曲艺术家"
 
@@ -4295,9 +4372,6 @@ msgstr "违背策略"
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-msgid "Resource Constraint"
-msgstr "资源约束"
-
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
@@ -4399,7 +4473,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 "选择资源"
@@ -4407,9 +4481,8 @@ msgstr "选择资源"
 msgid "Initiate Media"
 msgstr "创建多媒体会话"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "此协议不支持聊天室。"
+msgstr "此帐号不支持 PEP，无法发送心情"
 
 msgid "config:  Configure a chat room."
 msgstr "配置：配置聊天室。"
@@ -4460,9 +4533,8 @@ msgstr "ping &lt;jid&gt;：\tPing 用户/组件/服务器"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz： 向联系人发送闪屏震动，以便引起他的注意"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "选择正确用户"
+msgstr "mood：设置当前用户心情"
 
 msgid "Extended Away"
 msgstr "离开"
@@ -4506,7 +4578,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
@@ -4540,21 +4612,20 @@ msgstr "XMPP 消息错误"
 msgid "(Code %s)"
 msgstr "(代码 %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "无法发送消息：消息太大。"
+msgstr "消息中的自定义表情太大，无法发送。"
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP 流头部缺失"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP 版本不匹配"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP 流 ID 缺失"
 
 msgid "XML Parse error"
-msgstr "XML 分析错误"
+msgstr "XML 解析错误"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4624,280 +4695,226 @@ msgstr "无法给 %s 发送文件：未添加用户监视"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#, fuzzy
 msgid "Afraid"
-msgstr "阿拉伯语"
+msgstr "害怕"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "害羞"
+msgstr "惊讶"
 
-#, fuzzy
 msgid "Amorous"
-msgstr "显赫"
+msgstr "恋爱"
 
-#. 1
 msgid "Angry"
 msgstr "生气"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "已封禁"
+msgstr "烦闷"
 
 msgid "Anxious"
-msgstr "饥渴"
+msgstr "忧虑"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "送出文字"
+msgstr "刚醒"
 
 msgid "Ashamed"
 msgstr "害羞"
 
 msgid "Bored"
-msgstr "枯燥"
+msgstr "无聊"
 
-#, fuzzy
 msgid "Brave"
-msgstr "保存"
+msgstr "勇敢"
 
-#, fuzzy
 msgid "Calm"
-msgstr "域"
+msgstr "冷静"
 
-#, fuzzy
 msgid "Cautious"
-msgstr "聊天"
+msgstr "警惕"
 
-#, fuzzy
 msgid "Cold"
-msgstr "粗体"
+msgstr "感冒"
 
-#, fuzzy
 msgid "Confident"
-msgstr "冲突"
+msgstr "自信"
 
-#, fuzzy
 msgid "Confused"
-msgstr "继续"
+msgstr "困惑"
 
-#, fuzzy
 msgid "Contemplative"
-msgstr "联系信息"
+msgstr "沉思"
 
-#, fuzzy
 msgid "Contented"
-msgstr "已连接"
+msgstr "满足"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "公司"
+msgstr "怪癖"
 
 msgid "Crazy"
-msgstr ""
+msgstr "疯狂"
 
-#, fuzzy
 msgid "Creative"
-msgstr "创建"
+msgstr "创造"
 
-#, fuzzy
 msgid "Curious"
-msgstr "显赫"
+msgstr "好奇"
 
-#, fuzzy
 msgid "Dejected"
-msgstr "已拒绝"
+msgstr "灰心"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "已删除"
+msgstr "沮丧"
 
-#, fuzzy
 msgid "Disappointed"
-msgstr "已断开连接。"
+msgstr "失望"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "讨厌"
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "禁用"
+msgstr "惊愕"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "已脱离"
+msgstr "烦躁"
 
 msgid "Embarrassed"
-msgstr ""
+msgstr "尴尬"
 
-#, fuzzy
 msgid "Envious"
-msgstr "饥渴"
+msgstr "羡慕"
 
-#. 2
 msgid "Excited"
 msgstr "激动"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "显赫"
+msgstr "挑逗"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "名"
+msgstr "失望"
 
 msgid "Grateful"
-msgstr ""
+msgstr "感激"
 
-#, fuzzy
 msgid "Grieving"
-msgstr "正在获取..."
+msgstr "伤心"
 
-#. 3
 msgid "Grumpy"
 msgstr "暴躁"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "城市"
+msgstr "罪恶"
 
-#. 4
 msgid "Happy"
 msgstr "高兴"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "希望"
 
-#. 8
 msgid "Hot"
 msgstr "热情"
 
 msgid "Humbled"
-msgstr ""
+msgstr "谦卑"
 
 msgid "Humiliated"
-msgstr ""
+msgstr "屈辱"
 
-#, fuzzy
 msgid "Hungry"
-msgstr "生气"
+msgstr "饥饿"
 
-#, fuzzy
 msgid "Hurt"
-msgstr "心情"
+msgstr "伤心"
 
 msgid "Impressed"
-msgstr ""
+msgstr "印象深刻"
 
-#, fuzzy
 msgid "In awe"
-msgstr "热恋"
+msgstr "敬畏"
 
 msgid "In love"
 msgstr "热恋"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "印度尼西亚语"
+msgstr "愤慨"
 
 #, fuzzy
 msgid "Interested"
 msgstr "兴趣"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "已邀请"
+msgstr "醉酒"
 
-#. 6
 msgid "Invincible"
 msgstr "无敌"
 
 msgid "Jealous"
 msgstr "警惕"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "猴"
+msgstr "孤单"
 
-#, fuzzy
 msgid "Lost"
-msgstr "最大"
+msgstr "迷失"
 
 msgid "Lucky"
-msgstr ""
+msgstr "幸运"
 
-#, fuzzy
 msgid "Mean"
-msgstr "德语"
+msgstr "卑鄙"
 
-#, fuzzy
 msgid "Moody"
-msgstr "心情"
+msgstr "喜怒无常"
 
 msgid "Nervous"
-msgstr ""
+msgstr "紧张"
 
-#, fuzzy
 msgid "Neutral"
-msgstr "详细信息"
+msgstr "中立"
 
-#, fuzzy
 msgid "Offended"
-msgstr "离线"
+msgstr "生气"
 
 msgid "Outraged"
-msgstr ""
+msgstr "震怒"
 
-#, fuzzy
 msgid "Playful"
-msgstr "播放"
+msgstr "爱玩"
 
-#, fuzzy
 msgid "Proud"
-msgstr "大"
+msgstr "自豪"
 
-#, fuzzy
 msgid "Relaxed"
-msgstr "真名"
+msgstr "放松"
 
-#, fuzzy
 msgid "Relieved"
-msgstr "已接收"
+msgstr "解雇"
 
-#, fuzzy
 msgid "Remorseful"
-msgstr "删除"
+msgstr "悔恨"
 
-#, fuzzy
 msgid "Restless"
-msgstr "注册"
+msgstr "焦躁"
 
-#. 7
 msgid "Sad"
 msgstr "郁闷"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "讽刺"
 
 msgid "Satisfied"
-msgstr ""
+msgstr "满足"
 
-#, fuzzy
 msgid "Serious"
-msgstr "显赫"
+msgstr "严肃"
 
-#, fuzzy
 msgid "Shocked"
-msgstr "被屏蔽"
+msgstr "震惊"
 
 msgid "Shy"
-msgstr ""
+msgstr "害羞"
 
-#. 9
 msgid "Sick"
 msgstr "生病"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "困倦"
@@ -4905,37 +4922,32 @@ msgstr "困倦"
 msgid "Spontaneous"
 msgstr ""
 
-#, fuzzy
 msgid "Stressed"
-msgstr "速度："
+msgstr "压力"
 
-#, fuzzy
 msgid "Strong"
-msgstr "声音"
+msgstr "坚强"
 
 msgid "Surprised"
-msgstr ""
+msgstr "惊讶"
 
 msgid "Thankful"
-msgstr ""
+msgstr "感激"
 
 msgid "Thirsty"
-msgstr ""
+msgstr "渴望"
 
-#, fuzzy
 msgid "Tired"
-msgstr "Fire"
+msgstr "疲劳"
 
-#, fuzzy
 msgid "Undefined"
-msgstr "下划线"
+msgstr "点此修改心情"
 
 msgid "Weak"
-msgstr ""
+msgstr "虚弱"
 
-#, fuzzy
 msgid "Worried"
-msgstr "枯燥"
+msgstr "担忧"
 
 msgid "Set User Nickname"
 msgstr "设置用户昵称"
@@ -4946,7 +4958,7 @@ msgstr "请您为自己指定新的昵称。"
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "此信息对您的所有联系人可见，请选择合适的内容。"
 
 msgid "Set"
 msgstr "设置"
@@ -5248,7 +5260,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 "此帐号没有启用电子邮件。"
@@ -5289,18 +5301,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 "游戏标题"
 
@@ -5446,9 +5446,6 @@ msgstr "纪念日"
 msgid "Work"
 msgstr "工作"
 
-msgid "Job Title"
-msgstr "职称"
-
 msgid "Company"
 msgstr "公司"
 
@@ -5534,6 +5531,9 @@ msgstr "HTTP 方式服务器"
 msgid "Show custom smileys"
 msgstr "显示自定义如下："
 
+msgid "Allow direct connections"
+msgstr "允许直连"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：向用户发送闪屏振动，以便引起他的注意"
 
@@ -5617,7 +5617,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 "您在其它位置用此用户名登录了。"
@@ -5707,24 +5707,6 @@ msgstr "您是否要将这个好友也从通讯录中删除？"
 msgid "The username specified is invalid."
 msgstr "指定的用户名无效。"
 
-#. 5
-msgid "In Love"
-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 无效。"
 
@@ -5758,7 +5740,12 @@ msgstr "个人资料"
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "尚未检索到您的个人资料信息，请稍后重试。"
 
+#, fuzzy
+msgid "Your UID"
+msgstr "您的 MXitID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5766,6 +5753,7 @@ msgid "Verify PIN"
 msgstr "验证 PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "显示名称"
 
@@ -5792,10 +5780,6 @@ msgstr "现在没有可用的飞溅屏幕"
 msgid "About"
 msgstr "关于"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "更改心情..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "更改个人信息..."
@@ -5826,19 +5810,16 @@ msgstr "无法连接到 MXit 服务器。请检查您的服务器设置。"
 msgid "Connecting..."
 msgstr "正在连接..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit 登录名称"
-
-#. nick name
-msgid "Nick Name"
-msgstr "昵称"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5866,10 +5847,12 @@ 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 "用户名已被注册，请选择其他用户名。"
 
 msgid "Internal error. Please try again later."
@@ -5881,7 +5864,7 @@ msgstr "您没有输入安全码"
 msgid "Security Code"
 msgstr "安全码"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "输入安全码"
 
@@ -5907,11 +5890,16 @@ msgstr "正在载入菜单..."
 msgid "Status Message"
 msgstr "状态消息"
 
+msgid "Rejection Message"
+msgstr "拒绝消息"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "隐藏号码"
 
-msgid "Your Mobile Number..."
-msgstr "您的手机号码..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "您的 MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5924,6 +5912,25 @@ 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)："
+
+#. 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 的连接，请重新连接。"
@@ -5936,7 +5943,7 @@ msgid "Unable to process your request at this time"
 msgstr "当前无法处理您的请求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "等待 MXit 服务器回应超时。"
 
 msgid "Successfully Logged In..."
 msgstr "登录成功..."
@@ -6026,6 +6033,9 @@ msgstr "连接错误。(读取等级 0x05)"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "连接错误。(读取等级 0x06)"
 
+msgid "In Love"
+msgstr "热恋"
+
 msgid "Pending"
 msgstr "正在等待"
 
@@ -6039,7 +6049,7 @@ msgid "Deleted"
 msgstr "已删除"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit 广告"
 
 msgid "More Information"
 msgstr "更多信息"
@@ -6082,10 +6092,10 @@ msgid "New blog comments"
 msgstr "新博客评论"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "新个人资料评论"
 
 msgid "New friend requests!"
-msgstr "好友请求！"
+msgstr "新好友请求！"
 
 msgid "New picture comments"
 msgstr "新图片评论"
@@ -6143,7 +6153,7 @@ msgid "Failed to remove buddy"
 msgstr "移除好友失败"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "delbuddy 命令失败"
 
 msgid "blocklist command failed"
 msgstr "切换板失败"
@@ -6157,7 +6167,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 添加好友"
@@ -6167,16 +6177,16 @@ 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 "请启用正确的 MySpaceIM 帐户并重试。"
@@ -6409,9 +6419,6 @@ msgstr "密码已过期"
 msgid "Incorrect password"
 msgstr "密码不对"
 
-msgid "User not found"
-msgstr "用户未找到"
-
 msgid "Account has been disabled"
 msgstr "帐号已经被禁用"
 
@@ -6626,9 +6633,9 @@ msgstr "服务器地址"
 msgid "Server port"
 msgstr "服务器端口"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "从服务器收到了意外的 HTTP 响应 %s。"
+msgstr "从 %s 收到了意外的响应：%s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6655,111 +6662,156 @@ msgstr ""
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
 
+#, c-format
+msgid "Error requesting %s"
+msgstr "请求 %s 时出错"
+
 msgid "Could not join chat room"
 msgstr "无法进入聊天室"
 
 msgid "Invalid chat room name"
 msgstr "无效的聊天室名称"
 
-msgid "Thinking"
+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 ""
 
-#, fuzzy
+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 "停止打字"
+msgstr "购物中"
 
-#, fuzzy
 msgid "Questioning"
-msgstr "请求对话框"
+msgstr "问问题"
 
-#, fuzzy
 msgid "Eating"
-msgstr "寻呼"
+msgstr "正吃饭"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "正在玩游戏"
+msgstr "看电影"
 
 msgid "Typing"
-msgstr "正在打字"
+msgstr "在打字"
 
-#, fuzzy
 msgid "At the office"
-msgstr "不在办公室"
+msgstr "办公室"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "在洗澡"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "看电视"
 
-#, fuzzy
 msgid "Having fun"
-msgstr "挂断"
+msgstr "正开心"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "困倦"
+msgstr "在睡觉"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "使用 PDA"
 
-#, fuzzy
 msgid "Meeting friends"
-msgstr "即时消息朋友"
+msgstr "会见朋友"
 
-#, fuzzy
 msgid "On the phone"
-msgstr "接听电话"
+msgstr "接电话"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "重复"
+msgstr "冲浪中"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "手机"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "搜索网络"
 
 msgid "At a party"
-msgstr ""
+msgstr "在晚会"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "喝咖啡"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "用户名"
+msgstr "打游戏"
 
 msgid "Browsing the web"
-msgstr ""
+msgstr "浏览网页"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "声音"
+msgstr "吸烟中"
 
-#, fuzzy
 msgid "Writing"
-msgstr "正在工作"
+msgstr "在写作"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "正在工作"
+msgstr "在喝酒"
 
 msgid "Listening to music"
-msgstr "正在听音乐"
+msgstr "听音乐"
 
-#, fuzzy
 msgid "Studying"
-msgstr "正在发送"
+msgstr "学习中"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "兴趣"
+msgstr "在洗手间"
 
 msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
@@ -6778,7 +6830,7 @@ msgid "AIM Protocol Plugin"
 msgstr "AIM 协议插件"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6825,116 +6877,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 "无法接收离线消息"
-
-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 "
@@ -6967,10 +6909,10 @@ msgid "Games"
 msgstr "游戏"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
-msgstr "外挂"
+msgstr "插件"
 
 msgid "Send Buddy List"
 msgstr "发送好友列表"
@@ -7035,25 +6977,20 @@ msgstr "网上留意"
 msgid "Invisible"
 msgstr "隐身"
 
-#, fuzzy
 msgid "Evil"
-msgstr "电子邮件"
+msgstr ""
 
-#, fuzzy
 msgid "Depression"
-msgstr "职业"
+msgstr "沮丧"
 
-#, fuzzy
 msgid "At home"
-msgstr "关于我"
+msgstr "在家"
 
-#, fuzzy
 msgid "At work"
-msgstr "网络"
+msgstr "在上班"
 
-#, fuzzy
 msgid "At lunch"
-msgstr "外出就餐"
+msgstr "吃午餐"
 
 msgid "IP Address"
 msgstr "IP 地址"
@@ -7269,28 +7206,9 @@ 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 "上线时间"
 
@@ -7520,9 +7438,8 @@ msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图�
 msgid "iTunes Music Store Link"
 msgstr "iTunes 音乐商店链接"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr ""
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7554,9 +7471,8 @@ msgstr "获得 AIM 信息"
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "获取状态消息"
+msgstr "获取 X-状态消息"
 
 msgid "End Direct IM Session"
 msgstr "结束二人世界直连聊天"
@@ -7681,6 +7597,75 @@ 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 上"
+
 msgid "Aquarius"
 msgstr "水瓶座"
 
@@ -7963,6 +7948,10 @@ msgstr "正在发送请求"
 msgid "Admin"
 msgstr "管理员"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室标题"
+
 msgid "Notice"
 msgstr "公告"
 
@@ -9806,9 +9795,6 @@ msgstr "Yahoo ID..."
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-msgid "Pager server"
-msgstr "寻呼服务器"
-
 msgid "Pager port"
 msgstr "寻呼端口"
 
@@ -9824,18 +9810,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..."
 
@@ -9895,6 +9875,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 "用户名或密码不全"
@@ -9966,6 +9953,15 @@ msgstr ""
 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 "不在家"
 
@@ -10297,7 +10293,7 @@ msgstr ""
 
 #, 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"
@@ -10331,6 +10327,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)"
 
@@ -10397,9 +10397,8 @@ msgstr "请勿打扰"
 msgid "Extended away"
 msgstr "远远离开"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "正在接收"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10558,12 +10557,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 "登录选项"
@@ -10923,13 +10916,11 @@ msgstr "您目前登录的协议中没有一个可以添加好友的。"
 msgid "Unknown node type"
 msgstr "未知的错误代码 %d"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "请从列表中选择您的心情。"
+msgstr "请从列表中选择您的心情"
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "别名(可选)"
+msgstr "消息(可选)"
 
 msgid "Edit User Mood"
 msgstr "编辑用户心情"
@@ -11012,9 +11003,8 @@ msgstr "/工具/首选项(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隐私(_I)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/工具/系统日志(_L)"
+msgstr "/工具/设置心情(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/工具/文件传送(_F)"
@@ -11035,20 +11025,17 @@ msgstr "/帮助(_H)"
 msgid "/Help/Online _Help"
 msgstr "/帮助/在线帮助(_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "好友信息"
+msgstr "/帮助/编译信息(_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/帮助/调试窗口(_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "服务器信息"
+msgstr "/帮助/开发者信息(_V)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "个人信息"
+msgstr "/帮助/翻译者信息(_T)"
 
 msgid "/Help/_About"
 msgstr "/帮助/关于(_A)"
@@ -11269,9 +11256,8 @@ msgstr "<PurpleMain>/帐号/"
 msgid "_Edit Account"
 msgstr "编辑帐号(_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "设置心情..."
+msgstr "设置心情(_M)..."
 
 msgid "No actions available"
 msgstr "没有可用的操作"
@@ -11391,9 +11377,8 @@ msgstr "/对话(C)/媒体(E)/音频\\/视频聊天(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/对话/获取信息"
+msgstr "/对话/获取注意(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
@@ -11476,9 +11461,8 @@ msgstr "/对话/媒体/音频\\/视频聊天"
 msgid "/Conversation/Send File..."
 msgstr "/对话/发送文件..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/对话/获取信息"
+msgstr "/对话/获得注意"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话/添加好友千里眼..."
@@ -11544,13 +11528,11 @@ msgstr "发送(_S)"
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "关闭此标签"
+msgstr "关闭查找栏"
 
-#, fuzzy
 msgid "Find:"
-msgstr "查找"
+msgstr "查找："
 
 #, c-format
 msgid "%d person in room"
@@ -11712,6 +11694,9 @@ msgstr "南非荷兰语"
 msgid "Arabic"
 msgstr "阿拉伯语"
 
+msgid "Assamese"
+msgstr "阿萨姆语"
+
 msgid "Belarusian Latin"
 msgstr "白俄罗斯拉丁语"
 
@@ -11721,6 +11706,9 @@ msgstr "保加利亚语"
 msgid "Bengali"
 msgstr "孟加拉语"
 
+msgid "Bengali-India"
+msgstr "孟加拉印地语"
+
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
@@ -11835,12 +11823,14 @@ msgstr "老挝语"
 msgid "Macedonian"
 msgstr "马其顿语"
 
+msgid "Malayalam"
+msgstr ""
+
 msgid "Mongolian"
 msgstr "蒙古语"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "古吉拉特语"
+msgstr "马拉地语"
 
 msgid "Malay"
 msgstr "马来语"
@@ -11860,9 +11850,8 @@ msgstr "挪威尼诺斯克语"
 msgid "Occitan"
 msgstr "奥克西唐语"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "奥里雅语"
 
 msgid "Punjabi"
 msgstr "旁遮普语"
@@ -11945,21 +11934,19 @@ msgstr "阿姆哈拉语"
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#, fuzzy, c-format
+#, 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>"
+"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 的版权由其贡献者所有，在 "
-"“COPYRIGHT”文件中给出了所有贡献者的列表。我们不对此软件提供任何担保。<BR><BR>"
+"%s 是一个基于 libpurple 的可同时连接到多种消息服务的即使消息客户端。%s 通过 "
+"GTK+ 使用 C 语言编写。%s 在 GPL2 或更高版本许可下发布，允许在此许可下自由地使"
+"用、更改和再发布，许可证文本已随 %s 一起发布。%s 的版权属于其贡献者，该列表也"
+"随 %s 一起发布。%s 及其贡献者不对其提供任何担保。<BR><BR>"
 
 #, c-format
 msgid ""
@@ -11969,7 +11956,7 @@ msgid ""
 "im<BR><BR>"
 msgstr ""
 
-#, fuzzy, c-format
+#, 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/"
@@ -11983,20 +11970,19 @@ msgstr ""
 "\">support@pidgin.im</a><br/>这是一个公开的邮件列表，您还可以查看该列表的历史"
 "<a href=\"http://pidgin.im/pipermail/support/\">存档</a>。<br/>我们无法为第三"
 "方的协议或者插件提供支持。该邮件列表的基本交流语言是<b>英语</b>，虽然您可以使"
-"用其他语言进行求助，但响应的人数以及所能提供的帮助会因此而减少。<br/><br/>"
+"用其他语言进行求助，但响应的人数以及所能提供的帮助会因此而减少。<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "好友信息"
+msgstr "编译信息"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "好友信息"
+msgstr "%s 编译信息"
 
 msgid "Current Developers"
 msgstr "当前开发者"
@@ -12010,9 +11996,9 @@ msgstr "退休开发者"
 msgid "Retired Crazy Patch Writers"
 msgstr "退休的疯狂补丁编写者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "服务器信息"
+msgstr "%s 开放者信息"
 
 msgid "Current Translators"
 msgstr "当前翻译者"
@@ -12020,9 +12006,9 @@ msgstr "当前翻译者"
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "更多信息"
+msgstr "%s 翻译者信息"
 
 msgid "_Name"
 msgstr "名称(_N)"
@@ -12412,9 +12398,8 @@ msgstr "插入图像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "发送按钮"
+msgstr "发送提示"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>粗体(_B)</b>"
@@ -12462,7 +12447,7 @@ msgid "_Smile!"
 msgstr "表情(_S)"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "注意(_A)！"
 
 msgid "Log Deletion Failed"
 msgstr "删除日志失败"
@@ -12478,14 +12463,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?"
@@ -12574,11 +12559,13 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "退出，因为另一个 libpurple 客户端已运行。\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒体(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/媒体/挂起(_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "挂断"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13366,10 +13353,6 @@ msgstr "快捷方式文本"
 msgid "Custom Smiley Manager"
 msgstr "自定义表情管理器"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "需要激活"
-
 msgid "Select Buddy Icon"
 msgstr "选择好友图标"
 
@@ -13504,9 +13487,8 @@ msgstr "播放声音"
 msgid "_Save File"
 msgstr "保存文件"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "您真的想要删除 %s 吗？"
+msgstr "您真的想要清屏吗？"
 
 msgid "Select color"
 msgstr "选择颜色"
@@ -14469,8 +14451,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 "显示日期于..."
@@ -14665,10 +14656,195 @@ 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 "$(^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 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 "创建会议出错"
 
@@ -14825,9 +15001,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "_User:"
 #~ msgstr "用户(_U)："
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ 运行时刻版本"
-
 #~ msgid "Calling ... "
 #~ msgstr "正在呼叫..."
 
@@ -15357,7 +15530,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/zh_HK.po b/po/zh_HK.po
index 76405fb8e9..e4fd979bd8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,4 +1,4 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.24 2010/02/15 23:14:17 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.25 2010/05/10 05:50:52 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
@@ -8,7 +8,7 @@
 # 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.619 2010/02/15 23:14:17 acli Exp $
+# $InternalId: zh_TW.po,v 1.637 2010/05/28 19:17:20 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,12 +60,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.6\n"
+"Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-14 03:06-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-05-29 02:50+0800\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,25 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+#, fuzzy
+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 "新郵件通知"
 
@@ -702,7 +716,7 @@ msgid "Enable Sounds"
 msgstr "啟動音效"
 
 msgid "You are not connected."
-msgstr "連線成功。"
+msgstr "尚未連線。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -854,7 +868,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -1332,6 +1346,10 @@ msgstr "其他人在聊天室說話"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1432,7 +1450,6 @@ msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #. title
-#. optional information
 msgid "Title"
 msgstr "職銜"
 
@@ -1633,7 +1650,7 @@ msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1732,6 +1749,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」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
@@ -1756,8 +1779,10 @@ 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 "這張證書已逾期，應視作無效。"
@@ -1998,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 "原因不明"
 
@@ -3276,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 "名"
 
@@ -3890,12 +3917,6 @@ 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 "伺服器需要經由未經加密的串流進行明文認證"
 
@@ -3925,6 +3946,16 @@ 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 認證失敗"
 
@@ -3932,6 +3963,43 @@ 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 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 "無法把帳號轉成正則形態"
 
@@ -3995,6 +4063,7 @@ msgstr "省／州"
 msgid "Postal Code"
 msgstr "郵遞編號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -4009,10 +4078,14 @@ msgstr "所屬機構"
 msgid "Organization Unit"
 msgstr "所屬部門"
 
+msgid "Job Title"
+msgstr "職銜"
+
 msgid "Role"
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -4249,12 +4322,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 "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 帳號無效，域名是必須設定的。"
 
@@ -4352,7 +4434,6 @@ msgstr "伺服器不支援封鎖"
 msgid "Not Authorized"
 msgstr "未認證"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4384,7 +4465,6 @@ msgstr "發出狀態資訊通知"
 msgid "None (To pending)"
 msgstr "無，等待認證發出狀態資訊通知"
 
-#. 0
 msgid "None"
 msgstr "無"
 
@@ -4400,16 +4480,18 @@ msgstr "情緒描述"
 msgid "Allow Buzz"
 msgstr "允許「嗶」功能"
 
-# NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#, fuzzy
 msgid "Mood Name"
-msgstr "英文別名"
+msgstr "情緒名稱"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "好友備註"
+msgstr "情緒備註"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "樂手名稱"
 
@@ -4626,12 +4708,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"
@@ -4765,9 +4841,8 @@ msgstr "選擇一個 Resource"
 msgid "Initiate Media"
 msgstr "媒體通話"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "這個通訊協定不支援聊天室。"
+msgstr "這個帳號不支援 PEP，所以無法設定情緒。"
 
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
@@ -4822,9 +4897,8 @@ msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "選擇正確的使用者"
+msgstr "mood: 設定目前的使用者情緒"
 
 msgid "Extended Away"
 msgstr "長時間離開"
@@ -4907,13 +4981,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自選表情。"
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "找不到 XMPP 串流標頭"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP 版本不符"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP 串流中找不到識別符"
 
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
@@ -4989,330 +5063,361 @@ msgstr "無法傳送檔案至 %s，因為未有訂閱對方的狀態資訊"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準（感謝德文翻譯員 Bjoern Voigt 指點）
 msgid "Afraid"
-msgstr "阿拉伯文"
+msgstr "害怕"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Amazed"
-msgstr "慚愧"
+msgstr "驚訝"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Amorous"
-msgstr "光宗耀祖"
+msgstr "動情"
 
-#. 1
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Angry"
 msgstr "憤怒"
 
-# FIXME 這是暫譯
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Annoyed"
-msgstr "被禁止"
+msgstr "煩厭"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Anxious"
 msgstr "憂慮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Aroused"
-msgstr "將會送出"
+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 "發悶"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Brave"
-msgstr "儲存"
+msgstr "勇敢"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Calm"
-msgstr "域名"
+msgstr "平靜"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Cautious"
-msgstr "聊天"
+msgstr "謹慎"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 表示覺得人們對你漠不關心，而不是你對別人漠不關心
 msgid "Cold"
-msgstr "粗體"
+msgstr "被人冷落"
 
-#  NOTE Jabber 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
-#  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Confident"
-msgstr "名稱或位址衝突"
+msgstr "自信"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Confused"
-msgstr "繼續"
+msgstr "困惑"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Contemplative"
-msgstr "好友"
+msgstr "靜思中"
 
-# TODO 要覆查 - 20061027
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Contented"
-msgstr "已連結"
+msgstr "滿意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Cranky"
-msgstr "公司名稱"
+msgstr "心煩意亂"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「對周圍發生的事件覺得失控」和「情緒失控」（極度興）兩種意義
 msgid "Crazy"
-msgstr ""
+msgstr "失控"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Creative"
-msgstr "建立"
+msgstr "有創意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Curious"
-msgstr "光宗耀祖"
+msgstr "好奇"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Dejected"
-msgstr "已拒絕"
+msgstr "意氣消沉"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Depressed"
-msgstr "已刪除"
+msgstr "抑鬱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Disappointed"
-msgstr "停止連線。"
+msgstr "失望"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Disgusted"
-msgstr ""
+msgstr "嘔心"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Dismayed"
-msgstr "停用"
+msgstr "失去勇氣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Distracted"
-msgstr "暫停連線"
+msgstr "分心"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Embarrassed"
-msgstr ""
+msgstr "羞恥"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Envious"
-msgstr "憂慮"
+msgstr "嫉妒"
 
-#. 2
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Excited"
 msgstr "興奮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
 msgid "Flirtatious"
-msgstr "光宗耀祖"
+msgstr "風騷"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
 msgid "Frustrated"
-msgstr "名"
+msgstr "受挫"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Grateful"
-msgstr ""
+msgstr "感恩"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Grieving"
-msgstr "讀取中..."
+msgstr "悲痛"
 
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 # XXX 譯文有待改進 - 20091126 acli
-#. 3
 msgid "Grumpy"
 msgstr "暴躁"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Guilty"
-msgstr "城市"
+msgstr "內疚"
 
-#. 4
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Happy"
 msgstr "開心"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hopeful"
-msgstr ""
+msgstr "滿懷希望"
 
-# XXX 原文瞹眛，譯文可能有錯 =P  - acli 20091127
-#. 8
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按 XMPP 標準這是溫度上令人不舒服的熱，不是熱情
 msgid "Hot"
-msgstr "火熱"
+msgstr "熱"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「謙遜」和「自卑」兩種意義
 msgid "Humbled"
-msgstr ""
+msgstr "自覺卑微"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Humiliated"
-msgstr ""
+msgstr "被人侮辱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hungry"
-msgstr "憤怒"
+msgstr "肚餓"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hurt"
-msgstr "幽默"
+msgstr "受傷"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Impressed"
-msgstr ""
+msgstr "印象良好"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "In awe"
-msgstr "戀愛中"
+msgstr "敬畏"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，這可以是戀愛，也可以只是喜歡
 msgid "In love"
 msgstr "戀愛中"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Indignant"
-msgstr "印尼文"
+msgstr "憤慨"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Interested"
-msgstr "興趣"
+msgstr "有興趣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Intoxicated"
-msgstr "已邀請"
+msgstr "喝醉了"
 
-#. 6
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Invincible"
 msgstr "無敵"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Jealous"
 msgstr "嫉妒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Lonely"
-msgstr ""
+msgstr "寂寞"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按標準定義，譯文必須同時有「迷路」和「迷惘」兩種意義
 msgid "Lost"
-msgstr "最大聲"
+msgstr "迷失"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Lucky"
-msgstr ""
+msgstr "幸運"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Mean"
-msgstr "德文"
+msgstr "充滿惡意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Moody"
-msgstr "心情"
+msgstr "情緒不穩定"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Nervous"
-msgstr ""
+msgstr "神經質"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Neutral"
-msgstr "細節"
+msgstr "心情平淡"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文沒有包括標準內指定的全部字義! - acli 20100509
 msgid "Offended"
-msgstr "離線"
+msgstr "受辱"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Outraged"
-msgstr ""
+msgstr "忿怒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Playful"
-msgstr "播放"
+msgstr "調皮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Proud"
-msgstr "大聲"
+msgstr "驕傲"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Relaxed"
-msgstr "姓名"
+msgstr "輕鬆"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Relieved"
-msgstr "已收到"
+msgstr "鬆一口氣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Remorseful"
-msgstr "移除"
+msgstr "懊悔"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「沒有休息」、「無法安靜」、「不舒服」和「無法入睡」數種意義
 msgid "Restless"
-msgstr "註冊"
+msgstr "無法安靜"
 
-#. 7
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sad"
 msgstr "憂愁"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sarcastic"
-msgstr "馬拉提文"
+msgstr "諷刺"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Satisfied"
-msgstr ""
+msgstr "滿意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Serious"
-msgstr "光宗耀祖"
+msgstr "嚴肅"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Shocked"
-msgstr "封鎖"
+msgstr "大吃一驚"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「膽怯」和「害羞」兩種意義
 msgid "Shy"
-msgstr ""
+msgstr "膽怯/害羞"
 
-#. 9
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sick"
 msgstr "生病"
 
-#. 10
+# 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 ""
+msgstr "隨意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Stressed"
-msgstr "成功："
+msgstr "有壓力"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進，但按標準定義，譯文必須同時有「體力上」和「心力上」強的兩種意義 - acli 20100509
 msgid "Strong"
-msgstr "歌曲"
+msgstr "強"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Surprised"
-msgstr ""
+msgstr "驚奇"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Thankful"
-msgstr ""
+msgstr "滿心感謝"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Thirsty"
-msgstr ""
+msgstr "口渴"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Tired"
-msgstr "Fire"
+msgstr "疲倦"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 這解「在標準內未有列舉的其他情緒」，不是「沒有設定情緒」
 msgid "Undefined"
-msgstr "底線"
+msgstr "其他情緒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Weak"
-msgstr "拳打"
+msgstr "虛弱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Worried"
-msgstr "發悶"
+msgstr "擔心"
 
 #  XXX may be wrong
 msgid "Set User Nickname"
@@ -5561,7 +5666,7 @@ msgid "Other Contacts"
 msgstr "沒有羣組的好友"
 
 # XXX 暫譯，有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」？ 
+# XXX 這可能是MSN的「基本資料連絡人」？
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別；可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5692,18 +5797,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 "遊戲名稱"
 
@@ -5852,9 +5945,6 @@ msgstr "週年紀念日"
 msgid "Work"
 msgstr "工作資料"
 
-msgid "Job Title"
-msgstr "職銜"
-
 msgid "Company"
 msgstr "公司名稱"
 
@@ -5942,6 +6032,9 @@ msgstr "HTTP 方式專用伺服器"
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -6133,24 +6226,6 @@ msgstr "你要將好友自通訊錄中刪除嗎？"
 msgid "The username specified is invalid."
 msgstr "你所輸入的帳號無效。"
 
-#. 5
-msgid "In Love"
-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 "你所輸入的密碼無效。"
 
@@ -6182,7 +6257,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 "密碼"
 
@@ -6191,6 +6270,7 @@ msgstr "確認密碼"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "網名"
 
@@ -6217,10 +6297,6 @@ msgstr "目前沒有可用的啟動畫面"
 msgid "About"
 msgstr "關於此模組"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "修改心情..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "修改個人資料..."
@@ -6252,20 +6328,16 @@ msgstr "無法連線至 MXit 伺服器，請檢查伺服器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
-#. nick name
-msgid "Nick Name"
-msgstr "網名"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6293,10 +6365,12 @@ 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 "帳號已註冊，請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
@@ -6308,7 +6382,7 @@ msgstr "未有輸入保安碼"
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6334,12 +6408,17 @@ msgstr "載入清單中..."
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼？」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "流動電話號碼..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo 帳號"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6352,6 +6431,32 @@ msgstr "使用 HTTP 連線"
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "你已被踢出：(%s)"
+
+#  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, fuzzy
+msgid "was kicked"
+msgstr "無效的 ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "聊天室(_R)："
+
+# XXX 要覆查
+#. 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 的連線已中斷，請重新連線。"
@@ -6464,6 +6569,9 @@ msgstr "（在讀取階段 0x05 時）MXit 發生連線錯誤"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "（在讀取階段 0x06 時）MXit 發生連線錯誤"
 
+msgid "In Love"
+msgstr "戀愛中"
+
 msgid "Pending"
 msgstr "等候中"
 
@@ -6871,9 +6979,6 @@ msgstr "密碼已過期"
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-msgid "User not found"
-msgstr "找不到該使用者"
-
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
@@ -7127,115 +7232,164 @@ msgstr "伺服器表示登入前必須完成圖片驗證，但這用戶端尚未
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允許你的帳號在這裏登入"
 
+# NOTE 單寫「要求 %s」好像有些怪 - acli 20090902
+#, c-format
+msgid "Error requesting %s"
+msgstr "要求讀取 %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 "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"
+
+# XXX 這是什麼？ - acli 20100510
 msgid "Thinking"
-msgstr ""
+msgstr "思想中"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "停止輸入"
+msgstr "正在購物"
 
-#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20090730
-#, fuzzy
+# XXX 這是什麼？ - acli 20100510
 msgid "Questioning"
-msgstr "提問視窗"
+msgstr "提問中"
 
-#, fuzzy
 msgid "Eating"
-msgstr "傳呼"
+msgstr "正在吃東西"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "正在玩遊戲"
+msgstr "正在看電影"
 
 msgid "Typing"
 msgstr "輸入中"
 
-#, fuzzy
 msgid "At the office"
-msgstr "不在辦公室"
+msgstr "在辦公室"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "在洗澡"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "在看電視"
 
-# NOTE 這是按鈕上的標籤
-#, fuzzy
+# XXX Having fun 是指正在玩樂、尋開心、或在做一些令人覺得很開心的事（例如和朋友一起聊天很開心，甚至做義工令你很開心……）
 msgid "Having fun"
-msgstr "掛斷"
+msgstr "開心中"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "想睡"
+msgstr "在睡覺"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "正在用電子手帳"
 
-#  NOTE 這是群組名稱
-#, fuzzy
 msgid "Meeting friends"
-msgstr "即時訊息的好友"
+msgstr "正在跟朋友一起"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "電話中"
 
-#, fuzzy
+# XXX 這和「Browsing the web」有什麼分別？？難道真是在滑浪？？ acli 20100509
 msgid "Surfing"
-msgstr "重覆發生"
+msgstr "在瀏覽網頁"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "使用流動通訊器材"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "在網上搜尋中"
 
 msgid "At a party"
-msgstr ""
+msgstr "在派對中"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "正在喝咖啡"
 
+# XXX obviously needs improvement - acli 20100503
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "雙子座"
+msgstr "正在玩圖像遊戲"
 
+# XXX 這和「Surfing」有什麼分別？？ acli 20100509
 msgid "Browsing the web"
-msgstr ""
+msgstr "在瀏覽網頁"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "歌曲"
+msgstr "正在抽煙"
 
-#, fuzzy
 msgid "Writing"
-msgstr "正在工作"
+msgstr "正在寫作"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "正在工作"
+msgstr "正在喝酒"
 
 msgid "Listening to music"
 msgstr "聽音樂中"
 
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
 msgid "Studying"
-msgstr "傳送中"
+msgstr "正在溫習"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "興趣"
+msgstr "正在上廁所"
 
 msgid "Received invalid data on connection with server"
 msgstr "連線至伺服器時收到無效的資料"
@@ -7303,121 +7457,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
-# 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 "被家長監控限制，無法接收即時訊息"
-
-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 "離線訊息庫已滿"
-
 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 "
@@ -7537,23 +7576,20 @@ msgstr "允許其他使用者在網絡上查看你目前的狀態"
 msgid "Invisible"
 msgstr "隱身"
 
-#, fuzzy
+# XXX 這是什麼?? - acli 20100510
 msgid "Evil"
-msgstr "電子郵件"
+msgstr "邪惡"
 
-#, fuzzy
+# XXX 這是什麼?? - acli 20100510
 msgid "Depression"
-msgstr "專業"
+msgstr "抑鬱"
 
-#, fuzzy
 msgid "At home"
-msgstr "關於我"
+msgstr "在家"
 
-#, fuzzy
 msgid "At work"
-msgstr "網絡"
+msgstr "工作中"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "外出用餐"
 
@@ -7780,28 +7816,9 @@ 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 "上線自"
 
@@ -8050,10 +8067,8 @@ msgstr "無法傳送即時訊息圖像；AIM 聊天並不支援即時訊息圖�
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#  NOTE Untranslated
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "午飯"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -8084,9 +8099,8 @@ msgstr "取得 AIM 資訊"
 msgid "Edit Buddy Comment"
 msgstr "編輯好友備註"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "取得狀態訊息"
+msgstr "取得 X-Status 訊息"
 
 # XXX 譯「工作階段」好像很奇怪，可能跟 cnscode.org.tw 譯「會談」反而好一點？？
 msgid "End Direct IM Session"
@@ -8215,6 +8229,93 @@ msgstr ""
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息圖像時所必須的。"
 "這樣將會曝露你的 IP 位址，因此可能會有私隱方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+#  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "Service unavailable"
+msgstr "不提供該項服務"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "找不到該會議"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by host"
+msgstr "不支援"
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by client"
+msgstr "不支援"
+
+#, fuzzy
+msgid "Refused by client"
+msgstr "到用戶端速率"
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "「回答」或然率："
+
+#, fuzzy
+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 ""
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "暫時無法使用服務"
+
+#, fuzzy
+msgid "No match"
+msgstr "沒有相符合的"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "好友清單已滿"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "請求中"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -8515,6 +8616,10 @@ msgstr "請求中"
 msgid "Admin"
 msgstr "管理人"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室名稱"
+
 msgid "Notice"
 msgstr "通知"
 
@@ -8646,6 +8751,7 @@ msgstr " TCP"
 msgid " FromMobile"
 msgstr " 使用流動通訊器材"
 
+# NOTE 根據cnscode.org.tw, 大陸「綁定」= 台灣「繫結」
 msgid " BindMobile"
 msgstr " 綁定流動通訊器材"
 
@@ -10461,9 +10567,6 @@ msgstr "Yahoo 帳號"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
@@ -10480,18 +10583,13 @@ msgstr "聊天室區域 (Locale)"
 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 "聊天室清單所在網址"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN 帳號..."
 
@@ -10530,8 +10628,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."
@@ -10556,6 +10654,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 "未有輸入帳號或密碼"
@@ -10629,6 +10735,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 "不在家"
 
@@ -11030,7 +11144,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.
@@ -11044,6 +11158,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)"
 
@@ -11116,10 +11234,9 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-# XXX 20080508 acli
-#, fuzzy
+# XXX 20100503 acli 這是什麼？？？
 msgid "Feeling"
-msgstr "接收中"
+msgstr "感覺"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11292,13 +11409,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 "登入選項"
@@ -11673,14 +11783,11 @@ msgstr "你並未登入任何一個可供你新增哪個好友的通訊協定。
 msgid "Unknown node type"
 msgstr "節點類別不明"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "請從列表選擇你目前的情緒。"
+msgstr "請從列表選擇你目前的情緒"
 
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
 msgid "Message (optional)"
-msgstr "別名（選用）"
+msgstr "訊息（選用）"
 
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
@@ -11764,9 +11871,8 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/工具/系統日誌(_L)"
+msgstr "/工具/設定情緒(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
@@ -11787,20 +11893,17 @@ msgstr "/說明(_H)"
 msgid "/Help/Online _Help"
 msgstr "/說明/網上說明(_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "好友資訊"
+msgstr "/說明/版本建置資訊(_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "伺服器資訊"
+msgstr "/說明/開發者名單(_V)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "個人資料"
+msgstr "/說明/譯者名單(_T)"
 
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
@@ -12030,9 +12133,8 @@ msgstr "<PurpleMain>/帳號/"
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "設定情緒..."
+msgstr "設定情緒(_M)..."
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
@@ -12162,9 +12264,9 @@ msgstr "/交談/媒體/語音／視像通話(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "/Conversation/Get _Attention"
-msgstr "/交談/取得資訊"
+msgstr "/交談/取得注意(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
@@ -12248,9 +12350,9 @@ msgstr "/交談/媒體/語音／視像通話"
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "/Conversation/Get Attention"
-msgstr "/交談/取得資訊"
+msgstr "/交談/取得注意"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
@@ -12316,13 +12418,13 @@ msgstr "傳送(_S)"
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#, fuzzy
+# XXX 這是Firefox的譯文，其實我覺得「bar」譯成「欄位」較好 =P
 msgid "Close Find bar"
-msgstr "關閉這個分頁"
+msgstr "關閉文字尋找列"
 
-#, fuzzy
+# XXX 如上
 msgid "Find:"
-msgstr "搜尋"
+msgstr "尋找："
 
 #, c-format
 msgid "%d person in room"
@@ -12397,7 +12499,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 "標示比對字串"
@@ -12501,6 +12602,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 "白俄羅斯文"
@@ -12511,6 +12616,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"
@@ -12647,6 +12755,10 @@ msgstr "寮國文"
 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 "蒙古文"
 
@@ -12777,22 +12889,21 @@ msgstr "阿姆哈拉文"
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#, fuzzy, c-format
+# XXX 要校對一下這個 - 20100503 acli
+# NOTE 所有 %s 都是 PIDGIN_NAME，沒有檔名
+#, 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>"
+"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 ""
@@ -12801,8 +12912,11 @@ msgid ""
 "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 聊天室：devel@conference.pidgin.im<BR><BR>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12812,24 +12926,24 @@ msgid ""
 "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 "About %s"
 msgstr "關於 %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "好友資訊"
+msgstr "版本建置資訊"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "好友資訊"
+msgstr "這個 %s 的版本建置資訊"
 
 msgid "Current Developers"
 msgstr "現任開發者"
@@ -12848,9 +12962,9 @@ msgstr "前任開發者"
 msgid "Retired Crazy Patch Writers"
 msgstr "前任的狂熱模組作者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "伺服器資訊"
+msgstr "%s 開發者名單"
 
 msgid "Current Translators"
 msgstr "現任譯者"
@@ -12858,9 +12972,9 @@ msgstr "現任譯者"
 msgid "Past Translators"
 msgstr "前任譯者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "更多資訊"
+msgstr "%s 譯者名單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 msgid "_Name"
@@ -13281,9 +13395,9 @@ msgstr "插入圖像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "Send Attention"
-msgstr "「傳送」按紐"
+msgstr "取得注意"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>粗體(_B)</b>"
@@ -13334,7 +13448,7 @@ msgid "_Smile!"
 msgstr "笑一個(_S)！"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "注意！(_A)"
 
 msgid "Log Deletion Failed"
 msgstr "日誌刪除失敗"
@@ -13351,14 +13465,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?"
@@ -13448,17 +13562,20 @@ 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"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+#, fuzzy
+msgid "_Hangup"
+msgstr "掛斷"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14268,10 +14385,6 @@ msgstr "捷徑文字"
 msgid "Custom Smiley Manager"
 msgstr "自選表情管理"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "必須先啟動帳號"
-
 msgid "Select Buddy Icon"
 msgstr "選擇好友圖示"
 
@@ -15451,8 +15564,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 "顯示日期於..."
@@ -15651,956 +15773,192 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-# FIXME 譯文有待改進 - acli 20090731
-#~ msgid "Error creating conference."
-#~ msgstr "建立會議失敗。"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "無法連結 Socket 到通訊埠：%s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "無法監聽 Socket：%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 "個人資料網址"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN 協定模組"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s 不是一個有效的羣組。"
-
-#~ msgid "Unknown error."
-#~ msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%2$s (%3$s)：%1$s"
-
-#  TODO 請覆查，譯文有待改進
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#~ 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 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ 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>irc.freenode.net 上的 #pidgin 頻道"
-#~ "<BR><BR>"
-
-#~ 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>"
-
-# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#~ msgid "Debugging Information"
-#~ msgstr "除錯專用資訊"
-
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#~ 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」，原因不明，大概是圖像檔已損壞"
-
-#  NOTE Jabber 的「stanza」譯「段落」，下同
-#~ 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 連線方法。"
-
-#~ 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 ""
-#~ "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 "檔案傳輸伺服器（日本地區）"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
-
-#~ 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 "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷：\n"
-#~ "%d, %s"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
-
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
-
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
-
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
-
-#~ msgid "Blood Type"
-#~ msgstr "血型"
-
-#~ msgid "Update information"
-#~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ 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."
+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 "Auth"
-#~ msgstr "認證"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
-#~ msgid "Approve"
-#~ msgstr "允許"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin 正在執行，請結束 Pidgin 後重試。"
 
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin 核心檔案及 DLL"
 
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "為 Pidgin 在開始選單建立捷徑"
 
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "為 Pidgin 在桌面上建立捷徑"
 
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "除錯符號（匯報當機專用）"
 
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING，按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "桌面"
 
-#~ msgid "I am the admin"
-#~ 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 "Unknown status"
-#~ 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 "Remove from Qun"
-#~ 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 "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 執行環境（如未安裝則必須安裝）"
 
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組？"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "本地化支援"
 
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求？"
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "下一頁 >"
 
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin 網絡即時通（必須安裝）"
 
-#~ msgid "Change Qun information"
-#~ msgstr "修改群組資訊"
+# 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 "System Message"
-#~ msgstr "系統訊息"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "捷徑"
 
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>上次登入位址：</b>%s<br>\n"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "啟動 Pidgin 的捷徑"
 
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>上次登入時間：</b>%s\n"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "拼字檢查功能支援"
 
-#~ msgid "Set My Information"
-#~ msgstr "設定我的資訊"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "開始選單"
 
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "拼字檢查功能支援（需連線至互聯網才能安裝）"
 
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
+msgid "The installer is already running."
+msgstr "安裝程式已在執行中。"
 
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
+# 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 "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入，暫時不支援 Redirect_EX 功能"
+#  NOTE 這似乎是視窗標題
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "網址處理器"
 
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤：%s"
+# 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 版本，新版本會在不移除舊版本的情況下被安裝。"
 
-# FIXME 不知這是什麼，但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號：%s"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "瀏覽 Pidgin 官方網站"
 
-# XXX 看不明原始碼，這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
+msgid "You do not have permission to uninstall this application."
+msgstr "你沒有權限移除程式。"
 
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張證書尚未生效。"
 
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求？"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "你所輸入的網名無效。"
 
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎？"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
 
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
+#~ msgid "Nick Name"
+#~ msgstr "網名"
 
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "流動電話號碼..."
 
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
+#~ msgid "Rate to host"
+#~ msgstr "到伺服器速率"
 
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
+#~ msgid "Rate to client"
+#~ msgstr "到用戶端速率"
 
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
+# XXX 暫譯 - acli 20090730
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒體/掛斷(_H)"
 
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他（她）加入您的好友清單嗎？"
+#~ msgid "Current Mood"
+#~ msgstr "目前的心情"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "New Mood"
+#~ msgstr "新心情"
 
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
+#~ msgid "Change your Mood"
+#~ msgstr "修改心情"
 
-#~ msgid "developer"
-#~ msgstr "開發者"
+#~ msgid "How do you feel right now?"
+#~ msgstr "您現在覺得怎樣？"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"
+#~ msgid "Change Mood..."
+#~ msgstr "修改心情..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cb7619ba60..8fd8a0b9d8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 # 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.619 2010/02/15 23:14:17 acli Exp $
+# $InternalId: zh_TW.po,v 1.634 2010/05/27 21:29:19 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,12 +58,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.6\n"
+"Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:17-0700\n"
-"PO-Revision-Date: 2010-02-14 03:06-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-05-29 02:50+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -114,12 +115,25 @@ msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+#, fuzzy
+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 "新郵件通知"
 
@@ -700,7 +714,7 @@ msgid "Enable Sounds"
 msgstr "啟動音效"
 
 msgid "You are not connected."
-msgstr "連線成功。"
+msgstr "尚未連線。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -852,7 +866,7 @@ msgstr "中止"
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -1330,6 +1344,10 @@ msgstr "其他人在聊天室說話"
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1430,7 +1448,6 @@ msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #. title
-#. optional information
 msgid "Title"
 msgstr "職銜"
 
@@ -1631,7 +1648,7 @@ msgstr "當接收到含有網址的訊息時，使用 TinyURL 縮短網址，好
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -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,8 +1777,10 @@ 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 "這張憑證已逾期，應視作無效。"
@@ -1996,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 "原因不明"
 
@@ -3274,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 "名"
 
@@ -3888,12 +3915,6 @@ 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 "伺服器需要經由未經加密的串流進行明文認證"
 
@@ -3923,6 +3944,16 @@ 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 認證失敗"
 
@@ -3930,6 +3961,43 @@ 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 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 "無法把帳號轉成正準形式"
 
@@ -3993,6 +4061,7 @@ msgstr "省／州"
 msgid "Postal Code"
 msgstr "郵遞區號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -4007,10 +4076,14 @@ msgstr "所屬機構"
 msgid "Organization Unit"
 msgstr "所屬部門"
 
+msgid "Job Title"
+msgstr "職銜"
+
 msgid "Role"
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -4247,12 +4320,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 "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 帳號無效，域名是必須設定的。"
 
@@ -4350,7 +4432,6 @@ msgstr "伺服器不支援封鎖"
 msgid "Not Authorized"
 msgstr "未認證"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "心情"
 
@@ -4382,7 +4463,6 @@ msgstr "發出狀態資訊通知"
 msgid "None (To pending)"
 msgstr "無，等待認證發出狀態資訊通知"
 
-#. 0
 msgid "None"
 msgstr "無"
 
@@ -4398,16 +4478,18 @@ msgstr "情緒描述"
 msgid "Allow Buzz"
 msgstr "允許「嗶」功能"
 
-# NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#, fuzzy
 msgid "Mood Name"
-msgstr "英文別名"
+msgstr "情緒名稱"
 
-#, fuzzy
 msgid "Mood Comment"
-msgstr "好友備註"
+msgstr "情緒備註"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr "樂手名稱"
 
@@ -4624,12 +4706,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"
@@ -4763,9 +4839,8 @@ msgstr "選擇一個 Resource"
 msgid "Initiate Media"
 msgstr "媒體通話"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "這個通訊協定不支援聊天室。"
+msgstr "這個帳號不支援 PEP，所以無法設定情緒。"
 
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
@@ -4820,9 +4895,8 @@ msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "選擇正確的使用者"
+msgstr "mood: 設定目前的使用者情緒"
 
 msgid "Extended Away"
 msgstr "長時間離開"
@@ -4905,13 +4979,13 @@ msgid "A custom smiley in the message is too large to send."
 msgstr "訊息中含有一個因檔案大小超過上限而無法送出的自訂表情。"
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "找不到 XMPP 串流標頭"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP 版本不符"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP 串流中找不到識別符"
 
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
@@ -4987,330 +5061,361 @@ msgstr "無法傳送檔案至 %s，因為未有訂閱對方的狀態資訊"
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準（感謝德文翻譯員 Bjoern Voigt 指點）
 msgid "Afraid"
-msgstr "阿拉伯文"
+msgstr "害怕"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Amazed"
-msgstr "慚愧"
+msgstr "驚訝"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Amorous"
-msgstr "光宗耀祖"
+msgstr "動情"
 
-#. 1
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Angry"
 msgstr "憤怒"
 
-# FIXME 這是暫譯
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Annoyed"
-msgstr "被禁止"
+msgstr "煩厭"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Anxious"
 msgstr "憂慮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Aroused"
-msgstr "將會送出"
+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 "發悶"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Brave"
-msgstr "儲存"
+msgstr "勇敢"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Calm"
-msgstr "域名"
+msgstr "平靜"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Cautious"
-msgstr "聊天"
+msgstr "謹慎"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 表示覺得人們對你漠不關心，而不是你對別人漠不關心
 msgid "Cold"
-msgstr "粗體"
+msgstr "被人冷落"
 
-#  NOTE Jabber 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
-#  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Confident"
-msgstr "名稱或位址衝突"
+msgstr "自信"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Confused"
-msgstr "繼續"
+msgstr "困惑"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Contemplative"
-msgstr "好友"
+msgstr "靜思中"
 
-# TODO 要覆查 - 20061027
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Contented"
-msgstr "已連結"
+msgstr "滿意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Cranky"
-msgstr "公司名稱"
+msgstr "心煩意亂"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「對周圍發生的事件覺得失控」和「情緒失控」（極度興）兩種意義
 msgid "Crazy"
-msgstr ""
+msgstr "失控"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Creative"
-msgstr "建立"
+msgstr "有創意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Curious"
-msgstr "光宗耀祖"
+msgstr "好奇"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Dejected"
-msgstr "已拒絕"
+msgstr "意氣消沉"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Depressed"
-msgstr "已刪除"
+msgstr "抑鬱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Disappointed"
-msgstr "停止連線。"
+msgstr "失望"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Disgusted"
-msgstr ""
+msgstr "嘔心"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Dismayed"
-msgstr "停用"
+msgstr "失去勇氣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Distracted"
-msgstr "暫停連線"
+msgstr "分心"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Embarrassed"
-msgstr ""
+msgstr "羞恥"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Envious"
-msgstr "憂慮"
+msgstr "嫉妒"
 
-#. 2
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Excited"
 msgstr "興奮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
 msgid "Flirtatious"
-msgstr "光宗耀祖"
+msgstr "風騷"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進 20100509 acli
 msgid "Frustrated"
-msgstr "名"
+msgstr "受挫"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Grateful"
-msgstr ""
+msgstr "感恩"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Grieving"
-msgstr "讀取中..."
+msgstr "悲痛"
 
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 # XXX 譯文有待改進 - 20091126 acli
-#. 3
 msgid "Grumpy"
 msgstr "暴躁"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Guilty"
-msgstr "城市"
+msgstr "內疚"
 
-#. 4
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Happy"
 msgstr "開心"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hopeful"
-msgstr ""
+msgstr "滿懷希望"
 
-# XXX 原文瞹眛，譯文可能有錯 =P  - acli 20091127
-#. 8
+# NOTE XMPP/MXIT 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按 XMPP 標準這是溫度上令人不舒服的熱，不是熱情
 msgid "Hot"
-msgstr "火熱"
+msgstr "熱"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# XXX  譯文有待改進，但按標準定義譯文必須同時有「謙遜」和「自卑」兩種意義
 msgid "Humbled"
-msgstr ""
+msgstr "自覺卑微"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Humiliated"
-msgstr ""
+msgstr "被人侮辱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hungry"
-msgstr "憤怒"
+msgstr "肚餓"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Hurt"
-msgstr "幽默"
+msgstr "受傷"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Impressed"
-msgstr ""
+msgstr "印象良好"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "In awe"
-msgstr "戀愛中"
+msgstr "敬畏"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，這可以是戀愛，也可以只是喜歡
 msgid "In love"
 msgstr "戀愛中"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Indignant"
-msgstr "印尼文"
+msgstr "憤慨"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Interested"
-msgstr "興趣"
+msgstr "有興趣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Intoxicated"
-msgstr "已邀請"
+msgstr "喝醉了"
 
-#. 6
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Invincible"
 msgstr "無敵"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Jealous"
 msgstr "嫉妒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Lonely"
-msgstr ""
+msgstr "寂寞"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 按標準定義，譯文必須同時有「迷路」和「迷惘」兩種意義
 msgid "Lost"
-msgstr "最大聲"
+msgstr "迷失"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Lucky"
-msgstr ""
+msgstr "幸運"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Mean"
-msgstr "德文"
+msgstr "充滿惡意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Moody"
-msgstr "心情"
+msgstr "情緒不穩定"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Nervous"
-msgstr ""
+msgstr "神經質"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Neutral"
-msgstr "細節"
+msgstr "心情平淡"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文沒有包括標準內指定的全部字義! - acli 20100509
 msgid "Offended"
-msgstr "離線"
+msgstr "受辱"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Outraged"
-msgstr ""
+msgstr "忿怒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Playful"
-msgstr "播放"
+msgstr "調皮"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Proud"
-msgstr "大聲"
+msgstr "驕傲"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Relaxed"
-msgstr "姓名"
+msgstr "輕鬆"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Relieved"
-msgstr "已收到"
+msgstr "鬆一口氣"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Remorseful"
-msgstr "移除"
+msgstr "懊悔"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「沒有休息」、「無法安靜」、「不舒服」和「無法入睡」數種意義
 msgid "Restless"
-msgstr "註冊"
+msgstr "無法安靜"
 
-#. 7
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sad"
 msgstr "憂愁"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sarcastic"
-msgstr "馬拉提文"
+msgstr "諷刺"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Satisfied"
-msgstr ""
+msgstr "滿意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Serious"
-msgstr "光宗耀祖"
+msgstr "嚴肅"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進 acli 20100509
 msgid "Shocked"
-msgstr "封鎖"
+msgstr "大吃一驚"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 按標準定義，譯文應同時有「膽怯」和「害羞」兩種意義
 msgid "Shy"
-msgstr ""
+msgstr "膽怯/害羞"
 
-#. 9
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Sick"
 msgstr "生病"
 
-#. 10
+# 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 ""
+msgstr "隨意"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Stressed"
-msgstr "成功："
+msgstr "有壓力"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# FIXME 譯文有待改進，但按標準定義，譯文必須同時有「體力上」和「心力上」強的兩種意義 - acli 20100509
 msgid "Strong"
-msgstr "歌曲"
+msgstr "強"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Surprised"
-msgstr ""
+msgstr "驚奇"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Thankful"
-msgstr ""
+msgstr "滿心感謝"
 
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Thirsty"
-msgstr ""
+msgstr "口渴"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Tired"
-msgstr "Fire"
+msgstr "疲倦"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
+# NOTE 這解「在標準內未有列舉的其他情緒」，不是「沒有設定情緒」
 msgid "Undefined"
-msgstr "底線"
+msgstr "其他情緒"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Weak"
-msgstr "拳打"
+msgstr "虛弱"
 
-#, fuzzy
+# NOTE XMPP 情緒值，譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
 msgid "Worried"
-msgstr "發悶"
+msgstr "擔心"
 
 #  XXX may be wrong
 msgid "Set User Nickname"
@@ -5559,7 +5664,7 @@ msgid "Other Contacts"
 msgstr "沒有群組的好友"
 
 # XXX 暫譯，有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」？ 
+# XXX 這可能是MSN的「基本資料連絡人」？
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別；可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5690,18 +5795,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 "遊戲名稱"
 
@@ -5850,9 +5943,6 @@ msgstr "週年紀念日"
 msgid "Work"
 msgstr "工作資料"
 
-msgid "Job Title"
-msgstr "職銜"
-
 msgid "Company"
 msgstr "公司名稱"
 
@@ -5940,6 +6030,9 @@ msgstr "HTTP 方式專用伺服器"
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -6131,24 +6224,6 @@ msgstr "您要將好友自通訊錄中刪除嗎？"
 msgid "The username specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#. 5
-msgid "In Love"
-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 "您所輸入的密碼無效。"
 
@@ -6180,7 +6255,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 "密碼"
 
@@ -6189,6 +6268,7 @@ msgstr "確認密碼"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "暱稱"
 
@@ -6215,10 +6295,6 @@ msgstr "目前沒有可用的啟動畫面"
 msgid "About"
 msgstr "關於此模組"
 
-#. display / change mood
-msgid "Change Mood..."
-msgstr "修改心情..."
-
 #. display / change profile
 msgid "Change Profile..."
 msgstr "修改個人資料..."
@@ -6250,20 +6326,16 @@ msgstr "無法連線至 MXit 伺服器，請檢查伺服器設定。"
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-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 Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
-#. nick name
-msgid "Nick Name"
-msgstr "暱稱"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6291,10 +6363,12 @@ 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 "帳號已註冊，請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
@@ -6306,7 +6380,7 @@ msgstr "未有輸入保安碼"
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6332,12 +6406,17 @@ msgstr "載入清單中..."
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼？」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "行動電話號碼..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo 帳號"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6350,6 +6429,32 @@ msgstr "使用 HTTP 連線"
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "您已被踢出：(%s)"
+
+#  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, fuzzy
+msgid "was kicked"
+msgstr "無效的 ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "聊天室(_R)："
+
+# XXX 要覆查
+#. 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 的連線已中斷，請重新連線。"
@@ -6462,6 +6567,9 @@ msgstr "（在讀取階段 0x05 時）MXit 發生連線錯誤"
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr "（在讀取階段 0x06 時）MXit 發生連線錯誤"
 
+msgid "In Love"
+msgstr "戀愛中"
+
 msgid "Pending"
 msgstr "等候中"
 
@@ -6869,9 +6977,6 @@ msgstr "密碼已過期"
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-msgid "User not found"
-msgstr "找不到該使用者"
-
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
@@ -7125,115 +7230,164 @@ msgstr "伺服器表示登入前必須完成圖片驗證，但這用戶端尚未
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允許您的帳號在這裏登入"
 
+# NOTE 單寫「要求 %s」好像有些怪 - acli 20090902
+#, c-format
+msgid "Error requesting %s"
+msgstr "要求讀取 %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 "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"
+
+# XXX 這是什麼？ - acli 20100510
 msgid "Thinking"
-msgstr ""
+msgstr "思想中"
 
-#, fuzzy
 msgid "Shopping"
-msgstr "停止輸入"
+msgstr "正在購物"
 
-#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20090730
-#, fuzzy
+# XXX 這是什麼？ - acli 20100510
 msgid "Questioning"
-msgstr "提問視窗"
+msgstr "提問中"
 
-#, fuzzy
 msgid "Eating"
-msgstr "傳呼"
+msgstr "正在吃東西"
 
-#, fuzzy
 msgid "Watching a movie"
-msgstr "正在玩遊戲"
+msgstr "正在看電影"
 
 msgid "Typing"
 msgstr "輸入中"
 
-#, fuzzy
 msgid "At the office"
-msgstr "不在辦公室"
+msgstr "在辦公室"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "在洗澡"
 
 msgid "Watching TV"
-msgstr ""
+msgstr "在看電視"
 
-# NOTE 這是按鈕上的標籤
-#, fuzzy
+# XXX Having fun 是指正在玩樂、尋開心、或在做一些令人覺得很開心的事（例如和朋友一起聊天很開心，甚至做義工令你很開心……）
 msgid "Having fun"
-msgstr "掛斷"
+msgstr "開心中"
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "想睡"
+msgstr "在睡覺"
 
 msgid "Using a PDA"
-msgstr ""
+msgstr "正在用電子手帳"
 
-#  NOTE 這是群組名稱
-#, fuzzy
 msgid "Meeting friends"
-msgstr "即時訊息的好友"
+msgstr "正在跟朋友一起"
 
-#, fuzzy
 msgid "On the phone"
 msgstr "電話中"
 
-#, fuzzy
+# XXX 這和「Browsing the web」有什麼分別？？難道真是在滑浪？？ acli 20100509
 msgid "Surfing"
-msgstr "重覆發生"
+msgstr "在瀏覽網頁"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "使用行動裝置"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "在網上搜尋中"
 
 msgid "At a party"
-msgstr ""
+msgstr "在派對中"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "正在喝咖啡"
 
+# XXX obviously needs improvement - acli 20100503
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "雙子座"
+msgstr "正在玩影像遊戲"
 
+# XXX 這和「Surfing」有什麼分別？？ acli 20100509
 msgid "Browsing the web"
-msgstr ""
+msgstr "在瀏覽網頁"
 
-#, fuzzy
 msgid "Smoking"
-msgstr "歌曲"
+msgstr "正在抽菸"
 
-#, fuzzy
 msgid "Writing"
-msgstr "正在工作"
+msgstr "正在寫作"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "正在工作"
+msgstr "正在喝酒"
 
 msgid "Listening to music"
 msgstr "聽音樂中"
 
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
 msgid "Studying"
-msgstr "傳送中"
+msgstr "正在溫習"
 
-#, fuzzy
 msgid "In the restroom"
-msgstr "興趣"
+msgstr "正在上廁所"
 
 msgid "Received invalid data on connection with server"
 msgstr "連線至伺服器時收到無效的資料"
@@ -7301,121 +7455,6 @@ msgstr ""
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
-# 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 "被家長監控限制，無法接收即時訊息"
-
-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 "離線訊息庫已滿"
-
 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 "
@@ -7535,23 +7574,20 @@ msgstr "允許其他使用者在網路上查看您目前的狀態"
 msgid "Invisible"
 msgstr "隱身"
 
-#, fuzzy
+# XXX 這是什麼?? - acli 20100510
 msgid "Evil"
-msgstr "電子郵件"
+msgstr "邪惡"
 
-#, fuzzy
+# XXX 這是什麼?? - acli 20100510
 msgid "Depression"
-msgstr "專業"
+msgstr "抑鬱"
 
-#, fuzzy
 msgid "At home"
-msgstr "關於我"
+msgstr "在家"
 
-#, fuzzy
 msgid "At work"
-msgstr "網路"
+msgstr "工作中"
 
-#, fuzzy
 msgid "At lunch"
 msgstr "外出用餐"
 
@@ -7778,28 +7814,9 @@ 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 "上線自"
 
@@ -8048,10 +8065,8 @@ msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影�
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#  NOTE Untranslated
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "午飯"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -8082,9 +8097,8 @@ msgstr "取得 AIM 資訊"
 msgid "Edit Buddy Comment"
 msgstr "編輯好友備註"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "取得狀態訊息"
+msgstr "取得 X-Status 訊息"
 
 # XXX 譯「工作階段」好像很奇怪，可能跟 cnscode.org.tw 譯「會談」反而好一點？？
 msgid "End Direct IM Session"
@@ -8213,6 +8227,93 @@ msgstr ""
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+#  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "Service unavailable"
+msgstr "不提供該項服務"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "找不到該會議"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by host"
+msgstr "不支援"
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by client"
+msgstr "不支援"
+
+#, fuzzy
+msgid "Refused by client"
+msgstr "到用戶端速率"
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "「回答」或然率："
+
+#, fuzzy
+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 ""
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "暫時無法使用服務"
+
+#, fuzzy
+msgid "No match"
+msgstr "沒有相符合的"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "好友清單已滿"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "請求中"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -8513,6 +8614,10 @@ msgstr "請求中"
 msgid "Admin"
 msgstr "管理人"
 
+#. XXX: Should this be "Topic"?
+msgid "Room Title"
+msgstr "聊天室名稱"
+
 msgid "Notice"
 msgstr "通知"
 
@@ -8644,6 +8749,7 @@ msgstr " TCP"
 msgid " FromMobile"
 msgstr " 使用行動裝置"
 
+# NOTE 根據cnscode.org.tw, 大陸「綁定」= 台灣「繫結」
 msgid " BindMobile"
 msgstr " 綁定行動裝置"
 
@@ -10455,9 +10561,6 @@ msgstr "Yahoo 帳號"
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
@@ -10474,18 +10577,13 @@ msgstr "聊天室區域 (Locale)"
 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 "聊天室清單所在網址"
 
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 msgid "Yahoo JAPAN ID..."
 msgstr "Yahoo JAPAN 帳號..."
 
@@ -10524,8 +10622,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."
@@ -10550,6 +10648,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 "未有輸入帳號或密碼"
@@ -10623,6 +10729,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 "不在家"
 
@@ -11024,7 +11138,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.
@@ -11038,6 +11152,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)"
 
@@ -11110,10 +11228,9 @@ msgstr "請勿打擾"
 msgid "Extended away"
 msgstr "長時間離開"
 
-# XXX 20080508 acli
-#, fuzzy
+# XXX 20100503 acli 這是什麼？？？
 msgid "Feeling"
-msgstr "接收中"
+msgstr "感覺"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11286,13 +11403,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 "登入選項"
@@ -11667,14 +11777,11 @@ msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。
 msgid "Unknown node type"
 msgstr "節點類別不明"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "請從列表選擇您目前的情緒。"
+msgstr "請從列表選擇您目前的情緒"
 
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
 msgid "Message (optional)"
-msgstr "別名（選用）"
+msgstr "訊息（選用）"
 
 msgid "Edit User Mood"
 msgstr "編輯使用者情緒"
@@ -11758,9 +11865,8 @@ msgstr "/工具/偏好設定(_E)"
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/工具/系統日誌(_L)"
+msgstr "/工具/設定情緒(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
@@ -11781,20 +11887,17 @@ msgstr "/說明(_H)"
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "好友資訊"
+msgstr "/說明/版本建置資訊(_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "伺服器資訊"
+msgstr "/說明/開發者名單(_V)"
 
-#, fuzzy
 msgid "/Help/_Translator Information"
-msgstr "個人資訊"
+msgstr "/說明/譯者名單(_T)"
 
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
@@ -12024,9 +12127,8 @@ msgstr "<PurpleMain>/帳號/"
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "設定情緒..."
+msgstr "設定情緒(_M)..."
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
@@ -12156,9 +12258,9 @@ msgstr "/交談/媒體/語音／視像通話(_C)"
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "/Conversation/Get _Attention"
-msgstr "/交談/取得資訊"
+msgstr "/交談/取得注意(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
@@ -12242,9 +12344,9 @@ msgstr "/交談/媒體/語音／視像通話"
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "/Conversation/Get Attention"
-msgstr "/交談/取得資訊"
+msgstr "/交談/取得注意"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
@@ -12310,13 +12412,13 @@ msgstr "傳送(_S)"
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#, fuzzy
+# XXX 這是Firefox的譯文，其實我覺得「bar」譯成「欄位」較好 =P
 msgid "Close Find bar"
-msgstr "關閉這個分頁"
+msgstr "關閉文字尋找列"
 
-#, fuzzy
+# XXX 如上
 msgid "Find:"
-msgstr "搜尋"
+msgstr "尋找："
 
 #, c-format
 msgid "%d person in room"
@@ -12391,7 +12493,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 "標示比對字串"
@@ -12495,6 +12596,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 "白俄羅斯文"
@@ -12505,6 +12610,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"
@@ -12641,6 +12749,10 @@ msgstr "寮國文"
 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 "蒙古文"
 
@@ -12771,22 +12883,21 @@ msgstr "阿姆哈拉文"
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#, fuzzy, c-format
+# XXX 要校對一下這個 - 20100503 acli
+# NOTE 所有 %s 都是 PIDGIN_NAME，沒有檔名
+#, 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>"
+"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 ""
@@ -12795,8 +12906,11 @@ msgid ""
 "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 聊天室：devel@conference.pidgin.im<BR><BR>"
 
-#, fuzzy, c-format
+#, 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/"
@@ -12806,24 +12920,24 @@ msgid ""
 "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 "About %s"
 msgstr "關於 %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "好友資訊"
+msgstr "版本建置資訊"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "好友資訊"
+msgstr "這個 %s 的版本建置資訊"
 
 msgid "Current Developers"
 msgstr "現任開發者"
@@ -12842,9 +12956,9 @@ msgstr "前任開發者"
 msgid "Retired Crazy Patch Writers"
 msgstr "前任的狂熱模組作者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "伺服器資訊"
+msgstr "%s 開發者名單"
 
 msgid "Current Translators"
 msgstr "現任譯者"
@@ -12852,9 +12966,9 @@ msgstr "現任譯者"
 msgid "Past Translators"
 msgstr "前任譯者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "更多資訊"
+msgstr "%s 譯者名單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 msgid "_Name"
@@ -13275,9 +13389,9 @@ msgstr "插入影像"
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#, fuzzy
+# XXX 譯文有待改進 acli 20100509
 msgid "Send Attention"
-msgstr "「傳送」按紐"
+msgstr "取得注意"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>粗體(_B)</b>"
@@ -13328,7 +13442,7 @@ msgid "_Smile!"
 msgstr "笑一個(_S)！"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "注意！(_A)"
 
 msgid "Log Deletion Failed"
 msgstr "日誌刪除失敗"
@@ -13345,14 +13459,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?"
@@ -13442,17 +13556,20 @@ 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"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+#, fuzzy
+msgid "_Hangup"
+msgstr "掛斷"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14262,10 +14379,6 @@ msgstr "捷徑文字"
 msgid "Custom Smiley Manager"
 msgstr "自訂表情管理"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "必須先啟動帳號"
-
 msgid "Select Buddy Icon"
 msgstr "選擇好友圖示"
 
@@ -15445,8 +15558,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 "顯示日期於..."
@@ -15645,956 +15767,192 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-# FIXME 譯文有待改進 - acli 20090731
-#~ msgid "Error creating conference."
-#~ msgstr "建立會議失敗。"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "無法連結 Socket 到通訊埠：%s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "無法監聽 Socket：%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 "個人資料網址"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN 協定模組"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s 不是一個有效的群組。"
-
-#~ msgid "Unknown error."
-#~ msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%2$s (%3$s)：%1$s"
-
-#  TODO 請覆查，譯文有待改進
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查，譯文有待改進
-#~ 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 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ 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>irc.freenode.net 上的 #pidgin 頻道"
-#~ "<BR><BR>"
-
-#~ 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>"
-
-# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#~ msgid "Debugging Information"
-#~ msgstr "除錯專用資訊"
-
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#~ 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」，原因不明，大概是影像檔已損壞"
-
-#  NOTE Jabber 的「stanza」譯「段落」，下同
-#~ 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 連線方法。"
-
-#~ 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 ""
-#~ "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 "檔案傳輸伺服器（日本地區）"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
-
-#~ 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 "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷：\n"
-#~ "%d, %s"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
-
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
-
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
-
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
-
-#~ msgid "Blood Type"
-#~ msgstr "血型"
-
-#~ msgid "Update information"
-#~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ 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."
+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 "Auth"
-#~ msgstr "認證"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
-#~ msgid "Approve"
-#~ msgstr "允許"
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin 正在執行，請結束 Pidgin 後重試。"
 
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr "Pidgin 核心檔案及 DLL"
 
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "為 Pidgin 在開始選單建立捷徑"
 
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "為 Pidgin 在桌面上建立捷徑"
 
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "除錯符號（回報當機專用）"
 
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING，按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
+#. Installer Subsection Text
+msgid "Desktop"
+msgstr "桌面"
 
-#~ msgid "I am the admin"
-#~ 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 "Unknown status"
-#~ 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 "Remove from Qun"
-#~ 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 "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ 執行環境（如未安裝則必須安裝）"
 
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組？"
+#. Installer Subsection Text
+msgid "Localizations"
+msgstr "本地化支援"
 
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求？"
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
+msgid "Next >"
+msgstr "下一頁 >"
 
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
+#. Installer Subsection Text
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin 網路即時通（必須安裝）"
 
-#~ msgid "Change Qun information"
-#~ msgstr "修改群組資訊"
+# 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 "System Message"
-#~ msgstr "系統訊息"
+#. Installer Subsection Text
+msgid "Shortcuts"
+msgstr "捷徑"
 
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>上次登入位址：</b>%s<br>\n"
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr "啟動 Pidgin 的捷徑"
 
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>上次登入時間：</b>%s\n"
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr "拼字檢查功能支援"
 
-#~ msgid "Set My Information"
-#~ msgstr "設定我的資訊"
+#. Installer Subsection Text
+msgid "Start Menu"
+msgstr "開始選單"
 
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr "拼字檢查功能支援（需連線至網際網路才能安裝）"
 
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
+msgid "The installer is already running."
+msgstr "安裝程式已在執行中。"
 
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
+# 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 "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入，暫時不支援 Redirect_EX 功能"
+#  NOTE 這似乎是視窗標題
+#. Installer Subsection Text
+msgid "URI Handlers"
+msgstr "網址處理器"
 
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤：%s"
+# 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 版本，新版本會在不移除舊版本的情況下被安裝。"
 
-# FIXME 不知這是什麼，但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號：%s"
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr "瀏覽 Pidgin 官方網站"
 
-# XXX 看不明原始碼，這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
+msgid "You do not have permission to uninstall this application."
+msgstr "您沒有權限移除程式。"
 
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中，將會嘗試 %d 次"
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
 
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求？"
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
 
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎？"
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
 
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位，就是 profile->nickname
+#~ msgid "Nick Name"
+#~ msgstr "暱稱"
 
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
+#~ msgid "Your Mobile Number..."
+#~ msgstr "行動電話號碼..."
 
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
+#~ msgid "Rate to host"
+#~ msgstr "到伺服器速率"
 
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
+#~ msgid "Rate to client"
+#~ msgstr "到用戶端速率"
 
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
+# XXX 暫譯 - acli 20090730
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒體/掛斷(_H)"
 
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他（她）加入您的好友清單嗎？"
+#~ msgid "Current Mood"
+#~ msgstr "目前的心情"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "New Mood"
+#~ msgstr "新心情"
 
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
+#~ msgid "Change your Mood"
+#~ msgstr "修改心情"
 
-#~ msgid "developer"
-#~ msgstr "開發者"
+#~ msgid "How do you feel right now?"
+#~ msgstr "您現在覺得怎樣？"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"
+#~ msgid "Change Mood..."
+#~ msgstr "修改心情..."
diff --git a/share/ca-certs/Makefile.am b/share/ca-certs/Makefile.am
index 4ec9d6ab76..13097a340c 100644
--- a/share/ca-certs/Makefile.am
+++ b/share/ca-certs/Makefile.am
@@ -9,6 +9,7 @@ CERTIFICATES = \
 		StartCom_Certification_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
 		Thawte_Premium_Server_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_-_G5.pem \
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-----