changeset 29739:13fa0fffac6d

merge of '1529fa495883d559527375c0d8b7fbe68cf019c2' and '3e607deb45a1ba0c62a1b8f376d94b2751ec8343'
author Paul Aurich <paul@darkrain42.org>
date Sat, 09 Jan 2010 02:00:18 +0000
parents c4ed54041d6e (current diff) 10eaca0bf01a (diff)
children ba8577b87d2e
files pidgin/pixmaps/tray/16/tray-away.png pidgin/pixmaps/tray/16/tray-busy.png pidgin/pixmaps/tray/16/tray-connecting.png pidgin/pixmaps/tray/16/tray-extended-away.png pidgin/pixmaps/tray/16/tray-invisible.png pidgin/pixmaps/tray/16/tray-message.png pidgin/pixmaps/tray/16/tray-new-im.png pidgin/pixmaps/tray/16/tray-offline.png pidgin/pixmaps/tray/16/tray-online.png pidgin/pixmaps/tray/22/tray-away.png pidgin/pixmaps/tray/22/tray-busy.png pidgin/pixmaps/tray/22/tray-connecting.png pidgin/pixmaps/tray/22/tray-extended-away.png pidgin/pixmaps/tray/22/tray-invisible.png pidgin/pixmaps/tray/22/tray-message.png pidgin/pixmaps/tray/22/tray-new-im.png pidgin/pixmaps/tray/22/tray-offline.png pidgin/pixmaps/tray/22/tray-online.png pidgin/pixmaps/tray/32/tray-away.png pidgin/pixmaps/tray/32/tray-busy.png pidgin/pixmaps/tray/32/tray-connecting.png pidgin/pixmaps/tray/32/tray-extended-away.png pidgin/pixmaps/tray/32/tray-invisible.png pidgin/pixmaps/tray/32/tray-message.png pidgin/pixmaps/tray/32/tray-new-im.png pidgin/pixmaps/tray/32/tray-offline.png pidgin/pixmaps/tray/32/tray-online.png pidgin/pixmaps/tray/48/tray-away.png pidgin/pixmaps/tray/48/tray-busy.png pidgin/pixmaps/tray/48/tray-connecting.png pidgin/pixmaps/tray/48/tray-extended-away.png pidgin/pixmaps/tray/48/tray-invisible.png pidgin/pixmaps/tray/48/tray-message.png pidgin/pixmaps/tray/48/tray-new-im.png pidgin/pixmaps/tray/48/tray-offline.png pidgin/pixmaps/tray/48/tray-online.png
diffstat 298 files changed, 32836 insertions(+), 18150 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 20 00:33:23 2009 +0000
+++ b/ChangeLog	Sat Jan 09 02:00:18 2010 +0000
@@ -1,4 +1,3 @@
-
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.0 (??/??/????):
@@ -16,18 +15,53 @@
 	* Use GtkStatusIcon for the docklet, providing better integration in
 	  notification area.
 	* Added UI for sending attentions (buzz, nudge) on supporting protocols.
+	* Make the search dialog unobtrusive in the conversation window (by making
+	  it look and behave like the search dialog in Firefox)
 
-version 2.6.4 (??/??/20??):
+version 2.6.5 (??/??/20??):
+	libpurple:
+	* TLS certificates are actually stored to the local cache once again
+	  (accepting a name mismatch on a certificate should now be remembered)
+
+	General:
+	* Build-time fixes for Solaris.  (Paul Townsend)
+
+	AIM and ICQ:
+	* Messages from some mobile clients are no longer displayed as
+	  Chinese characters (broken in 2.6.4)
+
+	MSN:
+	* File transfer requests will no longer cause a crash if you delete the
+	  file before the other side accepts.
+	* Recieved files will no longer hold an extra lock after completion,
+	  meaning they can be moved or deleted without complaints from your OS.
+	* Buddies who sign in from a second location will no longer cause an
+	  unnecessary chat window to open.
+
+	XMPP:
+	* Added support for the SCRAM-SHA-1 SASL mechanism.  This is only
+	  available when built without Cyrus SASL support.
+	* When getting info on a domain-only (server) JID, show uptime
+	  (when given by the result of the "last query") and don't show status as
+	  offline.
+	* Do not crash when attempting to register for a new account on Windows.
+	* Fix file transfer with clients that do not support Entity Capabilities
+	  (e.g. Spark)
+
+version 2.6.4 (11/29/2009):
 	libpurple:
 	* Actually emit the hold signal for media calls.
+	* Fix building the GnuTLS plugin with older versions of GnuTLS.
+	* Fix DNS TXT query resolution.
+	* Don't send Proxy-Authorization headers to HTTP proxy servers until we've
+	  received a "407 Proxy Authentication Required" response from the server.
+	  (thecrux)
 	* Added "MXit" protocol plugin, supported and maintained by the MXit folks
 	  themselves (MXit Lifestyle (Pty) Ltd.)
 
 	General:
 	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
 	  to announce the list of loaded plugins (in both Finch and Pidgin).
-	* Fix building the GnuTLS plugin with older versions of GnuTLS.
-	* Fix DNS TXT query resolution.
 	* Always rejoin open chats after an account reconnects.
 
 	AIM and ICQ:
@@ -36,7 +70,9 @@
 	* The simultaneous login account option is respected when using
 	  the clientLogin authentication method.
 	* Fix offline message retrieval (broken in 2.6.3)
+	* Fix handling of markup on some messages (broken in 2.6.2)
 	* Fix SSL when clientLogin is enabled.
+	* Fix sending and receiving Unicode characters in a Direct IM
 
 	MSN:
 	* Don't forget display names for buddies.
@@ -47,6 +83,9 @@
 	* Fix a random crash that might occur when idle.
 	* Fix a crash when logging in with some long non-ASCII passwords.
 	  (Shaun Lindsay)
+	* Cache our own friendly name as the server no longer does that for
+	  us.  Users of older versions may need to re-set their friendly name
+	  as it has probably been reset.
 
 	XMPP:
 	* Users connecting to Google Talk now have an "Initiate Chat" context menu
@@ -55,7 +94,7 @@
 	* Resolve an issue when connecting to iChat Server when no resource
 	  is specified.
 	* Try to automatically find a STUN server by using an SRV lookup on the
-	  account's domain, and use that for voice and video if found and the user 
+	  account's domain, and use that for voice and video if found and the user
 	  didn't set one manually in prefs.
 	* Fix a crash when adding a buddy without an '@'.
 	* Don't show the option to send a file to a buddy if we know for certain
@@ -74,11 +113,17 @@
 	* The TinyURL plugin now creates shorter URLs for long non-conversation
 	  URLs, e.g. URLs to open Inbox in Yahoo/MSN protocols, or the Yahoo
 	  Captcha when joining chat rooms.
+	* Fix displaying umlauts etc. in non-utf8 locale (fix in libgnt).
 
 	Pidgin:
 	* The userlist in a multiuser chat can be styled via gtkrc by using the
 	  widget name "pidgin_conv_userlist". (Heiko Schmitt)
 	* Add a hold button to the media window.
+	* Fix a bug where the conversation backlog stops scrolling in a very busy
+	  chat room.
+	* In the Conversation "Send To" menu, offline buddies appear grayed
+	  out (but are still selectable).  Previously, only offline buddies on
+	  accounts that do not support offline messaging appeared grayed out.
 
 	Pidgin Preference and Preference Window Changes:
 	* Removed the "Use font from theme" and "Conversation Font" preferences
--- a/ChangeLog.API	Fri Nov 20 00:33:23 2009 +0000
+++ b/ChangeLog.API	Sat Jan 09 02:00:18 2010 +0000
@@ -4,6 +4,9 @@
 	libpurple:
 		Added:
 		* purple_account_get_name_for_display
+		* purple_buddy_get_media_caps
+		* purple_buddy_set_media_caps
+		* purple_contact_get_group
 		* purple_media_candidate_copy
 		* purple_media_codec_copy
 		* purple_media_manager_get_backend_type
@@ -24,6 +27,17 @@
 		* pidgin_dialogs_translators (should not be used by anything but Pidgin)
 		* gtk_imhtmltoolbar_switch_active_conversation
 
+version 2.6.5 (??/??/20??):
+	libpurple:
+		Changed:
+		* purple_xfer_cancel_local is now called instead of
+		  purple_xfer_request_denied if an error is found when selecting
+		  a file to send. Request denied is still used when a receive
+		  request is not allowed.
+
+version 2.6.4 (11/29/2009):
+	No changes
+
 version 2.6.3 (10/16/2009):
 	No changes
 
--- a/ChangeLog.win32	Fri Nov 20 00:33:23 2009 +0000
+++ b/ChangeLog.win32	Sat Jan 09 02:00:18 2010 +0000
@@ -5,6 +5,13 @@
 	* Crash Report files (pidgin.RPT) are now generated in the ~/.purple
 	  directory instead of the installation directory.
 
+version 2.6.5 (??/??/20??):
+	* Installer translations for: Norwegian nynorsk
+
+version 2.6.4 (11/29/2009):
+	* Register URL handlers for everything that Windows knows about.  Still
+	  use the HTTP "open" handler for security reasons.
+
 version 2.6.3 (10/16/2009):
 	* No changes
 
--- a/NEWS	Fri Nov 20 00:33:23 2009 +0000
+++ b/NEWS	Sat Jan 09 02:00:18 2010 +0000
@@ -2,6 +2,26 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.5 (??/??/20??):
+
+2.6.4 (11/29/2009):
+	John:  It's release time again.  Lots of bug fixes this time around, as
+	well as a new protocol plugin developed and maintained by the MXit folks
+	folks.  Elliott and I also did a ton of work on the Preferences window,
+	which will now hopefully fit on most people's small screens.  Enjoy!
+
+	Elliott: This release has been in the works for so long, I don't really
+	remember doing any work on it.  But I do know the MSN servers gave us a
+	little bit of trouble this time around, forgetting people's friendly
+	names.  Nothing too problematic, just a touch annoying.  Also, we've got
+	a nice new Preferences dialog.  You can thank John for that mostly, with
+	a couple of tweaks by me.
+
+	Sadrul: A lot of little fixes for a lot of things! Among them, a fix
+	for a long standing issue with displaying unicode in non-utf8 locale in
+	finch. We also have a new prpl for MXit. This release is very very cool
+	altogether. Enjoy!
+
 2.6.3 (10/16/2009):
 	Mark: Someone reported a fairly serious bug in our AIM/ICQ code
 	so we're releasing a special "severe bug fix only" build.  See the
--- a/configure.ac	Fri Nov 20 00:33:23 2009 +0000
+++ b/configure.ac	Sat Jan 09 02:00:18 2010 +0000
@@ -144,7 +144,7 @@
 	;;
 esac
 
-ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu hy id it ja ka km kn ko ku lo lt mk mn ms_MY my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv sw ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -812,6 +812,10 @@
 fi
 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
 
+dnl #######################################################################
+dnl # Check for Internationalized Domain Name support
+dnl #######################################################################
+
 AC_ARG_ENABLE(idn,
 	[AC_HELP_STRING([--disable-idn], [compile without IDN support])],
 	[enable_idn="$enableval" force_idn=$enableval], [enable_idn="yes" force_idn=no])
@@ -1470,7 +1474,7 @@
 		AC_CHECK_LIB(pthread, pthread_create, )
 		AC_CHECK_LIB(util, openpty, )
 		AC_CHECK_LIB(db, dbopen, )
-		PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+		PY_LIBS="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config -lpython$PY_VERSION"
 		PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
 		AC_DEFINE(USE_PYTHON, [1], [Define if python headers are available.])
 		AC_MSG_RESULT(ok)
@@ -2267,11 +2271,15 @@
 AC_ARG_ENABLE(cyrus-sasl, AC_HELP_STRING([--enable-cyrus-sasl], [enable Cyrus SASL support for jabberd]), enable_cyrus_sasl=$enableval, enable_cyrus_sasl=no)
 if test "x$enable_cyrus_sasl" = "xyes" ; then
 	AC_CHECK_LIB(sasl2, sasl_client_init, [
+			AM_CONDITIONAL(USE_CYRUS_SASL, true)
 			AC_DEFINE(HAVE_CYRUS_SASL, [1], [Define to 1 if Cyrus SASL is present])
 			SASL_LIBS=-"lsasl2"
 		], [
+			AM_CONDITIONAL(USE_CYRUS_SASL, false)
 			AC_ERROR(Cyrus SASL library not found)
 		])
+else
+	AM_CONDITIONAL(USE_CYRUS_SASL, false)
 fi
 
 dnl #######################################################################
@@ -2498,6 +2506,8 @@
 		   pidgin/Makefile
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
+		   pidgin/pidgin-2.pc
+		   pidgin/pidgin-2-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
@@ -2515,6 +2525,8 @@
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
 		   libpurple/purple-uninstalled.pc
+		   libpurple/purple-2.pc
+		   libpurple/purple-2-uninstalled.pc
 		   libpurple/plugins/Makefile
 		   libpurple/plugins/mono/Makefile
 		   libpurple/plugins/mono/api/Makefile
--- a/doc/finch.1.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/doc/finch.1.in	Sat Jan 09 02:00:18 2010 +0000
@@ -114,7 +114,7 @@
 .B Ctrl \+ o \fR or \fB F10
 Bring up the menu (if there is one) for a window.
 .TP
-.B F11
+.B F11 \fR or \fB Ctrl \+ x
 Popup the context menu (if there is one) for the selected widget.
 .TP
 .B Alt \+ /
--- a/finch/finch.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/finch.c	Sat Jan 09 02:00:18 2010 +0000
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
--- a/finch/gntaccount.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntaccount.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
--- a/finch/gntblist.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntblist.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <blist.h>
@@ -1119,6 +1119,8 @@
 		PurpleMenuAction *act = (PurpleMenuAction *) list->data;
 		act->data = node;
 		gnt_append_menu_action(menu, act, NULL);
+		g_signal_connect_swapped(G_OBJECT(menu), "destroy",
+			G_CALLBACK(purple_menu_action_free), act);
 	}
 }
 
@@ -1368,6 +1370,8 @@
 			iter; iter = g_list_delete_link(iter, iter))
 	{
 		gnt_append_menu_action(menu, iter->data, NULL);
+		g_signal_connect_swapped(G_OBJECT(menu), "destroy",
+				G_CALLBACK(purple_menu_action_free), iter->data);
 	}
 }
 
--- a/finch/gntcertmgr.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntcertmgr.c	Sat Jan 09 02:00:18 2010 +0000
@@ -25,8 +25,8 @@
  *
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "certificate.h"
 #include "debug.h"
--- a/finch/gntconn.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntconn.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "core.h"
--- a/finch/gntconv.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntconv.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <string.h>
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <cmds.h>
 #include <core.h>
--- a/finch/gntdebug.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntdebug.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,7 +38,6 @@
 
 #include "gntdebug.h"
 #include "finch.h"
-#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
--- a/finch/gntft.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntft.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
--- a/finch/gntlog.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntlog.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
--- a/finch/gntmedia.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntmedia.c	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 #include "gntconv.h"
 #include "gntmedia.h"
 
--- a/finch/gntnotify.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntnotify.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <util.h>
 
--- a/finch/gntplugin.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntplugin.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
--- a/finch/gntpounce.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/gntpounce.c	Sat Jan 09 02:00:18 2010 +0000
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
--- a/finch/libgnt/gntbox.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntbox.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntbox.h"
 #include "gntstyle.h"
 #include "gntutils.h"
@@ -90,7 +91,7 @@
 		else
 			wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_TITLE_D));
 		mvwaddch(widget->window, 0, pos-1, ACS_RTEE | gnt_color_pair(GNT_COLOR_NORMAL));
-		mvwaddstr(widget->window, 0, pos, title);
+		mvwaddstr(widget->window, 0, pos, C_(title));
 		mvwaddch(widget->window, 0, right, ACS_LTEE | gnt_color_pair(GNT_COLOR_NORMAL));
 		g_free(title);
 	}
--- a/finch/libgnt/gntbutton.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntbutton.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gntinternal.h"
 #include "gntbutton.h"
 #include "gntstyle.h"
 #include "gntutils.h"
@@ -48,7 +49,7 @@
 		type = GNT_COLOR_NORMAL;
 
 	wbkgdset(widget->window, '\0' | gnt_color_pair(type));
-	mvwaddstr(widget->window, (small_button) ? 0 : 1, 2, button->priv->text);
+	mvwaddstr(widget->window, (small_button) ? 0 : 1, 2, C_(button->priv->text));
 	if (small_button) {
 		type = GNT_COLOR_HIGHLIGHT;
 		mvwchgat(widget->window, 0, 0, widget->priv.width, focus ? A_BOLD : A_REVERSE, type, NULL);
--- a/finch/libgnt/gntcheckbox.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntcheckbox.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntcheckbox.h"
 
 enum
@@ -36,21 +37,21 @@
 {
 	GntCheckBox *cb = GNT_CHECK_BOX(widget);
 	GntColorType type;
-	char *text;
+	gboolean focus = gnt_widget_has_focus(widget);
 
-	if (gnt_widget_has_focus(widget))
+	if (focus)
 		type = GNT_COLOR_HIGHLIGHT;
 	else
 		type = GNT_COLOR_NORMAL;
 
 	wbkgdset(widget->window, '\0' | gnt_color_pair(type));
 
-	text = g_strdup_printf("[%c]", cb->checked ? 'X' : ' ');
-	mvwaddstr(widget->window, 0, 0, text);
-	g_free(text);
+	mvwaddch(widget->window, 0, 0, '[');
+	mvwaddch(widget->window, 0, 1, (cb->checked ? 'X' : ' ') | (focus ? A_UNDERLINE : A_NORMAL));
+	mvwaddch(widget->window, 0, 2, ']');
 
 	wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_NORMAL));
-	mvwaddstr(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
+	mvwaddstr(widget->window, 0, 4, C_(GNT_BUTTON(cb)->priv->text));
 	wmove(widget->window, 0, 1);
 
 	GNTDEBUG;
--- a/finch/libgnt/gntcombobox.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntcombobox.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntbox.h"
 #include "gntcombobox.h"
 #include "gnttree.h"
@@ -90,7 +91,7 @@
 	s = (char*)gnt_util_onscreen_width_to_pointer(text, widget->priv.width - 4, &len);
 	*s = '\0';
 
-	mvwaddstr(widget->window, 1, 1, text);
+	mvwaddstr(widget->window, 1, 1, C_(text));
 	whline(widget->window, ' ' | gnt_color_pair(type), widget->priv.width - 4 - len);
 	mvwaddch(widget->window, 1, widget->priv.width - 3, ACS_VLINE | gnt_color_pair(GNT_COLOR_NORMAL));
 	mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | gnt_color_pair(GNT_COLOR_NORMAL));
--- a/finch/libgnt/gntentry.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntentry.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "gntinternal.h"
 #include "gntbox.h"
 #include "gntentry.h"
 #include "gntmarshal.h"
@@ -284,7 +285,7 @@
 				g_utf8_pointer_to_offset(entry->scroll, entry->end));
 	}
 	else
-		mvwprintw(widget->window, 0, 0, "%s", entry->scroll);
+		mvwprintw(widget->window, 0, 0, "%s", C_(entry->scroll));
 
 	stop = gnt_util_onscreen_width(entry->scroll, entry->end);
 	if (stop < widget->priv.width)
--- a/finch/libgnt/gntinternal.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntinternal.h	Sat Jan 09 02:00:18 2010 +0000
@@ -19,6 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <glib.h>
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "Gnt"
 
@@ -31,3 +32,6 @@
 # define gnt_warning g_warning
 #endif
 
+extern int gnt_need_conversation_to_locale;
+extern const char *C_(const char *x);
+
--- a/finch/libgnt/gntkeys.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntkeys.h	Sat Jan 09 02:00:18 2010 +0000
@@ -65,7 +65,7 @@
 #define GNT_KEY_BACKSPACE SAFE(key_backspace)
 #define GNT_KEY_DEL    SAFE(key_dc)
 #define GNT_KEY_INS    SAFE(key_ic)
-#define GNT_KEY_BACK_TAB SAFE(back_tab)
+#define GNT_KEY_BACK_TAB (back_tab ? back_tab : SAFE(key_btab))
 
 #define GNT_KEY_CTRL_A     "\001"
 #define GNT_KEY_CTRL_B     "\002"
--- a/finch/libgnt/gntlabel.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntlabel.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntlabel.h"
 #include "gntutils.h"
 
@@ -53,7 +54,7 @@
 	chtype flag = gnt_text_format_flag_to_chtype(label->flags);
 
 	wbkgdset(widget->window, '\0' | flag);
-	mvwaddstr(widget->window, 0, 0, label->text);
+	mvwaddstr(widget->window, 0, 0, C_(label->text));
 
 	GNTDEBUG;
 }
--- a/finch/libgnt/gntmain.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntmain.c	Sat Jan 09 02:00:18 2010 +0000
@@ -82,6 +82,8 @@
 static GntWM *wm;
 static GntClipboard *clipboard;
 
+int gnt_need_conversation_to_locale;
+
 #define HOLDING_ESCAPE  (escape_stuff.timer != 0)
 
 static struct {
@@ -465,10 +467,12 @@
 #ifdef NO_WIDECHAR
 	ascii_only = TRUE;
 #else
-	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf")))
+	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf"))) {
 		ascii_only = FALSE;
-	else
+	} else {
 		ascii_only = TRUE;
+		gnt_need_conversation_to_locale = TRUE;
+	}
 #endif
 
 	initscr();
@@ -731,3 +735,24 @@
 #endif
 }
 
+const char *C_(const char *x)
+{
+	static char *c = NULL;
+	if (gnt_need_conversation_to_locale) {
+		GError *error = NULL;
+		g_free(c);
+		c = g_locale_from_utf8(x, -1, NULL, NULL, &error);
+		if (c == NULL || error) {
+			char *store = c;
+			c = NULL;
+			gnt_warning("Error: %s\n", error ? error->message : "(unknown)");
+			g_error_free(error);
+			error = NULL;
+			g_free(c);
+			c = store;
+		}
+		return c ? c : x;
+	} else
+		return x;
+}
+
--- a/finch/libgnt/gntmenu.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntmenu.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntmenu.h"
 #include "gntmenuitemcheck.h"
 
@@ -92,7 +93,7 @@
 			item->priv.x = getcurx(widget->window) + widget->priv.x;
 			item->priv.y = getcury(widget->window) + widget->priv.y + 1;
 			wbkgdset(widget->window, type);
-			wprintw(widget->window, " %s   ", item->text);
+			wprintw(widget->window, " %s   ", C_(item->text));
 		}
 	} else {
 		org_draw(widget);
--- a/finch/libgnt/gnttextview.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gnttextview.c	Sat Jan 09 02:00:18 2010 +0000
@@ -118,7 +118,7 @@
 			if (select_start && select_start < view->string->str + seg->start && select_end > view->string->str + seg->end) {
 				fl |= A_REVERSE;
 				wattrset(widget->window, fl);
-				wprintw(widget->window, "%s", (view->string->str + seg->start));
+				wprintw(widget->window, "%s", C_(view->string->str + seg->start));
 			} else if (select_start && select_end &&
 				((select_start >= view->string->str + seg->start && select_start <= view->string->str + seg->end) ||
 				(select_end <= view->string->str + seg->end && select_start <= view->string->str + seg->start))) {
@@ -132,13 +132,13 @@
 						fl = seg->flags;
 					str = g_strndup(cur, last - cur);
 					wattrset(widget->window, fl);
-					waddstr(widget->window, str);
+					waddstr(widget->window, C_(str));
 					g_free(str);
 					cur = g_utf8_next_char(cur);
 				}
 			} else {
 				wattrset(widget->window, fl);
-				wprintw(widget->window, "%s", (view->string->str + seg->start));
+				wprintw(widget->window, "%s", C_(view->string->str + seg->start));
 			}
 			*end = back;
 		}
--- a/finch/libgnt/gnttree.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gnttree.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "gntinternal.h"
 #include "gntmarshal.h"
 #include "gntstyle.h"
 #include "gnttree.h"
@@ -549,7 +550,7 @@
 		}
 
 		wbkgdset(widget->window, '\0' | attr);
-		mvwaddstr(widget->window, i, pos, str);
+		mvwaddstr(widget->window, i, pos, C_(str));
 		whline(widget->window, ' ', scrcol - wr);
 		tree->bottom = row;
 		g_free(str);
--- a/finch/libgnt/gntutils.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntutils.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "config.h"
+
 #include "gntinternal.h"
 #undef GNT_LOG_DOMAIN
 #define GNT_LOG_DOMAIN "Utils"
@@ -35,8 +37,6 @@
 #include "gntutils.h"
 #include "gntwindow.h"
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,8 +46,6 @@
 #include <libxml/tree.h>
 #endif
 
-#include "config.h"
-
 void gnt_util_get_text_bound(const char *text, int *width, int *height)
 {
 	const char *s = text, *last;
--- a/finch/libgnt/gntws.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/gntws.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1,5 +1,28 @@
+/*
+ * GNT - The GLib Ncurses Toolkit
+ *
+ * GNT is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
 #include <gmodule.h>
 
+#include "gntinternal.h"
 #include "gntbox.h"
 #include "gntwidget.h"
 #include "gntwindow.h"
@@ -73,7 +96,7 @@
 		else
 			mvwhline(taskbar, 0, width * i, ' ' | gnt_color_pair(color), getmaxx(stdscr) - width * i);
 		title = GNT_BOX(w)->title;
-		mvwprintw(taskbar, 0, width * i, "%s", title ? title : "<gnt>");
+		mvwprintw(taskbar, 0, width * i, "%s", title ? C_(title) : "<gnt>");
 		if (i)
 			mvwaddch(taskbar, 0, width *i - 1, ACS_VLINE | A_STANDOUT | gnt_color_pair(GNT_COLOR_NORMAL));
 	}
--- a/finch/libgnt/wms/s.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/finch/libgnt/wms/s.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1,8 +1,8 @@
+#include "internal.h"
+
 #include <string.h>
 #include <sys/types.h>
 
-#include "internal.h"
-
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
--- a/libpurple/blist.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/blist.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1739,6 +1739,14 @@
 	g_free(contact);
 }
 
+PurpleGroup *
+purple_contact_get_group(const PurpleContact *contact)
+{
+	g_return_val_if_fail(contact, NULL);
+
+	return (PurpleGroup *)(((PurpleBlistNode *)contact)->parent);
+}
+
 void purple_contact_set_alias(PurpleContact *contact, const char *alias)
 {
 	purple_blist_alias_contact(contact,alias);
@@ -2605,6 +2613,18 @@
 	return buddy->presence;
 }
 
+PurpleMediaCaps purple_buddy_get_media_caps(const PurpleBuddy *buddy)
+{
+	g_return_val_if_fail(buddy != NULL, 0);
+	return buddy->media_caps;
+}
+
+void purple_buddy_set_media_caps(PurpleBuddy *buddy, PurpleMediaCaps media_caps)
+{
+	g_return_if_fail(buddy != NULL);
+	buddy->media_caps = media_caps;
+}
+
 PurpleGroup *purple_buddy_get_group(PurpleBuddy *buddy)
 {
 	g_return_val_if_fail(buddy != NULL, NULL);
--- a/libpurple/blist.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/blist.h	Sat Jan 09 02:00:18 2010 +0000
@@ -659,6 +659,24 @@
 PurplePresence *purple_buddy_get_presence(const PurpleBuddy *buddy);
 
 /**
+ * Gets the media caps from a buddy.
+ *
+ * @param buddy The buddy.
+ * @return      The media caps.
+ *
+ * @since 2.7.0
+ */
+PurpleMediaCaps purple_buddy_get_media_caps(const PurpleBuddy *buddy);
+
+/**
+ * Sets the media caps for a buddy.
+ *
+ * @param buddy      The PurpleBuddy.
+ * @param media_caps The PurpleMediaCaps.
+ */
+void purple_buddy_set_media_caps(PurpleBuddy *buddy, PurpleMediaCaps media_caps);
+
+/**
  * Adds a new buddy to the buddy list.
  *
  * The buddy will be inserted right after node or prepended to the
@@ -717,6 +735,16 @@
 void purple_contact_destroy(PurpleContact *contact);
 
 /**
+ * Gets the PurpleGroup from a PurpleContact
+ *
+ * @param contact  The contact
+ * @return         The group
+ *
+ * @since 2.7.0
+ */
+PurpleGroup *purple_contact_get_group(const PurpleContact *contact);
+
+/**
  * Adds a new contact to the buddy list.
  *
  * The new contact will be inserted after insert or prepended to the list if
--- a/libpurple/certificate.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/certificate.c	Sat Jan 09 02:00:18 2010 +0000
@@ -26,8 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 #include "certificate.h"
 #include "dbus-maybe.h"
@@ -1433,9 +1431,8 @@
 	tls_peers = purple_certificate_find_pool(x509_tls_cached.scheme_name,
 						 "tls_peers");
 	if (tls_peers) {
-		if (!purple_certificate_pool_contains(tls_peers, vrq->subject_name) &&
-		        !purple_certificate_pool_store(tls_peers,vrq->subject_name,
-		                                       peer_crt)) {
+		if (!purple_certificate_pool_store(tls_peers,vrq->subject_name,
+		                                   peer_crt)) {
 			purple_debug_error("certificate/x509/tls_cached",
 			                   "FAILED to cache peer certificate\n");
 		}
--- a/libpurple/cmds.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/cmds.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 
 #include "account.h"
--- a/libpurple/conversation.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/conversation.h	Sat Jan 09 02:00:18 2010 +0000
@@ -1024,7 +1024,8 @@
 GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users);
 
 /**
- * Returns a list of users in the chat room.
+ * Returns a list of users in the chat room.  The members of the list
+ * are PurpleConvChatBuddy objects.
  *
  * @param chat The chat.
  *
--- a/libpurple/dbus-server.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/dbus-server.c	Sat Jan 09 02:00:18 2010 +0000
@@ -25,14 +25,16 @@
 #define DBUS_API_SUBJECT_TO_CHANGE
 #endif
 
+/* Allow the code below to see deprecated functions, so we can continue to
+ * export them via DBus. */
+#undef PURPLE_DISABLE_DEPRECATED
+
+#include "internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-/* Allow the code below to see deprecated functions, so we can continue to
- * export them via DBus. */
-#undef PURPLE_DISABLE_DEPRECATED
-
 #include "account.h"
 #include "blist.h"
 #include "conversation.h"
@@ -42,7 +44,6 @@
 #include "dbus-bindings.h"
 #include "debug.h"
 #include "core.h"
-#include "internal.h"
 #include "savedstatuses.h"
 #include "smiley.h"
 #include "util.h"
--- a/libpurple/debug.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/debug.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "prefs.h"
 #include "util.h"
 
--- a/libpurple/desktopitem.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/desktopitem.c	Sat Jan 09 02:00:18 2010 +0000
@@ -53,12 +53,12 @@
  * Boston, MA 02111-1301, USA.
  */
 
+#include "internal.h"
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "desktopitem.h"
-#include "internal.h"
 
 struct _PurpleDesktopItem {
 	int refcount;
--- a/libpurple/eventloop.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/eventloop.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include "internal.h"
 #include "eventloop.h"
-#include "internal.h"
 
 static PurpleEventLoopUiOps *eventloop_ui_ops = NULL;
 
--- a/libpurple/ft.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/ft.c	Sat Jan 09 02:00:18 2010 +0000
@@ -120,6 +120,10 @@
 		ui_ops->new_xfer(xfer);
 
 	xfers = g_list_prepend(xfers, xfer);
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("xfer", "new %p [%d]\n", xfer, xfer->ref);
+
 	return xfer;
 }
 
@@ -131,8 +135,6 @@
 
 	g_return_if_fail(xfer != NULL);
 
-	priv = g_hash_table_lookup(xfers_data, xfer);
-
 	/* Close the file browser, if it's open */
 	purple_request_close_with_handle(xfer);
 
@@ -162,6 +164,9 @@
 	g_return_if_fail(xfer != NULL);
 
 	xfer->ref++;
+
+	if (purple_debug_is_verbose())
+		purple_debug_info("xfer", "ref'd %p [%d]\n", xfer, xfer->ref);
 }
 
 void
@@ -172,6 +177,9 @@
 
 	xfer->ref--;
 
+	if (purple_debug_is_verbose())
+		purple_debug_info("xfer", "unref'd %p [%d]\n", xfer, xfer->ref);
+
 	if (xfer->ref == 0)
 		purple_xfer_destroy(xfer);
 }
@@ -243,7 +251,7 @@
 	escaped = g_markup_escape_text(message, -1);
 
 	if (is_error)
-		flags = PURPLE_MESSAGE_ERROR;
+		flags |= PURPLE_MESSAGE_ERROR;
 
 	purple_conversation_write(conv, NULL, escaped, flags, time(NULL));
 	g_free(escaped);
@@ -282,14 +290,16 @@
 purple_xfer_choose_file_ok_cb(void *user_data, const char *filename)
 {
 	PurpleXfer *xfer;
+	PurpleXferType type;
 	struct stat st;
 	gchar *dir;
 
 	xfer = (PurpleXfer *)user_data;
+	type = purple_xfer_get_type(xfer);
 
 	if (g_stat(filename, &st) != 0) {
 		/* File not found. */
-		if (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE) {
+		if (type == PURPLE_XFER_RECEIVE) {
 #ifndef _WIN32
 			int mode = W_OK;
 #else
@@ -311,29 +321,26 @@
 		}
 		else {
 			purple_xfer_show_file_error(xfer, filename);
-			purple_xfer_request_denied(xfer);
+			purple_xfer_cancel_local(xfer);
 		}
 	}
-	else if ((purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) &&
-			 (st.st_size == 0)) {
+	else if ((type == PURPLE_XFER_SEND) && (st.st_size == 0)) {
 
 		purple_notify_error(NULL, NULL,
 						  _("Cannot send a file of 0 bytes."), NULL);
 
-		purple_xfer_request_denied(xfer);
+		purple_xfer_cancel_local(xfer);
 	}
-	else if ((purple_xfer_get_type(xfer) == PURPLE_XFER_SEND) &&
-			 S_ISDIR(st.st_mode)) {
+	else if ((type == PURPLE_XFER_SEND) && S_ISDIR(st.st_mode)) {
 		/*
 		 * XXX - Sending a directory should be valid for some protocols.
 		 */
 		purple_notify_error(NULL, NULL,
 						  _("Cannot send a directory."), NULL);
 
-		purple_xfer_request_denied(xfer);
+		purple_xfer_cancel_local(xfer);
 	}
-	else if ((purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE) &&
-			 S_ISDIR(st.st_mode)) {
+	else if ((type == PURPLE_XFER_RECEIVE) && S_ISDIR(st.st_mode)) {
 		char *msg, *utf8;
 		utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
 		msg = g_strdup_printf(
@@ -343,6 +350,23 @@
 		g_free(msg);
 		purple_xfer_request_denied(xfer);
 	}
+	else if (type == PURPLE_XFER_SEND) {
+#ifndef _WIN32
+		int mode = R_OK;
+#else
+		int mode = F_OK;
+#endif
+
+		if (g_access(filename, mode) == 0) {
+			purple_xfer_request_accepted(xfer, filename);
+		} else {
+			purple_xfer_ref(xfer);
+			purple_notify_message(
+				NULL, PURPLE_NOTIFY_MSG_ERROR, NULL,
+				_("File is not readable."), NULL,
+				(PurpleNotifyCloseCallback)purple_xfer_choose_file, xfer);
+		}
+	}
 	else {
 		purple_xfer_request_accepted(xfer, filename);
 	}
@@ -356,7 +380,11 @@
 	PurpleXfer *xfer = (PurpleXfer *)user_data;
 
 	purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL);
-	purple_xfer_request_denied(xfer);
+	if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
+		purple_xfer_cancel_local(xfer);
+	else
+		purple_xfer_request_denied(xfer);
+	purple_xfer_unref(xfer);
 }
 
 static int
@@ -981,6 +1009,8 @@
 		r = write(xfer->fd, buffer, s);
 		if (r < 0 && errno == EAGAIN)
 			r = 0;
+		if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
+			purple_xfer_set_completed(xfer, TRUE);
 	}
 
 	return r;
@@ -1011,6 +1041,9 @@
 				return;
 			}
 
+			if ((purple_xfer_get_size(xfer) > 0) &&
+				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
+				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
@@ -1048,7 +1081,7 @@
 					xfer->watcher = 0;
 				}
 				/* 
-				 * if we requested 0 bytes it's only normal that en up here 
+				 * if we requested 0 bytes it's only normal that end up here 
 				 * we shouldn't return as we still have something to 
 				 * write in priv->buffer
 				 */
--- a/libpurple/ft.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/ft.h	Sat Jan 09 02:00:18 2010 +0000
@@ -160,7 +160,10 @@
 
 	PurpleXferStatusType status;    /**< File Transfer's status.             */
 
-	/* I/O operations. */
+	/** I/O operations, which should be set by the prpl using
+	 *  purple_xfer_set_init_fnc() and friends.  Setting #init is
+	 *  mandatory; all others are optional.
+	 */
 	struct
 	{
 		void (*init)(PurpleXfer *xfer);
--- a/libpurple/imgstore.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/imgstore.c	Sat Jan 09 02:00:18 2010 +0000
@@ -25,7 +25,6 @@
  *
 */
 
-#include <glib.h>
 #include "internal.h"
 
 #include "dbus-maybe.h"
--- a/libpurple/media/backend-fs2.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/media/backend-fs2.c	Sat Jan 09 02:00:18 2010 +0000
@@ -24,11 +24,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "backend-fs2.h"
-
 #include "internal.h"
 
 #ifdef USE_VV
+#include "backend-fs2.h"
+
 #include "backend-iface.h"
 #include "debug.h"
 #include "network.h"
@@ -1967,7 +1967,6 @@
 #endif /* USE_VV */
 	g_return_val_if_reached(NULL);
 }
-#endif /* USE_GSTREAMER */
 
 void
 purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
@@ -2030,3 +2029,4 @@
 	}
 #endif /* USE_VV */
 }
+#endif /* USE_GSTREAMER */
--- a/libpurple/media/codec.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/media/codec.h	Sat Jan 09 02:00:18 2010 +0000
@@ -32,7 +32,7 @@
 /** An opaque structure representing an audio or video codec. */
 typedef struct _PurpleMediaCodec PurpleMediaCodec;
 
-#include "util.h"
+#include "../util.h"
 
 #include <glib-object.h>
 
--- a/libpurple/media/media.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/media/media.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,18 +23,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-
 #include "internal.h"
 
 #include "account.h"
 #include "media.h"
-#include "media/backend-fs2.h"
 #include "media/backend-iface.h"
 #include "mediamanager.h"
 
 #include "debug.h"
 
 #ifdef USE_GSTREAMER
+#include "media/backend-fs2.h"
 #include "marshallers.h"
 #include "media-gst.h"
 #endif
--- a/libpurple/mime.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/mime.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,11 +21,6 @@
  * USA.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-
 #include "internal.h"
 
 /* this should become "util.h" if we ever get this into purple proper */
--- a/libpurple/nat-pmp.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/nat-pmp.c	Sat Jan 09 02:00:18 2010 +0000
@@ -29,8 +29,8 @@
  * OF SUCH DAMAGE.
  */
 
+#include "internal.h"
 #include "nat-pmp.h"
-#include "internal.h"
 #include "debug.h"
 #include "signals.h"
 #include "network.h"
--- a/libpurple/ntlm.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/ntlm.c	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <stdlib.h>
 #include "internal.h"
 
 #include "util.h"
--- a/libpurple/plugins/log_reader.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/plugins/log_reader.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1,7 +1,7 @@
+#include "internal.h"
+
 #include <stdio.h>
 
-#include "internal.h"
-
 #include "debug.h"
 #include "log.h"
 #include "plugin.h"
--- a/libpurple/plugins/signals-test.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/plugins/signals-test.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,9 +20,10 @@
  */
 #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
 
+#include "internal.h"
+
 #include <stdio.h>
 
-#include "internal.h"
 #include "cipher.h"
 #include "connection.h"
 #include "conversation.h"
--- a/libpurple/protocols/gg/lib/common.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/common.c	Sat Jan 09 02:00:18 2010 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #ifndef _WIN32
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -41,8 +43,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 FILE *gg_debug_file = NULL;
 
 #ifndef GG_DEBUG_DISABLE
--- a/libpurple/protocols/gg/lib/dcc.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/dcc.c	Sat Jan 09 02:00:18 2010 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32
@@ -41,8 +43,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
-
 #ifndef GG_DEBUG_DISABLE
 /*
  * gg_dcc_debug_data() // funkcja wewntrzna
--- a/libpurple/protocols/gg/lib/events.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/events.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -46,7 +48,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_event_free()
--- a/libpurple/protocols/gg/lib/http.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/http.c	Sat Jan 09 02:00:18 2010 +0000
@@ -18,6 +18,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -43,7 +45,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_http_connect() // funkcja pomocnicza
--- a/libpurple/protocols/gg/lib/libgadu.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/libgadu.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,6 +21,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -57,7 +59,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 int gg_debug_level = 0;
 void (*gg_debug_handler)(int level, const char *format, va_list ap) = NULL;
--- a/libpurple/protocols/gg/lib/pubdir.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/pubdir.c	Sat Jan 09 02:00:18 2010 +0000
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -27,8 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 /*
  * gg_register3()
  *
--- a/libpurple/protocols/gg/lib/pubdir50.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/gg/lib/pubdir50.c	Sat Jan 09 02:00:18 2010 +0000
@@ -18,13 +18,13 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "libgadu.h"
-
 /*
  * gg_pubdir50_new()
  *
--- a/libpurple/protocols/jabber/Makefile.am	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Sat Jan 09 02:00:18 2010 +0000
@@ -5,12 +5,21 @@
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-JABBERSOURCES = auth.c \
+JABBERSOURCES = \
+			  adhoccommands.c \
+			  adhoccommands.h \
+			  auth.c \
 			  auth.h \
+			  auth_digest_md5.c \
+			  auth_plain.c \
+			  auth_scram.c \
+			  auth_scram.h \
 			  buddy.c \
 			  buddy.h \
 			  bosh.c \
 			  bosh.h \
+			  caps.c \
+			  caps.h \
 			  chat.c \
 			  chat.h \
 			  data.c \
@@ -43,10 +52,13 @@
 			  jutil.h \
 			  message.c \
 			  message.h \
+			  namespaces.h \
 			  oob.c \
 			  oob.h \
 			  parser.c \
 			  parser.h \
+			  pep.c \
+			  pep.h \
 			  ping.c \
 			  ping.h \
 			  presence.c \
@@ -55,14 +67,6 @@
 			  roster.h \
 			  si.c \
 			  si.h \
-			  xdata.c \
-			  xdata.h \
-			  caps.c \
-			  caps.h \
-			  adhoccommands.c \
-			  adhoccommands.h \
-			  pep.c \
-			  pep.h \
 			  useravatar.c \
 			  useravatar.h \
 			  usermood.c \
@@ -70,12 +74,18 @@
 			  usernick.c \
 			  usernick.h \
 			  usertune.c \
-			  usertune.h
+			  usertune.h \
+			  xdata.c \
+			  xdata.h
 
 AM_CFLAGS = $(st)
 
 libxmpp_la_LDFLAGS = -module -avoid-version
 
+if USE_CYRUS_SASL
+JABBERSOURCES += auth_cyrus.c
+endif
+
 if STATIC_JABBER
 
 st = -DPURPLE_STATIC_PRPL
--- a/libpurple/protocols/jabber/Makefile.mingw	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Sat Jan 09 02:00:18 2010 +0000
@@ -45,6 +45,10 @@
 C_SRC =	\
 			adhoccommands.c \
 			auth.c \
+			auth_cyrus.c \
+			auth_digest_md5.c \
+			auth_plain.c \
+			auth_scram.c \
 			buddy.c \
 			bosh.c \
 			caps.c \
--- a/libpurple/protocols/jabber/adhoccommands.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Sat Jan 09 02:00:18 2010 +0000
@@ -97,7 +97,7 @@
 	if (type == JABBER_IQ_ERROR)
 		return;
 
-	query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#items");
+	query = xmlnode_get_child_with_namespace(packet, "query", NS_DISCO_ITEMS);
 	if (!query)
 		return;
 	node = xmlnode_get_attrib(query, "node");
@@ -275,7 +275,8 @@
                                 JabberIqType type, const char *id,
                                 xmlnode *packet, gpointer data)
 {
-	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query", "http://jabber.org/protocol/disco#items");
+	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
+			NS_DISCO_ITEMS);
 
 	jabber_adhoc_got_server_list(js, from, query);
 
@@ -291,8 +292,9 @@
 }
 
 void jabber_adhoc_server_get_list(JabberStream *js) {
-	JabberIq *iq = jabber_iq_new_query(js,JABBER_IQ_GET,"http://jabber.org/protocol/disco#items");
-	xmlnode *query = xmlnode_get_child_with_namespace(iq->node,"query","http://jabber.org/protocol/disco#items");
+	JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_ITEMS);
+	xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query",
+			NS_DISCO_ITEMS);
 
 	xmlnode_set_attrib(iq->node,"to",js->user->domain);
 	xmlnode_set_attrib(query,"node","http://jabber.org/protocol/commands");
--- a/libpurple/protocols/jabber/auth.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sat Jan 09 02:00:18 2010 +0000
@@ -39,6 +39,8 @@
 #include "iq.h"
 #include "notify.h"
 
+static GSList *auth_mechs = NULL;
+
 static void auth_old_result_cb(JabberStream *js, const char *from,
                                JabberIqType type, const char *id,
                                xmlnode *packet, gpointer data);
@@ -46,8 +48,11 @@
 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,
@@ -58,7 +63,7 @@
 				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(js->gc->account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+		} 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."));
@@ -71,418 +76,96 @@
 
 static void finish_plaintext_authentication(JabberStream *js)
 {
-	if(js->auth_type == JABBER_AUTH_PLAIN) {
-		xmlnode *auth;
-		GString *response;
-		gchar *enc_out;
-
-		auth = xmlnode_new("auth");
-		xmlnode_set_namespace(auth, "urn:ietf:params:xml: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");
-
-		response = g_string_new("");
-		response = g_string_append_len(response, "\0", 1);
-		response = g_string_append(response, js->user->node);
-		response = g_string_append_len(response, "\0", 1);
-		response = g_string_append(response,
-				purple_connection_get_password(js->gc));
-
-		enc_out = purple_base64_encode((guchar *)response->str, response->len);
+	JabberIq *iq;
+	xmlnode *query, *x;
 
-		xmlnode_set_attrib(auth, "mechanism", "PLAIN");
-		xmlnode_insert_data(auth, enc_out, -1);
-		g_free(enc_out);
-		g_string_free(response, TRUE);
-
-		jabber_send(js, auth);
-		xmlnode_free(auth);
-	} else if(js->auth_type == JABBER_AUTH_IQ_AUTH) {
-		JabberIq *iq;
-		xmlnode *query, *x;
-
-		iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:auth");
-		query = xmlnode_get_child(iq->node, "query");
-		x = xmlnode_new_child(query, "username");
-		xmlnode_insert_data(x, js->user->node, -1);
-		x = xmlnode_new_child(query, "resource");
-		xmlnode_insert_data(x, js->user->resource, -1);
-		x = xmlnode_new_child(query, "password");
-		xmlnode_insert_data(x, purple_connection_get_password(js->gc), -1);
-		jabber_iq_set_callback(iq, auth_old_result_cb, NULL);
-		jabber_iq_send(iq);
-	}
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:auth");
+	query = xmlnode_get_child(iq->node, "query");
+	x = xmlnode_new_child(query, "username");
+	xmlnode_insert_data(x, js->user->node, -1);
+	x = xmlnode_new_child(query, "resource");
+	xmlnode_insert_data(x, js->user->resource, -1);
+	x = xmlnode_new_child(query, "password");
+	xmlnode_insert_data(x, purple_connection_get_password(js->gc), -1);
+	jabber_iq_set_callback(iq, auth_old_result_cb, NULL);
+	jabber_iq_send(iq);
 }
 
 static void allow_plaintext_auth(PurpleAccount *account)
 {
+	PurpleConnection *gc;
+	JabberStream *js;
+
 	purple_account_set_bool(account, "auth_plain_in_clear", TRUE);
 
-	finish_plaintext_authentication(account->gc->proto_data);
+	gc = purple_account_get_connection(account);
+	js = purple_connection_get_protocol_data(gc);
+
+	finish_plaintext_authentication(js);
 }
 
 static void disallow_plaintext_auth(PurpleAccount *account)
 {
-	purple_connection_error_reason(account->gc,
+	purple_connection_error_reason(purple_account_get_connection(account),
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
 		_("Server requires plaintext authentication over an unencrypted stream"));
 }
 
 #ifdef HAVE_CYRUS_SASL
-
-static void jabber_auth_start_cyrus(JabberStream *);
-static void jabber_sasl_build_callbacks(JabberStream *);
-
-/* Callbacks for Cyrus SASL */
-
-static int jabber_sasl_cb_realm(void *ctx, int id, const char **avail, const char **result)
-{
-	JabberStream *js = (JabberStream *)ctx;
-
-	if (id != SASL_CB_GETREALM || !result) return SASL_BADPARAM;
-
-	*result = js->user->domain;
-
-	return SASL_OK;
-}
-
-static int jabber_sasl_cb_simple(void *ctx, int id, const char **res, unsigned *len)
+static void
+auth_old_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 {
-	JabberStream *js = (JabberStream *)ctx;
-
-	switch(id) {
-		case SASL_CB_AUTHNAME:
-			*res = js->user->node;
-			break;
-		case SASL_CB_USER:
-			*res = "";
-			break;
-		default:
-			return SASL_BADPARAM;
-	}
-	if (len) *len = strlen((char *)*res);
-	return SASL_OK;
-}
-
-static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret)
-{
-	JabberStream *js = (JabberStream *)ctx;
-	const char *pw = purple_account_get_password(js->gc->account);
-	size_t len;
-	static sasl_secret_t *x = NULL;
-
-	if (!conn || !secret || id != SASL_CB_PASS)
-		return SASL_BADPARAM;
-
-	len = strlen(pw);
-	x = (sasl_secret_t *) realloc(x, sizeof(sasl_secret_t) + len);
-
-	if (!x)
-		return SASL_NOMEM;
-
-	x->len = len;
-	strcpy((char*)x->data, pw);
-
-	*secret = x;
-	return SASL_OK;
-}
-
-static void allow_cyrus_plaintext_auth(PurpleAccount *account)
-{
-	purple_account_set_bool(account, "auth_plain_in_clear", TRUE);
-
-	jabber_auth_start_cyrus(account->gc->proto_data);
-}
-
-static gboolean auth_pass_generic(JabberStream *js, PurpleRequestFields *fields)
-{
+	PurpleAccount *account;
+	JabberStream *js;
 	const char *entry;
 	gboolean remember;
 
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
+		return;
+
+	account = purple_connection_get_account(gc);
+	js = purple_connection_get_protocol_data(gc);
+
 	entry = purple_request_fields_get_string(fields, "password");
 	remember = purple_request_fields_get_bool(fields, "remember");
 
 	if (!entry || !*entry)
 	{
-		purple_notify_error(js->gc->account, NULL, _("Password is required to sign on."), NULL);
-		return FALSE;
+		purple_notify_error(account, NULL, _("Password is required to sign on."), NULL);
+		return;
 	}
 
 	if (remember)
-		purple_account_set_remember_password(js->gc->account, TRUE);
-
-	purple_account_set_password(js->gc->account, entry);
-
-	return TRUE;
-}
-
-static void auth_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
-{
-	JabberStream *js;
-
-	/* The password prompt dialog doesn't get disposed if the account disconnects */
-	if (!PURPLE_CONNECTION_IS_VALID(conn))
-		return;
-
-	js = conn->proto_data;
-
-	if (!auth_pass_generic(js, fields))
-		return;
+		purple_account_set_remember_password(account, TRUE);
 
-	/* Rebuild our callbacks as we now have a password to offer */
-	jabber_sasl_build_callbacks(js);
-
-	/* Restart our connection */
-	jabber_auth_start_cyrus(js);
-}
-
-static void
-auth_old_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
-{
-	JabberStream *js;
-
-	/* The password prompt dialog doesn't get disposed if the account disconnects */
-	if (!PURPLE_CONNECTION_IS_VALID(conn))
-		return;
-
-	js = conn->proto_data;
-
-	if (!auth_pass_generic(js, fields))
-		return;
+	purple_account_set_password(account, entry);
 
 	/* Restart our connection */
 	jabber_auth_start_old(js);
 }
 
-
 static void
-auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields)
+auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
 {
-	JabberStream *js;
-
 	/* The password prompt dialog doesn't get disposed if the account disconnects */
-	if (!PURPLE_CONNECTION_IS_VALID(conn))
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	js = conn->proto_data;
-
 	/* Disable the account as the user has canceled connecting */
-	purple_account_set_enabled(conn->account, purple_core_get_ui(), FALSE);
+	purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE);
 }
-
-static void jabber_auth_start_cyrus(JabberStream *js)
-{
-	const char *clientout = NULL;
-	char *enc_out;
-	unsigned coutlen = 0;
-	xmlnode *auth;
-	sasl_security_properties_t secprops;
-	gboolean again;
-	gboolean plaintext = TRUE;
-
-	/* Set up security properties and options */
-	secprops.min_ssf = 0;
-	secprops.security_flags = SASL_SEC_NOANONYMOUS;
-
-	if (!jabber_stream_is_ssl(js)) {
-		secprops.max_ssf = -1;
-		secprops.maxbufsize = 4096;
-		plaintext = purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE);
-		if (!plaintext)
-			secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
-	} else {
-		secprops.max_ssf = 0;
-		secprops.maxbufsize = 0;
-		plaintext = TRUE;
-	}
-	secprops.property_names = 0;
-	secprops.property_values = 0;
-
-	do {
-		again = FALSE;
-
-		js->sasl_state = sasl_client_new("xmpp", js->serverFQDN, NULL, NULL, js->sasl_cb, 0, &js->sasl);
-		if (js->sasl_state==SASL_OK) {
-			sasl_setprop(js->sasl, SASL_SEC_PROPS, &secprops);
-			purple_debug_info("sasl", "Mechs found: %s\n", js->sasl_mechs->str);
-			js->sasl_state = sasl_client_start(js->sasl, js->sasl_mechs->str, NULL, &clientout, &coutlen, &js->current_mech);
-		}
-		switch (js->sasl_state) {
-			/* Success */
-			case SASL_OK:
-			case SASL_CONTINUE:
-				break;
-			case SASL_NOMECH:
-				/* No mechanisms have offered to help */
-
-				/* Firstly, if we don't have a password try
-				 * to get one
-				 */
-
-				if (!purple_account_get_password(js->gc->account)) {
-					purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
-					return;
-
-				/* If we've got a password, but aren't sending
-				 * it in plaintext, see if we can turn on
-				 * plaintext auth
-				 */
-				} else if (!plaintext) {
-					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
-							js->gc->account->username);
-					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
-							_("Plaintext Authentication"),
-							msg,
-							1, js->gc->account, NULL, NULL, js->gc->account,
-							allow_cyrus_plaintext_auth,
-							disallow_plaintext_auth);
-					g_free(msg);
-					return;
-
-				} 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
-					 * 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
-					 */
-					js->auth_type = JABBER_AUTH_IQ_AUTH;
-					jabber_auth_start_old(js);
-					return;
-				}
-				/* not reached */
-				break;
-
-				/* Fatal errors. Give up and go home */
-			case SASL_BADPARAM:
-			case SASL_NOMEM:
-				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);
-
-				/*
-				 * DAA: is this right?
-				 * The manpage says that "mech" will contain the chosen mechanism on success.
-				 * Presumably, if we get here that isn't the case and we shouldn't try again?
-				 * I suspect that this never happens.
-				 */
-				/*
-				 * SXW: Yes, this is right. What this handles is the situation where a
-				 * mechanism, say GSSAPI, is tried. If that mechanism fails, it may be
-				 * due to mechanism specific issues, so we want to try one of the other
-				 * supported mechanisms. This code handles that case
-				 */
-				if (js->current_mech && *js->current_mech) {
-					char *pos;
-					if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
-						g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
-					}
-					/* Remove space which separated this mech from the next */
-					if ((js->sasl_mechs->str)[0] == ' ') {
-						g_string_erase(js->sasl_mechs, 0, 1);
-					}
-					again = TRUE;
-				}
-
-				sasl_dispose(&js->sasl);
-		}
-	} while (again);
-
-	if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) {
-		auth = xmlnode_new("auth");
-		xmlnode_set_namespace(auth, "urn:ietf:params:xml: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 (clientout) {
-			if (coutlen == 0) {
-				xmlnode_insert_data(auth, "=", -1);
-			} else {
-				enc_out = purple_base64_encode((unsigned char*)clientout, coutlen);
-				xmlnode_insert_data(auth, enc_out, -1);
-				g_free(enc_out);
-			}
-		}
-		jabber_send(js, auth);
-		xmlnode_free(auth);
-	} else {
-		purple_connection_error_reason(js->gc,
-			PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
-			_("SASL authentication failed"));
-	}
-}
-
-static int
-jabber_sasl_cb_log(void *context, int level, const char *message)
-{
-	if(level <= SASL_LOG_TRACE)
-		purple_debug_info("sasl", "%s\n", message);
-
-	return SASL_OK;
-}
-
-void
-jabber_sasl_build_callbacks(JabberStream *js)
-{
-	int id;
-
-	/* Set up our callbacks structure */
-	if (js->sasl_cb == NULL)
-		js->sasl_cb = g_new0(sasl_callback_t,6);
-
-	id = 0;
-	js->sasl_cb[id].id = SASL_CB_GETREALM;
-	js->sasl_cb[id].proc = jabber_sasl_cb_realm;
-	js->sasl_cb[id].context = (void *)js;
-	id++;
-
-	js->sasl_cb[id].id = SASL_CB_AUTHNAME;
-	js->sasl_cb[id].proc = jabber_sasl_cb_simple;
-	js->sasl_cb[id].context = (void *)js;
-	id++;
-
-	js->sasl_cb[id].id = SASL_CB_USER;
-	js->sasl_cb[id].proc = jabber_sasl_cb_simple;
-	js->sasl_cb[id].context = (void *)js;
-	id++;
-
-	if (purple_account_get_password(js->gc->account) != NULL ) {
-		js->sasl_cb[id].id = SASL_CB_PASS;
-		js->sasl_cb[id].proc = jabber_sasl_cb_secret;
-		js->sasl_cb[id].context = (void *)js;
-		id++;
-	}
-
-	js->sasl_cb[id].id = SASL_CB_LOG;
-	js->sasl_cb[id].proc = jabber_sasl_cb_log;
-	js->sasl_cb[id].context = (void*)js;
-	id++;
-
-	js->sasl_cb[id].id = SASL_CB_LIST_END;
-}
-
 #endif
 
 void
 jabber_auth_start(JabberStream *js, xmlnode *packet)
 {
-#ifndef HAVE_CYRUS_SASL
-	gboolean digest_md5 = FALSE, plain=FALSE;
-#endif
-
+	GSList *mechanisms = NULL;
+	GSList *l;
+	xmlnode *response = NULL;
 	xmlnode *mechs, *mechnode;
-
+	JabberSaslState state;
+	char *msg = NULL;
 
 	if(js->registration) {
 		jabber_register_start(js);
@@ -490,7 +173,6 @@
 	}
 
 	mechs = xmlnode_get_child(packet, "mechanisms");
-
 	if(!mechs) {
 		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -498,76 +180,53 @@
 		return;
 	}
 
-#ifdef HAVE_CYRUS_SASL
-	js->sasl_mechs = g_string_new("");
-#endif
-
 	for(mechnode = xmlnode_get_child(mechs, "mechanism"); mechnode;
 			mechnode = xmlnode_get_next_twin(mechnode))
 	{
 		char *mech_name = xmlnode_get_data(mechnode);
-#ifdef HAVE_CYRUS_SASL
-		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
-		 * support it and including it gives a false fall-back to other mechs offerred,
-		 * leading to incorrect error handling.
-		 */
-		if (purple_strequal(mech_name, "X-GOOGLE-TOKEN")) {
-			g_free(mech_name);
-			continue;
-		}
 
-		g_string_append(js->sasl_mechs, mech_name);
-		g_string_append_c(js->sasl_mechs, ' ');
-#else
-		if (purple_strequal(mech_name, "DIGEST-MD5"))
-			digest_md5 = TRUE;
-		else if (purple_strequal(mech_name, "PLAIN"))
-			plain = TRUE;
-#endif
-		g_free(mech_name);
+		if (mech_name && *mech_name)
+			mechanisms = g_slist_prepend(mechanisms, mech_name);
+		else if (mech_name)
+			g_free(mech_name);
+
 	}
 
-#ifdef HAVE_CYRUS_SASL
-	js->auth_type = JABBER_AUTH_CYRUS;
-
-	jabber_sasl_build_callbacks(js);
-
-	jabber_auth_start_cyrus(js);
-#else
+	for (l = auth_mechs; l; l = l->next) {
+		JabberSaslMech *possible = l->data;
 
-	if(digest_md5) {
-		xmlnode *auth;
-
-		js->auth_type = JABBER_AUTH_DIGEST_MD5;
-		auth = xmlnode_new("auth");
-		xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl");
-		xmlnode_set_attrib(auth, "mechanism", "DIGEST-MD5");
+		/* Is this the Cyrus SASL mechanism? */
+		if (g_str_equal(possible->name, "*")) {
+			js->auth_mech = possible;
+			break;
+		}
 
-		jabber_send(js, auth);
-		xmlnode_free(auth);
-	} else if(plain) {
-		js->auth_type = JABBER_AUTH_PLAIN;
+		/* Can we find this mechanism in the server's list? */
+		if (g_slist_find_custom(mechanisms, possible->name, (GCompareFunc)strcmp)) {
+			js->auth_mech = possible;
+			break;
+		}
+	}
 
-		if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
-			char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
-					js->gc->account->username);
-			purple_request_yes_no(js->gc, _("Plaintext Authentication"),
-					_("Plaintext Authentication"),
-					msg,
-					1,
-					purple_connection_get_account(js->gc), NULL, NULL,
-					purple_connection_get_account(js->gc), allow_plaintext_auth,
-					disallow_plaintext_auth);
-			g_free(msg);
-			return;
-		}
-		finish_plaintext_authentication(js);
-	} else {
+	if (js->auth_mech == NULL) {
+		/* Found no good mechanisms... */
 		purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 				_("Server does not use any supported authentication method"));
+		return;
 	}
-#endif
+
+	state = js->auth_mech->start(js, mechs, &response, &msg);
+	if (state == JABBER_SASL_STATE_FAIL) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+				msg ? msg : _("Unknown Error"));
+	} else if (response) {
+		jabber_send(js, response);
+		xmlnode_free(response);
+	}
+
+	g_free(msg);
 }
 
 static void auth_old_result_cb(JabberStream *js, const char *from,
@@ -578,19 +237,22 @@
 		jabber_stream_set_state(js, JABBER_STREAM_POST_AUTH);
 		jabber_disco_items_server(js);
 	} else {
+		PurpleAccount *account;
 		PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		char *msg = jabber_parse_error(js, packet, &reason);
 		xmlnode *error;
 		const char *err_code;
 
+		account = purple_connection_get_account(js->gc);
+
 		/* FIXME: Why is this not in jabber_parse_error? */
 		if((error = xmlnode_get_child(packet, "error")) &&
 					(err_code = xmlnode_get_attrib(error, "code")) &&
 					g_str_equal(err_code, "401")) {
 			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 			/* Clear the pasword if it isn't being saved */
-			if (!purple_account_get_remember_password(js->gc->account))
-				purple_account_set_password(js->gc->account, NULL);
+			if (!purple_account_get_remember_password(account))
+				purple_account_set_password(account, NULL);
 		}
 
 		purple_connection_error_reason(js->gc, reason, msg);
@@ -663,16 +325,17 @@
 			jabber_iq_send(iq);
 
 		} else if(xmlnode_get_child(query, "password")) {
-			if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(js->gc->account,
+			PurpleAccount *account = purple_connection_get_account(js->gc);
+			if(!jabber_stream_is_ssl(js) && !purple_account_get_bool(account,
 						"auth_plain_in_clear", FALSE)) {
 				char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
-											js->gc->account->username);
+											purple_account_get_username(account));
 				purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 						_("Plaintext Authentication"),
 						msg,
 						1,
-						purple_connection_get_account(js->gc), NULL, NULL,
-						purple_connection_get_account(js->gc), allow_plaintext_auth,
+						account, NULL, NULL,
+						account, allow_plaintext_auth,
 						disallow_plaintext_auth);
 				g_free(msg);
 				return;
@@ -689,22 +352,30 @@
 
 void jabber_auth_start_old(JabberStream *js)
 {
+	PurpleAccount *account;
 	JabberIq *iq;
 	xmlnode *query, *username;
 
+	account = purple_connection_get_account(js->gc);
+
 	/*
 	 * We can end up here without encryption if the server doesn't support
 	 * <stream:features/> and we're not using old-style SSL.  If the user
 	 * is requiring SSL/TLS, we need to enforce it.
 	 */
 	if (!jabber_stream_is_ssl(js) &&
-			purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+			purple_account_get_bool(account, "require_tls", 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."));
 		return;
 	}
 
+	if (js->registration) {
+		jabber_register_start(js);
+		return;
+	}
+
 	/*
 	 * IQ Auth doesn't have support for resource binding, so we need to pick a
 	 * default resource so it will work properly.  jabberd14 throws an error and
@@ -721,8 +392,8 @@
 	 * password prompting here
 	 */
 
-	if (!purple_account_get_password(js->gc->account)) {
-		purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
+	if (!purple_account_get_password(account)) {
+		purple_account_request_password(account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
 		return;
 	}
 #endif
@@ -737,352 +408,65 @@
 	jabber_iq_send(iq);
 }
 
-/* Parts of this algorithm are inspired by stuff in libgsasl */
-static GHashTable* parse_challenge(const char *challenge)
-{
-	const char *token_start, *val_start, *val_end, *cur;
-	GHashTable *ret = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-
-	cur = challenge;
-	while(*cur != '\0') {
-		/* Find the end of the token */
-		gboolean in_quotes = FALSE;
-		char *name, *value = NULL;
-		token_start = cur;
-		while(*cur != '\0' && (in_quotes || (!in_quotes && *cur != ','))) {
-			if (*cur == '"')
-				in_quotes = !in_quotes;
-			cur++;
-		}
-
-		/* Find start of value.  */
-		val_start = strchr(token_start, '=');
-		if (val_start == NULL || val_start > cur)
-			val_start = cur;
-
-		if (token_start != val_start) {
-			name = g_strndup(token_start, val_start - token_start);
-
-			if (val_start != cur) {
-				val_start++;
-				while (val_start != cur && (*val_start == ' ' || *val_start == '\t'
-						|| *val_start == '\r' || *val_start == '\n'
-						|| *val_start == '"'))
-					val_start++;
-
-				val_end = cur;
-				while (val_end != val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
-						|| *val_end == '\r' || *val_end == '\n'
-						|| *val_end == '"'  || *val_end == '\0'))
-					val_end--;
-
-				if (val_start != val_end)
-					value = g_strndup(val_start, val_end - val_start + 1);
-			}
-
-			g_hash_table_replace(ret, name, value);
-		}
-
-		/* Find the start of the next token, if there is one */
-		if (*cur != '\0') {
-			cur++;
-			while (*cur == ' ' || *cur == ',' || *cur == '\t'
-					|| *cur == '\r' || *cur == '\n')
-				cur++;
-		}
-	}
-
-	return ret;
-}
-
-static char *
-generate_response_value(JabberID *jid, const char *passwd, const char *nonce,
-		const char *cnonce, const char *a2, const char *realm)
-{
-	PurpleCipher *cipher;
-	PurpleCipherContext *context;
-	guchar result[16];
-	size_t a1len;
-
-	gchar *a1, *convnode=NULL, *convpasswd = NULL, *ha1, *ha2, *kd, *x, *z;
-
-	if((convnode = g_convert(jid->node, -1, "iso-8859-1", "utf-8",
-					NULL, NULL, NULL)) == NULL) {
-		convnode = g_strdup(jid->node);
-	}
-	if(passwd && ((convpasswd = g_convert(passwd, -1, "iso-8859-1",
-						"utf-8", NULL, NULL, NULL)) == NULL)) {
-		convpasswd = g_strdup(passwd);
-	}
-
-	cipher = purple_ciphers_find_cipher("md5");
-	context = purple_cipher_context_new(cipher, NULL);
-
-	x = g_strdup_printf("%s:%s:%s", convnode, realm, convpasswd ? convpasswd : "");
-	purple_cipher_context_append(context, (const guchar *)x, strlen(x));
-	purple_cipher_context_digest(context, sizeof(result), result, NULL);
-
-	a1 = g_strdup_printf("xxxxxxxxxxxxxxxx:%s:%s", nonce, cnonce);
-	a1len = strlen(a1);
-	g_memmove(a1, result, 16);
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)a1, a1len);
-	purple_cipher_context_digest(context, sizeof(result), result, NULL);
-
-	ha1 = purple_base16_encode(result, 16);
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)a2, strlen(a2));
-	purple_cipher_context_digest(context, sizeof(result), result, NULL);
-
-	ha2 = purple_base16_encode(result, 16);
-
-	kd = g_strdup_printf("%s:%s:00000001:%s:auth:%s", ha1, nonce, cnonce, ha2);
-
-	purple_cipher_context_reset(context, NULL);
-	purple_cipher_context_append(context, (const guchar *)kd, strlen(kd));
-	purple_cipher_context_digest(context, sizeof(result), result, NULL);
-	purple_cipher_context_destroy(context);
-
-	z = purple_base16_encode(result, 16);
-
-	g_free(convnode);
-	g_free(convpasswd);
-	g_free(x);
-	g_free(a1);
-	g_free(ha1);
-	g_free(ha2);
-	g_free(kd);
-
-	return z;
-}
-
 void
 jabber_auth_handle_challenge(JabberStream *js, xmlnode *packet)
 {
-
-	if(js->auth_type == JABBER_AUTH_DIGEST_MD5) {
-		char *enc_in = xmlnode_get_data(packet);
-		char *dec_in;
-		char *enc_out;
-		GHashTable *parts;
-
-		if(!enc_in) {
-			purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Invalid response from server"));
-			return;
-		}
-
-		dec_in = (char *)purple_base64_decode(enc_in, NULL);
-		purple_debug_misc("jabber", "decoded challenge (%"
-				G_GSIZE_FORMAT "): %s\n", strlen(dec_in), dec_in);
-
-		parts = parse_challenge(dec_in);
-
-
-		if (g_hash_table_lookup(parts, "rspauth")) {
-			char *rspauth = g_hash_table_lookup(parts, "rspauth");
-
-
-			if (rspauth && purple_strequal(rspauth, js->expected_rspauth)) {
-				jabber_send_raw(js,
-						"<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl' />",
-						-1);
-			} else {
-				purple_connection_error_reason(js->gc,
-					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Invalid challenge from server"));
-			}
-			g_free(js->expected_rspauth);
-			js->expected_rspauth = NULL;
-		} else {
-			/* assemble a response, and send it */
-			/* see RFC 2831 */
-			char *realm;
-			char *nonce;
-
-			/* Make sure the auth string contains everything that should be there.
-			   This isn't everything in RFC2831, but it is what we need. */
-
-			nonce = g_hash_table_lookup(parts, "nonce");
-
-			/* we're actually supposed to prompt the user for a realm if
-			 * the server doesn't send one, but that really complicates things,
-			 * so i'm not gonna worry about it until is poses a problem to
-			 * someone, or I get really bored */
-			realm = g_hash_table_lookup(parts, "realm");
-			if(!realm)
-				realm = js->user->domain;
-
-			if (nonce == NULL || realm == NULL)
-				purple_connection_error_reason(js->gc,
-					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Invalid challenge from server"));
-			else {
-				GString *response = g_string_new("");
-				char *a2;
-				char *auth_resp;
-				char *buf;
-				char *cnonce;
-
-				cnonce = g_strdup_printf("%x%u%x", g_random_int(), (int)time(NULL),
-						g_random_int());
-
-				a2 = g_strdup_printf("AUTHENTICATE:xmpp/%s", realm);
-				auth_resp = generate_response_value(js->user,
-						purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
-				g_free(a2);
-
-				a2 = g_strdup_printf(":xmpp/%s", realm);
-				js->expected_rspauth = generate_response_value(js->user,
-						purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
-				g_free(a2);
-
-				g_string_append_printf(response, "username=\"%s\"", js->user->node);
-				g_string_append_printf(response, ",realm=\"%s\"", realm);
-				g_string_append_printf(response, ",nonce=\"%s\"", nonce);
-				g_string_append_printf(response, ",cnonce=\"%s\"", cnonce);
-				g_string_append_printf(response, ",nc=00000001");
-				g_string_append_printf(response, ",qop=auth");
-				g_string_append_printf(response, ",digest-uri=\"xmpp/%s\"", realm);
-				g_string_append_printf(response, ",response=%s", auth_resp);
-				g_string_append_printf(response, ",charset=utf-8");
+	const char *ns = xmlnode_get_namespace(packet);
 
-				g_free(auth_resp);
-				g_free(cnonce);
-
-				enc_out = purple_base64_encode((guchar *)response->str, response->len);
-
-				purple_debug_misc("jabber", "decoded response (%"
-						G_GSIZE_FORMAT "): %s\n",
-						response->len, response->str);
-
-				buf = g_strdup_printf("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>", enc_out);
-
-				jabber_send_raw(js, buf, -1);
-
-				g_free(buf);
-
-				g_free(enc_out);
-
-				g_string_free(response, TRUE);
-			}
-		}
-
-		g_free(enc_in);
-		g_free(dec_in);
-		g_hash_table_destroy(parts);
-	}
-#ifdef HAVE_CYRUS_SASL
-	else if (js->auth_type == JABBER_AUTH_CYRUS) {
-		char *enc_in = xmlnode_get_data(packet);
-		unsigned char *dec_in;
-		char *enc_out;
-		const char *c_out;
-		unsigned int clen;
-		gsize declen;
-		xmlnode *response;
-
-		dec_in = purple_base64_decode(enc_in, &declen);
-
-		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen,
-						  NULL, &c_out, &clen);
-		g_free(enc_in);
-		g_free(dec_in);
-		if (js->sasl_state != SASL_CONTINUE && js->sasl_state != SASL_OK) {
-			gchar *tmp = g_strdup_printf(_("SASL error: %s"),
-					sasl_errdetail(js->sasl));
-			purple_debug_error("jabber", "Error is %d : %s\n",
-					js->sasl_state, sasl_errdetail(js->sasl));
-			purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
-			g_free(tmp);
-			return;
-		} else {
-			response = xmlnode_new("response");
-			xmlnode_set_namespace(response, "urn:ietf:params:xml:ns:xmpp-sasl");
-			if (clen > 0) {
-				/* Cyrus SASL 2.1.22 appears to contain code to add the charset
-				 * to the response for DIGEST-MD5 but there is no possibility
-				 * it will be executed.
-				 *
-				 * My reading of the digestmd5 plugin indicates the username and
-				 * realm are always encoded in UTF-8 (they seem to be the values
-				 * we pass in), so we need to ensure charset=utf-8 is set.
-				 */
-				if (!purple_strequal(js->current_mech, "DIGEST-MD5") ||
-						strstr(c_out, ",charset="))
-					/* If we're not using DIGEST-MD5 or Cyrus SASL is fixed */
-					enc_out = purple_base64_encode((unsigned char*)c_out, clen);
-				else {
-					char *tmp = g_strdup_printf("%s,charset=utf-8", c_out);
-					enc_out = purple_base64_encode((unsigned char*)tmp, clen + 14);
-					g_free(tmp);
-				}
-
-				xmlnode_insert_data(response, enc_out, -1);
-				g_free(enc_out);
-			}
-			jabber_send(js, response);
-			xmlnode_free(response);
-		}
-	}
-#endif
-}
-
-void jabber_auth_handle_success(JabberStream *js, xmlnode *packet)
-{
-	const char *ns = xmlnode_get_namespace(packet);
-#ifdef HAVE_CYRUS_SASL
-	const void *x;
-#endif
-
-	if (!purple_strequal(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
+	if (!purple_strequal(ns, NS_XMPP_SASL)) {
 		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Invalid response from server"));
 		return;
 	}
 
-#ifdef HAVE_CYRUS_SASL
-	/* The SASL docs say that if the client hasn't returned OK yet, we
-	 * should try one more round against it
-	 */
-	if (js->sasl_state != SASL_OK) {
-		char *enc_in = xmlnode_get_data(packet);
-		unsigned char *dec_in = NULL;
-		const char *c_out;
-		unsigned int clen;
-		gsize declen = 0;
+	if (js->auth_mech && js->auth_mech->handle_challenge) {
+		xmlnode *response = NULL;
+		char *msg = NULL;
+		JabberSaslState state = js->auth_mech->handle_challenge(js, packet, &response, &msg);
+		if (state == JABBER_SASL_STATE_FAIL) {
+			purple_connection_error_reason(js->gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+					msg ? msg : _("Invalid challenge from server"));
+		} else if (response) {
+			jabber_send(js, response);
+			xmlnode_free(response);
+		}
 
-		if(enc_in != NULL)
-			dec_in = purple_base64_decode(enc_in, &declen);
+		g_free(msg);
+	} else
+		purple_debug_warning("jabber", "Received unexpected (and unhandled) <challenge/>\n");
+}
 
-		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen, NULL, &c_out, &clen);
+void jabber_auth_handle_success(JabberStream *js, xmlnode *packet)
+{
+	const char *ns = xmlnode_get_namespace(packet);
 
-		g_free(enc_in);
-		g_free(dec_in);
+	if (!purple_strequal(ns, NS_XMPP_SASL)) {
+		purple_connection_error_reason(js->gc,
+			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+			_("Invalid response from server"));
+		return;
+	}
+
+	if (js->auth_mech && js->auth_mech->handle_success) {
+		char *msg = NULL;
+		JabberSaslState state = js->auth_mech->handle_success(js, packet, &msg);
 
-		if (js->sasl_state != SASL_OK) {
-			/* This should never happen! */
+		if (state == JABBER_SASL_STATE_FAIL) {
 			purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Invalid response from server"));
-			g_return_if_reached();
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+					msg ? msg : _("Invalid response from server"));
+			return;
+		} else if (state == JABBER_SASL_STATE_CONTINUE) {
+			purple_connection_error_reason(js->gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+					msg ? msg : _("Server thinks authentication is complete, but client does not"));
+			return;
 		}
+
+		g_free(msg);
 	}
-	/* If we've negotiated a security layer, we need to enable it */
-	if (js->sasl) {
-		sasl_getprop(js->sasl, SASL_SSF, &x);
-		if (*(int *)x > 0) {
-			sasl_getprop(js->sasl, SASL_MAXOUTBUF, &x);
-			js->sasl_maxbuf = *(int *)x;
-		}
-	}
-#endif
 
 	/*
 	 * The stream will be reinitialized later in jabber_recv_cb_ssl() or
@@ -1095,31 +479,23 @@
 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet)
 {
 	PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
-	char *msg;
+	char *msg = NULL;
 
-#ifdef HAVE_CYRUS_SASL
-	if(js->auth_fail_count++ < 5) {
-		if (js->current_mech && *js->current_mech) {
-			char *pos;
-			if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
-				g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
-			}
-			/* Remove space which separated this mech from the next */
-			if ((js->sasl_mechs->str)[0] == ' ') {
-				g_string_erase(js->sasl_mechs, 0, 1);
-			}
-		}
-		if (*js->sasl_mechs->str) {
-			/* If we have remaining mechs to try, do so */
-			sasl_dispose(&js->sasl);
+	if (js->auth_mech && js->auth_mech->handle_failure) {
+		xmlnode *stanza = NULL;
+		JabberSaslState state = js->auth_mech->handle_failure(js, packet, &stanza, &msg);
 
-			jabber_auth_start_cyrus(js);
+		if (state != JABBER_SASL_STATE_FAIL && stanza) {
+			jabber_send(js, stanza);
+			xmlnode_free(stanza);
 			return;
 		}
 	}
-#endif
-	msg = jabber_parse_error(js, packet, &reason);
-	if(!msg) {
+
+	if (!msg)
+		msg = jabber_parse_error(js, packet, &reason);
+
+	if (!msg) {
 		purple_connection_error_reason(js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Invalid response from server"));
@@ -1128,3 +504,39 @@
 		g_free(msg);
 	}
 }
+
+static gint compare_mech(gconstpointer a, gconstpointer b)
+{
+	const JabberSaslMech *mech_a = a;
+	const JabberSaslMech *mech_b = b;
+
+	/* higher priority comes *before* lower priority in the list */
+	if (mech_a->priority > mech_b->priority)
+		return -1;
+	else if (mech_a->priority < mech_b->priority)
+		return 1;
+	/* This really shouldn't happen */
+	return 0;
+}
+
+void jabber_auth_init(void)
+{
+	JabberSaslMech **tmp;
+	gint count, i;
+
+	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_plain_mech(), compare_mech);
+	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_digest_md5_mech(), compare_mech);
+#ifdef HAVE_CYRUS_SASL
+	auth_mechs = g_slist_insert_sorted(auth_mechs, jabber_auth_get_cyrus_mech(), compare_mech);
+#endif
+
+	tmp = jabber_auth_get_scram_mechs(&count);
+	for (i = 0; i < count; ++i)
+		auth_mechs = g_slist_insert_sorted(auth_mechs, tmp[i], compare_mech);
+}
+
+void jabber_auth_uninit(void)
+{
+	g_slist_free(auth_mechs);
+	auth_mechs = NULL;
+}
--- a/libpurple/protocols/jabber/auth.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/auth.h	Sat Jan 09 02:00:18 2010 +0000
@@ -24,9 +24,27 @@
 #ifndef PURPLE_JABBER_AUTH_H_
 #define PURPLE_JABBER_AUTH_H_
 
+typedef struct _JabberSaslMech JabberSaslMech;
+
 #include "jabber.h"
 #include "xmlnode.h"
 
+typedef enum {
+	JABBER_SASL_STATE_FAIL = -1,    /* Abort, Retry, Fail? */
+	JABBER_SASL_STATE_OK = 0,       /* Hooray! */
+	JABBER_SASL_STATE_CONTINUE = 1  /* More authentication required */
+} JabberSaslState;
+
+struct _JabberSaslMech {
+	gint8 priority; /* Higher priority will be tried before lower priority */
+	const gchar *name;
+	JabberSaslState (*start)(JabberStream *js, xmlnode *mechanisms, xmlnode **reply, char **msg);
+	JabberSaslState (*handle_challenge)(JabberStream *js, xmlnode *packet, xmlnode **reply, char **msg);
+	JabberSaslState (*handle_success)(JabberStream *js, xmlnode *packet, char **msg);
+	JabberSaslState (*handle_failure)(JabberStream *js, xmlnode *packet, xmlnode **reply, char **msg);
+	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);
@@ -34,4 +52,14 @@
 void jabber_auth_handle_success(JabberStream *js, xmlnode *packet);
 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet);
 
+JabberSaslMech *jabber_auth_get_plain_mech(void);
+JabberSaslMech *jabber_auth_get_digest_md5_mech(void);
+JabberSaslMech **jabber_auth_get_scram_mechs(gint *count);
+#ifdef HAVE_CYRUS_SASL
+JabberSaslMech *jabber_auth_get_cyrus_mech(void);
+#endif
+
+void jabber_auth_init(void);
+void jabber_auth_uninit(void);
+
 #endif /* PURPLE_JABBER_AUTH_H_ */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,564 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+#include "core.h"
+#include "debug.h"
+#include "request.h"
+
+#include "auth.h"
+#include "jabber.h"
+
+static JabberSaslState jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply,
+                                               char **error);
+static void jabber_sasl_build_callbacks(JabberStream *);
+
+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"));
+}
+
+static void start_cyrus_wrapper(JabberStream *js)
+{
+	char *error = NULL;
+	xmlnode *response = NULL;
+	JabberSaslState state = jabber_auth_start_cyrus(js, &response, &error);
+
+	if (state == JABBER_SASL_STATE_FAIL) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
+				error);
+		g_free(error);
+	} else if (response) {
+		jabber_send(js, response);
+		xmlnode_free(response);
+	}
+}
+
+
+/* Callbacks for Cyrus SASL */
+
+static int jabber_sasl_cb_realm(void *ctx, int id, const char **avail, const char **result)
+{
+	JabberStream *js = ctx;
+
+	if (id != SASL_CB_GETREALM || !result) return SASL_BADPARAM;
+
+	*result = js->user->domain;
+
+	return SASL_OK;
+}
+
+static int jabber_sasl_cb_simple(void *ctx, int id, const char **res, unsigned *len)
+{
+	JabberStream *js = ctx;
+
+	switch(id) {
+		case SASL_CB_AUTHNAME:
+			*res = js->user->node;
+			break;
+		case SASL_CB_USER:
+			*res = "";
+			break;
+		default:
+			return SASL_BADPARAM;
+	}
+	if (len) *len = strlen((char *)*res);
+	return SASL_OK;
+}
+
+static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret)
+{
+	JabberStream *js = ctx;
+	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);
+
+	if (!conn || !secret || id != SASL_CB_PASS)
+		return SASL_BADPARAM;
+
+	len = strlen(pw);
+	x = (sasl_secret_t *) realloc(x, sizeof(sasl_secret_t) + len);
+
+	if (!x)
+		return SASL_NOMEM;
+
+	x->len = len;
+	strcpy((char*)x->data, pw);
+
+	*secret = x;
+	return SASL_OK;
+}
+
+static void allow_cyrus_plaintext_auth(PurpleAccount *account)
+{
+	PurpleConnection *gc;
+	JabberStream *js;
+
+	gc = purple_account_get_connection(account);
+	js = purple_connection_get_protocol_data(gc);
+
+	purple_account_set_bool(account, "auth_plain_in_clear", TRUE);
+
+	start_cyrus_wrapper(js);
+}
+
+static void auth_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	PurpleAccount *account;
+	JabberStream *js;
+	const char *entry;
+	gboolean remember;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
+		return;
+
+	account = purple_connection_get_account(gc);
+	js = purple_connection_get_protocol_data(gc);
+
+	entry = purple_request_fields_get_string(fields, "password");
+	remember = purple_request_fields_get_bool(fields, "remember");
+
+	if (!entry || !*entry)
+	{
+		purple_notify_error(account, NULL, _("Password is required to sign on."), NULL);
+		return;
+	}
+
+	if (remember)
+		purple_account_set_remember_password(account, TRUE);
+
+	purple_account_set_password(account, entry);
+
+	/* Rebuild our callbacks as we now have a password to offer */
+	jabber_sasl_build_callbacks(js);
+
+	/* Restart our negotiation */
+	start_cyrus_wrapper(js);
+}
+
+static void
+auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields)
+{
+	PurpleAccount *account;
+	JabberStream *js;
+
+	/* The password prompt dialog doesn't get disposed if the account disconnects */
+	if (!PURPLE_CONNECTION_IS_VALID(gc))
+		return;
+
+	account = purple_connection_get_account(gc);
+	js = purple_connection_get_protocol_data(gc);
+
+	/* Disable the account as the user has canceled connecting */
+	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
+}
+
+static JabberSaslState
+jabber_auth_start_cyrus(JabberStream *js, xmlnode **reply, char **error)
+{
+	PurpleAccount *account;
+	const char *clientout = NULL;
+	char *enc_out;
+	unsigned coutlen = 0;
+	sasl_security_properties_t secprops;
+	gboolean again;
+	gboolean plaintext = TRUE;
+
+	/* Set up security properties and options */
+	secprops.min_ssf = 0;
+	secprops.security_flags = SASL_SEC_NOANONYMOUS;
+
+	account = purple_connection_get_account(js->gc);
+
+	if (!jabber_stream_is_ssl(js)) {
+		secprops.max_ssf = -1;
+		secprops.maxbufsize = 4096;
+		plaintext = purple_account_get_bool(account, "auth_plain_in_clear", FALSE);
+		if (!plaintext)
+			secprops.security_flags |= SASL_SEC_NOPLAINTEXT;
+	} else {
+		secprops.max_ssf = 0;
+		secprops.maxbufsize = 0;
+		plaintext = TRUE;
+	}
+	secprops.property_names = 0;
+	secprops.property_values = 0;
+
+	do {
+		again = FALSE;
+
+		js->sasl_state = sasl_client_new("xmpp", js->serverFQDN, NULL, NULL, js->sasl_cb, 0, &js->sasl);
+		if (js->sasl_state==SASL_OK) {
+			sasl_setprop(js->sasl, SASL_SEC_PROPS, &secprops);
+			purple_debug_info("sasl", "Mechs found: %s\n", js->sasl_mechs->str);
+			js->sasl_state = sasl_client_start(js->sasl, js->sasl_mechs->str, NULL, &clientout, &coutlen, &js->current_mech);
+		}
+		switch (js->sasl_state) {
+			/* Success */
+			case SASL_OK:
+			case SASL_CONTINUE:
+				break;
+			case SASL_NOMECH:
+				/* No mechanisms have offered to help */
+
+				/* Firstly, if we don't have a password try
+				 * to get one
+				 */
+
+				if (!purple_account_get_password(account)) {
+					purple_account_request_password(account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
+					return JABBER_SASL_STATE_CONTINUE;
+
+				/* If we've got a password, but aren't sending
+				 * it in plaintext, see if we can turn on
+				 * plaintext auth
+				 */
+				} else if (!plaintext) {
+					char *msg = g_strdup_printf(_("%s requires 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"),
+							msg,
+							1, account, NULL, NULL, account,
+							allow_cyrus_plaintext_auth,
+							disallow_plaintext_auth);
+					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
+					 * 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
+					 */
+					js->auth_mech = NULL;
+					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:
+				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);
+
+				/*
+				 * DAA: is this right?
+				 * The manpage says that "mech" will contain the chosen mechanism on success.
+				 * Presumably, if we get here that isn't the case and we shouldn't try again?
+				 * I suspect that this never happens.
+				 */
+				/*
+				 * SXW: Yes, this is right. What this handles is the situation where a
+				 * mechanism, say GSSAPI, is tried. If that mechanism fails, it may be
+				 * due to mechanism specific issues, so we want to try one of the other
+				 * supported mechanisms. This code handles that case
+				 */
+				if (js->current_mech && *js->current_mech) {
+					char *pos;
+					if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
+						g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
+					}
+					/* Remove space which separated this mech from the next */
+					if ((js->sasl_mechs->str)[0] == ' ') {
+						g_string_erase(js->sasl_mechs, 0, 1);
+					}
+					again = TRUE;
+				}
+
+				sasl_dispose(&js->sasl);
+		}
+	} while (again);
+
+	if (js->sasl_state == SASL_CONTINUE || js->sasl_state == SASL_OK) {
+		xmlnode *auth = xmlnode_new("auth");
+		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 (clientout) {
+			if (coutlen == 0) {
+				xmlnode_insert_data(auth, "=", -1);
+			} else {
+				enc_out = purple_base64_encode((unsigned char*)clientout, coutlen);
+				xmlnode_insert_data(auth, enc_out, -1);
+				g_free(enc_out);
+			}
+		}
+
+		*reply = auth;
+		return JABBER_SASL_STATE_CONTINUE;
+	} else {
+		*error = g_strdup(_("SASL authentication failed"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+}
+
+static int
+jabber_sasl_cb_log(void *context, int level, const char *message)
+{
+	if(level <= SASL_LOG_TRACE)
+		purple_debug_info("sasl", "%s\n", message);
+
+	return SASL_OK;
+}
+
+static void
+jabber_sasl_build_callbacks(JabberStream *js)
+{
+	PurpleAccount *account;
+	int id;
+
+	/* Set up our callbacks structure */
+	if (js->sasl_cb == NULL)
+		js->sasl_cb = g_new0(sasl_callback_t,6);
+
+	id = 0;
+	js->sasl_cb[id].id = SASL_CB_GETREALM;
+	js->sasl_cb[id].proc = jabber_sasl_cb_realm;
+	js->sasl_cb[id].context = (void *)js;
+	id++;
+
+	js->sasl_cb[id].id = SASL_CB_AUTHNAME;
+	js->sasl_cb[id].proc = jabber_sasl_cb_simple;
+	js->sasl_cb[id].context = (void *)js;
+	id++;
+
+	js->sasl_cb[id].id = SASL_CB_USER;
+	js->sasl_cb[id].proc = jabber_sasl_cb_simple;
+	js->sasl_cb[id].context = (void *)js;
+	id++;
+
+	account = purple_connection_get_account(js->gc);
+	if (purple_account_get_password(account) != NULL ) {
+		js->sasl_cb[id].id = SASL_CB_PASS;
+		js->sasl_cb[id].proc = jabber_sasl_cb_secret;
+		js->sasl_cb[id].context = (void *)js;
+		id++;
+	}
+
+	js->sasl_cb[id].id = SASL_CB_LOG;
+	js->sasl_cb[id].proc = jabber_sasl_cb_log;
+	js->sasl_cb[id].context = (void*)js;
+	id++;
+
+	js->sasl_cb[id].id = SASL_CB_LIST_END;
+}
+
+static JabberSaslState
+jabber_cyrus_start(JabberStream *js, xmlnode *mechanisms,
+                   xmlnode **reply, char **error)
+{
+	xmlnode *mechnode;
+
+	js->sasl_mechs = g_string_new("");
+
+	for(mechnode = xmlnode_get_child(mechanisms, "mechanism"); mechnode;
+			mechnode = xmlnode_get_next_twin(mechnode))
+	{
+		char *mech_name = xmlnode_get_data(mechnode);
+
+		if (!mech_name || !*mech_name) {
+			g_free(mech_name);
+			continue;
+		}
+
+		/* Don't include Google Talk's X-GOOGLE-TOKEN mechanism, as we will not
+		 * support it and including it gives a false fall-back to other mechs offerred,
+		 * leading to incorrect error handling.
+		 */
+		if (g_str_equal(mech_name, "X-GOOGLE-TOKEN")) {
+			g_free(mech_name);
+			continue;
+		}
+
+		g_string_append(js->sasl_mechs, mech_name);
+		g_string_append_c(js->sasl_mechs, ' ');
+		g_free(mech_name);
+	}
+
+	jabber_sasl_build_callbacks(js);
+	return jabber_auth_start_cyrus(js, reply, error);
+}
+
+static JabberSaslState
+jabber_cyrus_handle_challenge(JabberStream *js, xmlnode *packet,
+                              xmlnode **reply, char **error)
+{
+	char *enc_in = xmlnode_get_data(packet);
+	unsigned char *dec_in;
+	char *enc_out;
+	const char *c_out;
+	unsigned int clen;
+	gsize declen;
+
+	dec_in = purple_base64_decode(enc_in, &declen);
+
+	js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen,
+					  NULL, &c_out, &clen);
+	g_free(enc_in);
+	g_free(dec_in);
+	if (js->sasl_state != SASL_CONTINUE && js->sasl_state != SASL_OK) {
+		gchar *tmp = g_strdup_printf(_("SASL error: %s"),
+				sasl_errdetail(js->sasl));
+		purple_debug_error("jabber", "Error is %d : %s\n",
+				js->sasl_state, sasl_errdetail(js->sasl));
+		*error = tmp;
+		return JABBER_SASL_STATE_FAIL;
+	} else {
+		xmlnode *response = xmlnode_new("response");
+		xmlnode_set_namespace(response, NS_XMPP_SASL);
+		if (clen > 0) {
+			/* Cyrus SASL 2.1.22 appears to contain code to add the charset
+			 * to the response for DIGEST-MD5 but there is no possibility
+			 * it will be executed.
+			 *
+			 * My reading of the digestmd5 plugin indicates the username and
+			 * realm are always encoded in UTF-8 (they seem to be the values
+			 * we pass in), so we need to ensure charset=utf-8 is set.
+			 */
+			if (!purple_strequal(js->current_mech, "DIGEST-MD5") ||
+					strstr(c_out, ",charset="))
+				/* If we're not using DIGEST-MD5 or Cyrus SASL is fixed */
+				enc_out = purple_base64_encode((unsigned char*)c_out, clen);
+			else {
+				char *tmp = g_strdup_printf("%s,charset=utf-8", c_out);
+				enc_out = purple_base64_encode((unsigned char*)tmp, clen + 14);
+				g_free(tmp);
+			}
+
+			xmlnode_insert_data(response, enc_out, -1);
+			g_free(enc_out);
+		}
+
+		*reply = response;
+		return JABBER_SASL_STATE_CONTINUE;
+	}
+}
+
+static JabberSaslState
+jabber_cyrus_handle_success(JabberStream *js, xmlnode *packet,
+                            char **error)
+{
+	const void *x;
+
+	/* The SASL docs say that if the client hasn't returned OK yet, we
+	 * should try one more round against it
+	 */
+	if (js->sasl_state != SASL_OK) {
+		char *enc_in = xmlnode_get_data(packet);
+		unsigned char *dec_in = NULL;
+		const char *c_out;
+		unsigned int clen;
+		gsize declen = 0;
+
+		if(enc_in != NULL)
+			dec_in = purple_base64_decode(enc_in, &declen);
+
+		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen, NULL, &c_out, &clen);
+
+		g_free(enc_in);
+		g_free(dec_in);
+
+		if (js->sasl_state != SASL_OK) {
+			/* This should never happen! */
+			*error = g_strdup(_("Invalid response from server"));
+			g_return_val_if_reached(JABBER_SASL_STATE_FAIL);
+		}
+	}
+
+	/* If we've negotiated a security layer, we need to enable it */
+	if (js->sasl) {
+		sasl_getprop(js->sasl, SASL_SSF, &x);
+		if (*(int *)x > 0) {
+			sasl_getprop(js->sasl, SASL_MAXOUTBUF, &x);
+			js->sasl_maxbuf = *(int *)x;
+		}
+	}
+
+	return JABBER_SASL_STATE_OK;
+}
+
+static JabberSaslState
+jabber_cyrus_handle_failure(JabberStream *js, xmlnode *packet,
+                            xmlnode **reply, char **error)
+{
+	if (js->auth_fail_count++ < 5) {
+		if (js->current_mech && *js->current_mech) {
+			char *pos;
+			if ((pos = strstr(js->sasl_mechs->str, js->current_mech))) {
+				g_string_erase(js->sasl_mechs, pos-js->sasl_mechs->str, strlen(js->current_mech));
+			}
+			/* Remove space which separated this mech from the next */
+			if ((js->sasl_mechs->str)[0] == ' ') {
+				g_string_erase(js->sasl_mechs, 0, 1);
+			}
+		}
+		if (*js->sasl_mechs->str) {
+			/* If we have remaining mechs to try, do so */
+			sasl_dispose(&js->sasl);
+
+			return jabber_auth_start_cyrus(js, reply, error);
+		}
+	}
+
+	/* Nothing to send */
+	return JABBER_SASL_STATE_FAIL;
+}
+
+static JabberSaslMech cyrus_mech = {
+	100, /* priority */
+	"*", /* name; Cyrus provides a bunch of mechanisms, so use an invalid
+	      * mechanism name (per rfc4422 3.1). */
+	jabber_cyrus_start,
+	jabber_cyrus_handle_challenge,
+	jabber_cyrus_handle_success,
+	jabber_cyrus_handle_failure,
+	NULL,
+};
+
+JabberSaslMech *jabber_auth_get_cyrus_mech(void)
+{
+	return &cyrus_mech;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.c	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,292 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+
+#include "debug.h"
+#include "cipher.h"
+#include "util.h"
+#include "xmlnode.h"
+
+#include "auth.h"
+#include "jabber.h"
+
+static JabberSaslState
+digest_md5_start(JabberStream *js, xmlnode *packet, xmlnode **response,
+                 char **error)
+{
+	xmlnode *auth = xmlnode_new("auth");
+	xmlnode_set_namespace(auth, NS_XMPP_SASL);
+	xmlnode_set_attrib(auth, "mechanism", "DIGEST-MD5");
+
+	*response = auth;
+	return JABBER_SASL_STATE_CONTINUE;
+}
+
+/* Parts of this algorithm are inspired by stuff in libgsasl */
+static GHashTable* parse_challenge(const char *challenge)
+{
+	const char *token_start, *val_start, *val_end, *cur;
+	GHashTable *ret = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, g_free);
+
+	cur = challenge;
+	while(*cur != '\0') {
+		/* Find the end of the token */
+		gboolean in_quotes = FALSE;
+		char *name, *value = NULL;
+		token_start = cur;
+		while(*cur != '\0' && (in_quotes || (!in_quotes && *cur != ','))) {
+			if (*cur == '"')
+				in_quotes = !in_quotes;
+			cur++;
+		}
+
+		/* Find start of value.  */
+		val_start = strchr(token_start, '=');
+		if (val_start == NULL || val_start > cur)
+			val_start = cur;
+
+		if (token_start != val_start) {
+			name = g_strndup(token_start, val_start - token_start);
+
+			if (val_start != cur) {
+				val_start++;
+				while (val_start != cur && (*val_start == ' ' || *val_start == '\t'
+						|| *val_start == '\r' || *val_start == '\n'
+						|| *val_start == '"'))
+					val_start++;
+
+				val_end = cur;
+				while (val_end != val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
+						|| *val_end == '\r' || *val_end == '\n'
+						|| *val_end == '"'  || *val_end == '\0'))
+					val_end--;
+
+				if (val_start != val_end)
+					value = g_strndup(val_start, val_end - val_start + 1);
+			}
+
+			g_hash_table_replace(ret, name, value);
+		}
+
+		/* Find the start of the next token, if there is one */
+		if (*cur != '\0') {
+			cur++;
+			while (*cur == ' ' || *cur == ',' || *cur == '\t'
+					|| *cur == '\r' || *cur == '\n')
+				cur++;
+		}
+	}
+
+	return ret;
+}
+
+static char *
+generate_response_value(JabberID *jid, const char *passwd, const char *nonce,
+		const char *cnonce, const char *a2, const char *realm)
+{
+	PurpleCipher *cipher;
+	PurpleCipherContext *context;
+	guchar result[16];
+	size_t a1len;
+
+	gchar *a1, *convnode=NULL, *convpasswd = NULL, *ha1, *ha2, *kd, *x, *z;
+
+	if((convnode = g_convert(jid->node, -1, "iso-8859-1", "utf-8",
+					NULL, NULL, NULL)) == NULL) {
+		convnode = g_strdup(jid->node);
+	}
+	if(passwd && ((convpasswd = g_convert(passwd, -1, "iso-8859-1",
+						"utf-8", NULL, NULL, NULL)) == NULL)) {
+		convpasswd = g_strdup(passwd);
+	}
+
+	cipher = purple_ciphers_find_cipher("md5");
+	context = purple_cipher_context_new(cipher, NULL);
+
+	x = g_strdup_printf("%s:%s:%s", convnode, realm, convpasswd ? convpasswd : "");
+	purple_cipher_context_append(context, (const guchar *)x, strlen(x));
+	purple_cipher_context_digest(context, sizeof(result), result, NULL);
+
+	a1 = g_strdup_printf("xxxxxxxxxxxxxxxx:%s:%s", nonce, cnonce);
+	a1len = strlen(a1);
+	g_memmove(a1, result, 16);
+
+	purple_cipher_context_reset(context, NULL);
+	purple_cipher_context_append(context, (const guchar *)a1, a1len);
+	purple_cipher_context_digest(context, sizeof(result), result, NULL);
+
+	ha1 = purple_base16_encode(result, 16);
+
+	purple_cipher_context_reset(context, NULL);
+	purple_cipher_context_append(context, (const guchar *)a2, strlen(a2));
+	purple_cipher_context_digest(context, sizeof(result), result, NULL);
+
+	ha2 = purple_base16_encode(result, 16);
+
+	kd = g_strdup_printf("%s:%s:00000001:%s:auth:%s", ha1, nonce, cnonce, ha2);
+
+	purple_cipher_context_reset(context, NULL);
+	purple_cipher_context_append(context, (const guchar *)kd, strlen(kd));
+	purple_cipher_context_digest(context, sizeof(result), result, NULL);
+	purple_cipher_context_destroy(context);
+
+	z = purple_base16_encode(result, 16);
+
+	g_free(convnode);
+	g_free(convpasswd);
+	g_free(x);
+	g_free(a1);
+	g_free(ha1);
+	g_free(ha2);
+	g_free(kd);
+
+	return z;
+}
+
+static JabberSaslState
+digest_md5_handle_challenge(JabberStream *js, xmlnode *packet,
+                            xmlnode **response, char **msg)
+{
+	xmlnode *reply = NULL;
+	char *enc_in = xmlnode_get_data(packet);
+	char *dec_in;
+	char *enc_out;
+	GHashTable *parts;
+	JabberSaslState state = JABBER_SASL_STATE_CONTINUE;
+
+	if (!enc_in) {
+		*msg = g_strdup(_("Invalid response from server"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+
+	dec_in = (char *)purple_base64_decode(enc_in, NULL);
+	purple_debug_misc("jabber", "decoded challenge (%"
+			G_GSIZE_FORMAT "): %s\n", strlen(dec_in), dec_in);
+
+	parts = parse_challenge(dec_in);
+
+	if (g_hash_table_lookup(parts, "rspauth")) {
+		char *rspauth = g_hash_table_lookup(parts, "rspauth");
+
+		if (rspauth && purple_strequal(rspauth, js->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;
+	} else {
+		/* assemble a response, and send it */
+		/* see RFC 2831 */
+		char *realm;
+		char *nonce;
+
+		/* Make sure the auth string contains everything that should be there.
+		   This isn't everything in RFC2831, but it is what we need. */
+
+		nonce = g_hash_table_lookup(parts, "nonce");
+
+		/* we're actually supposed to prompt the user for a realm if
+		 * the server doesn't send one, but that really complicates things,
+		 * so i'm not gonna worry about it until is poses a problem to
+		 * someone, or I get really bored */
+		realm = g_hash_table_lookup(parts, "realm");
+		if(!realm)
+			realm = js->user->domain;
+
+		if (nonce == NULL || realm == NULL) {
+			*msg = g_strdup(_("Invalid challenge from server"));
+			state = JABBER_SASL_STATE_FAIL;
+		} else {
+			GString *response = g_string_new("");
+			char *a2;
+			char *auth_resp;
+			char *cnonce;
+
+			cnonce = g_strdup_printf("%x%u%x", g_random_int(), (int)time(NULL),
+					g_random_int());
+
+			a2 = g_strdup_printf("AUTHENTICATE:xmpp/%s", realm);
+			auth_resp = generate_response_value(js->user,
+					purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
+			g_free(a2);
+
+			a2 = g_strdup_printf(":xmpp/%s", realm);
+			js->expected_rspauth = generate_response_value(js->user,
+					purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
+			g_free(a2);
+
+			g_string_append_printf(response, "username=\"%s\"", js->user->node);
+			g_string_append_printf(response, ",realm=\"%s\"", realm);
+			g_string_append_printf(response, ",nonce=\"%s\"", nonce);
+			g_string_append_printf(response, ",cnonce=\"%s\"", cnonce);
+			g_string_append_printf(response, ",nc=00000001");
+			g_string_append_printf(response, ",qop=auth");
+			g_string_append_printf(response, ",digest-uri=\"xmpp/%s\"", realm);
+			g_string_append_printf(response, ",response=%s", auth_resp);
+			g_string_append_printf(response, ",charset=utf-8");
+
+			g_free(auth_resp);
+			g_free(cnonce);
+
+			enc_out = purple_base64_encode((guchar *)response->str, response->len);
+
+			purple_debug_misc("jabber", "decoded response (%"
+					G_GSIZE_FORMAT "): %s\n",
+					response->len, response->str);
+
+			reply = xmlnode_new("response");
+			xmlnode_set_namespace(reply, NS_XMPP_SASL);
+			xmlnode_insert_data(reply, enc_out, -1);
+
+			g_free(enc_out);
+
+			g_string_free(response, TRUE);
+		}
+	}
+
+	g_free(enc_in);
+	g_free(dec_in);
+	g_hash_table_destroy(parts);
+
+	*response = reply;
+	return state;
+}
+
+static JabberSaslMech digest_md5_mech = {
+	10, /* priority */
+	"DIGEST-MD5", /* name */
+	digest_md5_start,
+	digest_md5_handle_challenge,
+	NULL, /* handle_success */
+	NULL, /* handle_failure */
+	NULL  /* handle_dispose */
+};
+
+JabberSaslMech *jabber_auth_get_digest_md5_mech(void)
+{
+	return &digest_md5_mech;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_plain.c	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,119 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+
+#include "account.h"
+#include "debug.h"
+#include "request.h"
+#include "util.h"
+#include "xmlnode.h"
+
+#include "jabber.h"
+#include "auth.h"
+
+static xmlnode *finish_plaintext_authentication(JabberStream *js)
+{
+	xmlnode *auth;
+	GString *response;
+	gchar *enc_out;
+
+	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");
+
+	response = g_string_new("");
+	response = g_string_append_len(response, "\0", 1);
+	response = g_string_append(response, js->user->node);
+	response = g_string_append_len(response, "\0", 1);
+	response = g_string_append(response,
+			purple_connection_get_password(js->gc));
+
+	enc_out = purple_base64_encode((guchar *)response->str, response->len);
+
+	xmlnode_set_attrib(auth, "mechanism", "PLAIN");
+	xmlnode_insert_data(auth, enc_out, -1);
+	g_free(enc_out);
+	g_string_free(response, TRUE);
+
+	return auth;
+}
+
+static void allow_plaintext_auth(PurpleAccount *account)
+{
+	PurpleConnection *gc = purple_account_get_connection(account);
+	JabberStream *js = purple_connection_get_protocol_data(gc);
+	xmlnode *response;
+
+	purple_account_set_bool(account, "auth_plain_in_clear", TRUE);
+
+	response = finish_plaintext_authentication(js);
+	jabber_send(js, response);
+	xmlnode_free(response);
+}
+
+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"));
+}
+
+static JabberSaslState
+jabber_plain_start(JabberStream *js, xmlnode *packet, xmlnode **response, char **error)
+{
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+	char *msg;
+
+	if (jabber_stream_is_ssl(js) || purple_account_get_bool(account, "auth_plain_in_clear", FALSE)) {
+		*response = finish_plaintext_authentication(js);
+		return JABBER_SASL_STATE_OK;
+	}
+
+	msg = g_strdup_printf(_("%s requires 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"),
+			msg,
+			1,
+			account, NULL, NULL,
+			account, allow_plaintext_auth, disallow_plaintext_auth);
+	g_free(msg);
+	return JABBER_SASL_STATE_CONTINUE;
+}
+
+static JabberSaslMech plain_mech = {
+	0, /* priority */
+	"PLAIN", /* name */
+	jabber_plain_start,
+	NULL, /* handle_challenge */
+	NULL, /* handle_success */
+	NULL, /* handle_failure */
+	NULL  /* dispose */
+};
+
+JabberSaslMech *jabber_auth_get_plain_mech(void)
+{
+	return &plain_mech;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,577 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+
+#include "auth.h"
+#include "auth_scram.h"
+
+#include "cipher.h"
+#include "debug.h"
+
+static const JabberScramHash hashes[] = {
+	{ "-SHA-1", "sha1", 20 },
+};
+
+static const JabberScramHash *mech_to_hash(const char *mech)
+{
+	int i;
+
+	g_return_val_if_fail(mech != NULL && *mech != '\0', NULL);
+
+	for (i = 0; i < G_N_ELEMENTS(hashes); ++i) {
+		if (strstr(mech, hashes[i].mech_substr))
+			return &(hashes[i]);
+	}
+
+	purple_debug_error("jabber", "Unknown SCRAM mechanism %s\n", mech);
+	g_return_val_if_reached(NULL);
+}
+
+guchar *jabber_scram_hi(const JabberScramHash *hash, const GString *str,
+                        GString *salt, guint iterations)
+{
+	PurpleCipherContext *context;
+	guchar *result;
+	guint i;
+	guchar *prev, *tmp;
+
+	g_return_val_if_fail(hash != NULL, NULL);
+	g_return_val_if_fail(str != NULL && str->len > 0, NULL);
+	g_return_val_if_fail(salt != NULL && salt->len > 0, NULL);
+	g_return_val_if_fail(iterations > 0, NULL);
+
+	prev   = g_new0(guint8, hash->size);
+	tmp    = g_new0(guint8, hash->size);
+	result = g_new0(guint8, hash->size);
+
+	context = purple_cipher_context_new_by_name("hmac", NULL);
+
+	/* Append INT(1), a four-octet encoding of the integer 1, most significant
+	 * octet first. */
+	g_string_append_len(salt, "\0\0\0\1", 4);
+
+	/* Compute U0 */
+	purple_cipher_context_set_option(context, "hash", (gpointer)hash->name);
+	purple_cipher_context_set_key_with_len(context, (guchar *)str->str, str->len);
+	purple_cipher_context_append(context, (guchar *)salt->str, salt->len);
+	purple_cipher_context_digest(context, hash->size, result, NULL);
+
+	memcpy(prev, result, hash->size);
+
+	/* Compute U1...Ui */
+	for (i = 1; i < iterations; ++i) {
+		guint j;
+		purple_cipher_context_set_option(context, "hash", (gpointer)hash->name);
+		purple_cipher_context_set_key_with_len(context, (guchar *)str->str, str->len);
+		purple_cipher_context_append(context, prev, hash->size);
+		purple_cipher_context_digest(context, hash->size, tmp, NULL);
+
+		for (j = 0; j < hash->size; ++j)
+			result[j] ^= tmp[j];
+
+		memcpy(prev, tmp, hash->size);
+	}
+
+	purple_cipher_context_destroy(context);
+	g_free(tmp);
+	g_free(prev);
+	return result;
+}
+
+/*
+ * Helper functions for doing the SCRAM calculations. The first argument
+ * is the hash algorithm.  All buffers must be of the appropriate size
+ * according to the JabberScramHash.
+ *
+ * "str" is a NULL-terminated string for hmac().
+ *
+ * Needless to say, these are fragile.
+ */
+static void
+hmac(const JabberScramHash *hash, guchar *out, const guchar *key, const gchar *str)
+{
+	PurpleCipherContext *context;
+
+	context = purple_cipher_context_new_by_name("hmac", NULL);
+	purple_cipher_context_set_option(context, "hash", (gpointer)hash->name);
+	purple_cipher_context_set_key_with_len(context, key, hash->size);
+	purple_cipher_context_append(context, (guchar *)str, strlen(str));
+	purple_cipher_context_digest(context, hash->size, out, NULL);
+	purple_cipher_context_destroy(context);
+}
+
+static void
+hash(const JabberScramHash *hash, guchar *out, const guchar *data)
+{
+	PurpleCipherContext *context;
+
+	context = purple_cipher_context_new_by_name(hash->name, NULL);
+	purple_cipher_context_append(context, data, hash->size);
+	purple_cipher_context_digest(context, hash->size, out, NULL);
+	purple_cipher_context_destroy(context);
+}
+
+gboolean
+jabber_scram_calc_proofs(JabberScramData *data, GString *salt, guint iterations)
+{
+	guint hash_len = data->hash->size;
+	guint i;
+
+	GString *pass = g_string_new(data->password);
+
+	guchar *salted_password;
+	guchar *client_key, *stored_key, *client_signature, *server_key;
+
+	client_key = g_new0(guchar, hash_len);
+	stored_key = g_new0(guchar, hash_len);
+	client_signature = g_new0(guchar, hash_len);
+	server_key = g_new0(guchar, hash_len);
+
+	data->client_proof = g_string_sized_new(hash_len);
+	data->client_proof->len = hash_len;
+	data->server_signature = g_string_sized_new(hash_len);
+	data->server_signature->len = hash_len;
+
+	salted_password = jabber_scram_hi(data->hash, pass, salt, iterations);
+
+	memset(pass->str, 0, pass->allocated_len);
+	g_string_free(pass, TRUE);
+
+	if (!salted_password)
+		return FALSE;
+
+	/* client_key = HMAC(salted_password, "Client Key") */
+	hmac(data->hash, client_key, salted_password, "Client Key");
+	/* server_key = HMAC(salted_password, "Server Key") */
+	hmac(data->hash, server_key, salted_password, "Server Key");
+	g_free(salted_password);
+
+	/* stored_key = HASH(client_key) */
+	hash(data->hash, stored_key, client_key);
+
+	/* client_signature = HMAC(stored_key, auth_message) */
+	hmac(data->hash, client_signature, stored_key, data->auth_message->str);
+	/* server_signature = HMAC(server_key, auth_message) */
+	hmac(data->hash, (guchar *)data->server_signature->str, server_key, data->auth_message->str);
+
+	/* client_proof = client_key XOR client_signature */
+	for (i = 0; i < hash_len; ++i)
+		data->client_proof->str[i] = client_key[i] ^ client_signature[i];
+
+	g_free(server_key);
+	g_free(client_signature);
+	g_free(stored_key);
+	g_free(client_key);
+
+	return TRUE;
+}
+
+static gboolean
+parse_server_step1(JabberScramData *data, const char *challenge,
+                   gchar **out_nonce, GString **out_salt, guint *out_iterations)
+{
+	char **tokens;
+	char *token, *decoded, *tmp;
+	gsize len;
+	char *nonce = NULL;
+	GString *salt = NULL;
+	guint iterations;
+
+	tokens = g_strsplit(challenge, ",", -1);
+	if (tokens == NULL)
+		return FALSE;
+
+	token = tokens[0];
+	if (token[0] != 'r' || token[1] != '=')
+		goto err;
+
+	/* Ensure that the first cnonce_len bytes of the nonce are the original
+	 * cnonce we sent to the server.
+	 */
+	if (0 != strncmp(data->cnonce, token + 2, strlen(data->cnonce)))
+		goto err;
+
+	nonce = g_strdup(token + 2);
+
+	/* The Salt, base64-encoded */
+	token = tokens[1];
+	if (token[0] != 's' || token[1] != '=')
+		goto err;
+
+	decoded = (gchar *)purple_base64_decode(token + 2, &len);
+	if (!decoded || *decoded == '\0') {
+		g_free(decoded);
+		goto err;
+	}
+	salt = g_string_new_len(decoded, len);
+	g_free(decoded);
+
+	/* The iteration count */
+	token = tokens[2];
+	if (token[0] != 'i' || token[1] != '=' || token[2] == '\0')
+		goto err;
+
+	/* Validate the string */
+	for (tmp = token + 2; *tmp; ++tmp)
+		if (!g_ascii_isdigit(*tmp))
+			goto err;
+
+	iterations = strtoul(token + 2, NULL, 10);
+
+	g_strfreev(tokens);
+	*out_nonce = nonce;
+	*out_salt = salt;
+	*out_iterations = iterations;
+	return TRUE;
+
+err:
+	g_free(nonce);
+	if (salt)
+		g_string_free(salt, TRUE);
+	g_strfreev(tokens);
+	return FALSE;
+}
+
+static gboolean
+parse_server_step2(JabberScramData *data, const char *challenge, gchar **out_verifier)
+{
+	char **tokens;
+	char *token;
+
+	tokens = g_strsplit(challenge, ",", -1);
+	if (tokens == NULL)
+		return FALSE;
+
+	token = tokens[0];
+	if (token[0] != 'v' || token[1] != '=' || token[2] == '\0') {
+		g_strfreev(tokens);
+		return FALSE;
+	}
+
+	*out_verifier = g_strdup(token + 2);
+	g_strfreev(tokens);
+	return TRUE;
+}
+
+gboolean
+jabber_scram_feed_parser(JabberScramData *data, gchar *in, gchar **out)
+{
+	gboolean ret;
+
+	g_return_val_if_fail(data != NULL, FALSE);
+
+	g_string_append_c(data->auth_message, ',');
+	g_string_append(data->auth_message, in);
+
+	if (data->step == 1) {
+		gchar *nonce, *proof;
+		GString *salt;
+		guint iterations;
+
+		ret = parse_server_step1(data, in, &nonce, &salt, &iterations);
+		if (!ret)
+			return FALSE;
+
+		g_string_append_c(data->auth_message, ',');
+
+		/* "biws" is the base64 encoding of "n,,". I promise. */
+		g_string_append_printf(data->auth_message, "c=%s,r=%s", "biws", nonce);
+#ifdef CHANNEL_BINDING
+#error fix this
+#endif
+
+		ret = jabber_scram_calc_proofs(data, salt, iterations);
+		if (!ret)
+			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(proof);
+	} else if (data->step == 2) {
+		gchar *server_sig, *enc_server_sig;
+		gsize len;
+
+		ret = parse_server_step2(data, in, &enc_server_sig);
+		if (!ret)
+			return FALSE;
+
+		server_sig = (gchar *)purple_base64_decode(enc_server_sig, &len);
+		g_free(enc_server_sig);
+
+		if (server_sig == NULL || len != data->server_signature->len) {
+			g_free(server_sig);
+			return FALSE;
+		}
+
+		if (0 != memcmp(server_sig, data->server_signature->str, len)) {
+			g_free(server_sig);
+			return FALSE;
+		}
+		g_free(server_sig);
+
+		*out = NULL;
+	} else {
+		purple_debug_error("jabber", "SCRAM: There is no step %d\n", data->step);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static gchar *escape_username(const gchar *in)
+{
+	gchar *tmp, *tmp2;
+
+	tmp = purple_strreplace(in, "=", "=3D");
+	tmp2 = purple_strreplace(tmp, ",", "=2D");
+	g_free(tmp);
+	return tmp2;
+}
+
+static JabberSaslState
+scram_start(JabberStream *js, xmlnode *mechanisms, xmlnode **out, char **error)
+{
+	xmlnode *reply;
+	JabberScramData *data;
+	guint64 cnonce;
+#ifdef CHANNEL_BINDING
+	gboolean binding_supported = TRUE;
+#endif
+	gchar *dec_out, *enc_out;
+	gchar *prepped_node, *tmp;
+	gchar *prepped_pass;
+
+	prepped_node = jabber_saslprep(js->user->node);
+	if (!prepped_node) {
+		*error = g_strdup(_("Unable to canonicalize username"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+
+	tmp = escape_username(prepped_node);
+	g_free(prepped_node);
+	prepped_node = tmp;
+
+	prepped_pass = jabber_saslprep(purple_connection_get_password(js->gc));
+	if (!prepped_pass) {
+		g_free(prepped_node);
+		*error = g_strdup(_("Unable to canonicalize password"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+
+	data = js->auth_mech_data = g_new0(JabberScramData, 1);
+	data->hash = mech_to_hash(js->auth_mech->name);
+	data->password = prepped_pass;
+
+#ifdef CHANNEL_BINDING
+	if (strstr(js->auth_mech_name, "-PLUS"))
+		data->channel_binding = TRUE;
+#endif
+	cnonce = ((guint64)g_random_int() << 32) | g_random_int();
+	data->cnonce = purple_base64_encode((guchar *)&cnonce, sizeof(cnonce));
+
+	data->auth_message = g_string_new(NULL);
+	g_string_printf(data->auth_message, "n=%s,r=%s",
+			prepped_node, data->cnonce);
+	g_free(prepped_node);
+
+	data->step = 1;
+
+	reply = xmlnode_new("auth");
+	xmlnode_set_namespace(reply, NS_XMPP_SASL);
+	xmlnode_set_attrib(reply, "mechanism", js->auth_mech->name);
+
+	/* TODO: Channel binding */
+	dec_out = g_strdup_printf("%c,,%s", 'n', data->auth_message->str);
+	enc_out = purple_base64_encode((guchar *)dec_out, strlen(dec_out));
+	purple_debug_misc("jabber", "initial SCRAM message '%s'\n", dec_out);
+
+	xmlnode_insert_data(reply, enc_out, -1);
+
+	g_free(enc_out);
+	g_free(dec_out);
+
+	*out = reply;
+	return JABBER_SASL_STATE_CONTINUE;
+}
+
+static JabberSaslState
+scram_handle_challenge(JabberStream *js, xmlnode *challenge, xmlnode **out, char **error)
+{
+	JabberScramData *data = js->auth_mech_data;
+	xmlnode *reply;
+	gchar *enc_in, *dec_in;
+	gchar *enc_out = NULL, *dec_out = NULL;
+	gsize len;
+	JabberSaslState state = JABBER_SASL_STATE_FAIL;
+
+	enc_in = xmlnode_get_data(challenge);
+	if (!enc_in || *enc_in == '\0') {
+		reply = xmlnode_new("abort");
+		xmlnode_set_namespace(reply, NS_XMPP_SASL);
+		data->step = -1;
+		*error = g_strdup(_("Invalid challenge from server"));
+		goto out;
+	}
+
+	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");
+		xmlnode_set_namespace(reply, NS_XMPP_SASL);
+		data->step = -1;
+		*error = g_strdup(_("Malicious challenge from server"));
+		goto out;
+	}
+
+	purple_debug_misc("jabber", "decoded challenge: %s\n", dec_in);
+
+	if (!jabber_scram_feed_parser(data, dec_in, &dec_out)) {
+		reply = xmlnode_new("abort");
+		xmlnode_set_namespace(reply, NS_XMPP_SASL);
+		data->step = -1;
+		*error = g_strdup(_("Invalid challenge from server"));
+		goto out;
+	}
+
+	data->step += 1;
+
+	reply = xmlnode_new("response");
+	xmlnode_set_namespace(reply, NS_XMPP_SASL);
+
+	purple_debug_misc("jabber", "decoded response: %s\n", dec_out ? dec_out : "(null)");
+	if (dec_out) {
+		enc_out = purple_base64_encode((guchar *)dec_out, strlen(dec_out));
+		xmlnode_insert_data(reply, enc_out, -1);
+	}
+
+	state = JABBER_SASL_STATE_CONTINUE;
+
+out:
+	g_free(enc_out);
+	g_free(dec_out);
+
+	*out = reply;
+	return state;
+}
+
+static JabberSaslState
+scram_handle_success(JabberStream *js, xmlnode *packet, char **error)
+{
+	JabberScramData *data = js->auth_mech_data;
+	char *enc_in, *dec_in;
+	char *dec_out = NULL;
+	gsize len;
+
+	enc_in = xmlnode_get_data(packet);
+	g_return_val_if_fail(enc_in != NULL && *enc_in != '\0', FALSE);
+
+	if (data->step == 3)
+		return JABBER_SASL_STATE_OK;
+
+	if (data->step != 2) {
+		*error = g_strdup(_("Unexpected response from server"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+
+	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 */
+		g_free(dec_in);
+		*error = g_strdup(_("Invalid 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_out);
+		*error = g_strdup(_("Invalid challenge from server"));
+		return JABBER_SASL_STATE_FAIL;
+	}
+
+	/* Hooray */
+	return JABBER_SASL_STATE_OK;
+}
+
+void jabber_scram_data_destroy(JabberScramData *data)
+{
+	g_free(data->cnonce);
+	if (data->auth_message)
+		g_string_free(data->auth_message, TRUE);
+	if (data->client_proof)
+		g_string_free(data->client_proof, TRUE);
+	if (data->server_signature)
+		g_string_free(data->server_signature, TRUE);
+	if (data->password) {
+		memset(data->password, 0, strlen(data->password));
+		g_free(data->password);
+	}
+
+	g_free(data);
+}
+
+static void scram_dispose(JabberStream *js)
+{
+	if (js->auth_mech_data) {
+		jabber_scram_data_destroy(js->auth_mech_data);
+		js->auth_mech_data = NULL;
+	}
+}
+
+static JabberSaslMech scram_sha1_mech = {
+	50, /* priority */
+	"SCRAM-SHA-1", /* name */
+	scram_start,
+	scram_handle_challenge,
+	scram_handle_success,
+	NULL, /* handle_failure */
+	scram_dispose
+};
+
+#ifdef CHANNEL_BINDING
+/* With channel binding */
+static JabberSaslMech scram_sha1_plus_mech = {
+	scram_sha1_mech.priority + 1, /* priority */
+	"SCRAM-SHA-1-PLUS", /* name */
+	scram_start,
+	scram_handle_challenge,
+	scram_handle_success,
+	NULL, /* handle_failure */
+	scram_dispose
+};
+#endif
+
+JabberSaslMech **jabber_auth_get_scram_mechs(gint *count)
+{
+	static JabberSaslMech *mechs[] = {
+		&scram_sha1_mech,
+#ifdef CHANNEL_BINDING
+		&scram_sha1_plus_mech,
+#endif
+	};
+
+	*count = G_N_ELEMENTS(mechs);
+	return mechs;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_scram.h	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,95 @@
+/**
+ * @file auth_scram.h Implementation of SASL-SCRAM authentication
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef PURPLE_JABBER_AUTH_SCRAM_H_
+#define PURPLE_JABBER_AUTH_SCRAM_H_
+
+/*
+ * Every function in this file is ONLY exposed for tests.
+ * DO NOT USE ANYTHING HERE OR YOU WILL BE SENT TO THE PIT OF DESPAIR.
+ */
+
+/* Per-connection state stored between messages.
+ * This is stored in js->auth_data_mech.
+ */
+typedef struct {
+	const char *mech_substr;
+	const char *name;
+	guint size;
+} JabberScramHash;
+
+typedef struct {
+	const JabberScramHash *hash;
+	char *cnonce;
+	GString *auth_message;
+
+	GString *client_proof;
+	GString *server_signature;
+
+	gchar *password;
+	gboolean channel_binding;
+	int step;
+} JabberScramData;
+
+#include "auth.h"
+
+/**
+ * Implements the Hi() function as described in the SASL-SCRAM I-D.
+ *
+ * @param hash The struct corresponding to the hash function to be used.
+ * @param str  The string to perform the PBKDF2 operation on.
+ * @param salt The salt.
+ * @param iterations The number of iterations to perform.
+ *
+ * @returns A newly allocated string containing the result. The string is
+ *          NOT null-terminated and its length is the length of the binary
+ *          output of the hash function in-use.
+ */
+guchar *jabber_scram_hi(const JabberScramHash *hash, const GString *str,
+                        GString *salt, guint iterations);
+
+/**
+ * Calculates the proofs as described in Section 3 of the SASL-SCRAM I-D.
+ *
+ * @param data A JabberScramData structure. hash and auth_message must be
+ *             set. client_proof and server_signature will be set as a result
+ *             of this function.
+ * @param salt       The salt (as specified by the server)
+ * @param iterations The number of iterations to perform.
+ *
+ * @returns TRUE if the proofs were successfully calculated. FALSE otherwise.
+ */
+gboolean jabber_scram_calc_proofs(JabberScramData *data, GString *salt,
+                                  guint iterations);
+
+/**
+ * Feed the algorithm with the data from the server.
+ */
+gboolean jabber_scram_feed_parser(JabberScramData *data, gchar *in, gchar **out);
+
+/**
+ * Clean up and destroy the data struct
+ */
+void jabber_scram_data_destroy(JabberScramData *data);
+
+#endif /* PURPLE_JABBER_AUTH_SCRAM_H_ */
--- a/libpurple/protocols/jabber/bosh.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Sat Jan 09 02:00:18 2010 +0000
@@ -369,8 +369,8 @@
 	                "sid='%s' "
 	                "to='%s' "
 	                "xml:lang='en' "
-	                "xmlns='http://jabber.org/protocol/httpbind' "
-	                "xmlns:xmpp='urn:xmpp:xbosh'",
+	                "xmlns='" NS_BOSH "' "
+	                "xmlns:xmpp='" NS_XMPP_BOSH "'",
 	                ++conn->rid,
 	                conn->sid,
 	                conn->js->user->domain);
@@ -567,13 +567,13 @@
 	                "xml:lang='en' "
 	                "xmpp:version='1.0' "
 	                "ver='1.6' "
-	                "xmlns:xmpp='urn:xmpp:bosh' "
+	                "xmlns:xmpp='" NS_XMPP_BOSH "' "
 	                "rid='%" G_GUINT64_FORMAT "' "
 /* TODO: This should be adjusted/adjustable automatically according to
  * realtime network behavior */
 	                "wait='60' "
 	                "hold='1' "
-	                "xmlns='http://jabber.org/protocol/httpbind'/>",
+	                "xmlns='" NS_BOSH "'/>",
 	                conn->js->user->domain,
 	                ++conn->rid);
 
--- a/libpurple/protocols/jabber/buddy.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Jan 09 02:00:18 2010 +0000
@@ -815,20 +815,32 @@
 
 	if (!jbi->jb->resources) {
 		/* the buddy is offline */
-		gchar *status =
-			g_strdup_printf("%s%s%s",	_("Offline"),
-			                jbi->last_message ? ": " : "",
-			                jbi->last_message ? jbi->last_message : "");
+		gboolean is_domain = jabber_jid_is_domain(jbi->jid);
+
 		if (jbi->last_seconds > 0) {
 			char *last = purple_str_seconds_to_string(jbi->last_seconds);
-			gchar *message = g_strdup_printf(_("%s ago"), last);
-			purple_notify_user_info_prepend_pair(user_info,
-				_("Logged Off"), message);
+			gchar *message = NULL;
+			const gchar *title = NULL;
+			if (is_domain) {
+				title = _("Uptime");
+				message = g_strdup_printf(_("%s"), last);
+			} else {
+				title = _("Logged Off");
+				message = g_strdup_printf(_("%s ago"), last);
+			}
+			purple_notify_user_info_prepend_pair(user_info, title, message);
 			g_free(last);
 			g_free(message);
 		}
-		purple_notify_user_info_prepend_pair(user_info, _("Status"), status);
-		g_free(status);
+
+		if (!is_domain) {
+			gchar *status =
+				g_strdup_printf("%s%s%s",	_("Offline"),
+				                jbi->last_message ? ": " : "",
+				                jbi->last_message ? jbi->last_message : "");
+			purple_notify_user_info_prepend_pair(user_info, _("Status"), status);
+			g_free(status);
+		}
 	}
 
 	g_free(resource_name);
@@ -1466,7 +1478,7 @@
 	if(!jbr->client.name)
 		return FALSE;
 
-	if(!strcmp(ns, "jabber:iq:last")) {
+	if(!strcmp(ns, NS_LAST_ACTIVITY)) {
 		if(!strcmp(jbr->client.name, "Trillian")) {
 			/* verified by nwalp 2007/05/09 */
 			if(!strcmp(jbr->client.version, "3.1.0.121") ||
@@ -1512,8 +1524,8 @@
 	 * respond (with an error or otherwise) to jabber:iq:last
 	 * requests.  There are a number of Trillian users in my
 	 * office. */
-	if(!_client_is_blacklisted(jbr, "jabber:iq:last")) {
-		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
+	if(!_client_is_blacklisted(jbr, NS_LAST_ACTIVITY)) {
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_LAST_ACTIVITY);
 		xmlnode_set_attrib(iq->node, "to", to);
 		jabber_iq_set_callback(iq, jabber_last_parse, jbi);
 		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
@@ -1522,12 +1534,12 @@
 
 	if (jbr->tz_off == PURPLE_NO_TZ_OFF &&
 			(!jbr->caps.info ||
-			 	jabber_resource_has_capability(jbr, "urn:xmpp:time"))) {
+			 	jabber_resource_has_capability(jbr, NS_ENTITY_TIME))) {
 		xmlnode *child;
 		iq = jabber_iq_new(js, JABBER_IQ_GET);
 		xmlnode_set_attrib(iq->node, "to", to);
 		child = xmlnode_new_child(iq->node, "time");
-		xmlnode_set_namespace(child, "urn:xmpp:time");
+		xmlnode_set_namespace(child, NS_ENTITY_TIME);
 		jabber_iq_set_callback(iq, jabber_time_parse, jbi);
 		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
 		jabber_iq_send(iq);
@@ -1590,7 +1602,7 @@
 
 	if (!jb->resources && is_bare_jid) {
 		/* user is offline, send a jabber:iq:last to find out last time online */
-		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:last");
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_LAST_ACTIVITY);
 		xmlnode_set_attrib(iq->node, "to", jid);
 		jabber_iq_set_callback(iq, jabber_last_offline_parse, jbi);
 		jbi->ids = g_slist_prepend(jbi->ids, g_strdup(iq->id));
@@ -1860,8 +1872,10 @@
 	 * However, since the gateway might appear offline to us, we cannot get that information. Therefore, I just assume
 	 * that gateways on the roster can be identified by having no '@' in their jid. This is a faily safe assumption, since
 	 * people don't tend to have a server or other service there.
+	 *
+	 * TODO: Use disco#info...
 	 */
-	if (g_utf8_strchr(name, -1, '@') == NULL) {
+	if (strchr(name, '@') == NULL) {
 		act = purple_menu_action_new(_("Log In"),
 									 PURPLE_CALLBACK(jabber_buddy_login),
 									 NULL, NULL);
--- a/libpurple/protocols/jabber/caps.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/caps.c	Sat Jan 09 02:00:18 2010 +0000
@@ -440,7 +440,7 @@
                         const char *id, xmlnode *packet, gpointer data)
 {
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-		"http://jabber.org/protocol/disco#info");
+		NS_DISCO_INFO);
 	jabber_caps_cbplususerdata *userdata = data;
 	JabberCapsClientInfo *info = NULL, *value;
 	JabberCapsTuple key;
@@ -531,7 +531,7 @@
                      const char *id, xmlnode *packet, gpointer data)
 {
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-		"http://jabber.org/protocol/disco#info");
+		NS_DISCO_INFO);
 	xmlnode *child;
 	ext_iq_data *userdata = data;
 	GList *features = NULL;
@@ -638,10 +638,9 @@
 		xmlnode *query;
 		char *nodever;
 
-		iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-					"http://jabber.org/protocol/disco#info");
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
 		query = xmlnode_get_child_with_namespace(iq->node, "query",
-					"http://jabber.org/protocol/disco#info");
+					NS_DISCO_INFO);
 		nodever = g_strdup_printf("%s#%s", node, ver);
 		xmlnode_set_attrib(query, "node", nodever);
 		g_free(nodever);
@@ -679,10 +678,9 @@
 				cbdata->name = exts[i];
 				cbdata->data = cbplususerdata_ref(userdata);
 
-				iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-				            "http://jabber.org/protocol/disco#info");
+				iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
 				query = xmlnode_get_child_with_namespace(iq->node, "query",
-				            "http://jabber.org/protocol/disco#info");
+				            NS_DISCO_INFO);
 				nodeext = g_strdup_printf("%s#%s", node, exts[i]);
 				xmlnode_set_attrib(query, "node", nodeext);
 				g_free(nodeext);
@@ -771,7 +769,7 @@
 	xmlnode *child;
 	JabberCapsClientInfo *info;
 
-	if (!query || strcmp(query->xmlns, "http://jabber.org/protocol/disco#info"))
+	if (!query || strcmp(query->xmlns, NS_DISCO_INFO))
 		return 0;
 
 	info = g_new0(JabberCapsClientInfo, 1);
--- a/libpurple/protocols/jabber/chat.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Sat Jan 09 02:00:18 2010 +0000
@@ -825,7 +825,7 @@
 
 	purple_roomlist_set_in_progress(js->roomlist, TRUE);
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_ITEMS);
 
 	xmlnode_set_attrib(iq->node, "to", server);
 
@@ -927,7 +927,7 @@
 	jcm = g_hash_table_lookup(chat->members, who);
 	if (jcm && jcm->jid)
 		jid = jcm->jid;
-	else if (g_utf8_strchr(who, -1, '@') != NULL)
+	else if (strchr(who, '@') != NULL)
 		jid = who;
 	else
 		return FALSE;
@@ -964,7 +964,7 @@
 	jcm = g_hash_table_lookup(chat->members, who);
 	if (jcm && jcm->jid)
 		jid = jcm->jid;
-	else if (g_utf8_strchr(who, -1, '@') != NULL)
+	else if (strchr(who, '@') != NULL)
 		jid = who;
 	else
 		return FALSE;
@@ -1201,7 +1201,7 @@
 	for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) {
 		const char *var = xmlnode_get_attrib(x, "var");
 
-		if(var && !strcmp(var, "http://jabber.org/protocol/xhtml-im")) {
+		if(var && !strcmp(var, NS_XHTML_IM)) {
 			chat->xhtml = TRUE;
 		}
 	}
@@ -1216,8 +1216,7 @@
 
 	room_jid = g_strdup_printf("%s@%s", chat->room, chat->server);
 
-	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET,
-			"http://jabber.org/protocol/disco#info");
+	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET, NS_DISCO_INFO);
 
 	xmlnode_set_attrib(iq->node, "to", room_jid);
 
--- a/libpurple/protocols/jabber/data.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/data.c	Sat Jan 09 02:00:18 2010 +0000
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
 
-#include "internal.h"
 #include "data.h"
 #include "debug.h"
 #include "xmlnode.h"
@@ -140,7 +141,7 @@
 	xmlnode *tag = xmlnode_new("data");
 	char *base64data = purple_base64_encode(data->data, data->size);
 
-	xmlnode_set_namespace(tag, XEP_0231_NAMESPACE);
+	xmlnode_set_namespace(tag, NS_BOB);
 	xmlnode_set_attrib(tag, "cid", data->cid);
 	xmlnode_set_attrib(tag, "type", data->type);
 
@@ -169,7 +170,7 @@
 {
 	xmlnode *tag = xmlnode_new("data");
 
-	xmlnode_set_namespace(tag, XEP_0231_NAMESPACE);
+	xmlnode_set_namespace(tag, NS_BOB);
 	xmlnode_set_attrib(tag, "cid", cid);
 
 	return tag;
@@ -254,7 +255,7 @@
 	remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
 		g_free, jabber_data_delete);
 
-	jabber_iq_register_handler("data", XEP_0231_NAMESPACE, jabber_data_parse);
+	jabber_iq_register_handler("data", NS_BOB, jabber_data_parse);
 }
 
 void
--- a/libpurple/protocols/jabber/data.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/data.h	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,6 @@
 #include "xmlnode.h"
 #include "jabber.h"
 
-#define XEP_0231_NAMESPACE "urn:xmpp:bob"
-
 #include <glib.h>
 
 typedef struct {
--- a/libpurple/protocols/jabber/disco.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Sat Jan 09 02:00:18 2010 +0000
@@ -60,7 +60,7 @@
 {
 	JabberBytestreamsStreamhost *sh = data;
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-		"http://jabber.org/protocol/bytestreams");
+		NS_BYTESTREAMS);
 
 	if (from && !strcmp(from, sh->jid) && query != NULL) {
 		xmlnode *sh_node = xmlnode_get_child(query, "streamhost");
@@ -109,8 +109,7 @@
 		/* create custom caps node URI */
 		node_uri = g_strconcat(CAPS0115_NODE, "#", jabber_caps_get_own_hash(js), NULL);
 
-		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
-				"http://jabber.org/protocol/disco#info");
+		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, NS_DISCO_INFO);
 
 		jabber_iq_set_id(iq, id);
 
@@ -152,7 +151,7 @@
 			 * advertises as 'voice-v1'.
 			 */
 			xmlnode *feature = xmlnode_new_child(query, "feature");
-			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/voice/v1");
+			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VOICE);
 		} else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) {
 			/*
 			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
@@ -164,7 +163,7 @@
 			 * advertises as 'video-v1'.
 			 */
 			xmlnode *feature = xmlnode_new_child(query, "feature");
-			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/video/v1");
+			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VIDEO);
 		} else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) {
 			/*
 			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
@@ -176,7 +175,7 @@
 			 * advertises as 'camera-v1'.
 			 */
 			xmlnode *feature = xmlnode_new_child(query, "feature");
-			xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/camera/v1");
+			xmlnode_set_attrib(feature, "var", NS_GOOGLE_CAMERA);
 #endif
 		} else {
 			xmlnode *error, *inf;
@@ -189,7 +188,7 @@
 			xmlnode_set_attrib(error, "code", "404");
 			xmlnode_set_attrib(error, "type", "cancel");
 			inf = xmlnode_new_child(error, "item-not-found");
-			xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
+			xmlnode_set_namespace(inf, NS_XMPP_STANZAS);
 		}
 		g_free(node_uri);
 		jabber_iq_send(iq);
@@ -204,7 +203,7 @@
 		error = xmlnode_new_child(iq->node, "error");
 		xmlnode_set_attrib(error, "type", "modify");
 		bad_request = xmlnode_new_child(error, "bad-request");
-		xmlnode_set_namespace(bad_request, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(bad_request, NS_XMPP_STANZAS);
 
 		jabber_iq_set_id(iq, id);
 		if (from)
@@ -221,8 +220,7 @@
 	struct _jabber_disco_info_cb_data *jdicd = data;
 	xmlnode *query;
 
-	query = xmlnode_get_child_with_namespace(packet, "query",
-				"http://jabber.org/protocol/disco#info");
+	query = xmlnode_get_child_with_namespace(packet, "query", NS_DISCO_INFO);
 
 	if (type == JABBER_IQ_RESULT && query) {
 		xmlnode *child;
@@ -257,7 +255,7 @@
 				} else if(!strcmp(category, "directory") && !strcmp(type, "user")) {
 					/* we found a JUD */
 					js->user_directories = g_list_prepend(js->user_directories, g_strdup(from));
-				} else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) {
+				} else if(!strcmp(category, "proxy") && !strcmp(type, NS_BYTESTREAMS)) {
 					/* This is a bytestream proxy */
 					JabberIq *iq;
 					JabberBytestreamsStreamhost *sh;
@@ -269,7 +267,7 @@
 					js->bs_proxies = g_list_prepend(js->bs_proxies, sh);
 
 					iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-								 "http://jabber.org/protocol/bytestreams");
+							NS_BYTESTREAMS);
 					xmlnode_set_attrib(iq->node, "to", sh->jid);
 					jabber_iq_set_callback(iq, jabber_disco_bytestream_server_cb, sh);
 					jabber_iq_send(iq);
@@ -284,20 +282,20 @@
 					capabilities |= JABBER_CAP_SI;
 				else if(!strcmp(var, "http://jabber.org/protocol/si/profile/file-transfer"))
 					capabilities |= JABBER_CAP_SI_FILE_XFER;
-				else if(!strcmp(var, "http://jabber.org/protocol/bytestreams"))
+				else if(!strcmp(var, NS_BYTESTREAMS))
 					capabilities |= JABBER_CAP_BYTESTREAMS;
 				else if(!strcmp(var, "jabber:iq:search"))
 					capabilities |= JABBER_CAP_IQ_SEARCH;
 				else if(!strcmp(var, "jabber:iq:register"))
 					capabilities |= JABBER_CAP_IQ_REGISTER;
-				else if(!strcmp(var, "urn:xmpp:ping"))
+				else if(!strcmp(var, NS_PING))
 					capabilities |= JABBER_CAP_PING;
-				else if(!strcmp(var, "http://jabber.org/protocol/disco#items"))
+				else if(!strcmp(var, NS_DISCO_ITEMS))
 					capabilities |= JABBER_CAP_ITEMS;
 				else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
 					capabilities |= JABBER_CAP_ADHOC;
 				}
-				else if(!strcmp(var, "http://jabber.org/protocol/ibb")) {
+				else if(!strcmp(var, NS_IBB)) {
 					purple_debug_info("jabber", "remote supports IBB\n");
 					capabilities |= JABBER_CAP_IBB;
 				}
@@ -341,7 +339,7 @@
 {
 	if(type == JABBER_IQ_GET) {
 		JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
-				"http://jabber.org/protocol/disco#items");
+				NS_DISCO_ITEMS);
 
 		/* preserve node */
 		xmlnode *iq_query = xmlnode_get_child(iq->node, "query");
@@ -372,10 +370,8 @@
 	if (js->pep)
 		jabber_avatar_fetch_mine(js);
 
-	if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
-		/* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
-		jabber_roster_request(js);
-	}
+	/* Yes, please! */
+	jabber_roster_request(js);
 
 	if (js->server_caps & JABBER_CAP_ADHOC) {
 		/* The server supports ad-hoc commands, so let's request the list */
@@ -409,8 +405,7 @@
 			sh->jid = g_strdup(ft_proxy_list[i]);
 			js->bs_proxies = g_list_prepend(js->bs_proxies, sh);
 
-			iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-						 "http://jabber.org/protocol/bytestreams");
+			iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_BYTESTREAMS);
 			xmlnode_set_attrib(iq->node, "to", sh->jid);
 			jabber_iq_set_callback(iq, jabber_disco_bytestream_server_cb, sh);
 			jabber_iq_send(iq);
@@ -555,15 +550,14 @@
 		if (!var)
 			continue;
 
-		if (!strcmp("google:mail:notify", var)) {
+		if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) {
 			js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
 			jabber_gmail_init(js);
-		} else if (!strcmp("google:roster", var)) {
+		} else if (!strcmp(NS_GOOGLE_ROSTER, var)) {
 			js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
-			jabber_google_roster_init(js);
 		} else if (!strcmp("http://jabber.org/protocol/commands", var)) {
 			js->server_caps |= JABBER_CAP_ADHOC;
-		} else if (!strcmp("urn:xmpp:blocking", var)) {
+		} else if (!strcmp(NS_SIMPLE_BLOCKING, var)) {
 			js->server_caps |= JABBER_CAP_BLOCKING;
 		}
 	}
@@ -604,7 +598,7 @@
 		if((node = xmlnode_get_attrib(child, "node")))
 			continue;
 
-		iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
+		iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
 		xmlnode_set_attrib(iq->node, "to", jid);
 		jabber_iq_set_callback(iq, jabber_disco_info_cb, NULL);
 		jabber_iq_send(iq);
@@ -613,15 +607,14 @@
 
 void jabber_disco_items_server(JabberStream *js)
 {
-	JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET,
-			"http://jabber.org/protocol/disco#items");
+	JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_ITEMS);
 
 	xmlnode_set_attrib(iq->node, "to", js->user->domain);
 
 	jabber_iq_set_callback(iq, jabber_disco_server_items_result_cb, NULL);
 	jabber_iq_send(iq);
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
 	xmlnode_set_attrib(iq->node, "to", js->user->domain);
 	jabber_iq_set_callback(iq, jabber_disco_server_info_result_cb, NULL);
 	jabber_iq_send(iq);
@@ -650,7 +643,7 @@
 	jdicd->data = data;
 	jdicd->callback = callback;
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_DISCO_INFO);
 	xmlnode_set_attrib(iq->node, "to", who);
 
 	jabber_iq_set_callback(iq, jabber_disco_info_cb, jdicd);
--- a/libpurple/protocols/jabber/google.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Sat Jan 09 02:00:18 2010 +0000
@@ -30,6 +30,7 @@
 #include "google.h"
 #include "jabber.h"
 #include "presence.h"
+#include "roster.h"
 #include "iq.h"
 #include "chat.h"
 
@@ -37,9 +38,6 @@
 
 #ifdef USE_VV
 
-#define NS_GOOGLE_VIDEO "http://www.google.com/session/video"
-#define NS_GOOGLE_PHONE "http://www.google.com/session/phone"
-
 typedef struct {
 	char *id;
 	char *initiator;
@@ -84,7 +82,7 @@
 google_session_create_xmlnode(GoogleSession *session, const char *type)
 {
 	xmlnode *node = xmlnode_new("session");
-	xmlnode_set_namespace(node, "http://www.google.com/session");
+	xmlnode_set_namespace(node, NS_GOOGLE_SESSION);
 	xmlnode_set_attrib(node, "id", session->id.id);
 	xmlnode_set_attrib(node, "initiator", session->id.initiator);
 	xmlnode_set_attrib(node, "type", type);
@@ -213,9 +211,9 @@
 		xmlnode_insert_child(iq->node, sess);
 		desc = xmlnode_new_child(sess, "description");
 		if (session->video)
-			xmlnode_set_namespace(desc, NS_GOOGLE_VIDEO);
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_VIDEO);
 		else
-			xmlnode_set_namespace(desc, NS_GOOGLE_PHONE);
+			xmlnode_set_namespace(desc, NS_GOOGLE_SESSION_PHONE);
 
 		codecs = purple_media_get_codecs(media, "google-video");
 
@@ -248,7 +246,7 @@
 					purple_media_codec_get_clock_rate(codec));
 			payload = xmlnode_new_child(desc, "payload-type");
 			if (session->video)
-				xmlnode_set_namespace(payload, NS_GOOGLE_PHONE);
+				xmlnode_set_namespace(payload, NS_GOOGLE_SESSION_PHONE);
 			xmlnode_set_attrib(payload, "id", id);
 			/*
 			 * Hack to make Gmail accept speex as the codec.
@@ -439,9 +437,9 @@
 	desc_element = xmlnode_get_child(sess, "description");
 	xmlns = xmlnode_get_namespace(desc_element);
 
-	if (purple_strequal(xmlns, NS_GOOGLE_PHONE))
+	if (purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
 		session->video = FALSE;
-	else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO))
+	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO))
 		session->video = TRUE;
 	else {
 		purple_debug_error("jabber", "Received initiate with "
@@ -498,7 +496,7 @@
 		id = xmlnode_get_attrib(codec_element, "id");
 
 		if (!session->video ||
-				(xmlns && !strcmp(xmlns, NS_GOOGLE_PHONE))) {
+				(xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_PHONE))) {
 			clock_rate = xmlnode_get_attrib(
 					codec_element, "clockrate");
 			video = FALSE;
@@ -623,7 +621,7 @@
 	GList *codecs = NULL, *video_codecs = NULL;
 	JabberIq *result = NULL;
 	const gchar *xmlns = xmlnode_get_namespace(desc_element);
-	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_VIDEO));
+	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_VIDEO));
 
 	for (; codec_element; codec_element = codec_element->next) {
 		const gchar *xmlns, *encoding_name, *id,
@@ -637,7 +635,7 @@
 		encoding_name =	xmlnode_get_attrib(codec_element, "name");
 		id = xmlnode_get_attrib(codec_element, "id");
 
-		if (!video || purple_strequal(xmlns, NS_GOOGLE_PHONE))
+		if (!video || purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
 			clock_rate = xmlnode_get_attrib(
 					codec_element, "clockrate");
 		else {
@@ -913,7 +911,7 @@
 	purple_debug_misc("jabber",
 		   "Got new mail notification. Sending request for more info\n");
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
 	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
 	query = xmlnode_get_child(iq->node, "query");
 
@@ -947,25 +945,11 @@
 	xmlnode_set_attrib(mailnotifications, "value", "true");
 	jabber_iq_send(iq);
 
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_MAIL_NOTIFY);
 	jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
 	jabber_iq_send(iq);
 }
 
-void jabber_google_roster_init(JabberStream *js)
-{
-	JabberIq *iq;
-	xmlnode *query;
-
-	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
-	query = xmlnode_get_child(iq->node, "query");
-
-	xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
-	xmlnode_set_attrib(query, "gr:ext", "2");
-
-	jabber_iq_send(iq);
-}
-
 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
 {
 	PurpleAccount *account = purple_connection_get_account(js->gc);
@@ -975,7 +959,7 @@
 
 	while (list) {
 		if (!strcmp(jid_norm, (char*)list->data)) {
-			xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
+			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
 			xmlnode_set_attrib(query, "gr:ext", "2");
 			xmlnode_set_attrib(item, "gr:t", "B");
 			return;
@@ -992,7 +976,7 @@
 
 	char *jid_norm;
 
-	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster");
+	const char *grt = xmlnode_get_attrib_with_namespace(item, "t", NS_GOOGLE_ROSTER);
 	const char *subscription = xmlnode_get_attrib(item, "subscription");
 	const char *ask = xmlnode_get_attrib(item, "ask");
 
@@ -1035,9 +1019,9 @@
 	return TRUE;
 }
 
-void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
+void jabber_google_roster_add_deny(JabberStream *js, const char *who)
 {
-	JabberStream *js;
+	PurpleAccount *account;
 	GSList *buddies;
 	JabberIq *iq;
 	xmlnode *query;
@@ -1047,14 +1031,10 @@
 	JabberBuddy *jb;
 	const char *balias;
 
-	js = (JabberStream*)(gc->proto_data);
-
-	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
-		return;
-
 	jb = jabber_buddy_find(js, who, TRUE);
 
-	buddies = purple_find_buddies(js->gc->account, who);
+	account = purple_connection_get_account(js->gc);
+	buddies = purple_find_buddies(account, who);
 	if(!buddies)
 		return;
 
@@ -1081,7 +1061,7 @@
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", balias ? balias : "");
 	xmlnode_set_attrib(item, "gr:t", "B");
-	xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
 	xmlnode_set_attrib(query, "gr:ext", "2");
 
 	jabber_iq_send(iq);
@@ -1101,12 +1081,11 @@
 		}
 	}
 
-	purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL);
+	purple_prpl_got_user_status(account, who, "offline", NULL);
 }
 
-void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who)
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who)
 {
-	JabberStream *js;
 	GSList *buddies;
 	JabberIq *iq;
 	xmlnode *query;
@@ -1115,14 +1094,6 @@
 	PurpleBuddy *b;
 	const char *balias;
 
-	g_return_if_fail(gc != NULL);
-	g_return_if_fail(who != NULL);
-
-	js = (JabberStream*)(gc->proto_data);
-
-	if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
-		return;
-
 	buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
 	if(!buddies)
 		return;
@@ -1149,7 +1120,7 @@
 	balias = purple_buddy_get_local_buddy_alias(b);
 	xmlnode_set_attrib(item, "jid", who);
 	xmlnode_set_attrib(item, "name", balias ? balias : "");
-	xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
+	xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
 	xmlnode_set_attrib(query, "gr:ext", "2");
 
 	jabber_iq_send(iq);
@@ -1401,7 +1372,7 @@
                              xmlnode *packet, gpointer data)
 {
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
-			GOOGLE_JINGLE_INFO_NAMESPACE);
+			NS_GOOGLE_JINGLE_INFO);
 
 	if (query)
 		jabber_google_jingle_info_common(js, from, type, query);
@@ -1421,7 +1392,7 @@
 jabber_google_send_jingle_info(JabberStream *js)
 {
 	JabberIq *jingle_info =
-		jabber_iq_new_query(js, JABBER_IQ_GET, GOOGLE_JINGLE_INFO_NAMESPACE);
+		jabber_iq_new_query(js, JABBER_IQ_GET, NS_GOOGLE_JINGLE_INFO);
 
 	jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
 		NULL);
@@ -1450,7 +1421,7 @@
 	                        NULL, NULL);
 	if (chat) {
 		chat->muc = TRUE;
-		jabber_chat_invite(gc, chat->id, "", buddy->name);
+		jabber_chat_invite(gc, chat->id, "", purple_buddy_get_name(buddy));
 	}
 
 	g_free(room);
--- a/libpurple/protocols/jabber/google.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/google.h	Sat Jan 09 02:00:18 2010 +0000
@@ -25,11 +25,6 @@
  * such that they don't intermingle with code for the XMPP RFCs and XEPs :) */
 
 #include "jabber.h"
-#include "media.h"
-
-#define GOOGLE_VOICE_CAP "http://www.google.com/xmpp/protocol/voice/v1"
-#define GOOGLE_VIDEO_CAP "http://www.google.com/xmpp/protocol/video/v1"
-#define GOOGLE_JINGLE_INFO_NAMESPACE "google:jingleinfo"
 
 #define GOOGLE_GROUPCHAT_SERVER "groupchat.google.com"
 
@@ -37,7 +32,6 @@
 void jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
                        const char *id, xmlnode *new_mail);
 
-void jabber_google_roster_init(JabberStream *js);
 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item);
 
 /* Returns FALSE if this should short-circuit processing of this roster item, or TRUE
@@ -48,8 +42,8 @@
 void jabber_google_presence_incoming(JabberStream *js, const char *who, JabberBuddyResource *jbr);
 char *jabber_google_presence_outgoing(PurpleStatus *tune);
 
-void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who);
-void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who);
+void jabber_google_roster_add_deny(JabberStream *js, const char *who);
+void jabber_google_roster_rem_deny(JabberStream *js, const char *who);
 
 char *jabber_google_format_to_html(const char *text);
 
--- a/libpurple/protocols/jabber/ibb.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/ibb.c	Sat Jan 09 02:00:18 2010 +0000
@@ -228,7 +228,7 @@
 		gchar block_size[10];
 
 		xmlnode_set_attrib(set->node, "to", jabber_ibb_session_get_who(sess));
-		xmlnode_set_namespace(open, XEP_0047_NAMESPACE);
+		xmlnode_set_namespace(open, NS_IBB);
 		xmlnode_set_attrib(open, "sid", jabber_ibb_session_get_sid(sess));
 		g_snprintf(block_size, sizeof(block_size), "%" G_GSIZE_FORMAT,
 			jabber_ibb_session_get_block_size(sess));
@@ -256,7 +256,7 @@
 		xmlnode *close = xmlnode_new("close");
 
 		xmlnode_set_attrib(set->node, "to", jabber_ibb_session_get_who(sess));
-		xmlnode_set_namespace(close, XEP_0047_NAMESPACE);
+		xmlnode_set_namespace(close, NS_IBB);
 		xmlnode_set_attrib(close, "sid", jabber_ibb_session_get_sid(sess));
 		xmlnode_insert_child(set->node, close);
 		jabber_iq_send(set);
@@ -333,7 +333,7 @@
 		g_snprintf(seq, sizeof(seq), "%u", jabber_ibb_session_get_send_seq(sess));
 
 		xmlnode_set_attrib(set->node, "to", jabber_ibb_session_get_who(sess));
-		xmlnode_set_namespace(data_element, XEP_0047_NAMESPACE);
+		xmlnode_set_namespace(data_element, NS_IBB);
 		xmlnode_set_attrib(data_element, "sid", jabber_ibb_session_get_sid(sess));
 		xmlnode_set_attrib(data_element, "seq", seq);
 		xmlnode_insert_data(data_element, base64, -1);
@@ -361,8 +361,7 @@
 	xmlnode *error = xmlnode_new("error");
 	xmlnode *item_not_found = xmlnode_new("item-not-found");
 
-	xmlnode_set_namespace(item_not_found,
-		"urn:ietf:params:xml:ns:xmpp-stanzas");
+	xmlnode_set_namespace(item_not_found, NS_XMPP_STANZAS);
 	xmlnode_set_attrib(error, "code", "440");
 	xmlnode_set_attrib(error, "type", "cancel");
 	jabber_iq_set_id(result, id);
@@ -507,11 +506,11 @@
 {
 	jabber_ibb_sessions = g_hash_table_new(g_str_hash, g_str_equal);
 
-	jabber_add_feature(XEP_0047_NAMESPACE, NULL);
+	jabber_add_feature(NS_IBB, NULL);
 
-	jabber_iq_register_handler("close", XEP_0047_NAMESPACE, jabber_ibb_parse);
-	jabber_iq_register_handler("data", XEP_0047_NAMESPACE, jabber_ibb_parse);
-	jabber_iq_register_handler("open", XEP_0047_NAMESPACE, jabber_ibb_parse);
+	jabber_iq_register_handler("close", NS_IBB, jabber_ibb_parse);
+	jabber_iq_register_handler("data", NS_IBB, jabber_ibb_parse);
+	jabber_iq_register_handler("open", NS_IBB, jabber_ibb_parse);
 }
 
 void
--- a/libpurple/protocols/jabber/ibb.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/ibb.h	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,6 @@
 #include "jabber.h"
 #include "iq.h"
 
-#define XEP_0047_NAMESPACE "http://jabber.org/protocol/ibb"
-
 typedef struct _JabberIBBSession JabberIBBSession;
 
 typedef void
--- a/libpurple/protocols/jabber/iq.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Sat Jan 09 02:00:18 2010 +0000
@@ -155,7 +155,7 @@
 	char *idle_time;
 
 	if(type == JABBER_IQ_GET) {
-		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "jabber:iq:last");
+		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, NS_LAST_ACTIVITY);
 		jabber_iq_set_id(iq, id);
 		if (from)
 			xmlnode_set_attrib(iq->node, "to", from);
@@ -190,7 +190,7 @@
 			xmlnode_set_attrib(iq->node, "to", from);
 
 		child = xmlnode_new_child(iq->node, child->name);
-		xmlnode_set_namespace(child, "urn:xmpp:time");
+		xmlnode_set_namespace(child, NS_ENTITY_TIME);
 
 		/* <tzo>-06:00</tzo> */
 		tm = localtime(&now_t);
@@ -200,7 +200,7 @@
 
 		/* <utc>2006-12-19T17:58:35Z</utc> */
 		tm = gmtime(&now_t);
-		date = purple_utf8_strftime("%FT%TZ", tm);
+		date = purple_utf8_strftime("%Y-%m-%dT%H:%M:%SZ", tm);
 		utc = xmlnode_new_child(child, "utc");
 		xmlnode_insert_data(utc, date, -1);
 
@@ -332,7 +332,7 @@
 			error = xmlnode_new_child(iq->node, "error");
 			xmlnode_set_attrib(error, "type", "modify");
 			x = xmlnode_new_child(error, "bad-request");
-			xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+			xmlnode_set_namespace(x, NS_XMPP_STANZAS);
 
 			jabber_iq_send(iq);
 		} else
@@ -397,7 +397,7 @@
 		xmlnode_set_attrib(error, "type", "cancel");
 		xmlnode_set_attrib(error, "code", "501");
 		x = xmlnode_new_child(error, "feature-not-implemented");
-		xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(x, NS_XMPP_STANZAS);
 
 		jabber_iq_send(iq);
 	}
@@ -458,21 +458,19 @@
 	signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
 	jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
-	jabber_iq_register_handler("mailbox", "google:mail:notify",
+	jabber_iq_register_handler("mailbox", NS_GOOGLE_MAIL_NOTIFY,
 			jabber_gmail_poke);
-	jabber_iq_register_handler("new-mail", "google:mail:notify",
+	jabber_iq_register_handler("new-mail", NS_GOOGLE_MAIL_NOTIFY,
 			jabber_gmail_poke);
-	jabber_iq_register_handler("ping", "urn:xmpp:ping", jabber_ping_parse);
-	jabber_iq_register_handler("query", GOOGLE_JINGLE_INFO_NAMESPACE,
+	jabber_iq_register_handler("ping", NS_PING, jabber_ping_parse);
+	jabber_iq_register_handler("query", NS_GOOGLE_JINGLE_INFO,
 			jabber_google_handle_jingle_info);
-	jabber_iq_register_handler("query", "http://jabber.org/protocol/bytestreams",
+	jabber_iq_register_handler("query", NS_BYTESTREAMS,
 			jabber_bytestreams_parse);
-	jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#info",
-			jabber_disco_info_parse);
-	jabber_iq_register_handler("query", "http://jabber.org/protocol/disco#items",
-			jabber_disco_items_parse);
-	jabber_iq_register_handler("query", "jabber:iq:last", jabber_iq_last_parse);
-	jabber_iq_register_handler("query", "jabber:iq:oob", jabber_oob_parse);
+	jabber_iq_register_handler("query", NS_DISCO_INFO, jabber_disco_info_parse);
+	jabber_iq_register_handler("query", NS_DISCO_ITEMS, jabber_disco_items_parse);
+	jabber_iq_register_handler("query", NS_LAST_ACTIVITY, jabber_iq_last_parse);
+	jabber_iq_register_handler("query", NS_OOB_IQ_DATA, jabber_oob_parse);
 	jabber_iq_register_handler("query", "jabber:iq:register",
 			jabber_register_parse);
 	jabber_iq_register_handler("query", "jabber:iq:roster",
@@ -480,12 +478,12 @@
 	jabber_iq_register_handler("query", "jabber:iq:version",
 			jabber_iq_version_parse);
 #ifdef USE_VV
-	jabber_iq_register_handler("session", "http://www.google.com/session",
+	jabber_iq_register_handler("session", NS_GOOGLE_SESSION,
 		jabber_google_session_parse);
 #endif
-	jabber_iq_register_handler("block", "urn:xmpp:blocking", jabber_blocklist_parse_push);
-	jabber_iq_register_handler("unblock", "urn:xmpp:blocking", jabber_blocklist_parse_push);
-	jabber_iq_register_handler("time", "urn:xmpp:time", jabber_time_parse);
+	jabber_iq_register_handler("block", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+	jabber_iq_register_handler("unblock", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+	jabber_iq_register_handler("time", NS_ENTITY_TIME, jabber_time_parse);
 
 }
 
--- a/libpurple/protocols/jabber/jabber.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jan 09 02:00:18 2010 +0000
@@ -81,8 +81,8 @@
 	char *open_stream;
 
 	open_stream = g_strdup_printf("<stream:stream to='%s' "
-				          "xmlns='jabber:client' "
-						  "xmlns:stream='http://etherx.jabber.org/streams' "
+				          "xmlns='" NS_XMPP_CLIENT "' "
+						  "xmlns:stream='" NS_XMPP_STREAMS "' "
 						  "version='1.0'>",
 						  js->user->domain);
 	/* setup the parser fresh for each stream */
@@ -116,7 +116,7 @@
 	jabber_iq_set_callback(iq, jabber_session_initialized_cb, NULL);
 
 	session = xmlnode_new_child(iq->node, "session");
-	xmlnode_set_namespace(session, "urn:ietf:params:xml:ns:xmpp-session");
+	xmlnode_set_namespace(session, NS_XMPP_SESSION);
 
 	jabber_iq_send(iq);
 }
@@ -128,7 +128,7 @@
 	xmlnode *bind;
 
 	if (type == JABBER_IQ_RESULT &&
-			(bind = xmlnode_get_child_with_namespace(packet, "bind", "urn:ietf:params:xml:ns:xmpp-bind"))) {
+			(bind = xmlnode_get_child_with_namespace(packet, "bind", NS_XMPP_BIND))) {
 		xmlnode *jid;
 		char *full_jid;
 		if((jid = xmlnode_get_child(bind, "jid")) && (full_jid = xmlnode_get_data(jid))) {
@@ -217,7 +217,7 @@
 		char *requested_resource;
 		JabberIq *iq = jabber_iq_new(js, JABBER_IQ_SET);
 		bind = xmlnode_new_child(iq->node, "bind");
-		xmlnode_set_namespace(bind, "urn:ietf:params:xml:ns:xmpp-bind");
+		xmlnode_set_namespace(bind, NS_XMPP_BIND);
 		requested_resource = jabber_prep_resource(js->user->resource);
 
 		if (requested_resource != NULL) {
@@ -229,13 +229,15 @@
 		jabber_iq_set_callback(iq, jabber_bind_result_cb, NULL);
 
 		jabber_iq_send(iq);
+	} else if (xmlnode_get_child_with_namespace(packet, "ver", NS_ROSTER_VERSIONING)) {
+		js->server_caps |= JABBER_CAP_ROSTER_VERSIONING;
 	} else /* if(xmlnode_get_child_with_namespace(packet, "auth")) */ {
 		/* If we get an empty stream:features packet, or we explicitly get
 		 * an auth feature with namespace http://jabber.org/features/iq-auth
 		 * we should revert back to iq:auth authentication, even though we're
 		 * connecting to an XMPP server.  */
-		js->auth_type = JABBER_AUTH_IQ_AUTH;
 		jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING);
+		jabber_auth_start_old(js);
 	}
 }
 
@@ -272,11 +274,11 @@
 	} else if(!strcmp((*packet)->name, "stream:features")) {
 		jabber_stream_features_parse(js, *packet);
 	} else if (!strcmp((*packet)->name, "features") && xmlns &&
-		   !strcmp(xmlns, "http://etherx.jabber.org/streams")) {
+		   !strcmp(xmlns, NS_XMPP_STREAMS)) {
 		jabber_stream_features_parse(js, *packet);
 	} else if(!strcmp((*packet)->name, "stream:error") ||
 			 (!strcmp((*packet)->name, "error") && xmlns &&
-				!strcmp(xmlns, "http://etherx.jabber.org/streams")))
+				!strcmp(xmlns, NS_XMPP_STREAMS)))
 	{
 		jabber_stream_handle_error(js, *packet);
 	} else if(!strcmp((*packet)->name, "challenge")) {
@@ -385,7 +387,7 @@
 		if(js->state != JABBER_STREAM_CONNECTED &&
 				/* Either <auth> or <query><password>... */
 				(((tag_start = strstr(data, "<auth ")) &&
-					strstr(data, "xmlns='urn:ietf:params:xml:ns:xmpp-sasl'")) ||
+					strstr(data, "xmlns='" NS_XMPP_SASL "'")) ||
 				((tag_start = strstr(data, "<query ")) &&
 					strstr(data, "xmlns='jabber:iq:auth'>") &&
 					(tag_start = strstr(tag_start, "<password>"))))) {
@@ -476,12 +478,19 @@
 	if (NULL == packet)
 		return;
 
+	if (!PURPLE_CONNECTION_IS_VALID(pc))
+		return;
+
 	js = purple_connection_get_protocol_data(pc);
+
+	if (NULL == js)
+		return;
+
 	if (js->bosh)
 		if (g_str_equal((*packet)->name, "message") ||
 				g_str_equal((*packet)->name, "iq") ||
 				g_str_equal((*packet)->name, "presence"))
-			xmlnode_set_namespace(*packet, "jabber:client");
+			xmlnode_set_namespace(*packet, NS_XMPP_CLIENT);
 	txt = xmlnode_to_str(*packet, &len);
 	jabber_send_raw(js, txt, len);
 	g_free(txt);
@@ -630,10 +639,11 @@
 	js->srv_query_data = NULL;
 
 	if (responses == NULL) {
+		purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
+				  "methods after failing to connect directly.");
 		purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to find alternative XMPP connection "
-				  "methods after failing to connect directly."));
+				_("Unable to connect"));
 		return;
 	}
 
@@ -1109,7 +1119,8 @@
 
 	if(cbdata->js->registration) {
 		username = g_strdup_printf("%s@%s%s%s", cbdata->js->user->node, cbdata->js->user->domain,
-			cbdata->js->user->resource ? "/" : "", cbdata->js->user->resource);
+			cbdata->js->user->resource ? "/" : "",
+			cbdata->js->user->resource ? cbdata->js->user->resource : "");
 		purple_account_set_username(cbdata->js->gc->account, username);
 		g_free(username);
 	}
@@ -1206,7 +1217,7 @@
 		jabber_x_data_request(js, x, jabber_register_x_data_cb, g_strdup(from));
 		return;
 
-	} else if((x = xmlnode_get_child_with_namespace(query, "x", "jabber:x:oob"))) {
+	} else if((x = xmlnode_get_child_with_namespace(query, "x", NS_OOB_X_DATA))) {
 		xmlnode *url;
 
 		if((url = xmlnode_get_child(x, "url"))) {
@@ -1502,6 +1513,8 @@
 	purple_circ_buffer_destroy(js->write_buffer);
 	if(js->writeh)
 		purple_input_remove(js->writeh);
+	if (js->auth_mech && js->auth_mech->dispose)
+		js->auth_mech->dispose(js);
 #ifdef HAVE_CYRUS_SASL
 	if(js->sasl)
 		sasl_dispose(&js->sasl);
@@ -1578,11 +1591,6 @@
 		case JABBER_STREAM_AUTHENTICATING:
 			purple_connection_update_progress(js->gc, _("Authenticating"),
 					js->gsc ? 7 : 3, JABBER_CONNECT_STEPS);
-			if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) {
-				jabber_register_start(js);
-			} else if(js->auth_type == JABBER_AUTH_IQ_AUTH) {
-				jabber_auth_start_old(js);
-			}
 			break;
 		case JABBER_STREAM_POST_AUTH:
 			purple_connection_update_progress(js->gc, _("Re-initializing Stream"),
@@ -1635,7 +1643,7 @@
 		error = xmlnode_new_child(result->node, "error");
 		xmlnode_set_attrib(error, "type", "cancel");
 		x = xmlnode_new_child(error, "not-allowed");
-		xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(x, NS_XMPP_STANZAS);
 
 		jabber_iq_send(result);
 		return;
@@ -1661,7 +1669,7 @@
 		error = xmlnode_new_child(result->node, "error");
 		xmlnode_set_attrib(error, "type", "modify");
 		x = xmlnode_new_child(error, "bad-request");
-		xmlnode_set_namespace(x, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(x, NS_XMPP_STANZAS);
 
 		jabber_iq_send(result);
 		return;
@@ -1691,7 +1699,7 @@
 	PurpleAccount *account;
 
 	blocklist = xmlnode_get_child_with_namespace(packet,
-			"blocklist", "urn:xmpp:blocking");
+			"blocklist", NS_SIMPLE_BLOCKING);
 	account = purple_connection_get_account(js->gc);
 
 	if (type == JABBER_IQ_ERROR || blocklist == NULL)
@@ -1724,7 +1732,7 @@
 	iq = jabber_iq_new(js, JABBER_IQ_GET);
 
 	blocklist = xmlnode_new_child(iq->node, "blocklist");
-	xmlnode_set_namespace(blocklist, "urn:xmpp:blocking");
+	xmlnode_set_namespace(blocklist, NS_SIMPLE_BLOCKING);
 
 	jabber_iq_set_callback(iq, jabber_blocklist_parse, NULL);
 
@@ -1737,13 +1745,15 @@
 	JabberIq *iq;
 	xmlnode *block, *item;
 
-	js = gc->proto_data;
+	g_return_if_fail(who != NULL && *who != '\0');
+
+	js = purple_connection_get_protocol_data(gc);
 	if (js == NULL)
 		return;
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 	{
-		jabber_google_roster_add_deny(gc, who);
+		jabber_google_roster_add_deny(js, who);
 		return;
 	}
 
@@ -1757,7 +1767,7 @@
 	iq = jabber_iq_new(js, JABBER_IQ_SET);
 
 	block = xmlnode_new_child(iq->node, "block");
-	xmlnode_set_namespace(block, "urn:xmpp:blocking");
+	xmlnode_set_namespace(block, NS_SIMPLE_BLOCKING);
 
 	item = xmlnode_new_child(block, "item");
 	xmlnode_set_attrib(item, "jid", who);
@@ -1771,13 +1781,15 @@
 	JabberIq *iq;
 	xmlnode *unblock, *item;
 
-	js = gc->proto_data;
+	g_return_if_fail(who != NULL && *who != '\0');
+
+	js = purple_connection_get_protocol_data(gc);
 	if (js == NULL)
 		return;
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
 	{
-		jabber_google_roster_rem_deny(gc, who);
+		jabber_google_roster_rem_deny(js, who);
 		return;
 	}
 
@@ -1787,7 +1799,7 @@
 	iq = jabber_iq_new(js, JABBER_IQ_SET);
 
 	unblock = xmlnode_new_child(iq->node, "unblock");
-	xmlnode_set_namespace(unblock, "urn:xmpp:blocking");
+	xmlnode_set_namespace(unblock, NS_SIMPLE_BLOCKING);
 
 	item = xmlnode_new_child(unblock, "item");
 	xmlnode_set_attrib(item, "jid", who);
@@ -2451,7 +2463,7 @@
 		} else if(xmlnode_get_child(error, "undefined-condition")) {
 			text = _("Unknown Error");
 		}
-	} else if(xmlns && !strcmp(xmlns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
+	} else if(xmlns && !strcmp(xmlns, NS_XMPP_SASL)) {
 		/* Most common reason can be the default */
 		SET_REASON(PURPLE_CONNECTION_ERROR_NETWORK_ERROR);
 		if(xmlnode_get_child(packet, "aborted")) {
@@ -2479,7 +2491,7 @@
 		}
 	} else if(!strcmp(packet->name, "stream:error") ||
 			 (!strcmp(packet->name, "error") && xmlns &&
-				!strcmp(xmlns, "http://etherx.jabber.org/streams"))) {
+				!strcmp(xmlns, NS_XMPP_STREAMS))) {
 		/* Most common reason as default: */
 		SET_REASON(PURPLE_CONNECTION_ERROR_NETWORK_ERROR);
 		if(xmlnode_get_child(packet, "bad-format")) {
@@ -2835,7 +2847,7 @@
 		return FALSE;
 	}
 
-	if (jabber_resource_has_capability(jbr, XEP_0224_NAMESPACE)) {
+	if (jabber_resource_has_capability(jbr, NS_ATTENTION)) {
 		xmlnode *buzz, *msg = xmlnode_new("message");
 		gchar *to;
 
@@ -2847,7 +2859,7 @@
 		xmlnode_set_attrib(msg, "type", "headline");
 
 		buzz = xmlnode_new_child(msg, "attention");
-		xmlnode_set_namespace(buzz, XEP_0224_NAMESPACE);
+		xmlnode_set_namespace(buzz, NS_ATTENTION);
 
 		jabber_send(js, msg);
 		xmlnode_free(msg);
@@ -3008,8 +3020,7 @@
 		if (type & PURPLE_MEDIA_AUDIO &&
 				!jabber_resource_has_capability(jbr,
 				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
-				jabber_resource_has_capability(jbr,
-				GOOGLE_VOICE_CAP))
+				jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);
@@ -3178,10 +3189,9 @@
 				caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
 						PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
 		}
-		if (jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP)) {
+		if (jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) {
 			caps |= PURPLE_MEDIA_CAPS_AUDIO;
-			if (jabber_resource_has_capability(jbr,
-					GOOGLE_VIDEO_CAP))
+			if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))
 				caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
 		}
 		return caps;
@@ -3230,6 +3240,12 @@
 		GList *iter;
 		gboolean has_resources_without_caps = FALSE;
 
+		/* if we didn't find a JabberBuddy, we don't have presence for this
+		 buddy, let's assume they can receive files, disco should tell us
+		 when actually trying */
+		if (jb == NULL)
+			return TRUE;
+
 		/* find out if there is any resources without caps */
 		for (iter = jb->resources; iter ; iter = g_list_next(iter)) {
 			JabberBuddyResource *jbr = (JabberBuddyResource *) iter->data;
@@ -3252,9 +3268,8 @@
 				if (jabber_resource_has_capability(jbr,
 						"http://jabber.org/protocol/si/profile/file-transfer")
 			    	&& (jabber_resource_has_capability(jbr,
-			    			"http://jabber.org/protocol/bytestreams")
-			        	|| jabber_resource_has_capability(jbr,
-				           		XEP_0047_NAMESPACE))) {
+			    			NS_BYTESTREAMS)
+			        	|| jabber_resource_has_capability(jbr, NS_IBB))) {
 					return TRUE;
 				}
 			}
@@ -3465,38 +3480,38 @@
 	jabber_add_identity("client", type, NULL, ui_name);
 
 	/* initialize jabber_features list */
-	jabber_add_feature("jabber:iq:last", 0);
-	jabber_add_feature("jabber:iq:oob", 0);
-	jabber_add_feature("urn:xmpp:time", 0);
+	jabber_add_feature(NS_LAST_ACTIVITY, 0);
+	jabber_add_feature(NS_OOB_IQ_DATA, 0);
+	jabber_add_feature(NS_ENTITY_TIME, 0);
 	jabber_add_feature("jabber:iq:version", 0);
 	jabber_add_feature("jabber:x:conference", 0);
-	jabber_add_feature("http://jabber.org/protocol/bytestreams", 0);
+	jabber_add_feature(NS_BYTESTREAMS, 0);
 	jabber_add_feature("http://jabber.org/protocol/caps", 0);
 	jabber_add_feature("http://jabber.org/protocol/chatstates", 0);
-	jabber_add_feature("http://jabber.org/protocol/disco#info", 0);
-	jabber_add_feature("http://jabber.org/protocol/disco#items", 0);
-	jabber_add_feature("http://jabber.org/protocol/ibb", 0);
+	jabber_add_feature(NS_DISCO_INFO, 0);
+	jabber_add_feature(NS_DISCO_ITEMS, 0);
+	jabber_add_feature(NS_IBB, 0);
 	jabber_add_feature("http://jabber.org/protocol/muc", 0);
 	jabber_add_feature("http://jabber.org/protocol/muc#user", 0);
 	jabber_add_feature("http://jabber.org/protocol/si", 0);
 	jabber_add_feature("http://jabber.org/protocol/si/profile/file-transfer", 0);
-	jabber_add_feature("http://jabber.org/protocol/xhtml-im", 0);
-	jabber_add_feature("urn:xmpp:ping", 0);
+	jabber_add_feature(NS_XHTML_IM, 0);
+	jabber_add_feature(NS_PING, 0);
 
 	/* Buzz/Attention */
-	jabber_add_feature(XEP_0224_NAMESPACE, jabber_buzz_isenabled);
+	jabber_add_feature(NS_ATTENTION, jabber_buzz_isenabled);
 
 	/* Bits Of Binary */
-	jabber_add_feature(XEP_0231_NAMESPACE, 0);
+	jabber_add_feature(NS_BOB, 0);
 
 	/* Jingle features! */
 	jabber_add_feature(JINGLE, 0);
 
 #ifdef USE_VV
-	jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled);
-	jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled);
-	jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled);
-	jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled);
+	jabber_add_feature(NS_GOOGLE_PROTOCOL_SESSION, jabber_audio_enabled);
+	jabber_add_feature(NS_GOOGLE_VOICE, jabber_audio_enabled);
+	jabber_add_feature(NS_GOOGLE_VIDEO, jabber_video_enabled);
+	jabber_add_feature(NS_GOOGLE_CAMERA, jabber_video_enabled);
 	jabber_add_feature(JINGLE_APP_RTP, 0);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
@@ -3507,6 +3522,8 @@
 			G_CALLBACK(jabber_caps_broadcast_change), NULL);
 #endif
 
+	jabber_auth_init();
+
 	/* IPC functions */
 	purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),
 							 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,
@@ -3541,6 +3558,7 @@
 {
 	purple_plugin_ipc_unregister_all(plugin);
 
+	jabber_auth_uninit();
 	jabber_features_destroy();
 	jabber_identities_destroy();
 }
--- a/libpurple/protocols/jabber/jabber.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Sat Jan 09 02:00:18 2010 +0000
@@ -47,6 +47,7 @@
 	JABBER_CAP_BLOCKING       = 1 << 13,
 
 	JABBER_CAP_ITEMS          = 1 << 14,
+	JABBER_CAP_ROSTER_VERSIONING = 1 << 15,
 
 	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
@@ -64,6 +65,9 @@
 #include "roomlist.h"
 #include "sslconn.h"
 
+#include "namespaces.h"
+
+#include "auth.h"
 #include "iq.h"
 #include "jutil.h"
 #include "xmlnode.h"
@@ -104,13 +108,9 @@
 		JABBER_PROTO_0_9,
 		JABBER_PROTO_1_0
 	} protocol_version;
-	enum {
-		JABBER_AUTH_UNKNOWN,
-		JABBER_AUTH_DIGEST_MD5,
-		JABBER_AUTH_PLAIN,
-		JABBER_AUTH_IQ_AUTH,
-		JABBER_AUTH_CYRUS
-	} auth_type;
+
+	JabberSaslMech *auth_mech;
+	gpointer auth_mech_data;
 	char *stream_id;
 	JabberStreamState state;
 
--- a/libpurple/protocols/jabber/jingle/jingle.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Sat Jan 09 02:00:18 2010 +0000
@@ -29,12 +29,13 @@
 #include "content.h"
 #include "debug.h"
 #include "jingle.h"
-#include <string.h>
 #include "session.h"
 #include "iceudp.h"
 #include "rawudp.h"
 #include "rtp.h"
 
+#include <string.h>
+
 GType
 jingle_get_type(const gchar *type)
 {
--- a/libpurple/protocols/jabber/jingle/session.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/session.c	Sat Jan 09 02:00:18 2010 +0000
@@ -360,11 +360,15 @@
 JingleSession *
 jingle_session_find_by_sid(JabberStream *js, const gchar *sid)
 {
+	JingleSession *session = NULL;
+
+	if (js->sessions)
+		session = g_hash_table_lookup(js->sessions, sid);
+
 	purple_debug_info("jingle", "find_by_id %s\n", sid);
-	purple_debug_info("jingle", "lookup: %p\n", (js->sessions) ?
-			  g_hash_table_lookup(js->sessions, sid) : NULL);  
-	return (JingleSession *) (js->sessions) ?
-			  g_hash_table_lookup(js->sessions, sid) : NULL;
+	purple_debug_info("jingle", "lookup: %p\n", session);
+
+	return session;
 }
 
 static gboolean find_by_jid_ghr(gpointer key,
@@ -372,7 +376,7 @@
 {
 	JingleSession *session = (JingleSession *)value;
 	const gchar *jid = user_data;
-	gboolean use_bare = g_utf8_strchr(jid, -1, '/') == NULL;
+	gboolean use_bare = strchr(jid, '/') == NULL;
 	gchar *remote_jid = jingle_session_get_remote_jid(session);
 	gchar *cmp_jid = use_bare ? jabber_get_bare_jid(remote_jid)
 				  : g_strdup(remote_jid);
--- a/libpurple/protocols/jabber/jutil.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Sat Jan 09 02:00:18 2010 +0000
@@ -276,6 +276,42 @@
 #endif /* USE_IDN */
 }
 
+char *jabber_saslprep(const char *in)
+{
+#ifdef USE_IDN
+	char *out;
+
+	g_return_val_if_fail(in != NULL, NULL);
+	g_return_val_if_fail(strlen(in) <= sizeof(idn_buffer) - 1, NULL);
+
+	strncpy(idn_buffer, in, sizeof(idn_buffer) - 1);
+	idn_buffer[sizeof(idn_buffer) - 1] = '\0';
+
+	if (STRINGPREP_OK != stringprep(idn_buffer, sizeof(idn_buffer), 0,
+	                                stringprep_saslprep)) {
+		memset(idn_buffer, 0, sizeof(idn_buffer));
+		return NULL;
+	}
+
+	out = g_strdup(idn_buffer);
+	memset(idn_buffer, 0, sizeof(idn_buffer));
+	return out;
+#else /* USE_IDN */
+	/* TODO: Something better than disallowing all non-ASCII characters */
+	/* TODO: Is this even correct? */
+	const guchar *c;
+
+	c = (const guchar *)in;
+	while (*c) {
+		if (*c > 0x7f ||
+				(*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r'))
+			return NULL;
+	}
+
+	return g_strdup(in);
+#endif /* USE_IDN */
+}
+
 static JabberID*
 jabber_id_new_internal(const char *str, gboolean allow_terminating_slash)
 {
@@ -473,6 +509,19 @@
 	}
 }
 
+char *jabber_get_domain(const char *in)
+{
+	JabberID *jid = jabber_id_new(in);
+	char *out;
+
+	if (!jid)
+		return NULL;
+
+	out = g_strdup(jid->domain);
+	jabber_id_free(jid);
+
+	return out;
+}
 
 char *jabber_get_resource(const char *in)
 {
@@ -513,6 +562,20 @@
 	                   NULL);
 }
 
+gboolean
+jabber_jid_is_domain(const char *jid)
+{
+	const char *c;
+
+	for (c = jid; *c; ++c) {
+		if (*c == '@' || *c == '/')
+			return FALSE;
+	}
+
+	return TRUE;
+}
+
+
 JabberID *
 jabber_id_new(const char *str)
 {
--- a/libpurple/protocols/jabber/jutil.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.h	Sat Jan 09 02:00:18 2010 +0000
@@ -35,10 +35,13 @@
 JabberID* jabber_id_new(const char *str);
 void jabber_id_free(JabberID *jid);
 
+char *jabber_get_domain(const char *jid);
 char *jabber_get_resource(const char *jid);
 char *jabber_get_bare_jid(const char *jid);
 char *jabber_id_get_bare_jid(const JabberID *jid);
 
+gboolean jabber_jid_is_domain(const char *jid);
+
 const char *jabber_normalize(const PurpleAccount *account, const char *in);
 
 /* Returns true if JID is the bare JID of our server. */
@@ -51,6 +54,15 @@
 gboolean jabber_domain_validate(const char *);
 gboolean jabber_resourceprep_validate(const char *);
 
+/**
+ * Apply the SASLprep profile of stringprep to the string passed in.
+ *
+ * @returns A newly allocated string containing the normalized version
+ *          of the input, or NULL if an error occurred (the string could
+ *          not be normalized)
+ */
+char *jabber_saslprep(const char *);
+
 PurpleConversation *jabber_find_unnormalized_conv(const char *name, PurpleAccount *account);
 
 char *jabber_calculate_data_sha1sum(gconstpointer data, size_t len);
--- a/libpurple/protocols/jabber/libxmpp.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Sat Jan 09 02:00:18 2010 +0000
@@ -295,7 +295,7 @@
 
 static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable *params)
 {
-	char *acct_id = g_hash_table_lookup(params, "account");
+	char *acct_id = params ? g_hash_table_lookup(params, "account") : NULL;
 	PurpleAccount *acct;
 
 	if (g_ascii_strcasecmp(proto, "xmpp"))
@@ -307,7 +307,8 @@
 		return FALSE;
 
 	/* xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message */
-	if (g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
+	/* params is NULL if the URI has no '?' (or anything after it) */
+	if (!params || g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
 		char *body = g_hash_table_lookup(params, "body");
 		if (user && *user) {
 			PurpleConversation *conv =
--- a/libpurple/protocols/jabber/message.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Sat Jan 09 02:00:18 2010 +0000
@@ -178,7 +178,7 @@
 	for(etc = jm->etc; etc; etc = etc->next) {
 		xmlnode *x = etc->data;
 		const char *xmlns = xmlnode_get_namespace(x);
-		if(xmlns && !strcmp(xmlns, "jabber:x:oob")) {
+		if(xmlns && !strcmp(xmlns, NS_OOB_X_DATA)) {
 			xmlnode *url, *desc;
 			char *urltxt, *desctxt;
 
@@ -460,7 +460,7 @@
 jabber_message_add_remote_smileys(const xmlnode *message)
 {
 	xmlnode *data_tag;
-	for (data_tag = xmlnode_get_child_with_namespace(message, "data", XEP_0231_NAMESPACE) ;
+	for (data_tag = xmlnode_get_child_with_namespace(message, "data", NS_BOB) ;
 		 data_tag ;
 		 data_tag = xmlnode_get_next_twin(data_tag)) {
 		const gchar *cid = xmlnode_get_attrib(data_tag, "cid");
@@ -611,22 +611,22 @@
 				jm->etc = g_list_append(jm->etc, child);
 			/* The following tests expect xmlns != NULL */
 			continue;
-		} else if(!strcmp(child->name, "subject") && !strcmp(xmlns,"jabber:client")) {
+		} else if(!strcmp(child->name, "subject") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->subject) {
 				jm->subject = xmlnode_get_data(child);
 				if(!jm->subject)
 					jm->subject = g_strdup("");
 			}
-		} else if(!strcmp(child->name, "thread") && !strcmp(xmlns,"jabber:client")) {
+		} else if(!strcmp(child->name, "thread") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->thread_id)
 				jm->thread_id = xmlnode_get_data(child);
-		} else if(!strcmp(child->name, "body") && !strcmp(xmlns,"jabber:client")) {
+		} 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);
 				g_free(msg);
 			}
-		} else if(!strcmp(child->name, "html") && !strcmp(xmlns,"http://jabber.org/protocol/xhtml-im")) {
+		} else if(!strcmp(child->name, "html") && !strcmp(xmlns, NS_XHTML_IM)) {
 			if(!jm->xhtml && xmlnode_get_child(child, "body")) {
 				char *c;
 
@@ -740,15 +740,15 @@
 			jm->type = JABBER_MESSAGE_EVENT;
 			for(items = xmlnode_get_child(child,"items"); items; items = items->next)
 				jm->eventitems = g_list_append(jm->eventitems, items);
-		} else if(!strcmp(child->name, "attention") && !strcmp(xmlns, XEP_0224_NAMESPACE)) {
+		} else if(!strcmp(child->name, "attention") && !strcmp(xmlns, NS_ATTENTION)) {
 			jm->hasBuzz = TRUE;
-		} else if(!strcmp(child->name, "delay") && !strcmp(xmlns,"urn:xmpp:delay")) {
+		} else if(!strcmp(child->name, "delay") && !strcmp(xmlns, NS_DELAYED_DELIVERY)) {
 			const char *timestamp = xmlnode_get_attrib(child, "stamp");
 			jm->delayed = TRUE;
 			if(timestamp)
 				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
 		} else if(!strcmp(child->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:delay")) {
+			if(!strcmp(xmlns, NS_DELAYED_DELIVERY_LEGACY)) {
 				const char *timestamp = xmlnode_get_attrib(child, "stamp");
 				jm->delayed = TRUE;
 				if(timestamp)
@@ -800,7 +800,7 @@
 			}
 		} else if (g_str_equal(child->name, "query")) {
 			const char *node = xmlnode_get_attrib(child, "node");
-			if (purple_strequal(xmlns, "http://jabber.org/protocol/disco#items")
+			if (purple_strequal(xmlns, NS_DISCO_ITEMS)
 					&& purple_strequal(node, "http://jabber.org/protocol/commands")) {
 				jabber_adhoc_got_list(js, jm->from, child);
 			}
@@ -946,7 +946,7 @@
 		case PURPLE_CONV_TYPE_IM:
 			jb = jabber_buddy_find(js, who, FALSE);
 			if (jb) {
-				return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE);
+				return jabber_buddy_has_capability(jb, NS_BOB);
 			} else {
 				return FALSE;
 			}
@@ -958,7 +958,7 @@
 				 10 people, to avoid getting too many BoB requests */
 				return jabber_chat_get_num_participants(chat) <= 10 &&
 					jabber_chat_all_participants_have_capability(chat,
-						XEP_0231_NAMESPACE);
+						NS_BOB);
 			} else {
 				return FALSE;
 			}
@@ -1204,9 +1204,9 @@
 	 * the user's roster, allow sending XHTML-IM markup.
 	 */
 	if (!jbr || !jbr->caps.info ||
-			jabber_resource_has_capability(jbr, "http://jabber.org/protocol/xhtml-im")) {
+			jabber_resource_has_capability(jbr, NS_XHTML_IM)) {
 		if (!jabber_xhtml_plain_equal(xhtml, jm->body))
-			jm->xhtml = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", xhtml);
+			jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'>%s</body></html>", xhtml);
 	}
 
 	g_free(xhtml);
@@ -1249,7 +1249,7 @@
 	}
 
 	if (chat->xhtml && !jabber_xhtml_plain_equal(xhtml, jm->body))
-		jm->xhtml = g_strdup_printf("<html xmlns='http://jabber.org/protocol/xhtml-im'><body xmlns='http://www.w3.org/1999/xhtml'>%s</body></html>", xhtml);
+		jm->xhtml = g_strdup_printf("<html xmlns='" NS_XHTML_IM "'><body xmlns='" NS_XHTML "'>%s</body></html>", xhtml);
 
 	g_free(xhtml);
 
--- a/libpurple/protocols/jabber/message.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/message.h	Sat Jan 09 02:00:18 2010 +0000
@@ -28,8 +28,6 @@
 #include "jabber.h"
 #include "xmlnode.h"
 
-#define XEP_0224_NAMESPACE "urn:xmpp:attention:0"
-
 typedef struct _JabberMessage {
 	JabberStream *js;
 	enum {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/namespaces.h	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,105 @@
+/*
+ * purple - Jabber Protocol Plugin
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+#ifndef PURPLE_JABBER_NAMESPACES_H_
+#define PURPLE_JABBER_NAMESPACES_H_
+
+#define NS_XMPP_BIND "urn:ietf:params:xml:ns:xmpp-bind"
+#define NS_XMPP_CLIENT "jabber:client"
+#define NS_XMPP_SASL "urn:ietf:params:xml:ns:xmpp-sasl"
+#define NS_XMPP_SESSION "urn:ietf:params:xml:ns:xmpp-session"
+#define NS_XMPP_STANZAS "urn:ietf:params:xml:ns:xmpp-stanzas"
+#define NS_XMPP_STREAMS "http://etherx.jabber.org/streams"
+
+/* XEP-0012 Last Activity (and XEP-0256 Last Activity in Presence) */
+#define NS_LAST_ACTIVITY "jabber:iq:last"
+
+/* XEP-0030 Service Discovery */
+#define NS_DISCO_INFO "http://jabber.org/protocol/disco#info"
+#define NS_DISCO_ITEMS "http://jabber.org/protocol/disco#items"
+
+/* XEP-0047 IBB (In-band bytestreams) */
+#define NS_IBB "http://jabber.org/protocol/ibb"
+
+/* XEP-0065 SOCKS5 Bytestreams */
+#define NS_BYTESTREAMS "http://jabber.org/protocol/bytestreams"
+
+/* XEP-0066 Out of Band Data (OOB) */
+#define NS_OOB_IQ_DATA "jabber:iq:oob"
+#define NS_OOB_X_DATA  "jabber:x:oob"
+
+/* XEP-0071 XHTML-IM (rich-text messages) */
+#define NS_XHTML_IM "http://jabber.org/protocol/xhtml-im"
+#define NS_XHTML "http://www.w3.org/1999/xhtml"
+
+/* XEP-0084 v0.12 User Avatar */
+#define NS_AVATAR_0_12_DATA     "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
+#define NS_AVATAR_0_12_METADATA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
+
+/* XEP-0084 v1.1 User Avatar */
+#define NS_AVATAR_1_1_DATA      "urn:xmpp:avatar:data"
+#define NS_AVATAR_1_1_METADATA  "urn:xmpp:avatar:metadata"
+
+/* XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH) */
+#define NS_BOSH "http://jabber.org/protocol/httpbind"
+
+/* XEP-0191 Simple Communications Blocking */
+#define NS_SIMPLE_BLOCKING "urn:xmpp:blocking"
+
+/* XEP-0199 Ping */
+#define NS_PING "urn:xmpp:ping"
+
+/* XEP-0202 Entity Time */
+#define NS_ENTITY_TIME "urn:xmpp:time"
+
+/* XEP-0203 Delayed Delivery (and legacy delayed delivery) */
+#define NS_DELAYED_DELIVERY "urn:xmpp:delay"
+#define NS_DELAYED_DELIVERY_LEGACY "jabber:x:delay"
+
+/* XEP-0206 XMPP over BOSH */
+#define NS_XMPP_BOSH "urn:xmpp:xbosh"
+
+/* XEP-0224 Attention */
+#define NS_ATTENTION "urn:xmpp:attention:0"
+
+/* XEP-0231 BoB (Bits of Binary) */
+#define NS_BOB "urn:xmpp:bob"
+
+/* XEP-0237 Roster Versioning */
+#define NS_ROSTER_VERSIONING "urn:xmpp:features:rosterver"
+
+/* 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"
+#define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1"
+#define NS_GOOGLE_JINGLE_INFO "google:jingleinfo"
+
+#define NS_GOOGLE_MAIL_NOTIFY "google:mail:notify"
+#define NS_GOOGLE_ROSTER "google:roster"
+
+#define NS_GOOGLE_PROTOCOL_SESSION "http://www.google.com/xmpp/protocol/session"
+#define NS_GOOGLE_SESSION "http://www.google.com/session"
+#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
+#define NS_GOOGLE_SESSION_VIDEO "http://www.google.com/session/video"
+
+#endif /* PURPLE_JABBER_NAMESPACES_H_ */
--- a/libpurple/protocols/jabber/oob.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/oob.c	Sat Jan 09 02:00:18 2010 +0000
@@ -170,11 +170,11 @@
 	if(!strcmp(code, "406")) {
 		z = xmlnode_new_child(y, "not-acceptable");
 		xmlnode_set_attrib(y, "type", "modify");
-		xmlnode_set_namespace(z, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(z, NS_XMPP_STANZAS);
 	} else if(!strcmp(code, "404")) {
 		z = xmlnode_new_child(y, "not-found");
 		xmlnode_set_attrib(y, "type", "cancel");
-		xmlnode_set_namespace(z, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(z, NS_XMPP_STANZAS);
 	}
 	jabber_iq_send(iq);
 
--- a/libpurple/protocols/jabber/parser.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/parser.c	Sat Jan 09 02:00:18 2010 +0000
@@ -47,9 +47,7 @@
 		js->protocol_version = JABBER_PROTO_0_9;
 		for(i=0; i < nb_attributes * 5; i += 5) {
 			int attrib_len = attributes[i+4] - attributes[i+3];
-			char *attrib = g_malloc(attrib_len + 1);
-			memcpy(attrib, attributes[i+3], attrib_len);
-			attrib[attrib_len] = '\0';
+			char *attrib = g_strndup((gchar *)attributes[i+3], attrib_len);
 
 			if(!xmlStrcmp(attributes[i], (xmlChar*) "version")
 					&& !strcmp(attrib, "1.0")) {
@@ -88,10 +86,7 @@
 			const char *attrib_ns = (const char *)attributes[i+2];
 			char *txt;
 			int attrib_len = attributes[i+4] - attributes[i+3];
-			char *attrib = g_malloc(attrib_len + 1);
-
-			memcpy(attrib, attributes[i+3], attrib_len);
-			attrib[attrib_len] = '\0';
+			char *attrib = g_strndup((gchar *)attributes[i+3], attrib_len);
 
 			txt = attrib;
 			attrib = purple_unescape_html(txt);
@@ -145,13 +140,21 @@
 	JabberStream *js = user_data;
 
 	if (error->level == XML_ERR_WARNING && error->message != NULL
-			&& strcmp(error->message, "xmlns: URI vcard-temp is not absolute\n") == 0)
+			&& g_str_equal(error->message, "xmlns: URI vcard-temp is not absolute\n"))
 		/*
 		 * This message happens when parsing vcards, and is normal, so don't
 		 * bother logging it because people scare easily.
 		 */
 		return;
 
+	if (error->level == XML_ERR_FATAL && error->code == XML_ERR_DOCUMENT_END)
+		/*
+		 * This is probably more annoying than the vcard-temp error; it occurs
+		 * because we disconnect in most cases without waiting for the receiving
+		 * </stream:stream> (limitations of libpurple)
+		 */
+		return;
+
 	purple_debug_error("jabber", "XML parser error for JabberStream %p: "
 								 "Domain %i, code %i, level %i: %s",
 					   js,
@@ -260,8 +263,8 @@
 		 * the opening <stream:stream> and there was no version, we need to
 		 * immediately start legacy IQ auth.
 		 */
-		js->auth_type = JABBER_AUTH_IQ_AUTH;
 		jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING);
+		jabber_auth_start_old(js);
 	}
 }
 
--- a/libpurple/protocols/jabber/ping.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/ping.c	Sat Jan 09 02:00:18 2010 +0000
@@ -74,7 +74,7 @@
 
 	iq = jabber_iq_new(js, JABBER_IQ_GET);
 	ping = xmlnode_new_child(iq->node, "ping");
-	xmlnode_set_namespace(ping, "urn:xmpp:ping");
+	xmlnode_set_namespace(ping, NS_PING);
 
 	jabber_iq_set_callback(iq, jabber_keepalive_pong_cb, NULL);
 	jabber_iq_send(iq);
@@ -90,7 +90,7 @@
 		xmlnode_set_attrib(iq->node, "to", jid);
 
 	ping = xmlnode_new_child(iq->node, "ping");
-	xmlnode_set_namespace(ping, "urn:xmpp:ping");
+	xmlnode_set_namespace(ping, NS_PING);
 
 	jabber_iq_set_callback(iq, jabber_ping_result_cb, NULL);
 	jabber_iq_send(iq);
--- a/libpurple/protocols/jabber/presence.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Jan 09 02:00:18 2010 +0000
@@ -150,7 +150,7 @@
 
 	/* we don't want to send presence before we've gotten our roster */
 	if (js->state != JABBER_STREAM_CONNECTED) {
-		purple_debug_info("jabber", "attempt to send presence before roster retrieved\n");
+		purple_debug_misc("jabber", "attempt to send presence before roster retrieved\n");
 		return;
 	}
 
@@ -297,7 +297,7 @@
 		gchar seconds[10];
 		g_snprintf(seconds, 10, "%d", (int) (time(NULL) - js->idle));
 
-		xmlnode_set_namespace(query, "jabber:iq:last");
+		xmlnode_set_namespace(query, NS_LAST_ACTIVITY);
 		xmlnode_set_attrib(query, "seconds", seconds);
 	}
 
@@ -433,7 +433,7 @@
                                  JabberPresenceCapabilities *userdata)
 {
 	JabberBuddyResource *jbr;
-	char *resource = g_utf8_strchr(userdata->from, -1, '/');
+	char *resource = strchr(userdata->from, '/');
 
 	if (resource)
 		resource += 1;
@@ -466,8 +466,8 @@
 		goto out;
 
 	if (!jbr->commands_fetched && jabber_resource_has_capability(jbr, "http://jabber.org/protocol/commands")) {
-		JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
-		xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", "http://jabber.org/protocol/disco#items");
+		JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, NS_DISCO_ITEMS);
+		xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", NS_DISCO_ITEMS);
 		xmlnode_set_attrib(iq->node, "to", userdata->from);
 		xmlnode_set_attrib(query, "node", "http://jabber.org/protocol/commands");
 		jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL);
@@ -637,7 +637,7 @@
 		} else if(xmlns == NULL) {
 			/* The rest of the cases used to check xmlns individually. */
 			continue;
-		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
+		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, NS_DELAYED_DELIVERY)) {
 			/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
 			delayed = TRUE;
 			stamp = xmlnode_get_attrib(y, "stamp");
@@ -646,7 +646,7 @@
 		} else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) {
 			nickname = xmlnode_get_data(y);
 		} else if(!strcmp(y->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:delay")) {
+			if(!strcmp(xmlns, NS_DELAYED_DELIVERY_LEGACY)) {
 				/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
 				delayed = TRUE;
 				stamp = xmlnode_get_attrib(y, "stamp");
@@ -659,7 +659,7 @@
 				}
 			}
 		} else if (!strcmp(y->name, "query") &&
-			!strcmp(xmlnode_get_namespace(y), "jabber:iq:last")) {
+			!strcmp(xmlnode_get_namespace(y), NS_LAST_ACTIVITY)) {
 			/* resource has specified idle */
 			const gchar *seconds = xmlnode_get_attrib(y, "seconds");
 			if (seconds) {
@@ -961,7 +961,7 @@
 		buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
 									 jid->node ? "@" : "", jid->domain);
 		if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) {
-			if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) {
+			if (jb != js->user_jb) {
 				purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%p)\n",
 									 buddy_name, purple_account_get_username(js->gc->account), js->gc->account);
 				jabber_id_free(jid);
--- a/libpurple/protocols/jabber/roster.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/roster.c	Sat Jan 09 02:00:18 2010 +0000
@@ -47,12 +47,50 @@
 	return g_string_free(out, FALSE);
 }
 
+static void roster_request_cb(JabberStream *js, const char *from,
+                              JabberIqType type, const char *id,
+                              xmlnode *packet, gpointer data)
+{
+	xmlnode *query;
+
+	if (type == JABBER_IQ_ERROR) {
+		/*
+		 * This shouldn't happen in any real circumstances and
+		 * likely constitutes a server-side misconfiguration (i.e.
+		 * explicitly not loading mod_roster...)
+		 */
+		purple_debug_error("jabber", "Error retrieving roster!?\n");
+		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+		return;
+	}
+
+	query = xmlnode_get_child(packet, "query");
+	if (query == NULL) {
+		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+		return;
+	}
+
+	jabber_roster_parse(js, from, type, id, query);
+	jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+}
+
 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");
 
+	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+		xmlnode_set_attrib(query, "gr:ext", "2");
+	}
+
+	jabber_iq_set_callback(iq, roster_request_cb, NULL);
 	jabber_iq_send(iq);
 }
 
@@ -155,6 +193,7 @@
                          JabberIqType type, const char *id, xmlnode *query)
 {
 	xmlnode *item, *group;
+	const char *ver;
 
 	if (!jabber_is_own_account(js, from)) {
 		purple_debug_warning("jabber", "Received bogon roster push from %s\n",
@@ -181,18 +220,18 @@
 			continue;
 
 		if(subscription) {
-			if (jb == js->user_jb)
+			if (g_str_equal(subscription, "remove"))
+				jb->subscription = JABBER_SUB_REMOVE;
+			else if (jb == js->user_jb)
 				jb->subscription = JABBER_SUB_BOTH;
-			else if(!strcmp(subscription, "none"))
+			else if (g_str_equal(subscription, "none"))
 				jb->subscription = JABBER_SUB_NONE;
-			else if(!strcmp(subscription, "to"))
+			else if (g_str_equal(subscription, "to"))
 				jb->subscription = JABBER_SUB_TO;
-			else if(!strcmp(subscription, "from"))
+			else if (g_str_equal(subscription, "from"))
 				jb->subscription = JABBER_SUB_FROM;
-			else if(!strcmp(subscription, "both"))
+			else if (g_str_equal(subscription, "both"))
 				jb->subscription = JABBER_SUB_BOTH;
-			else if(!strcmp(subscription, "remove"))
-				jb->subscription = JABBER_SUB_REMOVE;
 		}
 
 		if(purple_strequal(ask, "subscribe"))
@@ -227,13 +266,13 @@
 		}
 	}
 
-	js->currently_parsing_roster_push = FALSE;
+	ver = xmlnode_get_attrib(query, "ver");
+	if (ver) {
+		 PurpleAccount *account = purple_connection_get_account(js->gc);
+		 purple_account_set_string(account, "roster_ver", ver);
+	}
 
-	/* if we're just now parsing the roster for the first time,
-	 * then now would be the time to declare ourselves connected.
-	 */
-	if (js->state != JABBER_STREAM_CONNECTED)
-		jabber_stream_set_state(js, JABBER_STREAM_CONNECTED);
+	js->currently_parsing_roster_push = FALSE;
 }
 
 /* jabber_roster_update frees the GSList* passed in */
@@ -297,7 +336,7 @@
 
 	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
 		jabber_google_roster_outgoing(js, query, item);
-		xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
+		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
 		xmlnode_set_attrib(query, "gr:ext", "2");
 	}
 	jabber_iq_send(iq);
--- a/libpurple/protocols/jabber/si.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Sat Jan 09 02:00:18 2010 +0000
@@ -144,7 +144,7 @@
 	if(xfer->type == PURPLE_XFER_SEND)
 	{
 		xmlnode *activate;
-		iq = jabber_iq_new_query(jsx->js, JABBER_IQ_SET, "http://jabber.org/protocol/bytestreams");
+		iq = jabber_iq_new_query(jsx->js, JABBER_IQ_SET, NS_BYTESTREAMS);
 		xmlnode_set_attrib(iq->node, "to", streamhost->jid);
 		query = xmlnode_get_child(iq->node, "query");
 		xmlnode_set_attrib(query, "sid", jsx->stream_id);
@@ -155,7 +155,7 @@
 	}
 	else
 	{
-		iq = jabber_iq_new_query(jsx->js, JABBER_IQ_RESULT, "http://jabber.org/protocol/bytestreams");
+		iq = jabber_iq_new_query(jsx->js, JABBER_IQ_RESULT, NS_BYTESTREAMS);
 		xmlnode_set_attrib(iq->node, "to", xfer->who);
 		jabber_iq_set_id(iq, jsx->iq_id);
 		query = xmlnode_get_child(iq->node, "query");
@@ -232,7 +232,7 @@
 		xmlnode_set_attrib(error, "code", "404");
 		xmlnode_set_attrib(error, "type", "cancel");
 		inf = xmlnode_new_child(error, "item-not-found");
-		xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(inf, NS_XMPP_STANZAS);
 
 		jabber_iq_send(iq);
 
@@ -843,8 +843,7 @@
 
 	purple_xfer_unref(xfer);
 
-	iq = jabber_iq_new_query(jsx->js, JABBER_IQ_SET,
-			"http://jabber.org/protocol/bytestreams");
+	iq = jabber_iq_new_query(jsx->js, JABBER_IQ_SET, NS_BYTESTREAMS);
 	xmlnode_set_attrib(iq->node, "to", xfer->who);
 	query = xmlnode_get_child(iq->node, "query");
 
@@ -1214,11 +1213,11 @@
 		if(var && !strcmp(var, "stream-method")) {
 			if((value = xmlnode_get_child(field, "value"))) {
 				char *val = xmlnode_get_data(value);
-				if(val && !strcmp(val, "http://jabber.org/protocol/bytestreams")) {
+				if(val && !strcmp(val, NS_BYTESTREAMS)) {
 					jabber_si_xfer_bytestreams_send_init(xfer);
 					jsx->stream_method |= STREAM_METHOD_BYTESTREAMS;
 					found_method = TRUE;
-				} else if (val && !strcmp(val, XEP_0047_NAMESPACE)) {
+				} else if (val && !strcmp(val, NS_IBB)) {
 					jsx->stream_method |= STREAM_METHOD_IBB;
 					if (!found_method) {
 						/* we haven't tried to init a bytestream session, yet
@@ -1276,10 +1275,10 @@
 		behind troublesome firewalls */
 	option = xmlnode_new_child(field, "option");
 	value = xmlnode_new_child(option, "value");
-	xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
+	xmlnode_insert_data(value, NS_BYTESTREAMS, -1);
 	option = xmlnode_new_child(field, "option");
 	value = xmlnode_new_child(option, "value");
-	xmlnode_insert_data(value, "http://jabber.org/protocol/ibb", -1);
+	xmlnode_insert_data(value, NS_IBB, -1);
 
 	jabber_iq_set_callback(iq, jabber_si_xfer_send_method_cb, xfer);
 
@@ -1380,9 +1379,9 @@
 		error = xmlnode_new_child(iq->node, "error");
 		xmlnode_set_attrib(error, "type", "cancel");
 		child = xmlnode_new_child(error, "forbidden");
-		xmlnode_set_namespace(child, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(child, NS_XMPP_STANZAS);
 		child = xmlnode_new_child(error, "text");
-		xmlnode_set_namespace(child, "urn:ietf:params:xml:ns:xmpp-stanzas");
+		xmlnode_set_namespace(child, NS_XMPP_STANZAS);
 		xmlnode_insert_data(child, "Offer Declined", -1);
 
 		jabber_iq_send(iq);
@@ -1457,10 +1456,10 @@
 	g_free(xfer->who);
 	xfer->who = who;
 
-	if (jbr) {
+	if (jbr && jabber_resource_know_capabilities(jbr)) {
 		char *msg;
 
-		if (jabber_resource_has_capability(jbr, XEP_0047_NAMESPACE))
+		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")) {
 			jabber_si_xfer_send_request(xfer);
@@ -1588,10 +1587,10 @@
 			for people who know their firewalls are very restrictive */
 		if (jsx->stream_method & STREAM_METHOD_BYTESTREAMS) {
 			value = xmlnode_new_child(field, "value");
-			xmlnode_insert_data(value, "http://jabber.org/protocol/bytestreams", -1);
+			xmlnode_insert_data(value, NS_BYTESTREAMS, -1);
 		} else if(jsx->stream_method & STREAM_METHOD_IBB) {
 			value = xmlnode_new_child(field, "value");
-			xmlnode_insert_data(value, "http://jabber.org/protocol/ibb", -1);
+			xmlnode_insert_data(value, NS_IBB, -1);
 		}
 
 		jabber_iq_send(iq);
@@ -1695,9 +1694,9 @@
 				if((value = xmlnode_get_child(option, "value"))) {
 					char *val;
 					if((val = xmlnode_get_data(value))) {
-						if(!strcmp(val, "http://jabber.org/protocol/bytestreams")) {
+						if(!strcmp(val, NS_BYTESTREAMS)) {
 							jsx->stream_method |= STREAM_METHOD_BYTESTREAMS;
-						} else if(!strcmp(val, "http://jabber.org/protocol/ibb")) {
+						} else if(!strcmp(val, NS_IBB)) {
 							jsx->stream_method |= STREAM_METHOD_IBB;
 						}
 						g_free(val);
--- a/libpurple/protocols/jabber/useravatar.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/useravatar.h	Sat Jan 09 02:00:18 2010 +0000
@@ -29,12 +29,6 @@
 
 /* Implementation of XEP-0084 */
 
-#define NS_AVATAR_0_12_DATA     "http://www.xmpp.org/extensions/xep-0084.html#ns-data"
-#define NS_AVATAR_0_12_METADATA "http://www.xmpp.org/extensions/xep-0084.html#ns-metadata"
-
-#define NS_AVATAR_1_1_DATA      "urn:xmpp:avatar:data"
-#define NS_AVATAR_1_1_METADATA  "urn:xmpp:avatar:metadata"
-
 void jabber_avatar_init(void);
 void jabber_avatar_set(JabberStream *js, PurpleStoredImage *img);
 
--- a/libpurple/protocols/jabber/usermood.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Sat Jan 09 02:00:18 2010 +0000
@@ -33,6 +33,7 @@
 static const char * const moodstrings[] = {
 	"afraid",
 	"amazed",
+	"amorous",
 	"angry",
 	"annoyed",
 	"anxious",
@@ -41,22 +42,31 @@
 	"bored",
 	"brave",
 	"calm",
+	"cautious",
 	"cold",
+	"confident",
 	"confused",
+	"contemplative",
 	"contented",
 	"cranky",
+	"crazy",
+	"creative",
 	"curious",
+	"dejected",
 	"depressed",
 	"disappointed",
 	"disgusted",
+	"dismayed",
 	"distracted",
 	"embarrassed",
+	"envious",
 	"excited",
 	"flirtatious",
 	"frustrated",
 	"grumpy",
 	"guilty",
 	"happy",
+	"hopeful",
 	"hot",
 	"humbled",
 	"humiliated",
@@ -71,13 +81,16 @@
 	"invincible",
 	"jealous",
 	"lonely",
+	"lucky",
 	"mean",
 	"moody",
 	"nervous",
 	"neutral",
 	"offended",
+	"outraged",
 	"playful",
 	"proud",
+	"relaxed",
 	"relieved",
 	"remorseful",
 	"restless",
@@ -88,20 +101,29 @@
 	"shy",
 	"sick",
 	"sleepy",
+	"spontaneous",
 	"stressed",
+	"strong",
 	"surprised",
+	"thankful",
 	"thirsty",
-	"worried",
-	NULL
+	"tired",
+	"weak",
+	"worried"
 };
 
-static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) {
-	/* it doesn't make sense to have more than one item here, so let's just pick the first one */
-	xmlnode *item = xmlnode_get_child(items, "item");
+static void
+jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items)
+{
+	xmlnode *item;
+	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
 	const char *newmood = NULL;
 	char *moodtext = NULL;
-	JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE);
-	xmlnode *moodinfo, *mood;
+	xmlnode *child, *mood;
+
+	/* it doesn't make sense to have more than one item here, so let's just pick the first one */
+	item = xmlnode_get_child(items, "item");
+
 	/* ignore the mood of people not on our buddy list */
 	if (!buddy || !item)
 		return;
@@ -109,35 +131,39 @@
 	mood = xmlnode_get_child_with_namespace(item, "mood", "http://jabber.org/protocol/mood");
 	if (!mood)
 		return;
-	for (moodinfo = mood->child; moodinfo; moodinfo = moodinfo->next) {
-		if (moodinfo->type == XMLNODE_TYPE_TAG) {
-			if (!strcmp(moodinfo->name, "text")) {
-				if (!moodtext) /* only pick the first one */
-					moodtext = xmlnode_get_data(moodinfo);
-			} else {
-				int i;
-				for (i = 0; moodstrings[i]; ++i) {
-					/* verify that the mood is known (valid) */
-					if (!strcmp(moodinfo->name, moodstrings[i])) {
-						newmood = moodstrings[i];
-						break;
-					}
+	for (child = mood->child; child; child = child->next) {
+		if (child->type != XMLNODE_TYPE_TAG)
+			continue;
+
+		if (g_str_equal("text", child->name) && moodtext == NULL)
+				moodtext = xmlnode_get_data(child);
+		else {
+			int i;
+			for (i = 0; i < G_N_ELEMENTS(moodstrings); ++i) {
+				/* verify that the mood is known (valid) */
+				if (g_str_equal(child->name, moodstrings[i])) {
+					newmood = moodstrings[i];
+					break;
 				}
 			}
-			if (newmood != NULL && moodtext != NULL)
-			   break;
 		}
+		if (newmood != NULL && moodtext != NULL)
+		   break;
 	}
 	if (newmood != NULL) {
+		PurpleAccount *account;
 		const char *status_id;
 		JabberBuddyResource *resource = jabber_buddy_find_resource(buddy, NULL);
-		if(!resource) { /* huh? */
+		if (!resource) { /* huh? */
 			g_free(moodtext);
 			return;
 		}
 		status_id = jabber_buddy_state_get_status_id(resource->state);
 
-		purple_prpl_got_user_status(js->gc->account, from, status_id, "mood", _(newmood), "moodtext", moodtext?moodtext:"", NULL);
+		account = purple_connection_get_account(js->gc);
+		purple_prpl_got_user_status(account, from, status_id, "mood",
+		                            _(newmood), "moodtext",
+		                            moodtext ? moodtext : "", NULL);
 	}
 	g_free(moodtext);
 }
@@ -149,7 +175,6 @@
 
 static void do_mood_set_from_fields(PurpleConnection *gc, PurpleRequestFields *fields) {
 	JabberStream *js;
-	const int max_mood_idx = sizeof(moodstrings) / sizeof(moodstrings[0]) - 1;
 	int selected_mood = purple_request_fields_get_choice(fields, "mood");
 
 	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
@@ -159,7 +184,7 @@
 
 	js = gc->proto_data;
 
-	if (selected_mood < 0 || selected_mood >= max_mood_idx) {
+	if (selected_mood < 0 || selected_mood >= G_N_ELEMENTS(moodstrings)) {
 		purple_debug_error("jabber", "Invalid mood index (%d) selected.\n", selected_mood);
 		return;
 	}
@@ -182,7 +207,7 @@
 	field = purple_request_field_choice_new("mood",
 											_("Mood"), 0);
 
-	for(i = 0; moodstrings[i]; ++i)
+	for(i = 0; i < G_N_ELEMENTS(moodstrings); ++i)
 		purple_request_field_choice_add(field, _(moodstrings[i]));
 
 	purple_request_field_set_required(field, TRUE);
--- a/libpurple/protocols/msn/contact.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Sat Jan 09 02:00:18 2010 +0000
@@ -702,12 +702,15 @@
 		type = xmlnode_get_data(contactType);
 
 		/*setup the Display Name*/
-		if (type && !strcmp(type, "Me")){
-			char *friendly = NULL;
-			if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
-				friendly = xmlnode_get_data(displayName);
-			purple_connection_set_display_name(session->account->gc, friendly ? purple_url_decode(friendly) : NULL);
-			g_free(friendly);
+		if (type && !strcmp(type, "Me")) {
+			if (purple_connection_get_display_name(pc) == NULL) {
+				char *friendly = NULL;
+				if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
+					friendly = xmlnode_get_data(displayName);
+				purple_connection_set_display_name(pc,
+					friendly ? purple_url_decode(friendly) : NULL);
+				g_free(friendly);
+			}
 			continue; /* Not adding own account as buddy to buddylist */
 		}
 
--- a/libpurple/protocols/msn/msn.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,6 @@
  */
 #define PHOTO_SUPPORT 1
 
-#include <glib.h>
-
 #include "msn.h"
 #include "accountopt.h"
 #include "contact.h"
@@ -347,17 +345,23 @@
 msn_show_set_friendly_name(PurplePluginAction *action)
 {
 	PurpleConnection *gc;
+	PurpleAccount *account;
+	char *tmp;
 
 	gc = (PurpleConnection *) action->context;
-
-	purple_request_input(gc, NULL, _("Set your friendly name."),
+	account = purple_connection_get_account(gc);
+
+	tmp = g_strdup_printf(_("Set friendly name for %s."),
+	                      purple_account_get_username(account));
+	purple_request_input(gc, _("Set your friendly name."), tmp,
 					   _("This is the name that other MSN buddies will "
 						 "see you as."),
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_act_id),
 					   _("Cancel"), NULL,
-					   purple_connection_get_account(gc), NULL, NULL,
+					   account, NULL, NULL,
 					   gc);
+	g_free(tmp);
 }
 
 static void
@@ -1064,6 +1068,9 @@
 	if (strcmp(username, purple_account_get_username(account)))
 		purple_account_set_username(account, username);
 
+	username = purple_account_get_string(account, "display-name", NULL);
+	purple_connection_set_display_name(gc, username);
+
 	if (!msn_session_connect(session, host, port, http_method))
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
--- a/libpurple/protocols/msn/msn.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/msn.h	Sat Jan 09 02:00:18 2010 +0000
@@ -90,39 +90,50 @@
 
 typedef enum
 {
-	MSN_CLIENT_CAP_WIN_MOBILE = 0x000001,
-	MSN_CLIENT_CAP_INK_GIF    = 0x000004,
-	MSN_CLIENT_CAP_INK_ISF    = 0x000008,
-	MSN_CLIENT_CAP_VIDEO_CHAT = 0x000010,
-	MSN_CLIENT_CAP_PACKET     = 0x000020,
-	MSN_CLIENT_CAP_MSNMOBILE  = 0x000040,
-	MSN_CLIENT_CAP_MSNDIRECT  = 0x000080,
-	MSN_CLIENT_CAP_WEBMSGR    = 0x000200,
-	MSN_CLIENT_CAP_TGW        = 0x000800,
-	MSN_CLIENT_CAP_SPACE      = 0x001000,
-	MSN_CLIENT_CAP_MCE        = 0x002000,
-	MSN_CLIENT_CAP_DIRECTIM   = 0x004000,
-	MSN_CLIENT_CAP_WINKS      = 0x008000,
-	MSN_CLIENT_CAP_SEARCH     = 0x010000,
-	MSN_CLIENT_CAP_BOT        = 0x020000,
-	MSN_CLIENT_CAP_VOICEIM    = 0x040000,
-	MSN_CLIENT_CAP_SCHANNEL   = 0x080000,
-	MSN_CLIENT_CAP_SIP_INVITE = 0x100000,
-	MSN_CLIENT_CAP_SDRIVE     = 0x400000
+	MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001,
+	MSN_CLIENT_CAP_INK_GIF    = 0x0000004,
+	MSN_CLIENT_CAP_INK_ISF    = 0x0000008,
+	MSN_CLIENT_CAP_VIDEO_CHAT = 0x0000010,
+	MSN_CLIENT_CAP_PACKET     = 0x0000020,
+	MSN_CLIENT_CAP_MSNMOBILE  = 0x0000040,
+	MSN_CLIENT_CAP_MSNDIRECT  = 0x0000080,
+	MSN_CLIENT_CAP_WEBMSGR    = 0x0000200,
+	MSN_CLIENT_CAP_TGW        = 0x0000800,
+	MSN_CLIENT_CAP_SPACE      = 0x0001000,
+	MSN_CLIENT_CAP_MCE        = 0x0002000,
+	MSN_CLIENT_CAP_DIRECTIM   = 0x0004000,
+	MSN_CLIENT_CAP_WINKS      = 0x0008000,
+	MSN_CLIENT_CAP_SEARCH     = 0x0010000,
+	MSN_CLIENT_CAP_BOT        = 0x0020000,
+	MSN_CLIENT_CAP_VOICEIM    = 0x0040000,
+	MSN_CLIENT_CAP_SCHANNEL   = 0x0080000,
+	MSN_CLIENT_CAP_SIP_INVITE = 0x0100000,
+	MSN_CLIENT_CAP_SDRIVE     = 0x0400000,
+	MSN_CLIENT_CAP_ONECARE    = 0x1000000,
+	MSN_CLIENT_CAP_P2P_TURN   = 0x2000000,
+	MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
 
 } MsnClientCaps;
 
 typedef enum
 {
-	MSN_CLIENT_VER_5_0 = 0x00,
-	MSN_CLIENT_VER_6_0 = 0x10,	/* MSNC1 */
-	MSN_CLIENT_VER_6_1 = 0x20,	/* MSNC2 */
-	MSN_CLIENT_VER_6_2 = 0x30,	/* MSNC3 */
-	MSN_CLIENT_VER_7_0 = 0x40,	/* MSNC4 */
-	MSN_CLIENT_VER_7_5 = 0x50,	/* MSNC5 */
-	MSN_CLIENT_VER_8_0 = 0x60,	/* MSNC6 */
-	MSN_CLIENT_VER_8_1 = 0x70,	/* MSNC7 */
-	MSN_CLIENT_VER_8_5 = 0x80	/* MSNC8 */
+	MSN_CLIENT_EXT_CAP_RTC_VIDEO = 0x10,
+	MSN_CLIENT_EXT_CAP_P2PV2     = 0x20
+} MsnClientExtCaps;
+
+typedef enum
+{
+	MSN_CLIENT_VER_5_0  = 0x00,
+	MSN_CLIENT_VER_6_0  = 0x10,	/* MSNC1 */
+	MSN_CLIENT_VER_6_1  = 0x20,	/* MSNC2 */
+	MSN_CLIENT_VER_6_2  = 0x30,	/* MSNC3 */
+	MSN_CLIENT_VER_7_0  = 0x40,	/* MSNC4 */
+	MSN_CLIENT_VER_7_5  = 0x50,	/* MSNC5 */
+	MSN_CLIENT_VER_8_0  = 0x60,	/* MSNC6 */
+	MSN_CLIENT_VER_8_1  = 0x70,	/* MSNC7 */
+	MSN_CLIENT_VER_8_5  = 0x80,	/* MSNC8 */
+	MSN_CLIENT_VER_9_0  = 0x90,	/* MSNC9 */
+	MSN_CLIENT_VER_14_0 = 0xA0	/* MSNC10 */
 
 } MsnClientVerId;
 
@@ -133,6 +144,8 @@
 	((MSN_CLIENT_ID_VERSION    << 24) | \
 	 (MSN_CLIENT_ID_CAPABILITIES))
 
+#define MSN_CLIENT_EXT_ID 0
+
 gboolean msn_email_is_valid(const char *passport);
 void msn_act_id(PurpleConnection *gc, const char *entry);
 void msn_send_privacy(PurpleConnection *gc);
--- a/libpurple/protocols/msn/notification.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1408,6 +1408,7 @@
 				purple_connection_set_display_name(
 					purple_account_get_connection(session->account),
 					friendlyname);
+				purple_account_set_string(session->account, "display-name", friendlyname);
 			}
 		}
 	}
--- a/libpurple/protocols/msn/object.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/object.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,6 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "msn.h"
 #include "object.h"
 #include "debug.h"
 /* Sha1 stuff */
--- a/libpurple/protocols/msn/slp.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Sat Jan 09 02:00:18 2010 +0000
@@ -126,22 +126,60 @@
 			g_free(content);
 			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
 
-			msn_slpcall_destroy(slpcall);
+			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
+				slpcall->wasted = TRUE;
+			else
+				msn_slpcall_destroy(slpcall);
 		}
 	}
 }
 
-void
-msn_xfer_progress_cb(MsnSlpCall *slpcall, gsize total_length, gsize len, gsize offset)
+gssize
+msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer)
 {
-	PurpleXfer *xfer;
+	MsnSlpCall *slpcall;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+	g_return_val_if_fail(len > 0, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_SEND, -1);
+
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
+
+	g_return_val_if_fail(slpcall->xfer_msg != NULL, -1);
+
+	slpcall->u.outgoing.len = len;
+	slpcall->u.outgoing.data = data;
+	msn_slplink_send_msgpart(slpcall->slplink, slpcall->xfer_msg);
+	return MIN(1202, len);
+}
 
-	xfer = slpcall->xfer;
+gssize
+msn_xfer_read(guchar **data, PurpleXfer *xfer)
+{
+	MsnSlpCall *slpcall;
+	gsize len;
+
+	g_return_val_if_fail(xfer != NULL, -1);
+	g_return_val_if_fail(data != NULL, -1);
+
+	g_return_val_if_fail(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE, -1);
 
-	xfer->bytes_sent = (offset + len);
-	xfer->bytes_remaining = total_length - (offset + len);
+	slpcall = xfer->data;
+	/* Not sure I trust it'll be there */
+	g_return_val_if_fail(slpcall != NULL, -1);
 
-	purple_xfer_update_progress(xfer);
+	/* Just pass up the whole GByteArray. We'll make another. */
+	*data = slpcall->u.incoming_data->data;
+	len = slpcall->u.incoming_data->len;
+
+	g_byte_array_free(slpcall->u.incoming_data, FALSE);
+	slpcall->u.incoming_data = g_byte_array_new();
+
+	return len;
 }
 
 void
@@ -332,9 +370,7 @@
 
 		account = slpcall->slplink->session->account;
 
-		slpcall->cb = msn_xfer_completed_cb;
 		slpcall->end_cb = msn_xfer_end_cb;
-		slpcall->progress_cb = msn_xfer_progress_cb;
 		slpcall->branch = g_strdup(branch);
 
 		slpcall->pending = TRUE;
@@ -357,6 +393,10 @@
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
 			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);
 			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
+			purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+			purple_xfer_set_write_fnc(xfer, msn_xfer_write);
+
+			slpcall->u.incoming_data = g_byte_array_new();
 
 			slpcall->xfer = xfer;
 			purple_xfer_ref(slpcall->xfer);
--- a/libpurple/protocols/msn/slp.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slp.h	Sat Jan 09 02:00:18 2010 +0000
@@ -29,9 +29,6 @@
 #include "internal.h"
 #include "ft.h"
 
-void msn_xfer_progress_cb(MsnSlpCall *slpcall, gsize total_length, gsize
-						  len, gsize offset);
-
 MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
 							  const char *body);
 
@@ -41,6 +38,9 @@
 						   const guchar *body, gsize size);
 
 void msn_xfer_cancel(PurpleXfer *xfer);
+gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
+gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
+
 void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
 
 void msn_queue_buddy_icon_request(MsnUser *user);
--- a/libpurple/protocols/msn/slpcall.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Sat Jan 09 02:00:18 2010 +0000
@@ -105,10 +105,13 @@
 		slpcall->end_cb(slpcall, slpcall->slplink->session);
 
 	if (slpcall->xfer != NULL) {
+		if (purple_xfer_get_type(slpcall->xfer) == PURPLE_XFER_RECEIVE)
+			g_byte_array_free(slpcall->u.incoming_data, TRUE);
 		slpcall->xfer->data = NULL;
 		purple_xfer_unref(slpcall->xfer);
 	}
 
+
 	msn_slplink_remove_slpcall(slpcall->slplink, slpcall);
 
 	g_free(slpcall->id);
@@ -272,7 +275,8 @@
 				slpcall->timer = 0;
 			}
 
-			slpcall->cb(slpcall, body, body_len);
+			if (slpcall->cb)
+				slpcall->cb(slpcall, body, body_len);
 
 			slpcall->wasted = TRUE;
 		}
--- a/libpurple/protocols/msn/slpcall.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.h	Sat Jan 09 02:00:18 2010 +0000
@@ -72,6 +72,14 @@
 	char *data_info;
 
 	PurpleXfer *xfer;
+	union {
+		GByteArray *incoming_data;
+		struct {
+			gsize len;
+			const guchar *data;
+		} outgoing;
+	} u;
+	MsnSlpMessage *xfer_msg; /* A dirty hack */
 
 	MsnSlpCb cb;
 	void (*end_cb)(MsnSlpCall *slpcall, MsnSession *session);
--- a/libpurple/protocols/msn/slplink.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sat Jan 09 02:00:18 2010 +0000
@@ -232,7 +232,7 @@
 	}
 }
 
-static void
+void
 msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
 {
 	MsnMessage *msg;
@@ -247,11 +247,11 @@
 
 	if (slpmsg->offset < real_size)
 	{
-		if (slpmsg->fp)
+		if (slpmsg->slpcall && slpmsg->slpcall->xfer && purple_xfer_get_type(slpmsg->slpcall->xfer) == PURPLE_XFER_SEND &&
+				purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
 		{
-			char data[1202];
-			len = fread(data, 1, sizeof(data), slpmsg->fp);
-			msn_message_set_bin_data(msg, data, len);
+			len = MIN(1202, slpmsg->slpcall->u.outgoing.len);
+			msn_message_set_bin_data(msg, slpmsg->slpcall->u.outgoing.data, len);
 		}
 		else
 		{
@@ -309,7 +309,13 @@
 
 	if (slpmsg->offset < real_size)
 	{
-		msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
+		if (slpmsg->slpcall->xfer && purple_xfer_get_status(slpmsg->slpcall->xfer) == PURPLE_XFER_STATUS_STARTED)
+		{
+			slpmsg->slpcall->xfer_msg = slpmsg;
+			purple_xfer_prpl_ready(slpmsg->slpcall->xfer);
+		}
+		else
+			msn_slplink_send_msgpart(slpmsg->slplink, slpmsg);
 	}
 	else
 	{
@@ -448,20 +454,22 @@
 send_file_cb(MsnSlpCall *slpcall)
 {
 	MsnSlpMessage *slpmsg;
-	struct stat st;
 	PurpleXfer *xfer;
 
+	xfer = (PurpleXfer *)slpcall->xfer;
+	purple_xfer_ref(xfer);
+	purple_xfer_start(xfer, -1, NULL, 0);
+	if (purple_xfer_get_status(xfer) != PURPLE_XFER_STATUS_STARTED) {
+		purple_xfer_unref(xfer);
+		return;
+	}
+	purple_xfer_unref(xfer);
+
 	slpmsg = msn_slpmsg_new(slpcall->slplink);
 	slpmsg->slpcall = slpcall;
 	slpmsg->flags = 0x1000030;
 	slpmsg->info = "SLP FILE";
-
-	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
-	slpmsg->fp = xfer->dest_fp;
-	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
-		slpmsg->size = st.st_size;
-	xfer->dest_fp = NULL; /* Disable double fclose() */
+	slpmsg->size = purple_xfer_get_size(xfer);
 
 	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
 }
@@ -489,6 +497,7 @@
 	const char *data;
 	guint64 offset;
 	gsize len;
+	PurpleXfer *xfer = NULL;
 
 	if (purple_debug_is_verbose())
 		msn_slpmsg_show(msg);
@@ -525,12 +534,12 @@
 				if (slpmsg->flags == 0x20 ||
 				    slpmsg->flags == 0x1000020 || slpmsg->flags == 0x1000030)
 				{
-					PurpleXfer *xfer;
-
 					xfer = slpmsg->slpcall->xfer;
-
 					if (xfer != NULL)
 					{
+						slpmsg->ft = TRUE;
+						slpmsg->slpcall->xfer_msg = slpmsg;
+
 						purple_xfer_ref(xfer);
 						purple_xfer_start(xfer,	-1, NULL, 0);
 
@@ -540,14 +549,12 @@
 							g_return_if_reached();
 						} else {
 							purple_xfer_unref(xfer);
-							slpmsg->fp = xfer->dest_fp;
-							xfer->dest_fp = NULL; /* Disable double fclose() */
 						}
 					}
 				}
 			}
 		}
-		if (!slpmsg->fp && slpmsg->size)
+		if (!slpmsg->ft && slpmsg->size)
 		{
 			slpmsg->buffer = g_try_malloc(slpmsg->size);
 			if (slpmsg->buffer == NULL)
@@ -569,10 +576,12 @@
 		}
 	}
 
-	if (slpmsg->fp)
+	if (slpmsg->ft)
 	{
-		/* fseek(slpmsg->fp, offset, SEEK_SET); */
-		len = fwrite(data, 1, len, slpmsg->fp);
+		xfer = slpmsg->slpcall->xfer;
+		slpmsg->slpcall->u.incoming_data =
+				g_byte_array_append(slpmsg->slpcall->u.incoming_data, (const guchar *)data, len);
+		purple_xfer_prpl_ready(xfer);
 	}
 	else if (slpmsg->size && slpmsg->buffer)
 	{
@@ -613,29 +622,37 @@
 
 		slpcall = msn_slp_process_msg(slplink, slpmsg);
 
-		if (slpmsg->flags == 0x100)
-		{
-			MsnDirectConn *directconn;
+		if (slpcall == NULL) {
+			msn_slpmsg_destroy(slpmsg);
+			return;
+		}
 
-			directconn = slplink->directconn;
+		if (!slpcall->wasted) {
+			if (slpmsg->flags == 0x100)
+			{
+				MsnDirectConn *directconn;
+
+				directconn = slplink->directconn;
 #if 0
-			if (!directconn->acked)
-				msn_directconn_send_handshake(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 */
+			}
+			else if (slpmsg->flags == 0x00 || slpmsg->flags == 0x1000000 ||  
+			         slpmsg->flags == 0x20 || slpmsg->flags == 0x1000020 ||  
+			         slpmsg->flags == 0x1000030)
+			{
+				/* Release all the messages and send the ACK */
 
-			msn_slplink_send_ack(slplink, msg);
-			msn_slplink_send_queued_slpmsgs(slplink);
+				msn_slplink_send_ack(slplink, msg);
+				msn_slplink_send_queued_slpmsgs(slplink);
+			}
+
 		}
 
 		msn_slpmsg_destroy(slpmsg);
 
-		if (slpcall != NULL && slpcall->wasted)
+		if (slpcall->wasted)
 			msn_slpcall_destroy(slpcall);
 	}
 }
@@ -732,7 +749,6 @@
 
 	slpcall->session_init_cb = send_file_cb;
 	slpcall->end_cb = msn_xfer_end_cb;
-	slpcall->progress_cb = msn_xfer_progress_cb;
 	slpcall->cb = msn_xfer_completed_cb;
 	slpcall->xfer = xfer;
 	purple_xfer_ref(slpcall->xfer);
@@ -740,6 +756,8 @@
 	slpcall->pending = TRUE;
 
 	purple_xfer_set_cancel_send_fnc(xfer, msn_xfer_cancel);
+	purple_xfer_set_read_fnc(xfer, msn_xfer_read);
+	purple_xfer_set_write_fnc(xfer, msn_xfer_write);
 
 	xfer->data = slpcall;
 
--- a/libpurple/protocols/msn/slplink.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slplink.h	Sat Jan 09 02:00:18 2010 +0000
@@ -84,6 +84,9 @@
 void msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg);
 void msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer);
 
+/* Only exported for msn_xfer_write */
+void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg);
+
 void msn_slplink_request_object(MsnSlpLink *slplink,
 								const char *info,
 								MsnSlpCb cb,
--- a/libpurple/protocols/msn/slpmsg.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slpmsg.c	Sat Jan 09 02:00:18 2010 +0000
@@ -60,9 +60,6 @@
 
 	slplink = slpmsg->slplink;
 
-	if (slpmsg->fp != NULL)
-		fclose(slpmsg->fp);
-
 	purple_imgstore_unref(slpmsg->img);
 
 	/* We don't want to free the data of the PurpleStoredImage,
@@ -96,7 +93,7 @@
 	/* We can only have one data source at a time. */
 	g_return_if_fail(slpmsg->buffer == NULL);
 	g_return_if_fail(slpmsg->img == NULL);
-	g_return_if_fail(slpmsg->fp == NULL);
+	g_return_if_fail(slpmsg->ft == FALSE);
 
 	if (body != NULL)
 		slpmsg->buffer = g_memdup(body, size);
@@ -112,7 +109,7 @@
 	/* We can only have one data source at a time. */
 	g_return_if_fail(slpmsg->buffer == NULL);
 	g_return_if_fail(slpmsg->img == NULL);
-	g_return_if_fail(slpmsg->fp == NULL);
+	g_return_if_fail(slpmsg->ft == FALSE);
 
 	slpmsg->img = purple_imgstore_ref(img);
 	slpmsg->buffer = (guchar *)purple_imgstore_get_data(img);
--- a/libpurple/protocols/msn/slpmsg.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Sat Jan 09 02:00:18 2010 +0000
@@ -54,7 +54,7 @@
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
 	long flags;
 
-	FILE *fp;
+	gboolean ft;
 	PurpleStoredImage *img;
 	guchar *buffer;
 	long long offset;
--- a/libpurple/protocols/msn/switchboard.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Jan 09 02:00:18 2010 +0000
@@ -222,13 +222,28 @@
 {
 	MsnCmdProc *cmdproc;
 	PurpleAccount *account;
+	char *semicolon;
+	char *passport;
 
 	g_return_if_fail(swboard != NULL);
 
 	cmdproc = swboard->cmdproc;
 	account = cmdproc->session->account;
 
-	swboard->users = g_list_prepend(swboard->users, g_strdup(user));
+	semicolon = strchr(user, ';');
+	/* We don't really care about the machine ID. */
+	if (semicolon)
+		passport = g_strndup(user, semicolon - user);
+	else
+		passport = g_strdup(user);
+
+	/* Don't add multiple endpoints to the conversation. */
+	if (g_list_find_custom(swboard->users, passport, (GCompareFunc)strcmp)) {
+		g_free(passport);
+		return;
+	}
+
+	swboard->users = g_list_prepend(swboard->users, passport);
 	swboard->current_users++;
 	swboard->empty = FALSE;
 
--- a/libpurple/protocols/msn/userlist.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/msn/userlist.c	Sat Jan 09 02:00:18 2010 +0000
@@ -50,8 +50,11 @@
 	{
 		MsnSession *session = pa->gc->proto_data;
 		MsnUserList *userlist = session->userlist;
+		PurpleAccount *account = purple_connection_get_account(pa->gc);
 
 		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
+		purple_privacy_deny_remove(account, pa->who, TRUE);
+		purple_privacy_permit_add(account, pa->who, TRUE);
 
 		msn_del_contact_from_list(session, NULL, pa->who, MSN_LIST_PL);
 	}
--- a/libpurple/protocols/mxit/actions.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/actions.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<time.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
@@ -41,17 +37,17 @@
 
 /* MXit Moods */
 static const char*	moods[] = {
-	/* 0 */		"None",
-	/* 1 */		"Angry",
-	/* 2 */		"Excited",
-	/* 3 */		"Grumpy",
-	/* 4 */		"Happy",
-	/* 5 */		"In Love",
-	/* 6 */		"Invincible",
-	/* 7 */		"Sad",
-	/* 8 */		"Hot",
-	/* 9 */		"Sick",
-	/* 10 */	"Sleepy"
+	/* 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")
 };
 
 
@@ -150,37 +146,37 @@
 	/* validate pin */
 	pin = purple_request_fields_get_string( fields, "pin" );
 	if ( !pin ) {
-		err = "The PIN you entered is invalid.";
+		err = _( "The PIN you entered is invalid." );
 		goto out;
 	}
 	len = strlen( pin );
 	if ( ( len < 4 ) || ( len > 10 ) ) {
-		err = "The PIN you entered has an invalid length [4-10].";
+		err = _( "The PIN you entered has an invalid length [4-10]." );
 		goto out;
 	}
 	for ( i = 0; i < len; i++ ) {
 		if ( !g_ascii_isdigit( pin[i] ) ) {
-			err = "The PIN is invalid. It should only consist of digits [0-9].";
+			err = _( "The PIN is invalid. It should only consist of digits [0-9]." );
 			goto out;
 		}
 	}
 	pin2 = purple_request_fields_get_string( fields, "pin2" );
 	if ( ( !pin2 ) || ( strcmp( pin, pin2 ) != 0 ) ) {
-		err = "The two PINs you entered does not match.";
+		err = _( "The two PINs you entered do not match." );
 		goto out;
 	}
 
 	/* validate name */
 	name = purple_request_fields_get_string( fields, "name" );
 	if ( ( !name ) || ( strlen( name ) < 3 ) ) {
-		err = "The name you entered is invalid.";
+		err = _( "The name you entered is invalid." );
 		goto out;
 	}
 
 	/* validate birthdate */
 	bday = purple_request_fields_get_string( fields, "bday" );
 	if ( ( !bday ) || ( strlen( bday ) < 10 ) || ( !validateDate( bday ) ) ) {
-		err = "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'.";
+		err = _( "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." );
 		goto out;
 	}
 
@@ -218,10 +214,7 @@
 		acount++;
 
 		/* update gender */
-		if ( purple_request_fields_get_choice( fields, "male" ) == 0 )
-			profile->male = FALSE;
-		else
-			profile->male = TRUE;
+		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_string_append( attributes, attrib );
 		acount++;
@@ -282,7 +275,7 @@
 	}
 	else {
 		/* show error to user */
-		mxit_popup( PURPLE_NOTIFY_MSG_ERROR, _( "Profile Update Error" ), _( err ) );
+		mxit_popup( PURPLE_NOTIFY_MSG_ERROR, _( "Profile Update Error" ), err );
 	}
 }
 
--- a/libpurple/protocols/mxit/chunk.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/chunk.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
@@ -576,18 +573,17 @@
 
 	/* parse the resource chunks */
 	while ( chunklen > 0 ) {
-		struct raw_chunk* chunkhdr = ( struct raw_chunk * ) &chunkdata[pos];
-		chunkhdr->length = ntohl( chunkhdr->length );		/* host byte-order */
+		gchar* chunk = &chunkdata[pos];
 
 		/* start of chunk data */
-		pos += sizeof( struct raw_chunk );
+		pos += MXIT_CHUNK_HEADER_SIZE;
 
-		switch ( chunkhdr->type ) {
+		switch ( chunk_type( chunk ) ) {
 			case CP_CHUNK_SPLASH :			/* splash image */
 				{
 					struct splash_chunk* splash = g_new0( struct splash_chunk, 1 );
 
-					mxit_chunk_parse_splash( &chunkdata[pos], chunkhdr->length, splash );
+					mxit_chunk_parse_splash( &chunkdata[pos], chunk_length( chunk ), splash );
 
 					cr->resources = g_list_append( cr->resources, splash );
 					break;
@@ -600,12 +596,12 @@
 					break;
 				}
 			default:
-				purple_debug_info( MXIT_PLUGIN_ID, "Unsupported custom resource chunk received (%i)\n", chunkhdr->type );
+				purple_debug_info( MXIT_PLUGIN_ID, "Unsupported custom resource chunk received (%i)\n", chunk_type( chunk) );
 		}
 
 		/* skip over data to next resource chunk */
-		pos += chunkhdr->length;
-		chunklen -= ( sizeof( struct raw_chunk ) + chunkhdr->length );
+		pos += chunk_length( chunk );
+		chunklen -= ( MXIT_CHUNK_HEADER_SIZE + chunk_length( chunk ) );
 	}
 }
 
--- a/libpurple/protocols/mxit/chunk.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/chunk.h	Sat Jan 09 02:00:18 2010 +0000
@@ -31,6 +31,8 @@
 
 
 #define		MXIT_CHUNK_FILEID_LEN		8			/* bytes */
+#define		MXIT_CHUNK_HEADER_SIZE		5			/* type (1 byte) + length (4 bytes) */
+
 
 /* Multimedia chunk types */
 #define		CP_CHUNK_NONE				0x00		/* (0) no chunk */
@@ -68,13 +70,35 @@
 #define		REJECT_BAD_RECIPIENT		4
 
 /*
- * a Chunk header
+ * Chunk header manipulation functions
  */
-struct raw_chunk {
-	guint8		type;
-	guint32		length;
-	gchar		data[0];
-} __attribute__ ((packed));
+static inline guint chunk_type( gchar* chunkheader )
+{
+	return *chunkheader;
+}
+
+static inline void set_chunk_type( gchar* chunkheader, guint type )
+{
+	*chunkheader = type;
+}
+
+static inline guint32 chunk_length( gchar* chunkheader )
+{
+	guint32 length = *( (const guint32*) &chunkheader[1] );
+	return htonl( length );
+}
+
+static inline void set_chunk_length( gchar* chunkheader, guint32 size )
+{
+	size = htonl( size );
+	memcpy( &chunkheader[1], &size, sizeof( guint32 ) );
+}
+
+static inline gchar* chunk_data( gchar* chunkheader )
+{
+	return &chunkheader[MXIT_CHUNK_HEADER_SIZE];
+}
+
 
 struct offerfile_chunk {
 	char	fileid[MXIT_CHUNK_FILEID_LEN];
--- a/libpurple/protocols/mxit/cipher.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/cipher.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
--- a/libpurple/protocols/mxit/filexfer.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/filexfer.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
--- a/libpurple/protocols/mxit/formcmds.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/formcmds.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <glib.h>
+
+#include "internal.h"
 #include <glib/gprintf.h>
 
 #include "purple.h"
@@ -216,7 +216,7 @@
 
     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);
+        purple_debug_error(MXIT_PLUGIN_ID, _( "Conversation with '%s' not found\n" ), from);
         return;
     }
 
@@ -239,12 +239,10 @@
 	replymsg = g_hash_table_lookup(hash, "replymsg");		/* find the reply message */
 	if ((selmsg) && (replymsg)) {
 		gchar*	seltext = g_markup_escape_text(purple_url_decode(selmsg), -1);
-		gchar*	replytext = g_markup_escape_text(purple_url_decode(replymsg), -1);
 
-		mxit_add_html_link( mx, replytext, seltext );
+		mxit_add_html_link( mx, purple_url_decode(replymsg), seltext );
 
 		g_free(seltext);
-		g_free(replytext);
 	}
 }
 
@@ -268,7 +266,7 @@
 
 	dest = g_hash_table_lookup(hash, "dest");				/* find the destination */
 	if (dest) {
-		g_string_append_printf(msg, "<a href=\"%s\">%s</a>", purple_url_decode(dest), (text) ? text : "Download");		/* add link to display message */
+		g_string_append_printf(msg, "<a href=\"%s\">%s</a>", purple_url_decode(dest), (text) ? text : _( "Download" ));		/* add link to display message */
 	}
 
 	if (text)
@@ -333,7 +331,7 @@
 	reply = g_hash_table_lookup(hash, "replymsg");
 	if (reply) {
 		g_string_append_printf(msg, "\n");
-		mxit_add_html_link(mx, reply, "click here");
+		mxit_add_html_link(mx, reply, _( "click here" ));
 	}
 }
 
@@ -345,7 +343,6 @@
  *  @param message			The message text
  *  @return					The length of the command
  */
-//void mxit_command_received(struct MXitSession* session, const char* from, char* message, time_t timestamp)
 int mxit_parse_command(struct RXMsgData* mx, char* message)
 {
 	GHashTable* hash	= NULL;
--- a/libpurple/protocols/mxit/http.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/http.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
--- a/libpurple/protocols/mxit/login.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/login.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
@@ -142,8 +140,10 @@
 		session->http_timer_id = purple_timeout_add_seconds( 2, mxit_manage_polling, session );
 	}
 
-	/* start the tx queue manager timer */
-	session->q_timer = purple_timeout_add_seconds( 2, mxit_manage_queue, session );
+	/* This timer might already exist if we're registering a new account */
+	if ( session->q_timer == 0 )
+		/* start the tx queue manager timer */
+		session->q_timer = purple_timeout_add_seconds( 2, mxit_manage_queue, session );
 }
 
 
@@ -224,7 +224,7 @@
 	struct MXitProfile*		profile		= session->profile;
 	const char*				str;
 	const char*				pin;
-	char*					err			= NULL;
+	const char*				err			= NULL;
 	int						len;
 	int						i;
 
@@ -238,7 +238,7 @@
 	/* nickname */
 	str = purple_request_fields_get_string( fields, "nickname" );
 	if ( ( !str ) || ( strlen( str ) < 3 ) ) {
-		err = "The nick name you entered is invalid.";
+		err = _( "The nick name you entered is invalid." );
 		goto out;
 	}
 	g_strlcpy( profile->nickname, str, sizeof( profile->nickname ) );
@@ -246,37 +246,34 @@
 	/* birthdate */
 	str = purple_request_fields_get_string( fields, "bday" );
 	if ( ( !str ) || ( strlen( str ) < 10 ) || ( !validateDate( str ) ) ) {
-		err = "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'.";
+		err = _( "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'." );
 		goto out;
 	}
 	g_strlcpy( profile->birthday, str, sizeof( profile->birthday ) );
 
 	/* gender */
-	if ( purple_request_fields_get_choice( fields, "male" ) == 0 )
-		profile->male = FALSE;
-	else
-		profile->male = TRUE;
+	profile->male = ( purple_request_fields_get_choice( fields, "male" ) != 0 );
 
 	/* pin */
 	pin = purple_request_fields_get_string( fields, "pin" );
 	if ( !pin ) {
-		err = "The PIN you entered is invalid.";
+		err = _( "The PIN you entered is invalid." );
 		goto out;
 	}
 	len = strlen( pin );
 	if ( ( len < 7 ) || ( len > 10 ) ) {
-		err = "The PIN you entered has an invalid length [7-10].";
+		err = _( "The PIN you entered has an invalid length [7-10]." );
 		goto out;
 	}
 	for ( i = 0; i < len; i++ ) {
 		if ( !g_ascii_isdigit( pin[i] ) ) {
-			err = "The PIN is invalid. It should only consist of digits [0-9].";
+			err = _( "The PIN is invalid. It should only consist of digits [0-9]." );
 			goto out;
 		}
 	}
 	str = purple_request_fields_get_string( fields, "pin2" );
 	if ( ( !str ) || ( strcmp( pin, str ) != 0 ) ) {
-		err = "The two PINs you entered does not match.";
+		err = _( "The two PINs you entered do not match." );
 		goto out;
 	}
 	g_strlcpy( profile->pin, pin, sizeof( profile->pin ) );
@@ -288,7 +285,7 @@
 	}
 	else {
 		/* show error to user */
-		mxit_popup( PURPLE_NOTIFY_MSG_ERROR, _( "Registration Error" ), _( err ) );
+		mxit_popup( PURPLE_NOTIFY_MSG_ERROR, _( "Registration Error" ), err );
 		mxit_register_view( session );
 	}
 }
--- a/libpurple/protocols/mxit/markup.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/markup.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
@@ -66,16 +63,16 @@
 
 /* vibes */
 static const char*	vibes[] = {
-	/* 0 */		"Cool Vibrations",
-	/* 1 */		"Purple Rain",
-	/* 2 */		"Polite",
-	/* 3 */		"Rock n Roll",
-	/* 4 */		"Summer Slumber",
-	/* 5 */		"Electric Razor",
-	/* 6 */		"S.O.S",
-	/* 7 */		"Jack Hammer",
-	/* 8 */		"Bumble Bee",
-	/* 9 */		"Ripple"
+	/* 0 */		N_( "Cool Vibrations" ),
+	/* 1 */		N_( "Purple Rain" ),
+	/* 2 */		N_( "Polite" ),
+	/* 3 */		N_( "Rock n Roll" ),
+	/* 4 */		N_( "Summer Slumber" ),
+	/* 5 */		N_( "Electric Razor" ),
+	/* 6 */		N_( "S.O.S" ),
+	/* 7 */		N_( "Jack Hammer" ),
+	/* 8 */		N_( "Bumble Bee" ),
+	/* 9 */		N_( "Ripple" )
 };
 
 
@@ -416,7 +413,6 @@
 	}
 	else if ( mx->chatid < 0 ) {
 		/* normal chat message */
-		//serv_got_im( mx->session->con, mx->from, mx->msg->str, mx->flags, mx->timestamp );
 		mxit_show_split_message( mx );
 	}
 	else {
@@ -653,7 +649,7 @@
 		return 0;
 	}
 
-	g_string_append_printf( mx->msg, "<font color=\"%s\"><i>%s Vibe...</i></font>", MXIT_VIBE_MSG_COLOR, vibes[vibeid] );
+	g_string_append_printf( mx->msg, "<font color=\"%s\"><i>%s Vibe...</i></font>", MXIT_VIBE_MSG_COLOR, _( vibes[vibeid] ) );
 	return 2;
 }
 
--- a/libpurple/protocols/mxit/multimx.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/multimx.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <errno.h>
-
+#include "internal.h"
 #include "purple.h"
 #include "prpl.h"
 
@@ -408,7 +406,7 @@
 
 	/* Configuration option: Room Name */
 	pce = g_new0(struct proto_chat_entry, 1);
-	pce->label = "_Room Name:";
+	pce->label = _( "_Room Name:" );
 	pce->identifier = "room";
 	pce->required = TRUE;
 	m = g_list_append(m, pce);
--- a/libpurple/protocols/mxit/mxit.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<glib.h>
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"notify.h"
 #include	"plugin.h"
@@ -63,7 +60,7 @@
 	PurpleConnection*	con;
 	gchar**				parts	= NULL;
 	gchar*				link	= NULL;
-	unsigned int		len;
+	gsize				len;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_link_click (%s)\n", link64 );
 
@@ -125,7 +122,7 @@
 /*------------------------------------------------------------------------
  * Register MXit to receive URI click notifications from the UI
  */
-void mxit_register_uri_handler()
+void mxit_register_uri_handler(void)
 {
 	not_link_ref_count++;
 	if ( not_link_ref_count == 1 ) {
@@ -170,6 +167,7 @@
 	struct contact*		contact;
 	PurpleBuddy*		buddy;
 	const char*			who;
+	char*				tmp;
 
 	gc = purple_conversation_get_gc( conv );
 	if ( session->con != gc ) {
@@ -190,7 +188,11 @@
 
 	/* find the buddy object */
 	buddy = purple_find_buddy( session->acc, who );
-	if ( ( !buddy ) || ( !buddy->proto_data ) )
+	if ( !buddy )
+		return;
+
+	contact = purple_buddy_get_protocol_data(buddy);
+	if ( !contact )
 		return;
 
 	/* we ignore all conversations with which we have chatted with in this session */
@@ -198,13 +200,14 @@
 		return;
 
 	/* determite if this buddy is a MXit service */
-	contact = buddy->proto_data;
 	switch ( contact->type ) {
 		case MXIT_TYPE_BOT :
 		case MXIT_TYPE_CHATROOM :
 		case MXIT_TYPE_GALLERY :
 		case MXIT_TYPE_INFO :
-				serv_got_im( session->con, who, "<font color=\"#999999\">Loading menu...</font>\n", PURPLE_MESSAGE_NOTIFY, time( NULL ) );
+				tmp = g_strdup_printf("<font color=\"#999999\">%s</font>\n", _( "Loading menu..." ));
+				serv_got_im( session->con, who, tmp, PURPLE_MESSAGE_NOTIFY, time( NULL ) );
+				g_free(tmp);
 				mxit_send_message( session, who, " ", FALSE );
 		default :
 				break;
@@ -258,7 +261,7 @@
  */
 static const char* mxit_list_emblem( PurpleBuddy* buddy )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return NULL;
@@ -295,7 +298,7 @@
  */
 char* mxit_status_text( PurpleBuddy* buddy )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return NULL;
@@ -320,7 +323,7 @@
  */
 static void mxit_tooltip( PurpleBuddy* buddy, PurpleNotifyUserInfo* info, gboolean full )
 {
-	struct contact*	contact = buddy->proto_data;
+	struct contact*	contact = purple_buddy_get_protocol_data(buddy);
 
 	if ( !contact )
 		return;
@@ -343,7 +346,7 @@
 
 	/* hidden number */
 	if ( contact->flags & MXIT_CFLAG_HIDDEN )
-		purple_notify_user_info_add_pair( info, _( "Hidden Number" ), "Yes" );
+		purple_notify_user_info_add_pair( info, _( "Hidden Number" ), _( "Yes" ) );
 }
 
 
@@ -455,7 +458,7 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_free_buddy\n" );
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data(buddy);
 	if ( contact ) {
 		if ( contact->statusMsg )
 			g_free( contact->statusMsg );
@@ -463,7 +466,8 @@
 			g_free( contact->avatarId );
 		g_free( contact );
 	}
-	buddy->proto_data = NULL;
+
+	purple_buddy_set_protocol_data(buddy, NULL);
 }
 
 
@@ -541,7 +545,7 @@
 
 	table = g_hash_table_new( g_str_hash, g_str_equal );
 
-	g_hash_table_insert( table, "login_label", _( "Your Mobile Number..." ) );
+	g_hash_table_insert( table, "login_label", (gpointer)_( "Your Mobile Number..." ) );
 
 	return table;
 }
@@ -686,8 +690,6 @@
 
 	option = purple_account_option_bool_new( _( "Enable splash-screen popup" ), MXIT_CONFIG_SPLASHPOPUP, FALSE );
 	proto_info.protocol_options = g_list_append( proto_info.protocol_options, option );
-
-	g_assert( sizeof( struct raw_chunk ) == 5 );
 }
 
 PURPLE_INIT_PLUGIN( mxit, init_plugin, plugin_info );
--- a/libpurple/protocols/mxit/mxit.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/mxit.h	Sat Jan 09 02:00:18 2010 +0000
@@ -27,14 +27,7 @@
 #define		_MXIT_H_
 
 
-/* internationalize feedback strings */
-#ifndef		_
-#ifdef		GETTEXT_PACKAGE
-#include	<glib/gi18n-lib.h>
-#else
-#define		_( x )						( x )
-#endif
-#endif
+#include "internal.h"
 
 
 #if defined( __APPLE__ )
@@ -68,7 +61,7 @@
 /* Plugin details */
 #define		MXIT_PLUGIN_ID				"prpl-loubserp-mxit"
 #define		MXIT_PLUGIN_NAME			"MXit"
-#define		MXIT_PLUGIN_VERSION			"2.2.0"
+#define		MXIT_PLUGIN_VERSION			"2.3.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"
@@ -189,7 +182,7 @@
 void mxit_enable_signals( struct MXitSession* session );
 
 #ifdef	MXIT_LINK_CLICK
-void mxit_register_uri_handler();
+void mxit_register_uri_handler(void);
 #endif
 
 
--- a/libpurple/protocols/mxit/profile.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/profile.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<ctype.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
@@ -117,9 +115,9 @@
 
 	buddy = purple_find_buddy( session->acc, username );
 	if ( buddy ) {
-		purple_notify_user_info_add_pair( info, _( "Alias" ), buddy->alias );
+		purple_notify_user_info_add_pair( info, _( "Alias" ), purple_buddy_get_alias( buddy ) );
 		purple_notify_user_info_add_section_break( info );
-		contact = buddy->proto_data;
+		contact = purple_buddy_get_protocol_data(buddy);
 	}
 
 	purple_notify_user_info_add_pair( info, _( "Nick Name" ), profile->nickname );
--- a/libpurple/protocols/mxit/protocol.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
@@ -339,10 +335,10 @@
 	/* build the HTTP request packet */
 	reqlen = g_snprintf( request, 256,
 					"POST %s?%s HTTP/1.1\r\n"
-			  		"User-Agent: " MXIT_HTTP_USERAGENT "\r\n"
+					"User-Agent: " MXIT_HTTP_USERAGENT "\r\n"
 					"Content-Type: application/octet-stream\r\n"
-			 		"Host: %s\r\n"
-					"Content-Length: %" G_GSIZE_FORMAT "\r\n"
+					"Host: %s\r\n"
+					"Content-Length: %d\r\n"
 					"\r\n",
 					session->http_server,
 					purple_url_encode( packet->header ),
@@ -1035,7 +1031,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "SENDING FILE '%s' of %i bytes to user '%s'\n", filename, buflen, username );
@@ -1044,17 +1040,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_senddirect( chunk->data, username, filename, buf, buflen );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_senddirect( chunk_data( chunk ), username, filename, buf, buflen );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating senddirect chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_DIRECT_SND;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_DIRECT_SND );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1071,7 +1067,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_reject\n" );
@@ -1080,17 +1076,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_reject( chunk->data, fileid );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_reject( chunk_data( chunk ), fileid );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating reject chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_REJECT;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_REJECT );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1109,7 +1105,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_accept\n" );
@@ -1118,17 +1114,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_get( chunk->data, fileid, filesize, offset );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_get( chunk_data(chunk), fileid, filesize, offset );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating getfile chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_GET;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_GET );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1145,7 +1141,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_file_received\n" );
@@ -1154,17 +1150,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_received( chunk->data, fileid, status );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_received( chunk_data(chunk), fileid, status );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating received chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_RECIEVED;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_RECIEVED );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1182,7 +1178,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_set_avatar: %i bytes\n", avatarlen );
@@ -1191,17 +1187,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_set_avatar( chunk->data, avatar, avatarlen );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_set_avatar( chunk_data(chunk), avatar, avatarlen );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating set avatar chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_SET_AVATAR;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_SET_AVATAR );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1221,7 +1217,7 @@
 {
 	char				data[CP_MAX_PACKET];
 	int					datalen		= 0;
-	struct raw_chunk*	chunk;
+	gchar*				chunk;
 	int					size;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_avatar: %s\n", mxitId );
@@ -1230,17 +1226,17 @@
 	datalen = sprintf( data, "ms=" );
 
 	/* map chunk header over data buffer */
-	chunk = (struct raw_chunk *) &data[datalen];
-
-	size = mxit_chunk_create_get_avatar( chunk->data, mxitId, avatarId, MXIT_AVATAR_SIZE );
+	chunk = &data[datalen];
+
+	size = mxit_chunk_create_get_avatar( chunk_data(chunk), mxitId, avatarId, MXIT_AVATAR_SIZE );
 	if ( size < 0 ) {
 		purple_debug_error( MXIT_PLUGIN_ID, "Error creating get avatar chunk (%i)\n", size );
 		return;
 	}
 
-	chunk->type = CP_CHUNK_GET_AVATAR;
-	chunk->length = htonl( size );
-	datalen += sizeof( struct raw_chunk ) + size;
+	set_chunk_type( chunk, CP_CHUNK_GET_AVATAR );
+	set_chunk_length( chunk, size );
+	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
 	/* send the byte stream to the mxit server */
 	mxit_queue_packet( session, data, datalen, CP_CMD_MEDIA );
@@ -1345,8 +1341,8 @@
 			name = purple_buddy_get_alias( buddy );
 		else
 			name = records[0]->fields[0]->data;
-		g_snprintf( msg, sizeof( msg ), "%s sent you an encrypted message, but it is not supported on this client.", name );
-		mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Message Error" ), _( msg ) );
+		g_snprintf( msg, sizeof( msg ), _( "%s sent you an encrypted message, but it is not supported on this client." ), name );
+		mxit_popup( PURPLE_NOTIFY_MSG_WARNING, _( "Message Error" ), msg );
 		return;
 	}
 
@@ -1938,13 +1934,13 @@
 	if ( packet->errmsg )
 		errdesc = packet->errmsg;
 	else
-		errdesc = "An internal MXit server error occurred.";
+		errdesc = _( "An internal MXit server error occurred." );
 
 	purple_debug_info( MXIT_PLUGIN_ID, "Error Reply %i:%s\n", packet->errcode, errdesc );
 
 	if ( packet->errcode == MXIT_ERRCODE_LOGGEDOUT ) {
 		/* we are not currently logged in, so we need to reconnect */
-		purple_connection_error( session->con, _( errmsg ) );
+		purple_connection_error( session->con, _( errdesc ) );
 	}
 
 	/* packet command */
@@ -1957,12 +1953,12 @@
 					return 0;
 				}
 				else {
-					sprintf( errmsg, "Login error: %s (%i)", errdesc, packet->errcode );
-					purple_connection_error( session->con, _( errmsg ) );
+					sprintf( 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 );
+				sprintf( 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 :
--- a/libpurple/protocols/mxit/roster.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/roster.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
@@ -53,11 +50,11 @@
 	const char*				name;
 } const mxit_statuses[] = {
 		/*	primative,						no,							id,			name					*/
-		{	PURPLE_STATUS_OFFLINE,			MXIT_PRESENCE_OFFLINE,		"offline",	"Offline"			},	/* 0 */
-		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_ONLINE,		"online",	"Available"			},	/* 1 */
-		{	PURPLE_STATUS_AWAY,				MXIT_PRESENCE_AWAY,			"away",		"Away"				},	/* 2 */
-		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_AVAILABLE,	"chat",		"Chatty"			},	/* 3 */
-		{	PURPLE_STATUS_UNAVAILABLE,		MXIT_PRESENCE_DND,			"dnd",		"Do Not Disturb"	}	/* 4 */
+		{	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 */
+		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_AVAILABLE,	"chat",		N_( "Chatty" )			},	/* 3 */
+		{	PURPLE_STATUS_UNAVAILABLE,		MXIT_PRESENCE_DND,			"dnd",		N_( "Do Not Disturb" )	}	/* 4 */
 };
 
 
@@ -77,7 +74,7 @@
 		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->primative, status->id, _( status->name ), TRUE, TRUE, FALSE,
 					"message", _( "Message" ), purple_value_new( PURPLE_TYPE_STRING ),
 					NULL );
 
@@ -321,7 +318,7 @@
 
 		/* create new buddy */
 		buddy = purple_buddy_new( session->acc, contact->username, contact->alias );
-		buddy->proto_data = contact;
+		purple_buddy_set_protocol_data(buddy, contact);
 
 		/* add new buddy to list */
 		purple_blist_add_buddy( buddy, NULL, group, NULL );
@@ -329,13 +326,15 @@
 	else {
 		/* buddy was found in the group */
 
+		gpointer data = NULL;
+
 		/* now update the buddy's alias */
 		purple_blist_alias_buddy( buddy, contact->alias );
 
 		/* replace the buddy's contact struct */
-		if ( buddy->proto_data )
-			free( buddy->proto_data );
-		buddy->proto_data = contact;
+		if ( ( data = purple_buddy_get_protocol_data( buddy ) ) )
+			free( data );
+		purple_buddy_set_protocol_data( buddy, contact );
 	}
 
 	/* load buddy's avatar id */
@@ -382,7 +381,7 @@
 		return;
 	}
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data( buddy );
 	if ( !contact )
 		return;
 
@@ -398,7 +397,7 @@
 		contact->statusMsg = NULL;
 	}
 	if ( statusMsg[0] != '\0' )
-		contact->statusMsg = g_strdup( statusMsg );	
+		contact->statusMsg = g_markup_escape_text( statusMsg, -1 );
 
 	/* update avatarId */
 	if ( ( contact->avatarId ) && ( g_ascii_strcasecmp( contact->avatarId, avatarId ) == 0 ) ) {
@@ -442,9 +441,12 @@
 	for ( i = 0; i < g_slist_length( list ); i++ ) {
 		buddy = g_slist_nth_data( list, i );
 
-		if ( !buddy->proto_data ) {
+		if ( !purple_buddy_get_protocol_data( buddy ) ) {
+			const gchar *alias = purple_buddy_get_alias( buddy );
+			const gchar *name = purple_buddy_get_name( buddy );
+
 			/* this buddy should be removed, because we did not receive him in our roster update from MXit */
-			purple_debug_info( MXIT_PLUGIN_ID, "Removed 'old' buddy from the blist '%s' (%s)\n", buddy->alias, buddy->name );
+			purple_debug_info( MXIT_PLUGIN_ID, "Removed 'old' buddy from the blist '%s' (%s)\n", alias, name );
 			purple_blist_remove_buddy( buddy );
 		}
 	}
@@ -538,7 +540,7 @@
 		return FALSE;
 	}
 
-	contact = buddy->proto_data;
+	contact = purple_buddy_get_protocol_data( buddy );
 	if ( !contact )
 		return FALSE;
 
@@ -563,10 +565,13 @@
 	GSList*				list	= NULL;
 	PurpleBuddy*		mxbuddy	= NULL;
 	unsigned int		i;
+	const gchar *		buddy_name = purple_buddy_get_name( buddy );
+	const gchar *		buddy_alias = purple_buddy_get_alias( buddy );
+	const gchar *		group_name = purple_group_get_name( group );
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy '%s' (group='%s')\n", buddy->name, group->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy '%s' (group='%s')\n", buddy_name, group_name );
 
-	list = purple_find_buddies( session->acc, buddy->name );
+	list = purple_find_buddies( session->acc, buddy_name );
 	if ( g_slist_length( list ) == 1 ) {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy (scenario 1) (list:%i)\n", g_slist_length( list ) );
 		/*
@@ -575,7 +580,7 @@
 		 * you accept an invite.  so in that case the user is already
 		 * in our blist and ready to be chatted to.
 		 */
-		mxit_send_invite( session, buddy->name, buddy->alias, group->name );
+		mxit_send_invite( session, buddy_name, buddy_alias, group_name );
 	}
 	else {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_add_buddy (scenario 2) (list:%i)\n", g_slist_length( list ) );
@@ -588,17 +593,17 @@
 		for ( i = 0; i < g_slist_length( list ); i++ ) {
 			mxbuddy = g_slist_nth_data( list, i );
 
-			if ( mxbuddy->proto_data != NULL ) {
+			if ( purple_buddy_get_protocol_data( mxbuddy ) != NULL ) {
 				/* this is our REAL MXit buddy! */
 
 				/* now update the buddy's alias */
-				purple_blist_alias_buddy( mxbuddy, buddy->alias );
+				purple_blist_alias_buddy( mxbuddy, buddy_alias );
 
 				/* now update the buddy's group */
 //				mxbuddy = mxit_update_buddy_group( session, mxbuddy, group );
 
 				/* send the update to the MXit server */
-				mxit_send_update_contact( session, mxbuddy->name, mxbuddy->alias, group->name );
+				mxit_send_update_contact( session, purple_buddy_get_name( mxbuddy ), purple_buddy_get_alias( mxbuddy ), group_name );
 			}
 		}
 	}
@@ -626,10 +631,11 @@
 void mxit_remove_buddy( PurpleConnection* gc, PurpleBuddy* buddy, PurpleGroup* group )
 {
 	struct MXitSession*	session	= (struct MXitSession*) gc->proto_data;
+	const gchar *		buddy_name = purple_buddy_get_name( buddy );
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_remove_buddy '%s'\n", buddy->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_remove_buddy '%s'\n", buddy_name );
 
-	mxit_send_remove( session, buddy->name );
+	mxit_send_remove( session, buddy_name );
 }
 
 
@@ -662,7 +668,7 @@
 		return;
 	}
 
-	mxit_send_update_contact( session, who, alias, group->name );
+	mxit_send_update_contact( session, who, alias, purple_group_get_name( group ) );
 }
 
 
@@ -688,7 +694,7 @@
 		return;
 	}
 
-	mxit_send_update_contact( session, who, buddy->alias, new_group );
+	mxit_send_update_contact( session, who, purple_buddy_get_alias( buddy ), new_group );
 }
 
 
@@ -707,7 +713,7 @@
 	PurpleBuddy*		buddy	= NULL;
 	GList*				item	= NULL;
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_rename_group from '%s' to '%s\n", old_name, group->name );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_rename_group from '%s' to '%s\n", old_name, purple_group_get_name( group ) );
 
 	//  TODO: Might be more efficient to use the "rename group" command (cmd=29).
 
@@ -715,7 +721,7 @@
 	item = moved_buddies;
 	while ( item ) {
 		buddy = item->data;
-		mxit_send_update_contact( session, buddy->name, buddy->alias, group->name );
+		mxit_send_update_contact( session, purple_buddy_get_name( buddy ), purple_buddy_get_alias( buddy ), purple_group_get_name( group ) );
 		item = g_list_next( item );
 	}
 }
--- a/libpurple/protocols/mxit/splashscreen.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/splashscreen.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <libgen.h>
+#include "internal.h"
 #include <glib/gstdio.h>
 
 #include "purple.h"
@@ -44,10 +44,10 @@
 {
 	const char* splashId = purple_account_get_string(session->acc, MXIT_CONFIG_SPLASHID, NULL);
 
-	purple_debug_info(MXIT_PLUGIN_ID, "Current splashId: '%s'\n", splashId);
-
-	if ((splashId != NULL) && (*splashId != '\0'))
+	if ((splashId != NULL) && (*splashId != '\0')) {
+		purple_debug_info(MXIT_PLUGIN_ID, "Current splashId: '%s'\n", splashId);
 		return splashId;
+	}
 	else
 		return NULL;
 }
@@ -150,7 +150,7 @@
 
 	/* Get current splash ID */
 	splashId = splash_current(session);
-	if (!splashId)
+	if (splashId == NULL)		/* no splash-screen */
 		return;
 
 	/* if is clickable, then send click event */
--- a/libpurple/protocols/mxit/splashscreen.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/mxit/splashscreen.h	Sat Jan 09 02:00:18 2010 +0000
@@ -39,7 +39,7 @@
 /*
  * Indicate if splash-screen popups are enabled.
  */
-gboolean splash_popup_enabled();
+gboolean splash_popup_enabled(struct MXitSession* session);
 
 /*
  * Save a new splash-screen.
--- a/libpurple/protocols/myspace/myspace.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Sat Jan 09 02:00:18 2010 +0000
@@ -20,6 +20,8 @@
 #ifndef _MYSPACE_MYSPACE_H
 #define _MYSPACE_MYSPACE_H
 
+#include "internal.h"
+
 /* Other includes */
 #include <string.h>
 #include <errno.h>/* for EAGAIN */
@@ -36,8 +38,6 @@
 #include <sys/socket.h>
 #endif
 
-#include "internal.h"
-
 #include "notify.h"
 #include "plugin.h"
 #include "accountopt.h"
--- a/libpurple/protocols/myspace/user.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/myspace/user.c	Sat Jan 09 02:00:18 2010 +0000
@@ -54,11 +54,13 @@
 
 	user = purple_buddy_get_protocol_data(buddy);
 	if (create && !user) {
+		PurpleBlistNode *node = PURPLE_BLIST_NODE(buddy);
+
 		/* No MsimUser for this buddy; make one. */
 
 		user = g_new0(MsimUser, 1);
 		user->buddy = buddy;
-		user->id = purple_blist_node_get_int(&buddy->node, "UserID");
+		user->id = purple_blist_node_get_int(node, "UserID");
 		purple_buddy_set_protocol_data(buddy, user);
 	}
 
@@ -70,6 +72,9 @@
 	if (!user)
 		return;
 
+	if (user->url_data != NULL)
+		purple_util_fetch_url_cancel(user->url_data);
+
 	g_free(user->client_info);
 	g_free(user->gender);
 	g_free(user->location);
@@ -212,6 +217,8 @@
 	const char *name = purple_buddy_get_name(user->buddy);
 	PurpleAccount *account;
 
+	user->url_data = NULL;
+
 	purple_debug_info("msim_downloaded_buddy_icon",
 			"Downloaded %" G_GSIZE_FORMAT " bytes\n", len);
 
@@ -375,7 +382,9 @@
 
 		/* Only download if URL changed */
 		if (!previous_url || !g_str_equal(previous_url, user->image_url)) {
-			purple_util_fetch_url(user->image_url, TRUE, NULL, TRUE, msim_downloaded_buddy_icon, (gpointer)user);
+			if (user->url_data != NULL)
+				purple_util_fetch_url_cancel(user->url_data);
+			user->url_data = purple_util_fetch_url(user->image_url, TRUE, NULL, TRUE, msim_downloaded_buddy_icon, (gpointer)user);
 		}
 	} else if (g_str_equal(key_str, "LastImageUpdated")) {
 		/* TODO: use somewhere */
--- a/libpurple/protocols/myspace/user.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/myspace/user.h	Sat Jan 09 02:00:18 2010 +0000
@@ -40,6 +40,7 @@
 	gchar *image_url;
 	guint last_image_updated;
 	gboolean temporary_user;
+	PurpleUtilFetchUrlData *url_data;
 } MsimUser;
 
 /* Callback function pointer type for when a user's information is received,
--- a/libpurple/protocols/novell/nmuser.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/novell/nmuser.c	Sat Jan 09 02:00:18 2010 +0000
@@ -18,9 +18,8 @@
  *
  */
 
-#include <glib.h>
+#include "internal.h"
 #include <string.h>
-#include "internal.h"
 #include "nmfield.h"
 #include "nmuser.h"
 #include "nmconn.h"
--- a/libpurple/protocols/oscar/clientlogin.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Sat Jan 09 02:00:18 2010 +0000
@@ -36,12 +36,12 @@
  * http://dev.aol.com/authentication_for_clients
  */
 
+#include "oscar.h"
+#include "oscarcommon.h"
+
 #include "cipher.h"
 #include "core.h"
 
-#include "oscar.h"
-#include "oscarcommon.h"
-
 #define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
 #define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession"
 
@@ -275,13 +275,20 @@
 	char *query_string, *signature, *url;
 	gboolean use_tls = purple_account_get_bool(purple_connection_get_account(od->gc), "use_ssl", OSCAR_DEFAULT_USE_SSL);
 
-	/* Construct the GET parameters */
+	/*
+	 * Construct the GET parameters.  0x00000611 is the distid given to
+	 * us by AOL for use as the default libpurple distid.
+	 */
 	query_string = g_strdup_printf("a=%s"
+			"&distId=%d"
 			"&f=xml"
 			"&k=%s"
 			"&ts=%" PURPLE_TIME_T_MODIFIER
 			"&useTLS=%d",
-			purple_url_encode(token), get_client_key(od), hosttime, use_tls);
+			purple_url_encode(token),
+			oscar_get_ui_info_int(od->icq ? "prpl-icq-distid"
+					: "prpl-aim-distid", 0x00000611),
+			get_client_key(od), hosttime, use_tls);
 	signature = generate_signature("GET", URL_START_OSCAR_SESSION,
 			query_string, session_key);
 	url = g_strdup_printf(URL_START_OSCAR_SESSION "?%s&sig_sha256=%s",
--- a/libpurple/protocols/oscar/family_auth.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/family_auth.c	Sat Jan 09 02:00:18 2010 +0000
@@ -26,12 +26,12 @@
  *
  */
 
+#include "oscar.h"
+
 #include <ctype.h>
 
 #include "cipher.h"
 
-#include "oscar.h"
-
 /* #define USE_XOR_FOR_ICQ */
 
 #ifdef USE_XOR_FOR_ICQ
--- a/libpurple/protocols/oscar/odc.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/odc.c	Sat Jan 09 02:00:18 2010 +0000
@@ -110,8 +110,8 @@
 	byte_stream_put16(&bs, 0x0000);
 	byte_stream_put16(&bs, 0x0000);
 	byte_stream_put32(&bs, frame->payload.len);
-	byte_stream_put16(&bs, 0x0000);
 	byte_stream_put16(&bs, frame->encoding);
+	byte_stream_put16(&bs, 0x0000);	
 	byte_stream_put16(&bs, 0x0000);
 	byte_stream_put16(&bs, frame->flags);
 	byte_stream_put16(&bs, 0x0000);
--- a/libpurple/protocols/oscar/oscar.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Jan 09 02:00:18 2010 +0000
@@ -378,12 +378,12 @@
 }
 
 static gchar *
-oscar_utf8_try_convert(PurpleAccount *account, const gchar *msg)
+oscar_utf8_try_convert(PurpleAccount *account, OscarData *od, const gchar *msg)
 {
 	const char *charset = NULL;
 	char *ret = NULL;
 
-	if(oscar_util_valid_name_icq(purple_account_get_username(account)))
+	if (od->icq)
 		charset = purple_account_get_string(account, "encoding", NULL);
 
 	if(charset && *charset)
@@ -438,9 +438,7 @@
 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;
-
-	purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%" G_GSIZE_FORMAT "\n", charset, charsubset, datalen);
+	const gchar *charsetstr1, *charsetstr2, *charsetstr3 = NULL;
 
 	if ((datalen == 0) || (data == NULL))
 		return NULL;
@@ -459,18 +457,32 @@
 		charsetstr1 = "ASCII";
 		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	} else if (charset == 0x000d) {
-		/* Mobile AIM client on a Nokia 3100 and an LG VX6000 */
-		charsetstr1 = "ISO-8859-1";
-		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+		/* 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)
-		ret = purple_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
+	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;
 
@@ -565,7 +577,7 @@
 		return;
 	}
 
-	purple_debug_info("oscar", "Conversion from UTF-8 to %s failed (%s), falling back to unicode.\n",
+	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;
@@ -786,24 +798,24 @@
 }
 
 static void
-oscar_user_info_convert_and_add_pair(PurpleAccount *account, PurpleNotifyUserInfo *user_info,
+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, value))) {
+	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, PurpleNotifyUserInfo *user_info,
+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, value))) {
+	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);
 	}
@@ -884,10 +896,14 @@
 			   (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
 
 	if (strip_html_tags) {
-		/* Away messges are HTML, but available messages were originally plain text.
+		/* 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.
 		 */
-		if (is_away && message) {
+		/*
+		 * 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);
@@ -906,7 +922,7 @@
 	}
 	g_free(itmsurl);
 
-	if (is_away && message) {
+	if (message) {
 		tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account));
 		g_free(message);
 		message = tmp;
@@ -1006,7 +1022,7 @@
 			char *tmp2 = g_markup_escape_text(tmp, strlen(tmp));
 			g_free(tmp);
 
-			oscar_user_info_convert_and_add_pair(account, user_info, _("Buddy Comment"), tmp2);
+			oscar_user_info_convert_and_add_pair(account, od, user_info, _("Buddy Comment"), tmp2);
 			g_free(tmp2);
 		}
 	}
@@ -2434,7 +2450,7 @@
 	 * Note: There *may* be some clients which send messages as HTML formatted -
 	 *       they need to be special-cased somehow.
 	 */
-	if (oscar_util_valid_name_icq(purple_account_get_username(account)) && oscar_util_valid_name_icq(userinfo->bn)) {
+	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);
@@ -2449,42 +2465,81 @@
 	 */
 	if (purple_markup_find_tag("body", tmp, &start, &end, &attribs))
 	{
+		int len;
+		char *tmp2, *body;
 		const char *ichattextcolor, *ichatballooncolor;
-		const char *start2, *end2;
+		const char *slash_body_start, *slash_body_end = NULL; /* </body> */
 		GData *unused;
 
 		/*
 		 * Find the ending </body> so we can strip off the outer <html/>
 		 * and <body/>
 		 */
-		if (purple_markup_find_tag("/body", end + 1, &start2, &end2, &unused))
+		if (purple_markup_find_tag("/body", end + 1, &slash_body_start, &slash_body_end, &unused))
 		{
-			gchar *tmp2;
-			tmp2 = g_strndup(end + 1, (start2 - 1) - (end + 1) + 1);
-			g_free(tmp);
-			tmp = tmp2;
+			body = g_strndup(start, slash_body_end - start + 1);
 			g_datalist_clear(&unused);
 		}
+		else
+		{
+			purple_debug_warning("oscar", "Broken message contains <body> but not </body>!\n");
+			/* Take everything after <body> */
+			body = g_strdup(start);
+		}
 
 		ichattextcolor = g_datalist_get_data(&attribs, "ichattextcolor");
 		if (ichattextcolor != NULL)
 		{
-			gchar *tmp2;
-			tmp2 = g_strdup_printf("<font color=\"%s\">%s</font>", ichattextcolor, tmp);
-			g_free(tmp);
-			tmp = tmp2;
+			tmp2 = g_strdup_printf("<font color=\"%s\">%s</font>", ichattextcolor, body);
+			g_free(body);
+			body = tmp2;
 		}
 
 		ichatballooncolor = g_datalist_get_data(&attribs, "ichatballooncolor");
 		if (ichatballooncolor != NULL)
 		{
-			gchar *tmp2;
-			tmp2 = g_strdup_printf("<font back=\"%s\">%s</font>", ichatballooncolor, tmp);
-			g_free(tmp);
-			tmp = tmp2;
+			tmp2 = g_strdup_printf("<font back=\"%s\">%s</font>", ichatballooncolor, body);
+			g_free(body);
+			body = tmp2;
 		}
 
 		g_datalist_clear(&attribs);
+
+		len = start - tmp;
+		tmp2 = g_strdup_printf("%.*s%s%s", len, tmp, body, slash_body_end ? slash_body_end + 1: "</body>");
+		g_free(tmp);
+		g_free(body);
+
+		tmp = tmp2;
+	}
+
+	/*
+	 * Are there <html/> surrounding tags? If so, strip them out, too.
+	 */
+	if (purple_markup_find_tag("html", tmp, &start, &end, &attribs))
+	{
+		gchar *tmp2;
+		int len;
+
+		g_datalist_clear(&attribs);
+
+		len = start - tmp;
+		tmp2 = g_strdup_printf("%.*s%s", len, tmp, end + 1);
+		g_free(tmp);
+		tmp = tmp2;
+	}
+
+	if (purple_markup_find_tag("/html", tmp, &start, &end, &attribs))
+	{
+		gchar *tmp2;
+		int len;
+
+		g_datalist_clear(&attribs);
+
+		len = start - tmp;
+		tmp2 = g_strdup_printf("%.*s%s", len, tmp, end + 1);
+		g_free(tmp);
+		tmp = tmp2;
 	}
 
 	serv_got_im(gc, userinfo->bn, tmp, flags,
@@ -3521,9 +3576,9 @@
 
 			purple_debug_misc("oscar",
 					"created room: %s %hu %hu %hu %u %hu %hu %hhu %hu %s %s\n",
-					fqcn, exchange, instance, flags, createtime,
+					fqcn ? fqcn : "(null)", exchange, instance, flags, createtime,
 					maxmsglen, maxoccupancy, createperms, unknown,
-					name, ck);
+					name ? name : "(null)", ck);
 			aim_chat_join(od, exchange, ck, instance);
 			}
 			break;
@@ -4118,7 +4173,7 @@
 		bi = NULL;
 
 	purple_notify_user_info_add_pair(user_info, _("UIN"), who);
-	oscar_user_info_convert_and_add(account, user_info, _("Nick"), info->nick);
+	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,
@@ -4128,9 +4183,9 @@
 		purple_notify_user_info_add_pair(user_info, _("IP Address"), tstr);
 		g_free(tstr);
 	}
-	oscar_user_info_convert_and_add(account, user_info, _("First Name"), info->first);
-	oscar_user_info_convert_and_add(account, user_info, _("Last Name"), info->last);
-	if (info->email && info->email[0] && (utf8 = oscar_utf8_try_convert(account, info->email))) {
+	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);
@@ -4139,7 +4194,7 @@
 	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, info->email2[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);
@@ -4147,7 +4202,7 @@
 			}
 		}
 	}
-	oscar_user_info_convert_and_add(account, user_info, _("Mobile Phone"), info->mobile);
+	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")));
@@ -4167,14 +4222,14 @@
 		 * feel free to remove it.  --rlaager */
 		mktime(tm);
 
-		oscar_user_info_convert_and_add(account, user_info, _("Birthday"), purple_date_format_short(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, info->personalwebpage))) {
+	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);
@@ -4184,33 +4239,33 @@
 	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, user_info, _("Additional Information"), info->info);
+	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, user_info, _("Address"), info->homeaddr);
-		oscar_user_info_convert_and_add(account, user_info, _("City"), info->homecity);
-		oscar_user_info_convert_and_add(account, user_info, _("State"), info->homestate);
-		oscar_user_info_convert_and_add(account, user_info, _("Zip Code"), info->homezip);
+		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, user_info, _("Address"), info->workaddr);
-		oscar_user_info_convert_and_add(account, user_info, _("City"), info->workcity);
-		oscar_user_info_convert_and_add(account, user_info, _("State"), info->workstate);
-		oscar_user_info_convert_and_add(account, user_info, _("Zip Code"), info->workzip);
+		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, user_info, _("Company"), info->workcompany);
-		oscar_user_info_convert_and_add(account, user_info, _("Division"), info->workdivision);
-		oscar_user_info_convert_and_add(account, user_info, _("Position"), info->workposition);
-
-		if (info->workwebpage && info->workwebpage[0] && (utf8 = oscar_utf8_try_convert(account, info->workwebpage))) {
+		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);
@@ -4241,7 +4296,7 @@
 	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, info->nick))) {
+	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))) {
@@ -4552,6 +4607,8 @@
 	}
 	g_string_free(data, TRUE);
 
+	purple_debug_info("oscar", "sending direct IM %s using charset %i", msg->str, charset);
+	
 	peer_odc_send_im(conn, msg->str, msg->len, charset,
 			imflags & PURPLE_MESSAGE_AUTO_RESP);
 	g_string_free(msg, TRUE);
@@ -4593,7 +4650,7 @@
 	if ((conn != NULL) && (conn->ready))
 	{
 		/* If we're directly connected, send a direct IM */
-		purple_debug_info("oscar", "Sending direct IM with flags %i", imflags);
+		purple_debug_info("oscar", "Sending direct IM with flags %i\n", imflags);
 		purple_odc_send_im(conn, tmp1, imflags);
 	} else {
 		struct buddyinfo *bi;
@@ -4694,7 +4751,7 @@
 			/* Messaging an SMS (mobile) user */
 			tmp2 = purple_markup_strip_html(tmp1);
 			is_html = FALSE;
-		} else if (oscar_util_valid_name_icq(purple_account_get_username(account))) {
+		} else if (od->icq) {
 			if (oscar_util_valid_name_icq(name)) {
 				/* From ICQ to ICQ */
 				tmp2 = purple_markup_strip_html(tmp1);
@@ -4990,6 +5047,9 @@
 void
 oscar_set_status(PurpleAccount *account, PurpleStatus *status)
 {
+	PurpleConnection *pc;
+	OscarData *od;
+
 	purple_debug_info("oscar", "Set status to %s\n", purple_status_get_name(status));
 
 	if (!purple_status_is_active(status))
@@ -4998,11 +5058,14 @@
 	if (!purple_account_is_connected(account))
 		return;
 
+	pc = purple_account_get_connection(account);
+	od = purple_connection_get_protocol_data(pc);
+
 	/* Set the AIM-style away message for both AIM and ICQ accounts */
 	oscar_set_info_and_status(account, FALSE, NULL, TRUE, status);
 
 	/* Set the ICQ status for ICQ accounts only */
-	if (oscar_util_valid_name_icq(purple_account_get_username(account)))
+	if (od->icq)
 		oscar_set_status_icq(account);
 }
 
@@ -5244,7 +5307,7 @@
 	{ /* If not in server list then prune from local list */
 		GSList *cur, *next;
 		GSList *buddies = purple_find_buddies(account, NULL);
-
+		
 		/* Buddies */
 		cur = NULL;
 
@@ -5334,28 +5397,45 @@
 
 	/* 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)))
 		switch (curitem->type) {
 			case AIM_SSI_TYPE_BUDDY: { /* Buddy */
 				if (curitem->name) {
 					struct aim_ssi_item *groupitem;
-					const char *gname, *alias;
+					char *gname, *gname_utf8, *alias, *alias_utf8;
 
 					groupitem = aim_ssi_itemlist_find(od->ssi.local, curitem->gid, 0x0000);
 					gname = groupitem ? groupitem->name : NULL;
-
-					g = purple_find_group(gname ? gname : _("Orphans"));
+					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;
+
+					g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans"));
 					if (g == NULL) {
-						g = purple_group_new(gname ? gname : _("Orphans"));
+						g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
 						purple_blist_add_group(g, NULL);
 					}
 
 					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;
+
 					b = purple_find_buddy_in_group(account, curitem->name, g);
 					if (b) {
 						/* Get server stored alias */
-						purple_blist_alias_buddy(b, alias);
+						purple_blist_alias_buddy(b, alias_utf8);
 					} else {
-						b = purple_buddy_new(account, curitem->name, alias);
+						b = purple_buddy_new(account, curitem->name, alias_utf8);
 
 						purple_debug_info("oscar",
 								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname);
@@ -5379,15 +5459,30 @@
 								purple_buddy_get_name(b),
 								OSCAR_STATUS_ID_MOBILE, NULL);
 					}
+
+					g_free(gname_utf8);
+					g_free(alias_utf8);
 				}
 			} break;
 
 			case AIM_SSI_TYPE_GROUP: { /* Group */
-				const char *gname = curitem->name;
-				if (gname != NULL && purple_find_group(gname) == NULL) {
-					g = purple_group_new(gname);
+				char *gname;
+				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;
+
+				if (gname_utf8 != NULL && purple_find_group(gname_utf8) == NULL) {
+					g = purple_group_new(gname_utf8);
 					purple_blist_add_group(g, NULL);
 				}
+				g_free(gname_utf8);
 			} break;
 
 			case AIM_SSI_TYPE_PERMIT: { /* Permit buddy */
@@ -5526,8 +5621,7 @@
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	const char *gname;
-	char *alias;
+	char *gname, *gname_utf8, *alias, *alias_utf8;
 	PurpleBuddy *b;
 	PurpleGroup *g;
 	struct aim_ssi_item *ssi_item;
@@ -5548,7 +5642,19 @@
 		return 1;
 
 	gname = aim_ssi_itemlist_findparentname(od->ssi.local, name);
+	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;
+	g_free(alias);
 
 	b = purple_find_buddy(account, name);
 	if (b) {
@@ -5557,21 +5663,21 @@
 		 * of your buddies, so update our local buddy list with
 		 * the person's new alias.
 		 */
-		purple_blist_alias_buddy(b, alias);
+		purple_blist_alias_buddy(b, alias_utf8);
 	} else if (snac_subtype == 0x0008) {
 		/*
 		 * You're logged in somewhere else and you added a buddy to
 		 * your server list, so add them to your local buddy list.
 		 */
-		b = purple_buddy_new(account, name, alias);
-
-		if (!(g = purple_find_group(gname ? gname : _("Orphans")))) {
-			g = purple_group_new(gname ? gname : _("Orphans"));
+		b = purple_buddy_new(account, name, alias_utf8);
+
+		if (!(g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
+			g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
 			purple_blist_add_group(g, NULL);
 		}
 
 		purple_debug_info("oscar",
-				   "ssi: adding buddy %s to group %s to local list\n", name, gname ? gname : _("Orphans"));
+				   "ssi: adding buddy %s to group %s to local list\n", name, gname_utf8 ? gname_utf8 : _("Orphans"));
 		purple_blist_add_buddy(b, NULL, g, NULL);
 
 		/* Mobile users should always be online */
@@ -5584,8 +5690,6 @@
 
 	}
 
-	g_free(alias);
-
 	ssi_item = aim_ssi_itemlist_finditem(od->ssi.local,
 			gname, name, AIM_SSI_TYPE_BUDDY);
 	if (ssi_item == NULL)
@@ -5595,6 +5699,9 @@
 				"group %s\n", name, gname);
 	}
 
+	g_free(gname_utf8);
+	g_free(alias_utf8);
+
 	return 1;
 }
 
@@ -6297,6 +6404,7 @@
 	struct name_data *data;
 	PurpleGroup *g;
 	char *comment;
+	gchar *comment_utf8;
 	gchar *title;
 	PurpleAccount *account;
 	const char *name;
@@ -6315,6 +6423,7 @@
 	data = g_new(struct name_data, 1);
 
 	comment = aim_ssi_getcomment(od->ssi.local, purple_group_get_name(g), name);
+	comment_utf8 = comment ? oscar_utf8_try_convert(account, od, comment) : NULL;
 
 	data->gc = gc;
 	data->name = g_strdup(name);
@@ -6322,7 +6431,7 @@
 
 	title = g_strdup_printf(_("Buddy Comment for %s"), data->name);
 	purple_request_input(gc, title, _("Buddy Comment:"), NULL,
-					   comment, TRUE, FALSE, NULL,
+					   comment_utf8, TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(oscar_ssi_editcomment),
 					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
 					   account, data->name, NULL,
@@ -6330,6 +6439,7 @@
 	g_free(title);
 
 	g_free(comment);
+	g_free(comment_utf8);
 }
 
 static void
--- a/libpurple/protocols/oscar/oscar.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Sat Jan 09 02:00:18 2010 +0000
@@ -29,10 +29,10 @@
 #ifndef _OSCAR_H_
 #define _OSCAR_H_
 
+#include "internal.h"
 #include "circbuffer.h"
 #include "debug.h"
 #include "eventloop.h"
-#include "internal.h"
 #include "proxy.h"
 #include "sslconn.h"
 
--- a/libpurple/protocols/oscar/oscarcommon.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,9 @@
  * and libicq.c
  */
 
+#include "internal.h"
+
 #include "accountopt.h"
-#include "internal.h"
 #include "prpl.h"
 #include "version.h"
 #include "notify.h"
--- a/libpurple/protocols/qq/buddy_list.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "qq.h"
 
 #include "debug.h"
--- a/libpurple/protocols/qq/buddy_memo.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/buddy_memo.c	Sat Jan 09 02:00:18 2010 +0000
@@ -119,7 +119,7 @@
 
 	who = uid_to_purple_name(bd_uid);
 	buddy = purple_find_buddy(account, who);
-	if (buddy == NULL || buddy->proto_data == NULL) {
+	if (buddy == NULL || purple_buddy_get_protocol_data(buddy) == NULL) {
 		g_free(who);
 		purple_debug_info("QQ", "Error...Can NOT find %d!\n", bd_uid);
 		return;
--- a/libpurple/protocols/qq/buddy_opt.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "notify.h"
 #include "request.h"
 #include "privacy.h"
--- a/libpurple/protocols/qq/char_conv.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/char_conv.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "char_conv.h"
 #include "packet_parse.h"
--- a/libpurple/protocols/qq/qq.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/qq.h	Sat Jan 09 02:00:18 2010 +0000
@@ -25,7 +25,6 @@
 #ifndef _QQ_QQ_H_
 #define _QQ_QQ_H_
 
-#include <glib.h>
 #include "internal.h"
 #include "ft.h"
 #include "circbuffer.h"
--- a/libpurple/protocols/qq/qq_base.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/qq_base.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "server.h"
 #include "cipher.h"
 #include "request.h"
--- a/libpurple/protocols/qq/qq_network.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "group_info.h"
--- a/libpurple/protocols/qq/qq_process.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/qq_process.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "buddy_list.h"
--- a/libpurple/protocols/qq/utils.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/qq/utils.c	Sat Jan 09 02:00:18 2010 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include "limits.h"
 #include "stdlib.h"
 #include "string.h"
--- a/libpurple/protocols/sametime/sametime.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,6 +21,7 @@
   USA.
 */
 
+#include "internal.h"
 
 /* system includes */
 #include <stdlib.h>
@@ -30,9 +31,6 @@
 #include <glib.h>
 
 /* purple includes */
-#include "internal.h"
-#include "config.h"
-
 #include "account.h"
 #include "accountopt.h"
 #include "circbuffer.h"
--- a/libpurple/protocols/silc/buddy.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/buddy.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/chat.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/chat.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/ft.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/ft.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/ops.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/ops.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/pk.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/pk.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/silc.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/silc.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/util.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/util.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/wb.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/silc/wb.c	Sat Jan 09 02:00:18 2010 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/yahoo/util.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Sat Jan 09 02:00:18 2010 +0000
@@ -656,7 +656,10 @@
 	/* Strip off the outter HTML node */
 	/* This probably isn't necessary, especially if we made the outter HTML
 	 * node an empty span.  But the HTML is simpler this way. */
-	xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13);
+	if (!purple_strequal(xmlstr1, "<html/>"))
+		xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13);
+	else
+		xmlstr2 = g_strdup("");
 	g_free(xmlstr1);
 
 	esc = g_strescape(x, NULL);
--- a/libpurple/protocols/yahoo/ycht.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/protocols/yahoo/ycht.c	Sat Jan 09 02:00:18 2010 +0000
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "prpl.h"
 #include "notify.h"
--- a/libpurple/prpl.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/prpl.c	Sat Jan 09 02:00:18 2010 +0000
@@ -595,17 +595,21 @@
 
 	while (list) {
 		PurpleBuddy *buddy = list->data;
-		PurpleMediaCaps oldcaps = buddy->media_caps;
+		PurpleMediaCaps oldcaps = purple_buddy_get_media_caps(buddy);
+		PurpleMediaCaps newcaps = 0;
 		const gchar *bname = purple_buddy_get_name(buddy);
 		list = g_slist_delete_link(list, list);
-		buddy->media_caps = purple_prpl_get_media_caps(account, bname);
 
-		if (oldcaps == buddy->media_caps)
+		
+		newcaps = purple_prpl_get_media_caps(account, bname);
+		purple_buddy_set_media_caps(buddy, newcaps);
+
+		if (oldcaps == newcaps)
 			continue;
 
 		purple_signal_emit(purple_blist_get_handle(),
 				"buddy-caps-changed", buddy,
-				buddy->media_caps, oldcaps);
+				newcaps, oldcaps);
 	}
 #endif
 }
--- a/libpurple/prpl.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/prpl.h	Sat Jan 09 02:00:18 2010 +0000
@@ -91,14 +91,17 @@
 	PurpleIconScaleRules scale_rules;  /**< How to stretch this icon */
 };
 
+/** Represents an entry containing information that must be supplied by the
+ *  user when joining a chat.
+ */
 struct proto_chat_entry {
-	const char *label;
-	const char *identifier;
-	gboolean required;
-	gboolean is_int;
-	int min;
-	int max;
-	gboolean secret;
+	const char *label;       /**< User-friendly name of the entry */
+	const char *identifier;  /**< Used by the PRPL to identify the option */
+	gboolean required;       /**< True if it's required */
+	gboolean is_int;         /**< True if the entry expects an integer */
+	int min;                 /**< Minimum value in case of integer */
+	int max;                 /**< Maximum value in case of integer */
+	gboolean secret;         /**< True if the entry is secret (password) */
 };
 
 /** Represents "nudges" and "buzzes" that you may send to a buddy to attract
@@ -252,7 +255,26 @@
 	 * node.
 	 */
 	GList *(*blist_node_menu)(PurpleBlistNode *node);
+
+	/**
+	 * Returns a list of #proto_chat_entry structs, which represent
+	 * information required by the PRPL to join a chat. libpurple will
+	 * call join_chat along with the information filled by the user.
+	 *
+	 * @return A list of #proto_chat_entry structs
+	 */
 	GList *(*chat_info)(PurpleConnection *);
+
+	/**
+	 * Returns a hashtable which maps #proto_chat_entry struct identifiers
+	 * to default options as strings based on chat_name. The resulting 
+	 * hashtable should be created with g_hash_table_new_full(g_str_hash,
+	 * g_str_equal, NULL, g_free);. Use #get_chat_name if you instead need
+	 * to extract a chat name from a hashtable.
+	 *
+	 * @param chat_name The chat name to be turned into components
+	 * @return Hashtable containing the information extracted from chat_name
+	 */
 	GHashTable *(*chat_info_defaults)(PurpleConnection *, const char *chat_name);
 
 	/* All the server-related functions */
@@ -314,14 +336,80 @@
 	void (*rem_permit)(PurpleConnection *, const char *name);
 	void (*rem_deny)(PurpleConnection *, const char *name);
 	void (*set_permit_deny)(PurpleConnection *);
+
+	/**
+	 * Called when the user requests joining a chat. Should arrange for
+	 * #serv_got_joined_chat to be called.
+	 *
+	 * @param components A hashtable containing information required to
+	 *                   join the chat as described by the entries returned
+	 *                   by #chat_info. It may also be called when accepting
+	 *                   an invitation, in which case this matches the
+	 *                   data parameter passed to #serv_got_chat_invite.
+	 */
 	void (*join_chat)(PurpleConnection *, GHashTable *components);
+
+	/**
+	 * Called when the user refuses a chat invitation.
+	 *
+	 * @param components A hashtable containing information required to
+	 *                   join the chat as passed to #serv_got_chat_invite.
+	 */
 	void (*reject_chat)(PurpleConnection *, GHashTable *components);
+
+	/**
+	 * Returns a chat name based on the information in components. Use
+	 * #chat_info_defaults if you instead need to generate a hashtable 
+	 * from a chat name.
+	 *
+	 * @param components A hashtable containing information about the chat.
+	 */
 	char *(*get_chat_name)(GHashTable *components);
+
+	/**
+	 * Invite a user to join a chat.
+	 *
+	 * @param id      The id of the chat to invite the user to.
+	 * @param message A message displayed to the user when the invitation 
+	 *                is received.
+	 * @param who     The name of the user to send the invation to.
+	 */
 	void (*chat_invite)(PurpleConnection *, int id,
 						const char *message, const char *who);
+	/**
+	 * Called when the user requests leaving a chat.
+	 *
+	 * @param id The id of the chat to leave
+	 */
 	void (*chat_leave)(PurpleConnection *, int id);
+
+	/**
+	 * Send a whisper to a user in a chat.
+	 *
+	 * @param id      The id of the chat.
+	 * @param who     The name of the user to send the whisper to.
+	 * @param message The message of the whisper.
+	 */
 	void (*chat_whisper)(PurpleConnection *, int id,
 						 const char *who, const char *message);
+
+	/**
+	 * Send a message to a chat.
+	 * This PRPL function should return a positive value on success.
+	 * If the message is too big to be sent, return -E2BIG.  If
+	 * the account is not connected, return -ENOTCONN.  If the
+	 * PRPL is unable to send the message for another reason, return
+	 * some other negative value.  You can use one of the valid
+	 * errno values, or just big something.  If the message should
+	 * not be echoed to the conversation window, return 0.
+	 *
+	 * @param id      The id of the chat to send the message to.
+	 * @param message The message to send to the chat.
+	 * @param flags   A bitwise OR of #PurpleMessageFlags representing
+	 *                message flags.
+	 * @return 	  A positive number or 0 in case of succes,
+	 *                a negative error number in case of failure.
+	 */
 	int  (*chat_send)(PurpleConnection *, int id, const char *message, PurpleMessageFlags flags);
 
 	/** If implemented, this will be called regularly for this prpl's
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/purple-2-uninstalled.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,22 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
+Libs: ${abs_builddir}/libpurple.la
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/purple-2.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
+Name: libpurple
+Description: libpurple is a GLib-based instant messenger library.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lpurple
--- a/libpurple/purple-uninstalled.pc.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/purple-uninstalled.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -6,9 +6,14 @@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
 Requires: glib-2.0
-Cflags: -I${pcfiledir}
-Libs: ${pcfiledir}/libpurple.la
+Cflags: -I${abs_srcdir} -I${abs_builddir}
+Libs: ${abs_builddir}/libpurple.la
--- a/libpurple/purple.pc.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/purple.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -6,6 +6,8 @@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+plugindir=${libdir}/purple-@PURPLE_MAJOR_VERSION@
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
--- a/libpurple/roomlist.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/roomlist.c	Sat Jan 09 02:00:18 2010 +0000
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 
 #include "account.h"
--- a/libpurple/server.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/server.h	Sat Jan 09 02:00:18 2010 +0000
@@ -168,6 +168,14 @@
 						  const char *who, const char *message,
 						  GHashTable *data);
 
+/**
+ * Called by a prpl when an account has joined a chat.
+ *
+ * @param gc   The connection on which the chat was joined. 
+ * @param id   The id of the chat, assigned by the prpl.
+ * @param name The name of the chat.
+ * @return     The resulting conversation
+ */
 PurpleConversation *serv_got_joined_chat(PurpleConnection *gc,
 									   int id, const char *name);
 /**
@@ -181,7 +189,24 @@
  */
 void purple_serv_got_join_chat_failed(PurpleConnection *gc, GHashTable *data);
 
+/**
+ * Called by a prpl when an account has left a chat.
+ *
+ * @param g  The connection on which the chat was left.
+ * @param id The id of the chat, as assigned by the prpl.
+ */
 void serv_got_chat_left(PurpleConnection *g, int id);
+
+/**
+ * Called by a prpl when a message has been received in a chat.
+ *
+ * @param g       The connection on which the message was received.
+ * @param id      The id of the chat, as assigned by the prpl.
+ * @param who     The name of the user who sent the message.
+ * @param flags   The flags of the message.
+ * @param message The message received in the chat.
+ * @param mtime   The time when the message was received.
+ */
 void serv_got_chat_in(PurpleConnection *g, int id, const char *who,
 					  PurpleMessageFlags flags, const char *message, time_t mtime);
 void serv_send_file(PurpleConnection *gc, const char *who, const char *file);
--- a/libpurple/tests/Makefile.am	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/Makefile.am	Sat Jan 09 02:00:18 2010 +0000
@@ -11,6 +11,7 @@
 	    tests.h \
 		test_cipher.c \
 		test_jabber_jutil.c \
+		test_jabber_scram.c \
 		test_qq.c \
 		test_yahoo_util.c \
 		test_util.c \
@@ -26,11 +27,11 @@
 		-DBUILDDIR=\"$(top_builddir)\"
 
 check_libpurple_LDADD=\
-        @CHECK_LIBS@ \
-		$(GLIB_LIBS) \
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
 		$(top_builddir)/libpurple/protocols/qq/libqq.la \
 		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
-		$(top_builddir)/libpurple/libpurple.la
+		$(top_builddir)/libpurple/libpurple.la \
+        @CHECK_LIBS@ \
+		$(GLIB_LIBS)
 
 endif
--- a/libpurple/tests/check_libpurple.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/check_libpurple.c	Sat Jan 09 02:00:18 2010 +0000
@@ -44,7 +44,7 @@
 	purple_eventloop_set_ui_ops(&eventloop_ui_ops);
 
 	/* build our fake home directory */
-	home_dir = g_build_path(BUILDDIR, "libpurple", "tests", "home", NULL);
+	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);
 
@@ -67,6 +67,9 @@
 	int number_failed;
 	SRunner *sr;
 
+	if (g_getenv("PURPLE_CHECK_DEBUG"))
+		purple_debug_set_enabled(TRUE);
+
 	/* Make g_return_... functions fatal, ALWAYS.
 	 * As this is the test code, this is NOT controlled
 	 * by PURPLE_FATAL_ASSERTS. */
@@ -76,6 +79,7 @@
 
 	srunner_add_suite(sr, cipher_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
+	srunner_add_suite(sr, jabber_scram_suite());
 	srunner_add_suite(sr, qq_suite());
 	srunner_add_suite(sr, yahoo_util_suite());
 	srunner_add_suite(sr, util_suite());
--- a/libpurple/tests/test_cipher.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/test_cipher.c	Sat Jan 09 02:00:18 2010 +0000
@@ -142,12 +142,13 @@
 	PurpleCipherContext *context = NULL; \
 	gchar cdigest[41]; \
 	gboolean ret = FALSE; \
+	gchar *input = data; \
 	\
 	cipher = purple_ciphers_find_cipher("sha1"); \
 	context = purple_cipher_context_new(cipher, NULL); \
 	\
-	if((data)) { \
-		purple_cipher_context_append(context, (guchar *)(data), strlen((data))); \
+	if (input) { \
+		purple_cipher_context_append(context, (guchar *)input, strlen(input)); \
 	} else { \
 		gint j; \
 		guchar buff[1000]; \
@@ -202,12 +203,13 @@
 	PurpleCipherContext *context = NULL; \
 	gchar cdigest[65]; \
 	gboolean ret = FALSE; \
+	gchar *input = data; \
 	\
 	cipher = purple_ciphers_find_cipher("sha256"); \
 	context = purple_cipher_context_new(cipher, NULL); \
 	\
-	if((data)) { \
-		purple_cipher_context_append(context, (guchar *)(data), strlen((data))); \
+	if (input) { \
+		purple_cipher_context_append(context, (guchar *)input, strlen(input)); \
 	} else { \
 		gint j; \
 		guchar buff[1000]; \
--- a/libpurple/tests/test_jabber_jutil.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/test_jabber_jutil.c	Sat Jan 09 02:00:18 2010 +0000
@@ -40,6 +40,8 @@
 	fail_unless(jabber_nodeprep_validate("foo"));
 	fail_unless(jabber_nodeprep_validate("%d"));
 	fail_unless(jabber_nodeprep_validate("y\\z"));
+	fail_unless(jabber_nodeprep_validate("a="));
+	fail_unless(jabber_nodeprep_validate("a,"));
 
 	longnode = g_strnfill(1023, 'a');
 	fail_unless(jabber_nodeprep_validate(longnode));
@@ -118,6 +120,8 @@
 	assert_valid_jid("paul@[::1]"); /* IPv6 */
 	assert_valid_jid("paul@[2001:470:1f05:d58::2]");
 	assert_valid_jid("paul@[2001:470:1f05:d58::2]/foo");
+	assert_valid_jid("pa=ul@10.0.42.230");
+	assert_valid_jid("pa,ul@10.0.42.230");
 
 	assert_invalid_jid("@gmail.com");
 	assert_invalid_jid("@@gmail.com");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/tests/test_jabber_scram.c	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,117 @@
+#include <string.h>
+
+#include "tests.h"
+#include "../util.h"
+#include "../protocols/jabber/auth_scram.h"
+#include "../protocols/jabber/jutil.h"
+
+static JabberScramHash sha1_mech = { "-SHA-1", "sha1", 20 };
+
+#define assert_pbkdf2_equal(password, salt, count, expected) { \
+	GString *p = g_string_new(password); \
+	GString *s = g_string_new(salt); \
+	guchar *result = jabber_scram_hi(&sha1_mech, p, s, count); \
+	fail_if(result == NULL, "Hi() returned NULL"); \
+	fail_if(0 != memcmp(result, expected, 20), "Hi() returned invalid result"); \
+	g_string_free(s, TRUE); \
+	g_string_free(p, TRUE); \
+}
+
+START_TEST(test_pbkdf2)
+{
+	assert_pbkdf2_equal("password", "salt", 1, "\x0c\x60\xc8\x0f\x96\x1f\x0e\x71\xf3\xa9\xb5\x24\xaf\x60\x12\x06\x2f\xe0\x37\xa6");
+	assert_pbkdf2_equal("password", "salt", 2, "\xea\x6c\x01\x4d\xc7\x2d\x6f\x8c\xcd\x1e\xd9\x2a\xce\x1d\x41\xf0\xd8\xde\x89\x57");
+	assert_pbkdf2_equal("password", "salt", 4096, "\x4b\x00\x79\x01\xb7\x65\x48\x9a\xbe\xad\x49\xd9\x26\xf7\x21\xd0\x65\xa4\x29\xc1");
+
+#if 0
+	/* This causes libcheck to time out :-D */
+	assert_pbkdf2_equal("password", "salt", 16777216, "\xee\xfe\x3d\x61\xcd\x4d\xa4\xe4\xe9\x94\x5b\x3d\x6b\xa2\x15\x8c\x26\x34\xe9\x84");
+#endif
+}
+END_TEST
+
+START_TEST(test_proofs)
+{
+	JabberScramData *data = g_new0(JabberScramData, 1);
+	gboolean ret;
+	GString *salt;
+	const char *client_proof;
+/*	const char *server_signature; */
+
+	data->hash = &sha1_mech;
+	data->password = g_strdup("password");
+	data->auth_message = g_string_new("n=username@jabber.org,r=8jLxB5515dhFxBil5A0xSXMH,"
+			"r=8jLxB5515dhFxBil5A0xSXMHabc,s=c2FsdA==,i=1,"
+			"c=biws,r=8jLxB5515dhFxBil5A0xSXMHabc");
+	client_proof = "\x48\x61\x30\xa5\x61\x0b\xae\xb9\xe4\x11\xa8\xfd\xa5\xcd\x34\x1d\x8a\x3c\x28\x17";
+
+	salt = g_string_new("salt");
+	ret = jabber_scram_calc_proofs(data, salt, 1);
+	fail_if(ret == FALSE, "Failed to calculate SCRAM proofs!");
+
+	fail_unless(0 == memcmp(client_proof, data->client_proof->str, 20));
+	g_string_free(salt, TRUE);
+
+	jabber_scram_data_destroy(data);
+}
+END_TEST
+
+#define assert_successful_exchange(pw, nonce, start_data, challenge1, response1, success) { \
+	JabberScramData *data = g_new0(JabberScramData, 1); \
+	gboolean ret; \
+	gchar *out; \
+	\
+	data->step = 1; \
+	data->hash = &sha1_mech; \
+	data->password = jabber_saslprep(pw); \
+	fail_if(data->password == NULL); \
+	data->cnonce = g_strdup(nonce); \
+	data->auth_message = g_string_new(start_data); \
+	\
+	ret = jabber_scram_feed_parser(data, challenge1, &out); \
+	fail_unless(ret == TRUE); \
+	fail_unless(g_str_equal(out, response1), "Got unexpected response to challenge. Expected %s, got %s", response1, out); \
+	g_free(out); \
+	\
+	data->step = 2; \
+	ret = jabber_scram_feed_parser(data, success, &out); \
+	fail_unless(ret == TRUE); \
+	fail_unless(out == NULL); \
+	\
+	jabber_scram_data_destroy(data); \
+}
+
+START_TEST(test_mech)
+{
+	assert_successful_exchange("password", "H7yDYKAWBCrM2Fa5SxGa4iez",
+			"n=paul,r=H7yDYKAWBCrM2Fa5SxGa4iez",
+			"r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,s=3rXeErP/os7jUNqU,i=4096",
+			"c=biws,r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,p=pXkak78EuwwOEwk2/h/OzD7NkEI=",
+			"v=ldX4EBNnOgDnNTOCmbSfBHAUCOs=");
+
+	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=");
+}
+END_TEST
+
+Suite *
+jabber_scram_suite(void)
+{
+	Suite *s = suite_create("Jabber SASL SCRAM functions");
+
+	TCase *tc = tcase_create("PBKDF2 Functionality");
+	tcase_add_test(tc, test_pbkdf2);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("SCRAM Proofs");
+	tcase_add_test(tc, test_proofs);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("SCRAM exchange");
+	tcase_add_test(tc, test_mech);
+	suite_add_tcase(s, tc);
+	return s;
+}
--- a/libpurple/tests/test_yahoo_util.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Sat Jan 09 02:00:18 2010 +0000
@@ -15,6 +15,10 @@
 
 START_TEST(test_codes_to_html)
 {
+	assert_string_equal_free("",
+			yahoo_codes_to_html(""));
+	assert_string_equal_free("",
+			yahoo_codes_to_html("\x1B[12345m"));
 	assert_string_equal_free("plain",
 			yahoo_codes_to_html("plain"));
 	assert_string_equal_free("unknown  ansi code",
--- a/libpurple/tests/tests.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/tests/tests.h	Sat Jan 09 02:00:18 2010 +0000
@@ -10,6 +10,7 @@
 Suite * master_suite(void);
 Suite * cipher_suite(void);
 Suite * jabber_jutil_suite(void);
+Suite * jabber_scram_suite(void);
 Suite * qq_suite(void);
 Suite * yahoo_util_suite(void);
 Suite * util_suite(void);
--- a/libpurple/theme-manager.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/theme-manager.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme-manager.h"
 #include "util.h"
--- a/libpurple/theme.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/theme.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme.h"
 #include "util.h"
--- a/libpurple/whiteboard.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/whiteboard.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "whiteboard.h"
 #include "prpl.h"
--- a/libpurple/xmlnode.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/libpurple/xmlnode.c	Sat Jan 09 02:00:18 2010 +0000
@@ -29,8 +29,8 @@
  * as I want to be.  Thank you libxode for giving me a good starting point */
 #define _PURPLE_XMLNODE_C_
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 
 #include <libxml/parser.h>
 #include <string.h>
@@ -588,9 +588,7 @@
 			const char *prefix = (const char *)attributes[i+1];
 			char *txt;
 			int attrib_len = attributes[i+4] - attributes[i+3];
-			char *attrib = g_malloc(attrib_len + 1);
-			memcpy(attrib, attributes[i+3], attrib_len);
-			attrib[attrib_len] = '\0';
+			char *attrib = g_strndup((const char *)attributes[i+3], attrib_len);
 			txt = attrib;
 			attrib = purple_unescape_html(txt);
 			g_free(txt);
--- a/pidgin/gtkblist.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkblist.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1205,9 +1205,9 @@
 
 		purple_blist_node_set_bool(node, "collapsed", TRUE);
 
-		for(cnode = node->child; cnode; cnode = cnode->next) {
+		for(cnode = purple_blist_node_get_first_child(node); cnode; cnode = purple_blist_node_get_sibling_next(cnode)) {
 			if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
-				gtknode = cnode->ui_data;
+				gtknode = purple_blist_node_get_ui_data(cnode);
 				if (!gtknode->contact_expanded)
 					continue;
 				gtknode->contact_expanded = FALSE;
@@ -1239,7 +1239,7 @@
 		else
 			buddy = (PurpleBuddy*)node;
 
-		pidgin_dialogs_im_with_user(buddy->account, buddy->name);
+		pidgin_dialogs_im_with_user(purple_buddy_get_account(buddy), purple_buddy_get_name(buddy));
 	} else if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
 		gtk_blist_join_chat((PurpleChat *)node);
 	} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -1259,9 +1259,9 @@
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (PURPLE_BLIST_NODE_IS_BUDDY(node))
-			purple_blist_request_add_chat(NULL, (PurpleGroup*)node->parent->parent, NULL, NULL);
+			purple_blist_request_add_chat(NULL, purple_buddy_get_group(PURPLE_BUDDY(node)), NULL, NULL);
 		if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_CHAT(node))
-			purple_blist_request_add_chat(NULL, (PurpleGroup*)node->parent, NULL, NULL);
+			purple_blist_request_add_chat(NULL, purple_contact_get_group(PURPLE_CONTACT(node)), NULL, NULL);
 		else if (PURPLE_BLIST_NODE_IS_GROUP(node))
 			purple_blist_request_add_chat(NULL, (PurpleGroup*)node, NULL, NULL);
 	}
@@ -1279,13 +1279,13 @@
 	if(gtk_tree_selection_get_selected(sel, NULL, &iter)){
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &node, -1);
 		if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node->parent->parent)->name,
-					NULL);
-		} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)
-				|| PURPLE_BLIST_NODE_IS_CHAT(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node->parent)->name, NULL);
+			PurpleGroup *group = purple_buddy_get_group(PURPLE_BUDDY(node));
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(group), NULL);
+		} else if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_CHAT(node)) {
+			PurpleGroup *group = purple_contact_get_group(PURPLE_CONTACT(node));
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(group), NULL);
 		} else if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
-			purple_blist_request_add_buddy(NULL, NULL, ((PurpleGroup*)node)->name, NULL);
+			purple_blist_request_add_buddy(NULL, NULL, purple_group_get_name(PURPLE_GROUP(node)), NULL);
 		}
 	}
 	else {
@@ -1337,11 +1337,11 @@
 	if(!PURPLE_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _pidgin_blist_node *)node->ui_data;
+	gtknode = purple_blist_node_get_ui_data(node);
 
 	gtknode->contact_expanded = TRUE;
 
-	for(bnode = node->child; bnode; bnode = bnode->next) {
+	for(bnode = purple_blist_node_get_first_child(node); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) {
 		pidgin_blist_update(NULL, bnode);
 	}
 
@@ -1356,7 +1356,7 @@
 		/* Let the treeview draw so it knows where to scroll */
 		ex->treeview = GTK_TREE_VIEW(gtkblist->treeview);
 		ex->path = path;
-		ex->node = node->child;
+		ex->node = purple_blist_node_get_first_child(node);
 		g_idle_add(scroll_to_expanded_cell, ex);
 	}
 }
@@ -1370,11 +1370,11 @@
 	if(!PURPLE_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _pidgin_blist_node *)node->ui_data;
+	gtknode = purple_blist_node_get_ui_data(node);
 
 	gtknode->contact_expanded = FALSE;
 
-	for(bnode = node->child; bnode; bnode = bnode->next) {
+	for(bnode = purple_blist_node_get_first_child(node); bnode; bnode = purple_blist_node_get_sibling_next(bnode)) {
 		pidgin_blist_update(NULL, bnode);
 	}
 }
@@ -1465,10 +1465,10 @@
 	submenu = gtk_menu_new();
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 
-	for (group = purple_blist_get_root(); group; group = group->next) {
-		if (group->type != PURPLE_BLIST_GROUP_NODE)
+	for (group = purple_blist_get_root(); group; group = purple_blist_node_get_sibling_next(group)) {
+		if (!PURPLE_BLIST_NODE_IS_GROUP(group))
 			continue;
-		if (group == node->parent)
+		if (group == purple_blist_node_get_parent(node))
 			continue;
 		menuitem = pidgin_new_item_from_stock(submenu, purple_group_get_name((PurpleGroup *)group), NULL,
 						      G_CALLBACK(gtk_blist_menu_move_to_cb), node, 0, 0, NULL);
@@ -1479,6 +1479,8 @@
 
 void
 pidgin_blist_make_buddy_menu(GtkWidget *menu, PurpleBuddy *buddy, gboolean sub) {
+	PurpleAccount *account = NULL;
+	PurpleConnection *pc = NULL;
 	PurplePluginProtocolInfo *prpl_info;
 	PurpleContact *contact;
 	PurpleBlistNode *node;
@@ -1487,13 +1489,16 @@
 	g_return_if_fail(menu);
 	g_return_if_fail(buddy);
 
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(buddy->account->gc->prpl);
-
-	node = (PurpleBlistNode*)buddy;
+	account = purple_buddy_get_account(buddy);
+	pc = purple_account_get_connection(account);
+	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(pc));
+
+	node = PURPLE_BLIST_NODE(buddy);
 
 	contact = purple_buddy_get_contact(buddy);
 	if (contact) {
-		contact_expanded = ((struct _pidgin_blist_node *)(((PurpleBlistNode*)contact)->ui_data))->contact_expanded;
+		PidginBlistNode *node = purple_blist_node_get_ui_data(PURPLE_BLIST_NODE(contact));
+		contact_expanded = node->contact_expanded;
 	}
 
 	if (prpl_info && prpl_info->get_info) {
--- a/pidgin/gtkblist.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkblist.h	Sat Jan 09 02:00:18 2010 +0000
@@ -132,9 +132,9 @@
 	gpointer priv;                   /**< Pointer to opaque private data */
 };
 
-#define PIDGIN_BLIST(list) ((PidginBuddyList *)(list)->ui_data)
+#define PIDGIN_BLIST(list) ((PidginBuddyList *)purple_blist_get_ui_data())
 #define PIDGIN_IS_PIDGIN_BLIST(list) \
-	((list)->ui_ops == pidgin_blist_get_ui_ops())
+	(purple_blist_get_ui_ops() == pidgin_blist_get_ui_ops())
 
 /**************************************************************************
  * @name GTK+ Buddy List API
--- a/pidgin/gtkcertmgr.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Sat Jan 09 02:00:18 2010 +0000
@@ -25,10 +25,8 @@
  *
  */
 
-#include <glib.h>
-
+#include "internal.h"
 #include "core.h"
-#include "internal.h"
 #include "pidgin.h"
 #include "pidginstock.h"
 
--- a/pidgin/gtkconv.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkconv.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1113,114 +1113,13 @@
 	clear_conversation_scrollback(conv);
 }
 
-struct _search {
-	PidginWindow *gtkwin;
-	GtkWidget *entry;
-};
-
-static void do_search_cb(GtkWidget *widget, gint resp, struct _search *s)
-{
-	PurpleConversation *conv;
-	PidginConversation *gtk_active_conv;
-	GList *iter;
-
-	conv = pidgin_conv_window_get_active_conversation(s->gtkwin);
-	gtk_active_conv = PIDGIN_CONVERSATION(conv);
-
-	switch (resp)
-	{
-		case GTK_RESPONSE_OK:
-			/* clear highlighting except the active conversation window
-			 * highlight the keywords in the active conversation window */
-			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin) ; iter ; iter = iter->next)
-			{
-				PidginConversation *gtkconv = iter->data;
-
-				if (gtkconv != gtk_active_conv)
-				{
-					gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
-				}
-				else
-				{
-					gtk_imhtml_search_find(GTK_IMHTML(gtk_active_conv->imhtml),
-					                       gtk_entry_get_text(GTK_ENTRY(s->entry)));
-				}
-			}
-			break;
-
-		case GTK_RESPONSE_DELETE_EVENT:
-		case GTK_RESPONSE_CLOSE:
-			/* clear the keyword highlighting in all the conversation windows */
-			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin); iter; iter=iter->next)
-			{
-				PidginConversation *gconv = iter->data;
-				gtk_imhtml_search_clear(GTK_IMHTML(gconv->imhtml));
-			}
-
-			gtk_widget_destroy(s->gtkwin->dialogs.search);
-			s->gtkwin->dialogs.search = NULL;
-			g_free(s);
-			break;
-	}
-}
-
 static void
 menu_find_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *gtkwin = data;
-	GtkWidget *hbox;
-	GtkWidget *img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-						  gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-	GtkWidget *label;
-	struct _search *s;
-
-	if (gtkwin->dialogs.search) {
-		gtk_window_present(GTK_WINDOW(gtkwin->dialogs.search));
-		return;
-	}
-
-	s = g_malloc(sizeof(struct _search));
-	s->gtkwin = gtkwin;
-
-	gtkwin->dialogs.search = gtk_dialog_new_with_buttons(_("Find"),
-			GTK_WINDOW(gtkwin->window), GTK_DIALOG_DESTROY_WITH_PARENT,
-			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-			GTK_STOCK_FIND, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response(GTK_DIALOG(gtkwin->dialogs.search),
-									GTK_RESPONSE_OK);
-	g_signal_connect(G_OBJECT(gtkwin->dialogs.search), "response",
-					 G_CALLBACK(do_search_cb), s);
-
-	gtk_container_set_border_width(GTK_CONTAINER(gtkwin->dialogs.search), PIDGIN_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(gtkwin->dialogs.search), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(gtkwin->dialogs.search), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BORDER);
-	gtk_container_set_border_width(
-		GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), PIDGIN_HIG_BOX_SPACE);
-
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox),
-					  hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkwin->dialogs.search),
-									  GTK_RESPONSE_OK, FALSE);
-
-	label = gtk_label_new(NULL);
-	gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Search for:"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-
-	s->entry = gtk_entry_new();
-	gtk_entry_set_activates_default(GTK_ENTRY(s->entry), TRUE);
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(s->entry));
-	g_signal_connect(G_OBJECT(s->entry), "changed",
-					 G_CALLBACK(pidgin_set_sensitive_if_input),
-					 gtkwin->dialogs.search);
-	gtk_box_pack_start(GTK_BOX(hbox), s->entry, FALSE, FALSE, 0);
-
-	gtk_widget_show_all(gtkwin->dialogs.search);
-	gtk_widget_grab_focus(s->entry);
+	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(gtkwin);
+	gtk_widget_show_all(gtkconv->quickfind.container);
+	gtk_widget_grab_focus(gtkconv->quickfind.entry);
 }
 
 #ifdef USE_VV
@@ -3916,8 +3815,7 @@
 	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 4);
 
 	if (buddy != NULL &&
-	    !purple_presence_is_online(purple_buddy_get_presence(buddy)) &&
-	    !purple_account_supports_offline_message(account, buddy))
+	    !purple_presence_is_online(purple_buddy_get_presence(buddy)))
 	{
 		gtk_widget_set_sensitive(label, FALSE);
 
@@ -4899,6 +4797,121 @@
 	return FALSE;
 }
 
+/* Close button {{{ */
+static gboolean
+close_button_left_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
+{
+	static GdkCursor *ptr = NULL;
+	if (ptr == NULL) {
+		ptr = gdk_cursor_new(GDK_LEFT_PTR);
+	}
+
+	gtk_label_set_markup(label, "×");
+	gdk_window_set_cursor(event->window, ptr);
+	return FALSE;
+}
+
+static gboolean
+close_button_entered_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
+{
+	static GdkCursor *hand = NULL;
+	if (hand == NULL) {
+		hand = gdk_cursor_new(GDK_HAND2);
+	}
+
+	gtk_label_set_markup(label, "<u>×</u>");
+	gdk_window_set_cursor(event->window, hand);
+	return FALSE;
+}
+
+static GtkWidget *
+create_close_button(void)
+{
+	GtkWidget *ebox = gtk_event_box_new();
+	GtkWidget *close_image;
+
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+	gtk_widget_set_events(ebox, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
+	close_image = gtk_label_new("×");
+	g_signal_connect(G_OBJECT(ebox), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
+	g_signal_connect(G_OBJECT(ebox), "leave-notify-event", G_CALLBACK(close_button_left_cb), close_image);
+	gtk_widget_show(close_image);
+	gtk_container_add(GTK_CONTAINER(ebox), close_image);
+
+	return ebox;
+}
+
+/* }}} */
+
+/* Quick Find {{{ */
+static gboolean
+pidgin_conv_end_quickfind(PidginConversation *gtkconv)
+{
+	gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
+
+	gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
+	gtk_widget_hide_all(gtkconv->quickfind.container);
+
+	gtk_widget_grab_focus(gtkconv->entry);
+	return TRUE;
+}
+
+static gboolean
+quickfind_process_input(GtkWidget *entry, GdkEventKey *event, PidginConversation *gtkconv)
+{
+	switch (event->keyval) {
+		case GDK_Return:
+		case GDK_KP_Enter:
+			if (gtk_imhtml_search_find(GTK_IMHTML(gtkconv->imhtml), gtk_entry_get_text(GTK_ENTRY(entry)))) {
+				gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, NULL);
+			} else {
+				GdkColor col;
+				col.red = 0xffff;
+				col.green = 0xafff;
+				col.blue = 0xafff;
+				gtk_widget_modify_base(gtkconv->quickfind.entry, GTK_STATE_NORMAL, &col);
+			}
+			break;
+		case GDK_Escape:
+			pidgin_conv_end_quickfind(gtkconv);
+			break;
+		default:
+			return FALSE;
+	}
+	return TRUE;
+}
+
+static void
+pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
+{
+	GtkWidget *widget = gtk_hbox_new(FALSE, 0);
+	GtkWidget *label, *entry, *close;
+
+	gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
+
+	close = create_close_button();
+	gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0);
+	gtk_tooltips_set_tip(gtkconv->tooltips, close,
+	                     _("Close Find bar"), NULL);
+
+	label = gtk_label_new(_("Find:"));
+	gtk_box_pack_start(GTK_BOX(widget), label, FALSE, FALSE, 10);
+
+	entry = gtk_entry_new();
+	gtk_box_pack_start(GTK_BOX(widget), entry, TRUE, TRUE, 0);
+
+	gtkconv->quickfind.entry = entry;
+	gtkconv->quickfind.container = widget;
+
+	/* Hook to signals and stuff */
+	g_signal_connect(G_OBJECT(entry), "key_press_event",
+			G_CALLBACK(quickfind_process_input), gtkconv);
+	g_signal_connect_swapped(G_OBJECT(close), "button-press-event",
+			G_CALLBACK(pidgin_conv_end_quickfind), gtkconv);
+}
+
+/* }}} */
+
 static GtkWidget *
 setup_common_pane(PidginConversation *gtkconv)
 {
@@ -5037,6 +5050,8 @@
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "key_release_event",
 	                 G_CALLBACK(refocus_entry_cb), gtkconv);
 
+	pidgin_conv_setup_quickfind(gtkconv, vbox);
+
 	gtkconv->lower_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), gtkconv->lower_hbox, FALSE, FALSE, 0);
 	gtk_widget_show(gtkconv->lower_hbox);
@@ -9402,39 +9417,12 @@
 		                              gtkconv->tab_cont));
 }
 
-static gboolean
-close_button_left_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
-{
-	static GdkCursor *ptr = NULL;
-	if (ptr == NULL) {
-		ptr = gdk_cursor_new(GDK_LEFT_PTR);
-	}
-
-	gtk_label_set_markup(label, "×");
-	gdk_window_set_cursor(event->window, ptr);
-	return FALSE;
-}
-
-static gboolean
-close_button_entered_cb(GtkWidget *widget, GdkEventCrossing *event, GtkLabel *label)
-{
-	static GdkCursor *hand = NULL;
-	if (hand == NULL) {
-		hand = gdk_cursor_new(GDK_HAND2);
-	}
-
-	gtk_label_set_markup(label, "<u>×</u>");
-	gdk_window_set_cursor(event->window, hand);
-	return FALSE;
-}
-
 void
 pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	PurpleConversation *conv = gtkconv->active_conv;
 	PidginConversation *focus_gtkconv;
 	GtkWidget *tab_cont = gtkconv->tab_cont;
-	GtkWidget *close_image;
 	PurpleConversationType conv_type;
 	const gchar *tmp_lab;
 
@@ -9448,14 +9436,7 @@
 
 
 	/* Close button. */
-	gtkconv->close = gtk_event_box_new();
-	gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE);
-	gtk_widget_set_events(gtkconv->close, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-	close_image = gtk_label_new("×");
-	g_signal_connect(G_OBJECT(gtkconv->close), "enter-notify-event", G_CALLBACK(close_button_entered_cb), close_image);
-	g_signal_connect(G_OBJECT(gtkconv->close), "leave-notify-event", G_CALLBACK(close_button_left_cb), close_image);
-	gtk_widget_show(close_image);
-	gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
+	gtkconv->close = create_close_button();
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 	                     _("Close conversation"), NULL);
 
--- a/pidgin/gtkconv.h	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkconv.h	Sat Jan 09 02:00:18 2010 +0000
@@ -177,6 +177,12 @@
 		int timer;
 		GList *current;
 	} attach;
+
+	/* Quick Find (since 2.7.0) */
+	struct {
+		GtkWidget *entry;
+		GtkWidget *container;
+	} quickfind;
 };
 
 /*@}*/
--- a/pidgin/gtkdialogs.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkdialogs.c	Sat Jan 09 02:00:18 2010 +0000
@@ -195,11 +195,11 @@
 	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
 	{N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
 	{N_("Lao"),                 "lo", "Anousak Souphavah", "anousak@gmail.com"},
-	{N_("Lithuanian"),          "lt", "Laurynas Biveinis", "laurynas.biveinis@gmail.com"},
 	{N_("Macedonian"),          "mk", "Arangel Angov ", "arangel@linux.net.mk"},
 	{N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
 	{N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
 	{N_("Mongolian"),           "mn", "gooyo", NULL},
+	{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"},
@@ -227,6 +227,7 @@
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
 	{N_("Thai"),                "th", "Isriya Paireepairit", "markpeak@gmail.com"},
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
+	{N_("Ukranian"),            "uk", "Oleksandr Kovalenko", "alx.kovalenko@gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman@gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
 	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu@gmail.com"},
@@ -272,8 +273,9 @@
 	{N_("Georgian"),            "ka", "Temuri Doghonadze", NULL},
 	{N_("Korean"),              "ko", "Sang-hyun S, A Ho-seok Lee", NULL},
 	{N_("Korean"),              "ko", "Kyeong-uk Son", NULL},
+	{N_("Lithuanian"),          "lt", "Laurynas Biveinis", "laurynas.biveinis@gmail.com"},
+	{N_("Lithuanian"),          "lt", "Gediminas Čičinskas", NULL},
 	{N_("Lithuanian"),          "lt", "Andrius Štikonas", NULL},
-	{N_("Lithuanian"),          "lt", "Gediminas Čičinskas", NULL},
 	{N_("Macedonian"),          "mk", "Tomislav Markovski", NULL},
 	{N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
 	{N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
--- a/pidgin/gtkdocklet-gtk.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkdocklet-gtk.c	Sat Jan 09 02:00:18 2010 +0000
@@ -79,7 +79,7 @@
 		icon_name = PIDGIN_STOCK_TRAY_CONNECT;
 
 	if (icon_name) {
-		gtk_status_icon_set_from_stock(docklet, icon_name);
+		gtk_status_icon_set_from_icon_name(docklet, icon_name);
 	}
 }
 
@@ -156,6 +156,8 @@
 docklet_ui_init(void)
 {
 	pidgin_docklet_set_ui_ops(&ui_ops);
+	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
+		DATADIR G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S "pidgin" G_DIR_SEPARATOR_S "tray");
 }
 
 #endif  /* GTK_CHECK_VERSION(2,10,0) */
--- a/pidgin/gtkft.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkft.c	Sat Jan 09 02:00:18 2010 +0000
@@ -716,6 +716,7 @@
 	GtkWidget *sw;
 	GtkWidget *button;
 	GtkWidget *expander;
+	GtkWidget *alignment;
 	GtkWidget *table;
 	GtkWidget *checkbox;
 
@@ -773,9 +774,15 @@
 
 	gtk_widget_set_sensitive(expander, FALSE);
 
+	/* Small indent make table fall under GtkExpander's label */
+	alignment = gtk_alignment_new(1, 0, 1, 1);
+	gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 20, 0);
+	gtk_container_add(GTK_CONTAINER(expander), alignment);
+	gtk_widget_show(alignment);
+
 	/* The table of information. */
 	table = make_info_table(dialog);
-	gtk_container_add(GTK_CONTAINER(expander), table);
+	gtk_container_add(GTK_CONTAINER(alignment), table);
 	gtk_widget_show(table);
 
 	/* Open button */
--- a/pidgin/gtkimhtml.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkimhtml.c	Sat Jan 09 02:00:18 2010 +0000
@@ -462,6 +462,24 @@
 	parent_style_set(widget, prev_style);
 }
 
+static gboolean
+imhtml_get_iter_bounds(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end)
+{
+	if (imhtml->wbfo) {
+		gtk_text_buffer_get_bounds(imhtml->text_buffer, start, end);
+		return TRUE;
+	} else if (imhtml->editable) {
+		if (!gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, start, end)) {
+			GtkTextMark *mark = gtk_text_buffer_get_insert(imhtml->text_buffer);
+			gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, start, mark);
+			*end = *start;
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
 gtk_imhtml_set_link_color(GtkIMHtml *imhtml, GtkTextTag *tag)
 {
@@ -521,6 +539,7 @@
 	imhtml->tip_timer = 0;
 	imhtml->tip_window = gtk_window_new (GTK_WINDOW_POPUP);
 	gtk_widget_set_app_paintable (imhtml->tip_window, TRUE);
+	gtk_window_set_title(GTK_WINDOW(imhtml->tip_window), "GtkIMHtml");
 	gtk_window_set_resizable (GTK_WINDOW (imhtml->tip_window), FALSE);
 	gtk_widget_set_name (imhtml->tip_window, "gtk-tooltips");
 	gtk_window_set_type_hint (GTK_WINDOW (imhtml->tip_window),
@@ -2363,6 +2382,8 @@
 	return proto ? proto->length : 0;
 }
 
+static gboolean smooth_scroll_cb(gpointer data);
+
 /*
  <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
 
@@ -2417,7 +2438,14 @@
 
 		if (((y + height) - (rect.y + rect.height)) > height &&
 				gtk_text_buffer_get_char_count(imhtml->text_buffer)) {
-			options |= GTK_IMHTML_NO_SCROLL;
+			/* If we are in the middle of smooth-scrolling, then take a scroll step.
+			 * If we are not in the middle of smooth-scrolling, that means we were
+			 * not looking at the end of the buffer before the new text was added,
+			 * so do not scroll. */
+			if (imhtml->scroll_time)
+				smooth_scroll_cb(imhtml);
+			else
+				options |= GTK_IMHTML_NO_SCROLL;
 		}
 	}
 
@@ -2446,7 +2474,7 @@
  *
  * @return TRUE if the window needs to be scrolled further, FALSE if we're at the bottom.
  */
-static gboolean scroll_cb(gpointer data)
+static gboolean smooth_scroll_cb(gpointer data)
 {
 	GtkIMHtml *imhtml = data;
 	GtkAdjustment *adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
@@ -2460,6 +2488,8 @@
 		gtk_adjustment_set_value(adj, max_val);
 		g_timer_destroy(imhtml->scroll_time);
 		imhtml->scroll_time = NULL;
+		g_source_remove(imhtml->scroll_src);
+		imhtml->scroll_src = 0;
 		return FALSE;
 	}
 
@@ -2468,13 +2498,6 @@
 	return TRUE;
 }
 
-static gboolean smooth_scroll_idle_cb(gpointer data)
-{
-	GtkIMHtml *imhtml = data;
-	imhtml->scroll_src = g_timeout_add(SCROLL_DELAY, scroll_cb, imhtml);
-	return FALSE;
-}
-
 static gboolean scroll_idle_cb(gpointer data)
 {
 	GtkIMHtml *imhtml = data;
@@ -2494,7 +2517,7 @@
 		g_source_remove(imhtml->scroll_src);
 	if(smooth) {
 		imhtml->scroll_time = g_timer_new();
-		imhtml->scroll_src = g_idle_add_full(G_PRIORITY_LOW, smooth_scroll_idle_cb, imhtml, NULL);
+		imhtml->scroll_src = g_timeout_add_full(G_PRIORITY_LOW, SCROLL_DELAY, smooth_scroll_cb, imhtml, NULL);
 	} else {
 		imhtml->scroll_time = NULL;
 		imhtml->scroll_src = g_idle_add_full(G_PRIORITY_LOW, scroll_idle_cb, imhtml, NULL);
@@ -4182,11 +4205,8 @@
 	if (!imhtml->editable)
 		return;
 
-	if (imhtml->wbfo)
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-	else
-		if (!gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end))
-			gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
 
 	gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
 	gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
@@ -4529,19 +4549,13 @@
 
 	imhtml->edit.bold = !imhtml->edit.bold;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		if (imhtml->edit.bold)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		if (imhtml->edit.bold)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
-
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+
+	if (imhtml->edit.bold)
+		gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
+	else
+		gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "BOLD", &start, &end);
 }
 
 void gtk_imhtml_toggle_bold(GtkIMHtml *imhtml)
@@ -4555,18 +4569,13 @@
 
 	imhtml->edit.italic = !imhtml->edit.italic;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		if (imhtml->edit.italic)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		if (imhtml->edit.italic)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+
+	if (imhtml->edit.italic)
+		gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
+	else
+		gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end);
 }
 
 void gtk_imhtml_toggle_italic(GtkIMHtml *imhtml)
@@ -4580,18 +4589,13 @@
 
 	imhtml->edit.underline = !imhtml->edit.underline;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		if (imhtml->edit.underline)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		if (imhtml->edit.underline)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+
+	if (imhtml->edit.underline)
+		gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
+	else
+		gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end);
 }
 
 void gtk_imhtml_toggle_underline(GtkIMHtml *imhtml)
@@ -4605,18 +4609,13 @@
 
 	imhtml->edit.strike = !imhtml->edit.strike;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		if (imhtml->edit.strike)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		if (imhtml->edit.strike)
-			gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
-		else
-			gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+
+	if (imhtml->edit.strike)
+		gtk_text_buffer_apply_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
+	else
+		gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end);
 }
 
 void gtk_imhtml_toggle_strike(GtkIMHtml *imhtml)
@@ -4631,16 +4630,12 @@
 
 	imhtml->edit.fontsize = size;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		remove_font_size(imhtml, &start, &end, TRUE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		remove_font_size(imhtml, &start, &end, FALSE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+
+	remove_font_size(imhtml, &start, &end, imhtml->wbfo);
+	gtk_text_buffer_apply_tag(imhtml->text_buffer,
+			find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
 
 	object = g_object_ref(G_OBJECT(imhtml));
 	g_signal_emit(object, signals[TOGGLE_FORMAT], 0, GTK_IMHTML_SHRINK | GTK_IMHTML_GROW);
@@ -4659,16 +4654,11 @@
 	else
 		imhtml->edit.fontsize--;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		remove_font_size(imhtml, &start, &end, TRUE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+	remove_font_size(imhtml, &start, &end, imhtml->wbfo);
+	gtk_text_buffer_apply_tag(imhtml->text_buffer,
 		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		remove_font_size(imhtml, &start, &end, FALSE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	}
 }
 
 void gtk_imhtml_font_shrink(GtkIMHtml *imhtml)
@@ -4688,16 +4678,11 @@
 	else
 		imhtml->edit.fontsize++;
 
-	if (imhtml->wbfo) {
-		gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-		remove_font_size(imhtml, &start, &end, TRUE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	} else if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
-		remove_font_size(imhtml, &start, &end, FALSE);
-		gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                                  find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
-	}
+	if (!imhtml_get_iter_bounds(imhtml, &start, &end))
+		return;
+	remove_font_size(imhtml, &start, &end, imhtml->wbfo);
+	gtk_text_buffer_apply_tag(imhtml->text_buffer,
+			find_font_size_tag(imhtml, imhtml->edit.fontsize), &start, &end);
 }
 
 void gtk_imhtml_font_grow(GtkIMHtml *imhtml)
@@ -4720,39 +4705,16 @@
 	{
 		*edit_field = g_strdup(value);
 
-		if (imhtml->wbfo)
-		{
-			gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-			remove_func(imhtml, &start, &end, TRUE);
+		if (imhtml_get_iter_bounds(imhtml, &start, &end)) {
+			remove_func(imhtml, &start, &end, imhtml->wbfo);
 			gtk_text_buffer_apply_tag(imhtml->text_buffer,
-		                              find_func(imhtml, *edit_field), &start, &end);
-		}
-		else
-		{
-			gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start,
-			                                 gtk_text_buffer_get_mark(imhtml->text_buffer, "insert"));
-			if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end))
-			{
-				remove_func(imhtml, &start, &end, FALSE);
-				gtk_text_buffer_apply_tag(imhtml->text_buffer,
-				                          find_func(imhtml,
-				                                    *edit_field),
-				                                    &start, &end);
-			}
+					find_func(imhtml, *edit_field), &start, &end);
 		}
 	}
 	else
 	{
-		if (imhtml->wbfo)
-		{
-			gtk_text_buffer_get_bounds(imhtml->text_buffer, &start, &end);
-			remove_func(imhtml, &start, &end, TRUE);
-		}
-		else
-		{
-			if (imhtml->editable && gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end))
-				remove_func(imhtml, &start, &end, TRUE);
-		}
+		if (imhtml_get_iter_bounds(imhtml, &start, &end))
+			remove_func(imhtml, &start, &end, TRUE);	/* 'TRUE' or 'imhtml->wbfo'? */
 	}
 
 	object = g_object_ref(G_OBJECT(imhtml));
--- a/pidgin/gtkimhtmltoolbar.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1527,7 +1527,6 @@
 void gtk_imhtmltoolbar_attach(GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml)
 {
 	GtkIMHtmlButtons buttons;
-	gboolean bold, italic, underline;
 
 	g_return_if_fail(toolbar != NULL);
 	g_return_if_fail(GTK_IS_IMHTMLTOOLBAR(toolbar));
@@ -1543,9 +1542,6 @@
 
 	buttons = gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml));
 	update_buttons_cb(GTK_IMHTML(imhtml), buttons, toolbar);
-
-	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline);
-
 	update_buttons(toolbar);
 }
 
--- a/pidgin/gtkmain.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkmain.c	Sat Jan 09 02:00:18 2010 +0000
@@ -574,6 +574,8 @@
 	/* Initialize GThread before calling any Glib or GTK+ functions. */
 	g_thread_init(NULL);
 
+	g_set_prgname("Pidgin");
+
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
--- a/pidgin/gtkmedia.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkmedia.c	Sat Jan 09 02:00:18 2010 +0000
@@ -23,9 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "connection.h"
 #include "media.h"
 #include "mediamanager.h"
--- a/pidgin/gtkprefs.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkprefs.c	Sat Jan 09 02:00:18 2010 +0000
@@ -70,29 +70,33 @@
 	gchar *original_name;
 };
 
-static int sound_row_sel = 0;
-static GtkWidget *prefsnotebook;
-
+/* Main dialog */
+static GtkWidget *prefs = NULL;
+
+/* Notebook */
+static GtkWidget *prefsnotebook = NULL;
+static int notebook_page = 0;
+
+/* Conversations page */
+static GtkWidget *sample_imhtml = NULL;
+
+/* Themes page */
+static GtkWidget *prefs_sound_themes_combo_box;
+static GtkWidget *prefs_blist_themes_combo_box;
+static GtkWidget *prefs_status_themes_combo_box;
+static GtkWidget *prefs_smiley_themes_combo_box;
+
+/* Sound theme specific */
 static GtkWidget *sound_entry = NULL;
-static GtkWidget *prefs_proxy_frame = NULL;
-static GtkWidget *prefs_proxy_subframe = NULL;
-
-static GtkWidget *prefs = NULL;
-static GtkWidget *debugbutton = NULL;
-static int notebook_page = 0;
-
+static int sound_row_sel = 0;
+static gboolean prefs_sound_themes_loading;
+
+/* These exist outside the lifetime of the prefs dialog */
 static GtkListStore *prefs_sound_themes;
 static GtkListStore *prefs_blist_themes;
 static GtkListStore *prefs_status_icon_themes;
 static GtkListStore *prefs_smiley_themes;
 
-static GtkWidget *prefs_sound_themes_combo_box;
-static GtkWidget *prefs_blist_themes_combo_box;
-static GtkWidget *prefs_status_themes_combo_box;
-static GtkWidget *prefs_smiley_themes_combo_box;
-
-static gboolean prefs_sound_themes_loading;
-
 /*
  * PROTOTYPES
  */
@@ -336,10 +340,21 @@
 	/* Unregister callbacks. */
 	purple_prefs_disconnect_by_handle(prefs);
 
-	prefs = NULL;
+	/* NULL-ify globals */
 	sound_entry = NULL;
-	debugbutton = NULL;
+	sound_row_sel = 0;
+	prefs_sound_themes_loading = FALSE;
+
+	prefs_sound_themes_combo_box = NULL;
+	prefs_blist_themes_combo_box = NULL;
+	prefs_status_themes_combo_box = NULL;
+	prefs_smiley_themes_combo_box = NULL;
+
+	sample_imhtml = NULL;
+
 	notebook_page = 0;
+	prefsnotebook = NULL;
+	prefs = NULL;
 }
 
 static gchar *
@@ -951,6 +966,7 @@
 		gtk_tree_model_get(GTK_TREE_MODEL(prefs_smiley_themes), &new_iter, 2, &new_theme, -1);
 
 		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/smileys/theme", new_theme);
+		pidgin_themes_smiley_themeize(sample_imhtml);
 
 		g_free(new_theme);
 	}
@@ -1425,6 +1441,16 @@
 	return ret;
 }
 
+#ifdef _WIN32
+static void
+pidgin_custom_font_set(GtkFontButton *font_button, gpointer nul)
+{
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/custom_font",
+				gtk_font_button_get_font_name(font_button))
+;
+}
+#endif
+
 static GtkWidget *
 conv_page(void)
 {
@@ -1474,6 +1500,9 @@
 		1, 8, NULL);
 
 #ifdef _WIN32
+	{
+	GtkWidget *fontpref, *font_button, *hbox;
+	const char *font_name;
 	vbox = pidgin_make_frame(ret, _("Font"));
 
 	fontpref = pidgin_prefs_checkbox(_("Use font from _theme"),
@@ -1492,15 +1521,16 @@
 		gtk_widget_set_sensitive(hbox, FALSE);
 	g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox);
 	g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL);
+
+	}
 #endif
 
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
-	gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START);
 
 	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
 	gtk_widget_show(frame);
 	gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml");
-	gtk_widget_set_size_request(frame, 300, -1);
+	gtk_widget_set_size_request(frame, 450, -1);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 									GTK_IMHTML_BOLD |
@@ -1523,7 +1553,7 @@
 					 G_CALLBACK(formatting_toggle_cb), toolbar);
 	g_signal_connect_after(G_OBJECT(imhtml), "format_function_clear",
 					 G_CALLBACK(formatting_clear_cb), NULL);
-
+	sample_imhtml = imhtml;
 
 	gtk_widget_show(ret);
 
@@ -1619,6 +1649,7 @@
 	g_error_free(err);
 }
 
+#ifndef _WIN32
 static void
 browser_button_clicked_cb(GtkWidget *button, gpointer null)
 {
@@ -1630,6 +1661,7 @@
 	purple_notify_error(NULL, NULL, _("Cannot start browser configuration program."), err->message);
 	g_error_free(err);
 }
+#endif
 
 static void
 auto_ip_button_clicked_cb(GtkWidget *button, gpointer null)
@@ -1962,6 +1994,7 @@
 {
 	GtkWidget *ret = NULL, *vbox = NULL, *hbox = NULL;
 	GtkWidget *table = NULL, *entry = NULL, *label = NULL, *proxy_button = NULL;
+	GtkWidget *prefs_proxy_frame = NULL;
 	PurpleProxyInfo *proxy_info;
 
 	ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
@@ -2001,14 +2034,14 @@
 		         which is never */
 		gtk_widget_show_all(ret);
 	} else {
-		prefs_proxy_subframe = gtk_vbox_new(FALSE, 0);
-	
+		GtkWidget *prefs_proxy_subframe = gtk_vbox_new(FALSE, 0);
+
 		/* This is a global option that affects SOCKS4 usage even with
 		 * account-specific proxy settings */
 		pidgin_prefs_checkbox(_("Use remote _DNS with SOCKS4 proxies"),
 							  "/purple/proxy/socks4_remotedns", prefs_proxy_frame);
 		gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0);
-	
+
 		pidgin_prefs_dropdown(prefs_proxy_frame, _("Proxy t_ype:"), PURPLE_PREF_STRING,
 					"/purple/proxy/type",
 					_("No proxy"), "none",
@@ -2019,93 +2052,94 @@
 					NULL);
 		gtk_box_pack_start(GTK_BOX(prefs_proxy_frame), prefs_proxy_subframe, 0, 0, 0);
 		proxy_info = purple_global_proxy_get_info();
-	
+
 		gtk_widget_show_all(ret);
-	
+
 		purple_prefs_connect_callback(prefs, "/purple/proxy/type",
 					    proxy_changed_cb, prefs_proxy_subframe);
-	
+
 		table = gtk_table_new(4, 2, FALSE);
 		gtk_container_set_border_width(GTK_CONTAINER(table), 0);
 		gtk_table_set_col_spacings(GTK_TABLE(table), 5);
 		gtk_table_set_row_spacings(GTK_TABLE(table), 10);
 		gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), table);
-	
-	
+
 		label = gtk_label_new_with_mnemonic(_("_Host:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
 		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
-	
+
 		entry = gtk_entry_new();
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
 		g_signal_connect(G_OBJECT(entry), "changed",
 				 G_CALLBACK(proxy_print_option), (void *)PROXYHOST);
-	
+
 		if (proxy_info != NULL && purple_proxy_info_get_host(proxy_info))
 			gtk_entry_set_text(GTK_ENTRY(entry),
 					   purple_proxy_info_get_host(proxy_info));
-	
+
 		hbox = gtk_hbox_new(TRUE, 5);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 		pidgin_set_accessible_label (entry, label);
-	
+
 		label = gtk_label_new_with_mnemonic(_("P_ort:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
 		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
-	
+
 		entry = gtk_spin_button_new_with_range(0, 65535, 1);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
 		g_signal_connect(G_OBJECT(entry), "changed",
 				 G_CALLBACK(proxy_print_option), (void *)PROXYPORT);
-	
+
 		if (proxy_info != NULL && purple_proxy_info_get_port(proxy_info) != 0) {
-			char buf[128];
-			g_snprintf(buf, sizeof(buf), "%d",
-				   purple_proxy_info_get_port(proxy_info));
-	
-				gtk_entry_set_text(GTK_ENTRY(entry), buf);
+			gtk_spin_button_set_value(GTK_SPIN_BUTTON(entry),
+				purple_proxy_info_get_port(proxy_info));
 		}
 		pidgin_set_accessible_label (entry, label);
-	
+
 		label = gtk_label_new_with_mnemonic(_("User_name:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
 		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
-	
+
 		entry = gtk_entry_new();
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
 		g_signal_connect(G_OBJECT(entry), "changed",
 				 G_CALLBACK(proxy_print_option), (void *)PROXYUSER);
-	
+
 		if (proxy_info != NULL && purple_proxy_info_get_username(proxy_info) != NULL)
 			gtk_entry_set_text(GTK_ENTRY(entry),
 						   purple_proxy_info_get_username(proxy_info));
-	
+
 		hbox = gtk_hbox_new(TRUE, 5);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 		pidgin_set_accessible_label (entry, label);
-	
+
 		label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
 		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
-	
+
 		entry = gtk_entry_new();
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 		gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0);
 		gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
-	#if !GTK_CHECK_VERSION(2,16,0)
+#if !GTK_CHECK_VERSION(2,16,0)
 		if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*')
 			gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR);
-	#endif /* Less than GTK+ 2.16 */
+#endif /* Less than GTK+ 2.16 */
 		g_signal_connect(G_OBJECT(entry), "changed",
 				 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
-	
+
 		if (proxy_info != NULL && purple_proxy_info_get_password(proxy_info) != NULL)
 			gtk_entry_set_text(GTK_ENTRY(entry),
 					   purple_proxy_info_get_password(proxy_info));
 		pidgin_set_accessible_label (entry, label);
+
+		proxy_changed_cb("/purple/proxy/type", PURPLE_PREF_STRING,
+			purple_prefs_get_string("/purple/proxy/type"),
+			prefs_proxy_subframe);
+
 	}
 
 	return ret;
@@ -2400,6 +2434,9 @@
 
 	vbox2 = pidgin_make_frame(ret, _("Sound Options"));
 
+	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0);
+
 #ifndef _WIN32
 	dd = pidgin_prefs_dropdown(vbox2, _("_Method:"), PURPLE_PREF_STRING,
 			PIDGIN_PREFS_ROOT "/sound/method",
@@ -2415,9 +2452,6 @@
 	gtk_size_group_add_widget(sg, dd);
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5);
 
-	vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_box_pack_start(GTK_BOX(vbox2), vbox, FALSE, FALSE, 0);
-
 	entry = gtk_entry_new();
 	gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
 	cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
@@ -2819,7 +2853,7 @@
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/smileys/theme", "Default");
 
 	/* Smiley Callbacks */
-	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
+	purple_prefs_connect_callback(&prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
 								smiley_theme_pref_cb, NULL);
 
 	pidgin_prefs_update_old();
@@ -2884,10 +2918,6 @@
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/signon");
 	purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/silent_signon");
 
-#ifndef _WIN32
-	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/custom_font");
-#endif
-
 	/* Convert old queuing prefs to hide_new 3-way pref. */
 	if (purple_prefs_exists("/plugins/gtk/docklet/queue_messages") &&
 	    purple_prefs_get_bool("/plugins/gtk/docklet/queue_messages"))
--- a/pidgin/gtksavedstatuses.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtksavedstatuses.c	Sat Jan 09 02:00:18 2010 +0000
@@ -1824,6 +1824,9 @@
 	g_object_set(G_OBJECT(icon_rend),
 			"stock-size", gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
 			NULL);
+#if GTK_CHECK_VERSION(2,6,0)
+	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+#endif
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
 	g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(status_menu_cb), callback);
--- a/pidgin/gtkwhiteboard.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/gtkwhiteboard.c	Sat Jan 09 02:00:18 2010 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <stdlib.h>
-
 #include "internal.h"
 #include "blist.h"
 #include "debug.h"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidgin-2-uninstalled.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,21 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+abs_top_srcdir=@abs_top_srcdir@
+abs_top_builddir=@abs_top_builddir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${abs_top_srcdir}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pidgin-2.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+
+plugindir=${libdir}/pidgin
+
+Name: Pidgin
+Description: Pidgin is a GTK2-based instant messenger application.
+Version: @VERSION@
+Requires: gtk+-2.0 purple
+Cflags: -I${includedir}
--- a/pidgin/pidgin-uninstalled.pc.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/pidgin-uninstalled.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -6,8 +6,13 @@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
+plugindir=${libdir}/pidgin
+
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
 Requires: gtk+-2.0 purple
-Cflags: -I${pcfiledir}
+Cflags: -I${abs_srcdir}
--- a/pidgin/pidgin.pc.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/pidgin.pc.in	Sat Jan 09 02:00:18 2010 +0000
@@ -6,6 +6,8 @@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+plugindir=${libdir}/pidgin
+
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
--- a/pidgin/pixmaps/Makefile.am	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sat Jan 09 02:00:18 2010 +0000
@@ -486,48 +486,48 @@
 		tray/16/offline_4bit.ico
 
 TRAY_16 = \
-		tray/16/tray-away.png \
-		tray/16/tray-busy.png \
-		tray/16/tray-invisible.png \
-		tray/16/tray-connecting.png \
-		tray/16/tray-extended-away.png \
-		tray/16/tray-message.png \
-		tray/16/tray-new-im.png \
-		tray/16/tray-offline.png \
-		tray/16/tray-online.png
+		tray/hicolor/16x16/status/pidgin-tray-away.png \
+		tray/hicolor/16x16/status/pidgin-tray-busy.png \
+		tray/hicolor/16x16/status/pidgin-tray-invisible.png \
+		tray/hicolor/16x16/status/pidgin-tray-connecting.png \
+		tray/hicolor/16x16/status/pidgin-tray-extended-away.png \
+		tray/hicolor/16x16/status/pidgin-tray-message.png \
+		tray/hicolor/16x16/status/pidgin-tray-new-im.png \
+		tray/hicolor/16x16/status/pidgin-tray-offline.png \
+		tray/hicolor/16x16/status/pidgin-tray-online.png
 
 TRAY_22 = \
-		tray/22/tray-away.png \
-		tray/22/tray-busy.png \
-		tray/22/tray-connecting.png \
-		tray/22/tray-extended-away.png \
-		tray/22/tray-invisible.png \
-		tray/22/tray-message.png \
-		tray/22/tray-new-im.png \
-		tray/22/tray-offline.png \
-		tray/22/tray-online.png
+		tray/hicolor/22x22/status/pidgin-tray-away.png \
+		tray/hicolor/22x22/status/pidgin-tray-busy.png \
+		tray/hicolor/22x22/status/pidgin-tray-connecting.png \
+		tray/hicolor/22x22/status/pidgin-tray-extended-away.png \
+		tray/hicolor/22x22/status/pidgin-tray-invisible.png \
+		tray/hicolor/22x22/status/pidgin-tray-message.png \
+		tray/hicolor/22x22/status/pidgin-tray-new-im.png \
+		tray/hicolor/22x22/status/pidgin-tray-offline.png \
+		tray/hicolor/22x22/status/pidgin-tray-online.png
 
 TRAY_32 = \
-		tray/32/tray-away.png \
-		tray/32/tray-busy.png \
-		tray/32/tray-connecting.png \
-		tray/32/tray-extended-away.png \
-		tray/32/tray-invisible.png \
-		tray/32/tray-message.png \
-		tray/32/tray-new-im.png \
-		tray/32/tray-offline.png \
-		tray/32/tray-online.png
+		tray/hicolor/32x32/status/pidgin-tray-away.png \
+		tray/hicolor/32x32/status/pidgin-tray-busy.png \
+		tray/hicolor/32x32/status/pidgin-tray-connecting.png \
+		tray/hicolor/32x32/status/pidgin-tray-extended-away.png \
+		tray/hicolor/32x32/status/pidgin-tray-invisible.png \
+		tray/hicolor/32x32/status/pidgin-tray-message.png \
+		tray/hicolor/32x32/status/pidgin-tray-new-im.png \
+		tray/hicolor/32x32/status/pidgin-tray-offline.png \
+		tray/hicolor/32x32/status/pidgin-tray-online.png
 
 TRAY_48 = \
-		tray/48/tray-away.png \
-		tray/48/tray-busy.png \
-		tray/48/tray-connecting.png \
-		tray/48/tray-extended-away.png \
-		tray/48/tray-invisible.png \
-		tray/48/tray-message.png \
-		tray/48/tray-new-im.png \
-		tray/48/tray-offline.png \
-		tray/48/tray-online.png
+		tray/hicolor/48x48/status/pidgin-tray-away.png \
+		tray/hicolor/48x48/status/pidgin-tray-busy.png \
+		tray/hicolor/48x48/status/pidgin-tray-connecting.png \
+		tray/hicolor/48x48/status/pidgin-tray-extended-away.png \
+		tray/hicolor/48x48/status/pidgin-tray-invisible.png \
+		tray/hicolor/48x48/status/pidgin-tray-message.png \
+		tray/hicolor/48x48/status/pidgin-tray-new-im.png \
+		tray/hicolor/48x48/status/pidgin-tray-offline.png \
+		tray/hicolor/48x48/status/pidgin-tray-online.png
 
 EXTRA_DIST = \
 		edit.png			\
Binary file pidgin/pixmaps/tray/16/tray-away.png has changed
Binary file pidgin/pixmaps/tray/16/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/16/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/16/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/16/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/16/tray-message.png has changed
Binary file pidgin/pixmaps/tray/16/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/16/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/16/tray-online.png has changed
Binary file pidgin/pixmaps/tray/22/tray-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/22/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/22/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/22/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/22/tray-message.png has changed
Binary file pidgin/pixmaps/tray/22/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/22/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/22/tray-online.png has changed
Binary file pidgin/pixmaps/tray/32/tray-away.png has changed
Binary file pidgin/pixmaps/tray/32/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/32/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/32/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/32/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/32/tray-message.png has changed
Binary file pidgin/pixmaps/tray/32/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/32/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/32/tray-online.png has changed
Binary file pidgin/pixmaps/tray/48/tray-away.png has changed
Binary file pidgin/pixmaps/tray/48/tray-busy.png has changed
Binary file pidgin/pixmaps/tray/48/tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/48/tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/48/tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/48/tray-message.png has changed
Binary file pidgin/pixmaps/tray/48/tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/48/tray-offline.png has changed
Binary file pidgin/pixmaps/tray/48/tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-busy.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-offline.png has changed
Binary file pidgin/pixmaps/tray/hicolor/16x16/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-busy.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-offline.png has changed
Binary file pidgin/pixmaps/tray/hicolor/22x22/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-busy.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-offline.png has changed
Binary file pidgin/pixmaps/tray/hicolor/32x32/status/pidgin-tray-online.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-busy.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-connecting.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-extended-away.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-invisible.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-message.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-new-im.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-offline.png has changed
Binary file pidgin/pixmaps/tray/hicolor/48x48/status/pidgin-tray-online.png has changed
--- a/pidgin/plugins/disco/gtkdisco.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/plugins/disco/gtkdisco.c	Sat Jan 09 02:00:18 2010 +0000
@@ -225,8 +225,8 @@
 		gtk_widget_set_sensitive(dialog->account_widget, FALSE);
 
 	username = purple_account_get_username(dialog->account);
-	at = g_utf8_strchr(username, -1, '@');
-	slash = g_utf8_strchr(username, -1, '/');
+	at = strchr(username, '@');
+	slash = strchr(username, '/');
 	if (at && !slash) {
 		server = g_strdup_printf("%s", at + 1);
 	} else if (at && slash && at + 1 < slash) {
--- a/pidgin/plugins/gtk-signals-test.c	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/plugins/gtk-signals-test.c	Sat Jan 09 02:00:18 2010 +0000
@@ -20,9 +20,10 @@
  */
 #define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
 
+#include "internal.h"
+
 #include <gtk/gtk.h>
 
-#include "internal.h"
 #include "debug.h"
 #include "version.h"
 
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Fri Nov 20 00:33:23 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Sat Jan 09 02:00:18 2010 +0000
@@ -176,6 +176,7 @@
   !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"
@@ -215,6 +216,7 @@
   !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"
@@ -723,6 +725,7 @@
     Delete "$INSTDIR\plugins\libicq.dll"
     Delete "$INSTDIR\plugins\libirc.dll"
     Delete "$INSTDIR\plugins\libmsn.dll"
+    Delete "$INSTDIR\plugins\libmxit.dll"
     Delete "$INSTDIR\plugins\libmyspace.dll"
     Delete "$INSTDIR\plugins\libnapster.dll"
     Delete "$INSTDIR\plugins\libnovell.dll"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/nsis/translations/norwegian_nynorsk.nsh	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,80 @@
+;;
+;;  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 kjrer allereie."
+!define PIDGIN_IS_RUNNING			"Pidgin kjrer no. Lukk programmet og prv igjen."
+!define GTK_INSTALLER_NEEDED			"GTK+-kjremiljet manglar eller treng  bli oppdatert.$\rInstaller v${GTK_MIN_VERSION} eller nyare av GTK+-kjremiljet"
+
+; 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 opplysningsforml. $_CLICK"
+
+; Components Page
+!define PIDGIN_SECTION_TITLE			"Pidgin lynmeldingsklient (pkravd)"
+!define GTK_SECTION_TITLE			"GTK+-kjremilj (pkravd 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 brukargrensesnittverktykasse p fleire plattformer som Pidgin nyttar"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Snarvegar for  starta Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Lag ein snarveg til Pidgin p skrivebordet"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Lag ein snarveg til Pidgin p startmenyen"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Fann ei gammal utgve av GTK+-kjremiljet. Vil du oppdatera ho?$\rMerk: $(^Name) vil kanskje ikkje fungera om du ikkje oppdaterer."
+!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me er ikkje kompatibelt med GTK+ 2.8.0 eller nyare. GTK+ ${GTK_INSTALL_VERSION} kjem ikkje til  bli installert.$\rInstallasjonen vil bli abvroten om ikkje GTK+ ${GTK_MIN_VERSION} eller nyare allereie er installert."
+
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Besk Pidgin si nettside"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Klarte ikkje  avinstallera Pidgin-utgva som er i bruk. Den nye utgva kjem til  bli installert utan  ta vekk den gjeldande."
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Klarte ikkje  installera GTK+-kjremiljet."
+!define GTK_BAD_INSTALL_PATH			"Klarer ikkje  laga eller f tilgang til bana du skreiv."
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI-referanse"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Avinstallasjonsprogrammet fann ikkje registerpostar for Pidgin.$\rTruleg har ein annan brukar installert denne applikasjonen."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikkje lyve 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		"Frysk"
+!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"
+
--- a/po/ChangeLog	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/ChangeLog	Sat Jan 09 02:00:18 2010 +0000
@@ -2,7 +2,25 @@
 
 version 2.7.0
 
+version 2.6.5
+	* Norwegian Nynorsk win32 translation added (Yngve Spjeld Landro)
+	* Russian translation updated (Антон Самохвалов)
+
 version 2.6.4
+	* Afrikaans translation updated (Friedel Wolff)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. Liu)
+	* Chinese (Simplified) translation updated (liyuekui and Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Hebrew translation updated (Shalom Craimer)
+	* Malay translation added (Muhammad Najmi bin Ahmad Zabidi)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Polish translation updated under new translator (Piotr Drąg)
+	* Russian translation updated (Антон Самохвалов)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Ukrainian translation updated under new translator (Oleksandr
+	  Kovalenko)
 	* Vietnamese translation updated (Clytie Siddall)
 
 version 2.6.3
--- a/po/POTFILES.in	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/POTFILES.in	Sat Jan 09 02:00:18 2010 +0000
@@ -88,6 +88,10 @@
 libpurple/protocols/irc/parse.c
 libpurple/protocols/jabber/adhoccommands.c
 libpurple/protocols/jabber/auth.c
+libpurple/protocols/jabber/auth_cyrus.c
+libpurple/protocols/jabber/auth_digest_md5.c
+libpurple/protocols/jabber/auth_plain.c
+libpurple/protocols/jabber/auth_scram.c
 libpurple/protocols/jabber/bosh.c
 libpurple/protocols/jabber/buddy.c
 libpurple/protocols/jabber/chat.c
--- a/po/af.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/af.po	Sat Jan 09 02:00:18 2010 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-09-03 01:03+0200\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-30 00:41+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.4.0\n"
+"X-Generator: Virtaal 0.5.0-rc1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -634,9 +634,8 @@
 msgid "Enable Sounds"
 msgstr "Aktiveer klanke"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Kon nie koppel nie"
+msgstr "U is nie gekoppel nie."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
@@ -1530,10 +1529,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL vir bostaande: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Wag asb. terwyl TinyURL 'n korter URL kry ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Skep 'n TinyURL slegs vir URL'e van dié lengte of langer"
@@ -1555,6 +1554,7 @@
 msgid "Online"
 msgstr "Aanlyn"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Vanlyn"
 
@@ -1665,6 +1665,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 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."
@@ -1896,9 +1898,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Oplosserproses het afgesluit sonder om die versoek te antwoord"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Kon nie %s oplos nie: %d"
+msgstr "Fout met omskakeling van %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2221,17 +2223,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr ""
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Konferensie gesluit"
-
-#, fuzzy
+msgstr "Konferensiefout"
+
 msgid "Error with your microphone"
-msgstr "Fout met u mikrofoon."
-
-#, fuzzy
+msgstr "Fout met u mikrofoon"
+
 msgid "Error with your webcam"
-msgstr "Fout met u webkamera."
+msgstr "Fout met u webkamera"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3090,10 +3089,10 @@
 msgstr "Wagwoord (weer)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "Tik captcha in"
 
 msgid "Captcha"
-msgstr ""
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registreer nuwe Gadu-Gadu-rekening"
@@ -3170,10 +3169,12 @@
 msgid "Add to chat..."
 msgstr "Voeg by geselsie..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Beskikbaar"
 
+#. 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
@@ -3984,12 +3985,14 @@
 msgid "Log Out"
 msgstr "Meld af"
 
+#. 2
 msgid "Chatty"
 msgstr "Geselserig"
 
 msgid "Extended Away"
 msgstr "Vir lank weg"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Moenie pla nie"
 
@@ -4253,6 +4256,7 @@
 msgid "None (To pending)"
 msgstr "Geen (aan hangende)"
 
+#. 0
 msgid "None"
 msgstr "Geen"
 
@@ -4558,9 +4562,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfigureer 'n geselsiekamer."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [kamer]:  Verlaat die kamer."
+msgstr "part [boodskap]:  Verlaat die kamer."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreer met 'n geselsiekamer."
@@ -5054,10 +5057,12 @@
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s het 'n knipoog gestuur. <a href='msn-wink://%s'>Klik hier om dit te "
+"speel</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s het 'n knipoog gestuur, maar dit kon nie gestoor word nie"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
@@ -5222,7 +5227,7 @@
 msgstr ""
 "SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5452,9 +5457,8 @@
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Kan nie gebruiker byvoeg nie"
+msgstr "Kan nie gebruiker verwyder nie"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiele boodskap is nie gestuur nie omdat dit te lank was."
@@ -5692,28 +5696,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s het u van sy of haar vriendelys verwyder."
 
+#. 1
+msgid "Angry"
+msgstr "Kwaad"
+
+#. 2
+msgid "Excited"
+msgstr "Opgewonde"
+
+#. 3
+msgid "Grumpy"
+msgstr "Knorrig"
+
+#. 4
+msgid "Happy"
+msgstr "Gelukkig"
+
+#. 5
+msgid "In Love"
+msgstr "Verlief"
+
+#. 6
+msgid "Invincible"
+msgstr "Onoorwinlik"
+
+#. 7
+msgid "Sad"
+msgstr "Ongelukkig"
+
+#. 8
+msgid "Hot"
+msgstr ""
+
+#. 9
+msgid "Sick"
+msgstr "Siek"
+
+#. 10
+msgid "Sleepy"
+msgstr "Vaak"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "U huidige stemming"
+msgstr "Huidige gemoedstoestand"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Gebruikerstemming"
-
-#, fuzzy
+msgstr "Nuwe gemoedstoestand"
+
 msgid "Change your Mood"
-msgstr "Verander wagwoord"
-
-#, fuzzy
+msgstr "Verander u gemoedstoestand"
+
 msgid "How do you feel right now?"
-msgstr "Ek's nie hier op die oomblik nie"
+msgstr "Hoe voel u reg nou?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Die PIN wat gegee is, is ongeldig."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "Die PIN is ongeldig. Dit moet slegs syfers [0-9] bevat."
+
+msgid "The two PINs you entered do not match."
+msgstr "Die twee PIN-kodes wat gegee is stem nie ooreen nie."
+
+msgid "The name you entered is invalid."
+msgstr "Die naam wat gegee is, is ongeldig."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Die verjaardag wat gegee is, is ongeldig. Die korrekte formaat is 'YYYY-MM-"
+"DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Skryffout"
+msgstr "Fout moet opdatering van profiel"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5721,275 +5781,257 @@
 msgstr "Profiel"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "U profielinligting is nog nie bekom nie. Probeer gerus later weer."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifieer PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Van"
+msgstr ""
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Versteek my nommer"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Selfoonnommer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Gebruikerprofiel"
+msgstr "Dateer u profiel op"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Hier kan u MXit-profiel opgedateer word"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Bekyk spatskerm"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Daar is tans geen spatskerm beskikbaar nie"
+
 msgid "About"
-msgstr "Omtrent %s"
+msgstr "Aangaande"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Verander wagwoord..."
+msgstr "Verander gemoedstoestand..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Verander wagwoord..."
+msgstr "Verander profiel..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Bekyk staaflêer..."
+msgstr "Bekyk spatskerm..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Omtrent %s"
+msgstr "Aangaande..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Die boodskap is te groot."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Die lêer wat u probeer stuur is te groot!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Kan nie koppel aan die MXit-HTTP-bediener nie. Kontroleer die "
+"bedieneropstelling."
+
 msgid "Logging In..."
-msgstr "Aanmelding"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Kan nie aan bediener koppel nie. Tik gerus die adres van die bediener "
-"waaraan u wil koppel."
-
-#, fuzzy
+msgstr "Meld tans aan..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Kan nie koppel aan die MXit-bediener nie. Kontroleer die bedieneropstelling."
+
 msgid "Connecting..."
-msgstr "Koppel tans"
+msgstr "Koppel tans..."
+
+msgid "The nick name you entered is invalid."
+msgstr "Die bynaam wat gegee is, is ongeldig."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [7-10]."
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "MXit-aanmeldnaam"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Bynaam"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registreer 'n nuwe XMPP-rekening"
-
-#, fuzzy
+msgstr "Registreer 'n nuwe MXit-rekening"
+
 msgid "Please fill in the following fields:"
-msgstr "Vul gerus die volgende velde in"
+msgstr "Vul gerus die volgende velde in:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Fout met kontak met MXit-WAP-werf. Probeer gerus later weer."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit kan tans nie die versoek verwerk nie. Probeer gerus later weer."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Verkeerde sekuriteitskode is ingetik. Probeer gerus later weer."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "U sessie het verval. Probeer gerus later weer."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Ongeldige land is gekies. Probeer gerus weer."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Gebruikernaam is nie geregistreer nie. Registreer asb. eers."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Gebruikernaam is reeds geregistreer. Kies asb. 'n ander gebruikernaam."
+
 msgid "Internal error. Please try again later."
-msgstr "Die bediener is nie beskikbaar nie; probeer later weer"
+msgstr "Interne fout. Probeer gerus later weer."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "U het nie die sekuriteitskode ingetik nie"
+
 msgid "Security Code"
-msgstr "Sekuriteit geaktiveer"
+msgstr "Sekuriteitskode"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Tik wagwoord"
-
-#, fuzzy
+msgstr "Gee die sekuriteitskode"
+
 msgid "Your Country"
-msgstr "Land"
-
-#, fuzzy
+msgstr "U land"
+
 msgid "Your Language"
-msgstr "Voorkeurtaal"
+msgstr "U taal"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Vereis magtiging"
+msgstr ""
 
 msgid "MXit account validation"
 msgstr ""
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Bedienerinligting"
-
-#, fuzzy
+msgstr "Verkry tans gebruikerinligting..."
+
+msgid "Loading menu..."
+msgstr "Laai tans kieslys..."
+
 msgid "Status Message"
-msgstr "Gestuurde boodskappe"
-
-#, fuzzy
+msgstr "Statusboodskap"
+
 msgid "Hidden Number"
-msgstr "Tweede naam"
-
-#, fuzzy
+msgstr "Versteekte nommer"
+
 msgid "Your Mobile Number..."
-msgstr "Stel selfoonnommer..."
+msgstr "U selfoonnommer..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Bediener"
-
-#, fuzzy
+msgstr "WAP-bediener"
+
 msgid "Connect via HTTP"
-msgstr "Koppel met TCP"
+msgstr "Koppel via HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Aktiveer opsspring vir spatskerm"
 
 #. 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 "Koppeling met MXit is verloor. Herkoppel asseblief."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP-boodskapfout"
-
-#, fuzzy
+msgstr "Fout met stuur van boodskap"
+
 msgid "Unable to process your request at this time"
-msgstr "Kan nie aan bediener koppel nie."
+msgstr "Kan nie u versoek nou verwerk nie"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Uittelling terwyl gewag word vir 'n antwoord van die MXit-bediener."
+
 msgid "Successfully Logged In..."
-msgstr "U het qun-lid suksesvol gewysig"
-
-#, fuzzy
+msgstr "Suksesvol aangemeld..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s het 'n geënkripteerde boodskap gestuur, maar dit word nie ondersteun deur "
+"hierdie kliënt nie."
+
 msgid "Message Error"
-msgstr "XMPP-boodskapfout"
+msgstr "Boodskapfout"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Kan nie herverwysing doen met die gespesifiseerde protokol nie"
+
+msgid "An internal MXit server error occurred."
+msgstr "'n Interne MXit-bedienerfout het voorgekom."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Aanmeldfout: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Afmeldfout: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Verbindingfout"
-
-#, fuzzy
+msgstr ""
+
 msgid "Message Sending Error"
-msgstr "XMPP-boodskapfout"
-
-#, fuzzy
+msgstr "Fout met stuur van boodskap"
+
 msgid "Status Error"
-msgstr "Stroomfout"
-
-#, fuzzy
+msgstr "Statusfout"
+
 msgid "Mood Error"
-msgstr "Ikoonfout"
-
-#, fuzzy
+msgstr "Gemoedstoestandfout"
+
 msgid "Invitation Error"
-msgstr "Deregistrasiefout"
-
-#, fuzzy
+msgstr "Uitnodigingsfout"
+
 msgid "Contact Removal Error"
-msgstr "Verbindingfout"
-
-#, fuzzy
+msgstr "Fout met skrap van kontak"
+
 msgid "Subscription Error"
-msgstr "Inskrywing"
-
-#, fuzzy
+msgstr ""
+
 msgid "Contact Update Error"
-msgstr "Verbindingfout"
-
-#, fuzzy
+msgstr ""
+
 msgid "File Transfer Error"
-msgstr "Lêeroordrag"
-
-#, fuzzy
+msgstr "Lêeroordragfout"
+
 msgid "Cannot create MultiMx room"
-msgstr "Kan nie vriendwag skep nie"
-
-#, fuzzy
+msgstr "Kan nie MultiMx-kamer skep nie"
+
 msgid "MultiMx Invitation Error"
-msgstr "Deregistrasiefout"
-
-#, fuzzy
+msgstr "MultiMx-uitnodigingsfout"
+
 msgid "Profile Error"
-msgstr "Skryffout"
+msgstr "Profielfout"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Ongeldige pakkie ontvang vanaf MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
@@ -6014,61 +6056,24 @@
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Kwaad"
-
-msgid "Excited"
-msgstr "Opgewonde"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Groep"
-
-msgid "Happy"
-msgstr "Gelukkig"
-
-msgid "In Love"
-msgstr "Verlief"
-
-msgid "Invincible"
-msgstr "Onoorwinlik"
-
-msgid "Sad"
-msgstr "Ongelukkig"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Gasheer:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Bynaam"
-
-msgid "Sleepy"
-msgstr "Vaak"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Stuur tans"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Nooi uit"
-
-#, fuzzy
+msgstr "Uitgenooi"
+
 msgid "Rejected"
-msgstr "Weier"
-
-#, fuzzy
+msgstr "Geweier"
+
 msgid "Deleted"
-msgstr "Skrap"
+msgstr "Geskrap"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-advertensie"
+
 msgid "More Information"
-msgstr "Werkinligting"
+msgstr "Meer inligting"
 
 #, c-format
 msgid "No such user: %s"
@@ -6854,9 +6859,8 @@
 msgstr "Kan nie lêer stuur nie"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Kan nie 'n gids stuur nie."
+msgstr ""
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
@@ -6877,13 +6881,11 @@
 msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "Kan nie boodskap stuur nie."
-
-#, fuzzy
+msgstr ""
+
 msgid "Offline message store full"
-msgstr "Vanlyn boodskap"
+msgstr "Stoor vir vanlynboodskappe is vol"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7053,14 +7055,14 @@
 msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
 
 #. 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 ""
-"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
-"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+"U gebruikernaam het nou te gereeld gekoppel en ontkoppel. Wag tien minute en "
+"probeer weer. Indien u voortgaan om te probeer sal u selfs nog langer moet "
+"wag."
 
 #. client too old
 #, c-format
@@ -7068,14 +7070,14 @@
 msgstr "Die kliëntweergawe wat u gebruik, is te oud. Gradeer gerus op by %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 ""
-"U het nou te gereeld gekoppel en ontkoppel. Wag 'n minuut en probeer weer. "
-"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+"U IP-adres het nou te gereeld gekoppel en ontkoppel. Wag 'n minuut en "
+"probeer weer. Indien u voortgaan om te probeer sal u selfs nog langer moet "
+"wag."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Die SecurID-sleutel wat getik is, is ongeldig"
@@ -7218,21 +7220,21 @@
 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Kan nie boodskap stuur nie (%s)."
+msgstr "Kan nie boodskap stuur nie: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan nie boodskap stuur nie: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kan nie boodskap aan %s stuur nie:"
-
-#, fuzzy, c-format
+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:"
+msgstr "Kan nie boodskap aan %s stuur nie: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7261,13 +7263,12 @@
 "[Kon nie 'n boodskap van hierdie gebruiker wys nie omdat dit ongeldige "
 "karakters bevat.]"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
 "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."
+"u oor die koerslimiet is. Wag gerus 10 sekondes en probeer weer.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -8411,9 +8412,9 @@
 msgid "File Send"
 msgstr "Lêer stuur"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr ""
+msgstr "%d het die oordrag van %s gekanselleer"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -9929,7 +9930,7 @@
 msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Gebruik rekening se instaanbediener vir SSL-verbindings"
 
 msgid "Chat room list URL"
 msgstr "Geselsiekamer-lys-URL"
@@ -10145,10 +10146,10 @@
 msgstr "Open inkassie"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Kan nie SMS stuur nie. Kan nie 'n selfoonnetwerk kry nie."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Kan nie SMS stuur nie. Onbekende selfoonnetwerk."
 
 msgid "Getting mobile carrier to send the SMS."
 msgstr ""
@@ -10690,6 +10691,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Gesels met kitsboodsappe.  Daar is ondersteuning vir AIM, Google Talk, "
+"Jabber/XMPP, MSN, Yahoo en meer"
 
 msgid "Internet Messenger"
 msgstr "Internetboodskapper"
@@ -10835,7 +10838,7 @@
 msgstr "Uitleg"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "Die uitleg van ikone, name en status van die vriendelys"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -11951,6 +11954,9 @@
 msgid "Mongolian"
 msgstr "Mongools"
 
+msgid "Malay"
+msgstr "Maleisies"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål-Noorweegs"
 
@@ -12020,6 +12026,9 @@
 msgid "Turkish"
 msgstr "Turks"
 
+msgid "Ukranian"
+msgstr "Oekraïens"
+
 msgid "Urdu"
 msgstr "Oerdoe"
 
@@ -12658,7 +12667,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "GIDS"
 
 msgid "use DIR for config files"
 msgstr "gebruik GIDS vir opstellinglêers"
@@ -12679,17 +12688,17 @@
 msgstr "moenie outomaties aanmeld nie"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+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 ""
-"aktiveer gespesifiseerde rekening(e) (opsionele argument NAAM\n"
-"                      spesifiseer rekening(e) om te gebruik, geskei met "
-"kommas."
+"aktiveer gespesifiseerde rekening(e)   (opsionele argument\n"
+"                      NAAM spesifiseer rekening(e) om te gebruik, geskei met "
+"kommas.\n"
+"                      Hiersonder word net die eerste rekening geaktiveer)."
 
 msgid "X display to use"
 msgstr "X-vertoon om te gebruik"
@@ -12791,9 +12800,8 @@
 msgid "Dismiss"
 msgstr ""
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vriendwag!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Die volgende inproppe gaan ontlaai word."
@@ -12965,16 +12973,14 @@
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(verstek)"
+msgid "Penguin Pimps"
+msgstr "Pikkepikkewyne"
 
 msgid "The default Pidgin sound theme"
 msgstr ""
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Vriendelys"
+msgstr ""
 
 msgid "The default Pidgin status icon theme"
 msgstr ""
@@ -12991,18 +12997,32 @@
 msgid "Theme failed to copy."
 msgstr "Uitpak van gesiggie-tema het misluk."
 
-msgid "Install Theme"
-msgstr "Installeer tema"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+msgid "Theme Selections"
+msgstr ""
+
+#. Instructions
+#, fuzzy
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Kies 'n gesiggie-tema wat u wil gebruik vanuit die lys hier onder. Nuwe "
 "temas kan geïnstalleer word deur hulle te sleep en te los op die temalys."
 
-msgid "Icon"
-msgstr "Ikoon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Vriendelystema"
+
+msgid "Status Icon Theme:"
+msgstr ""
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Gesiggie-temas"
 
 msgid "Keyboard Shortcuts"
 msgstr "Sleutelbordkortpaaie"
@@ -13010,10 +13030,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Sl_uit gesprekke met die Escape-sleutel"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Vriendelystema"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Stelsellaai-ikoon"
@@ -13100,9 +13116,6 @@
 msgid "Font"
 msgstr "Font"
 
-msgid "Use document font from _theme"
-msgstr "Gebruik dokumentskriftipe uit _tema"
-
 msgid "Use font from _theme"
 msgstr "Gebruik font uit _tema"
 
@@ -13125,15 +13138,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "Kan nie blaaieropstellingsprogram begin nie."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Deaktiveer"
+msgstr "Gedeaktiveer"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Gebruik _outomaties bespeurde IP-adres: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN-bediener:"
 
@@ -13149,78 +13160,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Aktiveer outoaanstuur vir roeteerderpoort"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Spesifiseer self die omvang van poorte om op te luister"
-
-#, fuzzy
+msgstr "_Spesifiseer self die omvang van poorte om op te luister:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Begin:"
+
 msgid "_End:"
-msgstr "_Vou oop"
+msgstr "_Einde:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr ""
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-bediener:"
-
-#, fuzzy
+msgstr "_TURN-bediener:"
+
 msgid "Use_rname:"
-msgstr "Gebruikernaam:"
-
-#, fuzzy
+msgstr "Geb_ruikernaam:"
+
 msgid "Pass_word:"
-msgstr "Wagwoord:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Instaanbediener en blaaier"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Instaanopstellingsprogram is nie gevind nie.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Blaaieropstellingsprogram is nie gevind nie.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Instaanbediener- en blaaiervoorkeure word in\n"
-"GNOME-voorkeure opgestel"
-
-msgid "Configure _Proxy"
-msgstr "Stel _instaanbediener op"
-
-msgid "Configure _Browser"
-msgstr "Stel _blaaier op"
-
-msgid "Proxy Server"
-msgstr "Instaanbediener"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Gebruik afgeleë DNS met SOCKS4-instaanbedieners"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Instaan_tipes:"
-
-msgid "No proxy"
-msgstr "Geen instaanbediener"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Poort:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Gebruikernaam:"
+msgstr "Wag_woord:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13261,6 +13221,15 @@
 msgid "Browser Selection"
 msgstr "Blaaierkeuse"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Blaaiervoorkeure word in GNOME-voorkeure opgestel"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Blaaieropstellingsprogram is nie gevind nie.</b>"
+
+msgid "Configure _Browser"
+msgstr "Stel _blaaier op"
+
 msgid "_Browser:"
 msgstr "_Blaaier:"
 
@@ -13284,6 +13253,35 @@
 "_Handmatig:\n"
 "(%s vir URL)"
 
+msgid "Proxy Server"
+msgstr "Instaanbediener"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Instaanbedienervoorkeure word in GNOME-voorkeure opgestel"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Instaanopstellingsprogram is nie gevind nie.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Stel _instaanbediener op"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Gebruik afgeleë _DNS met SOCKS4-instaanbedieners"
+
+msgid "Proxy t_ype:"
+msgstr "Instaan_tipes:"
+
+msgid "No proxy"
+msgstr "Geen instaanbediener"
+
+msgid "P_ort:"
+msgstr "P_oort:"
+
+msgid "User_name:"
+msgstr "Gebruiker_naam:"
+
 msgid "Log _format:"
 msgstr "Boekstaaf_formaat:"
 
@@ -13367,25 +13365,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Gebaseer op gebruik van sleutelbord en muis"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minute voor ledig word:"
+
+msgid "Change to this status when _idle:"
+msgstr "Verander na _dié status wanneer ledig:"
+
 msgid "_Auto-reply:"
 msgstr "_Outo-antwoord:"
 
 msgid "When both away and idle"
 msgstr "Terwyl weg en ledig"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Outoweg"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minute voor ledig word:"
-
-msgid "Change status when _idle"
-msgstr "Verander status terwyl _ledig"
-
-msgid "Change _status to:"
-msgstr "Verander _status na:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status by begin"
@@ -13399,15 +13390,15 @@
 msgid "Interface"
 msgstr "Koppelvlak"
 
-msgid "Smiley Themes"
-msgstr "Gesiggie-temas"
-
 msgid "Browser"
 msgstr "Blaaier"
 
 msgid "Status / Idle"
 msgstr "Status / ledig"
 
+msgid "Themes"
+msgstr "Temas"
+
 msgid "Allow all users to contact me"
 msgstr "Laat alle gebruikers toe om my te kontak"
 
@@ -13750,9 +13741,6 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin-gesiggies"
 
-msgid "Penguin Pimps"
-msgstr "Pikkepikkewyne"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Deur hier te kies, deaktiveer u grafiese emotikons."
 
@@ -14368,7 +14356,7 @@
 "Hierdie is 'n baie oulike inprop wat klomp dinge doen:\n"
 "- Dit sê wie die program geskryf het wanneer mens aanmeld\n"
 "- Dit keer alle teks agterstevoorom\n"
-"- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
+"- Dit stuur 'n boodskap aan mense op u lys die oomblik wat hulle aanmeld"
 
 msgid "Hyperlink Color"
 msgstr "Hiperskakelkleur"
@@ -14388,6 +14376,9 @@
 msgid "Conversation Entry"
 msgstr "Gesprekinskrywing"
 
+msgid "Conversation History"
+msgstr "Gesprekgeskiedenis"
+
 msgid "Request Dialog"
 msgstr "Versoek-dialoog"
 
@@ -14577,6 +14568,8 @@
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"Ikoon vir kontak/\n"
+"Ikoon vir onbekende persoon"
 
 msgid "Icon for Chat"
 msgstr "Ikoon vir geselsie"
@@ -14589,48 +14582,42 @@
 msgstr "Harder"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "Operateur"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "Halwe operateur"
 
 #, fuzzy
 msgid "Authorization dialog"
 msgstr "Magtiging gegee"
 
-#, fuzzy
 msgid "Error dialog"
-msgstr "Fout "
-
-#, fuzzy
+msgstr "Foutdialoog"
+
 msgid "Information dialog"
-msgstr "Inligting"
+msgstr "Inligtingsdialoog"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "Posdialoog"
 
 #, fuzzy
 msgid "Question dialog"
 msgstr "Versoek-dialoog"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Waarskuwingvlak"
+msgstr "Waarskuwingsdieloog"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Watter tipe dialoogvenster is dié?"
+
 msgid "Status Icons"
-msgstr "Status vir %s"
-
-#, fuzzy
+msgstr "Statusikone"
+
 msgid "Chatroom Emblems"
-msgstr "Geselsiekamer-lokaliteit"
+msgstr "Geselsiekamer-embleme"
 
 #, fuzzy
 msgid "Dialog Icons"
@@ -14863,9 +14850,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Begin %s met Windows-begin"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "laat veelvuldige instansies toe"
+msgstr "Laat veelvuldige instansies toe"
 
 msgid "_Dockable Buddy List"
 msgstr "_Dokbare vriendelys"
@@ -14926,8 +14912,8 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
+#~ msgid ""
+#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr ""
 #~ "Die wortelsertifikaat wat hierdie een beweer uitgereik is, is nie aan "
 #~ "Pidgin bekend nie."
@@ -14935,21 +14921,50 @@
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Stuur kitsboodskappe oor veelvoudige protokolle"
 
+#~ msgid ""
+#~ "enable specified account(s) (optional argument NAME\n"
+#~ "                      specifies account(s) to use, separated by commas."
+#~ msgstr ""
+#~ "aktiveer gespesifiseerde rekening(e) (opsionele argument NAAM\n"
+#~ "                      spesifiseer rekening(e) om te gebruik, geskei met "
+#~ "kommas."
+
+#~ msgid "Without this only the first account will be enabled)."
+#~ msgstr "Hiersonder word net die eerste rekening geaktiveer)."
+
+#~ msgid "Install Theme"
+#~ msgstr "Installeer tema"
+
+#~ msgid "Icon"
+#~ msgstr "Ikoon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Gebruik dokumentskriftipe uit _tema"
+
 #~ msgid "_Start port:"
 #~ msgstr "_Beginpoort:"
 
 #~ msgid "_End port:"
 #~ msgstr "_Endpoort:"
 
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Instaanbediener en blaaier"
+
 #~ msgid "_User:"
 #~ msgstr "_Gebruiker:"
 
+#~ msgid "Auto-away"
+#~ msgstr "Outoweg"
+
+#~ msgid "Change status when _idle"
+#~ msgstr "Verander status terwyl _ledig"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Verander _status na:"
+
 #~ msgid "GTK+ Runtime Version"
 #~ msgstr "GTK+-weergawe"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Hiersonder word net die eerste rekening geaktiveer)."
-
 #~ msgid "Calling ... "
 #~ msgstr "Bel tans ... "
 
@@ -15027,9 +15042,6 @@
 #~ msgid "Error requesting "
 #~ msgstr "Kon nie aanmeldteken aanvra nie"
 
-#~ msgid "%d canceled the transfer of %s"
-#~ msgstr "%d het die oordrag van %s gekanselleer"
-
 #~ msgid "Unable to not load SILC key pair"
 #~ msgstr "Kan nie SILC-sleutelpaar laai nie"
 
@@ -15046,10 +15058,7 @@
 #~ msgstr "Uitnodiging geweier"
 
 #~ msgid "Auto_join when account becomes online."
-#~ msgstr "Sluit _outomaties aan waneer rekening aanlyn kom."
-
-#~ msgid "The layout of icons, name, and status of the blist"
-#~ msgstr "Die uitleg van ikone, name en status van die vriendelys"
+#~ msgstr "Sluit _outomaties aan wanneer rekening aanlyn kom."
 
 #~ msgid "On-line Text"
 #~ msgstr "Aanlynteks"
@@ -15235,6 +15244,9 @@
 #~ msgid "Stream Initiation"
 #~ msgstr "Stroominisiasie"
 
+#~ msgid "User Mood"
+#~ msgstr "Gebruikerstemming"
+
 #~ msgid "User Activity"
 #~ msgstr "Gebruikeraktiwiteit"
 
@@ -15253,6 +15265,9 @@
 #~ msgid "Reachability Address"
 #~ msgstr "Bereikbaarheid-adres"
 
+#~ msgid "User Profile"
+#~ msgstr "Gebruikerprofiel"
+
 #~ msgid "Jingle"
 #~ msgstr "Kenwysie"
 
@@ -15388,6 +15403,9 @@
 #~ msgid "Could not write"
 #~ msgstr "Kon nie skryf nie"
 
+#~ msgid "Could not connect"
+#~ msgstr "Kon nie koppel nie"
+
 #~ msgid "Could not create listen socket"
 #~ msgstr "Kon nie luistersok skep nie"
 
--- a/po/ca.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/ca.po	Sat Jan 09 02:00:18 2010 +0000
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-10-26 09:20+0100\n"
+"POT-Creation-Date: 2009-11-29 22:28+0100\n"
+"PO-Revision-Date: 2009-11-29 22:39+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -472,10 +472,10 @@
 msgstr "Importació de certificats"
 
 msgid "Specify a hostname"
-msgstr "Indiqueu el nom de l'ordiador"
+msgstr "Indiqueu el nom de l'ordinador"
 
 msgid "Type the host name this certificate is for."
-msgstr "Entreu el nom de l'ordinador al qual pertany aquest certificat."
+msgstr "Introduïu el nom de l'ordinador al qual pertany aquest certificat."
 
 #, c-format
 msgid ""
@@ -880,7 +880,7 @@
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Els xats només es registraran si s'habilita preferència «Registra tots els "
+"Els xats només es registraran si s'habilita la preferència «Registra tots els "
 "xats»."
 
 msgid "No logs were found"
@@ -1569,7 +1569,7 @@
 msgstr "Fes un TinyURL d'això d'aquí dalt: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr "Espreu mentre TinyURL obté una URL més curta..."
+msgstr "Espereu mentre TinyURL obté una URL més curta..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Només crea TinyURL per a URL així de llargues o més"
@@ -1585,11 +1585,12 @@
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"En rebre missagtes amb URL, s'empra TinyURL perquè sigui més fàcil copiar"
+"En rebre missatges amb URL, s'empra TinyURL perquè sigui més fàcil copiar"
 
 msgid "Online"
 msgstr "En línia"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1634,7 +1635,7 @@
 msgstr "comptes"
 
 msgid "Password is required to sign on."
-msgstr "Es necessita la contrasenya per a poder connectar."
+msgstr "Es necessita la contrasenya per poder connectar."
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -3210,10 +3211,12 @@
 msgid "Add to chat..."
 msgstr "Afegeix al xat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponible"
 
+#. 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
@@ -3668,14 +3671,14 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [clau1[,clau2][,...]]:  entra a un o més "
-"canals, opcionalment proporcionant una clau si cal."
+"canals, proporcionant una clau opcional si cal."
 
 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;sala1&gt;[,sala2][,...] [clau1[,clau2][,...]]:  entra a un o més "
-"canals, opcionalment proporcionant una clau si cal."
+"canals, proporcionant una clau opcional si cal."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -4027,12 +4030,14 @@
 msgid "Log Out"
 msgstr "Desconnecta"
 
+#. 2
 msgid "Chatty"
 msgstr "Xerraire"
 
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
@@ -4297,6 +4302,7 @@
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
+#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -5504,9 +5510,8 @@
 msgid "Unknown error (%d)"
 msgstr "Error desconegut (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "No s'ha pogut afegir l'usuari"
+msgstr "No s'ha pogut suprimir l'usuari"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "No s'ha enviat el missatge al mòbil perquè era massa llarg."
@@ -5757,28 +5762,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s us ha suprimit de la seva llista d'amics."
 
+#. 1
+msgid "Angry"
+msgstr "Enfadat"
+
+#. 2
+msgid "Excited"
+msgstr "Excitat"
+
+#. 3
+msgid "Grumpy"
+msgstr "Rondinaire"
+
+#. 4
+msgid "Happy"
+msgstr "Content"
+
+#. 5
+msgid "In Love"
+msgstr "Enamorat"
+
+#. 6
+msgid "Invincible"
+msgstr "Invencible"
+
+#. 7
+msgid "Sad"
+msgstr "Trist"
+
+#. 8
+msgid "Hot"
+msgstr "Calent"
+
+#. 9
+msgid "Sick"
+msgstr "Malalt"
+
+#. 10
+msgid "Sleepy"
+msgstr "Endormiscat"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "El vostre estat d'ànim actual"
+msgstr "Estat d'ànim actual"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Estat d'ànim de l'usuari"
-
-#, fuzzy
+msgstr "Nou estat d'ànim"
+
 msgid "Change your Mood"
-msgstr "Canvia la contrasenya"
-
-#, fuzzy
+msgstr "Canvieu el vostre estat d'ànim"
+
 msgid "How do you feel right now?"
-msgstr "Ara mateix no sóc aquí"
+msgstr "Com us trobeu ara mateix?"
+
+msgid "The PIN you entered is invalid."
+msgstr "El PIN que heu introduït no és vàlid."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"La data de l'aniversari que heu introduït no és vàlida. El format és: 'AAAA-"
+"MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Error d'escriptura"
+msgstr "S'ha produït un error en actualitzar el perfil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5787,356 +5848,304 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
+"intentar més tard."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifiqueu el PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Visualitza"
+msgstr "Nom que es mostrarà"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Oculta el meu número"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Número del telèfon mòbil"
-
-#, fuzzy
+msgstr "Número de telèfon mòbil"
+
 msgid "Update your Profile"
-msgstr "Perfil de l'usuari"
+msgstr "Actualitzeu el vostre perfil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Aquí podeu actualitzar el vostre perfil MXit"
 
 msgid "View Splash"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostra la pantalla de presentació"
+
 msgid "There is no splash-screen currently available"
-msgstr "El xat no està actualment disponible"
-
-#, fuzzy
+msgstr "No hi ha cap pantalla de presentació disponible"
+
 msgid "About"
-msgstr "Quant a mi"
+msgstr "Quant a"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Canvia la contrasenya..."
+msgstr "Canvia l'estat d'ànim..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Canvia la contrasenya..."
+msgstr "Canvia el perfil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Mostra el registre..."
+msgstr "Mostra la pantalla de presentació..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Quant a mi"
+msgstr "Quant a..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "El missatge és massa llarg."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "El fitxer que voleu enviar és massa llarg."
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"No s'ha pogut connectar al servidor HTTP de MXit. Comproveu la configuració "
+"del servidor."
+
 msgid "Logging In..."
-msgstr "S'està entrant"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
-"us vulgueu connectar."
-
-#, fuzzy
+msgstr "S'està entrant..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "No s'ha pogut connectar al servidor MXit. Comproveu la configuració."
+
 msgid "Connecting..."
-msgstr "S'està connectant"
+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 ""
+msgstr "Nom d'usuari de MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Sobrenom"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registra un compte XMPP nou"
-
-#, fuzzy
+msgstr "Crea un compte MXit nou"
+
 msgid "Please fill in the following fields:"
-msgstr "Empleneu els camps següents"
+msgstr "Empleneu aquests camps:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"S'ha produït un error en connectar al lloc WAP de MXit. Intenteu-ho més tard."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"Ara mateix MXit no pot processar la sol·licitud. Torneu-ho a intentar més "
+"tard."
 
 msgid "Wrong security code entered. Please try again later."
 msgstr ""
+"S'ha introduït un codi de seguretat equivocat. Torneu-ho a intentar més tard."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "La vostra sessió ha expirat. Torneu-ho a intentar més tard."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Aquest nom d'usuari ja està registrat, escolliu-ne un altre."
+
 msgid "Internal error. Please try again later."
-msgstr "El servidor no està disponible, proveu-ho més tard"
+msgstr "S'ha produït un error intern. Torneu-ho a provar més tard."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "No heu introduït codi de seguretat"
+
 msgid "Security Code"
-msgstr "Seguretat habilitada"
+msgstr "Codi de seguretat"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Introduïu el codi"
-
-#, fuzzy
+msgstr "Introduïu el codi de seguretat"
+
 msgid "Your Country"
-msgstr "País"
-
-#, fuzzy
+msgstr "El vostre país"
+
 msgid "Your Language"
-msgstr "Idioma preferit"
+msgstr "La vostra llengua"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Sol·licitud d'autorització"
+msgstr "Autorització MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Validació del compte MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Informació del servidor"
-
-#, fuzzy
+msgstr "S'està obtenint informació de l'usuari..."
+
+msgid "Loading menu..."
+msgstr "S'està carregant el menú..."
+
 msgid "Status Message"
 msgstr "Missatge d'estat"
 
 # Segons la viquipèdia
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Nom del mig"
-
-#, fuzzy
+msgstr "Nombre ocult"
+
 msgid "Your Mobile Number..."
-msgstr "Estableix el número del telèfon mòbil..."
+msgstr "El vostre telèfon mòbil..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Servidor"
-
-#, fuzzy
+msgstr "Servidor WAP"
+
 msgid "Connect via HTTP"
-msgstr "Connecta amb TCP"
+msgstr "Connecta amb HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Habilita la pantalla de presentació emergent"
 
 #. 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 "Heu perdut la connexió a la sala de xat %s."
+msgstr "S'ha trencat la connexió a MXit. Torneu-vos a connectar."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Missatge d'error de l'XMPP"
-
-#, fuzzy
+msgstr "S'ha produït un error en enviar el missatge"
+
 msgid "Unable to process your request at this time"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+msgstr "Ara mateix no es pot processar la sol·licitud"
 
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
-
-#, fuzzy
+"S'ha exhaurit el temps d'espera per obtenir una resposta del servidor MXit."
+
 msgid "Successfully Logged In..."
-msgstr "S'ha entrat al Qun"
-
-#, fuzzy
+msgstr "S'ha pogut entrar..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s us ha enviat un missatge xifrat, però aquest client no implementa el "
+"mètode emprat per xifrar."
+
 msgid "Message Error"
-msgstr "Missatge d'error de l'XMPP"
+msgstr "S'ha produït un error en el missatge"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "No es pot redireccionar amb el protocol seleccionat"
+
+msgid "An internal MXit server error occurred."
+msgstr "S'ha produït un error intern del servidor MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "S'ha produït un error en entrar: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "S'ha produït un error en sortir: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en un contacte"
+
 msgid "Message Sending Error"
-msgstr "Missatge d'error de l'XMPP"
-
-#, fuzzy
+msgstr "S'ha produït un error en enviar un missatge"
+
 msgid "Status Error"
-msgstr "Error de flux"
-
-#, fuzzy
+msgstr "S'ha produït un error en l'estat"
+
 msgid "Mood Error"
-msgstr "Error en la icona"
-
-#, fuzzy
+msgstr "S'ha produït un error en l'estat d'ànim"
+
 msgid "Invitation Error"
-msgstr "Error en desconnectar"
-
-#, fuzzy
+msgstr "S'ha produït un error en la invitació"
+
 msgid "Contact Removal Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en suprimir un contacte"
+
 msgid "Subscription Error"
-msgstr "Subscripció"
-
-#, fuzzy
+msgstr "S'ha produït un error en la subscripció"
+
 msgid "Contact Update Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en actualitzar un contacte"
+
 msgid "File Transfer Error"
-msgstr "Transferència de fitxers"
-
-#, fuzzy
+msgstr "S'ha produït un error en la transferència de fitxers"
+
 msgid "Cannot create MultiMx room"
-msgstr "No s'ha pogut crear l'avís"
-
-#, fuzzy
+msgstr "No s'ha pogut crear una sala MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "Error en desconnectar"
-
-#, fuzzy
+msgstr "S'ha produït un error en la invitació MultiMix"
+
 msgid "Profile Error"
-msgstr "Error d'escriptura"
+msgstr "S'ha produït un error en el perfil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "S'ha rebut un paquet invàlid de MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "S'ha produït un error de conneció a MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Enfadat"
-
-msgid "Excited"
-msgstr "Excitat"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grup"
-
-msgid "Happy"
-msgstr "Content"
-
-msgid "In Love"
-msgstr "Enamorat"
-
-msgid "Invincible"
-msgstr "Invencible"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "Ordinador:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Sobrenom"
-
-msgid "Sleepy"
-msgstr "Endormiscat"
-
-#, fuzzy
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x06)"
+
 msgid "Pending"
-msgstr "S'està enviant"
-
-#, fuzzy
+msgstr "Pendent"
+
 msgid "Invited"
-msgstr "Convida"
-
-#, fuzzy
+msgstr "Convidat"
+
 msgid "Rejected"
-msgstr "Rebutja"
-
-#, fuzzy
+msgstr "Rebutjat"
+
 msgid "Deleted"
-msgstr "Suprimeix"
+msgstr "Suprimit"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Anuncis MXit"
+
 msgid "More Information"
-msgstr "Informació de la feina"
+msgstr "Més informació"
 
 #, c-format
 msgid "No such user: %s"
@@ -6353,7 +6362,7 @@
 msgstr "No s'ha establer cap nom d'usuari"
 
 msgid "Please enter a username to check its availability:"
-msgstr "Entreu un nom d'usuari per a comprovar-ne la disponibilitat:"
+msgstr "Introduïu un nom d'usuari per a comprovar-ne la disponibilitat:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6374,7 +6383,7 @@
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "bufetejar"
+msgstr "Bufetejar"
 
 #, c-format
 msgid "%s has whacked you!"
@@ -6548,7 +6557,8 @@
 msgstr "L'arxiu mestre està desconfigurat"
 
 msgid "Could not recognize the host of the username you entered"
-msgstr "No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu entrat"
+msgstr ""
+"No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu introduït"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
@@ -6930,47 +6940,42 @@
 msgstr "No es pot fer mentre estigui a AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Els controls parentals no permeten que es pugui rebre MI"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "No es poden enviar SMS si no s'accepten els termes"
+
 msgid "Cannot send SMS"
-msgstr "No s'ha pogut enviar el fitxer"
+msgstr "No s'ha pogut enviar l'SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "No es pot enviar un directori."
+msgstr "No es poden enviar SMS a aquest país"
 
 #. Undocumented
-#, fuzzy
 msgid "Cannot send SMS to unknown country"
-msgstr "No es poden enviar SMS, no es coneix l'operador de telefona mòbil."
+msgstr "No es poden enviar SMS a un país desconegut"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Els robots no poden iniciar MI"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Aquest robot no pot fer MI amb aquest usuari"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Aquest robot ha superat el límit de MI"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Aquest robot ha superat el límit de MI diari"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Aquest robot ha superat el límit de MI mensual"
+
 msgid "Unable to receive offline messages"
-msgstr "No s'ha pogut enviar el missatge."
-
-#, fuzzy
+msgstr "No s'han pogut rebre els missatges fora de línia"
+
 msgid "Offline message store full"
-msgstr "Missatge de fora de línia"
+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 "
@@ -7143,15 +7148,14 @@
 "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
 #. 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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
-"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
+"El vostre usuari s'ha estat connectant i desconnectat amb massa freqüència. "
+"Espereu deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu "
+"d'esperar encara més temps."
 
 #. client too old
 #, c-format
@@ -7159,18 +7163,17 @@
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu un "
-"minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
+"La vostra adreça IP s'ha estat connectant i desconnectat amb massa "
+"freqüència. Espereu un minut i intenteu-ho de nou. Si continueu intentant-"
+"ho, haureu d'esperar encara més temps."
 
 msgid "The SecurID key entered is invalid"
-msgstr "La clau SecurID que heu entrat no és vàlida"
+msgstr "La clau SecurID que heu introduït no és vàlida"
 
 msgid "Enter SecurID"
 msgstr "Introduïu el SecureID"
@@ -7185,7 +7188,8 @@
 msgstr "No s'ha pogut inicialitzar la connexió"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
+msgstr ""
+"Si us plau, autoritzeu-me perquè us pugui afegir a la meva llista d'amics."
 
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
@@ -7305,21 +7309,21 @@
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge (%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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge a %s:"
-
-#, fuzzy, c-format
+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:"
+msgstr "No s'ha pogut enviar el missatge a %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7348,13 +7352,12 @@
 "[No s'ha pogut mostrar el missatge d'aquest usuari perquè contenia caràcters "
 "invàlids.]"
 
-#, 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 ""
 "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
-"per sobre del límit. Espereu 10 segons i torneu-ho a provar."
+"per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -8648,7 +8651,7 @@
 msgstr "ID de Sametime"
 
 msgid "An ambiguous user ID was entered"
-msgstr "S'ha entrat un ID d'usuari ambigu"
+msgstr "S'ha introduït un ID d'usuari ambigu"
 
 #, c-format
 msgid ""
@@ -10771,6 +10774,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Xategeu amb missatgeria instantània, amb AIM, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo i més"
 
 msgid "Internet Messenger"
 msgstr "Missatger d'Internet"
@@ -11494,7 +11499,7 @@
 msgstr "/Amics/Ordena els amics"
 
 msgid "Type the host name for this certificate."
-msgstr "Entreu el nom de l'ordinador al qual pertany aquest certificat."
+msgstr "Introduïu el nom de l'ordinador al qual pertany aquest certificat."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11930,7 +11935,7 @@
 msgstr "Català"
 
 msgid "Valencian-Catalan"
-msgstr "Valencià-català"
+msgstr "Català (valencià)"
 
 msgid "Czech"
 msgstr "Txec"
@@ -12044,6 +12049,9 @@
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Malay"
+msgstr "Malai"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruec bokmål"
 
@@ -12115,6 +12123,9 @@
 msgid "Turkish"
 msgstr "Turc"
 
+msgid "Ukranian"
+msgstr "Ucraïnès"
+
 # FIXME?
 msgid "Urdu"
 msgstr "Urdu"
@@ -13070,8 +13081,10 @@
 msgid "(Custom)"
 msgstr "(Personalitzat)"
 
-msgid "(Default)"
-msgstr "(Predeterminat)"
+# Nom propi: http://www.penguinpimps.com/?
+# "proxenetes" no queda gens, s'hi podria posar alguna altra cosa (josep)
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr "El tema de sons predeterminat del pidgin"
@@ -13091,18 +13104,30 @@
 msgid "Theme failed to copy."
 msgstr "No s'ha pogut copiar el tema."
 
-msgid "Install Theme"
-msgstr "Instal·la el tema"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Seleccioneu un tema d'emoticones de la llista següent. Es poden instal·lar "
-"temes nous arrossegant-los i deixant-los anar a la llista de temes."
-
-msgid "Icon"
-msgstr "Icona"
+msgid "Theme Selections"
+msgstr "Selecció del tema"
+
+#. 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 ""
+"Seleccioneu el tema que vulgueu emprar de la llista d'aquí sota.\n"
+"Es poden afegir temes nous arrossegant-los i deixant-los anar a la llista de "
+"temes."
+
+msgid "Buddy List Theme:"
+msgstr "Tema de la llista d'amics:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema de la icona d'estat:"
+
+msgid "Sound Theme:"
+msgstr "Tema de sons:"
+
+msgid "Smiley Theme:"
+msgstr "Tema d'emoticones:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
@@ -13110,10 +13135,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Tanca les converses amb la tecla d'_escapament"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Tema de la llista d'amics"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
@@ -13200,9 +13221,6 @@
 msgid "Font"
 msgstr "Tipus de lletra"
 
-msgid "Use document font from _theme"
-msgstr "_Empra el tipus de lletra del document del tema"
-
 msgid "Use font from _theme"
 msgstr "Empra el tipus de lletra del _tema"
 
@@ -13248,17 +13266,14 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Habilita la desviació automàtica de ports de l'encaminador"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Especifica manualment el rang de ports on escoltar"
-
-#, fuzzy
+msgstr "_Especifica manualment el rang de ports on escoltar:"
+
 msgid "_Start:"
-msgstr "E_stat:"
-
-#, fuzzy
+msgstr "_Inici:"
+
 msgid "_End:"
-msgstr "_Amplia"
+msgstr "_Final:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
@@ -13267,60 +13282,11 @@
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Nom d'usuari:"
-
-#, fuzzy
+msgstr "Nom d'_usuari:"
+
 msgid "Pass_word:"
-msgstr "Contrasenya:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor intermediari i navegador"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>No s'ha pogut trobar el programa de configuració del servidor "
-"intermediari.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>No s'ha pogut trobar el programa de configuració del navegador.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Les preferències del servidor intermediari i\n"
-"del navegador les gestiona el GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Configura el _servidor intermediari"
-
-msgid "Configure _Browser"
-msgstr "Configura el _navegador"
-
-msgid "Proxy Server"
-msgstr "Servidor intermediari"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Empra DNS remot amb servidors intermediàris SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipus de servidor intermediari"
-
-msgid "No proxy"
-msgstr "Sense servidor intermediari"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nom d'usuari:"
+msgstr "Contrasen_ya:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13361,6 +13327,15 @@
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Les preferències del navegador es configuren a través del GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>No s'ha pogut trobar el programa de configuració del navegador.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configura el _navegador"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13384,6 +13359,38 @@
 "_Manual:\n"
 "(%s per a l'URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor intermediari"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Les preferències del servidor intermediari es configuren a través el GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+"<b>No s'ha pogut trobar el programa de configuració del servidor "
+"intermediari.</b>"
+
+msgid "Configure _Proxy"
+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"
+
+msgid "Proxy t_ype:"
+msgstr "_Tipus de servidor intermediari:"
+
+msgid "No proxy"
+msgstr "Sense servidor intermediari"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "_Nom d'usuari:"
+
 msgid "Log _format:"
 msgstr "_Format del registre:"
 
@@ -13467,25 +13474,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Basat en l'ús del teclat o el ratolí"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuts abans de passar a inactiu:"
+
+msgid "Change to this status when _idle:"
+msgstr "_Canvia l'estat quan estigui inactiu:"
+
 msgid "_Auto-reply:"
 msgstr "Resposta _automàtica:"
 
 msgid "When both away and idle"
 msgstr "En estar absent i inactiu alhora"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-absència"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minuts abans de passar a inactiu:"
-
-msgid "Change status when _idle"
-msgstr "_Canvia l'estat quan estigui inactiu"
-
-msgid "Change _status to:"
-msgstr "Canvia l'_estat a:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "L'estat en iniciar"
@@ -13499,15 +13499,15 @@
 msgid "Interface"
 msgstr "Interfície"
 
-msgid "Smiley Themes"
-msgstr "Temes d'emoticones"
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr "Estat / Inactiu"
 
+msgid "Themes"
+msgstr "Temes"
+
 msgid "Allow all users to contact me"
 msgstr "Permet a tots els usuaris contactar amb mi"
 
@@ -13854,11 +13854,6 @@
 msgid "Pidgin smileys"
 msgstr "Emoticones del Pidgin"
 
-# Nom propi: http://www.penguinpimps.com/?
-# "proxenetes" no queda gens, s'hi podria posar alguna altra cosa (josep)
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Si seleccioneu això s'inhabilitaran les emoticones gràfiques."
 
@@ -14505,6 +14500,9 @@
 msgid "Conversation Entry"
 msgstr "Entrada de la conversa"
 
+msgid "Conversation History"
+msgstr "Històric de converses"
+
 msgid "Request Dialog"
 msgstr "Diàleg de sol·licitud"
 
@@ -15038,6 +15036,27 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid "(Default)"
+#~ msgstr "(Predeterminat)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Instal·la el tema"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "_Empra el tipus de lletra del document del tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Servidor intermediari i navegador"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-absència"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Canvia l'_estat a:"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Envieu missatges instantanis en múltiples protocols"
 
@@ -15794,7 +15813,7 @@
 #~ msgstr "Estat desconegut"
 
 #~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Heu entrat un identificador de grup fora del rang"
+#~ msgstr "Heu introduït un identificador de grup fora del rang"
 
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "Esteu segur que voleu deixar aquest Qun?"
@@ -16074,9 +16093,6 @@
 #~ msgid "_Send To"
 #~ msgstr "_Envia a"
 
-#~ msgid "Conversation History"
-#~ msgstr "Històric de converses"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Visualitzador del registre"
 
@@ -17344,9 +17360,6 @@
 #~ msgid "Burmese"
 #~ msgstr "Birmà"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraïnès"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xosa"
 
--- a/po/ca@valencia.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/ca@valencia.po	Sat Jan 09 02:00:18 2010 +0000
@@ -1,4 +1,4 @@
-# Pidgin Catalan (Valencian) translation
+# Pidgin Catalan translation
 # Copyright (C) 2003, JM Pérez Cáncer <jm@cocoloco.dyn.dhs.org>
 # Copyright (C) unknown, Robert Millan <zeratul2@wanadoo.es>
 # Copyright (C) December 2003 (from 2003-12-12 until 2003-12-18),
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-07-26 17:23+0200\n"
+"POT-Creation-Date: 2009-11-28 18:48+0100\n"
+"PO-Revision-Date: 2009-11-28 21:57+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -322,7 +322,8 @@
 "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?"
@@ -471,10 +472,10 @@
 msgstr "Importació de certificats"
 
 msgid "Specify a hostname"
-msgstr "Indiqueu el nom de l'ordiador"
+msgstr "Indiqueu el nom de l'ordinador"
 
 msgid "Type the host name this certificate is for."
-msgstr "Entreu el nom de l'ordinador al qual pertany este certificat."
+msgstr "Introduïu el nom de l'ordinador al qual pertany este certificat."
 
 #, c-format
 msgid ""
@@ -581,7 +582,8 @@
 
 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."
@@ -660,9 +662,8 @@
 msgid "Enable Sounds"
 msgstr "Habilita els sons"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "No s'ha pogut connectar"
+msgstr "No esteu connectat."
 
 msgid "<AUTO-REPLY> "
 msgstr "<RESPOSTA-AUTOMÀTICA> "
@@ -673,9 +674,8 @@
 msgstr[0] "Llista d'%d usuari:\n"
 msgstr[1] "Llista de %d usuaris:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Les opcions de depuració disponibles són:  version"
+msgstr "Les opcions de depuració disponibles són:  plugins version"
 
 msgid "No such command (in this context)."
 msgstr "L'orde no existeix (en este context)."
@@ -705,7 +705,7 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;missatge&gt;: envia un missatge normalment com si no féreu servir "
+"say &lt;missatge&gt;: envia un missatge normalment com si no féssiu servir "
 "cap orde."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
@@ -756,8 +756,8 @@
 "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."
@@ -880,7 +880,7 @@
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Els xats només es registraran si s'habilita preferència «Registra tots els "
+"Els xats només es registraran si s'habilita la preferència «Registra tots els "
 "xats»."
 
 msgid "No logs were found"
@@ -1497,7 +1497,7 @@
 msgstr "%s vos ha enviat un missatge a %s"
 
 msgid "Buddy signs on/off"
-msgstr "Un amic es connecte/desconnecte"
+msgstr "Un amic es connecte/desconnecti"
 
 msgid "You receive an IM"
 msgstr "Rebeu un MI"
@@ -1566,14 +1566,13 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "Fes un TinyURL d'això d'ací dalt: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
-
-#, fuzzy
+msgstr "Espereu mentre TinyURL obté una URL més curta..."
+
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Crea TinyURL per a URL així de llargues o més"
+msgstr "Només crea TinyURL per a URL així de llargues o més"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "Prefix de l'adreça TinyURL (o altra)"
@@ -1584,14 +1583,14 @@
 msgid "TinyURL plugin"
 msgstr "Connector TinyURL"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"Quan rebeu missagtes amb URL, feu servir TinyURL per a copiar més fàcilment"
+"En rebre missatges amb URL, s'empra TinyURL perquè siga més fàcil copiar"
 
 msgid "Online"
 msgstr "En línia"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1636,7 +1635,7 @@
 msgstr "comptes"
 
 msgid "Password is required to sign on."
-msgstr "Es necessita la contrasenya per a poder connectar."
+msgstr "Es necessita la contrasenya per poder connectar."
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1693,28 +1692,25 @@
 msgid "buddy list"
 msgstr "llista d'amics"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"No es pot comprovar el certificat que presenta «%s» atès que està auto-signat."
+msgstr "No es pot comprovar el certificat atès que està auto-signat."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-
-#, fuzzy
+"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 "La cadena de certificació que presenta %s no és vàlida."
-
-#, fuzzy
+msgstr "El certificat encara no és vàlid."
+
 msgid "The certificate has expired and should not be considered valid."
-msgstr "La cadena de certificació que presenta %s no és vàlida."
+msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "La cadena de certificació que presenta %s no és vàlida."
+msgstr "El certificat que s'ha presentat no ha estat emés per a este domini."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1723,17 +1719,14 @@
 "Este certificat no es pot validar perquè no teniu cap base de dades de "
 "certificats arrel."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "La cadena de certificació que presenta %s no és vàlida."
-
-#, fuzzy
+msgstr "La cadena de certificació que s'ha presentat no és vàlida."
+
 msgid "The certificate has been revoked."
-msgstr "Ha finalitzat la trucada."
-
-#, fuzzy
+msgstr "El certificat ha estat revocat."
+
 msgid "An unknown certificate error occurred."
-msgstr "Hi ha hagut un error de connexió desconegut: %s."
+msgstr "S'ha produït un error desconegut en el certificat."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(NO COINCIDEIX)"
@@ -1778,26 +1771,25 @@
 msgid "_View Certificate..."
 msgstr "_Mostra el certificat..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "La cadena de certificació que presenta %s no és vàlida."
+msgstr "No s'ha pogut validar el certificat de %s."
 
 # Títol de finestra (josep)
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error en el certificat SSL"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "No s'ha pogut autenticar: %s"
-
-#, fuzzy, c-format
+msgstr "No s'ha pogut certificar"
+
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"El certificat de «%s» pareix indicar que és de «%s». Això podria voler dir que "
-"vos esteu connectant a un servei diferent del que vos penseu."
+"El certificat indica que és de «%s». Això podria voler dir que vos esteu "
+"connectant a un servei diferent del que vos penseu."
 
 #. Make messages
 #, c-format
@@ -1946,9 +1938,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "El procés resoledor ha acabat sense respondre la nostra sol·licitud"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "S'ha produït un error en resoldre %s: %d"
+msgstr "S'ha produït un error en convertir %s a punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2045,18 +2037,18 @@
 msgid "File transfer complete"
 msgstr "S'ha completat la transferència del fitxer"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Heu cancel·lat la transferència de %s"
 
 msgid "File transfer cancelled"
 msgstr "S'ha cancel·lat la transferència del fitxer"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s ha cancel·lat la transferència de %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s ha cancel·lat la transferència del fitxer"
 
@@ -2171,7 +2163,8 @@
 "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»"
@@ -2248,28 +2241,30 @@
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"No s'ha trobat cap còdec. Instal·leu els còdecs del GStreamer que podeu "
+"trobar en els paquests de connectors del GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-
-#, fuzzy
+"No hi ha cap més còdec. Les preferències dels còdecs al fitxer fs-codecs."
+"conf són massa estrictes."
+
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Hi ha hagut un error de connexió desconegut: %s."
-
-#, fuzzy
+msgstr "S'ha produït un error no recuperable del Farsight2."
+
 msgid "Conference error"
-msgstr "Conferència tancada"
+msgstr "Error en la conferència"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "S'ha produït un error amb el micròfon"
 
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "S'ha produït un error amb la càmera web"
+
+#, c-format
 msgid "Error creating session: %s"
-msgstr "S'ha produït un error en crear la connexió"
+msgstr "S'ha produït un error en crear la sessió: %s"
 
 msgid "Error creating conference."
 msgstr "S'ha produït un error en crear la conferència."
@@ -2535,16 +2530,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Connector de proves per a servidor d'IPC, que registra les ordes IPC."
 
-#, fuzzy
 msgid "Hide Joins/Parts"
-msgstr "Oculta els errors en entrar"
+msgstr "Oculta en entrar/eixir"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Per sales amb més persones que"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Si l'usuari no ha parlat en"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Aplica les normes d'ocultació als amics"
@@ -2726,8 +2720,8 @@
 "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"
@@ -2796,7 +2790,8 @@
 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
@@ -2823,8 +2818,8 @@
 "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..."
@@ -2956,7 +2951,7 @@
 msgstr "Un amic passe a _inactiu"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Un amic e_s connecte/desconnecte"
+msgstr "Un amic e_s connecte/desconnecti"
 
 #. *< type
 #. *< ui_requirement
@@ -3216,10 +3211,12 @@
 msgid "Add to chat..."
 msgstr "Afig al xat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponible"
 
+#. 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
@@ -3659,8 +3656,8 @@
 "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 "
@@ -3674,14 +3671,14 @@
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [clau1[,clau2][,...]]:  entra a un o més "
-"canals, opcionalment proporcionant una clau si cal."
+"canals, proporcionant una clau opcional si cal."
 
 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;sala1&gt;[,sala2][,...] [clau1[,clau2][,...]]:  entra a un o més "
-"canals, opcionalment proporcionant una clau si cal."
+"canals, proporcionant una clau opcional si cal."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -4001,11 +3998,11 @@
 msgid "Logo"
 msgstr "Logotip"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Esteu segur que voleu suprimir %s de la llista d'amics?"
+msgstr "%s no podrà veure l'actualització del vostre estat. Voleu continuar?"
 
 msgid "Cancel Presence Notification"
 msgstr "Cancel·la la notificació de presència"
@@ -4033,12 +4030,14 @@
 msgid "Log Out"
 msgstr "Desconnecta"
 
+#. 2
 msgid "Chatty"
 msgstr "Xerraire"
 
 msgid "Extended Away"
 msgstr "Absent des de fa una bona estona"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "No molesteu"
 
@@ -4303,6 +4302,7 @@
 msgid "None (To pending)"
 msgstr "Cap (a pendent)"
 
+#. 0
 msgid "None"
 msgstr "Cap"
 
@@ -4614,7 +4614,6 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  configura la sala de xat."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
 msgstr "part [sala]:  ix de la sala."
 
@@ -4634,13 +4633,12 @@
 "affiliate &lt;owner|admin|member|outcast|none&gt; [sobrenom1] "
 "[sobrenom2] ...: obtén els usuaris amb una afiliació, o els l'estableix."
 
-#, 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;usuari&gt; &lt;moderator|participant|visitor|none&gt; [sobrenom1] "
-"[sobrenom2] ...: obtén els usuaris amb el rol especificat, o els l'estableix."
+"role &lt;moderator|participant|visitor|none&gt; [sobrenom1] [sobrenom2] ...: "
+"obtén els usuaris amb el rol especificat, o els l'estableix."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuari&gt; [sala]:  convida un usuari a la sala."
@@ -5060,7 +5058,6 @@
 msgid "Not expected"
 msgstr "Inesperat"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "El nom amistós canvia massa de pressa"
 
@@ -5136,15 +5133,15 @@
 "no està implementat."
 
 msgid "Nudge"
-msgstr "Donar un cop de colze"
+msgstr "Donar un colp de colze"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s vos ha donat un cop de colze!"
+msgstr "%s vos ha donat un colp de colze!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "S'està donant un cop de colze a %s..."
+msgstr "S'està donant un colp de colze a %s..."
 
 msgid "Email Address..."
 msgstr "Correu electrònic..."
@@ -5193,7 +5190,8 @@
 #, 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."
@@ -5282,13 +5280,13 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 "No s'ha pogut afegir l'amic %s perquè el nom d'usuari no és vàlid. Els noms "
-"d'usuari han de ser adreces de correu vàlides."
+"d'usuari han de ser adreces de correu electròniques vàlides."
 
 msgid "Unable to Add"
 msgstr "No s'ha pogut afegir"
@@ -5485,7 +5483,7 @@
 msgstr "Mostra emoticones personalitzades"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: doneu un cop de colze a un usuari perquè vos pare atenció"
+msgstr "nudge: doneu un colp de colze a un usuari perquè vos pare atenció"
 
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Autenticació amb el Windows Live ID: no s'ha pogut connectar"
@@ -5495,7 +5493,7 @@
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s vos ha donat un cop de colze!"
+msgstr "%s vos ha donat un colp de colze!"
 
 msgid "The following users are missing from your addressbook"
 msgstr "Manquen estos usuaris a la vostra llista d'amics"
@@ -5512,9 +5510,8 @@
 msgid "Unknown error (%d)"
 msgstr "Error desconegut (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "No s'ha pogut afegir l'usuari"
+msgstr "No s'ha pogut suprimir l'usuari"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "No s'ha enviat el missatge al mòbil perquè era massa llarg."
@@ -5632,10 +5629,10 @@
 "%s ha sol·licitat poder veure la vostra càmera web, però això encara no està "
 "implementat."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s ha sol·licitat poder veure la vostra càmera web, però això encara no està "
+"%s vos ha convidat a veure la seua càmera web, però això encara no està "
 "implementat."
 
 msgid "Away From Computer"
@@ -5765,28 +5762,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vos ha suprimit de la seua llista d'amics."
 
+#. 1
+msgid "Angry"
+msgstr "Enfadat"
+
+#. 2
+msgid "Excited"
+msgstr "Excitat"
+
+#. 3
+msgid "Grumpy"
+msgstr "Rondinaire"
+
+#. 4
+msgid "Happy"
+msgstr "Content"
+
+#. 5
+msgid "In Love"
+msgstr "Enamorat"
+
+#. 6
+msgid "Invincible"
+msgstr "Invencible"
+
+#. 7
+msgid "Sad"
+msgstr "Trist"
+
+#. 8
+msgid "Hot"
+msgstr "Calent"
+
+#. 9
+msgid "Sick"
+msgstr "Malalt"
+
+#. 10
+msgid "Sleepy"
+msgstr "Endormiscat"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "El vostre estat d'ànim actual"
+msgstr "Estat d'ànim actual"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Estat d'ànim de l'usuari"
-
-#, fuzzy
+msgstr "Nou estat d'ànim"
+
 msgid "Change your Mood"
-msgstr "Canvia la contrasenya"
-
-#, fuzzy
+msgstr "Canvieu el vostre estat d'ànim"
+
 msgid "How do you feel right now?"
-msgstr "Ara mateix no sóc ací"
+msgstr "Com vos trobeu ara mateix?"
+
+msgid "The PIN you entered is invalid."
+msgstr "El PIN que heu introduït no és vàlid."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"La data de l'aniversari que heu introduït no és vàlida. El format és: 'AAAA-"
+"MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Error d'escriptura"
+msgstr "S'ha produït un error en actualitzar el perfil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5795,356 +5848,304 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
+"intentar més tard."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Verifiqueu el PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Visualitza"
+msgstr "Nom que es mostrarà"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Oculta el meu número"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Número del telèfon mòbil"
-
-#, fuzzy
+msgstr "Número de telèfon mòbil"
+
 msgid "Update your Profile"
-msgstr "Perfil de l'usuari"
+msgstr "Actualitzeu el vostre perfil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Ací podeu actualitzar el vostre perfil MXit"
 
 msgid "View Splash"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostra la pantalla de presentació"
+
 msgid "There is no splash-screen currently available"
-msgstr "El xat no està actualment disponible"
-
-#, fuzzy
+msgstr "No hi ha cap pantalla de presentació disponible"
+
 msgid "About"
-msgstr "Quant a mi"
+msgstr "Quant a"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Canvia la contrasenya..."
+msgstr "Canvia l'estat d'ànim..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Canvia la contrasenya..."
+msgstr "Canvia el perfil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Mostra el registre..."
+msgstr "Mostra la pantalla de presentació..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Quant a mi"
+msgstr "Quant a..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "El missatge és massa llarg."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "El fitxer que voleu enviar és massa llarg."
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"No s'ha pogut connectar al servidor HTTP de MXit. Comproveu la configuració "
+"del servidor."
+
 msgid "Logging In..."
-msgstr "S'està entrant"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
-"vos vulgueu connectar."
-
-#, fuzzy
+msgstr "S'està entrant..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "No s'ha pogut connectar al servidor MXit. Comproveu la configuració."
+
 msgid "Connecting..."
-msgstr "S'està connectant"
+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 ""
+msgstr "Nom d'usuari de MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Sobrenom"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registra un compte XMPP nou"
-
-#, fuzzy
+msgstr "Crea un compte MXit nou"
+
 msgid "Please fill in the following fields:"
-msgstr "Empleneu els camps següents"
+msgstr "Empleneu estos camps:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"S'ha produït un error en connectar al lloc WAP de MXit. Intenteu-ho més tard."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"Ara mateix MXit no pot processar la sol·licitud. Torneu-ho a intentar més "
+"tard."
 
 msgid "Wrong security code entered. Please try again later."
 msgstr ""
+"S'ha introduït un codi de seguretat equivocat. Torneu-ho a intentar més tard."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "La vostra sessió ha expirat. Torneu-ho a intentar més tard."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Este nom d'usuari ja està registrat, escolliu-ne un altre."
+
 msgid "Internal error. Please try again later."
-msgstr "El servidor no està disponible, proveu-ho més tard"
+msgstr "S'ha produït un error intern. Torneu-ho a provar més tard."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "No heu introduït codi de seguretat"
+
 msgid "Security Code"
-msgstr "Seguretat habilitada"
+msgstr "Codi de seguretat"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Introduïu el codi"
-
-#, fuzzy
+msgstr "Introduïu el codi de seguretat"
+
 msgid "Your Country"
-msgstr "País"
-
-#, fuzzy
+msgstr "El vostre país"
+
 msgid "Your Language"
-msgstr "Idioma preferit"
+msgstr "La vostra llengua"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Sol·licitud d'autorització"
+msgstr "Autorització MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Validació del compte MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Informació del servidor"
-
-#, fuzzy
+msgstr "S'està obtenint informació de l'usuari..."
+
+msgid "Loading menu..."
+msgstr "S'està carregant el menú..."
+
 msgid "Status Message"
 msgstr "Missatge d'estat"
 
 # Segons la viquipèdia
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Nom del mig"
-
-#, fuzzy
+msgstr "Nombre ocult"
+
 msgid "Your Mobile Number..."
-msgstr "Estableix el número del telèfon mòbil..."
+msgstr "El vostre telèfon mòbil..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Servidor"
-
-#, fuzzy
+msgstr "Servidor WAP"
+
 msgid "Connect via HTTP"
-msgstr "Connecta amb TCP"
+msgstr "Connecta amb HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Habilita la pantalla de presentació emergent"
 
 #. 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 "Heu perdut la connexió a la sala de xat %s."
+msgstr "S'ha trencat la connexió a MXit. Torneu-vos a connectar."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Missatge d'error de l'XMPP"
-
-#, fuzzy
+msgstr "S'ha produït un error en enviar el missatge"
+
 msgid "Unable to process your request at this time"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+msgstr "Ara mateix no es pot processar la sol·licitud"
 
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
-
-#, fuzzy
+"S'ha exhaurit el temps d'espera per obtindre una resposta del servidor MXit."
+
 msgid "Successfully Logged In..."
-msgstr "S'ha entrat al Qun"
-
-#, fuzzy
+msgstr "S'ha pogut entrar..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s vos ha enviat un missatge xifrat, però este client no implementa el "
+"mètode emprat per xifrar."
+
 msgid "Message Error"
-msgstr "Missatge d'error de l'XMPP"
+msgstr "S'ha produït un error en el missatge"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "No es pot redireccionar amb el protocol seleccionat"
+
+msgid "An internal MXit server error occurred."
+msgstr "S'ha produït un error intern del servidor MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "S'ha produït un error en entrar: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "S'ha produït un error en eixir: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en un contacte"
+
 msgid "Message Sending Error"
-msgstr "Missatge d'error de l'XMPP"
-
-#, fuzzy
+msgstr "S'ha produït un error en enviar un missatge"
+
 msgid "Status Error"
-msgstr "Error de flux"
-
-#, fuzzy
+msgstr "S'ha produït un error en l'estat"
+
 msgid "Mood Error"
-msgstr "Error en la icona"
-
-#, fuzzy
+msgstr "S'ha produït un error en l'estat d'ànim"
+
 msgid "Invitation Error"
-msgstr "Error en desconnectar"
-
-#, fuzzy
+msgstr "S'ha produït un error en la invitació"
+
 msgid "Contact Removal Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en suprimir un contacte"
+
 msgid "Subscription Error"
-msgstr "Subscripció"
-
-#, fuzzy
+msgstr "S'ha produït un error en la subscripció"
+
 msgid "Contact Update Error"
-msgstr "Error de connexió"
-
-#, fuzzy
+msgstr "S'ha produït un error en actualitzar un contacte"
+
 msgid "File Transfer Error"
-msgstr "Transferència de fitxers"
-
-#, fuzzy
+msgstr "S'ha produït un error en la transferència de fitxers"
+
 msgid "Cannot create MultiMx room"
-msgstr "No s'ha pogut crear l'avís"
-
-#, fuzzy
+msgstr "No s'ha pogut crear una sala MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "Error en desconnectar"
-
-#, fuzzy
+msgstr "S'ha produït un error en la invitació MultiMix"
+
 msgid "Profile Error"
-msgstr "Error d'escriptura"
+msgstr "S'ha produït un error en el perfil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "S'ha rebut un paquet invàlid de MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "S'ha produït un error de conneció a MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Enfadat"
-
-msgid "Excited"
-msgstr "Excitat"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grup"
-
-msgid "Happy"
-msgstr "Content"
-
-msgid "In Love"
-msgstr "Enamorat"
-
-msgid "Invincible"
-msgstr "Invencible"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "Ordinador:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Sobrenom"
-
-msgid "Sleepy"
-msgstr "Endormiscat"
-
-#, fuzzy
+msgstr "S'ha produït un error de connexió a MXit. (read stage 0x06)"
+
 msgid "Pending"
-msgstr "S'està enviant"
-
-#, fuzzy
+msgstr "Pendent"
+
 msgid "Invited"
-msgstr "Convida"
-
-#, fuzzy
+msgstr "Convidat"
+
 msgid "Rejected"
-msgstr "Rebutja"
-
-#, fuzzy
+msgstr "Rebutjat"
+
 msgid "Deleted"
-msgstr "Suprimeix"
+msgstr "Suprimit"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Anuncis MXit"
+
 msgid "More Information"
-msgstr "Informació de la faena"
+msgstr "Més informació"
 
 #, c-format
 msgid "No such user: %s"
@@ -6290,8 +6291,8 @@
 
 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."
@@ -6345,7 +6346,7 @@
 msgstr "Este nom d'usuari està disponible. Voleu fer-lo servir?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr "Un cop l'hagueu establit no el podreu canviar!"
+msgstr "Una vegada l'hagueu establit no el podreu canviar!"
 
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Establiu un nom d'usuari"
@@ -6361,7 +6362,7 @@
 msgstr "No s'ha establer cap nom d'usuari"
 
 msgid "Please enter a username to check its availability:"
-msgstr "Entreu un nom d'usuari per a comprovar-ne la disponibilitat:"
+msgstr "Introduïu un nom d'usuari per a comprovar-ne la disponibilitat:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6382,7 +6383,7 @@
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "bufetejar"
+msgstr "Bufetejar"
 
 #, c-format
 msgid "%s has whacked you!"
@@ -6556,7 +6557,8 @@
 msgstr "L'arxiu mestre està desconfigurat"
 
 msgid "Could not recognize the host of the username you entered"
-msgstr "No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu entrat"
+msgstr ""
+"No s'ha pogut reconèixer l'ordinador del nom d'usuari que heu introduït"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
@@ -6587,7 +6589,8 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versió d'avaluació no permet que entrin més de deu usuaris a la vegada"
+"Esta versió d'avaluació no permet que entrin més de deu usuaris a la "
+"vegada"
 
 msgid "The user is either offline or you are blocked"
 msgstr "L'usuari està fora de línia o bé esteu blocat"
@@ -6603,8 +6606,8 @@
 #, 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)."
@@ -6769,9 +6772,9 @@
 msgstr "Port en el servidor"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "S'ha rebut una resposta inesperada de "
+msgstr "S'ha rebut una resposta inesperada de %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6783,9 +6786,9 @@
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "S'ha produït en sol·licitar "
+msgstr "S'ha produït un error en sol·licitar %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL no permet que vos autentiqueu amb este nom d'usuari ací"
@@ -6855,8 +6858,8 @@
 "%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
@@ -6937,46 +6940,42 @@
 msgstr "No es pot fer mentre estiga a AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Els controls parentals no permeten que es puga rebre MI"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "No es poden enviar SMS si no s'accepten els termes"
+
 msgid "Cannot send SMS"
-msgstr "No s'ha pogut enviar el fitxer"
+msgstr "No s'ha pogut enviar l'SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "No es pot enviar un directori."
+msgstr "No es poden enviar SMS a este país"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "No es poden enviar SMS a un país desconegut"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Els robots no poden iniciar MI"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Este robot no pot fer MI amb este usuari"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Este robot ha superat el límit de MI"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Este robot ha superat el límit de MI diari"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Este robot ha superat el límit de MI mensual"
+
 msgid "Unable to receive offline messages"
-msgstr "No s'ha pogut enviar el missatge."
-
-#, fuzzy
+msgstr "No s'han pogut rebre els missatges fora de línia"
+
 msgid "Offline message store full"
-msgstr "Missatge de fora de línia"
+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 "
@@ -6994,8 +6993,9 @@
 "(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"
@@ -7112,9 +7112,9 @@
 "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."
@@ -7148,15 +7148,14 @@
 "El servei de missatges instantanis d'AOL no està disponible temporalment."
 
 #. 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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu "
-"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
+"El vostre usuari s'ha estat connectant i desconnectat amb massa freqüència. "
+"Espereu deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu "
+"d'esperar encara més temps."
 
 #. client too old
 #, c-format
@@ -7164,18 +7163,17 @@
 msgstr "La versió del client que useu és massa antiga, actualitzeu-la a %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 ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freqüència. Espereu un "
-"minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara més temps."
+"La vostra adreça IP s'ha estat connectant i desconnectat amb massa "
+"freqüència. Espereu un minut i intenteu-ho de nou. Si continueu intentant-"
+"ho, haureu d'esperar encara més temps."
 
 msgid "The SecurID key entered is invalid"
-msgstr "La clau SecurID que heu entrat no és vàlida"
+msgstr "La clau SecurID que heu introduït no és vàlida"
 
 msgid "Enter SecurID"
 msgstr "Introduïu el SecureID"
@@ -7190,7 +7188,8 @@
 msgstr "No s'ha pogut inicialitzar la connexió"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
+msgstr ""
+"Per favor, autoritzeu-me perquè vos puga afegir a la meua llista d'amics."
 
 msgid "No reason given."
 msgstr "No s'ha indicat cap motiu."
@@ -7310,21 +7309,21 @@
 msgstr[0] "Heu perdut %hu missatge de %s per motius desconeguts."
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge (%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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge a %s:"
-
-#, fuzzy, c-format
+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:"
+msgstr "No s'ha pogut enviar el missatge a %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7353,13 +7352,12 @@
 "[No s'ha pogut mostrar el missatge d'este usuari perquè contenia caràcters "
 "invàlids.]"
 
-#, 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 ""
 "No s'ha pogut realitzar la darrera acció que havíeu intentat perquè esteu "
-"per sobre del límit. Espereu 10 segons i torneu-ho a provar."
+"per sobre del límit. Espereu 10 segons i torneu-ho a provar.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7622,9 +7620,8 @@
 msgid "C_onnect"
 msgstr "C_onnecta"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "El servidor ha tancat la connexió"
+msgstr "Heu tancat la connexió."
 
 msgid "Get AIM Info"
 msgstr "Obtén informació d'AIM"
@@ -7636,9 +7633,8 @@
 msgid "Get Status Msg"
 msgstr "Aconsegueix el missatge d'estat"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "S'ha establit una connexió directa de MI"
+msgstr "Finalitzar la sessió de MI directa"
 
 msgid "Direct IM"
 msgstr "MI directa"
@@ -7676,8 +7672,8 @@
 "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"
@@ -7865,7 +7861,7 @@
 msgstr "Número de telèfon"
 
 msgid "Authorize adding"
-msgstr "Autoritzar que vos afegisquen"
+msgstr "Autoritzar que vos afigen"
 
 msgid "Cellphone Number"
 msgstr "Número de mòbil"
@@ -8069,7 +8065,7 @@
 msgstr "Categoria"
 
 msgid "The Qun does not allow others to join"
-msgstr "Este Qun no permet que s'hi afegisca ningú"
+msgstr "Este Qun no permet que s'hi afija ningú"
 
 msgid "Join QQ Qun"
 msgstr "Entra al Qun QQ"
@@ -8139,8 +8135,7 @@
 
 #, 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>"
@@ -8270,8 +8265,7 @@
 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
@@ -8482,7 +8476,7 @@
 msgid "File Send"
 msgstr "S'ha enviat el fitxer"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d ha cancel·lat la transferència de %s"
 
@@ -8607,8 +8601,8 @@
 "\"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"
@@ -8657,7 +8651,7 @@
 msgstr "ID de Sametime"
 
 msgid "An ambiguous user ID was entered"
-msgstr "S'ha entrat un ID d'usuari ambigu"
+msgstr "S'ha introduït un ID d'usuari ambigu"
 
 #, c-format
 msgid ""
@@ -9606,7 +9600,8 @@
 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"
@@ -10002,7 +9997,7 @@
 msgstr "Bloca invitacions a conferències i sales de xat"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Empra un compte per al servidor intermediàri per a connexions SSL"
 
 msgid "Chat room list URL"
 msgstr "URL de la llista de sales de xat"
@@ -10032,8 +10027,8 @@
 #, 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"
@@ -10050,15 +10045,14 @@
 "%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"
@@ -10111,26 +10105,26 @@
 msgid "Ignore buddy?"
 msgstr "Voleu ignorar l'amic?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "El sobrenom o la contrasenya no són correctes"
-
-#, fuzzy
+msgstr "El sobrenom o la contrasenya no són vàlides"
+
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"El compte està blocat perquè s'ha intentat entrar massa cops. Això es pot "
-"solucionar entrant al web de Yahoo!"
+"S'ha blocat el vostre compte perquè s'ha intentat entrar massa cops. Entreu "
+"al web de Yahoo! per solucionar això."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Error desconegut 52. Es pot sol·lucionar connectant de nou."
 
 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 nom d'usuari no és vàlid. Pot ser que hagueu introduït la "
+"vostra adreça de correu en lloc del nom d'usuari de Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10224,12 +10218,13 @@
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"No es poden enviar SMS, no s'ha pogut obtindre l'operador de telefonia mòbil."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "No es poden enviar SMS, no es coneix l'operador de telefona mòbil."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "S'està obtenint l'operador de telefonia mòbil per a poder enviar SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10267,7 +10262,8 @@
 "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!"
@@ -10309,9 +10305,9 @@
 "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."
@@ -10339,8 +10335,8 @@
 "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."
@@ -10420,11 +10416,13 @@
 
 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 ""
@@ -10776,6 +10774,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Xategeu amb missatgeria instantània, amb AIM, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo i més"
 
 msgid "Internet Messenger"
 msgstr "Missatger d'Internet"
@@ -10907,8 +10907,8 @@
 "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
@@ -10921,7 +10921,6 @@
 msgid "Layout"
 msgstr "Format"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr "El format de les icones, el nom, i l'estat de la llista d'amics"
 
@@ -10978,9 +10977,8 @@
 
 #. 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 "Text en línia"
+msgstr "Text en estar en línia"
 
 msgid "The text information for when a buddy is online"
 msgstr "Text informatiu per quan un amic estiga en línia"
@@ -10988,18 +10986,16 @@
 #. 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 "Text d'absència"
+msgstr "Text en estar absent"
 
 msgid "The text information for when a buddy is away"
 msgstr "Text informatiu per quan un amic estiga absent"
 
 #. 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 "Text de fora de línia"
-
-#, fuzzy
+msgstr "Text fora de línia"
+
 msgid "The text information for when a buddy is offline"
 msgstr "Text informatiu per quan un amic estiga fora de línia"
 
@@ -11024,7 +11020,6 @@
 msgid "Message (Nick Said) Text"
 msgstr "Text del missatge (on s'hi ha dit el sobrenom)"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -11049,8 +11044,8 @@
 "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."
@@ -11470,9 +11465,8 @@
 msgid "_Group:"
 msgstr "_Grup:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "_Entra automàticament quant el compte estiga connectat."
+msgstr "_Entra automàticament quant es connecte el compte."
 
 msgid "_Remain in chat after window is closed."
 msgstr "Co_ntinua al xat quan la finestra es tanque."
@@ -11505,7 +11499,7 @@
 msgstr "/Amics/Ordena els amics"
 
 msgid "Type the host name for this certificate."
-msgstr "Entreu el nom de l'ordinador al qual pertany este certificat."
+msgstr "Introduïu el nom de l'ordinador al qual pertany este certificat."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11586,9 +11580,8 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Missatge instantani nou..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Conversa/Con_vida..."
+msgstr "/Conversa/Entra a un _xat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Cerca..."
@@ -11942,7 +11935,7 @@
 msgstr "Català"
 
 msgid "Valencian-Catalan"
-msgstr "Valencià-català"
+msgstr "Català (valencià)"
 
 msgid "Czech"
 msgstr "Txec"
@@ -11979,7 +11972,7 @@
 msgstr "Estonià"
 
 msgid "Basque"
-msgstr ""
+msgstr "Basc"
 
 msgid "Persian"
 msgstr "Persa"
@@ -12056,6 +12049,9 @@
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Malay"
+msgstr "Malai"
+
 msgid "Bokmål Norwegian"
 msgstr "Noruec bokmål"
 
@@ -12127,6 +12123,9 @@
 msgid "Turkish"
 msgstr "Turc"
 
+msgid "Ukranian"
+msgstr "Ucraïnés"
+
 # FIXME?
 msgid "Urdu"
 msgstr "Urdu"
@@ -12193,6 +12192,13 @@
 "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\">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/>"
 
 #, c-format
 msgid ""
@@ -12605,8 +12611,8 @@
 "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!"
@@ -12764,45 +12770,48 @@
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
-
-#, fuzzy
+"Forma d'ús: %s [OPCIÓ]...\n"
+"\n"
+
 msgid "DIR"
-msgstr "IRC"
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "empra DIR per a fitxers de configuració"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "escriu missatges de depuració a la eixida estàndard"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "força estar en línia, independentment de l'estat de la xarxa"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "mostra esta ajuda i ix"
 
 # FIXME: entrades/registres?
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Permet diverses entrades simultànies"
+msgstr "permet diverses instàncies"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "no entra als comptes"
 
 msgid "NAME"
-msgstr ""
+msgstr "NOM"
 
 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 ""
+"habilita els comptes especificats (l'argument opcional NAME especifica\n"
+"                      els comptes a emprar, separats per comes. Sense això\n"
+"                      només s'habilitarà el primer compte)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "pantalla d'X a emprar"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "mostra la versió actual i ix"
 
 # FIXME: backtrace -> traça (bug-buddy) ?
 #, c-format
@@ -12836,7 +12845,8 @@
 #, 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 se eixirà atès que ja hi ha un altre client del libpurple executant-"
+"se.\n"
 
 msgid "/_Media"
 msgstr "/_Medi"
@@ -12853,7 +12863,7 @@
 msgstr "%s vol iniciar una sessió de vídeo."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Trucada entrant"
 
 msgid "_Pause"
 msgstr "_Pausa"
@@ -13069,21 +13079,21 @@
 msgstr "Esdeveniment d'avís desconegut, informeu-nos-en."
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(predeterminat)"
+msgstr "(Personalitzat)"
+
+# Nom propi: http://www.penguinpimps.com/?
+# "proxenetes" no queda gens, s'hi podria posar alguna altra cosa (josep)
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "El tema de sons predeterminat del pidgin"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor de temes per a la llista d'amics del Pidgin"
+msgstr "El tema per a la llista d'amics predeterminat del Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "El tema de les icones d'estat predeterminat del Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "No s'ha pogut desempaquetar el tema."
@@ -13094,18 +13104,30 @@
 msgid "Theme failed to copy."
 msgstr "No s'ha pogut copiar el tema."
 
-msgid "Install Theme"
-msgstr "Instal·la el tema"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Seleccioneu un tema d'emoticones de la llista següent. Es poden instal·lar "
-"temes nous arrossegant-los i deixant-los anar a la llista de temes."
-
-msgid "Icon"
-msgstr "Icona"
+msgid "Theme Selections"
+msgstr "Selecció del tema"
+
+#. 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 ""
+"Seleccioneu el tema que vulgueu emprar de la llista d'ací sota.\n"
+"Es poden afegir temes nous arrossegant-los i deixant-los anar a la llista de "
+"temes."
+
+msgid "Buddy List Theme:"
+msgstr "Tema de la llista d'amics:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema de la icona d'estat:"
+
+msgid "Sound Theme:"
+msgstr "Tema de sons:"
+
+msgid "Smiley Theme:"
+msgstr "Tema d'emoticones:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
@@ -13113,10 +13135,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Tanca les converses amb la tecla d'_escapament"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Tema de la llista d'amics"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Icona d'estat"
@@ -13203,9 +13221,6 @@
 msgid "Font"
 msgstr "Tipus de lletra"
 
-msgid "Use document font from _theme"
-msgstr "_Empra el tipus de lletra del document del tema"
-
 msgid "Use font from _theme"
 msgstr "Empra el tipus de lletra del _tema"
 
@@ -13229,15 +13244,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "No s'ha pogut iniciar el programa de configuració del navegador."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Inhabilita"
+msgstr "Inhabilitat"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Empra l'_adreça IP detectada automàticament: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
@@ -13253,80 +13266,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Habilita la desviació automàtica de ports de l'encaminador"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Especifica manualment el rang de ports on escoltar"
-
-#, fuzzy
+msgstr "_Especifica manualment el rang de ports on escoltar:"
+
 msgid "_Start:"
-msgstr "E_stat:"
-
-#, fuzzy
+msgstr "_Inici:"
+
 msgid "_End:"
-msgstr "_Amplia"
+msgstr "_Final:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Servidor repetidor (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "Servidor ST_UN:"
-
-#, fuzzy
+msgstr "Servidor _TURN:"
+
 msgid "Use_rname:"
-msgstr "Nom d'usuari:"
-
-#, fuzzy
+msgstr "Nom d'_usuari:"
+
 msgid "Pass_word:"
-msgstr "Contrasenya:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Servidor intermediari i navegador"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>No s'ha pogut trobar el programa de configuració del servidor "
-"intermediari.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>No s'ha pogut trobar el programa de configuració del navegador.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Les preferències del servidor intermediari i\n"
-"del navegador les gestiona el GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Configura el _servidor intermediari"
-
-msgid "Configure _Browser"
-msgstr "Configura el _navegador"
-
-msgid "Proxy Server"
-msgstr "Servidor intermediari"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Empra DNS remot amb servidors intermediàris SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Tipus de servidor intermediari"
-
-msgid "No proxy"
-msgstr "Sense servidor intermediari"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Nom d'usuari:"
+msgstr "Contrasen_ya:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13367,6 +13327,15 @@
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Les preferències del navegador es configuren a través del GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>No s'ha pogut trobar el programa de configuració del navegador.</b>"
+
+msgid "Configure _Browser"
+msgstr "Configura el _navegador"
+
 msgid "_Browser:"
 msgstr "_Navegador:"
 
@@ -13390,6 +13359,38 @@
 "_Manual:\n"
 "(%s per a l'URL)"
 
+msgid "Proxy Server"
+msgstr "Servidor intermediari"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Les preferències del servidor intermediari es configuren a través el GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+"<b>No s'ha pogut trobar el programa de configuració del servidor "
+"intermediari.</b>"
+
+msgid "Configure _Proxy"
+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"
+
+msgid "Proxy t_ype:"
+msgstr "_Tipus de servidor intermediari:"
+
+msgid "No proxy"
+msgstr "Sense servidor intermediari"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "_Nom d'usuari:"
+
 msgid "Log _format:"
 msgstr "_Format del registre:"
 
@@ -13473,25 +13474,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Basat en l'ús del teclat o el ratolí"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuts abans de passar a inactiu:"
+
+msgid "Change to this status when _idle:"
+msgstr "_Canvia l'estat quan estiga inactiu:"
+
 msgid "_Auto-reply:"
 msgstr "Resposta _automàtica:"
 
 msgid "When both away and idle"
 msgstr "En estar absent i inactiu alhora"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-absència"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minuts abans de passar a inactiu:"
-
-msgid "Change status when _idle"
-msgstr "_Canvia l'estat quan estiga inactiu"
-
-msgid "Change _status to:"
-msgstr "Canvia l'_estat a:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "L'estat en iniciar"
@@ -13505,15 +13499,15 @@
 msgid "Interface"
 msgstr "Interfície"
 
-msgid "Smiley Themes"
-msgstr "Temes d'emoticones"
-
 msgid "Browser"
 msgstr "Navegador"
 
 msgid "Status / Idle"
 msgstr "Estat / Inactiu"
 
+msgid "Themes"
+msgstr "Temes"
+
 msgid "Allow all users to contact me"
 msgstr "Permet a tots els usuaris contactar amb mi"
 
@@ -13721,8 +13715,8 @@
 "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"
@@ -13740,15 +13734,15 @@
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com a "
-"icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com "
+"a icona d'amic per a este usuari."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a "
-"este usuari."
+"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per "
+"a este usuari."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -13860,11 +13854,6 @@
 msgid "Pidgin smileys"
 msgstr "Emoticones del Pidgin"
 
-# Nom propi: http://www.penguinpimps.com/?
-# "proxenetes" no queda gens, s'hi podria posar alguna altra cosa (josep)
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Si seleccioneu això s'inhabilitaran les emoticones gràfiques."
 
@@ -14511,6 +14500,9 @@
 msgid "Conversation Entry"
 msgstr "Entrada de la conversa"
 
+msgid "Conversation History"
+msgstr "Històric de converses"
+
 msgid "Request Dialog"
 msgstr "Diàleg de sol·licitud"
 
@@ -14867,35 +14859,29 @@
 "Este connector permet a l'usuari personalitzar els formats de les marques "
 "horàries de les converses i dels registres."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Auto"
-
-#, fuzzy
+msgstr "Àudio"
+
 msgid "Video"
 msgstr " Vídeo"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Eixida"
+
 msgid "_Plugin"
-msgstr "Connectors"
-
-#, fuzzy
+msgstr "_Connectors"
+
 msgid "_Device"
-msgstr "Dispositiu"
+msgstr "_Dispositiu"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Entrada"
+
 msgid "P_lugin"
-msgstr "Connectors"
-
-#, fuzzy
+msgstr "C_onnectors"
+
 msgid "D_evice"
-msgstr "Dispositiu"
+msgstr "D_ispositiu"
 
 #. *< magic
 #. *< major version
@@ -14906,18 +14892,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Edita els paràmetres"
+msgstr "Configuració del so/vídeo"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Configureu el micròfon i la càmera web."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Configureu els paràmetres del micròfon i la càmera web per a trucades de veu/"
+"vídeo."
 
 msgid "Opacity:"
 msgstr "Opacitat:"
@@ -14947,8 +14934,7 @@
 
 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
@@ -14972,8 +14958,8 @@
 "\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."
 
@@ -14986,9 +14972,8 @@
 msgstr "_Inicia el %s en iniciar Windows"
 
 # FIXME: entrades/registres?
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Permet diverses entrades simultànies"
+msgstr "Permet diverses instàncies"
 
 msgid "_Dockable Buddy List"
 msgstr "Llista _d'amics acoblable"
@@ -15051,9 +15036,26 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "El Pidgin no coneix el certificat arrel d'este certificat."
+#~ msgid "(Default)"
+#~ msgstr "(Predeterminat)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Instal·la el tema"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "_Empra el tipus de lletra del document del tema"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Servidor intermediari i navegador"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-absència"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Canvia l'_estat a:"
 
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Envieu missatges instantanis en múltiples protocols"
@@ -15081,15 +15083,15 @@
 #~ "signature from the Certificate Authority from which it claims to have a "
 #~ "signature."
 #~ msgstr ""
-#~ "El certificat %s afirma tindre una signatura d'una entitat certificadora, "
+#~ "El certificat %s afirma tenir una signatura d'una entitat certificadora, "
 #~ "però la cadena de certificació no conté cap signatura digital vàlida "
-#~ "d'esta entitat."
+#~ "d'aquesta entitat."
 
 #~ msgid "Invalid certificate authority signature"
 #~ msgstr "La signatura de l'entitat certificadora no és vàlida"
 
 #~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Configuració de l'ocultació de les entrades i eixides"
+#~ msgstr "Configuració de l'ocultació de les entrades i sortides"
 
 #~ msgid "Minimum Room Size"
 #~ msgstr "Mida mínima de la sala"
@@ -15114,6 +15116,9 @@
 #~ "<FONT SIZE=\"4\">Ajuda per correu electrònic:</FONT> <A HREF=\"mailto:"
 #~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
 
+#~ msgid "_Resume"
+#~ msgstr "_Continua"
+
 #~ msgid ""
 #~ "%s %s\n"
 #~ "Usage: %s [OPTION]...\n"
@@ -15136,22 +15141,22 @@
 #~ "Forma d'ús: %s [OPTCIÓ]...\n"
 #~ "\n"
 #~ "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
-#~ "  -d, --debug         mostra missatges de depuració a la eixida "
+#~ "  -d, --debug         mostra missatges de depuració a la sortida "
 #~ "estàndard\n"
-#~ "  -f, --force-online  força que s'estiga en línia, independent de l'estat "
-#~ "de\n"
+#~ "  -f, --force-online  força que s'estigui en línia, independent de "
+#~ "l'estat de\n"
 #~ "                      la xarxa\n"
-#~ "  -h, --help          mostra esta ajuda i ix\n"
-#~ "  -m, --multiple      no controla que només hi haja una instància\n"
+#~ "  -h, --help          mostra aquesta ajuda i surt\n"
+#~ "  -m, --multiple      no controla que només hi hagi una instància\n"
 #~ "  -n, --nologin       no entra automàticament\n"
 #~ "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 #~ "NOM\n"
 #~ "                      indica els comptes a fer servir, separats per "
 #~ "comes.\n"
-#~ "                      Sense este argument només s'habilita el primer "
+#~ "                      Sense aquest argument només s'habilita el primer "
 #~ "compte).\n"
 #~ "  --display=PANTALLA  pantalla X a utilitzar\n"
-#~ "  -v, --version       mostra la versió actual i ix\n"
+#~ "  -v, --version       mostra la versió actual i surt\n"
 
 #~ msgid ""
 #~ "%s %s\n"
@@ -15174,24 +15179,21 @@
 #~ "Forma d'ús: %s [OPTCIÓ]...\n"
 #~ "\n"
 #~ "  -c, --config=DIR    utilitza DIR per als fitxers de configuració\n"
-#~ "  -d, --debug         mostra missatges de depuració a la eixida "
+#~ "  -d, --debug         mostra missatges de depuració a la sortida "
 #~ "estàndard\n"
-#~ "  -f, --force-online  força que s'estiga en línia, independent de l'estat "
-#~ "de\n"
+#~ "  -f, --force-online  força que s'estigui en línia, independent de "
+#~ "l'estat de\n"
 #~ "                      la xarxa\n"
-#~ "  -h, --help          mostra esta ajuda i ix\n"
-#~ "  -m, --multiple      no controla que només hi haja una instància\n"
+#~ "  -h, --help          mostra aquesta ajuda i surt\n"
+#~ "  -m, --multiple      no controla que només hi hagi una instància\n"
 #~ "  -n, --nologin       no entra automàticament\n"
 #~ "  -l, --login[=NOM]   habilita el compte especificat (l'argument opcional "
 #~ "NOM\n"
 #~ "                      indica els comptes a fer servir, separats per "
 #~ "comes.\n"
-#~ "                      Sense este argument només s'habilita el primer "
+#~ "                      Sense aquest argument només s'habilita el primer "
 #~ "compte).\n"
-#~ "  -v, --version       mostra la versió actual i ix\n"
-
-#~ msgid "_Resume"
-#~ msgstr "_Continua"
+#~ "  -v, --version       mostra la versió actual i surt\n"
 
 #~ msgid ""
 #~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -15811,7 +15813,7 @@
 #~ msgstr "Estat desconegut"
 
 #~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Heu entrat un identificador de grup fora del rang"
+#~ msgstr "Heu introduït un identificador de grup fora del rang"
 
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "Esteu segur que voleu deixar aquest Qun?"
@@ -16091,9 +16093,6 @@
 #~ msgid "_Send To"
 #~ msgstr "_Envia a"
 
-#~ msgid "Conversation History"
-#~ msgstr "Històric de converses"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Visualitzador del registre"
 
@@ -17361,9 +17360,6 @@
 #~ msgid "Burmese"
 #~ msgstr "Birmà"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ucraïnès"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xosa"
 
--- a/po/cs.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/cs.po	Sat Jan 09 02:00:18 2010 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-09-03 20:14+0100\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-29 21:18+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -627,9 +627,8 @@
 msgid "Enable Sounds"
 msgstr "Povolit zvuky"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Nemohu se připojit"
+msgstr "Nejsi připojen."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ODPOVĚĎ> "
@@ -641,9 +640,8 @@
 msgstr[1] "Seznam %d uživatelů:\n"
 msgstr[2] "Seznam %d uživatelů:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Podporované ladicí přepínače jsou: version"
+msgstr "Podporované ladicí přepínače jsou: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Takový příkaz (v tomto kontextu) neexistuje."
@@ -1521,10 +1519,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pro výše uvedené: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Prosím počkejte než TinyURL získá kratší URL..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Vytvořit TinyURL jen pro url dané délky a delší"
@@ -1544,6 +1542,7 @@
 msgid "Online"
 msgstr "Připojen"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Odpojen"
 
@@ -1654,6 +1653,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Certifikát není důvěryhodný, protože certifikát, který to může ověřit je "
+"momentálně důvěryhodný."
 
 msgid "The certificate is not valid yet."
 msgstr "Certifikát je neplatný."
@@ -1883,9 +1884,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Správce procesů skončil bez odpovědi na náš požadavek"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Chyba při vyhledávání %s: %d"
+msgstr "Chyba při konverzi %s na \"maličký\" kód: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2197,17 +2198,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Nastala neobnovitelná Farsight2 chyba."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Chyba konference."
-
-#, fuzzy
+msgstr "Chyba konference"
+
 msgid "Error with your microphone"
-msgstr "Chyba mikrofonu."
-
-#, fuzzy
+msgstr "Chyba mikrofonu"
+
 msgid "Error with your webcam"
-msgstr "Chyba webové kamery."
+msgstr "Chyba webové kamery"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3146,10 +3144,12 @@
 msgid "Add to chat..."
 msgstr "Přidat k chatu..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Přítomen"
 
+#. 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
@@ -3959,12 +3959,14 @@
 msgid "Log Out"
 msgstr "Odhlášení"
 
+#. 2
 msgid "Chatty"
 msgstr "Chatty"
 
 msgid "Extended Away"
 msgstr "Pryč na dlouho"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Nerušit"
 
@@ -4224,6 +4226,7 @@
 msgid "None (To pending)"
 msgstr "Žádné (do čeká)"
 
+#. 0
 msgid "None"
 msgstr "Žádné"
 
@@ -4528,9 +4531,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure: Nastavit místnost chatu."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [místnost]: Opustit místnost."
+msgstr "part [zpráva]: Opustit místnost."
 
 msgid "register:  Register with a chat room."
 msgstr "register: Zaregistrovat se u místnosti chatu."
@@ -5186,7 +5188,7 @@
 "Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu "
 "SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5415,9 +5417,8 @@
 msgid "Unknown error (%d)"
 msgstr "Neznámá chyba (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nemohu přidat uživatele"
+msgstr "Nemohu odebrat uživatele"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Zpráva na mobil nebyla odeslána, protože byla příliš dlouhá."
@@ -5655,28 +5656,82 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vás odstranil ze svého seznamu kamarádů."
 
+#. 1
+msgid "Angry"
+msgstr "Rozzlobený"
+
+#. 2
+msgid "Excited"
+msgstr "Vzrušený"
+
+#. 3
+msgid "Grumpy"
+msgstr "Mrzutý"
+
+#. 4
+msgid "Happy"
+msgstr "Šťastný"
+
+#. 5
+msgid "In Love"
+msgstr "Zamilovaný"
+
+#. 6
+msgid "Invincible"
+msgstr "Neporazitelný"
+
+#. 7
+msgid "Sad"
+msgstr "Smutný"
+
+#. 8
+msgid "Hot"
+msgstr "Žhavý"
+
+#. 9
+msgid "Sick"
+msgstr "Nemocný"
+
+#. 10
+msgid "Sleepy"
+msgstr "Ospalý"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Vaše momentální nálada"
+msgstr "Momentální nálada"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Nálada uživatele"
-
-#, fuzzy
+msgstr "Nová nálada uživatele"
+
 msgid "Change your Mood"
-msgstr "Změnit heslo"
-
-#, fuzzy
+msgstr "Změnit vaši náladu"
+
 msgid "How do you feel right now?"
-msgstr "Teď tu zrovna nejsem"
+msgstr "Jak se cítíte?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Zadaný PIN není platný."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Zadaný PIN má špatnou délku [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Neplatné jméno narození. Správný formát je: 'YYYY-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Chyba při zápisu"
+msgstr "Chyba při update profilu"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5684,356 +5739,294 @@
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Informace z profilu nebyly získány, zkuste to prosím později."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Ověření PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Příjmení"
+msgstr "Zobrazované jméno"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skrýt moje číslo"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Mobilní telefonní číslo"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil"
+msgstr "Update vašeho profilu"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tady můžete aktualizovat váš MXit profil"
 
 msgid "View Splash"
-msgstr ""
-
-#, fuzzy
+msgstr "Zobrazit spouštěcí obrazovku"
+
 msgid "There is no splash-screen currently available"
-msgstr "Chat je momentálně nedostupný"
-
-#, fuzzy
+msgstr "Spouštěcí obrazovka je momentálně nedostupná"
+
 msgid "About"
-msgstr "O mně"
+msgstr "O"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Změnit heslo..."
+msgstr "Změnit náladu..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Změnit heslo..."
+msgstr "Změnit profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Zobrazit záznam ..."
+msgstr "Zobrazit spouštěcí obrazovku..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O mně"
+msgstr "O..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Zpráva je příliš velká."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Soubor, který se pokoušíte poslat, je příliš velký!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "Nemohu se připojit k MXit HTTP serveru. Zkontrolujte nastavení."
+
 msgid "Logging In..."
-msgstr "Přihlašování"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
-"chcete připojit."
-
-#, fuzzy
+msgstr "Přihlašování..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "Nemohu se připojit k MXit serveru. Zkontrolujte nastavení."
+
 msgid "Connecting..."
-msgstr "Připojuji se"
+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 ""
+msgstr "Přihlašovací jméno MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Přezdívka"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Zaregistrovat nový účet XMPP"
-
-#, fuzzy
+msgstr "Zaregistrovat nový MXit účet"
+
 msgid "Please fill in the following fields:"
-msgstr "Vyplňte prosím následující pole"
+msgstr "Vyplňte prosím následující pole:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Chyba při kontaktu MXit WAP stránky. Zkuste to prosím později."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit nemůže teď zpracovat požadavek, zkuste to prosím později."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Vložen špatný bezpečnostní kód, zkuste to prosím později."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Sezení vypršelo, zkuste to prosím později."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Vybrána neplatná země, zkuste to prosím později."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Uživatelské jméno není registrováno. Nejdřív se registrujte."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Uživatelské jméno už je registrované, zkuste jiné."
+
 msgid "Internal error. Please try again later."
-msgstr "Server není k dispozici; zkuste to později"
+msgstr "Chyba. Zkuste to prosím později"
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Nevložil jste bezpečnostní kód"
+
 msgid "Security Code"
-msgstr "Zabezpečení povoleno"
+msgstr "Bezpečnostní kód"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Vložte kód"
-
-#, fuzzy
+msgstr "Vložte bezpečnostní kód"
+
 msgid "Your Country"
-msgstr "Země"
-
-#, fuzzy
+msgstr "Vaše země"
+
 msgid "Your Language"
-msgstr "Preferovaný jazyk"
+msgstr "Váš jazyk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Požadovat autorizaci"
+msgstr "MXit autorizace"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Ověření MXit účtu"
+
 msgid "Retrieving User Information..."
-msgstr "Informace o serveru"
-
-#, fuzzy
+msgstr "Získávám informace o uživateli..."
+
+msgid "Loading menu..."
+msgstr "Načítám menu..."
+
 msgid "Status Message"
-msgstr "Odeslané zprávy"
-
-#, fuzzy
+msgstr "Stavová zpráva"
+
 msgid "Hidden Number"
-msgstr "Prostřední jméno"
-
-#, fuzzy
+msgstr "Skryté číslo"
+
 msgid "Your Mobile Number..."
-msgstr "Nastavit mobilní telefonní číslo..."
+msgstr "Vaše mobilní telefonní číslo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
-
-#, fuzzy
+msgstr "WAP Server"
+
 msgid "Connect via HTTP"
-msgstr "Připojit se pomocí TCP"
+msgstr "Připojit se pomocí HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Povolit zobrazení spouštěcí obrazovky"
 
 #. 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 "Ztratili jste spojení s místností chatu %s."
+msgstr "Ztratili jste spojení s MXit. Prosím přihlaste se znovu."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Chyba zprávy XMPP"
-
-#, fuzzy
+msgstr "Chyba odeslání zprávy"
+
 msgid "Unable to process your request at this time"
-msgstr "Nemohu vyřešit jméno hosta"
+msgstr "Nemohu teď vyřešit váš požadavek"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Timeout pro čekání na odpověď z MXit serveru."
+
 msgid "Successfully Logged In..."
-msgstr "Úspěšně připojen Qun"
-
-#, fuzzy
+msgstr "Úspěšně přihlášen..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s vám poslal šifrovanou zprávu, která není v tomto klientovi podporována."
+
 msgid "Message Error"
-msgstr "Chyba zprávy XMPP"
+msgstr "Chyba zprávy"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Nemohu provést přesměrování pomocí daného protokolu"
+
+msgid "An internal MXit server error occurred."
+msgstr "Došlo k vnitřní chybě MXit serveru."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Chyba přihlášení: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Chyba odhlášení: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Chyba spojení"
-
-#, fuzzy
+msgstr "Chyba kontaktu"
+
 msgid "Message Sending Error"
-msgstr "Chyba zprávy XMPP"
-
-#, fuzzy
+msgstr "Chyba odeslání zprávy"
+
 msgid "Status Error"
-msgstr "Chyba proudu"
-
-#, fuzzy
+msgstr "Chyba stavu"
+
 msgid "Mood Error"
-msgstr "Chyba ikony"
-
-#, fuzzy
+msgstr "Chyba nálady"
+
 msgid "Invitation Error"
-msgstr "Chyba rušení registrace"
-
-#, fuzzy
+msgstr "Chyba pozvání"
+
 msgid "Contact Removal Error"
-msgstr "Chyba spojení"
-
-#, fuzzy
+msgstr "Chyba odstranění"
+
 msgid "Subscription Error"
-msgstr "Přihlášení"
-
-#, fuzzy
+msgstr "Chyba předplatného"
+
 msgid "Contact Update Error"
-msgstr "Chyba spojení"
-
-#, fuzzy
+msgstr "Chyba update kontaktu"
+
 msgid "File Transfer Error"
-msgstr "Přenos souborů"
-
-#, fuzzy
+msgstr "Chyba přenosu souborů"
+
 msgid "Cannot create MultiMx room"
-msgstr "Nemohu vytvořit sledování"
-
-#, fuzzy
+msgstr "Nemohu vytvořit MultiMx místnost"
+
 msgid "MultiMx Invitation Error"
-msgstr "Chyba rušení registrace"
-
-#, fuzzy
+msgstr "Chyba pozvání MultiMx"
+
 msgid "Profile Error"
-msgstr "Chyba při zápisu"
+msgstr "Chyba profilu"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Špatný paket obdržen z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Rozzlobený"
-
-msgid "Excited"
-msgstr "Vzrušený"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Skupina"
-
-msgid "Happy"
-msgstr "Šťastný"
-
-msgid "In Love"
-msgstr "Zamilovaný"
-
-msgid "Invincible"
-msgstr "Neporazitelný"
-
-msgid "Sad"
-msgstr "Smutný"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Počítač:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Přezdívka"
-
-msgid "Sleepy"
-msgstr "Ospalý"
-
-#, fuzzy
+msgstr "Nastala chyba při připojení k MXit. (read stage 0x06)"
+
 msgid "Pending"
-msgstr "Odesílám"
-
-#, fuzzy
+msgstr "Čekající"
+
 msgid "Invited"
-msgstr "Pozvat"
-
-#, fuzzy
+msgstr "Pozvaný"
+
 msgid "Rejected"
-msgstr "Odmítnout"
-
-#, fuzzy
+msgstr "Odmítnutý"
+
 msgid "Deleted"
-msgstr "Odstranit"
+msgstr "Smazané"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit inzerce"
+
 msgid "More Information"
-msgstr "Pracovní informace"
+msgstr "Více informací"
 
 #, c-format
 msgid "No such user: %s"
@@ -6806,46 +6799,42 @@
 msgstr "Ne když na AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Nemohu získat IM z důvodu rodičovské ochrany"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Nemohu poslat SMS bez přijmutí podmínek"
+
 msgid "Cannot send SMS"
-msgstr "Nemohu odeslat soubor"
+msgstr "Nemohu odeslat SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Nemohu odeslat adresář."
+msgstr "Nemohu odeslat SMS do této země"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Nemohu poslat SMS do neznámé země"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Bot účet nemůže zahájit IM "
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Bot účet nemůže IM tohoto uživatele"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Bot účet dosáhl IM limit"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Bot účet dosáhl denní IM limit"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Bot účet dosáhl měsíční IM limit"
+
 msgid "Unable to receive offline messages"
-msgstr "Nemohu odeslat zprávu."
-
-#, fuzzy
+msgstr "Nemohu přijmout offline zprávy"
+
 msgid "Offline message store full"
-msgstr "Zprávy při odpojení"
+msgstr "Úložiště offline zpráv je plné"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7013,7 +7002,6 @@
 msgstr "Služba AOL Instant Messenger je dočasně nedostupná."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
@@ -7029,7 +7017,6 @@
 "Verze klienta, kterou používáte, je příliš stará. Aktualizujte prosím na %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
@@ -7193,21 +7180,21 @@
 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Nemohu odeslat zprávu (%s)."
+msgstr "Nemohu odeslat zprávu: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nemohu odeslat zprávu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nemohu odeslat zprávu k %s:"
-
-#, fuzzy, c-format
+msgstr "Nemohu odeslat zprávu pro %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Nemohu odeslat zprávu k %s:"
+msgstr "Nemohu odeslat zprávu pro %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7236,13 +7223,13 @@
 "[Nemohu zobrazit zprávu od tohoto uživatele, protože obsahovala neplatné "
 "znaky.]"
 
-#, 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 ""
 "Poslední akce, o kterou jste se pokusili, nemohla být provedena, protože "
-"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to znovu."
+"jste překročili limit rychlosti. Počkejte prosím 10 sekund a zkuste to "
+"znovu.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10069,13 +10056,13 @@
 msgstr "Otevřít Příchozí poštu"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Nemohu poslat SMS. Nemohu získat tón."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Nemohu poslat SMS. Neznámý tón."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Získávám tón pro poslání SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10621,6 +10608,7 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat pomocí IM. Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a další"
 
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
@@ -11884,6 +11872,9 @@
 msgid "Mongolian"
 msgstr "Mongolština"
 
+msgid "Malay"
+msgstr "Malajština"
+
 msgid "Bokmål Norwegian"
 msgstr "Norština Bokmål"
 
@@ -11953,6 +11944,9 @@
 msgid "Turkish"
 msgstr "Turečtina"
 
+msgid "Ukranian"
+msgstr "Ukrajinština"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12581,7 +12575,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ADRESÁŘ"
 
 msgid "use DIR for config files"
 msgstr "použít ADRESÁŘ pro konfigurační soubory"
@@ -12602,16 +12596,16 @@
 msgstr "nepřihlašovat automaticky"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "JMÉNO"
+
 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 ""
 "povolí zadaný účet(y) (nepovinný argument JMÉNO\n"
-"                      určuje účet(y), které použít, oddělené čárkami."
+"                      určuje účet(y), které použít, oddělené čárkami.\n"
+"                      Bez zadání bude povolen jen první účet)."
 
 msgid "X display to use"
 msgstr "použít X displej"
@@ -12874,21 +12868,19 @@
 msgstr "Neznámé.... Oznamte to prosím!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(implicitní)"
+msgstr "(Uživatelský)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Výchozí zvukové téma Pidgina"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor seznamu kamarádů Pidgina"
+msgstr "Výchozí téma seznamu kamarádů Pidgina"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Výchozí téma stavových ikon Pidgina"
 
 msgid "Theme failed to unpack."
 msgstr "Téma nelze rozbalit."
@@ -12899,18 +12891,29 @@
 msgid "Theme failed to copy."
 msgstr "Téma nelze zkopírovat."
 
-msgid "Install Theme"
-msgstr "Nainstalovat téma"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Vyberte téma smajlíků, které chcete používat, ze seznamu níže. Nová témata "
-"mohou být nainstalována jejich přetažením do seznamu témat."
-
-msgid "Icon"
-msgstr "Ikona"
+msgid "Theme Selections"
+msgstr "Výběr tématu"
+
+#. 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 ""
+"Vyberte téma, které chcete používat, ze seznamu níže.\n"
+"Nová témata mohou být nainstalována jejich přetažením do seznamu témat."
+
+msgid "Buddy List Theme:"
+msgstr "Téma seznamu kamarádů:"
+
+msgid "Status Icon Theme:"
+msgstr "Téma ikon stavů:"
+
+msgid "Sound Theme:"
+msgstr "Zvukové téma:"
+
+msgid "Smiley Theme:"
+msgstr "Témata smajlíků:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
@@ -12918,10 +12921,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Za_vřít konverzaci klávesou Escape"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Téma seznamu kamarádů"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona v panelu"
@@ -13008,9 +13007,6 @@
 msgid "Font"
 msgstr "Písmo"
 
-msgid "Use document font from _theme"
-msgstr "Používat písmo dokumentu z _tématu"
-
 msgid "Use font from _theme"
 msgstr "Používat písmo z _tématu"
 
@@ -13033,15 +13029,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "Nemohu spustit konfiguraci prohlížeče."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "Za_kázat"
+msgstr "Zakázané"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Použít _automaticky detekovanou IP adresu: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
@@ -13057,78 +13051,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Povolit automatické směrování portů"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ručně určit rozsah portů, na kterých poslouchat"
-
-#, fuzzy
+msgstr "_Ručně určit rozsah portů, na kterých poslouchat:"
+
 msgid "_Start:"
-msgstr "_Stav:"
-
-#, fuzzy
+msgstr "_Spuštění:"
+
 msgid "_End:"
-msgstr "_Rozbalit"
+msgstr "U_končit"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Server pro přenos (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "Server ST_UN:"
-
-#, fuzzy
+msgstr "Server _TURN:"
+
 msgid "Use_rname:"
-msgstr "Jméno uživatele:"
-
-#, fuzzy
+msgstr "Jméno _uživatele:"
+
 msgid "Pass_word:"
-msgstr "Heslo:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy server a prohlížeč"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Program konfigurace proxy nenalezen.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Program pro prohlížení konfigurace nenalezen.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Nastavení proxy & prohlížeče jsou nastaveny\n"
-"v nastaveních GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Nastavit proxy"
-
-msgid "Configure _Browser"
-msgstr "Nastavit _prohlížeč"
-
-msgid "Proxy Server"
-msgstr "Proxy server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Použít vzdálený DNS s SOCKS4 proxy"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Typ proxy:"
-
-msgid "No proxy"
-msgstr "Žádná proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Jméno uživatele:"
+msgstr "He_slo:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13169,6 +13112,15 @@
 msgid "Browser Selection"
 msgstr "Výběr prohlížeče"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Nastavení prohlížeče je nastaveno v nastaveních GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Program pro prohlížení konfigurace nenalezen.</b>"
+
+msgid "Configure _Browser"
+msgstr "Nastavit _prohlížeč"
+
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
@@ -13192,6 +13144,35 @@
 "_Ruční:\n"
 "(%s pro URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Nastavení proxy je nastaveno v nastaveních GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Program konfigurace proxy nenalezen.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Nastavit proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Použít vzdálený _DNS s SOCKS4 proxy"
+
+msgid "Proxy t_ype:"
+msgstr "_Typ proxy:"
+
+msgid "No proxy"
+msgstr "Žádná proxy"
+
+msgid "P_ort:"
+msgstr "_Port:"
+
+msgid "User_name:"
+msgstr "Jmén_o uživatele:"
+
 msgid "Log _format:"
 msgstr "_Formát záznamu:"
 
@@ -13275,25 +13256,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Podle používání klávesnice nebo myši"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuty před nečinností:"
+
+msgid "Change to this status when _idle:"
+msgstr "Změnit na tento stav _při nečinnosti:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatická odpověď:"
 
 msgid "When both away and idle"
 msgstr "Při nepřítomnosti a nečinnosti"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatická nepřítomnost"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minuty před nečinností:"
-
-msgid "Change status when _idle"
-msgstr "Změnit stav _při nečinnosti"
-
-msgid "Change _status to:"
-msgstr "Změnit _stav na:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Stav při spuštění"
@@ -13307,15 +13281,15 @@
 msgid "Interface"
 msgstr "Rozhraní"
 
-msgid "Smiley Themes"
-msgstr "Témata smajlíků"
-
 msgid "Browser"
 msgstr "Prohlížeč"
 
 msgid "Status / Idle"
 msgstr "Stav / nečinný"
 
+msgid "Themes"
+msgstr "Témata"
+
 msgid "Allow all users to contact me"
 msgstr "Povolit všem uživatelům kontaktovat mě"
 
@@ -13659,9 +13633,6 @@
 msgid "Pidgin smileys"
 msgstr "Smajlíky Pidginu"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Výběr tohoto zakáže grafické emotikony."
 
@@ -14289,6 +14260,9 @@
 msgid "Conversation Entry"
 msgstr "Pole konverzace"
 
+msgid "Conversation History"
+msgstr "Historie konverzace"
+
 msgid "Request Dialog"
 msgstr "Dialog požadavku"
 
@@ -14751,9 +14725,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Spouštět %s při spuštění Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "povolit několikanásobné současné spuštění"
+msgstr "Povolit několikanásobné současné spuštění"
 
 msgid "_Dockable Buddy List"
 msgstr "_Dokovatelný seznam kamarádů"
@@ -14816,6 +14789,28 @@
 msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
 #, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(implicitní)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Nainstalovat téma"
+
+#~ msgid "Icon"
+#~ msgstr "Ikona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Používat písmo dokumentu z _tématu"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy server a prohlížeč"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatická nepřítomnost"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Změnit _stav na:"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "Vyžadovaný kořenový certifikát je problematický neznámý Pidginu."
 
@@ -15941,9 +15936,6 @@
 #~ msgid "_Send To"
 #~ msgstr "_Odeslat do"
 
-#~ msgid "Conversation History"
-#~ msgstr "Historie konverzace"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Prohlížeč záznamů"
 
--- a/po/de.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/de.po	Sat Jan 09 02:00:18 2010 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:33-0500\n"
-"PO-Revision-Date: 2009-10-07 22:34+0200\n"
-"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2009-12-10 22:38+0100\n"
+"PO-Revision-Date: 2009-12-11 20:55+0100\n"
+"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -636,9 +636,8 @@
 msgid "Enable Sounds"
 msgstr "Klänge aktivieren"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Sie haben die Verbindung beendet."
+msgstr "Sie sind nicht verbunden."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
@@ -1394,7 +1393,7 @@
 msgstr "Doppelte Bezeichnung"
 
 msgid "Please enter a different title for the status."
-msgstr "Bitte geben sie eine andere Bezeichnung für den Status ein."
+msgstr "Bitte geben Sie eine andere Bezeichnung für den Status ein."
 
 msgid "Substatus"
 msgstr "Unter-Status"
@@ -1465,7 +1464,7 @@
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s sagte ihren Spitznamen in %s"
+msgstr "%s sagte Ihren Spitznamen in %s"
 
 #, c-format
 msgid "%s sent a message in %s"
@@ -1565,6 +1564,7 @@
 msgid "Online"
 msgstr "Online"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1674,6 +1674,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 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."
@@ -2442,7 +2444,7 @@
 msgstr "_Setzen"
 
 msgid "None of your accounts are idle."
-msgstr "Keine ihrer Konten sind untätig."
+msgstr "Keine Ihrer Konten sind untätig."
 
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
@@ -2515,7 +2517,7 @@
 msgstr "Wenn Benutzer so viele Minuten nicht gesprochen hat"
 
 msgid "Apply hiding rules to buddies"
-msgstr "Regeln zum Verstecken auf Buddies anwenden"
+msgstr "Regeln zum Verstecken auf Buddys anwenden"
 
 #. *< type
 #. *< ui_requirement
@@ -3046,7 +3048,7 @@
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "Hostname oder Portnummer ihres Proxys sind falsch angegeben."
+msgstr "Hostname oder Portnummer Ihres Proxys sind falsch angegeben."
 
 msgid "Token Error"
 msgstr "Token-Fehler"
@@ -3105,7 +3107,7 @@
 msgstr "Passwort (nochmal)"
 
 msgid "Enter captcha text"
-msgstr "Captcha-Text eigeben"
+msgstr "Captcha-Text eingeben"
 
 msgid "Captcha"
 msgstr "Captcha"
@@ -3114,7 +3116,7 @@
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
 
 msgid "Please, fill in the following fields"
-msgstr "Bitte füllen sie die folgenden Felder aus"
+msgstr "Bitte füllen Sie die folgenden Felder aus"
 
 msgid "City"
 msgstr "Stadt"
@@ -3181,15 +3183,17 @@
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Wählen sie einen Chat für den Benutzer: %s"
+msgstr "Wählen Sie einen Chat für den Benutzer: %s"
 
 msgid "Add to chat..."
 msgstr "Zum Chat hinzufügen..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Verfügbar"
 
+#. 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
@@ -3778,7 +3782,7 @@
 "use it."
 msgstr ""
 "wallops &lt;Nachricht&gt;:  Wenn Sie diese Funktion nicht kennen, brauchen "
-"sie sie wahrscheinlich nicht."
+"Sie sie wahrscheinlich nicht."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [Server] &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen."
@@ -3823,6 +3827,13 @@
 "Der Server erfordert eine Klartext-Authentifizierung über einen "
 "unverschlüsselten Kanal"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Ungültige Serverantwort"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3835,15 +3846,6 @@
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-msgid "SASL authentication failed"
-msgstr "SASL-Authentifizierung fehlgeschlagen"
-
-msgid "Invalid response from server"
-msgstr "Ungültige Serverantwort"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Der Server benutzt keine der unterstützten Authentifizierungsmethoden"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr ""
 "Sie fordern Verschlüsselung, aber diese ist auf dem Server nicht verfügbar."
@@ -3851,10 +3853,32 @@
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr "SASL-Authentifizierung fehlgeschlagen"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-Fehler: %s"
 
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Kann nicht konfigurieren"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Es konnte kein lauschender Port geöffnet werden."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Ungültige Challenge vom Server"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Ungültige HTTP-Antwort vom Server empfangen"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Der BOSH-Verbindungsmanager hat Ihre Sitzung beendet."
 
@@ -3955,13 +3979,21 @@
 msgid "Resource"
 msgstr "Ressource"
 
+#, fuzzy
+msgid "Uptime"
+msgstr "Aktualisieren"
+
+#, c-format
+msgid "%s"
+msgstr ""
+
+msgid "Logged Off"
+msgstr "Abgemeldet"
+
 #, c-format
 msgid "%s ago"
 msgstr "vor %s"
 
-msgid "Logged Off"
-msgstr "Abgemeldet"
-
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
@@ -4010,12 +4042,14 @@
 msgid "Log Out"
 msgstr "Abmelden"
 
+#. 2
 msgid "Chatty"
 msgstr "Gesprächig"
 
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
@@ -4051,7 +4085,7 @@
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
-"Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
+"Füllen Sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
 msgid "Email Address"
@@ -4156,7 +4190,7 @@
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
-"Nach dem Fehlschlagen einer direkten XMPP-Verbindung konnen keine "
+"Nach dem Fehlschlagen einer direkten XMPP-Verbindung können keine "
 "alternativen Verbindungsmethoden gefunden werden."
 
 msgid "Invalid XMPP ID"
@@ -4284,6 +4318,7 @@
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
+#. 0
 msgid "None"
 msgstr "Kein"
 
@@ -4453,7 +4488,7 @@
 msgstr "Ungültige ID"
 
 msgid "Invalid Namespace"
-msgstr "Ungültiger Namenraum"
+msgstr "Ungültiger Namensraum"
 
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
@@ -4593,9 +4628,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [Raum]:  Verlasse den Raum."
+msgstr "part [Nachricht]:  Verlasse den Raum."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
@@ -5497,9 +5531,8 @@
 msgid "Unknown error (%d)"
 msgstr "Unbekannter Fehler (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Kann den Benutzer nicht hinzufügen"
+msgstr "Kann den Benutzer nicht entfernen"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobile Nachricht wurde nicht gesendet, da sie zu lang war."
@@ -5756,28 +5789,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "Der Benutzer %s hat Sie von seiner Buddy-Liste gelöscht."
 
+#. 1
+msgid "Angry"
+msgstr "Verärgert"
+
+#. 2
+msgid "Excited"
+msgstr "Aufgeregt"
+
+#. 3
+msgid "Grumpy"
+msgstr "Mürrisch"
+
+#. 4
+msgid "Happy"
+msgstr "Glücklich"
+
+#. 5
+msgid "In Love"
+msgstr "Verliebt"
+
+#. 6
+msgid "Invincible"
+msgstr "Unerschütterlich"
+
+#. 7
+msgid "Sad"
+msgstr "Traurig"
+
+#. 8
+msgid "Hot"
+msgstr "Heiß"
+
+#. 9
+msgid "Sick"
+msgstr "Krank"
+
+#. 10
+msgid "Sleepy"
+msgstr "Müde"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Ihre momentane Stimmung"
+msgstr "Momentane Stimmung"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Stimmung"
-
-#, fuzzy
+msgstr "Neue Stimmung"
+
 msgid "Change your Mood"
-msgstr "Passwort ändern"
-
-#, fuzzy
+msgstr "Ihre Stimmung ändern"
+
 msgid "How do you feel right now?"
-msgstr "Ich bin gerade nicht hier"
+msgstr "Wie fühlen Sie sich gerade?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Der eingegebene PIN ist ungültig."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Die eingegebene PIN hat eine ungültige Länge [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Der eingegebene Geburtstag ist ungültig. Das korrekte Format ist: 'JJJJ-MM-"
+"TT'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Schreibfehler"
+msgstr "Profil-Aktualisierungs-Fehler"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5786,353 +5875,311 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Ihre Profil-Informationen wurden noch nicht abgerufen. Bitte versuchen Sie "
+"es später noch einmal."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN bestätigen"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Nachname"
+msgstr "Anzeigename"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Meine Nummer verstecken"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Handynummer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Yahoo!-Profil"
+msgstr "Aktualisieren Sie Ihr Profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Hier können Sie Ihr MXit-Profil aktualisieren"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Startbildschirm anschauen"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Es gibt gerade keinen Startbildschirm"
+
 msgid "About"
-msgstr "Über mich"
+msgstr "Info"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Passwort ändern..."
+msgstr "Stimmung ändern..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Passwort ändern..."
+msgstr "Profil ändern..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Mitschnitt anzeigen..."
+msgstr "Startbildschirm anzeigen..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Über mich"
+msgstr "Über..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Die Nachricht ist zu lang."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Die Datei, die Sie senden möchten ist zu groß!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Kann keine Verbindung zum MXit-HTTP-Server herstellen. Bitte überprüfen Sie "
+"Ihre Server-Einstellungen."
+
 msgid "Logging In..."
-msgstr "Logge ein"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
-"Servers ein, mit dem Sie sich verbinden wollen."
-
-#, fuzzy
+msgstr "Logge ein..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Kann keine Verbindung zum MXit-Server herstellen. Bitte überprüfen Sie Ihre "
+"Server-Einstellungen."
+
 msgid "Connecting..."
-msgstr "Verbindungsaufbau"
+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 ""
+msgstr "MXit-Login-Name"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Spitzname"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrierung eines neuen XMPP-Kontos"
-
-#, fuzzy
+msgstr "Ein neues MXit-Konto registrieren"
+
 msgid "Please fill in the following fields:"
-msgstr "Bitte füllen sie die folgenden Felder aus"
+msgstr "Bitte füllen Sie die folgenden Felder aus:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Fehler beim Verbinden mit der MXit-WAP-Seite. Bitte versuchen Sie es später "
+"noch einmal."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit kann im Moment Ihre Anfrage nicht verarbeiten. Bitte versuchen Sie es "
+"später noch einmal."
 
 msgid "Wrong security code entered. Please try again later."
 msgstr ""
+"Es wurde ein falscher Sicherheitscode eingegeben. Bitte versuchen Sie es "
+"später noch einmal."
 
 msgid "Your session has expired. Please try again later."
 msgstr ""
+"Ihre Sitzung ist abgelaufen. Bitte versuchen Sie es später noch einmal."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Ungültiges Land gewählt. Bitte versuchen Sie es noch einmal."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Benutzername ist nicht registriert. Bitte registrieren Sie Sich zuerst."
 
 msgid "Username is already registered. Please choose another username."
 msgstr ""
-
-#, fuzzy
+"Der Benutzername ist bereits registriert. Bitte wählen Sie einen anderen "
+"Benutzernamen."
+
 msgid "Internal error. Please try again later."
-msgstr "Der Server ist nicht erreichbar; Versuchen Sie es später nochmal"
+msgstr "Internet Fehler. Versuchen Sie es später noch einmal."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Sie haben den Sicherheitscode nicht eingegeben"
+
 msgid "Security Code"
-msgstr "Sicherheit aktiviert"
+msgstr "Sicherheitscode"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Geben Sie den Code ein"
-
-#, fuzzy
+msgstr "Geben Sie den Sicherheitscode ein"
+
 msgid "Your Country"
-msgstr "Land"
-
-#, fuzzy
+msgstr "Ihr Land"
+
 msgid "Your Language"
-msgstr "Bevorzugte Sprache"
+msgstr "Ihre Sprache"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Autorisierung erforderlich"
+msgstr "MXit-Autorisierung"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-Kontoüberprüfung"
+
 msgid "Retrieving User Information..."
-msgstr "Serverinformation"
-
-#, fuzzy
+msgstr "Abrufen der Benutzerinformationen..."
+
+msgid "Loading menu..."
+msgstr "Lade das Menü..."
+
 msgid "Status Message"
-msgstr "Gesendete Nachrichten"
-
-#, fuzzy
+msgstr "Status-Nachricht"
+
 msgid "Hidden Number"
-msgstr "Zweiter Name"
-
-#, fuzzy
+msgstr "Versteckte Nummer"
+
 msgid "Your Mobile Number..."
-msgstr "Setze Handynummer..."
+msgstr "Ihre Handynummer..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
-
-#, fuzzy
+msgstr "WAP-Server"
+
 msgid "Connect via HTTP"
-msgstr "Über TCP verbinden"
+msgstr "Über HTTP verbinden"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Startbildschirm-Popup aktivieren"
 
 #. 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 ""
+"Wir haben die Verbindung zu MXit verloren. Bitte verbinden Sie sich neu."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP-Nachrichtenfehler"
-
-#, fuzzy
+msgstr "Fehler beim Senden der Nachricht"
+
 msgid "Unable to process your request at this time"
-msgstr "Hostname konnte nicht aufgelöst werden"
+msgstr "Kann Ihre Anfrage im Moment nicht verarbeiten"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Beim Warten auf den MXit-Server trat eine Zeitüberschreitung auf."
+
 msgid "Successfully Logged In..."
-msgstr "Qun erfolgreich betreten"
-
-#, fuzzy
+msgstr "Erfolgreich angemeldet..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s hat Ihnen eine verschlüsselte Nachricht gesendet, aber Verschlüsselung "
+"wird noch nicht unterstützt."
+
 msgid "Message Error"
-msgstr "XMPP-Nachrichtenfehler"
+msgstr "Nachrichtenfehler"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Kann die Umleitung nicht mit dem angegebenen Protokoll durchführen"
+
+msgid "An internal MXit server error occurred."
+msgstr "Es ist ein unbekannter MXit-Serverfehler aufgetreten."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Anmeldefehler: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Abmeldefehler: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Verbindungsfehler"
-
-#, fuzzy
+msgstr "Kontaktfehler"
+
 msgid "Message Sending Error"
-msgstr "XMPP-Nachrichtenfehler"
-
-#, fuzzy
+msgstr "Fehler beim Nachrichtenversand"
+
 msgid "Status Error"
-msgstr "Stream-Fehler"
-
-#, fuzzy
+msgstr "Status-Fehler"
+
 msgid "Mood Error"
-msgstr "Icon-Fehler"
-
-#, fuzzy
+msgstr "Stimmungs-Fehler"
+
 msgid "Invitation Error"
-msgstr "Fehler beim Aufheben der Registrierung"
-
-#, fuzzy
+msgstr "Fehler beim Einladen"
+
 msgid "Contact Removal Error"
-msgstr "Verbindungsfehler"
-
-#, fuzzy
+msgstr "Fehler beim Löschen eines Kontakts"
+
 msgid "Subscription Error"
-msgstr "Abonnement"
-
-#, fuzzy
+msgstr "Fehler beim Abonnieren"
+
 msgid "Contact Update Error"
-msgstr "Verbindungsfehler"
-
-#, fuzzy
+msgstr "Fehler beim Aktualisieren"
+
 msgid "File Transfer Error"
-msgstr "Dateiübertragung"
-
-#, fuzzy
+msgstr "Dateiübertragungsfehler"
+
 msgid "Cannot create MultiMx room"
-msgstr "Kann Alarm nicht erzeugen"
-
-#, fuzzy
+msgstr "Kann MultiMx-Raum nicht erzeugen"
+
 msgid "MultiMx Invitation Error"
-msgstr "Fehler beim Aufheben der Registrierung"
-
-#, fuzzy
+msgstr "Fehler bei der MultiMx-Einladung"
+
 msgid "Profile Error"
-msgstr "Schreibfehler"
+msgstr "Profilfehler"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Ungültiges Paket von MXit empfangen."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Verärgert"
-
-msgid "Excited"
-msgstr "Aufgeregt"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppe"
-
-msgid "Happy"
-msgstr "Glücklich"
-
-msgid "In Love"
-msgstr "Verliebt"
-
-msgid "Invincible"
-msgstr "Unerschütterlich"
-
-msgid "Sad"
-msgstr "Traurig"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Spitzname"
-
-msgid "Sleepy"
-msgstr "Müde"
-
-#, fuzzy
+msgstr "Ein MXit-Verbindungsfehler trat auf. (Lesephase 0x05)"
+
 msgid "Pending"
-msgstr "Sende"
-
-#, fuzzy
+msgstr "Ausstehend"
+
 msgid "Invited"
-msgstr "Einladen"
-
-#, fuzzy
+msgstr "Eingeladen"
+
 msgid "Rejected"
-msgstr "Ablehnen"
-
-#, fuzzy
+msgstr "Abgelehnt"
+
 msgid "Deleted"
-msgstr "Löschen"
+msgstr "Gelöscht"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-Werbung"
+
 msgid "More Information"
-msgstr "Information (Arbeit)"
+msgstr "Mehr Informationen"
 
 #, c-format
 msgid "No such user: %s"
@@ -6215,7 +6262,7 @@
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Ihr Passwort hat %zu Buchstaben, mehr als die erwartete maximale Länge "
-"von %d.  Bitte kürzen Sie ihr Passwort unter http://profileedit.myspace.com/"
+"von %d.  Bitte kürzen Sie Ihr Passwort unter http://profileedit.myspace.com/"
 "index.cfm?fuseaction=accountSettings.changePassword und versuchen Sie es "
 "erneut."
 
@@ -6256,7 +6303,7 @@
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-"Benutzen sie libpurple mit RC4-Unterstützung (>= 2.0.1). MySpaceIM-Plugin "
+"Benutzen Sie libpurple mit RC4-Unterstützung (>= 2.0.1). MySpaceIM-Plugin "
 "wird nicht geladen."
 
 msgid "Add friends from MySpace.com"
@@ -6297,7 +6344,7 @@
 msgstr "Bildschirmauflösung (dpi)"
 
 msgid "Base font size (points)"
-msgstr "Basis-Schriftgrüße (Punkt)"
+msgstr "Basis-Schriftgröße (Punkt)"
 
 msgid "User"
 msgstr "Benutzer"
@@ -6870,7 +6917,7 @@
 msgstr "Dienst nicht definiert"
 
 msgid "Obsolete SNAC"
-msgstr "Obsoleteter SNAC"
+msgstr "Obsoleter SNAC"
 
 msgid "Not supported by host"
 msgstr "Nicht unterstützt vom Host"
@@ -6924,47 +6971,43 @@
 msgstr "Nicht solange bei AOL angemeldet"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Kann wegen Kinderschutzeinstellungen keine IM empfangen"
 
 msgid "Cannot send SMS without accepting terms"
 msgstr ""
-
-#, fuzzy
+"SMS können nicht gesendet werden ohne die Vertragsbedingungen zu akzeptieren"
+
 msgid "Cannot send SMS"
-msgstr "Kann Datei nicht senden"
+msgstr "Kann SMS nicht senden"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Kann kein Verzeichnis senden."
+msgstr "Kann keine SMS in dieses Land senden"
 
 #. Undocumented
-#, fuzzy
 msgid "Cannot send SMS to unknown country"
-msgstr "Die SMS kann nicht gesendet werden. Unbekannter Mobilfunkkanal."
+msgstr "Kann keine SMS in ein unbekanntes Land schicken"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Bot-Konten können keine IMs initiieren"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Bot-Konten können diesem Benutzer keine Nachricht senden"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Das Bot-Konto erreichte die IM-Grenze"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Bot-Konto erreichte die tägliche IM-Grenze"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Bot-Konto erreichte die monatliche IM-Grenze"
+
 msgid "Unable to receive offline messages"
-msgstr "Nachricht kann nicht gesendet werden."
-
-#, fuzzy
+msgstr "Kann keine Offline-Nachrichten empfangen"
+
 msgid "Offline message store full"
-msgstr "Offline-Nachrichten"
+msgstr "Offline-Nachrichtenspeicher voll"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7136,15 +7179,14 @@
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
 #. 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 ""
-"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
-"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
-"noch länger warten."
+"Ihr Benutzername hat sich zu schnell an- und abgemeldet. Warten Sie 10 "
+"Minuten und versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, "
+"müssen Sie sogar noch länger warten."
 
 #. client too old
 #, c-format
@@ -7153,15 +7195,14 @@
 "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %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 ""
-"Sie haben sich zu schnell an- und abgemeldet. Warten Sie eine Minute und "
-"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
-"noch länger warten."
+"Ihre IP-Adresse hat sich zu schnell an- und abgemeldet. Warten Sie eine "
+"Minute und versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen "
+"Sie sogar noch länger warten."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch"
@@ -7314,21 +7355,21 @@
 msgstr[1] ""
 "Sie haben %hu Nachrichten von %s aus unbekannten Gründen nicht erhalten."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Kann die Nachricht nicht senden (%s)."
+msgstr "Kann die Nachricht nicht senden: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kann die Nachricht an %s nicht senden:"
-
-#, fuzzy, c-format
+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:"
+msgstr "Kann die Nachricht an %s nicht senden: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7357,14 +7398,13 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige "
 "Zeichen enthält.]"
 
-#, 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 ""
 "Die letzte gewünschte Aktion konnte nicht durchgeführt werden, da die "
 "Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
-"Sie es erneut."
+"Sie es erneut.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7941,7 +7981,7 @@
 msgstr "Buddy-Notiz"
 
 msgid "Change his/her memo as you like"
-msgstr "Ändern Sie seine/ihre Notiz wie sie möchten"
+msgstr "Ändern Sie seine/ihre Notiz wie Sie möchten"
 
 msgid "_Modify"
 msgstr "_Bearbeiten"
@@ -7982,7 +8022,7 @@
 
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u benötigt Authorisierung"
+msgstr "%u benötigt Autorisierung"
 
 msgid "Add buddy authorize"
 msgstr "Buddy-Autorisierung hinzufügen"
@@ -8586,7 +8626,7 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Bitte geben sie ein Thema für die neue Konferenz und eine "
+"Bitte geben Sie ein Thema für die neue Konferenz und eine "
 "Einladungsnachricht für %s ein"
 
 msgid "New Conference"
@@ -8610,8 +8650,8 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Wählen sie eine Konferenz von der Liste, zu der Sie den Benutzer %s einladen "
-"möchten. Wählen sie „Neue Konferenz erzeugen“, wenn Sie den Benutzer zu "
+"Wählen Sie eine Konferenz von der Liste, zu der Sie den Benutzer %s einladen "
+"möchten. Wählen Sie „Neue Konferenz erzeugen“, wenn Sie den Benutzer zu "
 "einer neuen Konferenz einladen möchten."
 
 msgid "Invite to Conference"
@@ -8667,8 +8707,8 @@
 "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 ""
-"Der Bezeichner '%s' kann sich vielleicht zu einem der folgenden Benutzer "
-"beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden "
+"Der Bezeichner '%s' kann sich vielleicht auf einen der folgenden Benutzer "
+"beziehen. Bitte wählen Sie den korrekten Benutzer aus der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen."
 
 msgid "Select User"
@@ -8767,7 +8807,7 @@
 "group and its members to your buddy list."
 msgstr ""
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
-"Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzufügen."
+"Gruppe und ihre Mitglieder zu Ihrer Buddy-Liste hinzuzufügen."
 
 #, c-format
 msgid "Search results for '%s'"
@@ -8782,7 +8822,7 @@
 "Der Bezeichner '%s' kann sich vielleicht zu einem der folgenden Benutzer "
 "beziehen. Mehr als ein Benutzer wurde mit dem gleichen Namen gefunden. Sie "
 "können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
-"senden, indem sie die folgenden Aktions-Buttons benutzen."
+"senden, indem Sie die folgenden Aktions-Buttons benutzen."
 
 msgid "Search Results"
 msgstr "Suchergebnisse"
@@ -8912,7 +8952,7 @@
 
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "Dem Buddy %s wird nicht (kryptografisch) vertraut"
+msgstr "Dem Buddy %s wird nicht (kryptographisch) vertraut"
 
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
@@ -9891,7 +9931,7 @@
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
-"Fehler: Entferntes Programm unterstützt die vorgeschlagene Cipher nicht"
+"Fehler: Entferntes Programm unterstützt die vorgeschlagene Chiffre nicht"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
@@ -10363,7 +10403,7 @@
 "able to rejoin a chatroom"
 msgstr ""
 "Unbekannter Fehler. Sie müssen sich eventuell abmelden und fünf Minuten "
-"warten, bevor sie wieder einen Chatraum betreten können"
+"warten, bevor Sie wieder einen Chatraum betreten können"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -10373,7 +10413,7 @@
 msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
 
 msgid "Maybe they're not in a chat?"
-msgstr "Vielleicht sind sie nicht im Chat?"
+msgstr "Vielleicht sind Sie nicht im Chat?"
 
 msgid "Fetching the room list failed."
 msgstr "Abrufen der Raumliste gescheitert."
@@ -10758,7 +10798,7 @@
 #, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
-"Die Verbindung wurde von einer anderen Software auf ihrem Computer "
+"Die Verbindung wurde von einer anderen Software auf Ihrem Computer "
 "unterbrochen."
 
 #. 10054
@@ -10796,6 +10836,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chatten mit Kurznachrichten.  Unterstützt AIM, Google Talk, Jabber/XMPP, "
+"MSN, Yahoo und weitere"
 
 msgid "Internet Messenger"
 msgstr "Internet-Sofortnachrichtendienst"
@@ -12070,6 +12112,9 @@
 msgid "Mongolian"
 msgstr "Mongolisch"
 
+msgid "Malay"
+msgstr "Malaiisch"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegisch"
 
@@ -12139,6 +12184,9 @@
 msgid "Turkish"
 msgstr "Türkisch"
 
+msgid "Ukranian"
+msgstr "Ukrainisch"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12202,14 +12250,7 @@
 "<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\">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/><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/>"
 
 #, c-format
 msgid ""
@@ -13086,8 +13127,8 @@
 msgid "(Custom)"
 msgstr "(Benutzerdefiniert)"
 
-msgid "(Default)"
-msgstr "(Standard)"
+msgid "Penguin Pimps"
+msgstr "Pinguin Pimps"
 
 msgid "The default Pidgin sound theme"
 msgstr "Das Standard-Klangthema für Pidgin"
@@ -13107,18 +13148,29 @@
 msgid "Theme failed to copy."
 msgstr "Thema konnte nicht kopiert werden."
 
-msgid "Install Theme"
-msgstr "Thema installieren"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Wählen Sie das zu benutzende Smilie-Thema aus der untenstehenden Liste. Neue "
-"Themen können durch Ziehen in die Themenliste installiert werden."
-
-msgid "Icon"
-msgstr "Icon"
+msgid "Theme Selections"
+msgstr "Themenauswahl"
+
+#. 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 ""
+"Wählen Sie das zu benutzende Thema aus den unten stehenden Listen.\n"
+"Neue Themen können durch Ziehen in die Themenliste installiert werden."
+
+msgid "Buddy List Theme:"
+msgstr "Buddy-Listen-Thema:"
+
+msgid "Status Icon Theme:"
+msgstr "Status-Icon-Thema:"
+
+msgid "Sound Theme:"
+msgstr "Klang-Thema:"
+
+msgid "Smiley Theme:"
+msgstr "Smiley-Thema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
@@ -13126,10 +13178,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Schließe Gespräche mit der Escape-Taste"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Buddy-Listen-Thema"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Kontrollleisten-Icon"
@@ -13202,7 +13250,7 @@
 msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
 
 msgid "Highlight _misspelled words"
-msgstr "_Falsch geschriebene Wörter hervorheben"
+msgstr "F_alsch geschriebene Wörter hervorheben"
 
 msgid "Use smooth-scrolling"
 msgstr "Weiches Scrollen aktivieren"
@@ -13216,9 +13264,6 @@
 msgid "Font"
 msgstr "Schriftart"
 
-msgid "Use document font from _theme"
-msgstr "Benutze Dokumentenschriftart des _Themas"
-
 msgid "Use font from _theme"
 msgstr "Benutze Schriftart des _Themas"
 
@@ -13248,9 +13293,8 @@
 msgid "Use _automatically detected IP address: %s"
 msgstr "Benutze _automatisch erkannte IP-Adresse: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_TURN-Server:"
+msgstr "ST_UN-Server:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
@@ -13262,19 +13306,16 @@
 msgstr "Ports"
 
 msgid "_Enable automatic router port forwarding"
-msgstr "Automatischer _Router-Port-Weiterleitung aktivieren"
-
-#, fuzzy
+msgstr "Automatische _Router-Port-Weiterleitung aktivieren"
+
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen"
-
-#, fuzzy
+msgstr "Port-Bereich, auf dem gehört werden soll, _manuell bestimmen:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Start:"
+
 msgid "_End:"
-msgstr "A_usklappen"
+msgstr "_Ende:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
@@ -13283,58 +13324,11 @@
 msgid "_TURN server:"
 msgstr "_TURN-Server:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Benutzername:"
-
-#, fuzzy
+msgstr "_Benutzername:"
+
 msgid "Pass_word:"
-msgstr "Passwort:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy-Server &amp; Browser"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Das Proxy-Konfigurationsprogramm wurde nicht gefunden.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Browser-Konfigurationsprogramm wurde nicht gefunden.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Proxy & Browser-Einstellungen werden im\n"
-"GNOME Kontrollzentrum konfiguriert"
-
-msgid "Configure _Proxy"
-msgstr "_Proxy konfigurieren"
-
-msgid "Configure _Browser"
-msgstr "_Browser konfigurieren"
-
-msgid "Proxy Server"
-msgstr "Proxy-Server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Remote-DNS mit SOCKS4-Proxys benutzen"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy-_Typ:"
-
-msgid "No proxy"
-msgstr "Kein Proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Benutzername:"
+msgstr "Pass_wort:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13375,6 +13369,15 @@
 msgid "Browser Selection"
 msgstr "Browserauswahl"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Browser-Einstellungen werden in den GNOME-Einstellungen konfiguriert"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Browser-Konfigurationsprogramm wurde nicht gefunden.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Browser konfigurieren"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13398,6 +13401,35 @@
 "_Manuell:\n"
 "(%s für die URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy-Server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Proxy-Einstellungen werden in den GNOME-Einstellungen konfiguriert"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Das Proxy-Konfigurationsprogramm wurde nicht gefunden.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Proxy konfigurieren"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Remote-_DNS mit SOCKS4-Proxys benutzen"
+
+msgid "Proxy t_ype:"
+msgstr "Proxy-_Typ:"
+
+msgid "No proxy"
+msgstr "Kein Proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "Benutzer_name:"
+
 msgid "Log _format:"
 msgstr "Mitschnitt-_Format:"
 
@@ -13408,7 +13440,7 @@
 msgstr "Alle C_hats mitschneiden"
 
 msgid "Log all _status changes to system log"
-msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
+msgstr "Sch_neide alle Statusveränderungen im System-Mitschnitt mit"
 
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
@@ -13455,7 +13487,7 @@
 "(%s für den Dateinamen)"
 
 msgid "M_ute sounds"
-msgstr "Stu_mmschalten"
+msgstr "_Stummschalten"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
@@ -13481,25 +13513,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Abhängig von Tastatur- oder Mausbenutzung"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
+
+msgid "Change to this status when _idle:"
+msgstr "Ändere zu diesem Status, wenn _inaktiv:"
+
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
 msgid "When both away and idle"
 msgstr "Wenn abwesend und untätig"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisch abwesend"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
-
-msgid "Change status when _idle"
-msgstr "Ändere Status, wenn _inaktiv"
-
-msgid "Change _status to:"
-msgstr "Ändere _Status zu:"
-
 #
 #. Signon status stuff
 msgid "Status at Startup"
@@ -13514,15 +13539,15 @@
 msgid "Interface"
 msgstr "Schnittstelle"
 
-msgid "Smiley Themes"
-msgstr "Smiley-Themen"
-
 msgid "Browser"
 msgstr "Browser"
 
 msgid "Status / Idle"
 msgstr "Status / Untätig"
 
+msgid "Themes"
+msgstr "Themen"
+
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
@@ -13728,7 +13753,7 @@
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s kann keine Verzeichnisse übertragen. Bitte senden sie die Dateien einzeln."
+"%s kann keine Verzeichnisse übertragen. Bitte senden Sie die Dateien einzeln."
 
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gewählt"
@@ -13778,7 +13803,7 @@
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten sie das Ziel der "
+"Sie haben eine Verknüpfung gewählt. Wahrscheinlich wollten Sie das Ziel der "
 "Verknüpfung senden und nicht die Verknüpfung selbst."
 
 #, c-format
@@ -13875,9 +13900,6 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin-Smileys"
 
-msgid "Penguin Pimps"
-msgstr "Pinguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Wenn Sie dies auswählen, werden grafische Emoticons deaktiviert."
 
@@ -14326,17 +14348,17 @@
 "haben."
 
 msgid "Markerline"
-msgstr "Markierunglinie"
+msgstr "Markierungslinie"
 
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr ""
 "Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
 
 msgid "Jump to markerline"
-msgstr "Springen zur Markierunglinie"
+msgstr "Springen zur Markierungslinie"
 
 msgid "Draw Markerline in "
-msgstr "Zeichne eine Markierunglinie in "
+msgstr "Zeichne eine Markierungslinie in "
 
 msgid "_IM windows"
 msgstr "_IM-Fenster"
@@ -14525,6 +14547,9 @@
 msgid "Conversation Entry"
 msgstr "Unterhaltungseintrag"
 
+msgid "Conversation History"
+msgstr "Unterhaltungsverlauf"
+
 msgid "Request Dialog"
 msgstr "Anfrage-Dialog"
 
@@ -14813,7 +14838,7 @@
 msgstr "Zeigt die Buddy-Liste als tickerähnliche Laufschrift."
 
 msgid "Display Timestamps Every"
-msgstr "Zeige Zeitstemple alle"
+msgstr "Zeige Zeitstempel alle"
 
 #. *< type
 #. *< ui_requirement
@@ -15052,19 +15077,3 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
-
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr ""
-#~ "Das Root-Zertifikat, welches für dieses angegeben ist, ist unbekannt."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Sendet Sofortnachrichten über mehrere Protokolle"
-
-#~ msgid "_Start port:"
-#~ msgstr "_Start-Port:"
-
-#~ msgid "_End port:"
-#~ msgstr "_End-Port:"
-
-#~ msgid "_User:"
-#~ msgstr "_Benutzer:"
--- a/po/fr.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/fr.po	Sat Jan 09 02:00:18 2010 +0000
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-29 09:40+0200\n"
+"POT-Creation-Date: 2009-11-28 15:44+0100\n"
+"PO-Revision-Date: 2009-11-28 15:03+0100\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -644,9 +644,8 @@
 msgid "Enable Sounds"
 msgstr "Activer les sons"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Impossible de se connecter."
+msgstr "Vous n'êtes pas connecté."
 
 msgid "<AUTO-REPLY> "
 msgstr "<Réponse automatique> "
@@ -657,9 +656,8 @@
 msgstr[0] "Liste de %d utilisateur :\n"
 msgstr[1] "Liste de %d utilisateurs :\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Les options de débuggage supportées sont : version"
+msgstr "Les options de débuggage supportées sont : plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
@@ -1545,10 +1543,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pour ci-dessus : %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Veuillez patientez pendant que TinyURL génère une URL plus courte..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
@@ -1570,6 +1568,7 @@
 msgid "Online"
 msgstr "En ligne"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Déconnecté"
 
@@ -1678,6 +1677,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 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."
@@ -1909,9 +1910,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Le processus de résolution s'est arrêté sans répondre."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Erreur à la résolution du nom %s : %d"
+msgstr "Erreur à la conversion de %s en punycode : %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2234,17 +2235,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Une erreur insurmontable de Farsight2 est survenue."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Erreur de conférence."
-
-#, fuzzy
+msgstr "Erreur de conférence"
+
 msgid "Error with your microphone"
-msgstr "Problème avec votre micro."
-
-#, fuzzy
+msgstr "Problème avec votre micro"
+
 msgid "Error with your webcam"
-msgstr "Problème avec votre webcam."
+msgstr "Problème avec votre webcam"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3199,10 +3197,12 @@
 msgid "Add to chat..."
 msgstr "Ajouter à la discussion..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Disponible"
 
+#. 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
@@ -4024,12 +4024,14 @@
 msgstr "Déconnexion"
 
 # Pour avoir le même texte que « Free for Chat »
+#. 2
 msgid "Chatty"
 msgstr "Libre pour discuter"
 
 msgid "Extended Away"
 msgstr "Longue absence"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
@@ -4297,6 +4299,7 @@
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
+#. 0
 msgid "None"
 msgstr "Aucun"
 
@@ -4606,9 +4609,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure : Configurer un salon de discussions"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [salon] : Quitter le salon"
+msgstr "part [salon] : Quitter le salon."
 
 msgid "register:  Register with a chat room."
 msgstr "register : S'enregistrer dans un salon"
@@ -5280,7 +5282,7 @@
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5509,9 +5511,8 @@
 msgid "Unknown error (%d)"
 msgstr "Erreur inconnue (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Impossible d'ajouter un utilisateur"
+msgstr "Impossible de supprimer l'utilisateur"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Le message mobile n'a pas été envoyé parce qu'il est trop long."
@@ -5751,28 +5752,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
 
+#. 1
+msgid "Angry"
+msgstr "En colère"
+
+#. 2
+msgid "Excited"
+msgstr "Excité"
+
+#. 3
+msgid "Grumpy"
+msgstr "Grognon"
+
+#. 4
+msgid "Happy"
+msgstr "Heureux"
+
+#. 5
+msgid "In Love"
+msgstr "Amoureux"
+
+#. 6
+msgid "Invincible"
+msgstr "Invincible"
+
+#. 7
+msgid "Sad"
+msgstr "Triste"
+
+#. 8
+msgid "Hot"
+msgstr "Chaud"
+
+#. 9
+msgid "Sick"
+msgstr "Malade"
+
+#. 10
+msgid "Sleepy"
+msgstr "Somnolant"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Votre humeur actuelle"
+msgstr "Humeur actuelle"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Humeur de l'utilisateur"
-
-#, fuzzy
+msgstr "Nouvelle humeur"
+
 msgid "Change your Mood"
-msgstr "Changer de mot de passe"
-
-#, fuzzy
+msgstr "Changer d'humeur"
+
 msgid "How do you feel right now?"
-msgstr "Je ne suis pas là pour l'instant."
+msgstr "Comment vous sentez-vous ?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Le code d'accès est non valide."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Le code d'accès n'a pas la bonne longueur [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+"Le code d'accès est non valide. Il doit être uniquement composé de chiffres."
+
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"La date de naissance saisie est non valide. Le format est : AAAA-MM-JJ."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Erreur d'écriture"
+msgstr "Erreur à la mise à jour du profil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5781,353 +5838,303 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Les informations de votre profil n'ont pu être récupérées. Veuillez "
+"réessayer plus tard."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "Code"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Vérification code"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Nom de famille"
+msgstr "Nom affiché"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Cacher mon numéro"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Téléphone portable"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil de l'utilisateur"
+msgstr "Mettre à jour votre profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Vous pouvez mettre à jour votre profil MXit ici"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Voir la bannière"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Il n'y a pas de bannière disponible pour l'instant"
+
 msgid "About"
-msgstr "À mon propos"
+msgstr "À propos"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Changer de mot de passe..."
+msgstr "Changer d'humeur..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Changer de mot de passe..."
+msgstr "Changer le profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Voir les archives..."
+msgstr "Voir la bannière..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "À mon propos"
+msgstr "À propos..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Message trop long"
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Le fichier que vous voulez envoyer est trop gros !"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Impossible de se connecter au serveur HTTP MXit. Veuillez vérifier votre "
+"configuration."
+
 msgid "Logging In..."
-msgstr "Connexion"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Impossible de se connecter au serveur. Veuillez saisir l'adresse du serveur "
-"sur lequel vous voulez vous connecter."
-
-#, fuzzy
+msgstr "Connexion..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Impossible de se connecter au serveur MXit. Veuillez vérifier votre "
+"configuration."
+
 msgid "Connecting..."
-msgstr "Connexion en cours"
+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 ""
+msgstr "Nom d'utilisateur MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Pseudonyme"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Enregistrer un nouveau compte XMPP"
-
-#, fuzzy
+msgstr "Enregistrer un nouveau compte MXit"
+
 msgid "Please fill in the following fields:"
-msgstr "Veuillez renseigner les rubriques suivantes"
+msgstr "Veuillez renseigner les rubriques suivantes :"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Erreur à la connexion au site WAP de MXit. Veuillez réessayer plus tard."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit ne peut gérer cette requête pour l'instant. Veuillez réessayer plus "
+"tard."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Mauvais code de sécurité saisi. Veuillez réessayer plus tard."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Votre session a expirée. Veuillez réessayer plus tard."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Pays choisi non valide. Veuillez réessayer plus tard."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Le nom d'utilisateur n'est pas enregistré. Veuillez l'enregistrer d'abord."
 
 msgid "Username is already registered. Please choose another username."
 msgstr ""
-
-#, fuzzy
+"Le nom d'utilisateur est déjà enregistré. Veuillez en choisir un autre."
+
 msgid "Internal error. Please try again later."
-msgstr "Le serveur est non disponible. Veuillez réessayer plus tard."
+msgstr "Erreur interne. Veuillez réessayer plus tard."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Vous n'avez pas saisi le code de sécurité"
+
 msgid "Security Code"
-msgstr "Sécurité activée"
+msgstr "Code de sécurité"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Saisissez le code"
-
-#, fuzzy
+msgstr "Saisissez le code de sécurité"
+
 msgid "Your Country"
-msgstr "Pays"
-
-#, fuzzy
+msgstr "Votre pays"
+
 msgid "Your Language"
-msgstr "Langue préférée"
+msgstr "Votre langue"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Demande d'autorisation"
+msgstr "Autorisation MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Validation du compte MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Informations du serveur"
-
-#, fuzzy
+msgstr "Récupération des informations de l'utilisateur..."
+
+msgid "Loading menu..."
+msgstr "Chargement du menu..."
+
 msgid "Status Message"
-msgstr "Messages envoyés"
-
-#, fuzzy
+msgstr "Messages d'état"
+
 msgid "Hidden Number"
-msgstr "Deuxième prénom"
-
-#, fuzzy
+msgstr "Numéro caché"
+
 msgid "Your Mobile Number..."
-msgstr "Changer le numéro de téléphone portable..."
+msgstr "Votre numéro de téléphone portable..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Serveur"
-
-#, fuzzy
+msgstr "Serveur WAP"
+
 msgid "Connect via HTTP"
-msgstr "Connexion par TCP"
+msgstr "Connexion par HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Activer l'affichage de la bannière"
 
 #. 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 "Connexion perdue avec MXit. Veuillez vous reconnecter."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Erreur message XMPP"
-
-#, fuzzy
+msgstr "Erreur à l'envoi du message"
+
 msgid "Unable to process your request at this time"
-msgstr "Impossible de résoudre l'adresse internet."
+msgstr "Impossible d'effectuer votre requête en ce moment."
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Temps d'attente dépassé pour la réponse du serveur MXit."
+
 msgid "Successfully Logged In..."
-msgstr "Entrée réussie dans le Qun"
-
-#, fuzzy
+msgstr "Connexion réussie..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s vous a envoyé un message chiffré, ce qui n'est pas supporté."
+
 msgid "Message Error"
-msgstr "Erreur message XMPP"
+msgstr "Erreur de message"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Impossible de faire une redirection avec le protocole utilisé"
+
+msgid "An internal MXit server error occurred."
+msgstr "Une erreur interne au serveur MXit est survenue."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Erreur de connexion : %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Erreur de déconnexion : %s (%i)"
+
 msgid "Contact Error"
-msgstr "Erreur de connexion"
-
-#, fuzzy
+msgstr "Erreur de contact"
+
 msgid "Message Sending Error"
-msgstr "Erreur message XMPP"
-
-#, fuzzy
+msgstr "Erreur à l'envoi du message"
+
 msgid "Status Error"
-msgstr "Erreur dans le flux"
-
-#, fuzzy
+msgstr "Erreur de message d'état"
+
 msgid "Mood Error"
-msgstr "Erreur d'icône"
-
-#, fuzzy
+msgstr "Erreur d'humeur"
+
 msgid "Invitation Error"
-msgstr "Erreur de désinscription"
-
-#, fuzzy
+msgstr "Erreur d'invitation"
+
 msgid "Contact Removal Error"
-msgstr "Erreur de connexion"
-
-#, fuzzy
+msgstr "Erreur de suppression de contact"
+
 msgid "Subscription Error"
-msgstr "Inscription"
-
-#, fuzzy
+msgstr "Erreur d'inscription"
+
 msgid "Contact Update Error"
-msgstr "Erreur de connexion"
-
-#, fuzzy
+msgstr "Erreur de mise à jour de contact"
+
 msgid "File Transfer Error"
-msgstr "Transfert de fichier"
-
-#, fuzzy
+msgstr "Erreur de transfert de fichier"
+
 msgid "Cannot create MultiMx room"
-msgstr "Impossible de créer l'alerte"
-
-#, fuzzy
+msgstr "Impossible de créer un salon MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "Erreur de désinscription"
-
-#, fuzzy
+msgstr "Erreur d'invitation MultiMx"
+
 msgid "Profile Error"
-msgstr "Erreur d'écriture"
+msgstr "Erreur de profil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Paquet de données non valide reçu du serveur MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Erreur de connexion MXit (étape de lecture 0x01)."
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Erreur de connexion MXit (étape de lecture 0x02)."
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Erreur de connexion MXit (étape de lecture 0x03)."
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Erreur de connexion MXit (étape de lecture 0x04)."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Erreur de connexion MXit (étape de lecture 0x05)."
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "En colère"
-
-msgid "Excited"
-msgstr "Excité"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Groupe"
-
-msgid "Happy"
-msgstr "Heureux"
-
-msgid "In Love"
-msgstr "Amoureux"
-
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Triste"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Hôte :"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Pseudonyme"
-
-msgid "Sleepy"
-msgstr "Somnolant"
-
-#, fuzzy
+msgstr "Erreur de connexion MXit (étape de lecture 0x06)."
+
 msgid "Pending"
-msgstr "Envoi en cours"
-
-#, fuzzy
+msgstr "En attente"
+
 msgid "Invited"
-msgstr "Inviter"
-
-#, fuzzy
+msgstr "Invité"
+
 msgid "Rejected"
-msgstr "Refuser"
-
-#, fuzzy
+msgstr "Refusé"
+
 msgid "Deleted"
-msgstr "Supprimer"
+msgstr "Supprimé"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Publicité MXit"
+
 msgid "More Information"
-msgstr "Informations professionnelles"
+msgstr "Plus d'informations"
 
 #, c-format
 msgid "No such user: %s"
@@ -6908,46 +6915,42 @@
 msgstr "Impossible sur AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Impossible de recevoir le message à cause du contrôle parental"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Impossible d'envoyer de SMS sans accepter les termes"
+
 msgid "Cannot send SMS"
-msgstr "Impossible d'envoyer le fichier"
+msgstr "Impossible d'envoyer le SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Impossible d'envoyer un dossier."
+msgstr "Impossible d'envoyer le SMS vers ce pays"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Impossible d'envoyer le SMS vers un pays inconnu"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Les comptes Bot ne peuvent pas commencer les conversations"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Le compte Bot ne peut pas envoyer de message à cette personne"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Le compte Bot a atteint sa limite de messages"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Le compte Bot a atteint sa limite de messages quotidiens"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Le compte Bot a atteint sa limite de messages mensuels"
+
 msgid "Unable to receive offline messages"
-msgstr "Impossible d'envoyer le message"
-
-#, fuzzy
+msgstr "Impossible de recevoir les messages déconnectés"
+
 msgid "Offline message store full"
-msgstr "Message déconnecté"
+msgstr "Stockage des messages déconnectés plein"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7118,7 +7121,6 @@
 msgstr "Le service est temporairement indisponible."
 
 #. 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 "
@@ -7136,13 +7138,12 @@
 "à jour sur %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 ""
-"Vous vous reconnectez trop rapidement. Attendez quelques minutes et "
+"Votre adresse IP se reconnecte trop rapidement. Attendez quelques minutes et "
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
@@ -7291,21 +7292,21 @@
 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Impossible d'envoyer le message (%s)"
+msgstr "Impossible d'envoyer le message : %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossible d'envoyer le message vers %s :"
-
-#, fuzzy, c-format
+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 :"
+msgstr "Impossible d'envoyer le message vers %s : %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7334,13 +7335,12 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
 "La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
-"limite. Veuillez attendre 10 secondes et réessayer."
+"limite. Veuillez attendre 10 secondes et réessayer.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10197,12 +10197,13 @@
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"Impossible d'envoyer le SMS. Impossible de trouver le fournisseur mobile."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Impossible d'envoyer le SNS. Fournisseur mobile inconnu."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Récupération du fournisseur mobile pour l'envoi du SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10746,6 +10747,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Conversation par messages instantanés. Supporte AIM, Google Talk, Jabber/"
+"XMPP, MSN, Yahoo et d'autres"
 
 msgid "Internet Messenger"
 msgstr "Messagerie internet"
@@ -12017,6 +12020,9 @@
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Malay"
+msgstr "Malaisien"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvégien bokmål"
 
@@ -12086,6 +12092,9 @@
 msgid "Turkish"
 msgstr "Turc"
 
+msgid "Ukranian"
+msgstr "Ukrainien"
+
 msgid "Urdu"
 msgstr "Ourdou"
 
@@ -12724,10 +12733,10 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DOS"
 
 msgid "use DIR for config files"
-msgstr "utilise le dossier DIR pour les fichiers de config"
+msgstr "utilise le dossier DOS pour les fichiers de config"
 
 msgid "print debugging messages to stdout"
 msgstr "affiche les messages de debug sur la sortie standard"
@@ -12745,16 +12754,17 @@
 msgstr "ne pas se connecter automatiquement"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "NOM"
+
 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 ""
-"active certains comptes (l'argument facultatif NAME\n"
-"                      spécifie ces comptes, séparés par des virgules."
+"active certains comptes (l'argument facultatif NOM\n"
+"                      spécifie ces comptes, séparés par des "
+"virgules.                      Sans cela, seul le premier compte sera "
+"activé.)"
 
 msgid "X display to use"
 msgstr "affichage X à utiliser"
@@ -13020,21 +13030,19 @@
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(défaut)"
+msgstr "(Personnalisé)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Le thème de sons par défaut Pidgin"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Éditeur de thème de liste de contacts Pidgin"
+msgstr "Le thème de liste de contacts par défaut Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Le thème d'icônes par défaut Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Le thème de frimousses n'a pas pu être déballé."
@@ -13045,19 +13053,30 @@
 msgid "Theme failed to copy."
 msgstr "Le thème de frimousses n'a pas pu être copié."
 
-msgid "Install Theme"
-msgstr "Installer un thème"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Choisissez un thème de frimousses que vous voulez utiliser dans la liste ci-"
-"dessous.  De nouveau thèmes peuvent être installés en les faisant glisser "
-"dans la liste des thèmes."
-
-msgid "Icon"
-msgstr "Icône"
+msgid "Theme Selections"
+msgstr "Choix des thèmes"
+
+#. 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 ""
+"Choisissez un thème que vous voulez utiliser dans la liste ci-dessous.\n"
+"De nouveau thèmes peuvent être installés en les faisant glisser dans la "
+"liste des thèmes."
+
+msgid "Buddy List Theme:"
+msgstr "Thème de liste de contacts :"
+
+msgid "Status Icon Theme:"
+msgstr "Thème d'icônes d'état :"
+
+msgid "Sound Theme:"
+msgstr "Thème de sons :"
+
+msgid "Smiley Theme:"
+msgstr "Thèmes de frimousses :"
 
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
@@ -13065,10 +13084,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Fermer les conversations avec la touche _Echap"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Thème de liste de contacts"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Icône de notification"
@@ -13155,9 +13170,6 @@
 msgid "Font"
 msgstr "Police"
 
-msgid "Use document font from _theme"
-msgstr "Utiliser la police de document du _thème"
-
 msgid "Use font from _theme"
 msgstr "Utiliser la police du thème"
 
@@ -13180,15 +13192,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "Impossible de lancer le programme de configuration du navigateur."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Désactiver"
+msgstr "Désactivé"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "_Détection auto de l'adresse IP : %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "Serveur ST_UN :"
 
@@ -13204,78 +13214,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activer la redirection automatique des ports du routeur"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Spécifier _manuellement la plage de ports à écouter"
-
-#, fuzzy
+msgstr "Spécifier _manuellement la plage de ports à écouter :"
+
 msgid "_Start:"
-msgstr "É_tat :"
-
-#, fuzzy
+msgstr "_Début :"
+
 msgid "_End:"
-msgstr "_Etendre"
+msgstr "_Fin :"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Serveur relai (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "Serveur ST_UN :"
-
-#, fuzzy
+msgstr "Serveur _TURN :"
+
 msgid "Use_rname:"
-msgstr "Utilisateur :"
-
-#, fuzzy
+msgstr "Utilisateu_r :"
+
 msgid "Pass_word:"
-msgstr "Mot de passe :"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Serveur proxy &amp; navigateur"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Le programme de configuration de proxy n'a pas été trouvé.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Le programme de configuration du navigateur n'a pas été trouvé.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Le choix du serveur proxy & navigateur\n"
-"est géré par les options de GNOME"
-
-msgid "Configure _Proxy"
-msgstr "_Configurer le proxy"
-
-msgid "Configure _Browser"
-msgstr "_Configurer le navigateur"
-
-msgid "Proxy Server"
-msgstr "Serveur 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 "Utiliser une DNS distantes avec SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Type :"
-
-msgid "No proxy"
-msgstr "Aucun"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port :"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Utilisateur :"
+msgstr "Mot de _passe :"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13316,6 +13275,15 @@
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Le choix du navigateur est géré par les options de GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Le programme de configuration du navigateur n'a pas été trouvé.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Configurer le navigateur"
+
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
@@ -13339,6 +13307,35 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
+msgid "Proxy Server"
+msgstr "Serveur proxy"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Le choix du serveur proxy est géré par les options de GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Le programme de configuration de proxy n'a pas été trouvé.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Configurer le proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Utiliser une _DNS distantes avec SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "_Typede proxy :"
+
+msgid "No proxy"
+msgstr "Aucun"
+
+msgid "P_ort:"
+msgstr "_Port :"
+
+msgid "User_name:"
+msgstr "Utilisateur :"
+
 msgid "Log _format:"
 msgstr "_Format des archives :"
 
@@ -13422,25 +13419,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Selon l'activité du clavier ou de la souris"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutes avant de passer inactif :"
+
+msgid "Change to this status when _idle:"
+msgstr "Changer vers cet état lorsque _inactif :"
+
 msgid "_Auto-reply:"
 msgstr "_Réponse automatique :"
 
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Absence automatique"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minutes avant de passer inactif :"
-
-msgid "Change status when _idle"
-msgstr "Changer d'état lorsque _inactif"
-
-msgid "Change _status to:"
-msgstr "_Changer l'état en :"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "État au démarrage"
@@ -13454,15 +13444,15 @@
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Thèmes des frimousses"
-
 msgid "Browser"
 msgstr "Navigateur"
 
 msgid "Status / Idle"
 msgstr "État / Inactivité"
 
+msgid "Themes"
+msgstr "Thèmes"
+
 msgid "Allow all users to contact me"
 msgstr "Permettre à tous les utilisateurs de me contacter"
 
@@ -13809,9 +13799,6 @@
 msgid "Pidgin smileys"
 msgstr "Frimousses de Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ce choix désactive les frimousses graphiques."
 
@@ -14462,6 +14449,9 @@
 msgid "Conversation Entry"
 msgstr "Ligne de conversation"
 
+msgid "Conversation History"
+msgstr "Historique des conversations"
+
 msgid "Request Dialog"
 msgstr "Boite de message pour requête"
 
@@ -14925,9 +14915,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Démarrer %s au lancement de Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "autoriser plusieurs instances du logiciel"
+msgstr "Autoriser plusieurs instances"
 
 msgid "_Dockable Buddy List"
 msgstr "Liste de contacts _accrochable"
@@ -14990,6 +14979,22 @@
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
 #, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(défaut)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Installer un thème"
+
+#~ msgid "Icon"
+#~ msgstr "Icône"
+
+#~ msgid "Auto-away"
+#~ msgstr "Absence automatique"
+
+#~ msgid "Change _status to:"
+#~ msgstr "_Changer l'état en :"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
 #~ "Le certificat racine dont est prétendu issu ce certificat est inconnu de "
@@ -15010,9 +15015,6 @@
 #~ msgid "GTK+ Runtime Version"
 #~ msgstr "Version des bibliothèques GTK+"
 
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Sans cela, seul le premier compte sera activé.)"
-
 #~ msgid "Calling ... "
 #~ msgstr "Appel... "
 
@@ -15507,9 +15509,6 @@
 #~ msgid "Burmese"
 #~ msgstr "Birman"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainien"
-
 #~ msgid "Xhosa"
 #~ msgstr "Xhosa"
 
--- a/po/he.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/he.po	Sat Jan 09 02:00:18 2010 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-30 09:44+0200\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-29 20:20+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -618,9 +618,8 @@
 msgid "Enable Sounds"
 msgstr "אפשר צלילים"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "לא ניתן להתחבר"
+msgstr "אינך מחובר/ת."
 
 msgid "<AUTO-REPLY> "
 msgstr "<מענה-אוטומטי> "
@@ -631,9 +630,8 @@
 msgstr[0] "רשימה של %d משתמש:\n"
 msgstr[1] "רשימה של %d משתמשים:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  version"
+msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  plungins version"
 
 msgid "No such command (in this context)."
 msgstr "אין פקודה כזו (בהקשר הזה)."
@@ -1497,10 +1495,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "URL מקוצר עבור הנ\"ל: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "יש להמתין בעת TinyURL מביא כתובת מקוצרת..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "רק ייצר TinyURL עבור כתובות באורך הזה ומעלה"
@@ -1520,6 +1518,7 @@
 msgid "Online"
 msgstr "מחובר"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "מנותק"
 
@@ -1627,7 +1626,7 @@
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "לא ניתן לבטוח בתעודה כיוון שאין תעודה מאושרת שיכולה לאמת אותה."
 
 msgid "The certificate is not valid yet."
 msgstr "התעודה עדיין אינה תקפה."
@@ -1855,9 +1854,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "שירות תרגום הכתובת סיים ללא תשובה לבקשתנו"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "שגיאה ב-resolving %s: %d"
+msgstr "שגיאה בהמרת %s אל punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2154,17 +2153,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "אירעה שגיאה שלא ניתן להתאושש ממנה ב-Farsight2."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "שגיאה בועידה."
-
-#, fuzzy
+msgstr "שגיאה בועידה"
+
 msgid "Error with your microphone"
-msgstr "שגיאה עם המיקרופון שלך."
-
-#, fuzzy
+msgstr "שגיאה עם המיקרופון שלך"
+
 msgid "Error with your webcam"
-msgstr "שגיאה עם המצלמה שלך."
+msgstr "שגיאה עם המצלמה שלך"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3092,10 +3088,12 @@
 msgid "Add to chat..."
 msgstr "הוסף לשיחה..."
 
+#. 0
 #. Global
 msgid "Available"
 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
@@ -3889,12 +3887,14 @@
 msgid "Log Out"
 msgstr "התנתק"
 
+#. 2
 msgid "Chatty"
 msgstr "פטפטן"
 
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
@@ -4154,6 +4154,7 @@
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
+#. 0
 msgid "None"
 msgstr "ללא"
 
@@ -4455,9 +4456,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  קבע הגדרות חדר צ'אט."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [חדר]:  עזוב את החדר."
+msgstr "part [הודעה]:  עזוב את החדר."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  הרשם בחדר צ'אט."
@@ -5105,13 +5105,13 @@
 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 מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים "
-"להיות כתובות אימייל תקפות."
+"להיות כתובות אימייל חוקיות."
 
 msgid "Unable to Add"
 msgstr "לא ניתן להוסיף"
@@ -5332,9 +5332,8 @@
 msgid "Unknown error (%d)"
 msgstr "שגיאה לא מוכרת (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "לא ניתן להוסיף משתמש"
+msgstr "לא ניתן להסיר משתמש"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "הודעת לנייד לא נשלחה מכיוון שהיא ארוכה מדי."
@@ -5563,28 +5562,82 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s הסיר/ה אותך מרשימת אנשי הקשר שלו או שלה."
 
+#. 1
+msgid "Angry"
+msgstr "כועס"
+
+#. 2
+msgid "Excited"
+msgstr "נלהב"
+
+#. 3
+msgid "Grumpy"
+msgstr "עצבני"
+
+#. 4
+msgid "Happy"
+msgstr "שמח"
+
+#. 5
+msgid "In Love"
+msgstr "מאוהב"
+
+#. 6
+msgid "Invincible"
+msgstr "בלתי מנוצח"
+
+#. 7
+msgid "Sad"
+msgstr "עצוב"
+
+#. 8
+msgid "Hot"
+msgstr "חם"
+
+#. 9
+msgid "Sick"
+msgstr "חולה"
+
+#. 10
+msgid "Sleepy"
+msgstr "ישנוני"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "מצב הרוח הנוכחי שלך"
+msgstr "מצב הרוח הנוכחי"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "מצב-רוח המשתמש"
-
-#, fuzzy
+msgstr "מצב-רוח חדש"
+
 msgid "Change your Mood"
-msgstr "שנה סיסמא"
-
-#, fuzzy
+msgstr "שנה את מצב הרוח שלך"
+
 msgid "How do you feel right now?"
-msgstr "אני לא כאן כרגע"
+msgstr "איך את/ה מרגיש/ה עכשיו?"
+
+msgid "The PIN you entered is invalid."
+msgstr "ה-PIN שהזנת אינו חוקי."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "ה-PIN שהזנת בעל אורך לא-חוקי [4-10[."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "ה-PIN אינו חוקי. על הקוד להכיל רק ספרות [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "שני ה-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
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "שגיאה בכתיבה"
+msgstr "שגיאה בעדכון פרופיל"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5592,352 +5645,294 @@
 msgstr "פרופיל"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "פרטי הפרופיל שלך עוד לא התקבלו. יש לנסות שנית מאוחר יותר."
 
 #. pin
-#, fuzzy
 msgid "PIN"
 msgstr "מספר זיהוי"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "וידוא מספר מזהה"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "שם משפחה"
+msgstr "שם תצוגה"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "הסתר את מספרי"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "מספר טלפון נייד"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "פרופיל משתמש"
+msgstr "עידכון הפרופיל שלך"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "כאן יש ביכולתך לעדכן את פרופיל ה-MXit שלך"
 
 msgid "View Splash"
-msgstr ""
+msgstr "הצג חלון-הקדמה"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "אין חלון-הקדמה זמין כרגע"
+
 msgid "About"
-msgstr "אודותי"
+msgstr "אודות"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "שנה סיסמא..."
+msgstr "שינוי מצב-רוח..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "שנה סיסמא..."
+msgstr "שנה פרופיל..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "הצג יומן-רישום..."
+msgstr "הצג חלון-הקדמה..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "אודותי"
+msgstr "אודות..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "ההודעה ארוכה מדי."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "הקובץ שברצונך לשלוח גדול מדי!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "לא ניתן להתחבר לשרת ה-MXit HTTP. יש לוודא את הגדרות השרת שלך."
+
 msgid "Logging In..."
-msgstr "מתחבר"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר."
-
-#, fuzzy
+msgstr "מתאמת..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "לא ניתן להתחבר לשרת ה-MXit. יש לוודא את הגדרות השרת שלך."
+
 msgid "Connecting..."
-msgstr "מתחבר"
+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 ""
+msgstr "שם משתמש MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "כינוי"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "רשום חשבון XMPP חדש"
-
-#, fuzzy
+msgstr "רשום חשבון MXit חדש"
+
 msgid "Please fill in the following fields:"
-msgstr "יש למלא את השדות הבאים"
+msgstr "יש למלא את השדות הבאים:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "שגיאה בגישה לאתר ה-WAP של MXit. יש לנסות שנית מאוחר יותר."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit אינו מסוגל לטפל בבקשה. יש לנסות בשנית מאוחר יותר."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "הוזן קוד אבטחה שגוי. יש לנסות בשנית מאוחר יותר."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "פג תוקפו של החיבור. יש לנסות בשנית מאוחר יותר."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "נבחרה ארץ לא-חוקית. יש לנסות שנית."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "שם המשתמש אינו רשום. חובה להירשם קודם."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "שם המשתמש כבר רשום. יש לבחור שם משתמש אחר."
+
 msgid "Internal error. Please try again later."
-msgstr "השרת לא זמין; יש לנסות מאוחר יותר"
+msgstr "שגיאה פנימית. יש לנסות מאוחר יותר."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "לא הזנת את קוד האבטחה"
+
 msgid "Security Code"
-msgstr "אבטחה מופעלת"
+msgstr "קוד אבטחה"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "הזן קוד"
-
-#, fuzzy
+msgstr "הזן קוד אבטחה"
+
 msgid "Your Country"
-msgstr "מדינה"
-
-#, fuzzy
+msgstr "מדינתך"
+
 msgid "Your Language"
-msgstr "שפה מועדפת"
+msgstr "שפתך"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "דרוש הרשאה"
+msgstr "אימות MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "אימות חשבון MXit"
+
 msgid "Retrieving User Information..."
-msgstr "מידע על השרת"
-
-#, fuzzy
+msgstr "שולף מידע משתמש..."
+
+msgid "Loading menu..."
+msgstr "טוען תפריט..."
+
 msgid "Status Message"
-msgstr "הודעות שנשלחו"
-
-#, fuzzy
+msgstr "הודעת מצב"
+
 msgid "Hidden Number"
-msgstr "שם אמצעי"
-
-#, fuzzy
+msgstr "מספר סמוי"
+
 msgid "Your Mobile Number..."
-msgstr "קבע/י מספר טלפון נייד..."
+msgstr "מספר הנייד שלך..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "שרת"
-
-#, fuzzy
+msgstr "שרת WAP"
+
 msgid "Connect via HTTP"
-msgstr "התחבר בעזרת TCP"
+msgstr "התחבר בעזרת HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "אפשר פתיחת חלון-הקדמה"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "החיבור אל MXit אבד. נא להתחבר בשנית."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "הודעת שגיאת XMPP"
-
-#, fuzzy
+msgstr "שגיאה בשליחת הודעה"
+
 msgid "Unable to process your request at this time"
-msgstr "לא ניתן לתרגם את שם השרת לכתובת"
+msgstr "לא ניתן לטפל בבקשתך ברגע זה"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "עבר הזמן שציפינו לחכות עד שנקבל תשובה משרת ה-XMit."
+
 msgid "Successfully Logged In..."
-msgstr "צורף בהצלחה אל Qun"
-
-#, fuzzy
+msgstr "החיבור הושלם בהצלחה..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"נשלחה אליך הודעה מוצפנת מאת %s, אבל הודעות אלו לא נתמכות ע\"י תוכנה זו."
+
 msgid "Message Error"
-msgstr "הודעת שגיאת XMPP"
+msgstr "שגיאת הודעה"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+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 "שגיעת התחברות"
-
-#, fuzzy
+msgstr "שגיאת חיבור"
+
 msgid "Message Sending Error"
-msgstr "הודעת שגיאת XMPP"
-
-#, fuzzy
+msgstr "שגיאה בשליחת הודעה"
+
 msgid "Status Error"
-msgstr "שגיאה בזרם"
-
-#, fuzzy
+msgstr "שגיאת מצב"
+
 msgid "Mood Error"
-msgstr "שגיאת תמונה"
-
-#, fuzzy
+msgstr "שגיאת מצב-רוח"
+
 msgid "Invitation Error"
-msgstr "שגיאת הסרת-רישום"
-
-#, fuzzy
+msgstr "שגיאת הזמנה"
+
 msgid "Contact Removal Error"
-msgstr "שגיעת התחברות"
-
-#, fuzzy
+msgstr "שגיאת הסרת איש-קשר"
+
 msgid "Subscription Error"
-msgstr "מנוי"
-
-#, fuzzy
+msgstr "שגיאת מנוי"
+
 msgid "Contact Update Error"
-msgstr "שגיעת התחברות"
-
-#, fuzzy
+msgstr "שגיאה בעדכון איש-קשר"
+
 msgid "File Transfer Error"
-msgstr "משלוח קבצים"
-
-#, fuzzy
+msgstr "שגיאת משלוח קובצים"
+
 msgid "Cannot create MultiMx room"
-msgstr "לא יכול ליצור תגובת-פעולה"
-
-#, fuzzy
+msgstr "לא יכול ליצור חדר MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "שגיאת הסרת-רישום"
-
-#, fuzzy
+msgstr "שגיאת הזמנת MultiMx"
+
 msgid "Profile Error"
-msgstr "שגיאה בכתיבה"
+msgstr "שגיאה בפרופיל"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "התקבלה חבילה לא-חוקית מאת MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "כועס"
-
-msgid "Excited"
-msgstr "נלהב"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "קבוצה"
-
-msgid "Happy"
-msgstr "שמח"
-
-msgid "In Love"
-msgstr "מאוהב"
-
-msgid "Invincible"
-msgstr "בלתי מנוצח"
-
-msgid "Sad"
-msgstr "עצוב"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_שרת:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "כינוי"
-
-msgid "Sleepy"
-msgstr "ישנוני"
-
-#, fuzzy
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x06)"
+
 msgid "Pending"
-msgstr "שליחה"
-
-#, fuzzy
+msgstr "ממתין"
+
 msgid "Invited"
-msgstr "הזמן"
-
-#, fuzzy
+msgstr "הוזמן"
+
 msgid "Rejected"
-msgstr "דחה"
-
-#, fuzzy
+msgstr "נדחה"
+
 msgid "Deleted"
-msgstr "מחק"
+msgstr "מחוק"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "פירסום MXit"
+
 msgid "More Information"
-msgstr "פרטי עבודה"
+msgstr "מידע נוסף"
 
 #, c-format
 msgid "No such user: %s"
@@ -6699,46 +6694,42 @@
 msgstr "לא בזמן שהות ב-AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "לא ניתן לקבל הודעות עקב הגבלות הורים"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "לא ניתן לשלוח SMS ללא קבלת התנאים"
+
 msgid "Cannot send SMS"
-msgstr "לא ניתן לשלוח את הקובץ"
+msgstr "לא מסוגל לשלוח SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "לא יכול לשלוח ספרייה"
+msgstr "לא מסוגל לשלוח SMS לארץ זו"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "לא ניתן לשלוח SMS למדינה לא מוכרת"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "חשבון רובוטי לא יכולים ליזום שיחות"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "חשבון רובוטי לא יכולים לשלוח הודעה למשתמש זה"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "החשבון רובוטי עבר את מכסת ההודעות"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "החשבון רובוטי עבר את מכסת ההודעות היומית"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "החשבון רובוטי עבר את מכסת ההודעות החודשית"
+
 msgid "Unable to receive offline messages"
-msgstr "לא ניתן לשלוח הודעה"
-
-#, fuzzy
+msgstr "לא ניתן לקבל הודעות לא-מקוונות"
+
 msgid "Offline message store full"
-msgstr "הודעות לא-מקוונות"
+msgstr "איזור אחסון ההודעות הלא-מקוונות הינו מלא"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6905,14 +6896,13 @@
 msgstr "שירות ההודעות של AOL לא זמין כרגע."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
-"תיאלץ להמתין אפילו יותר."
+"שם המשתמש שלך מבצע התחברות והתנתקות בתדירות גבוהה מדיי. יש להמתין עשר דקות "
+"ולנסות שנית. נסיונות חוזרים ונשנים יגררו זמן המתנה ארוך עוד יותר."
 
 #. client too old
 #, c-format
@@ -6920,14 +6910,13 @@
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י "
-"לנסות, תיאלצ/י להמתין אפילו יותר."
+"כתובת ה-IP שלך מבצע התחברות והתנתקות בתדירות גבוהה מדיי. יש להמתין עשר דקות "
+"ולנסות שנית. נסיונות חוזרים ונשנים יגררו זמן המתנה ארוך עוד יותר."
 
 msgid "The SecurID key entered is invalid"
 msgstr "המפתח SecurID שהוזן אינו תקף."
@@ -7060,21 +7049,21 @@
 msgstr[0] "פספסת %hu הודעה מאת %s מסיבה לא ידועה."
 msgstr[1] "פספסת %hu הודעות מאת %s מסיבה לא ידועה."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "לא ניתן לשלוח הודעה (%s)."
+msgstr "לא ניתן לשלוח הודעה %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "לא ניתן לשלוח הודעה: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "לא ניתן לשלוח הודעה ל %s:"
-
-#, fuzzy, c-format
+msgstr "לא ניתן לשלוח הודעה אל %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "לא ניתן לשלוח הודעה ל %s:"
+msgstr "לא ניתן לשלוח הודעה אל %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7101,13 +7090,12 @@
 "characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
-"יש לחכות 10 שניות ולנסות שנית."
+"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת מעל הגבלת המהירות. יש "
+"לחכות 10 שניות ולנסות שנית.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -9889,13 +9877,13 @@
 msgstr "פתח את תיבת הדואר שלי"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "לא ניתן לשלוח SMS. לא מצליח להגיע לספק השירות הנייד."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "לא ניתן לשלוח SMS. ספק שירות נייד לא מוכר."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "מבקש מספק השירות הנייד לשלוח את ה-SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10420,6 +10408,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"צ'אט בעזרת הודעות-מיידיות.  תומך AIM, Google Talk, Jabber/XMPP, MSN, Yahoo "
+"ועוד"
 
 msgid "Internet Messenger"
 msgstr "למסרים באינטרנט"
@@ -11673,6 +11663,9 @@
 msgid "Mongolian"
 msgstr "מונגולית"
 
+msgid "Malay"
+msgstr "מאלאית"
+
 msgid "Bokmål Norwegian"
 msgstr "נורבגית ספרותית"
 
@@ -11742,6 +11735,9 @@
 msgid "Turkish"
 msgstr "תורכית"
 
+msgid "Ukranian"
+msgstr "אוקראינית"
+
 msgid "Urdu"
 msgstr "אורדו"
 
@@ -12355,7 +12351,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ספריה"
 
 msgid "use DIR for config files"
 msgstr "השתמש בספרייה DIR לקבצי הגדרות"
@@ -12376,16 +12372,16 @@
 msgstr "אל תתחבר אוטומטית"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "שם"
+
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
 "אפשר חשבונות (פרמטר של שם החשבון\n"
-"                      מגדיר איזה חשבונות להשתמש בהם, מופרדים על ידי פסיקים."
+"                      מגדיר איזה חשבונות להשתמש בהם, מופרדים על ידי פסיקים.\n"
+"                      בלא זאת, רק החשבון הראשון יהיה פעיל)."
 
 msgid "X display to use"
 msgstr "תצוגת X להשתמש בה"
@@ -12645,21 +12641,19 @@
 msgstr "לא מוכר. אנא דווח על כך!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "ברירת המחדל))"
+msgstr "(מותאם אישית)"
+
+msgid "Penguin Pimps"
+msgstr "פרפראות פנגווינים"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "ערכת הצלילים המובנית של פידג'ין"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "עורך המוטיבים של רשימת החברים בפידג'ין"
+msgstr "ערכת המוטיבים המובנית עבור רשימת החברים בפידג'ין"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "ערכת הצלמיות המובנית של פידג'ין"
 
 msgid "Theme failed to unpack."
 msgstr "כישלון בעת פתיחת ערכת מוטיב."
@@ -12670,18 +12664,29 @@
 msgid "Theme failed to copy."
 msgstr "כישלון בעת העתקת ערכת מוטיב."
 
-msgid "Install Theme"
-msgstr "התקן עיצוב"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
-"הערכות."
-
-msgid "Icon"
-msgstr "סמל"
+msgid "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 "קיצורי-מקלדת"
@@ -12689,10 +12694,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_סגור חלונות שיחה עם כפתור האסקייפ"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "מוטיבי תצוגה עבור רשימת החברים"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "סמל מגש המערכת"
@@ -12779,9 +12780,6 @@
 msgid "Font"
 msgstr "גופן"
 
-msgid "Use document font from _theme"
-msgstr "התשמש בגופן המסמך מהמוטיב"
-
 msgid "Use font from _theme"
 msgstr "השתמש בגופן מהמוטיב"
 
@@ -12804,15 +12802,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "לא יכול להפעיל את תוכנת הגדרות הדפדפן."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_בטל"
+msgstr "כבוי"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "התשמש ב_כתובת ה-IP שזוההתה אוטומטית: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "שרת STUN:"
 
@@ -12828,79 +12824,28 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_אפשר ניתוב שקעים אוטומטית בנתב"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "ה_גדר ידנית את אוסף היציאות להקשיב להם"
-
-#, fuzzy
+msgstr "ה_גדר ידנית את אוסף היציאות להקשיב להם:"
+
 msgid "_Start:"
-msgstr "_מצב:"
-
-#, fuzzy
+msgstr "_התחל:"
+
 msgid "_End:"
-msgstr "ה_רחב"
+msgstr "_סיים:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "שרת העברה (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "שרת STUN:"
-
-#, fuzzy
+msgstr "שרת TURN:"
+
 msgid "Use_rname:"
 msgstr "שם משתמש:"
 
-#, fuzzy
 msgid "Pass_word:"
 msgstr "סיסמא:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "שרת תיווך ודפדפן"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>תוכנת הגדרות שרת התיווך לא נמצאה.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>תוכנת הגדרות הדפדפן לא נמצאה.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"העדפות שרת-תיווך ודפדפן מוגדרות\n"
-"בהעדפות של GNOME"
-
-msgid "Configure _Proxy"
-msgstr "הגדרת שרת תיווך"
-
-msgid "Configure _Browser"
-msgstr "הגדרת דפדפן"
-
-msgid "Proxy Server"
-msgstr "הגדרות המתווך"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "השתמש בשירות DNS מרוחק עם שרתי-תיווך SOCKS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "סוג ה_פרוקסי"
-
-msgid "No proxy"
-msgstr "ללא מתווך"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_יציאה:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "שם משתמש:"
-
 msgid "Seamonkey"
 msgstr "סי-מונקי"
 
@@ -12940,6 +12885,15 @@
 msgid "Browser Selection"
 msgstr "בחירת הדפדפן"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "העדפות דפדפן מוגדרות בהעדפות של GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>תוכנת הגדרות הדפדפן לא נמצאה.</b>"
+
+msgid "Configure _Browser"
+msgstr "הגדרת דפדפן"
+
 msgid "_Browser:"
 msgstr "_דפדפן:"
 
@@ -12963,6 +12917,35 @@
 "_ידנית:\n"
 "(%s עבור URL)"
 
+msgid "Proxy Server"
+msgstr "הגדרות המתווך"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "העדפות שרת-תיווך מוגדרות בהעדפות של GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>תוכנת הגדרות שרת התיווך לא נמצאה.</b>"
+
+msgid "Configure _Proxy"
+msgstr "הגדרת שרת תיווך"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "השתמש בשירות DNS מרוחק עם שרתי-תיווך SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "סוג ה_פרוקסי:"
+
+msgid "No proxy"
+msgstr "ללא מתווך"
+
+msgid "P_ort:"
+msgstr "_יציאה:"
+
+msgid "User_name:"
+msgstr "שם משתמש:"
+
 msgid "Log _format:"
 msgstr "מבנה ה_רישום:"
 
@@ -13046,25 +13029,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "על-פי פעילות עכבר או מקלדת"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_דקות לפני קביעת ריחוק:"
+
+msgid "Change to this status when _idle:"
+msgstr "קבע מצב זה בעת חוסר פעילות:"
+
 msgid "_Auto-reply:"
 msgstr "מענה אוטומ_טי:"
 
 msgid "When both away and idle"
 msgstr "כאשר מרוחק וגם חסר פעילות"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "ריחוק אוטומטי"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_דקות לפני קביעת ריחוק:"
-
-msgid "Change status when _idle"
-msgstr "קבע ריחוק בעת חוסר פעילות"
-
-msgid "Change _status to:"
-msgstr "שנה ריחוק ל:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "סטטוס בעת איתחול"
@@ -13078,15 +13054,15 @@
 msgid "Interface"
 msgstr "ממשק המשתמש"
 
-msgid "Smiley Themes"
-msgstr "ערכות החיוכים"
-
 msgid "Browser"
 msgstr "דפדפן"
 
 msgid "Status / Idle"
 msgstr "מצב / חוסר פעילות"
 
+msgid "Themes"
+msgstr "מוטיבים"
+
 msgid "Allow all users to contact me"
 msgstr "אפשר לכל משתמש ליצור איתי קשר"
 
@@ -13421,9 +13397,6 @@
 msgid "Pidgin smileys"
 msgstr "חייכני פידג'ין"
 
-msgid "Penguin Pimps"
-msgstr "פרפראות פנגווינים"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "בבחירת זה מבוטלים סמלי-הרגשות הגרפיים."
 
@@ -14047,6 +14020,9 @@
 msgid "Conversation Entry"
 msgstr "הזנת שיחות"
 
+msgid "Conversation History"
+msgstr "היסטוריית שיחות"
+
 msgid "Request Dialog"
 msgstr "חלון בקשה"
 
@@ -14503,7 +14479,6 @@
 msgid "_Start %s on Windows startup"
 msgstr "הפעל את %s בעת הפעלת חלונות"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "אפשר להפעיל יותר מעותק יחיד"
 
@@ -14568,6 +14543,28 @@
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
 #, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "ברירת המחדל))"
+
+#~ msgid "Install Theme"
+#~ msgstr "התקן עיצוב"
+
+#~ msgid "Icon"
+#~ msgstr "סמל"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "התשמש בגופן המסמך מהמוטיב"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "שרת תיווך ודפדפן"
+
+#~ msgid "Auto-away"
+#~ msgstr "ריחוק אוטומטי"
+
+#~ msgid "Change _status to:"
+#~ msgstr "שנה ריחוק ל:"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
 
--- a/po/hu.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/hu.po	Sat Jan 09 02:00:18 2010 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-29 00:59+0200\n"
+"POT-Creation-Date: 2009-11-26 13:07+0100\n"
+"PO-Revision-Date: 2009-11-26 13:06+0100\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"
@@ -633,9 +633,8 @@
 msgid "Enable Sounds"
 msgstr "Hangok engedélyezése"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Lezárta a kapcsolatot."
+msgstr "Nincs csatlakozva."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
@@ -646,9 +645,8 @@
 msgstr[0] "%d felhasználó listája:\n"
 msgstr[1] "%d felhasználó listája:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "A támogatott hibakeresési parancsok:  version"
+msgstr "A támogatott hibakeresési parancsok: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Nincs ilyen parancs (ebben a kontextusban)."
@@ -800,7 +798,7 @@
 
 #, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KiB/mp"
+msgstr "%.2f KiB/s"
 
 msgid "Sent"
 msgstr "Elküldött"
@@ -1530,10 +1528,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL a fentihez: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Kis türelmet, a TinyURL rövidebb URL címet készít…"
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "TinyURL készítése csak a legalább ilyen hosszú URL-címekhez"
@@ -1663,6 +1661,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 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."
@@ -1894,9 +1894,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "A feloldó folyamat a kérés megválaszolása nélkül lépett ki"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Hiba %s feloldásakor: %d"
+msgstr "Hiba %s átalakításakor punycode-ra: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2215,17 +2215,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Helyrehozhatatlan Farsight2 hiba történt."
 
-#, fuzzy
 msgid "Conference error"
 msgstr "Konferenciahiba"
 
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Hiba történt a mikrofonnal."
-
-#, fuzzy
+msgstr "Hiba történt a mikrofonnal"
+
 msgid "Error with your webcam"
-msgstr "Hiba történt a webkamerával."
+msgstr "Hiba történt a webkamerával"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3993,6 +3990,10 @@
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "Beszédes"
 
@@ -4261,6 +4262,7 @@
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
+#. 0
 msgid "None"
 msgstr "Nincs"
 
@@ -4571,9 +4573,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Csevegőszoba beállítása."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [szoba]:  A szoba elhagyása."
+msgstr "part [üzenet]:  A szoba elhagyása."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Regisztráció csevegőszobánál."
@@ -5242,7 +5243,7 @@
 "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL "
 "könyvtárat."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5472,9 +5473,8 @@
 msgid "Unknown error (%d)"
 msgstr "Ismeretlen hiba (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nem vehető fel a felhasználó"
+msgstr "Nem törölhető a felhasználó"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "A mobilüzenet nem küldhető el, mert túl hosszú."
@@ -5712,28 +5712,82 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s eltávolította Önt a partnerlistájáról."
 
+#. 1
+msgid "Angry"
+msgstr "Dühös"
+
+#. 2
+msgid "Excited"
+msgstr "Érdeklődő"
+
+#. 3
+msgid "Grumpy"
+msgstr "Rosszkedvű"
+
+#. 4
+msgid "Happy"
+msgstr "Boldog"
+
+#. 5
+msgid "In Love"
+msgstr "Szerelmes"
+
+#. 6
+msgid "Invincible"
+msgstr "Legyőzhetetlen"
+
+#. 7
+msgid "Sad"
+msgstr "Szomorú"
+
+#. 8
+msgid "Hot"
+msgstr "Forró"
+
+#. 9
+msgid "Sick"
+msgstr "Beteg"
+
+#. 10
+msgid "Sleepy"
+msgstr "Álmos"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Az Ön jelenlegi hangulata"
+msgstr "Jelenlegi hangulat"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Hangulat"
-
-#, fuzzy
+msgstr "Új hangulat"
+
 msgid "Change your Mood"
-msgstr "Jelszó módosítása"
-
-#, fuzzy
+msgstr "Hangulat módosítása"
+
 msgid "How do you feel right now?"
-msgstr "Nem vagyok itt"
+msgstr "Hogy érzi magát?"
+
+msgid "The PIN you entered is invalid."
+msgstr "A megadott PIN érvénytelen."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "A megadott PIN hossza érvénytelen [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "A megadott születésnap érvénytelen. A helyes formátum: „ÉÉÉÉ-HH-NN”."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Írási hiba"
+msgstr "Profilfrissítési hiba"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5741,354 +5795,298 @@
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "A profilinformációi még nincsenek lekérve. Próbálja újra később."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PIN ellenőrzése"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Vezetéknév"
+msgstr "Megjelenő név"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Rejtsd el a számom"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Mobiltelefonszám"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Yahoo! profil"
+msgstr "Profil frissítése"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Itt frissítheti MXit profilját"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Indítókép megjelenítése"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Nem érhető el indítókép"
+
 msgid "About"
-msgstr "A névjegyem"
+msgstr "Névjegy"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Jelszó módosítása…"
+msgstr "Hangulat módosítása…"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Jelszó módosítása…"
+msgstr "Profil módosítása…"
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Napló megtekintése…"
+msgstr "Indítókép megtekintése…"
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "A névjegyem"
+msgstr "Névjegy…"
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Az üzenet túl nagy."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "A küldeni kívánt fájl túl nagy."
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Nem lehet kapcsolódni a Mxit HTTP kiszolgálóhoz. Ellenőrizze a kiszolgáló "
+"beállításait."
+
 msgid "Logging In..."
-msgstr "Bejelentkezés"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Nem lehet kapcsolódni a kiszolgálóhoz. Adja meg a kiszolgáló címét, amelyhez "
-"kapcsolódni szeretne."
-
-#, fuzzy
+msgstr "Bejelentkezés…"
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Nem lehet kapcsolódni a MXit kiszolgálóhoz. Ellenőrizze a kiszolgáló "
+"beállításait."
+
 msgid "Connecting..."
-msgstr "Kapcsolódás"
+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 ""
+msgstr "MXit bejelentkezési név"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Becenév"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Új XMPP fiók regisztrálása"
-
-#, fuzzy
+msgstr "Új MXit fiók regisztrálása"
+
 msgid "Please fill in the following fields:"
-msgstr "Töltse ki az alábbi mezőket"
+msgstr "Töltse ki az alábbi mezőket:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Hiba a MXit WAP oldalhoz kapcsolódáskor. Próbálja újra később."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "A MXit jelenleg nem képes feldolgozni a kérést. Próbálja újra később."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "A megadott biztonsági kód hibás. Próbálja újra később."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "A munkamenet lejárt. Próbálja újra később."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Érvénytelen országot választott. Próbálja újra később."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "A felhasználónév nincs regisztrálva. Először regisztráljon."
 
 msgid "Username is already registered. Please choose another username."
 msgstr ""
-
-#, fuzzy
+"A felhasználónév már használatban van. Válasszon másik felhasználónevet."
+
 msgid "Internal error. Please try again later."
-msgstr "A kiszolgáló nem érhető el, próbálkozzon később"
+msgstr "Belső hiba. Próbálja újra később."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Nem adta meg a biztonsági kódot."
+
 msgid "Security Code"
-msgstr "Biztonság engedélyezve"
+msgstr "Biztonsági kód"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Adja meg a kódot"
-
-#, fuzzy
+msgstr "Adja meg a biztonsági kódot"
+
 msgid "Your Country"
 msgstr "Ország"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Előnyben részesített nyelv"
+msgstr "Nyelv"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Engedélyezés kérése"
+msgstr "MXit engedélyezés"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Mxit fiókellenőrzés"
+
 msgid "Retrieving User Information..."
-msgstr "Kiszolgálóinformációk"
-
-#, fuzzy
+msgstr "Felhasználóinformációk lekérése…"
+
+msgid "Loading menu..."
+msgstr "Menü betöltése…"
+
 msgid "Status Message"
-msgstr "Elküldött üzenetek"
-
-#, fuzzy
+msgstr "Állapotüzenet"
+
 msgid "Hidden Number"
-msgstr "Középső név"
-
-#, fuzzy
+msgstr "Rejtett szám"
+
 msgid "Your Mobile Number..."
-msgstr "Mobiltelefonszám beállítása…"
+msgstr "Az Ön mobiltelefonszáma…"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Kiszolgáló"
-
-#, fuzzy
+msgstr "WAP kiszolgáló"
+
 msgid "Connect via HTTP"
-msgstr "Kapcsolódás TCP segítségével"
+msgstr "Kapcsolódás HTTP segítségével"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Felugró indítókép engedélyezése"
 
 #. 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 "A kapcsolat elveszett a MXithez. Csatlakozzon újra."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP üzenethiba"
-
-#, fuzzy
+msgstr "Üzenetküldési hiba"
+
 msgid "Unable to process your request at this time"
-msgstr "Nem oldható fel a gépnév"
+msgstr "Nem dolgozható fel a kérés"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Időtúllépés a MXit kiszolgáló válaszára várakozás közben."
+
 msgid "Successfully Logged In..."
-msgstr "Sikeresen csatlakozott a Qun-hoz"
-
-#, fuzzy
+msgstr "Sikeres bejelentkezés…"
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s titkosított üzenetet küldött, de ez még nem támogatott."
+
 msgid "Message Error"
-msgstr "XMPP üzenethiba"
+msgstr "Üzenethiba"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Nem végezhető átirányítás a megadott protokoll használatával"
+
+msgid "An internal MXit server error occurred."
+msgstr "Belső MXit kiszolgálóhiba történt."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Bejelentkezési hiba: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Kijelentkezési hiba: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Kapcsolódási hiba"
-
-#, fuzzy
+msgstr "Partnerhiba"
+
 msgid "Message Sending Error"
-msgstr "XMPP üzenethiba"
-
-#, fuzzy
+msgstr "Üzenetküldési hiba"
+
 msgid "Status Error"
-msgstr "Folyamhiba"
-
-#, fuzzy
+msgstr "Állapothiba"
+
 msgid "Mood Error"
-msgstr "Ikonhiba"
-
-#, fuzzy
+msgstr "Hangulathiba"
+
 msgid "Invitation Error"
-msgstr "Regisztrációtörlési hiba"
-
-#, fuzzy
+msgstr "Meghívási hiba"
+
 msgid "Contact Removal Error"
-msgstr "Kapcsolódási hiba"
-
-#, fuzzy
+msgstr "Partnereltávolítási hiba"
+
 msgid "Subscription Error"
-msgstr "Feliratkozás"
-
-#, fuzzy
+msgstr "Feliratkozási hiba"
+
 msgid "Contact Update Error"
-msgstr "Kapcsolódási hiba"
-
-#, fuzzy
+msgstr "Partnerfrissítési hiba"
+
 msgid "File Transfer Error"
-msgstr "Fájlátvitel"
-
-#, fuzzy
+msgstr "Fájlátviteli hiba"
+
 msgid "Cannot create MultiMx room"
-msgstr "Nem hozható létre figyelmeztetés"
-
-#, fuzzy
+msgstr "Nem hozható létre MultiMx szoba"
+
 msgid "MultiMx Invitation Error"
-msgstr "Regisztrációtörlési hiba"
-
-#, fuzzy
+msgstr "MultiMx meghívási hiba"
+
 msgid "Profile Error"
-msgstr "Írási hiba"
+msgstr "Profilhiba"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Érvénytelen csomag érkezett a MXit-től."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Dühös"
-
-msgid "Excited"
-msgstr "Érdeklődő"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Csoport"
-
-msgid "Happy"
-msgstr "Boldog"
-
-msgid "In Love"
-msgstr "Szerelmes"
-
-msgid "Invincible"
-msgstr "Legyőzhetetlen"
-
-msgid "Sad"
-msgstr "Szomorú"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Gépnév:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Becenév"
-
-msgid "Sleepy"
-msgstr "Álmos"
-
-#, fuzzy
+msgstr "Kapcsolathiba történt a MXit-tel. (olvasási állapot: 0x06)"
+
 msgid "Pending"
-msgstr "Küldés"
-
-#, fuzzy
+msgstr "Függőben"
+
 msgid "Invited"
-msgstr "Meghívás"
-
-#, fuzzy
+msgstr "Meghívva"
+
 msgid "Rejected"
-msgstr "Visszautasítás"
-
-#, fuzzy
+msgstr "Visszautasítva"
+
 msgid "Deleted"
-msgstr "Törlés"
+msgstr "Törölve"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit hirdetés"
+
 msgid "More Information"
-msgstr "Munkahelyi adatok"
+msgstr "További információk"
 
 #, c-format
 msgid "No such user: %s"
@@ -6866,46 +6864,42 @@
 msgstr "Nem, amíg az AOL-on tartózkodik"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Nem fogadható üzenet a szülői felügyelet miatt"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Nem küldhető SMS a feltételek elfogadása nélkül"
+
 msgid "Cannot send SMS"
-msgstr "A fájl nem küldhető el"
+msgstr "Nem küldhető SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Könyvtár nem küldhető."
+msgstr "Nem küldhető SMS ebbe az országba"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Nem küldhető SMS ismeretlen országba"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Botfiókok nem kezdeményezhetnek azonnali üzenetküldést"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Botfiókok nem küldhetnek azonnali üzenetet a felhasználónak"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "A botfiók elérte az azonnali üzenetek korlátját"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "A botfiók elérte a napi azonnali üzenetek korlátját"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "A botfiók elérte a havi azonnali üzenetek korlátját"
+
 msgid "Unable to receive offline messages"
-msgstr "Az üzenetet nem lehet elküldeni."
-
-#, fuzzy
+msgstr "Nem lehet offline üzeneteket fogadni"
+
 msgid "Offline message store full"
-msgstr "Offline üzenet"
+msgstr "Az offline üzenetek tárolója megtelt"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7076,14 +7070,13 @@
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
 #. 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 ""
-"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
-"tovább folytatja, még többet kell majd várnia."
+"A felhasználóneve túl gyakran jelentkezik ki/be. Várjon tíz percet és "
+"próbálja meg újra. Ha tovább próbálkozik, még többet kell majd várnia."
 
 #. client too old
 #, c-format
@@ -7093,14 +7086,13 @@
 "következő helyről: %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 ""
-"Ön túl gyakran jelentkezik ki/be. Várjon egy percet és próbálja meg újra. Ha "
-"tovább folytatja, még többet kell majd várnia."
+"Az IP-címe túl gyakran jelentkezik ki/be. Várjon egy percet és próbálja meg "
+"újra. Ha tovább próbálkozik, még többet kell majd várnia."
 
 msgid "The SecurID key entered is invalid"
 msgstr "A megadott SecurID kulcs érvénytelen"
@@ -7254,21 +7246,21 @@
 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni (%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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s:"
-
-#, fuzzy, c-format
+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:"
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7297,13 +7289,12 @@
 "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
 "érvénytelen karaktereket tartalmazott.]"
 
-#, 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 ""
-"Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
-"Kérem várjon 10 másodpercet és próbálja meg újra."
+"Az utolsó művelet nem hajtható végre, mert túllépte a sebességkorlátot. "
+"Kérem várjon 10 másodpercet és próbálja meg újra.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10169,13 +10160,13 @@
 msgstr "Bejövő levelek megnyitása"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Nem küldhető SMS. Nem található mobilszolgáltató."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Nem küldhető SMS. Ismeretlen mobilszolgáltató."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Mobilszolgáltató keresése az SMS elküldéséhez."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10717,6 +10708,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Azonnali üzenetküldés AIM, Google Talk, Jabber/XMPP, MSN, Yahoo és más "
+"protokollok támogatásával"
 
 msgid "Internet Messenger"
 msgstr "Azonnali üzenetküldés"
@@ -11986,6 +11979,9 @@
 msgid "Mongolian"
 msgstr "Mongol"
 
+msgid "Malay"
+msgstr "Maláj"
+
 msgid "Bokmål Norwegian"
 msgstr "Norvég Bokmål"
 
@@ -12055,6 +12051,9 @@
 msgid "Turkish"
 msgstr "török"
 
+msgid "Ukranian"
+msgstr "Ukrán"
+
 msgid "Urdu"
 msgstr "urdu"
 
@@ -12688,7 +12687,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "KÖNYVTÁR"
 
 msgid "use DIR for config files"
 msgstr "a KÖNYVTÁR használata a beállítófájlokhoz"
@@ -12709,16 +12708,16 @@
 msgstr "ne jelentkezzen be automatikusan"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "NÉV"
+
 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 ""
-"automatikus bejelentkezés (a NÉV paraméter megadja a\n"
-"                      használandó fiókok vesszőkkel tagolt listáját."
+"adott fiókok engedélyezése (a NÉV paraméter megadja a\n"
+"                      használandó fiókok vesszőkkel tagolt listáját.\n"
+"                      Enélkül csak az első fiók lesz engedélyezve."
 
 msgid "X display to use"
 msgstr "Használandó X-megjelenítő"
@@ -12981,21 +12980,19 @@
 msgstr "Ismeretlen… Kérjük jelentse ezt!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(alapértelmezett)"
+msgstr "(Egyéni)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Az alapértelmezett Pidgin hangtéma"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin partnerlistatéma-szerkesztő"
+msgstr "Az alapértelmezett Pidgin partnerlistatéma"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Az alapértelmezett Pidgin állapotikon-téma"
 
 msgid "Theme failed to unpack."
 msgstr "A téma kicsomagolása meghiúsult."
@@ -13006,18 +13003,29 @@
 msgid "Theme failed to copy."
 msgstr "A téma másolása meghiúsult."
 
-msgid "Install Theme"
-msgstr "Téma telepítése"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
-"témák a témalistába dobással telepíthetők."
-
-msgid "Icon"
-msgstr "Ikon"
+msgid "Theme Selections"
+msgstr "Témaválasztás"
+
+#. 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 ""
+"Válassza ki a használni kívánt témát az alábbi listákból.\n"
+"Új témák a témalistába húzva telepíthetők."
+
+msgid "Buddy List Theme:"
+msgstr "Partnerlistatéma:"
+
+msgid "Status Icon Theme:"
+msgstr "Állapotikon-téma:"
+
+msgid "Sound Theme:"
+msgstr "Hangtéma:"
+
+msgid "Smiley Theme:"
+msgstr "Hangulatjel-téma:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
@@ -13025,10 +13033,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Társalgások bezárása az _Escape billentyűvel"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Partnerlista-téma"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Rendszertálca-ikon"
@@ -13115,9 +13119,6 @@
 msgid "Font"
 msgstr "Betűkészlet"
 
-msgid "Use document font from _theme"
-msgstr "A _téma dokumentum-betűkészletének használata"
-
 msgid "Use font from _theme"
 msgstr "A téma _betűkészletének használata"
 
@@ -13140,17 +13141,15 @@
 msgid "Cannot start browser configuration program."
 msgstr "Nem indítható a böngészőkonfigurációs program."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Tiltás"
+msgstr "Tiltva"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Automatikusan felismert _IP cím használata: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Kiszolgáló:"
+msgstr "ST_UN kiszolgáló:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Például: stunserver.org</span>"
@@ -13164,78 +13163,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "A_utomatikus útválasztóport-átirányítás"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "A figyelendő porttartomány _kézi megadása"
-
-#, fuzzy
+msgstr "A figyelendő porttartomány _kézi megadása:"
+
 msgid "_Start:"
-msgstr "Áll_apot:"
-
-#, fuzzy
+msgstr "Ke_zdete:"
+
 msgid "_End:"
-msgstr "_Kibontás"
+msgstr "_Vége:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Továbbító kiszolgáló (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Kiszolgáló:"
-
-#, fuzzy
+msgstr "_TURN kiszolgáló:"
+
 msgid "Use_rname:"
-msgstr "Felhasználónév:"
-
-#, fuzzy
+msgstr "_Felhasználónév:"
+
 msgid "Pass_word:"
-msgstr "Jelszó:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy-kiszolgáló és böngésző"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>A proxykonfigurációs program nem található.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>A böngészőkonfigurációs program nem található.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"A proxy és böngésző a GNOME beállításaiban\n"
-"vannak konfigurálva"
-
-msgid "Configure _Proxy"
-msgstr "_Proxy beállítása"
-
-msgid "Configure _Browser"
-msgstr "Bö_ngésző beállítása"
-
-msgid "Proxy Server"
-msgstr "Proxy-kiszolgáló"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Távoli DNS használata SOCKS4 proxykkal"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy _típusa:"
-
-msgid "No proxy"
-msgstr "Nincs Proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Felhasználónév:"
+msgstr "_Jelszó:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13276,6 +13224,15 @@
 msgid "Browser Selection"
 msgstr "Böngészőválasztás"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "A böngésző beállításai a GNOME beállításaiban vannak megadva"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>A böngészőkonfigurációs program nem található.</b>"
+
+msgid "Configure _Browser"
+msgstr "Bö_ngésző beállítása"
+
 msgid "_Browser:"
 msgstr "_Böngésző:"
 
@@ -13299,6 +13256,35 @@
 "_Kézi:\n"
 "(%s az URL-hez)"
 
+msgid "Proxy Server"
+msgstr "Proxy-kiszolgáló"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "A proxy beállításai a GNOME beállításaiban vannak megadva"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>A proxykonfigurációs program nem található.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Proxy beállítása"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Távoli _DNS használata SOCKS4 proxykkal"
+
+msgid "Proxy t_ype:"
+msgstr "Proxy _típusa:"
+
+msgid "No proxy"
+msgstr "Nincs Proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "_Felhasználónév:"
+
 msgid "Log _format:"
 msgstr "Napló_formátum:"
 
@@ -13382,25 +13368,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Billentyűzet vagy egér használata alapján"
 
+msgid "_Minutes before becoming idle:"
+msgstr "Üresjárat ennyi _perc után:"
+
+msgid "Change to this status when _idle:"
+msgstr "Állapot módosítása erre, _ha inaktív:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatikus válasz:"
 
 msgid "When both away and idle"
 msgstr "Ha távol van és inaktív"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatikus távollét"
-
-msgid "_Minutes before becoming idle:"
-msgstr "Üresjárat ennyi _perc után:"
-
-msgid "Change status when _idle"
-msgstr "Állapot módosítása, _ha inaktív"
-
-msgid "Change _status to:"
-msgstr "Állap_ot módosítása a következőre:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Állapot induláskor"
@@ -13414,15 +13393,15 @@
 msgid "Interface"
 msgstr "Felület"
 
-msgid "Smiley Themes"
-msgstr "Hangulatjel-témák"
-
 msgid "Browser"
 msgstr "Böngésző"
 
 msgid "Status / Idle"
 msgstr "Állapot / Inaktív"
 
+msgid "Themes"
+msgstr "Témák"
+
 msgid "Allow all users to contact me"
 msgstr "Mindenki kapcsolatba léphet velem"
 
@@ -13770,9 +13749,6 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin hangulatjelek"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Ennek kiválasztása letiltja a grafikus hangulatjeleket."
 
@@ -14414,6 +14390,9 @@
 msgid "Conversation Entry"
 msgstr "Társalgás beviteli mező"
 
+msgid "Conversation History"
+msgstr "Társalgáselőzmények"
+
 msgid "Request Dialog"
 msgstr "Kérdés párbeszédablak"
 
@@ -14879,9 +14858,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "A %s indítá_sa a Windows indulásakor"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "több példány engedélyezése"
+msgstr "Több példány engedélyezése"
 
 msgid "_Dockable Buddy List"
 msgstr "_Dokkolható partnerlista"
@@ -14944,25 +14922,3 @@
 msgstr ""
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
-
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "A tanúsítványt kiadó gyökértanúsítványt a Pidgin nem ismeri."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Azonnali üzenetek küldése több protokoll használatával"
-
-#~ msgid "_Start port:"
-#~ msgstr "_Első port:"
-
-#~ msgid "_End port:"
-#~ msgstr "_Utolsó port:"
-
-#~ msgid "_User:"
-#~ msgstr "_Felhasználó:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ runtime verzió"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "Enélkül csak az első fiók lesz engedélyezve)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/ms_MY.po	Sat Jan 09 02:00:18 2010 +0000
@@ -0,0 +1,14051 @@
+# translation of pidgin.po to Malay
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-23 10:52-0800\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"X-Generator: KBabel 1.11.4\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 ""
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stderr\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#. the user did not fill in the captcha
+msgid "Error"
+msgstr "Ralat"
+
+msgid "Account was not added"
+msgstr ""
+
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+msgid "New mail notifications"
+msgstr "Pemberitahuan emel baru"
+
+msgid "Remember password"
+msgstr ""
+
+msgid "There are no protocol plugins installed."
+msgstr ""
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+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 ""
+
+msgid "Delete Account"
+msgstr ""
+
+#. Delete button
+msgid "Delete"
+msgstr ""
+
+msgid "Accounts"
+msgstr ""
+
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+
+#. Add button
+msgid "Add"
+msgstr ""
+
+#. Modify button
+msgid "Modify"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr ""
+
+msgid "Add buddy to your list?"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr ""
+
+msgid "Authorize buddy?"
+msgstr ""
+
+msgid "Authorize"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+
+msgid "Default"
+msgstr ""
+
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+msgid "You must provide a group."
+msgstr ""
+
+msgid "You must select an account."
+msgstr ""
+
+msgid "The selected account is not online."
+msgstr ""
+
+msgid "Error adding buddy"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "Alias (optional)"
+msgstr ""
+
+msgid "Add in group"
+msgstr ""
+
+msgid "Account"
+msgstr ""
+
+msgid "Add Buddy"
+msgstr ""
+
+msgid "Please enter buddy information."
+msgstr ""
+
+msgid "Chats"
+msgstr ""
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr ""
+
+msgid "Alias"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Auto-join"
+msgstr ""
+
+msgid "Add Chat"
+msgstr ""
+
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+msgid "Error adding group"
+msgstr ""
+
+msgid "You must give a name for the group to add."
+msgstr ""
+
+msgid "Add Group"
+msgstr ""
+
+msgid "Enter the name of the group"
+msgstr ""
+
+msgid "Edit Chat"
+msgstr ""
+
+msgid "Please Update the necessary fields."
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Edit Settings"
+msgstr ""
+
+msgid "Information"
+msgstr ""
+
+msgid "Retrieving..."
+msgstr ""
+
+msgid "Get Info"
+msgstr ""
+
+msgid "Add Buddy Pounce"
+msgstr ""
+
+msgid "Send File"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid "Show when offline"
+msgstr ""
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Set Alias"
+msgstr ""
+
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr ""
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+#. Buddy List
+msgid "Buddy List"
+msgstr ""
+
+msgid "Place tagged"
+msgstr ""
+
+msgid "Toggle Tag"
+msgstr ""
+
+msgid "View Log"
+msgstr ""
+
+#. General
+msgid "Nickname"
+msgstr ""
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr ""
+
+msgid "On Mobile"
+msgstr ""
+
+msgid "New..."
+msgstr ""
+
+msgid "Saved..."
+msgstr ""
+
+msgid "Plugins"
+msgstr ""
+
+msgid "Block/Unblock"
+msgstr ""
+
+msgid "Block"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr ""
+
+msgid "New Instant Message"
+msgstr ""
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Join a Chat"
+msgstr ""
+
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+msgid "Options"
+msgstr ""
+
+msgid "Send IM..."
+msgstr ""
+
+msgid "Block/Unblock..."
+msgstr ""
+
+msgid "Join Chat..."
+msgstr ""
+
+msgid "View Log..."
+msgstr ""
+
+msgid "View All Logs"
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Empty groups"
+msgstr ""
+
+msgid "Offline buddies"
+msgstr ""
+
+msgid "Sort"
+msgstr ""
+
+msgid "By Status"
+msgstr ""
+
+msgid "Alphabetically"
+msgstr ""
+
+msgid "By Log Size"
+msgstr ""
+
+msgid "Buddy"
+msgstr ""
+
+msgid "Chat"
+msgstr ""
+
+msgid "Grouping"
+msgstr ""
+
+msgid "Certificate Import"
+msgstr ""
+
+msgid "Specify a hostname"
+msgstr ""
+
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+msgid "Certificate Import Error"
+msgstr ""
+
+msgid "X.509 certificate import failed"
+msgstr ""
+
+msgid "Select a PEM certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+msgid "Certificate Export Error"
+msgstr ""
+
+msgid "X.509 certificate export failed"
+msgstr ""
+
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#, c-format
+msgid "Certificate for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+msgid "SSL Host Certificate"
+msgstr ""
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+msgid "Confirm certificate delete"
+msgstr ""
+
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+msgid "Hostname"
+msgstr ""
+
+msgid "Info"
+msgstr ""
+
+#. Close button
+msgid "Close"
+msgstr ""
+
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+msgid "Re-enable Account"
+msgstr ""
+
+msgid "No such command."
+msgstr ""
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr ""
+
+#, c-format
+msgid "%s [%s]"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+
+msgid "You have left this chat."
+msgstr ""
+
+msgid ""
+"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 ""
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are: plugins version"
+msgstr ""
+
+msgid "No such command (in this context)."
+msgstr ""
+
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+msgid "prefs: Show the preference window."
+msgstr ""
+
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+msgid "Unable to open file."
+msgstr ""
+
+msgid "Debug Window"
+msgstr ""
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+msgid "Clear"
+msgstr ""
+
+msgid "Filter:"
+msgstr ""
+
+msgid "Pause"
+msgstr ""
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+msgid "File Transfers"
+msgstr ""
+
+msgid "Progress"
+msgstr ""
+
+msgid "Filename"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Speed"
+msgstr ""
+
+msgid "Remaining"
+msgstr ""
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#. 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 "Canceled"
+msgstr ""
+
+msgid "Failed"
+msgstr ""
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr ""
+
+msgid "Sent"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Finished"
+msgstr ""
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+msgid "Sending"
+msgstr ""
+
+msgid "Receiving"
+msgstr ""
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+msgid "%B %Y"
+msgstr ""
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+msgid "No logs were found"
+msgstr ""
+
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr ""
+
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+msgid "All Conversations"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "Calling..."
+msgstr ""
+
+msgid "Hangup"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr ""
+
+msgid "Reject"
+msgstr ""
+
+msgid "Call in progress."
+msgstr ""
+
+msgid "The call has been terminated."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio session with you."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to start an unsupported media session type with you."
+msgstr ""
+
+msgid "You have rejected the call."
+msgstr ""
+
+msgid "call: Make an audio call."
+msgstr ""
+
+msgid "Emails"
+msgstr ""
+
+msgid "You have mail!"
+msgstr ""
+
+msgid "Sender"
+msgstr ""
+
+msgid "Subject"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "New Mail"
+msgstr ""
+
+#, c-format
+msgid "Info for %s"
+msgstr ""
+
+msgid "Buddy Information"
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "IM"
+msgstr ""
+
+msgid "Invite"
+msgstr ""
+
+msgid "(none)"
+msgstr ""
+
+#. 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 ""
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+msgid "No configuration options for this plugin."
+msgstr ""
+
+msgid "Error loading plugin"
+msgstr ""
+
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+msgid "Select plugin to install"
+msgstr ""
+
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+msgid "Install Plugin..."
+msgstr ""
+
+msgid "Configure Plugin"
+msgstr ""
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+msgid "Preferences"
+msgstr ""
+
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+msgid "New Buddy Pounce"
+msgstr ""
+
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+msgid "Pounce Who"
+msgstr ""
+
+#. Account:
+msgid "Account:"
+msgstr ""
+
+msgid "Buddy name:"
+msgstr ""
+
+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr ""
+
+msgid "Signs on"
+msgstr ""
+
+msgid "Signs off"
+msgstr ""
+
+msgid "Goes away"
+msgstr ""
+
+msgid "Returns from away"
+msgstr ""
+
+msgid "Becomes idle"
+msgstr ""
+
+msgid "Is no longer idle"
+msgstr ""
+
+msgid "Starts typing"
+msgstr ""
+
+msgid "Pauses while typing"
+msgstr ""
+
+msgid "Stops typing"
+msgstr ""
+
+msgid "Sends a message"
+msgstr ""
+
+#. Create the "Action" frame.
+msgid "Action"
+msgstr ""
+
+msgid "Open an IM window"
+msgstr ""
+
+msgid "Pop up a notification"
+msgstr ""
+
+msgid "Send a message"
+msgstr ""
+
+msgid "Execute a command"
+msgstr ""
+
+msgid "Play a sound"
+msgstr ""
+
+msgid "Pounce only when my status is not Available"
+msgstr ""
+
+msgid "Recurring"
+msgstr ""
+
+msgid "Cannot create pounce"
+msgstr ""
+
+msgid "You do not have any accounts."
+msgstr ""
+
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr ""
+
+msgid "Buddy Pounces"
+msgstr ""
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr ""
+
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+msgid "Based on keyboard use"
+msgstr ""
+
+msgid "From last sent message"
+msgstr ""
+
+msgid "Never"
+msgstr ""
+
+msgid "Show Idle Time"
+msgstr ""
+
+msgid "Show Offline Buddies"
+msgstr ""
+
+msgid "Notify buddies when you are typing"
+msgstr ""
+
+msgid "Log format"
+msgstr ""
+
+msgid "Log IMs"
+msgstr ""
+
+msgid "Log chats"
+msgstr ""
+
+msgid "Log status change events"
+msgstr ""
+
+msgid "Report Idle time"
+msgstr ""
+
+msgid "Change status when idle"
+msgstr ""
+
+msgid "Minutes before changing status"
+msgstr ""
+
+msgid "Change status to"
+msgstr ""
+
+msgid "Conversations"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
+msgid "Not implemented yet."
+msgstr ""
+
+msgid "Save File..."
+msgstr ""
+
+msgid "Open File..."
+msgstr ""
+
+msgid "Choose Location..."
+msgstr ""
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+msgid "Room List"
+msgstr ""
+
+msgid "Buddy logs in"
+msgstr ""
+
+msgid "Buddy logs out"
+msgstr ""
+
+msgid "Message received"
+msgstr ""
+
+msgid "Message received begins conversation"
+msgstr ""
+
+msgid "Message sent"
+msgstr ""
+
+msgid "Person enters chat"
+msgstr ""
+
+msgid "Person leaves chat"
+msgstr ""
+
+msgid "You talk in chat"
+msgstr ""
+
+msgid "Others talk in chat"
+msgstr ""
+
+msgid "Someone says your username in chat"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr ""
+
+msgid "GStreamer failed to initialize."
+msgstr ""
+
+msgid "(default)"
+msgstr ""
+
+msgid "Select Sound File ..."
+msgstr ""
+
+msgid "Sound Preferences"
+msgstr ""
+
+msgid "Profiles"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Console Beep"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "No Sound"
+msgstr ""
+
+msgid "Sound Method"
+msgstr ""
+
+msgid "Method: "
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+
+#. Sound options
+msgid "Sound Options"
+msgstr ""
+
+msgid "Sounds when conversation has focus"
+msgstr ""
+
+msgid "Always"
+msgstr ""
+
+msgid "Only when available"
+msgstr ""
+
+msgid "Only when not available"
+msgstr ""
+
+msgid "Volume(0-100):"
+msgstr ""
+
+#. Sound events
+msgid "Sound Events"
+msgstr ""
+
+msgid "Event"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Test"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
+msgid "Choose..."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr ""
+
+msgid "Delete Status"
+msgstr ""
+
+msgid "Saved Statuses"
+msgstr ""
+
+#. title
+#. optional information
+msgid "Title"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. saveable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+msgid "Message"
+msgstr ""
+
+#. Use
+msgid "Use"
+msgstr ""
+
+msgid "Invalid title"
+msgstr ""
+
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+msgid "Duplicate title"
+msgstr ""
+
+msgid "Please enter a different title for the status."
+msgstr ""
+
+msgid "Substatus"
+msgstr ""
+
+msgid "Status:"
+msgstr ""
+
+msgid "Message:"
+msgstr ""
+
+msgid "Edit Status"
+msgstr ""
+
+msgid "Use different status for following accounts"
+msgstr ""
+
+#. Save & Use
+msgid "Save & Use"
+msgstr ""
+
+msgid "Certificates"
+msgstr ""
+
+msgid "Sounds"
+msgstr ""
+
+msgid "Statuses"
+msgstr ""
+
+msgid "Error loading the plugin."
+msgstr ""
+
+msgid "Couldn't find X display"
+msgstr ""
+
+msgid "Couldn't find window"
+msgstr ""
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+msgid "GntClipboard"
+msgstr ""
+
+msgid "Clipboard plugin"
+msgstr ""
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#, c-format
+msgid "%s just signed on"
+msgstr ""
+
+#, c-format
+msgid "%s just signed off"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a message"
+msgstr ""
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr ""
+
+msgid "Buddy signs on/off"
+msgstr ""
+
+msgid "You receive an IM"
+msgstr ""
+
+msgid "Someone speaks in a chat"
+msgstr ""
+
+msgid "Someone says your name in a chat"
+msgstr ""
+
+msgid "Notify with a toaster when"
+msgstr ""
+
+msgid "Beep too!"
+msgstr ""
+
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+msgid "GntGf"
+msgstr ""
+
+msgid "Toaster plugin"
+msgstr ""
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr ""
+
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+msgid "GntHistory"
+msgstr ""
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+
+#, c-format
+msgid "TinyURL for above: %s"
+msgstr ""
+
+msgid "Please wait while TinyURL fetches a shorter URL ..."
+msgstr ""
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr ""
+
+msgid "TinyURL (or other) address prefix"
+msgstr ""
+
+msgid "TinyURL"
+msgstr ""
+
+msgid "TinyURL plugin"
+msgstr ""
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+
+msgid "Online"
+msgstr ""
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online Buddies"
+msgstr ""
+
+msgid "Offline Buddies"
+msgstr ""
+
+msgid "Online/Offline"
+msgstr ""
+
+msgid "Meebo"
+msgstr ""
+
+msgid "No Grouping"
+msgstr ""
+
+msgid "Nested Subgroup"
+msgstr ""
+
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
+msgid "Lastlog"
+msgstr ""
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+msgid "GntLastlog"
+msgstr ""
+
+msgid "Lastlog plugin."
+msgstr ""
+
+msgid "accounts"
+msgstr ""
+
+msgid "Password is required to sign on."
+msgstr ""
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr ""
+
+msgid "Enter Password"
+msgstr ""
+
+msgid "Save password"
+msgstr ""
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+msgid "Connection Error"
+msgstr ""
+
+msgid "New passwords do not match."
+msgstr ""
+
+msgid "Fill out all fields completely."
+msgstr ""
+
+msgid "Original password"
+msgstr ""
+
+msgid "New password"
+msgstr ""
+
+msgid "New password (again)"
+msgstr ""
+
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+msgid "Please enter your current password and your new password."
+msgstr ""
+
+#, c-format
+msgid "Change user information for %s"
+msgstr ""
+
+msgid "Set User Info"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "Buddies"
+msgstr ""
+
+msgid "buddy list"
+msgstr ""
+
+msgid "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."
+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 ""
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr ""
+
+msgid "_View Certificate..."
+msgstr ""
+
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr ""
+
+msgid "Unable to validate certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. 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 ""
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr ""
+
+#. 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 ""
+
+msgid "The message is too large."
+msgstr ""
+
+msgid "Unable to send message."
+msgstr ""
+
+msgid "Send Message"
+msgstr ""
+
+msgid "_Send Message"
+msgstr ""
+
+#, c-format
+msgid "%s entered the room."
+msgstr ""
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr ""
+
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s left the room."
+msgstr ""
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+msgid "Invite to chat"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr ""
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+msgid "No name"
+msgstr ""
+
+msgid "Unable to create new resolver process\n"
+msgstr ""
+
+msgid "Unable to send request to resolver process\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Resolver process exited without answering our request"
+msgstr ""
+
+#, c-format
+msgid "Error converting %s to punycode: %d"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#. Data is assumed to be the destination bn
+msgid "Unknown reason"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+
+msgid "Directory is not writable."
+msgstr ""
+
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+msgid "Cannot send a directory."
+msgstr ""
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr ""
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr ""
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
+msgid "File transfer complete"
+msgstr ""
+
+#, c-format
+msgid "You cancelled the transfer of %s"
+msgstr ""
+
+msgid "File transfer cancelled"
+msgstr ""
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr ""
+
+msgid "Run the command in a terminal"
+msgstr ""
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+msgid "The handler for \"aim\" URLs"
+msgstr ""
+
+msgid "The handler for \"gg\" URLs"
+msgstr ""
+
+msgid "The handler for \"icq\" URLs"
+msgstr ""
+
+msgid "The handler for \"irc\" URLs"
+msgstr ""
+
+msgid "The handler for \"msnim\" URLs"
+msgstr ""
+
+msgid "The handler for \"sip\" URLs"
+msgstr ""
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr ""
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+msgid "HTML"
+msgstr ""
+
+msgid "Plain text"
+msgstr ""
+
+msgid "Old flat format"
+msgstr ""
+
+msgid "Logging of this conversation failed."
+msgstr ""
+
+msgid "XML"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr ""
+
+msgid "Conference error"
+msgstr ""
+
+msgid "Error with your microphone"
+msgstr ""
+
+msgid "Error with your webcam"
+msgstr ""
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr ""
+
+msgid "Error creating conference."
+msgstr ""
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+msgid "Unable to load the plugin"
+msgstr ""
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr ""
+
+msgid "Unable to load your plugin."
+msgstr ""
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+
+msgid "Autoaccept"
+msgstr ""
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+
+msgid "Autoaccept complete"
+msgstr ""
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr ""
+
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+msgid "_Save"
+msgstr ""
+
+msgid "_Cancel"
+msgstr ""
+
+msgid "Ask"
+msgstr ""
+
+msgid "Auto Accept"
+msgstr ""
+
+msgid "Auto Reject"
+msgstr ""
+
+msgid "Autoaccept File Transfers..."
+msgstr ""
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+msgid "Automatically reject from users not in buddy list"
+msgstr ""
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+msgid "Create a new directory for each user"
+msgstr ""
+
+msgid "Notes"
+msgstr ""
+
+msgid "Enter your notes below..."
+msgstr ""
+
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+msgid "Minutes"
+msgstr ""
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+msgid "I'dle Mak'er"
+msgstr ""
+
+msgid "Set Account Idle Time"
+msgstr ""
+
+msgid "_Set"
+msgstr ""
+
+msgid "None of your accounts are idle."
+msgstr ""
+
+msgid "Unset Account Idle Time"
+msgstr ""
+
+msgid "_Unset"
+msgstr ""
+
+msgid "Set Idle Time for All Accounts"
+msgstr ""
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+msgid "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 ""
+
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+msgid "You were disconnected from the server."
+msgstr ""
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+
+msgid "Message could not be sent."
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Adium"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Fire"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Messenger Plus!"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "MSN Messenger"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Trillian"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr ""
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr ""
+
+msgid "Fast size calculations"
+msgstr ""
+
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Log Reader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+msgid "Mono Plugin Loader"
+msgstr ""
+
+msgid "Loads .NET plugins with Mono."
+msgstr ""
+
+msgid "Add new line in IMs"
+msgstr ""
+
+msgid "Add new line in Chats"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+msgid "Offline Message Emulation"
+msgstr ""
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+msgid ""
+"The rest of the messages will be saved as pounces. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+msgid "Offline Message"
+msgstr ""
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "Save offline messages in pounce"
+msgstr ""
+
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
+msgid "One Time Password"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "One Time Password Support"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Enforce that passwords are used only once."
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
+"Note: The account password must not be saved for this to work."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+msgid "Psychic Mode"
+msgstr ""
+
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+msgid "Only enable for users on the buddy list"
+msgstr ""
+
+msgid "Disable when away"
+msgstr ""
+
+msgid "Display notification message in conversations"
+msgstr ""
+
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. Scheme name
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer away."
+msgstr ""
+
+#, c-format
+msgid "%s has gone away."
+msgstr ""
+
+#, c-format
+msgid "%s has become idle."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr ""
+
+#, c-format
+msgid "%s has signed on."
+msgstr ""
+
+msgid "Notify When"
+msgstr ""
+
+msgid "Buddy Goes _Away"
+msgstr ""
+
+msgid "Buddy Goes _Idle"
+msgstr ""
+
+msgid "Buddy _Signs On/Off"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+msgid ""
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+
+msgid "Unable to listen for incoming IM connections"
+msgstr ""
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+msgid "First name"
+msgstr ""
+
+msgid "Last name"
+msgstr ""
+
+#. email
+msgid "Email"
+msgstr ""
+
+msgid "AIM Account"
+msgstr ""
+
+msgid "XMPP Account"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr ""
+
+msgid "Purple Person"
+msgstr ""
+
+#. Creating the options for the protocol
+msgid "Local Port"
+msgstr ""
+
+msgid "Bonjour"
+msgstr ""
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr ""
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr ""
+
+#, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+msgid "Invalid proxy settings"
+msgstr ""
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+msgid "Token Error"
+msgstr ""
+
+msgid "Unable to fetch the token.\n"
+msgstr ""
+
+msgid "Save Buddylist..."
+msgstr ""
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+msgid "Buddylist saved successfully!"
+msgstr ""
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr ""
+
+msgid "Couldn't load buddylist"
+msgstr ""
+
+msgid "Load Buddylist..."
+msgstr ""
+
+msgid "Buddylist loaded successfully!"
+msgstr ""
+
+msgid "Save buddylist..."
+msgstr ""
+
+msgid "Load buddylist from file..."
+msgstr ""
+
+msgid "You must fill in all registration fields"
+msgstr ""
+
+msgid "Passwords do not match"
+msgstr ""
+
+msgid "Unable to register new account.  An unknown error occurred."
+msgstr ""
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+msgid "Registration completed successfully!"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password (again)"
+msgstr ""
+
+msgid "Enter captcha text"
+msgstr ""
+
+msgid "Captcha"
+msgstr ""
+
+msgid "Register New Gadu-Gadu Account"
+msgstr ""
+
+msgid "Please, fill in the following fields"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "Year of birth"
+msgstr ""
+
+#. 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 ""
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr ""
+
+msgid "Password was changed successfully!"
+msgstr ""
+
+msgid "Current password"
+msgstr ""
+
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr ""
+
+msgid "Change Gadu-Gadu Password"
+msgstr ""
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr ""
+
+msgid "Add to chat..."
+msgstr ""
+
+#. Global
+msgid "Available"
+msgstr ""
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+msgid "Away"
+msgstr ""
+
+msgid "UIN"
+msgstr ""
+
+#. first name
+msgid "First Name"
+msgstr ""
+
+msgid "Birth Year"
+msgstr ""
+
+msgid "Unable to display the search results."
+msgstr ""
+
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+msgid "Search results"
+msgstr ""
+
+msgid "No matching users found"
+msgstr ""
+
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+msgid "Unable to read from socket"
+msgstr ""
+
+msgid "Buddy list downloaded"
+msgstr ""
+
+msgid "Your buddy list was downloaded from the server."
+msgstr ""
+
+msgid "Buddy list uploaded"
+msgstr ""
+
+msgid "Your buddy list was stored on the server."
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
+msgstr ""
+
+msgid "Add to chat"
+msgstr ""
+
+msgid "Chat _name:"
+msgstr ""
+
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
+msgid "Chat error"
+msgstr ""
+
+msgid "This chat name is already in use"
+msgstr ""
+
+msgid "Not connected to the server"
+msgstr ""
+
+msgid "Find buddies..."
+msgstr ""
+
+msgid "Change password..."
+msgstr ""
+
+msgid "Upload buddylist to Server"
+msgstr ""
+
+msgid "Download buddylist from Server"
+msgstr ""
+
+msgid "Delete buddylist from Server"
+msgstr ""
+
+msgid "Save buddylist to file..."
+msgstr ""
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr ""
+
+#. summary
+msgid "Polish popular IM"
+msgstr ""
+
+msgid "Gadu-Gadu User"
+msgstr ""
+
+msgid "GG server"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s"
+msgstr ""
+
+#, c-format
+msgid "current topic is: %s"
+msgstr ""
+
+msgid "No topic is set"
+msgstr ""
+
+msgid "File Transfer Failed"
+msgstr ""
+
+msgid "Unable to open a listening port."
+msgstr ""
+
+msgid "Error displaying MOTD"
+msgstr ""
+
+msgid "No MOTD available"
+msgstr ""
+
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#, c-format
+msgid "MOTD for %s"
+msgstr ""
+
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+
+msgid "View MOTD"
+msgstr ""
+
+msgid "_Channel:"
+msgstr ""
+
+msgid "_Password:"
+msgstr ""
+
+msgid "IRC nick and server may not contain whitespace"
+msgstr ""
+
+msgid "SSL support unavailable"
+msgstr ""
+
+msgid "Unable to connect"
+msgstr ""
+
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
+msgstr ""
+
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Topic"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr ""
+
+#. host to connect to
+msgid "Server"
+msgstr ""
+
+#. port to connect to
+msgid "Port"
+msgstr ""
+
+msgid "Encodings"
+msgstr ""
+
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+msgid "Real name"
+msgstr ""
+
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+msgid "Use SSL"
+msgstr ""
+
+msgid "Bad mode"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr ""
+
+#, c-format
+msgid "You are banned from %s."
+msgstr ""
+
+msgid "Banned"
+msgstr ""
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+msgid " <i>(ircop)</i>"
+msgstr ""
+
+msgid " <i>(identified)</i>"
+msgstr ""
+
+msgid "Nick"
+msgstr ""
+
+msgid "Currently on"
+msgstr ""
+
+msgid "Idle for"
+msgstr ""
+
+msgid "Online since"
+msgstr ""
+
+msgid "<b>Defining adjective:</b>"
+msgstr ""
+
+msgid "Glorious"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr ""
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr ""
+
+msgid "Unknown message"
+msgstr ""
+
+msgid "The IRC server received a message it did not understand."
+msgstr ""
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+msgid "Time Response"
+msgstr ""
+
+msgid "The IRC server's local time is:"
+msgstr ""
+
+msgid "No such channel"
+msgstr ""
+
+#. does this happen?
+msgid "no such channel"
+msgstr ""
+
+msgid "User is not logged in"
+msgstr ""
+
+msgid "No such nick or channel"
+msgstr ""
+
+msgid "Could not send"
+msgstr ""
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr ""
+
+msgid "Invitation only"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr ""
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr ""
+
+msgid "Invalid nickname"
+msgstr ""
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+#. We only want to do the following dance if the connection
+#. has not been successfully completed.  If it has, just
+#. notify the user that their /nick command didn't go.
+#, c-format
+msgid "The nickname \"%s\" is already being used."
+msgstr ""
+
+msgid "Nickname in use"
+msgstr ""
+
+msgid "Cannot change nick"
+msgstr ""
+
+msgid "Could not change nick"
+msgstr ""
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr ""
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr ""
+
+msgid "Cannot join channel"
+msgstr ""
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Wallops from %s"
+msgstr ""
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+msgid "chanserv: Send a command to chanserv"
+msgstr ""
+
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid "memoserv: Send a command to memoserv"
+msgstr ""
+
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+msgid "nickserv: Send a command to nickserv"
+msgstr ""
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+msgid "PONG"
+msgstr ""
+
+msgid "CTCP PING reply"
+msgstr ""
+
+msgid "Disconnected."
+msgstr ""
+
+msgid "Unknown Error"
+msgstr ""
+
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+msgid "execute"
+msgstr ""
+
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr ""
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+msgid "Plaintext Authentication"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr ""
+
+msgid "Invalid response from server"
+msgstr ""
+
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+#, c-format
+msgid "SASL error: %s"
+msgstr ""
+
+msgid "The BOSH connection manager terminated your session."
+msgstr ""
+
+msgid "No session ID given"
+msgstr ""
+
+msgid "Unsupported version of BOSH protocol"
+msgstr ""
+
+msgid "Unable to establish a connection with the server"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr ""
+
+msgid "Unable to establish SSL connection"
+msgstr ""
+
+msgid "Full Name"
+msgstr ""
+
+msgid "Family Name"
+msgstr ""
+
+msgid "Given Name"
+msgstr ""
+
+msgid "URL"
+msgstr ""
+
+msgid "Street Address"
+msgstr ""
+
+#.
+#. * 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 ""
+
+msgid "Country"
+msgstr ""
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr ""
+
+msgid "Organization Name"
+msgstr ""
+
+msgid "Organization Unit"
+msgstr ""
+
+msgid "Role"
+msgstr ""
+
+#. birthday
+msgid "Birthday"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgid "Edit XMPP vCard"
+msgstr ""
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "Operating System"
+msgstr ""
+
+msgid "Local Time"
+msgstr ""
+
+msgid "Priority"
+msgstr ""
+
+msgid "Resource"
+msgstr ""
+
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged Off"
+msgstr ""
+
+msgid "Middle Name"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "P.O. Box"
+msgstr ""
+
+msgid "Photo"
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Cancel Presence Notification"
+msgstr ""
+
+msgid "Un-hide From"
+msgstr ""
+
+msgid "Temporarily Hide From"
+msgstr ""
+
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Initiate _Chat"
+msgstr ""
+
+msgid "Log In"
+msgstr ""
+
+msgid "Log Out"
+msgstr ""
+
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
+msgid "Chatty"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "JID"
+msgstr ""
+
+#. 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 ""
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+msgid "Email Address"
+msgstr ""
+
+msgid "Search for XMPP users"
+msgstr ""
+
+#. "Search"
+msgid "Search"
+msgstr ""
+
+msgid "Invalid Directory"
+msgstr ""
+
+msgid "Enter a User Directory"
+msgstr ""
+
+msgid "Select a user directory to search"
+msgstr ""
+
+msgid "Search Directory"
+msgstr ""
+
+msgid "_Room:"
+msgstr ""
+
+msgid "_Server:"
+msgstr ""
+
+msgid "_Handle:"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+msgid "Invalid Room Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+msgid "Invalid Server Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+msgid "Invalid Room Handle"
+msgstr ""
+
+msgid "Configuration error"
+msgstr ""
+
+msgid "Unable to configure"
+msgstr ""
+
+msgid "Room Configuration Error"
+msgstr ""
+
+msgid "This room is not capable of being configured"
+msgstr ""
+
+msgid "Registration error"
+msgstr ""
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+msgid "Error retrieving room list"
+msgstr ""
+
+msgid "Invalid Server"
+msgstr ""
+
+msgid "Enter a Conference Server"
+msgstr ""
+
+msgid "Select a conference server to query"
+msgstr ""
+
+msgid "Find Rooms"
+msgstr ""
+
+msgid "Affiliations:"
+msgstr ""
+
+msgid "No users found"
+msgstr ""
+
+msgid "Roles:"
+msgstr ""
+
+msgid "Ping timed out"
+msgstr ""
+
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
+msgstr ""
+
+msgid "Invalid XMPP ID"
+msgstr ""
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+msgid "Malformed BOSH URL"
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+msgid "Registration Successful"
+msgstr ""
+
+msgid "Registration Failed"
+msgstr ""
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+msgid "Unregistration Successful"
+msgstr ""
+
+msgid "Unregistration Failed"
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Postal code"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
+msgid "Already Registered"
+msgstr ""
+
+msgid "Unregister"
+msgstr ""
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+msgid "Register New XMPP Account"
+msgstr ""
+
+msgid "Register"
+msgstr ""
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+msgid "Change Registration"
+msgstr ""
+
+msgid "Error unregistering account"
+msgstr ""
+
+msgid "Account successfully unregistered"
+msgstr ""
+
+msgid "Initializing Stream"
+msgstr ""
+
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+msgid "Authenticating"
+msgstr ""
+
+msgid "Re-initializing Stream"
+msgstr ""
+
+msgid "Server doesn't support blocking"
+msgstr ""
+
+msgid "Not Authorized"
+msgstr ""
+
+#. (reference: "libpurple/request.h")
+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 ""
+
+#. 0
+msgid "None"
+msgstr ""
+
+#. subscription type
+msgid "Subscription"
+msgstr ""
+
+msgid "Mood Text"
+msgstr ""
+
+msgid "Allow Buzz"
+msgstr ""
+
+msgid "Tune Artist"
+msgstr ""
+
+msgid "Tune Title"
+msgstr ""
+
+msgid "Tune Album"
+msgstr ""
+
+msgid "Tune Genre"
+msgstr ""
+
+msgid "Tune Comment"
+msgstr ""
+
+msgid "Tune Track"
+msgstr ""
+
+msgid "Tune Time"
+msgstr ""
+
+msgid "Tune Year"
+msgstr ""
+
+msgid "Tune URL"
+msgstr ""
+
+msgid "Password Changed"
+msgstr ""
+
+msgid "Your password has been changed."
+msgstr ""
+
+msgid "Error changing password"
+msgstr ""
+
+msgid "Change XMPP Password"
+msgstr ""
+
+msgid "Please enter your new password"
+msgstr ""
+
+msgid "Set User Info..."
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+msgid "Change Password..."
+msgstr ""
+
+#. }
+msgid "Search for Users..."
+msgstr ""
+
+msgid "Bad Request"
+msgstr ""
+
+msgid "Conflict"
+msgstr ""
+
+msgid "Feature Not Implemented"
+msgstr ""
+
+msgid "Forbidden"
+msgstr ""
+
+msgid "Gone"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Item Not Found"
+msgstr ""
+
+msgid "Malformed XMPP ID"
+msgstr ""
+
+msgid "Not Acceptable"
+msgstr ""
+
+msgid "Not Allowed"
+msgstr ""
+
+msgid "Payment Required"
+msgstr ""
+
+msgid "Recipient Unavailable"
+msgstr ""
+
+msgid "Registration Required"
+msgstr ""
+
+msgid "Remote Server Not Found"
+msgstr ""
+
+msgid "Remote Server Timeout"
+msgstr ""
+
+msgid "Server Overloaded"
+msgstr ""
+
+msgid "Service Unavailable"
+msgstr ""
+
+msgid "Subscription Required"
+msgstr ""
+
+msgid "Unexpected Request"
+msgstr ""
+
+msgid "Authorization Aborted"
+msgstr ""
+
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+msgid "Invalid authzid"
+msgstr ""
+
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+msgid "Authentication Failure"
+msgstr ""
+
+msgid "Bad Format"
+msgstr ""
+
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+msgid "Resource Conflict"
+msgstr ""
+
+msgid "Connection Timeout"
+msgstr ""
+
+msgid "Host Gone"
+msgstr ""
+
+msgid "Host Unknown"
+msgstr ""
+
+msgid "Improper Addressing"
+msgstr ""
+
+msgid "Invalid ID"
+msgstr ""
+
+msgid "Invalid Namespace"
+msgstr ""
+
+msgid "Invalid XML"
+msgstr ""
+
+msgid "Non-matching Hosts"
+msgstr ""
+
+msgid "Policy Violation"
+msgstr ""
+
+msgid "Remote Connection Failed"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Restricted XML"
+msgstr ""
+
+msgid "See Other Host"
+msgstr ""
+
+msgid "System Shutdown"
+msgstr ""
+
+msgid "Undefined Condition"
+msgstr ""
+
+msgid "Unsupported Encoding"
+msgstr ""
+
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+msgid "Unsupported Version"
+msgstr ""
+
+msgid "XML Not Well Formed"
+msgstr ""
+
+msgid "Stream Error"
+msgstr ""
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because %s might be offline."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr ""
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr ""
+
+msgid "Media Initiation Failed"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Initiate Media"
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr ""
+
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+msgid "part [message]:  Leave the room."
+msgstr ""
+
+msgid "register:  Register with a chat room."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+msgid ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr ""
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr ""
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr ""
+
+msgid "Require SSL/TLS"
+msgstr ""
+
+msgid "Force old (port 5223) SSL"
+msgstr ""
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+msgid "Connect port"
+msgstr ""
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+msgid "Connect server"
+msgstr ""
+
+msgid "File transfer proxies"
+msgstr ""
+
+msgid "BOSH URL"
+msgstr ""
+
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr ""
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr ""
+
+#, c-format
+msgid "Message from %s"
+msgstr ""
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+msgid "XMPP Message Error"
+msgstr ""
+
+#, c-format
+msgid "(Code %s)"
+msgstr ""
+
+msgid "XML Parse error"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr ""
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+msgid "Create New Room"
+msgstr ""
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+msgid "_Configure Room"
+msgstr ""
+
+msgid "_Accept Defaults"
+msgstr ""
+
+msgid "No reason"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked: (%s)"
+msgstr ""
+
+#, c-format
+msgid "Kicked (%s)"
+msgstr ""
+
+msgid "An error occurred on the in-band bytestream transfer\n"
+msgstr ""
+
+msgid "Transfer was closed."
+msgstr ""
+
+msgid "Failed to open in-band bytestream"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+msgid "File Send Failed"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+msgid "Please select your mood from the list."
+msgstr ""
+
+msgid "Set"
+msgstr ""
+
+msgid "Set Mood..."
+msgstr ""
+
+msgid "Set User Nickname"
+msgstr ""
+
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+msgid "Set Nickname..."
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Select an action"
+msgstr ""
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "Buddy Add error"
+msgstr ""
+
+msgid "The username specified does not exist."
+msgstr ""
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse message"
+msgstr ""
+
+#, c-format
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#, c-format
+msgid "Invalid email address"
+msgstr ""
+
+#, c-format
+msgid "User does not exist"
+msgstr ""
+
+#, c-format
+msgid "Fully qualified domain name missing"
+msgstr ""
+
+#, c-format
+msgid "Already logged in"
+msgstr ""
+
+#, c-format
+msgid "Invalid username"
+msgstr ""
+
+#, c-format
+msgid "Invalid friendly name"
+msgstr ""
+
+#, c-format
+msgid "List full"
+msgstr ""
+
+#, c-format
+msgid "Already there"
+msgstr ""
+
+#, c-format
+msgid "Not on list"
+msgstr ""
+
+#, c-format
+msgid "User is offline"
+msgstr ""
+
+#, c-format
+msgid "Already in the mode"
+msgstr ""
+
+#, c-format
+msgid "Already in opposite list"
+msgstr ""
+
+#, c-format
+msgid "Too many groups"
+msgstr ""
+
+#, c-format
+msgid "Invalid group"
+msgstr ""
+
+#, c-format
+msgid "User not in group"
+msgstr ""
+
+#, c-format
+msgid "Group name too long"
+msgstr ""
+
+#, c-format
+msgid "Cannot remove group zero"
+msgstr ""
+
+#, c-format
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr ""
+
+#, c-format
+msgid "Switchboard failed"
+msgstr ""
+
+#, c-format
+msgid "Notify transfer failed"
+msgstr ""
+
+#, c-format
+msgid "Required fields missing"
+msgstr ""
+
+#, c-format
+msgid "Too many hits to a FND"
+msgstr ""
+
+#, c-format
+msgid "Not logged in"
+msgstr ""
+
+#, c-format
+msgid "Service temporarily unavailable"
+msgstr ""
+
+#, c-format
+msgid "Database server error"
+msgstr ""
+
+#, c-format
+msgid "Command disabled"
+msgstr ""
+
+#, c-format
+msgid "File operation error"
+msgstr ""
+
+#, c-format
+msgid "Memory allocation error"
+msgstr ""
+
+#, c-format
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#, c-format
+msgid "Server busy"
+msgstr ""
+
+#, c-format
+msgid "Server unavailable"
+msgstr ""
+
+#, c-format
+msgid "Peer notification server down"
+msgstr ""
+
+#, c-format
+msgid "Database connect error"
+msgstr ""
+
+#, c-format
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#, c-format
+msgid "Error creating connection"
+msgstr ""
+
+#, c-format
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#, c-format
+msgid "Unable to write"
+msgstr ""
+
+#, c-format
+msgid "Session overload"
+msgstr ""
+
+#, c-format
+msgid "User is too active"
+msgstr ""
+
+#, c-format
+msgid "Too many sessions"
+msgstr ""
+
+#, c-format
+msgid "Passport not verified"
+msgstr ""
+
+#, c-format
+msgid "Bad friend file"
+msgstr ""
+
+#, c-format
+msgid "Not expected"
+msgstr ""
+
+msgid "Friendly name is changing too rapidly"
+msgstr ""
+
+#, c-format
+msgid "Server too busy"
+msgstr ""
+
+#, c-format
+msgid "Authentication failed"
+msgstr ""
+
+#, c-format
+msgid "Not allowed when offline"
+msgstr ""
+
+#, c-format
+msgid "Not accepting new users"
+msgstr ""
+
+#, c-format
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#, c-format
+msgid "Passport account not yet verified"
+msgstr ""
+
+msgid "Passport account suspended"
+msgstr ""
+
+#, c-format
+msgid "Bad ticket"
+msgstr ""
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr ""
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr ""
+
+msgid "Other Contacts"
+msgstr ""
+
+msgid "Non-IM Contacts"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
+msgid "Nudge"
+msgstr ""
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+msgid "Email Address..."
+msgstr ""
+
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr ""
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+msgid "Set your home phone number."
+msgstr ""
+
+msgid "Set your work phone number."
+msgstr ""
+
+msgid "Set your mobile phone number."
+msgstr ""
+
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Disallow"
+msgstr ""
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
+msgstr ""
+
+msgid "Send a mobile message."
+msgstr ""
+
+msgid "Page"
+msgstr ""
+
+msgid "Playing a game"
+msgstr ""
+
+msgid "Working"
+msgstr ""
+
+msgid "Has you"
+msgstr ""
+
+msgid "Home Phone Number"
+msgstr ""
+
+msgid "Work Phone Number"
+msgstr ""
+
+msgid "Mobile Phone Number"
+msgstr ""
+
+msgid "Be Right Back"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "On the Phone"
+msgstr ""
+
+msgid "Out to Lunch"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "Game Title"
+msgstr ""
+
+msgid "Office Title"
+msgstr ""
+
+msgid "Set Friendly Name..."
+msgstr ""
+
+msgid "Set Home Phone Number..."
+msgstr ""
+
+msgid "Set Work Phone Number..."
+msgstr ""
+
+msgid "Set Mobile Phone Number..."
+msgstr ""
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr ""
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr ""
+
+msgid "View Blocked Text..."
+msgstr ""
+
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+msgid "Send to Mobile"
+msgstr ""
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be valid email addresses."
+msgstr ""
+
+msgid "Unable to Add"
+msgstr ""
+
+msgid "Authorization Request Message:"
+msgstr ""
+
+msgid "Please authorize me!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr ""
+
+msgid "Error retrieving profile"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Age"
+msgstr ""
+
+msgid "Occupation"
+msgstr ""
+
+msgid "Location"
+msgstr ""
+
+msgid "Hobbies and Interests"
+msgstr ""
+
+msgid "A Little About Me"
+msgstr ""
+
+msgid "Social"
+msgstr ""
+
+msgid "Marital Status"
+msgstr ""
+
+msgid "Interests"
+msgstr ""
+
+msgid "Pets"
+msgstr ""
+
+msgid "Hometown"
+msgstr ""
+
+msgid "Places Lived"
+msgstr ""
+
+msgid "Fashion"
+msgstr ""
+
+msgid "Humor"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Favorite Quote"
+msgstr ""
+
+msgid "Contact Info"
+msgstr ""
+
+msgid "Personal"
+msgstr ""
+
+msgid "Significant Other"
+msgstr ""
+
+msgid "Home Phone"
+msgstr ""
+
+msgid "Home Phone 2"
+msgstr ""
+
+msgid "Home Address"
+msgstr ""
+
+msgid "Personal Mobile"
+msgstr ""
+
+msgid "Home Fax"
+msgstr ""
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr ""
+
+msgid "Anniversary"
+msgstr ""
+
+#. Business
+msgid "Work"
+msgstr ""
+
+msgid "Job Title"
+msgstr ""
+
+msgid "Company"
+msgstr ""
+
+msgid "Department"
+msgstr ""
+
+msgid "Profession"
+msgstr ""
+
+msgid "Work Phone"
+msgstr ""
+
+msgid "Work Phone 2"
+msgstr ""
+
+msgid "Work Address"
+msgstr ""
+
+msgid "Work Mobile"
+msgstr ""
+
+msgid "Work Pager"
+msgstr ""
+
+msgid "Work Fax"
+msgstr ""
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr ""
+
+msgid "Start Date"
+msgstr ""
+
+msgid "Favorite Things"
+msgstr ""
+
+msgid "Last Updated"
+msgstr ""
+
+msgid "Homepage"
+msgstr ""
+
+msgid "The user has not created a public profile."
+msgstr ""
+
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+msgid "View web profile"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *< summary
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Use HTTP Method"
+msgstr ""
+
+msgid "HTTP Method Server"
+msgstr ""
+
+msgid "Show custom smileys"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+msgid "The following users are missing from your addressbook"
+msgstr ""
+
+#, c-format
+msgid "Unknown error (%d): %s"
+msgstr ""
+
+msgid "Unable to add user"
+msgstr ""
+
+#. Unknown error!
+#, c-format
+msgid "Unknown error (%d)"
+msgstr ""
+
+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] ""
+msgstr[1] ""
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+msgid "Writing error"
+msgstr ""
+
+msgid "Reading error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+
+msgid "Our protocol is not supported by the server"
+msgstr ""
+
+msgid "Error parsing HTTP"
+msgstr ""
+
+msgid "You have signed on from another location"
+msgstr ""
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "The MSN servers are going down temporarily"
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr ""
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "Handshaking"
+msgstr ""
+
+msgid "Transferring"
+msgstr ""
+
+msgid "Starting authentication"
+msgstr ""
+
+msgid "Getting cookie"
+msgstr ""
+
+msgid "Sending cookie"
+msgstr ""
+
+msgid "Retrieving buddy list"
+msgstr ""
+
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+
+msgid "Away From Computer"
+msgstr ""
+
+msgid "On The Phone"
+msgstr ""
+
+msgid "Out To Lunch"
+msgstr ""
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
+msgid "Message could not be sent because the user is offline:"
+msgstr ""
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr ""
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr ""
+
+msgid "Delete Buddy from Address Book?"
+msgstr ""
+
+msgid "Do you want to delete this buddy from your address book as well?"
+msgstr ""
+
+msgid "The username specified is invalid."
+msgstr ""
+
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+msgid "Profile URL"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+msgid "Unknown error."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#. 1
+msgid "Angry"
+msgstr ""
+
+#. 2
+msgid "Excited"
+msgstr ""
+
+#. 3
+msgid "Grumpy"
+msgstr ""
+
+#. 4
+msgid "Happy"
+msgstr ""
+
+#. 5
+msgid "In Love"
+msgstr ""
+
+#. 6
+msgid "Invincible"
+msgstr ""
+
+#. 7
+msgid "Sad"
+msgstr ""
+
+#. 8
+msgid "Hot"
+msgstr ""
+
+#. 9
+msgid "Sick"
+msgstr ""
+
+#. 10
+msgid "Sleepy"
+msgstr ""
+
+#. show current mood
+msgid "Current Mood"
+msgstr ""
+
+#. add all moods to list
+msgid "New Mood"
+msgstr ""
+
+msgid "Change your Mood"
+msgstr ""
+
+msgid "How do you feel right now?"
+msgstr ""
+
+msgid "The PIN you entered is invalid."
+msgstr ""
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr ""
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+msgid "The two PINs you entered do not match."
+msgstr ""
+
+msgid "The name you entered is invalid."
+msgstr ""
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
+#. show error to user
+msgid "Profile Update Error"
+msgstr ""
+
+#. no profile information yet, so we cannot update
+#. (reference: "libpurple/request.h")
+msgid "Profile"
+msgstr ""
+
+msgid "Your profile information is not yet retrieved. Please try again later."
+msgstr ""
+
+#. pin
+msgid "PIN"
+msgstr ""
+
+msgid "Verify PIN"
+msgstr ""
+
+#. display name
+msgid "Display Name"
+msgstr ""
+
+#. hidden
+msgid "Hide my number"
+msgstr ""
+
+#. mobile number
+msgid "Mobile Number"
+msgstr ""
+
+msgid "Update your Profile"
+msgstr ""
+
+msgid "Here you can update your MXit profile"
+msgstr ""
+
+msgid "View Splash"
+msgstr ""
+
+msgid "There is no splash-screen currently available"
+msgstr ""
+
+msgid "About"
+msgstr ""
+
+#. display / change mood
+msgid "Change Mood..."
+msgstr ""
+
+#. display / change profile
+msgid "Change Profile..."
+msgstr ""
+
+#. display splash-screen
+msgid "View Splash..."
+msgstr ""
+
+#. display plugin version
+msgid "About..."
+msgstr ""
+
+#. the file is too big
+msgid "The file you are trying to send is too large!"
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+
+msgid "Logging In..."
+msgstr ""
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+
+msgid "Connecting..."
+msgstr ""
+
+msgid "The nick name you entered is invalid."
+msgstr ""
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr ""
+
+#. mxit login name
+msgid "MXit Login Name"
+msgstr ""
+
+#. nick name
+msgid "Nick Name"
+msgstr ""
+
+#. show the form to the user to complete
+msgid "Register New MXit Account"
+msgstr ""
+
+msgid "Please fill in the following fields:"
+msgstr ""
+
+#. no reply from the WAP site
+msgid "Error contacting the MXit WAP site. Please try again later."
+msgstr ""
+
+#. wapserver error
+#. server could not find the user
+msgid ""
+"MXit is currently unable to process the request. Please try again later."
+msgstr ""
+
+msgid "Wrong security code entered. Please try again later."
+msgstr ""
+
+msgid "Your session has expired. Please try again later."
+msgstr ""
+
+msgid "Invalid country selected. Please try again."
+msgstr ""
+
+msgid "Username is not registered. Please register first."
+msgstr ""
+
+msgid "Username is already registered. Please choose another username."
+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
+msgid "Enter Security Code"
+msgstr ""
+
+msgid "Your Country"
+msgstr ""
+
+msgid "Your Language"
+msgstr ""
+
+#. display the form to the user and wait for his/her input
+msgid "MXit Authorization"
+msgstr ""
+
+msgid "MXit account validation"
+msgstr ""
+
+msgid "Retrieving User Information..."
+msgstr ""
+
+msgid "Loading menu..."
+msgstr ""
+
+msgid "Status Message"
+msgstr ""
+
+msgid "Hidden Number"
+msgstr ""
+
+msgid "Your Mobile Number..."
+msgstr ""
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr ""
+
+msgid "Connect via HTTP"
+msgstr ""
+
+msgid "Enable splash-screen popup"
+msgstr ""
+
+#. we must have lost the connection, so terminate it so that we can reconnect
+msgid "We have lost the connection to MXit. Please reconnect."
+msgstr ""
+
+#. packet could not be queued for transmission
+msgid "Message Send Error"
+msgstr ""
+
+msgid "Unable to process your request at this time"
+msgstr ""
+
+msgid "Timeout while waiting for a response from the MXit server."
+msgstr ""
+
+msgid "Successfully Logged In..."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
+msgid "Message Error"
+msgstr ""
+
+msgid "Cannot perform redirect using the specified protocol"
+msgstr ""
+
+msgid "An internal MXit server error occurred."
+msgstr ""
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr ""
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr ""
+
+msgid "Contact Error"
+msgstr ""
+
+msgid "Message Sending Error"
+msgstr ""
+
+msgid "Status Error"
+msgstr ""
+
+#, fuzzy
+msgid "Mood Error"
+msgstr "Ralat"
+
+msgid "Invitation Error"
+msgstr ""
+
+msgid "Contact Removal Error"
+msgstr ""
+
+msgid "Subscription Error"
+msgstr ""
+
+msgid "Contact Update Error"
+msgstr ""
+
+msgid "File Transfer Error"
+msgstr ""
+
+msgid "Cannot create MultiMx room"
+msgstr ""
+
+msgid "MultiMx Invitation Error"
+msgstr ""
+
+msgid "Profile Error"
+msgstr ""
+
+#. bad packet
+msgid "Invalid packet received from MXit."
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x01)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x02)"
+msgstr ""
+
+msgid "A connection error occurred to MXit. (read stage 0x03)"
+msgstr ""
+
+#. malformed packet length record (too long)
+msgid "A connection error occurred to MXit. (read stage 0x04)"
+msgstr ""
+
+#. connection error
+msgid "A connection error occurred to MXit. (read stage 0x05)"
+msgstr ""
+
+#. connection closed
+msgid "A connection error occurred to MXit. (read stage 0x06)"
+msgstr ""
+
+msgid "Pending"
+msgstr ""
+
+msgid "Invited"
+msgstr ""
+
+msgid "Rejected"
+msgstr ""
+
+msgid "Deleted"
+msgstr ""
+
+msgid "MXit Advertising"
+msgstr ""
+
+msgid "More Information"
+msgstr ""
+
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+msgid "User lookup"
+msgstr ""
+
+msgid "Reading challenge"
+msgstr ""
+
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+msgid "Logging in"
+msgstr ""
+
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+msgid "Lost connection with server"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
+msgid "New mail messages"
+msgstr ""
+
+msgid "New blog comments"
+msgstr ""
+
+msgid "New profile comments"
+msgstr ""
+
+msgid "New friend requests!"
+msgstr ""
+
+msgid "New picture comments"
+msgstr ""
+
+msgid "MySpace"
+msgstr ""
+
+msgid "IM Friends"
+msgstr ""
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Add contacts from server"
+msgstr ""
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr ""
+
+msgid "Invalid input condition"
+msgstr ""
+
+msgid "Failed to add buddy"
+msgstr ""
+
+msgid "'addbuddy' command failed."
+msgstr ""
+
+msgid "persist command failed"
+msgstr ""
+
+msgid "Failed to remove buddy"
+msgstr ""
+
+msgid "'delbuddy' command failed"
+msgstr ""
+
+msgid "blocklist command failed"
+msgstr ""
+
+msgid "Missing Cipher"
+msgstr ""
+
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr ""
+
+msgid "Change IM name..."
+msgstr ""
+
+msgid "myim URL handler"
+msgstr ""
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+msgid "Show display name in status text"
+msgstr ""
+
+msgid "Show headline in status text"
+msgstr ""
+
+msgid "Send emoticons"
+msgstr ""
+
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+msgid "Base font size (points)"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Headline"
+msgstr ""
+
+msgid "Song"
+msgstr ""
+
+msgid "Total Friends"
+msgstr ""
+
+msgid "Client Version"
+msgstr ""
+
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+msgid "This username is unavailable."
+msgstr ""
+
+msgid "Please try another username:"
+msgstr ""
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+msgid "Zap"
+msgstr ""
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr ""
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+msgid "Torch"
+msgstr ""
+
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr ""
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr ""
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr ""
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr ""
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+msgid "High-five"
+msgstr ""
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+msgid "Punk"
+msgstr ""
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+msgid "Raspberry"
+msgstr ""
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+msgid "Required parameters not passed in"
+msgstr ""
+
+msgid "Unable to write to network"
+msgstr ""
+
+msgid "Unable to read from network"
+msgstr ""
+
+msgid "Error communicating with server"
+msgstr ""
+
+msgid "Conference not found"
+msgstr ""
+
+msgid "Conference does not exist"
+msgstr ""
+
+msgid "A folder with that name already exists"
+msgstr ""
+
+msgid "Not supported"
+msgstr ""
+
+msgid "Password has expired"
+msgstr ""
+
+msgid "Incorrect password"
+msgstr ""
+
+msgid "User not found"
+msgstr ""
+
+msgid "Account has been disabled"
+msgstr ""
+
+msgid "The server could not access the directory"
+msgstr ""
+
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+msgid "Cannot add yourself"
+msgstr ""
+
+msgid "Master archive is misconfigured"
+msgstr ""
+
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+msgid "You have entered an incorrect username"
+msgstr ""
+
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+msgid "Incompatible protocol version"
+msgstr ""
+
+msgid "The user has blocked you"
+msgstr ""
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr ""
+
+#, c-format
+msgid "Unable to login: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+msgid "Telephone Number"
+msgstr ""
+
+msgid "Personal Title"
+msgstr ""
+
+msgid "Mailstop"
+msgstr ""
+
+msgid "User ID"
+msgstr ""
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+msgid "Full name"
+msgstr ""
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+msgid "Authenticating..."
+msgstr ""
+
+msgid "Waiting for response..."
+msgstr ""
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+msgid "Invitation to Conversation"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr ""
+
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+msgid "Server address"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr ""
+
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+msgid "Could not join chat room"
+msgstr ""
+
+msgid "Invalid chat room name"
+msgstr ""
+
+msgid "Received invalid data on connection with server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr ""
+
+msgid "ICQ UIN..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr ""
+
+msgid "Encoding"
+msgstr ""
+
+msgid "The remote user has closed the connection."
+msgstr ""
+
+msgid "The remote user has declined your request."
+msgstr ""
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+msgid "Unable to establish a connection with the remote user."
+msgstr ""
+
+msgid "Direct IM established"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+msgid "Invalid error"
+msgstr ""
+
+msgid "Invalid SNAC"
+msgstr ""
+
+msgid "Rate to host"
+msgstr ""
+
+msgid "Rate to client"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Service not defined"
+msgstr ""
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+msgid "Not supported by host"
+msgstr ""
+
+msgid "Not supported by client"
+msgstr ""
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+msgid "Responses lost"
+msgstr ""
+
+msgid "Request denied"
+msgstr ""
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr ""
+
+msgid "No match"
+msgstr ""
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
+msgid "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 "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr ""
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+msgid "Free For Chat"
+msgstr ""
+
+msgid "Not Available"
+msgstr ""
+
+msgid "Occupied"
+msgstr ""
+
+msgid "Web Aware"
+msgstr ""
+
+msgid "Invisible"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr ""
+
+msgid "Username sent"
+msgstr ""
+
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+#. Unregistered username
+#. uid is not exist
+#. the username does not exist
+msgid "Username does not exist"
+msgstr ""
+
+#. Suspended account
+msgid "Your account is currently suspended"
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#. 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 ""
+
+#. IP address connecting too frequently
+msgid ""
+"Your IP address has been connecting and disconnecting too frequently. Wait a "
+"minute and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr ""
+
+msgid "The SecurID key entered is invalid"
+msgstr ""
+
+msgid "Enter SecurID"
+msgstr ""
+
+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 ""
+
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+msgid "_Add"
+msgstr ""
+
+msgid "_Decline"
+msgstr ""
+
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Unknown reason."
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#. The conversion failed!
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again.\n"
+msgstr ""
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr ""
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+msgid "Position"
+msgstr ""
+
+msgid "Web Page"
+msgstr ""
+
+msgid "Pop-Up Message"
+msgstr ""
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+msgid "Error Changing Account Info"
+msgstr ""
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+msgid "Account Info"
+msgstr ""
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+msgid "Unable to set AIM profile."
+msgstr ""
+
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Profile too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Away message too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+msgid "Unable to Retrieve Buddy List"
+msgstr ""
+
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+
+msgid "Orphans"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+msgid "(no name)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+msgid "Authorization Given"
+msgstr ""
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "Authorization Denied"
+msgstr ""
+
+msgid "_Exchange:"
+msgstr ""
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr ""
+
+msgid "Buddy Comment:"
+msgstr ""
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+msgid "C_onnect"
+msgstr ""
+
+msgid "You closed the connection."
+msgstr ""
+
+msgid "Get AIM Info"
+msgstr ""
+
+#. We only do this if the user is in our buddy list
+msgid "Edit Buddy Comment"
+msgstr ""
+
+msgid "Get Status Msg"
+msgstr ""
+
+msgid "End Direct IM Session"
+msgstr ""
+
+msgid "Direct IM"
+msgstr ""
+
+msgid "Re-request Authorization"
+msgstr ""
+
+msgid "Require authorization"
+msgstr ""
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+msgid "ICQ Privacy Options"
+msgstr ""
+
+msgid "The new formatting is invalid."
+msgstr ""
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+
+msgid "Change Address To:"
+msgstr ""
+
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+msgid "Find Buddy by Email"
+msgstr ""
+
+msgid "Search for a buddy by email address"
+msgstr ""
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+msgid "_Search"
+msgstr ""
+
+msgid "Set User Info (web)..."
+msgstr ""
+
+#. This only happens when connecting with the old-style BUCP login
+msgid "Change Password (web)"
+msgstr ""
+
+msgid "Configure IM Forwarding (web)"
+msgstr ""
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr ""
+
+#. AIM actions
+msgid "Confirm Account"
+msgstr ""
+
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+msgid "Search for Buddy by Information"
+msgstr ""
+
+msgid "Use clientLogin"
+msgstr ""
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr ""
+
+msgid "Attempting to connect via proxy server."
+msgstr ""
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+
+msgid "Aquarius"
+msgstr ""
+
+msgid "Pisces"
+msgstr ""
+
+msgid "Aries"
+msgstr ""
+
+msgid "Taurus"
+msgstr ""
+
+msgid "Gemini"
+msgstr ""
+
+msgid "Cancer"
+msgstr ""
+
+msgid "Leo"
+msgstr ""
+
+msgid "Virgo"
+msgstr ""
+
+msgid "Libra"
+msgstr ""
+
+msgid "Scorpio"
+msgstr ""
+
+msgid "Sagittarius"
+msgstr ""
+
+msgid "Capricorn"
+msgstr ""
+
+msgid "Rat"
+msgstr ""
+
+msgid "Ox"
+msgstr ""
+
+msgid "Tiger"
+msgstr ""
+
+msgid "Rabbit"
+msgstr ""
+
+msgid "Dragon"
+msgstr ""
+
+msgid "Snake"
+msgstr ""
+
+msgid "Horse"
+msgstr ""
+
+msgid "Goat"
+msgstr ""
+
+msgid "Monkey"
+msgstr ""
+
+msgid "Rooster"
+msgstr ""
+
+msgid "Dog"
+msgstr ""
+
+msgid "Pig"
+msgstr ""
+
+msgid "Other"
+msgstr ""
+
+msgid "Visible"
+msgstr ""
+
+msgid "Friend Only"
+msgstr ""
+
+msgid "Private"
+msgstr ""
+
+msgid "QQ Number"
+msgstr ""
+
+msgid "Country/Region"
+msgstr ""
+
+msgid "Province/State"
+msgstr ""
+
+msgid "Zipcode"
+msgstr ""
+
+msgid "Phone Number"
+msgstr ""
+
+msgid "Authorize adding"
+msgstr ""
+
+msgid "Cellphone Number"
+msgstr ""
+
+msgid "Personal Introduction"
+msgstr ""
+
+msgid "City/Area"
+msgstr ""
+
+msgid "Publish Mobile"
+msgstr ""
+
+msgid "Publish Contact"
+msgstr ""
+
+msgid "College"
+msgstr ""
+
+msgid "Horoscope"
+msgstr ""
+
+msgid "Zodiac"
+msgstr ""
+
+msgid "Blood"
+msgstr ""
+
+msgid "True"
+msgstr ""
+
+msgid "False"
+msgstr ""
+
+msgid "Modify Contact"
+msgstr ""
+
+msgid "Modify Address"
+msgstr ""
+
+msgid "Modify Extended Information"
+msgstr ""
+
+msgid "Modify Information"
+msgstr ""
+
+msgid "Update"
+msgstr ""
+
+msgid "Could not change buddy information."
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Note"
+msgstr ""
+
+#. callback
+msgid "Buddy Memo"
+msgstr ""
+
+msgid "Change his/her memo as you like"
+msgstr ""
+
+msgid "_Modify"
+msgstr ""
+
+msgid "Memo Modify"
+msgstr ""
+
+msgid "Server says:"
+msgstr ""
+
+msgid "Your request was accepted."
+msgstr ""
+
+msgid "Your request was rejected."
+msgstr ""
+
+#, c-format
+msgid "%u requires verification"
+msgstr ""
+
+msgid "Add buddy question"
+msgstr ""
+
+msgid "Enter answer here"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Invalid answer."
+msgstr ""
+
+msgid "Authorization denied message:"
+msgstr ""
+
+msgid "Sorry, you're not my style."
+msgstr ""
+
+#, c-format
+msgid "%u needs authorization"
+msgstr ""
+
+msgid "Add buddy authorize"
+msgstr ""
+
+msgid "Enter request here"
+msgstr ""
+
+msgid "Would you be my friend?"
+msgstr ""
+
+msgid "QQ Buddy"
+msgstr ""
+
+msgid "Add buddy"
+msgstr ""
+
+msgid "Invalid QQ Number"
+msgstr ""
+
+msgid "Failed sending authorize"
+msgstr ""
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr ""
+
+#, c-format
+msgid "Failed removing me from %d's buddy list"
+msgstr ""
+
+msgid "No reason given"
+msgstr ""
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr ""
+
+msgid "Would you like to add him?"
+msgstr ""
+
+#, c-format
+msgid "Rejected by %s"
+msgstr ""
+
+#, c-format
+msgid "Message: %s"
+msgstr ""
+
+msgid "ID: "
+msgstr ""
+
+msgid "Group ID"
+msgstr ""
+
+msgid "QQ Qun"
+msgstr ""
+
+msgid "Please enter Qun number"
+msgstr ""
+
+msgid "You can only search for permanent Qun\n"
+msgstr ""
+
+msgid "(Invalid UTF-8 string)"
+msgstr ""
+
+msgid "Not member"
+msgstr ""
+
+msgid "Member"
+msgstr ""
+
+msgid "Requesting"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Detail"
+msgstr ""
+
+msgid "Creator"
+msgstr ""
+
+msgid "About me"
+msgstr ""
+
+msgid "Category"
+msgstr ""
+
+msgid "The Qun does not allow others to join"
+msgstr ""
+
+msgid "Join QQ Qun"
+msgstr ""
+
+msgid "Input request here"
+msgstr ""
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr ""
+
+msgid "Successfully joined Qun"
+msgstr ""
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr ""
+
+msgid "QQ Qun Operation"
+msgstr ""
+
+msgid "Failed:"
+msgstr ""
+
+msgid "Join Qun, Unknown Reply"
+msgstr ""
+
+msgid "Quit Qun"
+msgstr ""
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+msgid "Sorry, you are not our style"
+msgstr ""
+
+msgid "Successfully changed Qun members"
+msgstr ""
+
+msgid "Successfully changed Qun information"
+msgstr ""
+
+msgid "You have successfully created a Qun"
+msgstr ""
+
+msgid "Would you like to set up detailed information now?"
+msgstr ""
+
+msgid "Setup"
+msgstr ""
+
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr ""
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr ""
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr ""
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr ""
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr ""
+
+#, c-format
+msgid "Unknown-%d"
+msgstr ""
+
+msgid "Level"
+msgstr ""
+
+msgid " VIP"
+msgstr ""
+
+msgid " TCP"
+msgstr ""
+
+msgid " FromMobile"
+msgstr ""
+
+msgid " BindMobile"
+msgstr ""
+
+msgid " Video"
+msgstr ""
+
+msgid " Zone"
+msgstr ""
+
+msgid "Flag"
+msgstr ""
+
+msgid "Ver"
+msgstr ""
+
+msgid "Invalid name"
+msgstr ""
+
+msgid "Select icon..."
+msgstr ""
+
+#, c-format
+msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Total Online Buddies</b>: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Server</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Client Tag</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>My Internet IP</b>: %s:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>IP</b>: %s<br>\n"
+msgstr ""
+
+msgid "Login Information"
+msgstr ""
+
+msgid "<p><b>Original Author</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Code Contributors</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Acknowledgement</b>:<br>\n"
+msgstr ""
+
+msgid "<p><b>Scrupulous Testers</b>:<br>\n"
+msgstr ""
+
+msgid "and more, please let me know... thank you!))"
+msgstr ""
+
+msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
+msgstr ""
+
+msgid "<i>Feel free to join us!</i> :)"
+msgstr ""
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr ""
+
+msgid "Change Icon"
+msgstr ""
+
+msgid "Change Password"
+msgstr ""
+
+msgid "Account Information"
+msgstr ""
+
+msgid "Update all QQ Quns"
+msgstr ""
+
+msgid "About OpenQ"
+msgstr ""
+
+msgid "Modify Buddy Memo"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol Plugin"
+msgstr ""
+
+msgid "Auto"
+msgstr ""
+
+msgid "Select Server"
+msgstr ""
+
+msgid "QQ2005"
+msgstr ""
+
+msgid "QQ2007"
+msgstr ""
+
+msgid "QQ2008"
+msgstr ""
+
+msgid "Connect by TCP"
+msgstr ""
+
+msgid "Show server notice"
+msgstr ""
+
+msgid "Show server news"
+msgstr ""
+
+msgid "Show chat room when msg comes"
+msgstr ""
+
+msgid "Keep alive interval (seconds)"
+msgstr ""
+
+msgid "Update interval (seconds)"
+msgstr ""
+
+msgid "Unable to decrypt server reply"
+msgstr ""
+
+#, c-format
+msgid "Failed requesting token, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+#. extend redirect used in QQ2006
+msgid "Redirect_EX is not currently supported"
+msgstr ""
+
+#. need activation
+#. need activation
+#. need activation
+msgid "Activation required"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr ""
+
+msgid "Requesting captcha"
+msgstr ""
+
+msgid "Checking captcha"
+msgstr ""
+
+msgid "Failed captcha verification"
+msgstr ""
+
+msgid "Captcha Image"
+msgstr ""
+
+msgid "Enter code"
+msgstr ""
+
+msgid "QQ Captcha Verification"
+msgstr ""
+
+msgid "Enter the text from the image"
+msgstr ""
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
+"%s"
+msgstr ""
+
+msgid "Socket error"
+msgstr ""
+
+msgid "Getting server"
+msgstr ""
+
+msgid "Requesting token"
+msgstr ""
+
+msgid "Unable to resolve hostname"
+msgstr ""
+
+msgid "Invalid server or port"
+msgstr ""
+
+msgid "Connecting to server"
+msgstr ""
+
+msgid "QQ Error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server News:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+#, c-format
+msgid "From %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Server notice From %s: \n"
+"%s"
+msgstr ""
+
+msgid "Unknown SERVER CMD"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reply of %s(0x%02X)\n"
+"Room %u, reply 0x%02X"
+msgstr ""
+
+msgid "QQ Qun Command"
+msgstr ""
+
+msgid "Unable to decrypt login reply"
+msgstr ""
+
+msgid "Unknown LOGIN CMD"
+msgstr ""
+
+msgid "Unknown CLIENT CMD"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr ""
+
+msgid "File Send"
+msgstr ""
+
+#, c-format
+msgid "%d cancelled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "Info for Group %s"
+msgstr ""
+
+msgid "Notes Address Book Information"
+msgstr ""
+
+msgid "Invite Group to Conference..."
+msgstr ""
+
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+msgid "Sending Handshake"
+msgstr ""
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr ""
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+msgid "Login Redirected"
+msgstr ""
+
+msgid "Forcing Login"
+msgstr ""
+
+msgid "Login Acknowledged"
+msgstr ""
+
+msgid "Starting Services"
+msgstr ""
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+msgid "Conference Closed"
+msgstr ""
+
+msgid "Unable to send message: "
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+msgid "Place Closed"
+msgstr ""
+
+msgid "Microphone"
+msgstr ""
+
+msgid "Speakers"
+msgstr ""
+
+msgid "Video Camera"
+msgstr ""
+
+msgid "File Transfer"
+msgstr ""
+
+msgid "Supports"
+msgstr ""
+
+msgid "External User"
+msgstr ""
+
+msgid "Create conference with user"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+msgid "New Conference"
+msgstr ""
+
+msgid "Create"
+msgstr ""
+
+msgid "Available Conferences"
+msgstr ""
+
+msgid "Create New Conference..."
+msgstr ""
+
+msgid "Invite user to a conference"
+msgstr ""
+
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+msgid "Invite to Conference"
+msgstr ""
+
+msgid "Invite to Conference..."
+msgstr ""
+
+msgid "Send TEST Announcement"
+msgstr ""
+
+msgid "Topic:"
+msgstr ""
+
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+msgid "Connect"
+msgstr ""
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+msgid "Last Known Client"
+msgstr ""
+
+msgid "User Name"
+msgstr ""
+
+msgid "Sametime ID"
+msgstr ""
+
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+msgid "Select User"
+msgstr ""
+
+msgid "Unable to add user: user not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+
+msgid "Remotely Stored Buddy List"
+msgstr ""
+
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+msgid "Local Buddy List Only"
+msgstr ""
+
+msgid "Merge List from Server"
+msgstr ""
+
+msgid "Merge and Save List to Server"
+msgstr ""
+
+msgid "Synchronize List with Server"
+msgstr ""
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+msgid "Unable to add group: group exists"
+msgstr ""
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+msgid "Unable to add group"
+msgstr ""
+
+msgid "Possible Matches"
+msgstr ""
+
+msgid "Notes Address Book group results"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+msgid "Select Notes Address Book"
+msgstr ""
+
+msgid "Unable to add group: group not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+msgid "Notes Address Book Group"
+msgstr ""
+
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#, c-format
+msgid "Search results for '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+msgid "Search Results"
+msgstr ""
+
+msgid "No matches"
+msgstr ""
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+msgid "No Matches"
+msgstr ""
+
+msgid "Search for a user"
+msgstr ""
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+msgid "User Search"
+msgstr ""
+
+msgid "Import Sametime List..."
+msgstr ""
+
+msgid "Export Sametime List..."
+msgstr ""
+
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+msgid "User Search..."
+msgstr ""
+
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr ""
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+msgid "Key Agreement"
+msgstr ""
+
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+msgid "Error occurred during key agreement"
+msgstr ""
+
+msgid "Key Agreement failed"
+msgstr ""
+
+msgid "Timeout during key agreement"
+msgstr ""
+
+msgid "Key agreement was aborted"
+msgstr ""
+
+msgid "Key agreement is already started"
+msgstr ""
+
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+msgid "Key Agreement Request"
+msgstr ""
+
+msgid "IM With Password"
+msgstr ""
+
+msgid "Cannot set IM key"
+msgstr ""
+
+msgid "Set IM Password"
+msgstr ""
+
+msgid "Get Public Key"
+msgstr ""
+
+msgid "Cannot fetch the public key"
+msgstr ""
+
+msgid "Show Public Key"
+msgstr ""
+
+msgid "Could not load public key"
+msgstr ""
+
+msgid "User Information"
+msgstr ""
+
+msgid "Cannot get user information"
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+msgid "_Import..."
+msgstr ""
+
+msgid "Select correct user"
+msgstr ""
+
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+msgid "Detached"
+msgstr ""
+
+msgid "Indisposed"
+msgstr ""
+
+msgid "Wake Me Up"
+msgstr ""
+
+msgid "Hyper Active"
+msgstr ""
+
+msgid "Robot"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "User Modes"
+msgstr ""
+
+msgid "Preferred Contact"
+msgstr ""
+
+msgid "Preferred Language"
+msgstr ""
+
+msgid "Device"
+msgstr ""
+
+msgid "Timezone"
+msgstr ""
+
+msgid "Geolocation"
+msgstr ""
+
+msgid "Reset IM Key"
+msgstr ""
+
+msgid "IM with Key Exchange"
+msgstr ""
+
+msgid "IM with Password"
+msgstr ""
+
+msgid "Get Public Key..."
+msgstr ""
+
+msgid "Kill User"
+msgstr ""
+
+msgid "Draw On Whiteboard"
+msgstr ""
+
+msgid "_Passphrase:"
+msgstr ""
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+msgid "Channel Information"
+msgstr ""
+
+msgid "Cannot get channel information"
+msgstr ""
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr ""
+
+msgid "Channel Passphrase"
+msgstr ""
+
+msgid "Channel Public Keys List"
+msgstr ""
+
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+msgid "Channel Authentication"
+msgstr ""
+
+msgid "Add / Remove"
+msgstr ""
+
+msgid "Group Name"
+msgstr ""
+
+msgid "Passphrase"
+msgstr ""
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+msgid "Add Channel Private Group"
+msgstr ""
+
+msgid "User Limit"
+msgstr ""
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+msgid "Invite List"
+msgstr ""
+
+msgid "Ban List"
+msgstr ""
+
+msgid "Add Private Group"
+msgstr ""
+
+msgid "Reset Permanent"
+msgstr ""
+
+msgid "Set Permanent"
+msgstr ""
+
+msgid "Set User Limit"
+msgstr ""
+
+msgid "Reset Topic Restriction"
+msgstr ""
+
+msgid "Set Topic Restriction"
+msgstr ""
+
+msgid "Reset Private Channel"
+msgstr ""
+
+msgid "Set Private Channel"
+msgstr ""
+
+msgid "Reset Secret Channel"
+msgstr ""
+
+msgid "Set Secret Channel"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+msgid "Join Private Group"
+msgstr ""
+
+msgid "Cannot join private group"
+msgstr ""
+
+msgid "Call Command"
+msgstr ""
+
+msgid "Cannot call command"
+msgstr ""
+
+msgid "Unknown command"
+msgstr ""
+
+msgid "Secure File Transfer"
+msgstr ""
+
+msgid "Error during file transfer"
+msgstr ""
+
+msgid "Remote disconnected"
+msgstr ""
+
+msgid "Permission denied"
+msgstr ""
+
+msgid "Key agreement failed"
+msgstr ""
+
+msgid "Connection timed out"
+msgstr ""
+
+msgid "Creating connection failed"
+msgstr ""
+
+msgid "File transfer session does not exist"
+msgstr ""
+
+msgid "No file transfer session active"
+msgstr ""
+
+msgid "File transfer already started"
+msgstr ""
+
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+msgid "Could not start the file transfer"
+msgstr ""
+
+msgid "Cannot send file"
+msgstr ""
+
+msgid "Error occurred"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+msgid "Server signoff"
+msgstr ""
+
+msgid "Personal Information"
+msgstr ""
+
+msgid "Birth Day"
+msgstr ""
+
+msgid "Job Role"
+msgstr ""
+
+msgid "Organization"
+msgstr ""
+
+msgid "Unit"
+msgstr ""
+
+msgid "Join Chat"
+msgstr ""
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+msgid "Real Name"
+msgstr ""
+
+msgid "Status Text"
+msgstr ""
+
+msgid "Public Key Fingerprint"
+msgstr ""
+
+msgid "Public Key Babbleprint"
+msgstr ""
+
+msgid "_More..."
+msgstr ""
+
+msgid "Detach From Server"
+msgstr ""
+
+msgid "Cannot detach"
+msgstr ""
+
+msgid "Cannot set topic"
+msgstr ""
+
+msgid "Failed to change nickname"
+msgstr ""
+
+msgid "Roomlist"
+msgstr ""
+
+msgid "Cannot get room list"
+msgstr ""
+
+msgid "Network is empty"
+msgstr ""
+
+msgid "No public key was received"
+msgstr ""
+
+msgid "Server Information"
+msgstr ""
+
+msgid "Cannot get server information"
+msgstr ""
+
+msgid "Server Statistics"
+msgstr ""
+
+msgid "Cannot get server statistics"
+msgstr ""
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+msgid "Network Statistics"
+msgstr ""
+
+msgid "Ping"
+msgstr ""
+
+msgid "Ping failed"
+msgstr ""
+
+msgid "Ping reply received from server"
+msgstr ""
+
+msgid "Could not kill user"
+msgstr ""
+
+msgid "WATCH"
+msgstr ""
+
+msgid "Cannot watch user"
+msgstr ""
+
+msgid "Resuming session"
+msgstr ""
+
+msgid "Authenticating connection"
+msgstr ""
+
+msgid "Verifying server public key"
+msgstr ""
+
+msgid "Passphrase required"
+msgstr ""
+
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+msgid "Verify Public Key"
+msgstr ""
+
+msgid "_View..."
+msgstr ""
+
+msgid "Unsupported public key type"
+msgstr ""
+
+msgid "Disconnected by server"
+msgstr ""
+
+msgid "Error connecting to SILC Server"
+msgstr ""
+
+msgid "Key Exchange failed"
+msgstr ""
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+msgid "Performing key exchange"
+msgstr ""
+
+msgid "Unable to load SILC key pair"
+msgstr ""
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr ""
+
+msgid "Out of memory"
+msgstr ""
+
+msgid "Unable to initialize SILC protocol"
+msgstr ""
+
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#, c-format
+msgid "Download %s: %s"
+msgstr ""
+
+msgid "Your Current Mood"
+msgstr ""
+
+#, c-format
+msgid "Normal"
+msgstr ""
+
+msgid "In love"
+msgstr ""
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+msgid "SMS"
+msgstr ""
+
+msgid "MMS"
+msgstr ""
+
+msgid "Video conferencing"
+msgstr ""
+
+msgid "Your Current Status"
+msgstr ""
+
+msgid "Online Services"
+msgstr ""
+
+msgid "Let others see what services you are using"
+msgstr ""
+
+msgid "Let others see what computer you are using"
+msgstr ""
+
+msgid "Your VCard File"
+msgstr ""
+
+msgid "Timezone (UTC)"
+msgstr ""
+
+msgid "User Online Status Attributes"
+msgstr ""
+
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+
+msgid "Message of the Day"
+msgstr ""
+
+msgid "No Message of the Day available"
+msgstr ""
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+msgid "Passphrases do not match"
+msgstr ""
+
+msgid "Key Pair Generation failed"
+msgstr ""
+
+msgid "Key length"
+msgstr ""
+
+msgid "Public key file"
+msgstr ""
+
+msgid "Private key file"
+msgstr ""
+
+msgid "Passphrase (retype)"
+msgstr ""
+
+msgid "Generate Key Pair"
+msgstr ""
+
+msgid "Online Status"
+msgstr ""
+
+msgid "View Message of the Day"
+msgstr ""
+
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+msgid "Topic too long"
+msgstr ""
+
+msgid "You must specify a nick"
+msgstr ""
+
+#, c-format
+msgid "channel %s not found"
+msgstr ""
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr ""
+
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+msgid "list:  List channels on this network"
+msgstr ""
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+msgid "detach:  Detach this session"
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr ""
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Public Key file"
+msgstr ""
+
+msgid "Private Key file"
+msgstr ""
+
+msgid "Cipher"
+msgstr ""
+
+msgid "HMAC"
+msgstr ""
+
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+msgid "Public key authentication"
+msgstr ""
+
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+msgid "Block messages to whiteboard"
+msgstr ""
+
+msgid "Automatically open whiteboard"
+msgstr ""
+
+msgid "Digitally sign and verify all messages"
+msgstr ""
+
+msgid "Creating SILC key pair..."
+msgstr ""
+
+msgid "Unable to create SILC key pair"
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+msgid "Public Key Information"
+msgstr ""
+
+msgid "Paging"
+msgstr ""
+
+msgid "Video Conferencing"
+msgstr ""
+
+msgid "Computer"
+msgstr ""
+
+msgid "PDA"
+msgstr ""
+
+msgid "Terminal"
+msgstr ""
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+msgid "Whiteboard"
+msgstr ""
+
+msgid "No server statistics available"
+msgstr ""
+
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr ""
+
+msgid "Unable to initialize SILC Client connection"
+msgstr ""
+
+msgid "John Noname"
+msgstr ""
+
+#, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr ""
+
+msgid "Unable to create connection"
+msgstr ""
+
+msgid "Unknown server response"
+msgstr ""
+
+msgid "Unable to create listen socket"
+msgstr ""
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+msgid "SIP connect server not specified"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+msgid "Use UDP"
+msgstr ""
+
+msgid "Use proxy"
+msgstr ""
+
+msgid "Proxy"
+msgstr ""
+
+msgid "Auth User"
+msgstr ""
+
+msgid "Auth Domain"
+msgstr ""
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Use account proxy for SSL connections"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+msgid "Your SMS was not delivered"
+msgstr ""
+
+msgid "Your Yahoo! message did not get sent."
+msgstr ""
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+msgid "Add buddy rejected"
+msgstr ""
+
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
+msgstr ""
+
+#. username or password missing
+msgid "Username or password missing"
+msgstr ""
+
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+msgid "Failed Yahoo! Authentication"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+
+msgid "Ignore buddy?"
+msgstr ""
+
+msgid "Invalid username or password"
+msgstr ""
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+msgid "Unable to add buddy to server list"
+msgstr ""
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+msgid "Received unexpected HTTP response from server"
+msgstr ""
+
+#, c-format
+msgid "Lost connection with %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr ""
+
+msgid "Not at Home"
+msgstr ""
+
+msgid "Not at Desk"
+msgstr ""
+
+msgid "Not in Office"
+msgstr ""
+
+msgid "On Vacation"
+msgstr ""
+
+msgid "Stepped Out"
+msgstr ""
+
+msgid "Not on server list"
+msgstr ""
+
+msgid "Appear Online"
+msgstr ""
+
+msgid "Appear Permanently Offline"
+msgstr ""
+
+msgid "Presence"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Permanently Offline"
+msgstr ""
+
+msgid "Join in Chat"
+msgstr ""
+
+msgid "Initiate Conference"
+msgstr ""
+
+msgid "Presence Settings"
+msgstr ""
+
+msgid "Start Doodling"
+msgstr ""
+
+msgid "Select the ID you want to activate"
+msgstr ""
+
+msgid "Join whom in chat?"
+msgstr ""
+
+msgid "Activate ID..."
+msgstr ""
+
+msgid "Join User in Chat..."
+msgstr ""
+
+msgid "Open Inbox"
+msgstr ""
+
+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 ""
+
+msgid "Write Error"
+msgstr ""
+
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+msgid "Yahoo! Profile"
+msgstr ""
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+
+msgid "Yahoo! ID"
+msgstr ""
+
+msgid "Hobbies"
+msgstr ""
+
+msgid "Latest News"
+msgstr ""
+
+msgid "Home Page"
+msgstr ""
+
+msgid "Cool Link 1"
+msgstr ""
+
+msgid "Cool Link 2"
+msgstr ""
+
+msgid "Cool Link 3"
+msgstr ""
+
+msgid "Last Update"
+msgstr ""
+
+msgid ""
+"This profile is in a language or format that is not supported at this time."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+msgid "The user's profile is empty."
+msgstr ""
+
+#, c-format
+msgid "%s has declined to join."
+msgstr ""
+
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+msgid "Not available"
+msgstr ""
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+msgid "Fetching the room list failed."
+msgstr ""
+
+msgid "Voices"
+msgstr ""
+
+msgid "Webcams"
+msgstr ""
+
+msgid "Connection problem"
+msgstr ""
+
+msgid "Unable to fetch room list."
+msgstr ""
+
+msgid "User Rooms"
+msgstr ""
+
+msgid "Connection problem with the YCHT server"
+msgstr ""
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr ""
+
+msgid "Hidden or not logged-in"
+msgstr ""
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr ""
+
+msgid "Anyone"
+msgstr ""
+
+msgid "_Class:"
+msgstr ""
+
+msgid "_Instance:"
+msgstr ""
+
+msgid "_Recipient:"
+msgstr ""
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+msgid "Resubscribe"
+msgstr ""
+
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr ""
+
+msgid "Use tzc"
+msgstr ""
+
+msgid "tzc command"
+msgstr ""
+
+msgid "Export to .anyone"
+msgstr ""
+
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+msgid "Import from .anyone"
+msgstr ""
+
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+msgid "Realm"
+msgstr ""
+
+msgid "Exposure"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr ""
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s"
+msgstr ""
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr ""
+
+msgid "_No"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+msgid "_Accept"
+msgstr ""
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr ""
+
+msgid "saved statuses"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr ""
+
+msgid "Accept chat invitation?"
+msgstr ""
+
+#. Shortcut
+msgid "Shortcut"
+msgstr ""
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+msgid "Stored Image"
+msgstr ""
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+msgid "SSL Connection Failed"
+msgstr ""
+
+msgid "SSL Handshake Failed"
+msgstr ""
+
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+msgid "Unknown SSL error"
+msgstr ""
+
+msgid "Unset"
+msgstr ""
+
+msgid "Do not disturb"
+msgstr ""
+
+msgid "Extended away"
+msgstr ""
+
+msgid "Listening to music"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr ""
+
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr ""
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, c-format
+msgid "%x %X"
+msgstr ""
+
+msgid "Calculating..."
+msgstr ""
+
+msgid "Unknown."
+msgstr ""
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#, c-format
+msgid " (%s)"
+msgstr ""
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr ""
+
+#. 10060
+#, c-format
+msgid "Connection timed out."
+msgstr ""
+
+#. 10061
+#, c-format
+msgid "Connection refused."
+msgstr ""
+
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr ""
+
+#, c-format
+msgid "Error Reading %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+
+msgid "Internet Messenger"
+msgstr ""
+
+msgid "Pidgin Internet Messenger"
+msgstr ""
+
+msgid "Orientation"
+msgstr ""
+
+msgid "The orientation of the tray."
+msgstr ""
+
+#. Build the login options frame.
+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 ""
+
+msgid "SOCKS 4"
+msgstr ""
+
+msgid "SOCKS 5"
+msgstr ""
+
+msgid "Use Environmental Settings"
+msgstr ""
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr ""
+
+msgid "Proxy _type:"
+msgstr ""
+
+msgid "_Host:"
+msgstr ""
+
+msgid "_Port:"
+msgstr ""
+
+msgid "Pa_ssword:"
+msgstr ""
+
+msgid "Unable to save new account"
+msgstr ""
+
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+msgid "Add Account"
+msgstr ""
+
+msgid "_Basic"
+msgstr ""
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+msgid "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 ""
+
+#. 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] ""
+msgstr[1] ""
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+msgid "Please update the necessary fields."
+msgstr ""
+
+msgid "A_ccount"
+msgstr ""
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+msgid "Room _List"
+msgstr ""
+
+msgid "_Block"
+msgstr ""
+
+msgid "Un_block"
+msgstr ""
+
+msgid "Move to"
+msgstr ""
+
+msgid "Get _Info"
+msgstr ""
+
+msgid "I_M"
+msgstr ""
+
+msgid "_Audio Call"
+msgstr ""
+
+msgid "Audio/_Video Call"
+msgstr ""
+
+msgid "_Video Call"
+msgstr ""
+
+msgid "_Send File..."
+msgstr ""
+
+msgid "Add Buddy _Pounce..."
+msgstr ""
+
+msgid "View _Log"
+msgstr ""
+
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr ""
+
+msgid "_Remove"
+msgstr ""
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr ""
+
+msgid "Add _Buddy..."
+msgstr ""
+
+msgid "Add C_hat..."
+msgstr ""
+
+msgid "_Delete Group"
+msgstr ""
+
+msgid "_Rename"
+msgstr ""
+
+#. join button
+msgid "_Join"
+msgstr ""
+
+msgid "Auto-Join"
+msgstr ""
+
+msgid "Persistent"
+msgstr ""
+
+msgid "_Edit Settings..."
+msgstr ""
+
+msgid "_Collapse"
+msgstr ""
+
+msgid "_Expand"
+msgstr ""
+
+msgid "/Tools/Mute Sounds"
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr ""
+
+#. Buddies menu
+msgid "/_Buddies"
+msgstr ""
+
+msgid "/Buddies/New Instant _Message..."
+msgstr ""
+
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+msgid "/Buddies/View User _Log..."
+msgstr ""
+
+msgid "/Buddies/Sh_ow"
+msgstr ""
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+msgid "/Buddies/_Sort Buddies"
+msgstr ""
+
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+msgid "/Buddies/_Quit"
+msgstr ""
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr ""
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+msgid "/_Tools"
+msgstr ""
+
+msgid "/Tools/Buddy _Pounces"
+msgstr ""
+
+msgid "/Tools/_Certificates"
+msgstr ""
+
+msgid "/Tools/Custom Smile_ys"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr ""
+
+msgid "/Tools/Pr_eferences"
+msgstr ""
+
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr ""
+
+msgid "/Tools/R_oom List"
+msgstr ""
+
+msgid "/Tools/System _Log"
+msgstr ""
+
+msgid "/Tools/Mute _Sounds"
+msgstr ""
+
+#. Help
+msgid "/_Help"
+msgstr ""
+
+msgid "/Help/Online _Help"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr ""
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+msgid "(no topic set)"
+msgstr ""
+
+msgid "Buddy Alias"
+msgstr ""
+
+msgid "Logged In"
+msgstr ""
+
+msgid "Last Seen"
+msgstr ""
+
+msgid "Spooky"
+msgstr ""
+
+msgid "Awesome"
+msgstr ""
+
+msgid "Rockin'"
+msgstr ""
+
+msgid "Total Buddies"
+msgstr ""
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr ""
+
+#, c-format
+msgid "Idle %dm"
+msgstr ""
+
+msgid "/Buddies/New Instant Message..."
+msgstr ""
+
+msgid "/Buddies/Join a Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User Info..."
+msgstr ""
+
+msgid "/Buddies/Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add Chat..."
+msgstr ""
+
+msgid "/Buddies/Add Group..."
+msgstr ""
+
+msgid "/Tools/Privacy"
+msgstr ""
+
+msgid "/Tools/Room List"
+msgstr ""
+
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "By status"
+msgstr ""
+
+msgid "By recent log activity"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr ""
+
+#, c-format
+msgid "%s disabled"
+msgstr ""
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Re-enable"
+msgstr ""
+
+msgid "SSL FAQs"
+msgstr ""
+
+msgid "Welcome back!"
+msgstr ""
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "<b>Username:</b>"
+msgstr ""
+
+msgid "<b>Password:</b>"
+msgstr ""
+
+msgid "_Login"
+msgstr ""
+
+msgid "/Accounts"
+msgstr ""
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+msgid "Add a buddy.\n"
+msgstr ""
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr ""
+
+msgid "Add buddy to _group:"
+msgstr ""
+
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+msgid "A_lias:"
+msgstr ""
+
+msgid "_Group:"
+msgstr ""
+
+msgid "Auto_join when account 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 ""
+
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+msgid "_Edit Account"
+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 ""
+
+msgid "Unknown command."
+msgstr ""
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+msgid "Invite Buddy Into Chat Room"
+msgstr ""
+
+msgid "_Buddy:"
+msgstr ""
+
+msgid "_Message:"
+msgstr ""
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+msgid "Save Conversation"
+msgstr ""
+
+msgid "Find"
+msgstr ""
+
+msgid "_Search for:"
+msgstr ""
+
+msgid "Un-Ignore"
+msgstr ""
+
+msgid "Ignore"
+msgstr ""
+
+msgid "Get Away Message"
+msgstr ""
+
+msgid "Last Said"
+msgstr ""
+
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+msgid "Save Icon"
+msgstr ""
+
+msgid "Animate"
+msgstr ""
+
+msgid "Hide Icon"
+msgstr ""
+
+msgid "Save Icon As..."
+msgstr ""
+
+msgid "Set Custom Icon..."
+msgstr ""
+
+msgid "Change Size"
+msgstr ""
+
+msgid "Show All"
+msgstr ""
+
+#. Conversation menu
+msgid "/_Conversation"
+msgstr ""
+
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+msgid "/Conversation/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 ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+msgid "/Conversation/M_ore"
+msgstr ""
+
+msgid "/Conversation/Al_ias..."
+msgstr ""
+
+msgid "/Conversation/_Block..."
+msgstr ""
+
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+msgid "/Conversation/_Add..."
+msgstr ""
+
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+msgid "/Conversation/_Close"
+msgstr ""
+
+#. Options
+msgid "/_Options"
+msgstr ""
+
+msgid "/Options/Enable _Logging"
+msgstr ""
+
+msgid "/Options/Enable _Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr ""
+
+msgid "/Options/Show Ti_mestamps"
+msgstr ""
+
+msgid "/Conversation/More"
+msgstr ""
+
+msgid "/Options"
+msgstr ""
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+msgid "/Conversation"
+msgstr ""
+
+msgid "/Conversation/View Log"
+msgstr ""
+
+msgid "/Conversation/Media/Audio Call"
+msgstr ""
+
+msgid "/Conversation/Media/Video Call"
+msgstr ""
+
+msgid "/Conversation/Media/Audio\\/Video Call"
+msgstr ""
+
+msgid "/Conversation/Send File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+msgid "/Conversation/Get Info"
+msgstr ""
+
+msgid "/Conversation/Invite..."
+msgstr ""
+
+msgid "/Conversation/Alias..."
+msgstr ""
+
+msgid "/Conversation/Block..."
+msgstr ""
+
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+msgid "/Conversation/Add..."
+msgstr ""
+
+msgid "/Conversation/Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+msgid "/Options/Enable Logging"
+msgstr ""
+
+msgid "/Options/Enable Sounds"
+msgstr ""
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr ""
+
+msgid "/Options/Show Timestamps"
+msgstr ""
+
+msgid "User is typing..."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr ""
+
+msgid "_Send"
+msgstr ""
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr ""
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Typing"
+msgstr ""
+
+msgid "Stopped Typing"
+msgstr ""
+
+msgid "Nick Said"
+msgstr ""
+
+msgid "Unread Messages"
+msgstr ""
+
+msgid "New Event"
+msgstr ""
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+msgid "Confirm close"
+msgstr ""
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+
+msgid "Close other tabs"
+msgstr ""
+
+msgid "Close all tabs"
+msgstr ""
+
+msgid "Detach this tab"
+msgstr ""
+
+msgid "Close this tab"
+msgstr ""
+
+msgid "Close conversation"
+msgstr ""
+
+msgid "Last created window"
+msgstr ""
+
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+msgid "New window"
+msgstr ""
+
+msgid "By group"
+msgstr ""
+
+msgid "By account"
+msgstr ""
+
+msgid "Save Debug Log"
+msgstr ""
+
+msgid "Invert"
+msgstr ""
+
+msgid "Highlight matches"
+msgstr ""
+
+msgid "_Icon Only"
+msgstr ""
+
+msgid "_Text Only"
+msgstr ""
+
+msgid "_Both Icon & Text"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Right click for more options."
+msgstr ""
+
+msgid "Level "
+msgstr ""
+
+msgid "Select the debug filter level."
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Misc"
+msgstr ""
+
+msgid "Warning"
+msgstr ""
+
+msgid "Error "
+msgstr ""
+
+msgid "Fatal Error"
+msgstr ""
+
+msgid "bug master"
+msgstr ""
+
+msgid "artist"
+msgstr ""
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+msgid "voice and video"
+msgstr ""
+
+msgid "support"
+msgstr ""
+
+msgid "webmaster"
+msgstr ""
+
+msgid "Senior Contributor/QA"
+msgstr ""
+
+msgid "win32 port"
+msgstr ""
+
+msgid "maintainer"
+msgstr ""
+
+msgid "libfaim maintainer"
+msgstr ""
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+msgid "support/QA"
+msgstr ""
+
+msgid "XMPP"
+msgstr ""
+
+msgid "original author"
+msgstr ""
+
+msgid "lead developer"
+msgstr ""
+
+msgid "Afrikaans"
+msgstr ""
+
+msgid "Arabic"
+msgstr ""
+
+msgid "Belarusian Latin"
+msgstr ""
+
+msgid "Bulgarian"
+msgstr ""
+
+msgid "Bengali"
+msgstr ""
+
+msgid "Bosnian"
+msgstr ""
+
+msgid "Catalan"
+msgstr ""
+
+msgid "Valencian-Catalan"
+msgstr ""
+
+msgid "Czech"
+msgstr ""
+
+msgid "Danish"
+msgstr ""
+
+msgid "German"
+msgstr ""
+
+msgid "Dzongkha"
+msgstr ""
+
+msgid "Greek"
+msgstr ""
+
+msgid "Australian English"
+msgstr ""
+
+msgid "Canadian English"
+msgstr ""
+
+msgid "British English"
+msgstr ""
+
+msgid "Esperanto"
+msgstr ""
+
+msgid "Spanish"
+msgstr ""
+
+msgid "Estonian"
+msgstr ""
+
+msgid "Basque"
+msgstr ""
+
+msgid "Persian"
+msgstr ""
+
+msgid "Finnish"
+msgstr ""
+
+msgid "French"
+msgstr ""
+
+msgid "Irish"
+msgstr ""
+
+msgid "Galician"
+msgstr ""
+
+msgid "Gujarati"
+msgstr ""
+
+msgid "Gujarati Language Team"
+msgstr ""
+
+msgid "Hebrew"
+msgstr ""
+
+msgid "Hindi"
+msgstr ""
+
+msgid "Hungarian"
+msgstr ""
+
+msgid "Armenian"
+msgstr ""
+
+msgid "Indonesian"
+msgstr ""
+
+msgid "Italian"
+msgstr ""
+
+msgid "Japanese"
+msgstr ""
+
+msgid "Georgian"
+msgstr ""
+
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+msgid "Khmer"
+msgstr ""
+
+msgid "Kannada"
+msgstr ""
+
+msgid "Kannada Translation team"
+msgstr ""
+
+msgid "Korean"
+msgstr ""
+
+msgid "Kurdish"
+msgstr ""
+
+msgid "Lao"
+msgstr ""
+
+msgid "Lithuanian"
+msgstr ""
+
+msgid "Macedonian"
+msgstr ""
+
+msgid "Mongolian"
+msgstr ""
+
+msgid "Bokmål Norwegian"
+msgstr ""
+
+msgid "Nepali"
+msgstr ""
+
+msgid "Dutch, Flemish"
+msgstr ""
+
+msgid "Norwegian Nynorsk"
+msgstr ""
+
+msgid "Occitan"
+msgstr ""
+
+msgid "Punjabi"
+msgstr ""
+
+msgid "Polish"
+msgstr ""
+
+msgid "Portuguese"
+msgstr ""
+
+msgid "Portuguese-Brazil"
+msgstr ""
+
+msgid "Pashto"
+msgstr ""
+
+msgid "Romanian"
+msgstr ""
+
+msgid "Russian"
+msgstr ""
+
+msgid "Slovak"
+msgstr ""
+
+msgid "Slovenian"
+msgstr ""
+
+msgid "Albanian"
+msgstr ""
+
+msgid "Serbian"
+msgstr ""
+
+msgid "Sinhala"
+msgstr ""
+
+msgid "Swedish"
+msgstr ""
+
+msgid "Swahili"
+msgstr ""
+
+msgid "Tamil"
+msgstr ""
+
+msgid "Telugu"
+msgstr ""
+
+msgid "Thai"
+msgstr ""
+
+msgid "Turkish"
+msgstr ""
+
+msgid "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 ""
+
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font size=\"4\">Help 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 ""
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+msgstr ""
+
+msgid "Current Developers"
+msgstr ""
+
+msgid "Crazy Patch Writers"
+msgstr ""
+
+msgid "Retired Developers"
+msgstr ""
+
+msgid "Retired Crazy Patch Writers"
+msgstr ""
+
+msgid "Current Translators"
+msgstr ""
+
+msgid "Past Translators"
+msgstr ""
+
+msgid "Debugging Information"
+msgstr ""
+
+msgid "_Name"
+msgstr ""
+
+msgid "_Account"
+msgstr ""
+
+msgid "Get User Info"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+msgid "View User Log"
+msgstr ""
+
+msgid "Alias Contact"
+msgstr ""
+
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+msgid "Alias Buddy"
+msgstr ""
+
+msgid "Alias Chat"
+msgstr ""
+
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Remove Contact"
+msgstr ""
+
+msgid "_Remove Contact"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+
+msgid "Merge Groups"
+msgstr ""
+
+msgid "_Merge Groups"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Group"
+msgstr ""
+
+msgid "_Remove Group"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Buddy"
+msgstr ""
+
+msgid "_Remove Buddy"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Remove Chat"
+msgstr ""
+
+msgid "_Remove Chat"
+msgstr ""
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr ""
+
+msgid "Plu_gins"
+msgstr ""
+
+msgid "Pr_eferences"
+msgstr ""
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+msgid "_Quit"
+msgstr ""
+
+msgid "Not started"
+msgstr ""
+
+msgid "<b>Receiving As:</b>"
+msgstr ""
+
+msgid "<b>Receiving From:</b>"
+msgstr ""
+
+msgid "<b>Sending To:</b>"
+msgstr ""
+
+msgid "<b>Sending As:</b>"
+msgstr ""
+
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error running %s"
+msgstr ""
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+msgid "Filename:"
+msgstr ""
+
+msgid "Local File:"
+msgstr ""
+
+msgid "Speed:"
+msgstr ""
+
+msgid "Time Elapsed:"
+msgstr ""
+
+msgid "Time Remaining:"
+msgstr ""
+
+msgid "Close this window when all transfers _finish"
+msgstr ""
+
+msgid "C_lear finished transfers"
+msgstr ""
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr ""
+
+msgid "Paste as Plain _Text"
+msgstr ""
+
+msgid "_Reset formatting"
+msgstr ""
+
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+msgid "Hyperlink color"
+msgstr ""
+
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+msgid "Hyperlink visited color"
+msgstr ""
+
+msgid "Color to draw hyperlink after it has been visited (or activated)."
+msgstr ""
+
+msgid "Hyperlink prelight color"
+msgstr ""
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification"
+msgstr ""
+
+msgid "Typing notification font"
+msgstr ""
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+msgid "Enable typing notification"
+msgstr ""
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+
+msgid "Save Image"
+msgstr ""
+
+msgid "_Save Image..."
+msgstr ""
+
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+msgid "Select Font"
+msgstr ""
+
+msgid "Select Text Color"
+msgstr ""
+
+msgid "Select Background Color"
+msgstr ""
+
+msgid "_URL"
+msgstr ""
+
+msgid "_Description"
+msgstr ""
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+msgid "Insert Link"
+msgstr ""
+
+msgid "_Insert"
+msgstr ""
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+msgid "Insert Image"
+msgstr ""
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+msgid "Smile!"
+msgstr ""
+
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr ""
+
+msgid "_Font"
+msgstr ""
+
+msgid "Group Items"
+msgstr ""
+
+msgid "Ungroup Items"
+msgstr ""
+
+msgid "Bold"
+msgstr ""
+
+msgid "Italic"
+msgstr ""
+
+msgid "Underline"
+msgstr ""
+
+msgid "Strikethrough"
+msgstr ""
+
+msgid "Increase Font Size"
+msgstr ""
+
+msgid "Decrease Font Size"
+msgstr ""
+
+msgid "Font Face"
+msgstr ""
+
+msgid "Foreground Color"
+msgstr ""
+
+msgid "Reset Formatting"
+msgstr ""
+
+msgid "Insert IM Image"
+msgstr ""
+
+msgid "Insert Smiley"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr ""
+
+msgid "<i>_Italic</i>"
+msgstr ""
+
+msgid "<u>_Underline</u>"
+msgstr ""
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+
+msgid "_Normal"
+msgstr ""
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+msgid "_Font face"
+msgstr ""
+
+msgid "Foreground _color"
+msgstr ""
+
+msgid "Bac_kground color"
+msgstr ""
+
+msgid "_Image"
+msgstr ""
+
+msgid "_Link"
+msgstr ""
+
+msgid "_Horizontal rule"
+msgstr ""
+
+msgid "_Smile!"
+msgstr ""
+
+msgid "Log Deletion Failed"
+msgstr ""
+
+msgid "Check permissions and try again."
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+
+msgid "Delete Log?"
+msgstr ""
+
+msgid "Delete Log..."
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr ""
+
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Usage: %s [OPTION]...\n"
+"\n"
+msgstr ""
+
+msgid "DIR"
+msgstr ""
+
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
+msgid "NAME"
+msgstr ""
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled)."
+msgstr ""
+
+msgid "X display to use"
+msgstr ""
+
+msgid "display the current version and exit"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+msgstr ""
+
+#, c-format
+msgid "Exiting because another libpurple client is already running.\n"
+msgstr ""
+
+msgid "/_Media"
+msgstr ""
+
+msgid "/Media/_Hangup"
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start an audio/video session with you."
+msgstr ""
+
+#, c-format
+msgid "%s wishes to start a video session with you."
+msgstr ""
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr ""
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+msgid "Unable to open URL"
+msgstr ""
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+msgid "No message"
+msgstr ""
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+msgid "New Pounces"
+msgstr ""
+
+msgid "Dismiss"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
+msgstr ""
+
+msgid "The following plugins will be unloaded."
+msgstr ""
+
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+msgid "Unload Plugins"
+msgstr ""
+
+msgid "Could not unload plugin"
+msgstr ""
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+msgid "Author"
+msgstr ""
+
+msgid "<b>Written by:</b>"
+msgstr ""
+
+msgid "<b>Web site:</b>"
+msgstr ""
+
+msgid "<b>Filename:</b>"
+msgstr ""
+
+msgid "Configure Pl_ugin"
+msgstr ""
+
+msgid "<b>Plugin Details</b>"
+msgstr ""
+
+msgid "Select a file"
+msgstr ""
+
+msgid "Modify Buddy Pounce"
+msgstr ""
+
+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr ""
+
+msgid "_Account:"
+msgstr ""
+
+msgid "_Buddy name:"
+msgstr ""
+
+msgid "Si_gns on"
+msgstr ""
+
+msgid "Signs o_ff"
+msgstr ""
+
+msgid "Goes a_way"
+msgstr ""
+
+msgid "Ret_urns from away"
+msgstr ""
+
+msgid "Becomes _idle"
+msgstr ""
+
+msgid "Is no longer i_dle"
+msgstr ""
+
+msgid "Starts _typing"
+msgstr ""
+
+msgid "P_auses while typing"
+msgstr ""
+
+msgid "Stops t_yping"
+msgstr ""
+
+msgid "Sends a _message"
+msgstr ""
+
+msgid "Ope_n an IM window"
+msgstr ""
+
+msgid "_Pop up a notification"
+msgstr ""
+
+msgid "Send a _message"
+msgstr ""
+
+msgid "E_xecute a command"
+msgstr ""
+
+msgid "P_lay a sound"
+msgstr ""
+
+msgid "Brows_e..."
+msgstr ""
+
+msgid "Br_owse..."
+msgstr ""
+
+msgid "Pre_view"
+msgstr ""
+
+msgid "P_ounce only when my status is not Available"
+msgstr ""
+
+msgid "_Recurring"
+msgstr ""
+
+msgid "Pounce Target"
+msgstr ""
+
+msgid "Started typing"
+msgstr ""
+
+msgid "Paused while typing"
+msgstr ""
+
+msgid "Signed on"
+msgstr ""
+
+msgid "Returned from being idle"
+msgstr ""
+
+msgid "Returned from being away"
+msgstr ""
+
+msgid "Stopped typing"
+msgstr ""
+
+msgid "Signed off"
+msgstr ""
+
+msgid "Became idle"
+msgstr ""
+
+msgid "Went away"
+msgstr ""
+
+msgid "Sent a message"
+msgstr ""
+
+msgid "Unknown.... Please report this!"
+msgstr ""
+
+msgid "(Custom)"
+msgstr ""
+
+msgid "Penguin Pimps"
+msgstr ""
+
+msgid "The default Pidgin sound theme"
+msgstr ""
+
+msgid "The default Pidgin buddy list theme"
+msgstr ""
+
+msgid "The default Pidgin status icon theme"
+msgstr ""
+
+msgid "Theme failed to unpack."
+msgstr ""
+
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
+msgid "Theme Selections"
+msgstr ""
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+
+msgid "Buddy List Theme:"
+msgstr ""
+
+msgid "Status Icon Theme:"
+msgstr ""
+
+msgid "Sound Theme:"
+msgstr ""
+
+msgid "Smiley Theme:"
+msgstr ""
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+#. System Tray
+msgid "System Tray Icon"
+msgstr ""
+
+msgid "_Show system tray icon:"
+msgstr ""
+
+msgid "On unread messages"
+msgstr ""
+
+msgid "Conversation Window"
+msgstr ""
+
+msgid "_Hide new IM conversations:"
+msgstr ""
+
+msgid "When away"
+msgstr ""
+
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
+#. All the tab options!
+msgid "Tabs"
+msgstr ""
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+msgid "_Placement:"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Left Vertical"
+msgstr ""
+
+msgid "Right Vertical"
+msgstr ""
+
+msgid "N_ew conversations:"
+msgstr ""
+
+msgid "Show _formatting on incoming messages"
+msgstr ""
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+msgid "Show _detailed information"
+msgstr ""
+
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+msgid "Highlight _misspelled words"
+msgstr ""
+
+msgid "Use smooth-scrolling"
+msgstr ""
+
+msgid "F_lash window when IMs are received"
+msgstr ""
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+msgid "Font"
+msgstr ""
+
+msgid "Use 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 ""
+
+msgid "ST_UN server:"
+msgstr ""
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+msgid "Public _IP:"
+msgstr ""
+
+msgid "Ports"
+msgstr ""
+
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+msgid "_Manually specify range of ports to listen on:"
+msgstr ""
+
+msgid "_Start:"
+msgstr ""
+
+msgid "_End:"
+msgstr ""
+
+#. TURN server
+msgid "Relay Server (TURN)"
+msgstr ""
+
+msgid "_TURN server:"
+msgstr ""
+
+msgid "Use_rname:"
+msgstr ""
+
+msgid "Pass_word:"
+msgstr ""
+
+msgid "Seamonkey"
+msgstr ""
+
+msgid "Opera"
+msgstr ""
+
+msgid "Netscape"
+msgstr ""
+
+msgid "Mozilla"
+msgstr ""
+
+msgid "Konqueror"
+msgstr ""
+
+msgid "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 ""
+
+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 ""
+
+msgid "Proxy Server"
+msgstr ""
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr ""
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+msgid "Proxy t_ype:"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+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 ""
+
+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 ""
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr ""
+
+msgid "Block User"
+msgstr ""
+
+msgid "Type a user to block."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr ""
+
+msgid "Apply"
+msgstr ""
+
+msgid "That file already exists"
+msgstr ""
+
+msgid "Would you like to overwrite it?"
+msgstr ""
+
+msgid "Overwrite"
+msgstr ""
+
+msgid "Choose New Name"
+msgstr ""
+
+msgid "Select Folder..."
+msgstr ""
+
+#. list button
+msgid "_Get List"
+msgstr ""
+
+#. add button
+msgid "_Add Chat"
+msgstr ""
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr ""
+
+#. Use button
+msgid "_Use"
+msgstr ""
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+msgid "Different"
+msgstr ""
+
+msgid "_Title:"
+msgstr ""
+
+msgid "_Status:"
+msgstr ""
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr ""
+
+#, c-format
+msgid "Status for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
+msgid "Custom Smiley"
+msgstr ""
+
+msgid "Duplicate Shortcut"
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr ""
+
+msgid "_Image:"
+msgstr ""
+
+#. Shortcut text
+msgid "S_hortcut text:"
+msgstr ""
+
+msgid "Smiley"
+msgstr ""
+
+msgid "Shortcut Text"
+msgstr ""
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
+msgid "Select Buddy Icon"
+msgstr ""
+
+msgid "Click to change your buddyicon for this account."
+msgstr ""
+
+msgid "Click to change your buddyicon for all accounts."
+msgstr ""
+
+msgid "Waiting for network connection"
+msgstr ""
+
+msgid "New status..."
+msgstr ""
+
+msgid "Saved statuses..."
+msgstr ""
+
+msgid "Status Selector"
+msgstr ""
+
+msgid "Google Talk"
+msgstr ""
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+msgid "Failed to load image"
+msgstr ""
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+msgid "You have dragged an image"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+msgid "Set as buddy icon"
+msgstr ""
+
+msgid "Send image file"
+msgstr ""
+
+msgid "Insert in message"
+msgstr ""
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+msgid "Cannot send launcher"
+msgstr ""
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+msgid "Icon Error"
+msgstr ""
+
+msgid "Could not set icon"
+msgstr ""
+
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+msgid "_Open Link"
+msgstr ""
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
+msgid "_Open File"
+msgstr ""
+
+msgid "Open _Containing Directory"
+msgstr ""
+
+msgid "Save File"
+msgstr ""
+
+msgid "_Play Sound"
+msgstr ""
+
+msgid "_Save File"
+msgstr ""
+
+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 ""
+
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+msgid "Conversation Colors"
+msgstr ""
+
+msgid "Customize colors in the conversation window"
+msgstr ""
+
+msgid "Error Messages"
+msgstr ""
+
+msgid "Highlighted Messages"
+msgstr ""
+
+msgid "System Messages"
+msgstr ""
+
+msgid "Sent Messages"
+msgstr ""
+
+msgid "Received Messages"
+msgstr ""
+
+#, c-format
+msgid "Select Color for %s"
+msgstr ""
+
+msgid "Ignore incoming format"
+msgstr ""
+
+msgid "Apply in Chats"
+msgstr ""
+
+msgid "Apply in IMs"
+msgstr ""
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+msgid "_Browse"
+msgstr ""
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+msgid "By conversation count"
+msgstr ""
+
+msgid "Conversation Placement"
+msgstr ""
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+msgid "Number of conversations per window"
+msgstr ""
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+msgid "Middle mouse button"
+msgstr ""
+
+msgid "Right mouse button"
+msgstr ""
+
+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+msgid "Instant Messaging"
+msgstr ""
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+msgid "Group:"
+msgstr ""
+
+#. "New Person" button
+msgid "New Person"
+msgstr ""
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr ""
+
+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the expander
+msgid "User _details"
+msgstr ""
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr ""
+
+msgid "Unable to send email"
+msgstr ""
+
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+msgid "Add to Address Book"
+msgstr ""
+
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr ""
+
+msgid "Please enter the person's information below."
+msgstr ""
+
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+msgid "Account type:"
+msgstr ""
+
+#. Optional Information section
+msgid "Optional information:"
+msgstr ""
+
+msgid "First name:"
+msgstr ""
+
+msgid "Last name:"
+msgstr ""
+
+msgid "Email:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
+msgid "History"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+msgid "Mail Checker"
+msgstr ""
+
+msgid "Checks for new local mail."
+msgstr ""
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+msgid "Markerline"
+msgstr ""
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+msgid "Jump to markerline"
+msgstr ""
+
+msgid "Draw Markerline in "
+msgstr ""
+
+msgid "_IM windows"
+msgstr ""
+
+msgid "C_hat windows"
+msgstr ""
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+msgid "Music messaging session confirmed."
+msgstr ""
+
+msgid "Music Messaging"
+msgstr ""
+
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+msgid "Error Running Editor"
+msgstr ""
+
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr ""
+
+msgid "Score Editor Path"
+msgstr ""
+
+msgid "_Apply"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editing a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr ""
+
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+msgid "_Focused windows"
+msgstr ""
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr ""
+
+msgid "Prepend _string into window title:"
+msgstr ""
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+msgid "_Flash window"
+msgstr ""
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr ""
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr ""
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr ""
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr ""
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+msgid "Hyperlink Color"
+msgstr ""
+
+msgid "Visited Hyperlink Color"
+msgstr ""
+
+msgid "Highlighted Message Name Color"
+msgstr ""
+
+msgid "Typing Notification Color"
+msgstr ""
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+msgid "Conversation Entry"
+msgstr ""
+
+msgid "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 ""
+
+msgid "GTK+ Interface Font"
+msgstr ""
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+msgid "Disable Typing Notification Text"
+msgstr ""
+
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
+msgid "Colors"
+msgstr ""
+
+msgid "Fonts"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr ""
+
+msgid "Re-read gtkrc files"
+msgstr ""
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr ""
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+msgid "Raw"
+msgstr ""
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#, c-format
+msgid "You can upgrade to %s %s today."
+msgstr ""
+
+msgid "New Version Available"
+msgstr ""
+
+msgid "Later"
+msgstr ""
+
+msgid "Download Now"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Release Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+
+msgid "Duplicate Correction"
+msgstr ""
+
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+msgid "Text Replacements"
+msgstr ""
+
+msgid "You type"
+msgstr ""
+
+msgid "You send"
+msgstr ""
+
+msgid "Whole words only"
+msgstr ""
+
+msgid "Case sensitive"
+msgstr ""
+
+msgid "Add a new text replacement"
+msgstr ""
+
+msgid "You _type:"
+msgstr ""
+
+msgid "You _send:"
+msgstr ""
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+
+msgid "Only replace _whole words"
+msgstr ""
+
+msgid "General Text Replacement Options"
+msgstr ""
+
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+msgid "Text replacement"
+msgstr ""
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+#. A user in a chat room who has special privileges.
+msgid "Operator"
+msgstr ""
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+msgid "Display Timestamps Every"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Timestamp"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr ""
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr ""
+
+msgid "Timestamp Format Options"
+msgstr ""
+
+#, c-format
+msgid "_Force 24-hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr ""
+
+msgid "Co_nversations:"
+msgstr ""
+
+msgid "For delayed messages"
+msgstr ""
+
+msgid "For delayed messages and in chats"
+msgstr ""
+
+msgid "_Message Logs:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+msgid "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 ""
+
+msgid "_IM window transparency"
+msgstr ""
+
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+msgid "Always on top"
+msgstr ""
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr ""
+
+msgid "_Buddy List window transparency"
+msgstr ""
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+#. Autostart
+msgid "Startup"
+msgstr ""
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+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 ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr ""
+
+msgid "Account: "
+msgstr ""
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
--- a/po/nn.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/nn.po	Sat Jan 09 02:00:18 2010 +0000
@@ -2,14 +2,15 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2009-08-09 02:41+0100\n"
-"Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-29 10:08+0100\n"
+"Last-Translator: Yngve Spjeld Landro <nynorsk(a)strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Bookmarks: -1,1060,1063,3712,-1,-1,-1,-1,-1,-1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -134,7 +135,7 @@
 msgstr "%s%s%s%s har gjort %s til sin venn%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Legg til venn i lista?"
+msgstr "Leggja til venn i lista?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
@@ -167,7 +168,7 @@
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Sist sett: %s ago"
+"Sist sett: %s sidan"
 
 msgid "Default"
 msgstr "Standard"
@@ -260,8 +261,9 @@
 msgid "Get Info"
 msgstr "Hent info"
 
+# var: varsling
 msgid "Add Buddy Pounce"
-msgstr "Legg til vennevarsling"
+msgstr "Legg til venneovervaking"
 
 msgid "Send File"
 msgstr "Send fil"
@@ -501,8 +503,9 @@
 msgid "Confirm certificate delete"
 msgstr "Stadfest sertifikatslettinga"
 
+# var: Sertifikatstyrar
 msgid "Certificate Manager"
-msgstr "Sertifikatstyrar"
+msgstr "Sertifikatbehandling"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -587,12 +590,13 @@
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
+"Logginga er starta. Framtidige meldingar i denne samtalen vil bli logga."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
+"Logginga er stoppa. Framtidige meldingar i denne samtalen vil ikkje bli "
+"logga."
 
 msgid "Send To"
 msgstr "Send til"
@@ -606,8 +610,9 @@
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
+# var: varsling…
 msgid "Add Buddy Pounce..."
-msgstr "Legg til vennevarsling…"
+msgstr "Legg til venneovervaking…"
 
 msgid "Invite..."
 msgstr "Inviter…"
@@ -618,9 +623,8 @@
 msgid "Enable Sounds"
 msgstr "Slå på lydar"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Tenaren lukka tilkoplinga"
+msgstr "Du er ikkje tilkopla."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR> "
@@ -631,9 +635,8 @@
 msgstr[0] "Liste av %d brukar:\n"
 msgstr[1] "Liste av %d brukarar:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Støtta feilsøkingsval er:  utgåve"
+msgstr "Støtta feilsøkingsval er:  programtilleggsutgåver"
 
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
@@ -673,7 +676,8 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;val&gt;: send ulike feilsøkingsopplysningar til samtala du er i."
+"debug &lt;val&gt;: send ulike feilsøkingsopplysningar til den gjeldande "
+"samtalen."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: tømmer skjermen."
@@ -808,11 +812,11 @@
 
 #, c-format
 msgid "Conversation in %s on %s"
-msgstr "Samtala i %s på %s"
+msgstr "Samtalen i %s på %s"
 
 #, c-format
 msgid "Conversation with %s on %s"
-msgstr "Samtala med %s på %s"
+msgstr "Samtalen med %s på %s"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -834,7 +838,7 @@
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Samtaler vil berre bli logga om innstillinga \"Logg alle samtaler\" er slått "
+"Samtalen vil berre bli logga om innstillinga \"Logg alle samtalar\" er slått "
 "på."
 
 msgid "No logs were found"
@@ -849,14 +853,14 @@
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "Samtaler i %s"
+msgstr "Samtalar i %s"
 
 #, c-format
 msgid "Conversations with %s"
-msgstr "Samtaler med %s"
+msgstr "Samtalar med %s"
 
 msgid "All Conversations"
-msgstr "Alle samtaler"
+msgstr "Alle samtalar"
 
 msgid "System Log"
 msgstr "Systemlogg"
@@ -889,7 +893,7 @@
 msgstr "%s prøver å starta ein mediaøkttype som ikkje er støtta."
 
 msgid "You have rejected the call."
-msgstr "Du har avvist samtala."
+msgstr "Du har avvist samtalen."
 
 msgid "call: Make an audio call."
 msgstr "call: lag ei lydoppringing."
@@ -993,7 +997,7 @@
 msgstr "Installer programtillegg…"
 
 msgid "Configure Plugin"
-msgstr "Endra programtillegg"
+msgstr "Endra programtillegget"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1003,17 +1007,21 @@
 msgid "Preferences"
 msgstr "Innstillingar "
 
+# var: Skriv inn vennen du vil bli varsla om.
 msgid "Please enter a buddy to pounce."
-msgstr "Skriv inn vennen du vil bli varsla om."
-
+msgstr "Skriv inn vennen du vil overvaka."
+
+# var: Nytt vennevarsel
 msgid "New Buddy Pounce"
-msgstr "Nytt vennevarsel"
-
+msgstr "Ny venneovervaking"
+
+# var: Endra vennevarsel
 msgid "Edit Buddy Pounce"
-msgstr "Endra vennevarsel"
-
+msgstr "Endra venneovervakinga"
+
+# var: Varsling for
 msgid "Pounce Who"
-msgstr "Varsling for"
+msgstr "Overvaka kven"
 
 #. Account:
 msgid "Account:"
@@ -1022,9 +1030,10 @@
 msgid "Buddy name:"
 msgstr "Vennenamn:"
 
+# merknad: her kan ein nok ikkje nytta ordet "overvaka" som er nytta i andre samanhengar
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Varsla når venn…"
+msgstr "Varsla når vennen…"
 
 msgid "Signs on"
 msgstr "Loggar på"
@@ -1075,25 +1084,29 @@
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
+# var: Vennevarsling berre når eg ikkje er tilgjengeleg
 msgid "Pounce only when my status is not Available"
-msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
+msgstr "Venneovervaking berre når statusen min er Ikkje tilgjengeleg"
 
 # Regelmessig?
 msgid "Recurring"
 msgstr "Gjentakande"
 
+# var: Klarer ikkje å oppretta vennevarsel
 msgid "Cannot create pounce"
-msgstr "Klarer ikkje å oppretta vennevarsel"
+msgstr "Klarer ikkje å oppretta venneovervakinga"
 
 msgid "You do not have any accounts."
 msgstr "Du har ingen kontoar."
 
+# var: Du må først oppretta ein konto før du kan laga eit vennevarsel.
 msgid "You must create an account first before you can create a pounce."
-msgstr "Du må først oppretta ein konto før du kan laga eit vennevarsel."
-
+msgstr "Du må først oppretta ein konto før du kan laga ei venneovervaking."
+
+# Er du sikker på at du ønskjer å sletta varselet i %s  for %s?
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Er du sikker på at du ønskjer å sletta varselet i %s  for %s??"
+msgstr "Vil du verkeleg sletta overvakinga i %s av %s?"
 
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
@@ -1139,7 +1152,7 @@
 msgstr "%s har sendt deg ei melding. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Ukjend varselhending. Rapporter feilen."
+msgstr "Ukjend overvakingshending. Rapporter feilen."
 
 msgid "Based on keyboard use"
 msgstr "Basert på tastaturbruk"
@@ -1184,7 +1197,7 @@
 msgstr "Endra tilstand til"
 
 msgid "Conversations"
-msgstr "Samtaler"
+msgstr "Samtalar"
 
 msgid "Logging"
 msgstr "Loggføring"
@@ -1227,7 +1240,7 @@
 msgstr "Melding motteken"
 
 msgid "Message received begins conversation"
-msgstr "Motteken melding startar samtala"
+msgstr "Motteken melding startar samtalen"
 
 msgid "Message sent"
 msgstr "Melding sendt"
@@ -1296,7 +1309,7 @@
 msgstr "Lydinnstillingar"
 
 msgid "Sounds when conversation has focus"
-msgstr "Lydar når samtala har fokus"
+msgstr "Lydar når samtalen har fokus"
 
 msgid "Always"
 msgstr "Alltid"
@@ -1384,14 +1397,14 @@
 msgstr "Melding:"
 
 msgid "Edit Status"
-msgstr "Endra tilstand"
+msgstr "Endra tilstanden"
 
 msgid "Use different status for following accounts"
 msgstr "Bruk forskjellig status for dei følgjande kontoane"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "Lagra & bruk"
+msgstr "Lagra og bruk"
 
 msgid "Certificates"
 msgstr "Sertifikat"
@@ -1491,21 +1504,21 @@
 msgstr ""
 "Ein kan slå på loggføring frå Verktøy -> Innstillingar -> Loggføring.\n"
 "\n"
-"Å ta i bruk loggføring for lynmeldingar og/eller prating slår på historikk "
-"for liknande samtaletype (-ar)."
+"Loggføring av lynmeldingar og/eller prating slår på historikken for liknande "
+"samtaletype (-ar)."
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Viser nyleg logga samtaler i nye samtaler."
+msgstr "Viser nyleg logga samtalar i nye samtalar."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Når ei ny samtale blir opna, vil dette tillegget setja inn den siste samtala "
-"i den noverande."
+"Når ein ny samtale blir opna, vil dette tillegget setja inn den siste "
+"samtalen i den noverande."
 
 #, c-format
 msgid ""
@@ -1515,16 +1528,16 @@
 "\n"
 "Hentar TinyURL…"
 
+# Sjekk!
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL til adressa ovanfor: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
-
-#, fuzzy
+msgstr "Vent mens TinyURL hentar ein kortare URL …"
+
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Lag berre TinyURL for adresser med denne eller større lengd"
+msgstr "Lag berre TinyURL-ar for adresser med denne eller større lengd"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL-adresseprefiks (eller annan) "
@@ -1535,7 +1548,6 @@
 msgid "TinyURL plugin"
 msgstr "TinyURL-programtillegg"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
 "Ved mottak av meldingar med adresser (URL), bruk TinyURL som gjev lettare "
@@ -1544,6 +1556,7 @@
 msgid "Online"
 msgstr "Tilkopla"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -1576,7 +1589,7 @@
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "lastlog: leiter etter understrengar i loggen."
+msgstr "lastlog: leiter etter ein understreng i loggen."
 
 msgid "GntLastlog"
 msgstr "GntLastlog"
@@ -1588,7 +1601,7 @@
 msgstr "kontoar"
 
 msgid "Password is required to sign on."
-msgstr "Passord er påkravd for å logga på."
+msgstr "Ein må nytta passord for å logga på."
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1645,29 +1658,26 @@
 msgid "buddy list"
 msgstr "venneliste"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"Sertifikatet som \"%s\" presenterte, er sjølvsignert. Det kan ikkje "
-"kontrollerast automatisk."
-
+msgstr "Sertifikatet er sjølvsignert og kan ikkje kontrollerast automatisk."
+
+# !?
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-
-#, fuzzy
+"Ein kan ikkje stola på sertifikatet sidan det ikkje finst tiltrudde "
+"sertifikat som kan stadfesta det."
+
 msgid "The certificate is not valid yet."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
-
-#, fuzzy
+msgstr "Sertifikatet er ikkje gyldig enno."
+
 msgid "The certificate has expired and should not be considered valid."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Det presenterte sertifikatet er ikkje skrive ut til dette domenet."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1676,16 +1686,14 @@
 "Du har ingen database over rotsertifikat. Dermed kan ikkje dette "
 "sertifikatet validerast."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
-
-#, fuzzy
+msgstr "Den presenterte sertifikatkjeda er ugyldig."
+
 msgid "The certificate has been revoked."
-msgstr "Oppringinga er blitt avbroten."
+msgstr "Sertifikatet er blitt trekt attende."
 
 msgid "An unknown certificate error occurred."
-msgstr ""
+msgstr "Det oppstod ein ukjent sertifikatfeil."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(SAMSVARER IKKJE)"
@@ -1729,25 +1737,24 @@
 msgid "_View Certificate..."
 msgstr "Vis _sertifikat…"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Klarte ikkje å validera sertifikatet til %s."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL sertifikatfeil"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Klarte ikkje å autentisera: %s"
-
-#, fuzzy, c-format
+msgstr "Klarte ikkje å stadfesta sertifikatet"
+
+#, 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 ""
-"Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. "
-"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
+"Sertifikatet seier at det er frå \"%s\" i staden for. Dette kan bety at du "
+"ikkje koplar deg til den tenesta du trur du gjer."
 
 #. Make messages
 #, c-format
@@ -1763,7 +1770,7 @@
 "\n"
 "Fingeravtrykk (SHA1): %s\n"
 "\n"
-"Teken i bruk: %s\n"
+"Teke i bruk: %s\n"
 "Utgår: %s\n"
 
 #. TODO: Find what the handle ought to be
@@ -1893,9 +1900,10 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Oppslagsprosessen blei avslutta utan vi fekk svar"
 
-#, fuzzy, c-format
+# la:
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Oppslagsfeil mot %s: %d"
+msgstr "Konverteringa av %s til punycode feila: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1930,7 +1938,7 @@
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Ein kan ikkje skriva til atalogen."
+msgstr "Ein kan ikkje skriva til katalogen."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ein kan ikkje senda ei fil på 0 bytar."
@@ -1991,18 +1999,18 @@
 msgid "File transfer complete"
 msgstr "Filoverføringa er ferdig"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Du avbraut overføringa av %s"
 
 msgid "File transfer cancelled"
 msgstr "Filoverføringa blei avbroten"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s avbraut overføringa av %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s avbraut filoverføringa"
 
@@ -2165,7 +2173,7 @@
 msgstr "Gammalt flatformat"
 
 msgid "Logging of this conversation failed."
-msgstr "Klarte ikkje å loggføra denne samtala."
+msgstr "Klarte ikkje å loggføra denne samtalen."
 
 msgid "XML"
 msgstr "XML"
@@ -2201,28 +2209,30 @@
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Fnn ingen kodekar. Installer nokre GStreamer-kodekar frå GStreamer-"
+"programtilleggspakkane."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-
-#, fuzzy
+"Ingen kodekar igjen. Kodek-innstillingane dine i fs-codecs.conf er for "
+"strenge."
+
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Følgande feil har oppstått:"
-
-#, fuzzy
+msgstr "Det oppstod ein uoppretteleg Farsight2-feil."
+
 msgid "Conference error"
-msgstr "Konferansen er lukka"
+msgstr "Konferansefeil"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Mikrofonfeil"
 
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Nettkamerafeil"
+
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Tilkoplingsfeil"
+msgstr "Klarte ikkje å laga økta: %s"
 
 msgid "Error creating conference."
 msgstr "Klarte ikkje å laga konferansen"
@@ -2240,7 +2250,7 @@
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Samsvarsfeil %d i ABI-utgåva.%d.x (treng %d.%d.x)"
+msgstr "Samsvarsfeil i ABI-utgåve %d.%d.x (treng %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
@@ -2317,8 +2327,9 @@
 "Fillagringsbane\n"
 "(før opp heile filbana)"
 
+# var: Automatisk avvising frå brukarar utanfor vennelista
 msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisk avvising frå brukarar utanfor vennelista"
+msgstr "Automatisk avvising av brukarar utanfor vennelista"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2326,7 +2337,7 @@
 msgstr ""
 "La eit varslingsvindauge spretta opp når ei auto-godkjend filoverføring er "
 "ferdig\n"
-"(berre når det ikkje foregår ei samtale med sendaren)"
+"(berre når det ikkje foregår ein samtale med sendaren)"
 
 msgid "Create a new directory for each user"
 msgstr "Lag ein ny katalog for kvar brukar"
@@ -2484,17 +2495,17 @@
 "Test IPC-støtta i tillegget (som tenar). Dette registrerer IPC-kommandoane."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Skjul blir med / går ut"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "For rom med fleire personar enn"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Minutt brukaren har vore taus"
 
 msgid "Apply hiding rules to buddies"
-msgstr "Bruk skjul reglar på vennene"
+msgstr "Bruk skjulereglar på vennene"
 
 #. *< type
 #. *< ui_requirement
@@ -2516,8 +2527,8 @@
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Dette tillegget skjuler bli med-/gå ut-meldingar i store rom, med unntak for "
-"brukarar som tek aktv del i ei samtale."
+"Dette tillegget skjuler bli med- / gå ut-meldingar i store rom, med unntak "
+"for brukarar som tek aktiv del i ein samtale."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2645,10 +2656,10 @@
 msgstr "Lastar .Net-programtillegg saman med Mono."
 
 msgid "Add new line in IMs"
-msgstr "Leg til ne linje i lynmeldnga"
+msgstr "Legg til ny linje i lynmeldinga"
 
 msgid "Add new line in Chats"
-msgstr "Legg til ny linje i samtaler"
+msgstr "Legg til ny linje i samtalar"
 
 #. *< magic
 #. *< major version
@@ -2679,15 +2690,16 @@
 msgstr "Emulering av fråkopla meldingar"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Lagra meldingar som er sende til ein fråkopla brukar som varsel."
+msgstr "Lagra meldingar som er sende til ein fråkopla brukar som eit varsel."
 
 # `? '?
+# var: Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet frå `vennevarsel'-vindauget.
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet "
-"frå `vennevarsel'-vindauget."
+"frå `venneovervaking'-vindauget."
 
 #, c-format
 msgid ""
@@ -2701,7 +2713,7 @@
 msgstr "Fråkopla melding"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Du kan endra/sletta varselet frå vennevarsel-vindauget"
+msgstr "Du kan endra/sletta varselet frå `venneovervaking'-vindauget"
 
 msgid "Yes"
 msgstr "Ja"
@@ -2784,7 +2796,7 @@
 msgstr "Viser varslingsmelding i pratevindauget"
 
 msgid "Raise psychic conversations"
-msgstr "Hev synske samtaler"
+msgstr "Hev synske samtalar"
 
 #. *< type
 #. *< ui_requirement
@@ -2868,7 +2880,7 @@
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Tilbyr felles grensesnitt mot SSL støttebiblioteka."
+msgstr "Tilbyr felles grensesnitt mot SSL-støttebiblioteka."
 
 #, c-format
 msgid "%s is no longer away."
@@ -2897,7 +2909,7 @@
 msgstr "Venn går _vekk"
 
 msgid "Buddy Goes _Idle"
-msgstr "Venn blir _uverksam"
+msgstr "Venn _blir uverksam"
 
 msgid "Buddy _Signs On/Off"
 msgstr "Venn _loggar på/av"
@@ -2990,10 +3002,10 @@
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s har lukka samtala."
+msgstr "%s har lukka samtalen."
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
+msgstr "Klarte ikkje å senda meldinga. Samtalen kunne ikkje startast."
 
 #, c-format
 msgid "Unable to create socket: %s"
@@ -3047,8 +3059,9 @@
 msgid "Buddylist loaded successfully!"
 msgstr "Vennelista er henta inn."
 
+# var: Lagra venneliste…
 msgid "Save buddylist..."
-msgstr "Lagra venneliste…"
+msgstr "Lagra vennelista…"
 
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista frå fil…"
@@ -3156,10 +3169,12 @@
 msgid "Add to chat..."
 msgstr "Legg til praterom…"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Tilgjengeleg"
 
+#. 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
@@ -3326,7 +3341,7 @@
 msgstr "Vis \"Dagens melding\""
 
 msgid "_Channel:"
-msgstr "_Kanal:"
+msgstr "K_anal:"
 
 msgid "_Password:"
 msgstr "_Passord:"
@@ -3493,7 +3508,7 @@
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Du må vera invitert for å bli med  i %s."
+msgstr "Du må vera invitert for å bli med i %s."
 
 msgid "Invitation only"
 msgstr "Berre for inviterte"
@@ -3557,7 +3572,7 @@
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Kan ikkje bli med i %s: Registrering er påkravd."
+msgstr "Kan ikkje bli med i %s: må vera registrert."
 
 msgid "Cannot join channel"
 msgstr "Klarer ikkje å opna kanal"
@@ -3896,8 +3911,8 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Alle punkta under er valfrie. Ikkje fyll ut noko informasjon du ikkje er "
-"komfortabel med å gje frå deg."
+"Alle punkta under er valfrie. Skriv berre opplysningar som du ønskjer å dela "
+"med andre."
 
 msgid "Client"
 msgstr "Klient"
@@ -3936,11 +3951,12 @@
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Er du sikker på at du ønskjer å fjerna %s frå vennelista di?"
+msgstr ""
+"%s vil ikkje lenger kunna sjå statusoppdateringane dine. Vil du halda fram?"
 
 msgid "Cancel Presence Notification"
 msgstr "Avbryt nærværsvarsling"
@@ -3968,12 +3984,14 @@
 msgid "Log Out"
 msgstr "Logg av"
 
+#. 2
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
 msgid "Extended Away"
 msgstr "Utvida vekke"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -4031,7 +4049,7 @@
 msgstr "Vel ein brukarkatalog å søkja i"
 
 msgid "Search Directory"
-msgstr "Søk katalog"
+msgstr "Søk i katalog"
 
 msgid "_Room:"
 msgstr "_Rom:"
@@ -4040,7 +4058,7 @@
 msgstr "_Tenar:"
 
 msgid "_Handle:"
-msgstr "_Handtak:"
+msgstr "R_eferanse:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4058,10 +4076,10 @@
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s er ikkje eit gyldig romhandtak"
+msgstr "%s er ikkje ein gyldig romreferanse"
 
 msgid "Invalid Room Handle"
-msgstr "Ugyldig romhandtak"
+msgstr "Ugyldig romreferanse"
 
 msgid "Configuration error"
 msgstr "Feil i innstillingane"
@@ -4218,14 +4236,15 @@
 msgid "Mood"
 msgstr "Sinnsstemning"
 
+# var: Lyttar
 msgid "Now Listening"
-msgstr "Lyttar"
+msgstr "Lyttar til"
 
 msgid "Both"
 msgstr "Begge"
 
 msgid "From (To pending)"
-msgstr "Frå (til er ventande)"
+msgstr "Frå (ventande)"
 
 msgid "From"
 msgstr "Frå"
@@ -4234,8 +4253,9 @@
 msgstr "Til"
 
 msgid "None (To pending)"
-msgstr "Ingen (til er ventande)"
-
+msgstr "Ingen (ventande)"
+
+#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4348,10 +4368,10 @@
 msgstr "Tidsavbrot på fjerntenaren"
 
 msgid "Server Overloaded"
-msgstr "Tenaren er overlasta"
+msgstr "Tenaren er overbelasta"
 
 msgid "Service Unavailable"
-msgstr "Tenesten er utilgjengeleg"
+msgstr "Tenesta er utilgjengeleg"
 
 msgid "Subscription Required"
 msgstr "Abonnement påkravd"
@@ -4539,9 +4559,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [rom]:  Forlata praterommet."
+msgstr "part [melding]:  forlat rommet."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
@@ -4560,13 +4579,12 @@
 "[kallenamn2]…: hent brukarar med ei tilknyting til rommet eller lag slik "
 "tilknyting."
 
-#, 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;moderator|deltakar|besøkjar|none&gt;: hent brukarar med ei rolle i "
-"rommet eller lag slik rolle."
+"role &lt;moderator|deltakar|besøkjande|ingen&gt;: hent brukarane med ei "
+"rolle i rommet eller lag rolla deira."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;brukar&gt; [melding]:  Invitér ein brukar til rommet."
@@ -4625,15 +4643,16 @@
 msgstr "Tilkoplingstenar"
 
 msgid "File transfer proxies"
-msgstr "Mellomlager filoverføringar"
+msgstr "Mellomtenar filoverføringar"
 
 msgid "BOSH URL"
 msgstr "BOSH-adresse"
 
+# ? custom = tilpassa
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "Vis tilpass smilefjes"
+msgstr "Vis eigne smilefjes"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4655,8 +4674,9 @@
 msgid "Message delivery to %s failed: %s"
 msgstr "Meldinga til %s kom ikkje fram: %s"
 
+# var: Jabber meldingsfeil
 msgid "XMPP Message Error"
-msgstr "Jabber meldingsfeil"
+msgstr "XMPP-meldingsfeil"
 
 #, c-format
 msgid "(Code %s)"
@@ -4737,7 +4757,7 @@
 msgstr "Vel kva for ressurs av %s du ønskjer å senda fila til"
 
 msgid "Edit User Mood"
-msgstr "Endra brukarsinnsstemning"
+msgstr "Endra brukarsinnsstemninga"
 
 msgid "Please select your mood from the list."
 msgstr "Vel sinnsstemninga di frå lista."
@@ -4945,7 +4965,7 @@
 
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "Tenaren er på veg ned (forlat skipet)"
+msgstr "Tenaren er på veg ned (røm skipet)"
 
 #, c-format
 msgid "Error creating connection"
@@ -4983,9 +5003,8 @@
 msgid "Not expected"
 msgstr "Uventa"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "Endrar visingsnamnet for ofte"
+msgstr "Visingsnamnet blir endra for kjapt."
 
 #, c-format
 msgid "Server too busy"
@@ -5204,12 +5223,12 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
+"Klarer ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn må vera ei gyldig e-postadresse."
 
 msgid "Unable to Add"
@@ -5296,17 +5315,19 @@
 msgid "Home Address"
 msgstr "Heimeadresse"
 
+# var: Personleg mobil
 msgid "Personal Mobile"
-msgstr "Personleg mobil"
+msgstr "Privat mobil"
 
 msgid "Home Fax"
 msgstr "Heimefaks"
 
 msgid "Personal Email"
-msgstr "E-postadresse privat"
-
+msgstr "Privat e-postadresse"
+
+# var: Personleg pratenett
 msgid "Personal IM"
-msgstr "Personleg pratenett"
+msgstr "Privat prateadresse"
 
 msgid "Anniversary"
 msgstr "Jubileum"
@@ -5433,9 +5454,8 @@
 msgid "Unknown error (%d)"
 msgstr "ukjend feil (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Klarte ikkje å leggja til brukar"
+msgstr "Klarer ikkje å fjerna brukaren"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeldinga blei ikkje sendt sidan ho var for lang."
@@ -5457,12 +5477,12 @@
 "sign in."
 msgstr[0] ""
 "MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då "
-"automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
+"automatisk logga av. Du bør lukka alle opne samtalar.\n"
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 msgstr[1] ""
 "MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då "
-"automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
+"automatisk logga av. Du bør lukka alle opne samtalar.\n"
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 
@@ -5547,10 +5567,11 @@
 "%s spør om å få sjå nettkameraet ditt. Denne funksjonen er enno ikkje støtta."
 
 # dårleg formulering?
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s spør om å få sjå nettkameraet ditt. Denne funksjonen er enno ikkje støtta."
+"%s har invitert deg til å få sjå nettkameraet hans/hennar, men funksjonen er "
+"enno ikkje støtta."
 
 msgid "Away From Computer"
 msgstr "Vekke frå datamaskina"
@@ -5589,7 +5610,7 @@
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
-"Det kan vera at meldinga ikkje blei sendt sidan ein ukjend feil oppstod:"
+"Det kan vera at meldinga ikkje blei sendt sidan det oppstod ein ukjend feil:"
 
 msgid "Delete Buddy from Address Book?"
 msgstr "Sletta venn frå adresseboka?"
@@ -5671,28 +5692,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har fjerna deg frå vennelista si."
 
+#. 1
+msgid "Angry"
+msgstr "Sint"
+
+#. 2
+msgid "Excited"
+msgstr "Oppglødd"
+
+# Grinete?
+#. 3
+msgid "Grumpy"
+msgstr "Sur"
+
+#. 4
+msgid "Happy"
+msgstr "Glad"
+
+#. 5
+msgid "In Love"
+msgstr "Forelska"
+
+#. 6
+msgid "Invincible"
+msgstr "Uovervinneleg"
+
+#. 7
+msgid "Sad"
+msgstr "Trist"
+
+#. 8
+msgid "Hot"
+msgstr "Heit"
+
+#. 9
+msgid "Sick"
+msgstr "Sjuk"
+
+#. 10
+msgid "Sleepy"
+msgstr "Søvnig"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Sinnsstemninga di no"
+msgstr "Sinnsstemninga no"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Sinnsstemning"
-
-#, fuzzy
+msgstr "Ny sinnsstemning"
+
 msgid "Change your Mood"
-msgstr "Endra passord"
-
-#, fuzzy
+msgstr "Endra sinnsstemninga di"
+
 msgid "How do you feel right now?"
-msgstr "Eg er ikkje her nett no"
+msgstr "Korleis kjenner du deg nett no?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Du skreiv inn ein ugyldig PIN."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Du skreiv inn ein PIN med ulovleg lengd [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Fødselsdagen du skreiv inn er ugyldig. Det rette formatet er : 'ÅÅÅÅ-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Skrivefeil"
+msgstr "Profiloppdateringsfeil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5700,354 +5777,303 @@
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Profilopplysningane dine er ikkje henta enno. Prøv igjen seinare."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Stadfest PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Etternamn"
+msgstr "Visingsnamn"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skjul nummeret mitt"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Mobiltelefon"
-
-#, fuzzy
+msgstr "Mobilnummer"
+
 msgid "Update your Profile"
-msgstr "Yahoo!-profil"
+msgstr "Oppdater profilen din"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Her kan du oppdatera MXit-profilen din"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Syn oppstartsbilete"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Ikkje noko oppstartsvindage er tilgjengeleg no"
+
 msgid "About"
-msgstr "Om meg"
+msgstr "Om"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Endra passord…"
+msgstr "Endra sinnsstemninga…"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Endra passord…"
+msgstr "Endra profilen…"
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Sjå på loggen…"
+msgstr "Syn opningsbiletet…"
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Om meg"
+msgstr "Om…"
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Meldinga er for stor."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Meldinga du prøver å senda er for stor."
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Klarer ikkje å kopla til MXit sin HTTP-tenar. Kontroller tenarinnstillingane "
+"dine."
+
 msgid "Logging In..."
-msgstr "Loggar på"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
-"deg til."
-
-#, fuzzy
+msgstr "Loggar på…"
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Klarer ikkje å kopla til MXit-tenaren. Kontroller tenarinnstillingane dine."
+
 msgid "Connecting..."
-msgstr "Koplar til"
+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 ""
+msgstr "Påloggingsnamn MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Kallenamn"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrer ein ny XMPP-konto"
-
-#, fuzzy
+msgstr "Registrer ein ny MXit-konto"
+
 msgid "Please fill in the following fields:"
-msgstr "Fyll ut følgjande felt"
+msgstr "Fyll ut desse felta:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Klarte ikkje å nå MXit sin WAP-nettstad. Prøv igjen seinare."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit klarer ikkje å behandla førespurnaden din no. Prøv igjen seinare."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Du skreiv feil tryggleikskode. Prøv igjen seinare."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Økta di har gått ut. Prøv igjen seinare."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Du valde eit ugyldig land. Prøv igjen seinare."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Brukarnamnet er ikkje registrert. Registrer deg først."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn."
+
 msgid "Internal error. Please try again later."
-msgstr "Tenaren er ikkje tilgjengeleg - prøv igjen seinare"
+msgstr "Intern feil. Prøv igjen seinare."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Du skreiv ikkje inn tryggleikskoden"
+
 msgid "Security Code"
-msgstr "Tryggleik er slått på"
+msgstr "Tryggleikskode"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Skriv inn koden"
-
-#, fuzzy
+msgstr "Skriv inn tryggleikskoden"
+
 msgid "Your Country"
-msgstr "Land"
-
-#, fuzzy
+msgstr "Landet ditt"
+
 msgid "Your Language"
-msgstr "Føretrekt språk"
+msgstr "Språket ditt"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Krev godkjenning"
+msgstr "MXit-godkjenning"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-kontovalidering"
+
 msgid "Retrieving User Information..."
-msgstr "Tenarinformasjon"
-
-#, fuzzy
+msgstr "Hentar brukaropplysningar…"
+
+msgid "Loading menu..."
+msgstr "Lastar menyen…"
+
 msgid "Status Message"
-msgstr "Sende meldingar"
-
-#, fuzzy
+msgstr "Statusmelding"
+
 msgid "Hidden Number"
-msgstr "Mellomnamn"
-
-#, fuzzy
+msgstr "Skjult nummer"
+
 msgid "Your Mobile Number..."
-msgstr "Skriv inn mobiltelefonnummer…"
+msgstr "Mobiltelefonnummeret ditt…"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Tenar"
-
-#, fuzzy
+msgstr "WAP-tenar"
+
 msgid "Connect via HTTP"
-msgstr "Kopla til med TCP"
-
+msgstr "Kopla til over HTTP"
+
+# ? treng gjennomsyn
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Bruk oppstartsvindauge"
 
 #. 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 "Det er ikkje samband med MXit. Kopla til att."
+
+# var: Jabber meldingsfeil
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Jabber meldingsfeil"
-
-#, fuzzy
+msgstr "Sendingsfeil melding"
+
 msgid "Unable to process your request at this time"
-msgstr "Klarer ikkje å finna tenarnamnet"
+msgstr "Klarer ikkje å behandla førespurnaden no"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Tidsavbrot medan ein venta på svar frå MXit-tenaren."
+
 msgid "Successfully Logged In..."
-msgstr "Blei med i Qun"
-
-#, fuzzy
+msgstr "Du er pålogga…"
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s har sendt deg ei kryptert melding, men klienten støttar ikkje dette."
+
+# var: Jabber meldingsfeil
 msgid "Message Error"
-msgstr "Jabber meldingsfeil"
+msgstr "Meldingsfeil"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Kan ikkje nytta den spesifiserte protokollen til å vidaresenda"
+
+msgid "An internal MXit server error occurred."
+msgstr "Det oppstod ein intern MXit-tenarfeil."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Påloggingsfeil: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Avloggingsfeil: %s (%i)"
+
+# Kontaktfeil? - Sannsynlegvis ikkje
 msgid "Contact Error"
 msgstr "Sambandsfeil"
 
-#, fuzzy
+# var: Jabber meldingsfeil
 msgid "Message Sending Error"
-msgstr "Jabber meldingsfeil"
-
-#, fuzzy
+msgstr "Sendefeil melding"
+
 msgid "Status Error"
-msgstr "Feil i datastraumen"
-
-#, fuzzy
+msgstr "Statusfeil"
+
 msgid "Mood Error"
-msgstr "Ikon-feil"
-
-#, fuzzy
+msgstr "Sinnsstemnings-feil"
+
 msgid "Invitation Error"
-msgstr "Avregistreringsfeil"
-
-#, fuzzy
+msgstr "Invitasjonsfeil"
+
 msgid "Contact Removal Error"
-msgstr "Sambandsfeil"
-
-#, fuzzy
+msgstr "Kontaktfjerningsfeil"
+
 msgid "Subscription Error"
-msgstr "Abonnement"
-
-#, fuzzy
+msgstr "Abonnementsfeil"
+
 msgid "Contact Update Error"
-msgstr "Sambandsfeil"
-
-#, fuzzy
+msgstr "Kontaktoppdateringsfeil"
+
 msgid "File Transfer Error"
-msgstr "Filoverføring"
-
-#, fuzzy
+msgstr "Filoverføringsfeil"
+
+# var: Klarer ikkje å oppretta vennevarsel
 msgid "Cannot create MultiMx room"
-msgstr "Klarer ikkje å oppretta vennevarsel"
-
-#, fuzzy
+msgstr "Klarer ikkje å laga MultiMx-rom"
+
 msgid "MultiMx Invitation Error"
-msgstr "Avregistreringsfeil"
-
-#, fuzzy
+msgstr "MultiMx-invitasjonsfeil"
+
 msgid "Profile Error"
-msgstr "Skrivefeil"
+msgstr "Profilfeil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Fekk ein ugyldig pakke frå MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Sint"
-
-msgid "Excited"
-msgstr "Oppglødd"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppe"
-
-msgid "Happy"
-msgstr "Glad"
-
-msgid "In Love"
-msgstr "Forelska"
-
-msgid "Invincible"
-msgstr "Uovervinneleg"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Vert:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Kallenamn"
-
-msgid "Sleepy"
-msgstr "Søvnig"
-
-#, fuzzy
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x06)"
+
 msgid "Pending"
-msgstr "Sender"
-
-#, fuzzy
+msgstr "Ventar"
+
 msgid "Invited"
-msgstr "Inviter"
-
-#, fuzzy
+msgstr "Invitert"
+
 msgid "Rejected"
-msgstr "Avvis"
-
-#, fuzzy
+msgstr "Avvist"
+
 msgid "Deleted"
-msgstr "Slett"
+msgstr "Sletta"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-annonsering"
+
 msgid "More Information"
-msgstr "Arbeidsinformasjon"
+msgstr "Fleire opplsyningar"
 
 #, c-format
 msgid "No such user: %s"
@@ -6303,15 +6329,15 @@
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "Våtkyss"
+msgstr "Kosekyss"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s har våtkyssa deg!"
+msgstr "%s har kosekyssa deg!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "Våtkysser %s…"
+msgstr "Kosekysser %s…"
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -6395,7 +6421,6 @@
 msgid "Raspberrying %s..."
 msgstr "Rekkjer %s tunga…"
 
-#
 msgid "Required parameters not passed in"
 msgstr "Påkravde parameter ikkje oppgjevne"
 
@@ -6459,7 +6484,7 @@
 msgstr "Kontoen din er sperra grunna for mange feilpåloggingsforsøk"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Du kan ikkje leggja til same person to gonger i ei samtale"
+msgstr "Du kan ikkje leggja til same person to gonger i ein samtale"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Du har nådd grensa for tilletne kontaktar"
@@ -6650,9 +6675,9 @@
 msgstr "Tenarport"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Fekk uventa svar frå "
+msgstr "Fekk uventa svar frå %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6663,9 +6688,9 @@
 
 #. 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 "Klarte ikkje å spørja"
+msgstr "Klarte ikkje å henta %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her"
@@ -6815,46 +6840,43 @@
 msgstr "Ikkje når pålogga AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Får ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
+
+# tekstmeldinga? SMS-en?
 msgid "Cannot send SMS"
-msgstr "Klarer ikkje å senda fila"
+msgstr "Klarer ikkje å senda meldinga"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Ein kan ikkje senda ein katalog."
+msgstr "Kan ikkje senda meldingar til dette landet"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Kan ikkje senda meldingar til ukjente land"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Bot-kontoen har nådd lynmeldingsgrensa"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Bot-kontoen har nådd dagsgrensa for lynmeldingar"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
+
 msgid "Unable to receive offline messages"
-msgstr "Klarte ikkje å senda meldinga."
-
-#, fuzzy
+msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
+
 msgid "Offline message store full"
-msgstr "Fråkopla melding"
+msgstr "Fråkopla meldingslager er fullt"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6991,7 +7013,7 @@
 msgstr ""
 "Får ikkje til å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må "
 "vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre "
-"innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+"innehalda bokstavar, tal og mellomrom, eller berre innehalda tal."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7022,14 +7044,13 @@
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
-"Held du fram med å prøva, vil du måtta venta endå lenger."
+"Brukarnamnet ditt har kopla til og blitt fråkopla for ofte. Vent i ti minutt "
+"og prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
 
 #. client too old
 #, c-format
@@ -7037,14 +7058,13 @@
 msgstr "Klientutgåva du bruker er for gammal. Oppgrader på %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Du har kopla til og blitt fråkopla for ofte. Vent ei stund og prøv igjen. "
-"Held du fram med å prøva, vil du måtta venta endå lenger."
+"IP-adressa di har kopla til og blitt fråkopla for ofte. Vent ei stund og "
+"prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Den innskrivne SecurID-nøkkelen er ugyldig"
@@ -7185,21 +7205,21 @@
 msgstr[0] "Du fekk ikkje %hu melding frå %s av uviss årsak."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Klarer ikkje å senda melding (%s)."
+msgstr "Klarer ikkje å senda meldinga: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarte ikkje å senda til %s:"
-
-#, fuzzy, c-format
+msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Klarte ikkje å senda til %s:"
+msgstr "Klarer ikkje å senda meldinga til %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7228,13 +7248,13 @@
 "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
 "teikn.]"
 
-#, fuzzy
+# 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 minutt og prøv igjen."
+"Vent i 10 sekund og prøv igjen.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7403,7 +7423,7 @@
 msgstr ""
 "Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
-"berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+"berre innehalda bokstavar, tal og mellomrom, eller berre innehalda tal."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
@@ -7496,11 +7516,10 @@
 "Vil du fortsetja?"
 
 msgid "C_onnect"
-msgstr "_Koplar til"
-
-#, fuzzy
+msgstr "_Kopla til"
+
 msgid "You closed the connection."
-msgstr "Tenaren lukka tilkoplinga"
+msgstr "Du lukka tilkoplinga."
 
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
@@ -7512,9 +7531,8 @@
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "Oppretta direkte lynmeldingssamband"
+msgstr "Avslutt direktelynmeldingsøkta"
 
 msgid "Direct IM"
 msgstr "Direktelynmelding"
@@ -8133,7 +8151,7 @@
 msgstr "<p><b>Grundige testarar</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr "ån og meir, gjer vel å la meg få vita det… takk! :-)"
+msgstr "og meir, gjer vel og la meg få vita det… takk! ))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og alle gutane på bakrommet…</i><br>\n"
@@ -8349,9 +8367,9 @@
 msgid "File Send"
 msgstr "Filsending"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d avbraut overføringa av %s"
+msgstr "%d stoppa overføringa av %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8498,7 +8516,7 @@
 "Please enter one below to continue logging in."
 msgstr ""
 "Meanwhile-kontoen %s har ingen vert eller IP-adresse knytt til seg. Før opp "
-"ein av desse verdiane for å logga på."
+"ein av desse verdiane for å logga deg på."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
@@ -9181,7 +9199,7 @@
 msgstr "Fekk ingen offentleg nøkkel"
 
 msgid "Server Information"
-msgstr "Tenarinformasjon"
+msgstr "Tenaropplysningar"
 
 msgid "Cannot get server information"
 msgstr "Klarer ikkje å henta tenarinformasjonen"
@@ -9315,7 +9333,7 @@
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "Koplar til SILC-tenar"
+msgstr "Koplar til SILC-tenaren"
 
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
@@ -9532,7 +9550,7 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;kanalnamn&gt;:  inviter kallenamn eller legg "
+"invite &lt;kanal&gt; [-|+]&lt;kallenamn&gt;:  inviter kallenamn eller legg "
 "til/fjern frå kanalinvitasjonslista"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
@@ -9578,7 +9596,7 @@
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC protokolltillegg"
+msgstr "SILC-protokolltillegg"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
@@ -9815,7 +9833,7 @@
 msgstr "Bruk mellomlager"
 
 msgid "Proxy"
-msgstr "Mellomlager"
+msgstr "Mellomtenar"
 
 msgid "Auth User"
 msgstr "Autentiser brukar"
@@ -9867,7 +9885,7 @@
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Bruk kontomellomtenar for SSL-sambanda"
 
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
@@ -9975,26 +9993,26 @@
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "Feil brukarnamn eller passord"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Kontoen er låst grunna for mange forsøk på å logga på. Du kan kanskje løysa "
-"problemet ved å logga deg på Yahoo! sin nettstad."
+"Kontoen er låst grunna for mange forsøk på å logga på. Logg deg på Yahoo! "
+"sin nettstad."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Ukjend feilnummer 52. Oppattilkopling burde ordna problemet."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Feil 1013: ugyldig brukarnamn. Som oftast skuldast denne feilen at du har "
+"skrive e-postadressa di i staden for Yahoo!-id-en din."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10087,12 +10105,13 @@
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"Klarer ikkje å senda tekstmeldingar. Får ikkje kontakt med mobiloperatøren."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Klarer ikkje å senda tekstmeldingar. Ukjend mobiloperatør."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Hentar mobiloperatør for å kunna senda tekstmeldingar. "
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10338,7 +10357,7 @@
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr protokolltillegg"
+msgstr "Zephyr-protokolltillegg"
 
 msgid "Use tzc"
 msgstr "Bruk tzc"
@@ -10495,7 +10514,7 @@
 
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "%s vart verksam igjen"
+msgstr "+++ %s blei verksam igjen"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10629,6 +10648,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Prat ved hjelp av lynmeldingar.  Støttar AIM, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo og fleire"
 
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
@@ -10650,7 +10671,7 @@
 msgstr "Proto_koll:"
 
 msgid "_Username:"
-msgstr "Brukar_namn:"
+msgstr "_Brukarnamn:"
 
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
@@ -10670,7 +10691,7 @@
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
 msgid "Ad_vanced"
-msgstr "A_vansert"
+msgstr "_Avansert"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Bruk GNOME mellomlagerinnstillingar"
@@ -10712,7 +10733,7 @@
 msgstr "_Vert:"
 
 msgid "_Port:"
-msgstr "_Port:"
+msgstr "Po_rt:"
 
 msgid "Pa_ssword:"
 msgstr "P_assord:"
@@ -10730,10 +10751,10 @@
 msgstr "_Grunnleggjande"
 
 msgid "Create _this new account on the server"
-msgstr "Opprett denne _nye kontoen på tenaren"
+msgstr "Opprett _denne nye kontoen på tenaren"
 
 msgid "P_roxy"
-msgstr "_Mellomlager"
+msgstr "_Mellomtenar"
 
 msgid "Enabled"
 msgstr "I bruk"
@@ -10775,7 +10796,6 @@
 msgstr "Utforming"
 
 # blist = vennelista?
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr "Utforminga av ikona, namna og statusen til vennelista"
 
@@ -10831,9 +10851,8 @@
 
 #. 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 "Tilkopla-tekst"
+msgstr "Når tilkopla"
 
 msgid "The text information for when a buddy is online"
 msgstr "Tekstopplysningar når ein venn er tilkopla"
@@ -10848,13 +10867,11 @@
 
 #. 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 "Fråkopla-tekst"
-
-#, fuzzy
+msgstr "Når fråkopla"
+
 msgid "The text information for when a buddy is offline"
-msgstr "Tekstopplysningar når ein venn er fråkopla"
+msgstr "Tekstopplysningar når ein venn er vekke"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -10877,7 +10894,6 @@
 msgid "Message (Nick Said) Text"
 msgstr "Meldingstekst (kallenamnet sa)"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -10946,8 +10962,9 @@
 msgid "_Send File..."
 msgstr "_Send fil…"
 
+# var: Legg til _vennevarsling…
 msgid "Add Buddy _Pounce..."
-msgstr "Legg til _vennevarsling…"
+msgstr "Legg til _venneovervaking…"
 
 msgid "View _Log"
 msgstr "Vis l_ogg"
@@ -10977,7 +10994,7 @@
 msgstr "Legg til prate_rom…"
 
 msgid "_Delete Group"
-msgstr "_Slett gruppe"
+msgstr "_Slett gruppa"
 
 msgid "_Rename"
 msgstr "_Gje nytt namn"
@@ -11074,8 +11091,9 @@
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
+# var: /Verktøy/Venne_varsling
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Verktøy/Venne_varsling"
+msgstr "/Verktøy/Venne_overvaking"
 
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/_Sertifikat"
@@ -11084,7 +11102,7 @@
 msgstr "/Verktøy/_Tilpassa smilefjes"
 
 msgid "/Tools/Plu_gins"
-msgstr "/Verktøy/Program_tillegg"
+msgstr "/Verktøy/Progra_mtillegg"
 
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
@@ -11289,10 +11307,10 @@
 msgstr "Legg til venn.\n"
 
 msgid "Buddy's _username:"
-msgstr "Brukarnamnet til vennen:"
+msgstr "_Brukarnamnet til vennen:"
 
 msgid "(Optional) A_lias:"
-msgstr "Ka_llenamn (valfritt) :"
+msgstr "Kalle_namn (valfritt) :"
 
 msgid "Add buddy to _group:"
 msgstr "Legg vennen til i _gruppa:"
@@ -11313,14 +11331,13 @@
 "leggja til i vennelista.\n"
 
 msgid "A_lias:"
-msgstr "Al_ias:"
+msgstr "Kall_enamn:"
 
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Bli automatisk _med når kontoen koplar seg til att."
+msgstr "Bli automatisk _med når kontoen koplar seg til."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Hald fram i praten etter at vindauget er lukka."
@@ -11329,7 +11346,7 @@
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
 msgid "Enable Account"
-msgstr "Ta konto i bruk"
+msgstr "Ta kontoen i bruk"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
@@ -11346,6 +11363,7 @@
 msgid "_Disable"
 msgstr "_Slå av"
 
+# skal det vera hurtigtast her?
 msgid "/Tools"
 msgstr "/V_erktøy"
 
@@ -11384,7 +11402,7 @@
 msgstr "<h1>Samtale med %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Lagra samtale"
+msgstr "Lagra samtalen"
 
 msgid "Find"
 msgstr "Finn"
@@ -11435,9 +11453,8 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Samtale/_Inviter…"
+msgstr "/Samtale/Bli med  i eit _praterom…"
 
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
@@ -11449,7 +11466,7 @@
 msgstr "/Samtale/Lagra _som…"
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Samtale/T_øm skjermen"
+msgstr "/Samtale/T_øm historikken"
 
 msgid "/Conversation/M_edia"
 msgstr "/Samtale/M_edia"
@@ -11466,11 +11483,12 @@
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
+# var: /Samtale/Legg til _vennevarsling…
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Samtale/Legg til _vennevarsling…"
+msgstr "/Samtale/Legg til _venneovervaking…"
 
 msgid "/Conversation/_Get Info"
-msgstr "/Samtale/Hent info_rmasjon"
+msgstr "/Samtale/Hent opplysninga_r"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
@@ -11497,7 +11515,7 @@
 msgstr "/Samtale/Set inn _lenkje…"
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Samtale/Set inn _bilete…"
+msgstr "/Samtale/Set inn b_ilete…"
 
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
@@ -11547,8 +11565,9 @@
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
+# var: /Samtale/Legg til vennevarsling…
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Samtale/Legg til vennevarsling…"
+msgstr "/Samtale/Legg til venneovervaking…"
 
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
@@ -11654,7 +11673,7 @@
 msgstr "Lukk denne fana"
 
 msgid "Close conversation"
-msgstr "Lukk samtala"
+msgstr "Lukk samtalen"
 
 msgid "Last created window"
 msgstr "Siste opna vindauge"
@@ -11822,7 +11841,7 @@
 msgstr "Estisk"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisk"
 
 msgid "Persian"
 msgstr "Persisk"
@@ -11899,8 +11918,11 @@
 msgid "Mongolian"
 msgstr "Mongolsk"
 
+msgid "Malay"
+msgstr "Malayisk"
+
 msgid "Bokmål Norwegian"
-msgstr "Norsk bokmål"
+msgstr "Norsk (bokmål)"
 
 msgid "Nepali"
 msgstr "Nepali"
@@ -11968,6 +11990,9 @@
 msgid "Turkish"
 msgstr "Tyrkisk"
 
+msgid "Ukranian"
+msgstr "Ukrainsk"
+
 msgid "Urdu"
 msgstr "Urdu"
 
@@ -12032,6 +12057,12 @@
 "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\">Hjelp frå andre Pidgin-brukarar:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Dette er ei <b>open</b> "
+"postliste. (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
+">Vi kan ikkje hjelpa med tredjepart-protokollar eller -programtillegg.<br/"
+">Lista sitt primærspråk er  <b>engelsk</b>. Du kan skriva på eit anna språk, "
+"men då vil du kanskje ikkje få den hjelpa du treng.<br/><br/>"
 
 #, c-format
 msgid ""
@@ -12263,13 +12294,14 @@
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Filoverføringsdetaljar"
+msgstr "_Filoverføringsdetaljar"
 
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
+# var: _Ta vekk formatering
 msgid "_Reset formatting"
-msgstr "_Ta vekk formatering"
+msgstr "Nulls_till formateringa"
 
 msgid "Disable _smileys in selected text"
 msgstr "Slå av _smilefjes i vald tekst"
@@ -12420,7 +12452,7 @@
 msgstr "Legg til lenkje"
 
 msgid "_Insert"
-msgstr "Set _inn"
+msgstr "Se_t inn"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12438,8 +12470,9 @@
 "til denne snarvegen:\n"
 "%s"
 
+# var: Smil!
 msgid "Smile!"
-msgstr "Smil!"
+msgstr "Smilefjes"
 
 msgid "_Manage custom smileys"
 msgstr "_Smilefjesbehandling"
@@ -12531,8 +12564,9 @@
 msgid "_Horizontal rule"
 msgstr "_Horisontal strek"
 
+# treng ikkje utropsteikn på norsk, skulle eg tru :-)
 msgid "_Smile!"
-msgstr "S_mil!"
+msgstr "Smile_fjes"
 
 msgid "Log Deletion Failed"
 msgstr "Klarte ikkje å sletta loggen"
@@ -12590,43 +12624,48 @@
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Bruk: %s [VAL]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "KAT"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "bruk DIR for innstillingsfiler"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "skriv feilsøkingsmeldingane til standard utfil"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "kopla til uavhengig av nettverksstatus"
 
 msgid "display this help and exit"
-msgstr ""
-
-#, fuzzy
+msgstr "syn denne hjelpa og avslutt"
+
 msgid "allow multiple instances"
-msgstr "Tillat fleire samstundes påloggingar"
+msgstr "tillat fleire samstundes økter"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "logg ikkje på automatisk"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAMN"
 
 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 ""
+"slå på spesifisert(e) konto(ar) (valfritt argument NAMN\n"
+"                      spesifiserer konto(ar) å bruka, skilde med komma.\n"
+"                      Utan dette vil berre den første kontoen bli teken i "
+"bruk)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "X-skjerm som skal brukast"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "syn den noverande utgåva og avslutt"
 
 #, c-format
 msgid ""
@@ -12675,7 +12714,7 @@
 msgstr "%s ønskjer å starta ei biletøkt med deg."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Innkomande samtale"
 
 msgid "_Pause"
 msgstr "_Pause"
@@ -12723,8 +12762,10 @@
 msgid "Dismiss"
 msgstr "Avvis"
 
+# var: <span weight=\"bold\" size=\"larger\">Du har fått vennevarsel!</span>
+# verkar ikkje fungera :-(
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har fått vennevarsel!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har slått til!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Dei følgjande programtillegga vil bli lasta ut."
@@ -12775,7 +12816,7 @@
 msgstr "Vel ei fil"
 
 msgid "Modify Buddy Pounce"
-msgstr "Endra vennevarsel"
+msgstr "Endra vennevarselet"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12785,7 +12826,7 @@
 msgstr "_Konto:"
 
 msgid "_Buddy name:"
-msgstr "_Vennenamn:"
+msgstr "Venne_namn:"
 
 msgid "Si_gns on"
 msgstr "Lo_ggar på"
@@ -12794,55 +12835,55 @@
 msgstr "L_oggar av"
 
 msgid "Goes a_way"
-msgstr "Går _vekk"
+msgstr "G_år vekk"
 
 msgid "Ret_urns from away"
-msgstr "_Kjem attende etter å ha vore vekke"
+msgstr "Kj_em attende etter å ha vore vekke"
 
 msgid "Becomes _idle"
 msgstr "Blir _uverksam"
 
 msgid "Is no longer i_dle"
-msgstr "Er ikkje uverksam lenger"
+msgstr "Er _ikkje uverksam lenger"
 
 msgid "Starts _typing"
-msgstr "Begynner å skriva"
+msgstr "Begynner å _skriva"
 
 msgid "P_auses while typing"
 msgstr "Tek ein _pause under skrivinga"
 
 msgid "Stops t_yping"
-msgstr "Stansar skrivinga"
+msgstr "St_ansar skrivinga"
 
 msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
 msgid "Ope_n an IM window"
-msgstr "Opna eit lynmeldingsvindauge"
+msgstr "Opna eit lyn_meldingsvindauge"
 
 msgid "_Pop up a notification"
-msgstr "Sprett opp eit _varsel"
+msgstr "_Sprett opp eit varsel"
 
 msgid "Send a _message"
-msgstr "Send ei _melding"
+msgstr "Send e_i melding"
 
 msgid "E_xecute a command"
-msgstr "Køyr ein _kommando"
+msgstr "Kjø_r ein kommando"
 
 msgid "P_lay a sound"
-msgstr "Spel ein _lyd"
+msgstr "Spel ein ly_d"
 
 msgid "Brows_e..."
 msgstr "_Bla gjennom…"
 
 msgid "Br_owse..."
-msgstr "_Bla gjennom…"
+msgstr "Bl_a gjennom…"
 
 msgid "Pre_view"
-msgstr "Førehands_vis"
+msgstr "F_ørehandsvis"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
+msgstr "Venne_overvaking berre når statusen min er Ikkje tilgjengeleg"
 
 msgid "_Recurring"
 msgstr "_Gjentakande"
@@ -12884,21 +12925,19 @@
 msgstr "Ukjend… . Rapporter feilen."
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(standard)"
+msgstr "(tilpassa)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Pidgin sitt standard lydtema"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin vennelistedraktbehandlar"
+msgstr "Pidgin si standard vennelistedrakt"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidgin si standard ikondrakt"
 
 msgid "Theme failed to unpack."
 msgstr "Klarte ikkje å pakka ut drakta. "
@@ -12909,29 +12948,36 @@
 msgid "Theme failed to copy."
 msgstr "Klarte ikkje å kopiera drakta."
 
-msgid "Install Theme"
-msgstr "Installer drakta"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Vel smilefjesdrakt frå lista nedanfor. Du kan installera nye drakter ved å "
-"dra og sleppa dei ned i draktlista."
-
-msgid "Icon"
-msgstr "Ikon"
+msgid "Theme Selections"
+msgstr "Draktval"
+
+#. 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 ""
+"Vel drakta du ønskjer å bruka frå lista nedanfor.\n"
+"Du kan installera nye drakter ved å dra og sleppa dei ned i draktlista."
+
+msgid "Buddy List Theme:"
+msgstr "Vennelistedrakt:"
+
+msgid "Status Icon Theme:"
+msgstr "Statusikondrakt:"
+
+msgid "Sound Theme:"
+msgstr "Lyddrakt:"
+
+msgid "Smiley Theme:"
+msgstr "Smilefjesdrakt:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarvegar"
 
 # Trur det skal vera liten bokstav i escape :-)
 msgid "Cl_ose conversations with the Escape key"
-msgstr "L_ukk samtaler med escape-tasten"
-
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Vennelistedrakt"
+msgstr "Lukk samtalar med _escape-tasten"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12947,7 +12993,7 @@
 msgstr "Samtalevindauge"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Skjul nye lynmeldingssamtaler:"
+msgstr "_Skjul nye lynmeldingssamtalar:"
 
 msgid "When away"
 msgstr "Når vekke"
@@ -12963,7 +13009,7 @@
 msgstr "Vis lynmeldingar og prat i _faner"
 
 msgid "Show close b_utton on tabs"
-msgstr "Vis l_ukkeknappar på faner"
+msgstr "Vis _lukkeknappar på faner"
 
 msgid "_Placement:"
 msgstr "_Plassering:"
@@ -12987,16 +13033,16 @@
 msgstr "Vertikalt til høgre"
 
 msgid "N_ew conversations:"
-msgstr "_Nye samtaler:"
+msgstr "Nye samtala_r:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "Vis _formatering i innkomne meldingar"
+msgstr "Vis formatering i _innkomne meldingar"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Lukk lynmeldingane med ein gong fana blir lukka"
 
 msgid "Show _detailed information"
-msgstr "Vis _detaljar"
+msgstr "Vis d_etaljar"
 
 msgid "Enable buddy ic_on animation"
 msgstr "Bruk _animerte venneikon"
@@ -13019,14 +13065,11 @@
 msgid "Font"
 msgstr "Skrifttype"
 
-msgid "Use document font from _theme"
-msgstr "Bruk dokumentskrifttype frå _drakta"
-
 msgid "Use font from _theme"
 msgstr "Bruk skrifttype frå _drakta"
 
 msgid "Conversation _font:"
-msgstr "Samtaleskrift:"
+msgstr "Samtaleskri_ft:"
 
 msgid "Default Formatting"
 msgstr "Standardformatering"
@@ -13044,17 +13087,15 @@
 msgid "Cannot start browser configuration program."
 msgstr "Klarer ikkje å starta nettlesaren sitt innstillingsprogram."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Slå av"
+msgstr "Slått av"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Bruk _automatisk funnen IP-adresse: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Tenar:"
+msgstr "STU_N-tenar:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
@@ -13068,78 +13109,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "Slå på automatisk port_vidaresending"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Før opp _portrekkje det skal lyttast til"
-
-#, fuzzy
+msgstr "Før opp _portrekkje det skal lyttast til:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Start:"
+
 msgid "_End:"
-msgstr "_Utvid"
+msgstr "_Slutt:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "s"
-
-#, fuzzy
+msgstr "Vidaresendingstenar (TURN)"
+
 msgid "_TURN server:"
-msgstr "_Tenar:"
-
-#, fuzzy
+msgstr "_TURN-tenar:"
+
 msgid "Use_rname:"
-msgstr "Brukarnamn:"
-
-#, fuzzy
+msgstr "_Brukarnamn:"
+
 msgid "Pass_word:"
-msgstr "Passord:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Mellomtenar &amp; nettlesar"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Fann ikkje innstillingsprogrammet til mellomlageret.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Fann ikkje innstillingsprogrammet til nettlesaren.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Mellomlager- og nettlesarinnstillingar endrar\n"
-"ein i GNOME-innstillingane"
-
-msgid "Configure _Proxy"
-msgstr "Innstillingar _mellomtenar"
-
-msgid "Configure _Browser"
-msgstr "Innstillingar _nettlesar"
-
-msgid "Proxy Server"
-msgstr "Mellomtenar"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Bruk fjern-DNS med SOCKS4-mellomtenarar"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Mellomtenartype:"
-
-msgid "No proxy"
-msgstr "Inga mellomlagring"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Brukarnamn:"
+msgstr "_Passord:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13180,6 +13170,15 @@
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Nettlesarinnstillingar endrar ein i GNOME-innstillingane"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til nettlesaren.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Nettlesarinnstillingar"
+
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
@@ -13203,6 +13202,35 @@
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
+msgid "Proxy Server"
+msgstr "Mellomtenar"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Mellomtenarinnstillingar endrar ein i GNOME-innstillingane"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til mellomlageret.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Mellomtenarinnstillingar"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Bruk fjern-_DNS med SOCKS4-mellomtenarar"
+
+msgid "Proxy t_ype:"
+msgstr "_Mellomtenartype:"
+
+msgid "No proxy"
+msgstr "Inga mellomlagring"
+
+msgid "P_ort:"
+msgstr "Po_rt:"
+
+msgid "User_name:"
+msgstr "_Brukarnamn:"
+
 msgid "Log _format:"
 msgstr "Logg_format:"
 
@@ -13210,7 +13238,7 @@
 msgstr "L_oggfør alle lynmeldingar"
 
 msgid "Log all c_hats"
-msgstr "Loggfør alle sa_mtaler"
+msgstr "Loggfør alle sa_mtalar"
 
 msgid "Log all _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
@@ -13281,30 +13309,23 @@
 msgstr "_Nullstill"
 
 msgid "_Report idle time:"
-msgstr "Vis kor lenge _uverksam:"
+msgstr "Vis kor _lenge uverksam:"
 
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutt før ein blir uverksam:"
+
+msgid "Change to this status when _idle:"
+msgstr "Endra til denne _tilstanden når uverksam:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisk vekke"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minutt før ein blir uverksam:"
-
-msgid "Change status when _idle"
-msgstr "_Endra tilstand når uverksam"
-
-msgid "Change _status to:"
-msgstr "Endra _tilstand til:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
@@ -13318,15 +13339,15 @@
 msgid "Interface"
 msgstr "Grensesnitt"
 
-msgid "Smiley Themes"
-msgstr "Smilefjesdrakt"
-
 msgid "Browser"
 msgstr "Nettlesar"
 
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
+msgid "Themes"
+msgstr "Drakter:"
+
 msgid "Allow all users to contact me"
 msgstr "Tillat alle å kontakta meg"
 
@@ -13348,8 +13369,9 @@
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringar i personvernet blir tekne i bruk med ein gong."
 
+# var: Personvern for:
 msgid "Set privacy for:"
-msgstr "Personvern for:"
+msgstr "Gjeld kontoen:"
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -13480,8 +13502,9 @@
 msgid "Shortcut Text"
 msgstr "Snarvegstekst"
 
+# var: Tilpassa smilefjesbehandling
 msgid "Custom Smiley Manager"
-msgstr "Tilpassa smilefjesbehandling"
+msgstr "Smilefjesbehandling"
 
 msgid "Select Buddy Icon"
 msgstr "Vel venneikon"
@@ -13652,10 +13675,10 @@
 msgstr "_Inviter"
 
 msgid "_Modify..."
-msgstr "_Endra…"
+msgstr "E_ndra…"
 
 msgid "_Add..."
-msgstr "_Legg til…"
+msgstr "L_egg til…"
 
 msgid "_Open Mail"
 msgstr "_Opna e-post"
@@ -13669,9 +13692,6 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin-smilefjes"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Å velja dette tek vekk bruk av grafiske smilefjes."
 
@@ -13856,7 +13876,7 @@
 msgstr "Tenesteoppdaging"
 
 msgid "_Browse"
-msgstr "_Bla:"
+msgstr "_Bla"
 
 msgid "Server does not exist"
 msgstr "Tenaren finst ikkje"
@@ -13878,7 +13898,7 @@
 "eller andre XMPP-tenester."
 
 msgid "By conversation count"
-msgstr "Etter tal på samtaler"
+msgstr "Etter tal på samtalar"
 
 msgid "Conversation Placement"
 msgstr "Samtaleplassering"
@@ -13888,11 +13908,11 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Merk: innstillinga for \"Nye samtaler\" vera stilt inn på \"Etter tal på "
-"samtaler\"."
+"Merk: innstillinga for \"Nye samtalar\" må vera stilt inn på \"Etter tal på "
+"samtalar\"."
 
 msgid "Number of conversations per window"
-msgstr "Tal på samtaler per vindauge"
+msgstr "Tal på samtalar per vindauge"
 
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Skil lynmeldingsvindauge og praterom når plassert i nummerorden"
@@ -13917,7 +13937,7 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Avgrens talet på samtaler i kvart vindauge og, om du vil, skil "
+"Avgrens talet på samtalar i kvart vindauge og, om du vil, skil "
 "lynmeldingsvindauge og praterom"
 
 #. Configuration frame
@@ -13959,7 +13979,7 @@
 msgstr ""
 "Gjev støtte til muserørsler i samtalevindauge. Dra midtknappen på musa for å "
 "utføra enkelte handlingar:\n"
-" • dra ned og til høgre: lèt deg lukka ei samtale.\n"
+" • dra ned og til høgre: lèt deg lukka ein samtale.\n"
 " • dra opp og til venstre: byter til førre samtale.\n"
 " • dra opp og til høgre: byter til neste samtale."
 
@@ -14098,7 +14118,7 @@
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Minimerer vennelista og alle opne samtaler når du går vekk."
+msgstr "Minimerer vennelista og alle opne samtalar når du går vekk."
 
 msgid "Mail Checker"
 msgstr "E-postsjekkar"
@@ -14113,7 +14133,7 @@
 msgstr "Markeringslinje"
 
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Trekk ei linje for å visa nye meldingar i ei samtale."
+msgstr "Trekk ei linje for å visa nye meldingar i ein samtale."
 
 msgid "Jump to markerline"
 msgstr "Gå til markeringslinja"
@@ -14125,7 +14145,7 @@
 msgstr "_Lynmeldingsvindauge"
 
 msgid "C_hat windows"
-msgstr "_Samtalevindauge"
+msgstr "Samtale_vindauge"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14182,8 +14202,9 @@
 msgid "Notify For"
 msgstr "Nytt varsel for"
 
+# \t_Berre når nokon seier brukarnamnet ditt
 msgid "\t_Only when someone says your username"
-msgstr "\t_Berre når nokon seier brukarnamnet ditt"
+msgstr "Berre når nokon seier brukarnamnet _ditt"
 
 msgid "_Focused windows"
 msgstr "_Fokuserte vindauge"
@@ -14197,7 +14218,7 @@
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "Viser _talet på nye meldingar i vindaugstittelen"
+msgstr "Viser talet på _nye meldingar i vindaugstittelen"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
@@ -14212,11 +14233,11 @@
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "Hev samtalevindauge"
+msgstr "_Hev samtalevindauget"
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr "_Framhev samtalevindauget"
+msgstr "F_ramhev samtalevindauget"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14224,7 +14245,7 @@
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Fjern når vindauget får _fokus"
+msgstr "Fjern når vindauget får f_okus"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
@@ -14303,6 +14324,9 @@
 msgid "Conversation Entry"
 msgstr "Samtale"
 
+msgid "Conversation History"
+msgstr "Samtalehistorikk"
+
 # Vindauge eller meldingsvindauge?
 msgid "Request Dialog"
 msgstr "Førespurnadsvindauge"
@@ -14456,7 +14480,7 @@
 msgstr "Legg til ei ny teksterstatning"
 
 msgid "You _type:"
-msgstr "Du _skriv:"
+msgstr "_Du skriv:"
 
 msgid "You _send:"
 msgstr "Du s_ender:"
@@ -14590,8 +14614,9 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Ei rullande, vassrett utgåve av vennelista."
 
+# var: Vis tidsstempel kvar(t)
 msgid "Display Timestamps Every"
-msgstr "Vis tidsstempel kvar(t)"
+msgstr "Vis tidsstempel kvart"
 
 #. *< type
 #. *< ui_requirement
@@ -14623,7 +14648,7 @@
 msgstr "Vis datoar i…"
 
 msgid "Co_nversations:"
-msgstr "_Samtaler:"
+msgstr "_Samtalar:"
 
 # var: For forseinka meldingar
 msgid "For delayed messages"
@@ -14657,37 +14682,31 @@
 "timestamp formats."
 msgstr ""
 "Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for "
-"samtaler og loggmeldingar."
-
-#, fuzzy
+"samtalar og loggmeldingar."
+
 msgid "Audio"
-msgstr "Auto"
-
-#, fuzzy
+msgstr "Lyd"
+
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Utdata"
+
 msgid "_Plugin"
-msgstr "Tilleggsprogram"
-
-#, fuzzy
+msgstr "_Programtillegg"
+
 msgid "_Device"
-msgstr "Eining"
+msgstr "_Eining"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Inndata"
+
 msgid "P_lugin"
-msgstr "Tilleggsprogram"
-
-#, fuzzy
+msgstr "_Programtillegg"
+
 msgid "D_evice"
-msgstr "Eining"
+msgstr "_Eining"
 
 #. *< magic
 #. *< major version
@@ -14698,18 +14717,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Endra innstillingar"
+msgstr "Lyd-/videoinnstillingar"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Mikrofon- og nettkamera-innstillingar."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "Mikrofon- og nettkamera-innstillingar for tale-/video-samtalar."
 
 msgid "Opacity:"
 msgstr "Ugjennomskin:"
@@ -14722,7 +14740,7 @@
 msgstr "_Gjennomsiktige lynmeldingsvindauge"
 
 msgid "_Show slider bar in IM window"
-msgstr "Vis _glidefelt i lynmeldingsvindauga"
+msgstr "Vis glidefelt i _lynmeldingsvindauga"
 
 msgid "Remove IM window transparency on focus"
 msgstr "Ta vekk transparens i lynmeldingsvindauge ved fokus"
@@ -14775,9 +14793,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s saman med Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Tillat fleire samstundes påloggingar"
+msgstr "Tillat fleire samstundes instansar"
 
 msgid "_Dockable Buddy List"
 msgstr "Vennelista kan _festast"
@@ -14840,10 +14857,26 @@
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-# ?
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet."
+#~ 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"
@@ -14857,11 +14890,15 @@
 #~ 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 "Calling ... "
-#~ msgstr "Ringjer…"
+#~ 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"
@@ -14877,6 +14914,13 @@
 #~ 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"
 
--- a/po/pl.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/pl.po	Sat Jan 09 02:00:18 2010 +0000
@@ -1,30 +1,27 @@
-# Polish translation of pidgin
-# Copyright (C) Przemysław Sułek <pbs@linux.net.pl> <psulek@plo.pl>, 2001.
+# Polish translation of Pidgin
+# Copyright (C) Przemysław Sułek <pbs@linux.net.pl>, 2001.
 # Copyright (C) Krzysztof Foltman <kfoltman@onet.pl>, 2003.
 # Copyright (C) Artur Flinta <aflinta@at.kernel.pl>, 2004.
 # Copyright (C) Emil Nowak <emil5@go2.pl>, 2003-2007.
 # Copyright (C) Paweł Godlewski <pawel@endure.pl>, 2007.
 # Copyright (C) Tomasz Sałaciński <tsalacinski@gmail.com>, 2007.
+# Copyright (C) Piotr Makowski <pmakowski@aviary.pl>, 2008.
 # -----------------------------------------------------------------
-# Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>, 2008.
+# Copyright (C) Piotr Drąg <piotrdrag@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2008-12-29 17:50+0100\n"
-"Last-Translator: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
-"Language-Team: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-29 23:58+0100\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Gettext Translator 0.9\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: POLAND\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -33,9 +30,9 @@
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Napisz \"%s -h\" aby uzyskać więcej informacji.\n"
-
-#, fuzzy, c-format
+msgstr "%s. Należy podać \"%s -h\", aby uzyskać więcej informacji.\n"
+
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -47,14 +44,14 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s\n"
-"Użycie: %s [OPCJE]...\n"
-"\n"
-"  -c, --config=KAT    używa wybranego KATalogu z plikami konfiguracyjnymi\n"
-"  -d, --debug         wyświetla komunikaty przydatne przy debugowaniu na "
-"standardowe wyjście\n"
-"  -h, --help          wyświetla ten komunikat pomocy\n"
-"  -n, --nologin       wyłącza automatyczne logowanie\n"
-"  -v, --version       wyświetla numer aktualnej wersji\n"
+"Użycie: %s [OPCJA]...\n"
+"\n"
+"  -c, --config=KATALOG  używa KATALOGU z plikami konfiguracji\n"
+"  -d, --debug         przekazuje komunikaty debugowania na standardowe\n"
+"                      wyjście\n"
+"  -h, --help          wyświetla tę pomoc i kończy pracę\n"
+"  -n, --nologin       bez automatycznego logowania\n"
+"  -v, --version       wyświetla bieżącą wersję i kończy pracę\n"
 
 #, c-format
 msgid ""
@@ -62,9 +59,9 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s napotkał błędy podczas migracji Twoich ustawień z %s do %s. Proszę "
-"sprawdzić błąd i jeśli to możliwe, dokończyć migracji ręcznie. Proszę także "
-"o zgłoszenie tego błędu do http://developer.pidgin.im"
+"Program %s napotkał błędy podczas migracji ustawień z %s do %s. Proszę "
+"sprawdzić błąd i ukończyć migrację ręcznie. Proszę zgłosić ten błędu na "
+"http://developer.pidgin.im"
 
 #. the user did not fill in the captcha
 msgid "Error"
@@ -73,22 +70,20 @@
 msgid "Account was not added"
 msgstr "Konto nie zostało dodane"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
-msgstr "Identyfikator nie może być pusty."
+msgstr "Nazwa użytkownika konta nie może być pusta."
 
 msgid "New mail notifications"
-msgstr "Powiadamianie o nowej poczcie"
+msgstr "Powiadomienia o nowej poczcie"
 
 msgid "Remember password"
 msgstr "Zapamiętanie hasła"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
-msgstr "Brak wtyczek protokołów."
+msgstr "Nie zainstalowano żadnych wtyczek protokołów."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Prawdopodobnie zapomniałaś/zapomniałeś uruchomić 'make install' )"
+msgstr "(Prawdopodobnie zapomniano o wykonaniu \"make install\")"
 
 msgid "Modify Account"
 msgstr "Modyfikacja konta"
@@ -99,9 +94,8 @@
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Użytkownik:"
+msgstr "Nazwa użytkownika:"
 
 msgid "Password:"
 msgstr "Hasło:"
@@ -110,9 +104,8 @@
 msgstr "Alias:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Utwórz nowe konto na serwerze"
+msgstr "Utworzenie tego konta na serwerze"
 
 #. Cancel button
 #. Cancel
@@ -126,10 +119,10 @@
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Czy na pewno usunąć %s?"
+msgstr "Na pewno usunąć %s?"
 
 msgid "Delete Account"
-msgstr "Kasuj konto"
+msgstr "Usuń konto"
 
 #. Delete button
 msgid "Delete"
@@ -139,7 +132,7 @@
 msgstr "Konta"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Możesz włączyć lub wyłączyć konta z poniższej listy."
+msgstr "Można włączyć/wyłączyć konta z poniższej listy."
 
 #. Add button
 msgid "Add"
@@ -147,24 +140,24 @@
 
 #. Modify button
 msgid "Modify"
-msgstr "Modyfikuj"
+msgstr "Zmodyfikuj"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "Użytkownik %s%s%s%s dodał %s do swojej listy kontaktów %s%s"
+msgstr "Użytkownik %s%s%s%s dodał %s do swojej listy znajomych %s%s"
 
 msgid "Add buddy to your list?"
 msgstr "Dodać do listy znajomych?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "Użytkownik %s%s%s%s chce dodać %s do swojej listy znajomych %s%s."
+msgstr "Użytkownik %s%s%s%s chce dodać %s do swojej listy znajomych %s%s"
 
 msgid "Authorize buddy?"
-msgstr "Prośba o autoryzację"
+msgstr "Upoważnić znajomego?"
 
 msgid "Authorize"
-msgstr "Autoryzuj"
+msgstr "Upoważnij"
 
 msgid "Deny"
 msgstr "Odrzuć"
@@ -174,8 +167,8 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"Dostępnych: %d\n"
-"Wszystkich: %d"
+"Online: %d\n"
+"Razem: %d"
 
 #, c-format
 msgid "Account: %s (%s)"
@@ -193,36 +186,34 @@
 msgstr "Domyślny"
 
 msgid "You must provide a username for the buddy."
-msgstr "Należy wprowadzić nazwę użytkownika znajomego."
+msgstr "Należy podać nazwę użytkownika dla znajomego."
 
 msgid "You must provide a group."
-msgstr "Musisz ustawić grupę."
+msgstr "Należy podać grupę."
 
 msgid "You must select an account."
-msgstr "Musisz wybrać konto"
+msgstr "Należy wybrać konto."
 
 msgid "The selected account is not online."
-msgstr "Wybrane konto nie jest "
+msgstr "Wybrane konto nie jest w trybie online."
 
 msgid "Error adding buddy"
 msgstr "Błąd podczas dodawania znajomego"
 
 msgid "Username"
-msgstr "Użytkownik"
-
-#, fuzzy
+msgstr "Nazwa użytkownika"
+
 msgid "Alias (optional)"
-msgstr "Alias kontaktu"
-
-#, fuzzy
+msgstr "Alias (opcjonalny)"
+
 msgid "Add in group"
-msgstr "Dodawanie grupy"
+msgstr "Dodaj do grupy"
 
 msgid "Account"
 msgstr "Konto"
 
 msgid "Add Buddy"
-msgstr "Dodaj użytkownika"
+msgstr "Dodanie znajomego"
 
 msgid "Please enter buddy information."
 msgstr "Proszę podać informacje o znajomym."
@@ -241,37 +232,37 @@
 msgstr "Grupa"
 
 msgid "Auto-join"
-msgstr "Automatyczne przyłączanie się"
+msgstr "Automatyczne dołączanie"
 
 msgid "Add Chat"
 msgstr "Dodanie konferencji"
 
 msgid "You can edit more information from the context menu later."
-msgstr "Możesz redagować więcej informacji z menu kontekstowego później."
+msgstr "Można później zmodyfikować więcej informacji z menu kontekstowego."
 
 msgid "Error adding group"
 msgstr "Błąd podczas dodawania grupy"
 
 msgid "You must give a name for the group to add."
-msgstr "Musisz podać nazwę dodawanej grupy."
+msgstr "Należy podać nazwę dodawanej grupy."
 
 msgid "Add Group"
-msgstr "Dodawanie grupy"
+msgstr "Dodanie grupy"
 
 msgid "Enter the name of the group"
-msgstr "Podaj nazwę dodawanej grupy"
+msgstr "Proszę podać nazwę dodawanej grupy"
 
 msgid "Edit Chat"
-msgstr "Edycja konferencji"
+msgstr "Zmodyfikuj konferencję"
 
 msgid "Please Update the necessary fields."
-msgstr "Proszę uaktualniać niezbędne pola."
+msgstr "Proszę zaktualizować wymagane pola."
 
 msgid "Edit"
-msgstr "Edytuj"
+msgstr "Edycja"
 
 msgid "Edit Settings"
-msgstr "Edytuj ustawienia"
+msgstr "Zmodyfikuj ustawienia"
 
 msgid "Information"
 msgstr "Informacje"
@@ -280,50 +271,49 @@
 msgstr "Pobieranie..."
 
 msgid "Get Info"
-msgstr "Pobierz Informacje"
+msgstr "Pobierz informacje"
 
 msgid "Add Buddy Pounce"
-msgstr "Dodaj przechwytywanie zdarzeń"
+msgstr "Dodanie przechwytywania zdarzeń"
 
 msgid "Send File"
 msgstr "Wyślij plik"
 
 msgid "Blocked"
-msgstr "Zablokowane"
+msgstr "Zablokowano"
 
 msgid "Show when offline"
-msgstr "Wyświetlaj, gdy rozłączony"
+msgstr "Wyświetlaj w trybie offline"
 
 #, c-format
 msgid "Please enter the new name for %s"
-msgstr "Wpisz nową nazwę dla %s"
+msgstr "Proszę podać nową nazwę dla %s"
 
 msgid "Rename"
-msgstr "_Zmień nazwę"
+msgstr "Zmień nazwę"
 
 msgid "Set Alias"
-msgstr "Ustaw nazwę"
+msgstr "Ustaw alias"
 
 msgid "Enter empty string to reset the name."
-msgstr "Wpisz pusty ciąg znaków by zresetować nazwę."
+msgstr "Proszę podać pusty ciąg, aby przywrócić nazwę."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
-"Usunięcie kontaktu spowoduje usunięcie wszystkich znajomych zawartych w tym "
-"kontakcie."
+"Usunięcie tego kontaktu spowoduje usunięcie wszystkich znajomych w tym "
+"kontakcie"
 
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
-"Usunięcie grupy spowoduje usunięcie wszystkich znajomych należących do tej "
-"grupy."
+"Usunięcie tej grupy spowoduje usunięcie wszystkich znajomych z tej grupy"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Czy na pewno usunąć %s?"
+msgstr "Na pewno usunąć %s?"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
-msgstr "Potwierdź usunięcie"
+msgstr "Potwierdzenie usunięcia"
 
 msgid "Remove"
 msgstr "Usuń"
@@ -333,18 +323,17 @@
 msgstr "Lista znajomych"
 
 msgid "Place tagged"
-msgstr "Miejsce zostało otagowane"
-
-#, fuzzy
+msgstr "Nadano znaczniki miejscu"
+
 msgid "Toggle Tag"
-msgstr "Google Talk"
+msgstr "Przełącz znacznik"
 
 msgid "View Log"
-msgstr "Wyświetl _dziennik rozmów"
+msgstr "Wyświetl dziennik rozmów"
 
 #. General
 msgid "Nickname"
-msgstr "Identyfikator"
+msgstr "Pseudonim"
 
 #. Never know what those translations might end up like...
 #. Idle stuff
@@ -352,7 +341,7 @@
 msgstr "Bezczynny"
 
 msgid "On Mobile"
-msgstr "Używa urządzenia przenośnego"
+msgstr "Używa telefonu komórkowego"
 
 msgid "New..."
 msgstr "Nowy..."
@@ -363,22 +352,20 @@
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "Odblokuj "
+msgstr "Zablokuj/odblokuj"
 
 msgid "Block"
 msgstr "Zablokuj"
 
 msgid "Unblock"
-msgstr "Odblokuj "
+msgstr "Odblokuj"
 
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Proszę wprowadzić identyfikator lub nazwę znajomego do zablokowania/"
-"odblokowania."
+"Proszę podać nazwę użytkownika lub alias osoby do zablokowania/odblokowania."
 
 #. Not multiline
 #. Not masked?
@@ -391,17 +378,16 @@
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Proszę wprowadzić identyfikator lub nazwę znajomego, do którego należy "
-"wysłać wiadomość."
+"Proszę podać nazwę użytkownika lub alias osoby, do którego wysłać wiadomość."
 
 msgid "Channel"
 msgstr "Kanał"
 
 msgid "Join a Chat"
-msgstr "Dołącz do konferencji"
+msgstr "Dołączenie do konferencji"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "Proszę wpisać nazwę konferencji, do której chcesz dołączyć."
+msgstr "Proszę podać nazwę konferencji, do której dołączyć."
 
 msgid "Join"
 msgstr "Dołącz"
@@ -410,44 +396,42 @@
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Proszę podać identyfikator lub nazwę znajomego, którego dziennik rozmów "
-"należy wyświetlić."
+"Proszę podać nazwę użytkownika lub alias osoby, której dziennik rozmów "
+"wyświetlić."
 
 #. Create the "Options" frame.
 msgid "Options"
 msgstr "Opcje"
 
 msgid "Send IM..."
-msgstr "Wyślij IM..."
+msgstr "Wyślij wiadomość..."
 
 msgid "Block/Unblock..."
-msgstr "Zablokuj/Odblokuj..."
+msgstr "Zablokuj/odblokuj..."
 
 msgid "Join Chat..."
 msgstr "Dołącz do konferencji..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "Wyświetl _dziennik rozmów"
-
-#, fuzzy
+msgstr "Wyświetl dziennik rozmów..."
+
 msgid "View All Logs"
-msgstr "Wyświetl _dziennik rozmów"
+msgstr "Wyświetl wszystkie dzienniki rozmów"
 
 msgid "Show"
-msgstr "Pokaż"
+msgstr "Wyświetl"
 
 msgid "Empty groups"
 msgstr "Puste grupy"
 
 msgid "Offline buddies"
-msgstr "Nieobecni znajomi"
+msgstr "Znajomi w trybie offline"
 
 msgid "Sort"
-msgstr "Sortuj"
+msgstr "Posortuj"
 
 msgid "By Status"
-msgstr "Według statusu"
+msgstr "Według stanu"
 
 msgid "Alphabetically"
 msgstr "Alfabetycznie"
@@ -461,18 +445,17 @@
 msgid "Chat"
 msgstr "Konferencja"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "Grupa"
+msgstr "Grupowanie"
 
 msgid "Certificate Import"
 msgstr "Import certyfikatu"
 
 msgid "Specify a hostname"
-msgstr "Proszę wybrać nazwę hosta"
+msgstr "Proszę podać nazwę komputera"
 
 msgid "Type the host name this certificate is for."
-msgstr "Wpisz nazwę hosta dla tego certyfikatu."
+msgstr "Proszę podać nazwę komputera, dla którego jest ten certyfikat."
 
 #, c-format
 msgid ""
@@ -480,33 +463,34 @@
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Plik %s nie może zostać zaimportowany.\n"
-"Proszę się upewnić, czy plik jest odczytywalny i jest w formacie PEM.\n"
+"Proszę się upewnić, czy można odczytać plik i jest w formacie PEM.\n"
 
 msgid "Certificate Import Error"
-msgstr "Błąd importowania certyfikatu"
+msgstr "Błąd podczas importowania certyfikatu"
 
 msgid "X.509 certificate import failed"
-msgstr "Import certyfikatu X.509 zakończony niepowodzeniem."
+msgstr "Zaimportowanie certyfikatu X.509 nie powiodło się"
 
 msgid "Select a PEM certificate"
-msgstr "Wybierz certyfikat PEM"
+msgstr "Wybór certyfikatu PEM"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"Eksport do pliku %s zakończony niepowodzeniem.\n"
-"Upewnij się, że masz prawa zapisu do ścieżki docelowej.\n"
+"Wyeksportowanie do pliku %s nie powiodło się.\n"
+"Proszę upewnić się, czy użytkownik posiada uprawnienie do zapisu do ścieżki "
+"docelowej\n"
 
 msgid "Certificate Export Error"
 msgstr "Błąd eksportu certyfikatu"
 
 msgid "X.509 certificate export failed"
-msgstr "Eksportowanie certyfikatu X.509 zakończone niepowodzeniem."
+msgstr "Wyeksportowanie certyfikatu X.509 nie powiodło się"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "Eksportowanie certyfikatu PEM X.509"
+msgstr "Eksport certyfikatu PEM X.509"
 
 #, c-format
 msgid "Certificate for %s"
@@ -519,30 +503,30 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
-"Potoczna nazwa: %s\n"
-"\n"
-"Odcisk palca SHA1:\n"
+"Wspólna nazwa: %s\n"
+"\n"
+"Odcisk SHA1:\n"
 "%s"
 
 msgid "SSL Host Certificate"
-msgstr "Certyfikat hosta SSL"
+msgstr "Certyfikat SSL komputera"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Czy na pewno usunąć certyfikat dla %s?"
+msgstr "Na pewno usunąć certyfikat dla %s?"
 
 msgid "Confirm certificate delete"
-msgstr "Potwierdź usunięcie certyfikatu"
+msgstr "Potwierdzenie usunięcia certyfikatu"
 
 msgid "Certificate Manager"
 msgstr "Menadżer certyfikatów"
 
 #. Creating the user splits
 msgid "Hostname"
-msgstr "Nazwa hosta"
+msgstr "Nazwa komputera"
 
 msgid "Info"
-msgstr "Informacja"
+msgstr "Informacje"
 
 #. Close button
 msgid "Close"
@@ -554,7 +538,7 @@
 
 #, c-format
 msgid "%s disconnected."
-msgstr "%s rozłączony"
+msgstr "%s został rozłączony."
 
 #, c-format
 msgid ""
@@ -565,8 +549,8 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch nie będzie próbował ponownie nawiązać połączenia dopóki nie naprawisz "
-"błędu i nie włączysz ponownego logowania na to konto."
+"Program Finch nie będzie próbował ponownie połączyć konto, dopóki nie "
+"zostanie naprawiony błąd i ponownie włączone konto."
 
 msgid "Re-enable Account"
 msgstr "Ponownie włącz konto"
@@ -575,27 +559,27 @@
 msgstr "Nie ma takiego polecenia."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Błąd składni:  Podano niewłaściwą liczbę argumentów dla tego polecenia."
+msgstr "Błąd składni: podano błędną liczbę parametrów dla tego polecenia."
 
 msgid "Your command failed for an unknown reason."
-msgstr "Wykonanie polecenia zakończyło się niepowodzeniem z nieznanego powodu."
+msgstr "Polecenie nie powiodło się z nieznanego powodu."
 
 msgid "That command only works in chats, not IMs."
 msgstr ""
-"To polecenie jest dostępne tylko przy konferencjach - nie można go używać "
-"przy prywatnych wiadomościach."
+"Te polecenie działa tylko w konferencjach, nie można go używać w "
+"wiadomościach."
 
 msgid "That command only works in IMs, not chats."
 msgstr ""
-"To polecenie jest dostępne tylko przy prywatnych wiadomościach - nie można "
-"go używać w konferencjach."
+"Te polecenie jest dostępne tylko w wiadomościach, nie można go używać w "
+"konferencjach."
 
 msgid "That command doesn't work on this protocol."
-msgstr "Wybrane polecenie nie działa z tym protokołem."
+msgstr "Te polecenie nie działa z tym protokołem."
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "Wiadomość nie została wysłana, ponieważ nie jesteś zalogowany."
+msgstr ""
+"Wiadomość nie została wysłana, ponieważ użytkownik nie jest zalogowany."
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -614,26 +598,28 @@
 "%s coś pisze..."
 
 msgid "You have left this chat."
-msgstr "Opuściłeś tą konferencję"
+msgstr "Użytkownik opuścił tą konferencję."
 
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
+"Konto zostało rozłączone, a użytkownik opuścił konferencję. Zostanie "
+"automatycznie dołączony ponownie, kiedy konto zostanie połączone ponownie."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Zapisywanie do dziennika zostało włączone. Wszystkie wiadomości które "
-"pojawią się w oknie tej rozmowy zostaną zapisane."
+"Zapisywanie do dziennika zostało rozpoczęte. Od tej chwili wszystkie "
+"wiadomości w tej rozmowie zostaną zapisane."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Zapisywanie do dziennika zostało zatrzymane. Od tej chwili wszystkie "
-"wiadomości z tej rozmowy nie będą już zapisywane."
+"wiadomości w tej rozmowie nie będą zapisywane."
 
 msgid "Send To"
-msgstr "_Wyślij do"
+msgstr "Wyślij do"
 
 msgid "Conversation"
 msgstr "Rozmowa"
@@ -645,35 +631,32 @@
 msgstr "Datownik"
 
 msgid "Add Buddy Pounce..."
-msgstr "Dodaj przechwytywanie zdarzeń"
-
-#, fuzzy
+msgstr "Dodaj przechwytywanie zdarzeń..."
+
 msgid "Invite..."
-msgstr "Zaproś"
+msgstr "Zaproś..."
 
 msgid "Enable Logging"
 msgstr "Zapis do dziennika"
 
 msgid "Enable Sounds"
-msgstr "Włącz dźwięki"
-
-#, fuzzy
+msgstr "Włączenie dźwięków"
+
 msgid "You are not connected."
-msgstr "Nie można połączyć"
+msgstr "Nie połączono."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATYCZNA-ODPOWIEDŹ> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "Lista użytkowników:\n"
-msgstr[1] "Lista użytkowników:\n"
-msgstr[2] "Lista użytkowników:\n"
-
-#, fuzzy
+msgstr[0] "Lista %d użytkownika:\n"
+msgstr[1] "Lista %d użytkowników:\n"
+msgstr[2] "Lista %d użytkowników:\n"
+
 msgid "Supported debug options are: plugins version"
-msgstr "Obsługiwane opcje polecenia debug to:  version"
+msgstr "Obsługiwane opcje debugowania: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Nie ma takiego polecenia (w tym kontekście)."
@@ -682,7 +665,7 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Użyj \"/help &lt;polecenie&gt;\" aby uzyskać pomoc dla określonego "
+"Należy użyć \"/help &lt;polecenie&gt;\", aby uzyskać pomoc dla konkretnego "
 "polecenia.\n"
 "W tym kontekście dostępne są następujące polecenia:\n"
 
@@ -691,55 +674,58 @@
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
+"%s nie jest prawidłową klasą wiadomości. Proszę zobaczyć \"/help msgcolor\", "
+"aby uzyskać prawidłowe klasy wiadomości."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
+"%s nie jest prawidłowym kolorem. Proszę zobaczyć \"/help msgcolor\", aby "
+"uzyskać prawidłowe kolory."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;wiadomość&gt;:  Wysyła wiadomość w normalny sposób, taki sam jak bez "
-"używania jakichkolwiek poleceń."
+"say &lt;wiadomość&gt;: wysyła wiadomość w normalny sposób, taki sam jak bez "
+"używania poleceń."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;akcja&gt;:  Wysyła akcję w stylu IRC do znajomego lub konferencji."
+"me &lt;akcja&gt;: wysyła czynność w stylu IRC do znajomego lub konferencji."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;opcja&gt;:  Wysyła różne informacje debuggera do aktualnej rozmowy."
+"debug &lt;opcja&gt;: wysyła różne informacje debugowania do bieżącej rozmowy."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Czyści okno rozmowy"
+msgstr "clear: czyści okno rozmowy."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr ""
-"help &lt;polecenie&gt;:  Wyświetla pomoc dotyczącą określonego polecenia."
+msgstr "help &lt;polecenie&gt;: wyświetla pomoc konkretnego polecenia."
 
 msgid "users:  Show the list of users in the chat."
-msgstr "users: pokaż listę użytkowników w konferencji"
+msgstr "users: wyświetla listę użytkowników w konferencji."
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: Pokaż okno wtyczek."
+msgstr "plugins: wyświetla okno wtyczek."
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Pokaż listę znajomych."
+msgstr "buddylist: wyświetla listę znajomych."
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Pokaż konta."
+msgstr "accounts: wyświetla konta."
 
 msgid "debugwin: Show the debug window."
-msgstr "debugwin: Pokaż okno debuggera."
+msgstr "debugwin: wyświetla okno debugowania."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: Pokaż okno ustawień."
+msgstr "prefs: wyświetla okno preferencji."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Pokaż zapisane statusy."
+msgstr "statuses: wyświetla okno zapisanych stanów."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -748,12 +734,17 @@
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;klasa&gt; &lt;czcionka&gt; &lt;tło&gt;: ustawia kolor różnych "
+"klas wiadomości w oknie rozmowy.<br>    &lt;klasa&gt;: receive, send, "
+"highlight, action, timestamp<br>    &lt;czcionka/tło&gt;: black, red, green, "
+"blue, white, gray, darkgray, magenta, cyan, default<br><br>PRZYKŁAD:<br>    "
+"msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "Nie można otworzyć pliku."
 
 msgid "Debug Window"
-msgstr "Okno diagnostyczne"
+msgstr "Okno debugowania"
 
 #. 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,
@@ -768,16 +759,16 @@
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Przesyłanie plików. Ukończono %d%%, ilość plików - %d"
-msgstr[1] "Przesyłanie plików. Ukończono %d%%, ilość plików - %d"
-msgstr[2] "Przesyłanie plików. Ukończono %d%%, ilość plików - %d"
+msgstr[0] "Przesyłanie pliku - %d%% z %d pliku"
+msgstr[1] "Przesyłanie plików - %d%% z %d plików"
+msgstr[2] "Przesyłanie plików - %d%% z %d plików"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "Transmisja plików"
+msgstr "Przesyłanie plików"
 
 msgid "Progress"
 msgstr "Postęp"
@@ -789,7 +780,7 @@
 msgstr "Rozmiar"
 
 msgid "Speed"
-msgstr "Szybkość"
+msgstr "Prędkość"
 
 msgid "Remaining"
 msgstr "Pozostało"
@@ -797,13 +788,13 @@
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
 msgid "Status"
-msgstr "Status"
+msgstr "Stan"
 
 msgid "Close this window when all transfers finish"
-msgstr "Zamknij to okno, po zakończeniu wszystkich transferow"
+msgstr "Zamknięcie tego okna po ukończeniu wszystkich przesyłań"
 
 msgid "Clear finished transfers"
-msgstr "Wyczyść ukończone transfery"
+msgstr "Wyczyść ukończone przesyłania"
 
 msgid "Stop"
 msgstr "Zatrzymaj"
@@ -815,19 +806,17 @@
 msgstr "Anulowano"
 
 msgid "Failed"
-msgstr "Błąd"
+msgstr "Nie powiodło się"
 
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "U_staw"
-
-#, fuzzy
+msgstr "Wysłano"
+
 msgid "Received"
-msgstr "Odebrane wiadomości"
+msgstr "Odebrano"
 
 msgid "Finished"
 msgstr "Ukończono"
@@ -836,21 +825,19 @@
 msgid "The file was saved as %s."
 msgstr "Plik został zapisany jako %s."
 
-#, fuzzy
 msgid "Sending"
-msgstr "Wyślij"
-
-#, fuzzy
+msgstr "Wysyłanie"
+
 msgid "Receiving"
-msgstr "Pozostało"
-
-#, fuzzy, c-format
+msgstr "Odbieranie"
+
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Rozmowy w %s"
-
-#, fuzzy, c-format
+msgstr "Rozmowa w %s dnia %s"
+
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Rozmowy z %s"
+msgstr "Rozmowa z %s dnia %s"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -859,31 +846,31 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Zdarzenia systemowe będą zapisywane jeżeli opcja \"Zapis zmian statusu do "
-"dziennika systemowego\" jest włączona."
+"Zdarzenia systemowe będą zapisywane wyłącznie, jeśli preferencja \"Zapis "
+"zmian stanu do dziennika systemowego\" jest włączona."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Przychodzące wiadomości będą zapisywane jeżeli opcja \"Zapis wszystkich "
+"Wiadomości będą zapisywane wyłącznie, jeśli preferencja \"Zapis wszystkich "
 "wiadomości\" jest włączona."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Konferencje będą zapisywane, jeżeli opcja \"Zapis wszystkich konferencji\" "
-"jest włączona."
+"Konferencje będą zapisywane wyłącznie, jeśli preferencja \"Zapis wszystkich "
+"konferencji\" jest włączona."
 
 msgid "No logs were found"
-msgstr "Nie znaleziono zapisanego dziennika rozmów"
+msgstr "Nie odnaleziono żadnych dzienników rozmów"
 
 msgid "Total log size:"
 msgstr "Całkowity rozmiar dziennika rozmów:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "Przewiń/wyszukaj: "
 
 #, c-format
 msgid "Conversations in %s"
@@ -893,53 +880,51 @@
 msgid "Conversations with %s"
 msgstr "Rozmowy z %s"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Rozmowy"
+msgstr "Wszystkie rozmowy"
 
 msgid "System Log"
 msgstr "Dziennik systemowy"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "Obliczanie..."
+msgstr "Dzwonienie..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Rozłącz się"
 
 #. Number of actions
 msgid "Accept"
-msgstr "Akceptuj"
+msgstr "Zaakceptuj"
 
 msgid "Reject"
 msgstr "Odrzuć"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Trwa rozmowa."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Rozmowa została przerwana."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "Użytkownik %s chce rozpocząć sesję dźwiękową."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-
-#, fuzzy
+"Użytkownik %s próbuje rozpocząć nieobsługiwany typ sesji multimedialnej."
+
 msgid "You have rejected the call."
-msgstr "Opuszczono kanał%s%s"
+msgstr "Odrzucono rozmowę."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: rozpoczyna rozmowę dźwiękową."
 
 msgid "Emails"
-msgstr "Emaile"
+msgstr "Wiadomości e-mail"
 
 msgid "You have mail!"
-msgstr "Masz wiadomość!"
+msgstr "Nowa wiadomość."
 
 msgid "Sender"
 msgstr "Nadawca"
@@ -955,7 +940,7 @@
 msgstr[2] "%s (%s) ma %d nowych wiadomości."
 
 msgid "New Mail"
-msgstr "Nowa wiadomość email"
+msgstr "Nowa wiadomość e-mail"
 
 #, c-format
 msgid "Info for %s"
@@ -979,18 +964,17 @@
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "Numer identyfikacyjny"
+msgstr "Adres URI"
 
 msgid "ERROR"
 msgstr "BŁĄD"
 
 msgid "loading plugin failed"
-msgstr "Ładowanie wtyczki zakończone niepowodzeniem"
+msgstr "wczytanie wtyczki nie powiodło się"
 
 msgid "unloading plugin failed"
-msgstr "Wyłączanie wtyczki zakończone niepowodzeniem"
+msgstr "wyłączanie wtyczki nie powiodło się"
 
 #, c-format
 msgid ""
@@ -1005,38 +989,38 @@
 "Wersja: %s\n"
 "Opis: %s\n"
 "Autor: %s\n"
-"Strona domowa: %s\n"
+"Strona WWW: %s\n"
 "Nazwa pliku: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Wtyczka musi być włączona by móc ją konfigurować."
+msgstr "Wtyczka musi być wczytana przed skonfigurowaniem jej."
 
 msgid "No configuration options for this plugin."
-msgstr "Brak opcji konfiguracyjnych dla tej wtyczki."
+msgstr "Brak opcji konfiguracji dla tej wtyczki."
 
 msgid "Error loading plugin"
-msgstr "Wystąpił błąd podczas ładowania wtyczki."
+msgstr "Błąd podczas wczytywania wtyczki"
 
 msgid "The selected file is not a valid plugin."
-msgstr "Wybrany plik nie jest poprawnym plikiem wtyczki."
+msgstr "Wybrany plik nie jest prawidłową wtyczką."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-"Proszę otworzyć okno debugera i spróbować jeszcze raz aby zobaczyć pełną "
-"wiadomość o błędzie."
+"Proszę otworzyć okno debugowania i spróbować ponownie, aby zobaczyć dokładny "
+"komunikat błędu."
 
 msgid "Select plugin to install"
-msgstr "Wybierz wtyczkę do zainstalowania"
+msgstr "Proszę wybrać wtyczkę do zainstalowania"
 
 msgid "You can (un)load plugins from the following list."
-msgstr "Możesz załadować/wyładować wtyczki z tej listy"
+msgstr "Można wczytać/wyłączyć wtyczki z poniższej listy."
 
 msgid "Install Plugin..."
-msgstr "Instaluj wtyczkę..."
+msgstr "Zainstaluj wtyczkę..."
 
 msgid "Configure Plugin"
-msgstr "Konfiguruj wtyczkę"
+msgstr "Skonfiguruj wtyczkę"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1044,16 +1028,16 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 msgid "Preferences"
-msgstr "Ustawienia"
+msgstr "Preferencje"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Proszę podać użytkownika, od którego zdarzenia będą przechwytywane."
+msgstr "Proszę podać znajomego do przechwytywania zdarzeń."
 
 msgid "New Buddy Pounce"
 msgstr "Nowe przechwytywanie zdarzeń"
 
 msgid "Edit Buddy Pounce"
-msgstr "Modyfikacja zdarzenia"
+msgstr "Zmodyfikuj przechwytywane zdarzenie"
 
 msgid "Pounce Who"
 msgstr "Źródło zdarzeń"
@@ -1063,29 +1047,29 @@
 msgstr "Konto:"
 
 msgid "Buddy name:"
-msgstr "_Nazwa użytkownika:"
+msgstr "Nazwa znajomego:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Przechwytywane zdarzenia"
+msgstr "Przechwytywane zdarzenia, kiedy znajomy..."
 
 msgid "Signs on"
-msgstr "loguje się"
+msgstr "Zaloguje się"
 
 msgid "Signs off"
-msgstr "wylogowuje się"
+msgstr "Wylogowuje się"
 
 msgid "Goes away"
-msgstr "zaraz wraca"
+msgstr "Zaraz wraca"
 
 msgid "Returns from away"
-msgstr "wraca"
+msgstr "Wraca"
 
 msgid "Becomes idle"
-msgstr "przechodzi w stan bezczynności"
+msgstr "Przechodzi w stan bezczynności"
 
 msgid "Is no longer idle"
-msgstr "powraca ze stanu bezczynności"
+msgstr "Powraca ze stanu bezczynności"
 
 msgid "Starts typing"
 msgstr "Rozpoczyna pisanie"
@@ -1101,162 +1085,144 @@
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "Działanie"
+msgstr "Czynność"
 
 msgid "Open an IM window"
-msgstr "Otworzenie okna rozmowy"
+msgstr "Otwarcie okna rozmowy"
 
 msgid "Pop up a notification"
-msgstr "_Wyświetlenie okna z powiadomieniem"
-
-#, fuzzy
+msgstr "Wyświetlenie powiadomienia"
+
 msgid "Send a message"
-msgstr "Wysłanie wiado_mości"
-
-#, fuzzy
+msgstr "Wysłanie wiadomości"
+
 msgid "Execute a command"
-msgstr "Wyko_nanie polecenie"
-
-#, fuzzy
+msgstr "Wykonanie polecenia"
+
 msgid "Play a sound"
-msgstr "O_dtworzenie dźwięku"
-
-#, fuzzy
+msgstr "Odtworzenie dźwięku"
+
 msgid "Pounce only when my status is not Available"
-msgstr "Aktywne tylko gdy jestem dostępny"
+msgstr "Przechwytywanie tylko, gdy stan nie jest dostępny"
 
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "Nie można zmienić ksywki"
-
-#, fuzzy
+msgstr "Nie można utworzyć przechwytywania"
+
 msgid "You do not have any accounts."
-msgstr "Musisz wybrać konto"
+msgstr "Nie ma żadnych kont."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Należy najpierw utworzyć konto, aby utworzyć przechwytywanie."
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Na pewno chcesz usunąć przechwytywane zdarzenie od %s z konta %s ?"
+msgstr "Na pewno usunąć przechwytywane zdarzenie od %s z konta %s?"
 
 msgid "Buddy Pounces"
 msgstr "Przechwytywanie zdarzeń"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "Użytkownik %s zaczął/zaczęła coś pisać do Ciebie (%s)"
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s rozpoczął pisanie (%s)"
+
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "Użytkownik %s zaczął/zaczęła coś pisać do Ciebie (%s)"
+msgstr "Użytkownik %s przestał pisać (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s zalogował się (%s)"
+msgstr "Użytkownik %s zalogował się (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s przestał być bezczynny (%s)"
+msgstr "Użytkownik %s powrócił ze stanu bezczynności (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s jest już obecny (%s)"
+msgstr "Użytkownik %s wrócił (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s przestał pisać do Ciebie (%s)"
+msgstr "Użytkownik %s przestał pisać (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s rozłączył się (%s)"
+msgstr "Użytkownik %s rozłączył się (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s zmienił status na bezczynny (%s)"
+msgstr "Użytkownik %s przeszedł w stan bezczynności (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s zmieniła/zmienił stus na zajęty. (%s)"
+msgstr "Użytkownik %s zaraz wraca. (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s wysłał do Ciebie wiadomość. (%s)"
+msgstr "Użytkownik %s wysłał wiadomość. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr ""
-"Przechwycono nieznane zdarzenie. Proszę zawiadomić autorów programu Pidgin!"
+msgstr "Przechwycono nieznane zdarzenie. Proszę to zgłosić."
 
 msgid "Based on keyboard use"
-msgstr "Ruchy myszy i klawiatury"
+msgstr "W oparciu o użycie klawiatury"
 
 msgid "From last sent message"
-msgstr "Czas wysłania ostatniej wiadomości"
+msgstr "Od ostatniej wysłanej wiadomości"
 
 msgid "Never"
 msgstr "Nigdy"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "Ustawianie czasu bezczynności konta"
-
-#, fuzzy
+msgstr "Wyświetlanie czasu bezczynności"
+
 msgid "Show Offline Buddies"
-msgstr "Nieobecni znajomi"
+msgstr "Wyświetlanie znajomych w trybie offline"
 
 msgid "Notify buddies when you are typing"
-msgstr "_Informowanie znajomych o wpisywaniu tekstu"
+msgstr "Powiadamianie znajomych o pisaniu"
 
 msgid "Log format"
 msgstr "Format dziennika"
 
-#, fuzzy
 msgid "Log IMs"
-msgstr "Zalogowany"
-
-#, fuzzy
+msgstr "Zapis wiadomości"
+
 msgid "Log chats"
-msgstr "Zapis wszystkich _konferencji"
+msgstr "Zapis konferencji"
 
 msgid "Log status change events"
-msgstr "Zapis zmian statusu"
-
-#, fuzzy
+msgstr "Zapis zmian stanu"
+
 msgid "Report Idle time"
-msgstr "Sposób wyznaczania bezczynności:"
-
-#, fuzzy
+msgstr "Zgłaszanie czasu bezczynności"
+
 msgid "Change status when idle"
-msgstr "Zmiana Statusu po wykryciu bezczynności"
-
-#, fuzzy
+msgstr "Zmiana stanu podczas bezczynności"
+
 msgid "Minutes before changing status"
-msgstr "_Czas (w minutach) do zmiany statusu:"
-
-#, fuzzy
+msgstr "Minuty przed zmianą stanu"
+
 msgid "Change status to"
-msgstr "Zmiana _statusu na:"
+msgstr "Zmiana stanu na"
 
 msgid "Conversations"
 msgstr "Rozmowy"
 
 msgid "Logging"
-msgstr "Dziennik Rozmów"
-
-#, fuzzy
+msgstr "Dziennik rozmów"
+
 msgid "You must fill all the required fields."
-msgstr "Wypełnij pola wymagane do rejestracji."
-
-#, fuzzy
+msgstr "Należy wypełnić wszystkie wymagane pola."
+
 msgid "The required fields are underlined."
-msgstr "Nie udało się wczytać wymaganej wtyczki %s."
-
-#, fuzzy
+msgstr "Wymagane pola są podkreślone."
+
 msgid "Not implemented yet."
-msgstr "Ta funkcja nie jest jeszcze obsługiwana"
+msgstr "Jeszcze nie zaimplementowano."
 
 msgid "Save File..."
 msgstr "Zapisz plik..."
@@ -1264,26 +1230,24 @@
 msgid "Open File..."
 msgstr "Otwórz plik..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "Położenie"
+msgstr "Wybierz położenie..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
-
-#, fuzzy
+msgstr "Naciśnięcie klawisza \"Enter\" wyszuka więcej pokoi w tej kategorii."
+
 msgid "Get"
-msgstr "U_staw"
+msgstr "Uzyskaj"
 
 #. Create the window.
 msgid "Room List"
 msgstr "Lista pokoi"
 
 msgid "Buddy logs in"
-msgstr "Użytkownik loguje się"
+msgstr "Znajomy loguje się"
 
 msgid "Buddy logs out"
-msgstr "Użytkownik wyłącza swój komunikator"
+msgstr "Znajomy wylogowuje się"
 
 msgid "Message received"
 msgstr "Odebrano wiadomość"
@@ -1306,38 +1270,30 @@
 msgid "Others talk in chat"
 msgstr "Wypowiedź innych na konferencji"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "Ktoś wymawia Twoje imię na konferencji"
-
-#, fuzzy
+msgstr "Ktoś wymawia nazwę użytkownika na konferencji"
+
 msgid "GStreamer Failure"
-msgstr "Zapisz plik"
-
-#, fuzzy
+msgstr "Niepowodzenie biblioteki GStreamer"
+
 msgid "GStreamer failed to initialize."
-msgstr "Nie udało się rozpakować zestawu emotkionek."
-
-#, fuzzy
+msgstr "Zainicjowanie biblioteki GStreamer nie powiodło się."
+
 msgid "(default)"
-msgstr "Domyślny"
-
-#, fuzzy
+msgstr "(domyślnie)"
+
 msgid "Select Sound File ..."
-msgstr "Wyślij _plik"
-
-#, fuzzy
+msgstr "Wybierz plik dźwiękowy..."
+
 msgid "Sound Preferences"
-msgstr "Ustawienia"
-
-#, fuzzy
+msgstr "Preferencje dźwięku"
+
 msgid "Profiles"
-msgstr "Profil"
+msgstr "Profile"
 
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#, fuzzy
 msgid "Console Beep"
 msgstr "Sygnał konsoli"
 
@@ -1348,40 +1304,37 @@
 msgstr "Bez dźwięku"
 
 msgid "Sound Method"
-msgstr "Metoda odtwarzania dźwięku"
-
-#, fuzzy
+msgstr "Metoda dźwięku"
+
 msgid "Method: "
-msgstr "_Metoda:"
-
-#, fuzzy, c-format
+msgstr "Metoda: "
+
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"P_olecenie odtworzenia dźwięku\n"
+"Polecenie odtworzenia dźwięku\n"
 "(%s dla nazwy pliku)"
 
 #. Sound options
 msgid "Sound Options"
 msgstr "Opcje dźwięku"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "_Dźwięki w aktywnym oknie rozmowy"
+msgstr "Dźwięki w aktywnym oknie rozmowy"
 
 msgid "Always"
 msgstr "Zawsze"
 
 msgid "Only when available"
-msgstr "Tylko gdy jestem dostępny"
+msgstr "Tylko podczas dostępności"
 
 msgid "Only when not available"
 msgstr "Tylko podczas nieobecności"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "Głośność:"
+msgstr "Głośność (0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1390,29 +1343,27 @@
 msgid "Event"
 msgstr "Zdarzenie"
 
-#, fuzzy
 msgid "File"
-msgstr "Błąd"
+msgstr "Plik"
 
 msgid "Test"
-msgstr "Test"
+msgstr "Przetestuj"
 
 msgid "Reset"
-msgstr "Reset"
+msgstr "Przywróć"
 
 msgid "Choose..."
-msgstr "Wybór..."
-
-#, fuzzy, c-format
+msgstr "Wybierz..."
+
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Czy na pewno usunąć %s?"
-
-#, fuzzy
+msgstr "Czy na pewno usunąć \"%s\""
+
 msgid "Delete Status"
-msgstr "Stan podłączenia"
+msgstr "Usuń stan"
 
 msgid "Saved Statuses"
-msgstr "Zapisane statusy"
+msgstr "Zapisane stany"
 
 #. title
 #. optional information
@@ -1420,7 +1371,7 @@
 msgstr "Tytuł"
 
 msgid "Type"
-msgstr "Rodzaj"
+msgstr "Typ"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1434,142 +1385,128 @@
 msgstr "Wiadomość"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "Użytkownik"
-
-#, fuzzy
+msgstr "Użycie"
+
 msgid "Invalid title"
-msgstr "Niepoprawny identyfikator QQid"
+msgstr "Nieprawidłowy tytuł"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Wpisz tytuł dla tego statusu."
-
-#, fuzzy
+msgstr "Proszę podać niepusty tytuł stanu."
+
 msgid "Duplicate title"
-msgstr "Poprawianie duplikatów"
-
-#, fuzzy
+msgstr "Podwójny tytuł"
+
 msgid "Please enter a different title for the status."
-msgstr "Wpisz tytuł dla tego statusu."
-
-#, fuzzy
+msgstr "Proszę podać inny tytuł dla stanu."
+
 msgid "Substatus"
-msgstr "Status"
+msgstr "Podstan"
 
 msgid "Status:"
 msgstr "Stan:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "_Wiadomość:"
-
-#, fuzzy
+msgstr "Wiadomość:"
+
 msgid "Edit Status"
-msgstr "Edytuj ustawienia"
-
-#, fuzzy
+msgstr "Zmodyfikuj stan"
+
 msgid "Use different status for following accounts"
-msgstr "Używaj innych statusów dla poszczególnych kont"
+msgstr "Użycie różnych stanów dla poszczególnych kont"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "Z_apisz i użyj"
-
-#, fuzzy
+msgstr "Zapisz i użyj"
+
 msgid "Certificates"
-msgstr "Certyfikat dla %s"
+msgstr "Certyfikaty"
 
 msgid "Sounds"
 msgstr "Dźwięki"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "Status"
-
-#, fuzzy
+msgstr "Stany"
+
 msgid "Error loading the plugin."
-msgstr "Wystąpił błąd podczas ładowania wtyczki."
-
-#, fuzzy
+msgstr "Błąd podczas wczytywania wtyczki."
+
 msgid "Couldn't find X display"
-msgstr "Nie można wczytać listy kontaktów"
+msgstr "Nie można odnaleźć ekranu X"
 
 msgid "Couldn't find window"
-msgstr ""
+msgstr "Nie można odnaleźć okna"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"Nie można wczytać tej wtyczki, ponieważ nie została zbudowana z obsługą X11."
 
 msgid "GntClipboard"
-msgstr ""
-
-#, fuzzy
+msgstr "GntClipboard"
+
 msgid "Clipboard plugin"
-msgstr "Odłącz wtyczki"
+msgstr "Wtyczka schowka"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Kiedy zmienia się zawartość schowka gnt, jest ona dostępna dla X, jeśli to "
+"możliwe."
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s zalogował się"
+msgstr "Użytkownik %s właśnie się zalogował"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s rozłączył się"
+msgstr "Użytkownik %s właśnie się rozłączył"
 
 #, c-format
 msgid "%s sent you a message"
-msgstr "%s wysłał do Ciebie wiadomość"
+msgstr "Użytkownik %s wysłał wiadomość"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s wypowiedział Twoje imię w %s"
+msgstr "Użytkownik %s wypowiedział pseudonim użytkownika w %s"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s wysłał do Ciebie wiadomość. (%s)"
-
-#, fuzzy
+msgstr "Użytkownik %s wysłał wiadomość w %s"
+
 msgid "Buddy signs on/off"
-msgstr "Użytkownik loguje się/wylogowuje się"
+msgstr "Znajomy loguje się/wylogowuje się"
 
 msgid "You receive an IM"
-msgstr ""
-
-#, fuzzy
+msgstr "Odebrano wiadomość"
+
 msgid "Someone speaks in a chat"
-msgstr "Ktoś wymawia Twoje imię na konferencji"
-
-#, fuzzy
+msgstr "Ktoś odzywa się na konferencji"
+
 msgid "Someone says your name in a chat"
-msgstr "Ktoś wymawia Twoje imię na konferencji"
+msgstr "Ktoś wymawia imię użytkownika na konferencji"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "Powiadamianie za pomocą tostera, kiedy"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "Także sygnał."
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "Ustawienie WAŻNE dla okna terminala."
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "Wtyczka tostera"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Rozmowa z %s dnia %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "Wtyczka Historii wymaga włączonego zapisu rozmów do dziennika"
+msgstr "Wtyczka historii wymaga zapisu rozmów do dziennika"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1577,101 +1514,100 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Zapis do dziennika rozmów można włączyć w Narzędzia->Ustawienia->Dziennik "
-"Rozmów\n"
-"\n"
-"Wtyczka historii będzie aktywna dla tych typów rozmów, dla których włączysz "
-"zapis do dziennika rozmów."
-
-#, fuzzy
+"Zapis do dziennika rozmów można włączyć w Narzędzia -> Preferencje -> "
+"Dziennik rozmów\n"
+"\n"
+"Wtyczka historii będzie aktywna dla tych typów rozmów, dla których zostanie "
+"włączony zapis do dziennika rozmów."
+
 msgid "GntHistory"
-msgstr "Historia"
+msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Wyświetla ostatnio zapisane rozmowy w oknie nowych rozmów."
+msgstr "Wyświetla ostatnio zapisane rozmowy w nowych rozmowach."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Gdy nowa rozmowa zostanie rozpoczęta, wtyczka wstawi ostatnią konwersację do "
-"bieżącego okna rozmowy."
+"Kiedy nowa rozmowa zostanie rozpoczęta, ta wtyczka wstawi ostatnią rozmowę "
+"do bieżącej."
 
 #, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Przechwytywanie adresu TinyURL..."
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "Adres TinyURL dla powyższego: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Proszę czekać, aż TinyURL przechwyci skrócony adres URL..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr ""
+"Tworzenie adresów TinyURL tylko dla adresów URL tej długości lub większych"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Przedrostek adresu TinyURL (lub innego)"
+
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Wtyczka TinyURL"
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"Po odebraniu wiadomości z adresami URL, używa TinyURL, aby ułatwić kopiowanie"
 
 msgid "Online"
-msgstr "Dostępny"
-
+msgstr "Online"
+
+#. primative,						no,							id,			name
 msgid "Offline"
-msgstr "Rozłączony"
+msgstr "Offline"
 
 msgid "Online Buddies"
-msgstr "Połączeni znajomi"
+msgstr "Znajomi w trybie online"
 
 msgid "Offline Buddies"
-msgstr "Rozłączeni znajomi"
-
-#, fuzzy
+msgstr "Znajomi w trybie offline"
+
 msgid "Online/Offline"
-msgstr "Zalogowany od"
+msgstr "Online/offline"
 
 msgid "Meebo"
-msgstr ""
-
-#, fuzzy
+msgstr "Meebo"
+
 msgid "No Grouping"
-msgstr "Wyłączenie dźwięków"
+msgstr "Bez grupowania"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Zagnieżdżone podgrupy"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
-
-#, fuzzy
+msgstr "Zagnieżdżone grupowanie (eksperymentalne)"
+
 msgid "Provides alternate buddylist grouping options."
-msgstr "Umożliwia integrację z programem Evolution."
+msgstr "Dostarcza alternatywne opcje grupowania listy znajomych."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "Ostatni dziennik"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: wyszukuje podciąg w zaległościach."
 
 msgid "GntLastlog"
-msgstr ""
-
-#, fuzzy
+msgstr "GntLastlog"
+
 msgid "Lastlog plugin."
-msgstr "Instaluj wtyczkę..."
+msgstr "Wtyczka ostatniego dziennika."
 
 msgid "accounts"
 msgstr "konta"
@@ -1681,26 +1617,26 @@
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "Podaj hasło dla %s (%s)"
+msgstr "Proszę podać hasło dla %s (%s)"
 
 msgid "Enter Password"
-msgstr "Wprowadź hasło"
+msgstr "Proszę podać hasło"
 
 msgid "Save password"
 msgstr "Zapisz hasło"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Brak wtyczki dla protokołu %s"
+msgstr "Brak wtyczki protokołu %s"
 
 msgid "Connection Error"
 msgstr "Błąd połączenia"
 
 msgid "New passwords do not match."
-msgstr "Nowe hasła nie są zgodne."
+msgstr "Nowe hasła nie zgadzają się."
 
 msgid "Fill out all fields completely."
-msgstr "Wypełnij całkowicie wszystkie pola."
+msgstr "Proszę całkowicie wypełnić wszystkie pola."
 
 msgid "Original password"
 msgstr "Poprzednie hasło"
@@ -1716,14 +1652,14 @@
 msgstr "Zmiana hasła dla %s"
 
 msgid "Please enter your current password and your new password."
-msgstr "Wpisz swoje bieżące hasło oraz nowe hasło."
+msgstr "Proszę podać bieżące i nowe hasło."
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "Zmiana informacji o użytkowniku dla %s"
+msgstr "Zmiana informacji o użytkowniku %s"
 
 msgid "Set User Info"
-msgstr "Ustawianie danych użytkownika"
+msgstr "Ustaw informacje o użytkowniku"
 
 msgid "Unknown"
 msgstr "Nieznany"
@@ -1736,105 +1672,102 @@
 
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
+"Certyfikat jest podpisany nim samym i nie może zostać automatycznie "
+"sprawdzony."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-
-#, fuzzy
+"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 "Wybrany plik nie jest poprawnym plikiem wtyczki."
+msgstr "Certyfikat nie jest jeszcze prawidłowy."
 
 msgid "The certificate has expired and should not be considered valid."
-msgstr ""
+msgstr "Certyfikat wygasł i nie powinien już być uważany za prawidłowy."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "Prezentowany certyfikat nie został wydany dla tej domeny."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-
-#, fuzzy
+"Brak bazy danych głównych certyfikatów, więc ten certyfikat nie może zostać "
+"sprawdzony."
+
 msgid "The certificate chain presented is invalid."
-msgstr "Nowe formatowanie nie jest poprawne."
+msgstr "Prezentowany ciąg certyfikatu jest nieprawidłowy."
 
 msgid "The certificate has been revoked."
-msgstr ""
-
-#, fuzzy
+msgstr "Certyfikat został odrzucony."
+
 msgid "An unknown certificate error occurred."
-msgstr "Wystąpił nieznany błąd logowania: %s."
+msgstr "Wystąpił nieznany błąd certyfikatu."
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(NIE ZGADZA SIĘ)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s zaprezentowało następujący certyfikat do pojedynczego użytku:"
+
+#, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"Potoczna nazwa: %s\n"
-"\n"
-"Odcisk palca SHA1:\n"
-"%s"
+"Wspólna nazwa: %s %s\n"
+"Odcisk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Single-use Certificate Verification"
-msgstr "Weryfikacja Certyfikatu SSL"
+msgstr "Sprawdzanie certyfikatu pojedynczego użytku"
 
 #. Scheme name
 #. Pool name
-#, fuzzy
 msgid "Certificate Authorities"
-msgstr "Import certyfikatu"
+msgstr "Władze certyfikatów"
 
 #. Scheme name
 #. Pool name
-#, fuzzy
 msgid "SSL Peers Cache"
-msgstr "Serwery SSL"
+msgstr "Pamięć podręczna użytkowników SSL"
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Certyfikat dla %s"
+msgstr "Zaakceptować certyfikat dla %s?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr "Weryfikacja Certyfikatu SSL"
-
-#, fuzzy
+msgstr "Sprawdzanie certyfikatu SSL"
+
 msgid "_View Certificate..."
-msgstr "/Narzędzia/_Certyfikaty"
+msgstr "_Wyświetl certyfikat..."
 
 #, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "Nie można sprawdzić certyfikatu dla %s."
 
 #. TODO: Probably wrong.
-#, fuzzy
 msgid "SSL Certificate Error"
-msgstr "Błąd eksportu certyfikatu"
-
-#, fuzzy
+msgstr "Błąd certyfikatu SSL"
+
 msgid "Unable to validate certificate"
-msgstr "Nie można autoryzować: %s"
+msgstr "Nie można sprawdzić certyfikatu"
 
 #, 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 ""
+"Certyfikat jest z \"%s\". Może to oznaczać, że użytkownik nie łączy się z tą "
+"usługą, z którą chce."
 
 #. Make messages
 #, c-format
@@ -1846,19 +1779,23 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Wspólna nazwa: %s\n"
+"\n"
+"Odcisk (SHA1): %s\n"
+"\n"
+"Data aktywacji: %s\n"
+"Data wygaśnięcia: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "Import certyfikatu"
+msgstr "Informacje o certyfikacie"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "Błąd podczas rejestracji"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Błąd podczas rejestracji"
+msgstr "Błąd podczas wyrejestrowania"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1874,49 +1811,48 @@
 msgstr "Nieznany błąd"
 
 msgid "Unable to send message: The message is too large."
-msgstr "Nie można wysłać wiadomości, gdyż jest ona zbyt duża."
+msgstr "Nie można wysłać wiadomości, ponieważ jest za duża."
 
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nie można wysłać wiadomości do %s."
 
 msgid "The message is too large."
-msgstr "Ta wiadomość jest zbyt duża."
+msgstr "Ta wiadomość jest za duża."
 
 msgid "Unable to send message."
-msgstr "Wysłanie wiadomości nie powiodło się."
+msgstr "Nie można wysłać wiadomości."
 
 msgid "Send Message"
-msgstr "Wysłanie wiadomości"
+msgstr "Wyślij wiadomość"
 
 msgid "_Send Message"
-msgstr "Wysłanie Wiado_mości"
+msgstr "_Wyślij wiadomość"
 
 #, c-format
 msgid "%s entered the room."
-msgstr "%s wszedł do pokoju."
+msgstr "Użytkownik %s wszedł do pokoju."
 
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] wszedł do pokoju."
+msgstr "Użytkownik %s [<I>%s</I>] wszedł do pokoju."
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "Nazywasz się teraz %s"
+msgstr "Użytkownik zazywa się teraz %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s nazywa się teraz %s"
+msgstr "Użytkownik %s nazywa się teraz %s"
 
 #, c-format
 msgid "%s left the room."
-msgstr "użytkownik %s wyszedł z pokoju."
+msgstr "Użytkownik %s opuścił pokój."
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "użytkownik %s wyszedł z pokoju (%s)."
-
-#, fuzzy
+msgstr "Użytkownik %s opuścił pokój (%s)."
+
 msgid "Invite to chat"
 msgstr "Zaproś do konferencji"
 
@@ -1924,63 +1860,66 @@
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
-msgstr "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
+msgstr ""
+"Proszę podać nazwę użytkownika, którego zaprosić, razem z opcjonalną "
+"wiadomością zaproszenia."
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Nie można utworzyć połączenia: %s"
-
-#, fuzzy, c-format
+msgstr "Uzyskanie połączenia nie powiodło się: %s"
+
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "Nie można utworzyć połączenia: %s"
-
-#, fuzzy, c-format
+msgstr "Uzyskanie nazwy nie powiodło się: %s"
+
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Nie można utworzyć połączenia: %s"
+msgstr "Uzyskanie nazwy serwera nie powiodło się: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "Serwer D-BUS dla Purple nie jest uruchomiony powodu opisanego poniżej"
+msgstr ""
+"Serwer D-Bus biblioteki Purple nie jest uruchomiony z poniższego powodu"
 
 msgid "No name"
-msgstr "Brak nazwy"
-
-#, fuzzy
+msgstr "Bez nazwy"
+
 msgid "Unable to create new resolver process\n"
-msgstr "Nie można utworzyć gniazda"
-
-#, fuzzy
+msgstr "Nie można utworzyć nowego procesu rozwiązania\n"
+
 msgid "Unable to send request to resolver process\n"
-msgstr "Nie można wysłać wiadomości do %s."
+msgstr "Nie można wysłać żądania do procesu rozwiązania\n"
 
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Błąd tłumaczenia nazwy %s na adres IP: \n"
+"Błąd podczas rozwiązywania %s:\n"
 "%s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "Błąd tłumaczenia nazwy %s na adres IP: %d"
-
-#, fuzzy, c-format
+msgstr "Błąd podczas rozwiązywania %s: %d"
+
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Błąd odczytu z gniazda: %s"
+msgstr ""
+"Błąd podczas odczytywania z procesu rozwiązania:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Proces rozwiązania zakończył pracę bez odpowiedzi na żądanie"
+
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Błąd tłumaczenia nazwy %s na adres IP: %d"
+msgstr "Błąd podczas konwertowania %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "Utworzenie nowego wątku zakończyło się niepowodzeniem: %s"
+msgstr "Utworzenie wątku nie powiodło się: %s"
 
 #. Data is assumed to be the destination bn
 msgid "Unknown reason"
@@ -1991,7 +1930,7 @@
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"Błąd odczytu %s: \n"
+"Błąd podczas odczytywania %s: \n"
 "%s.\n"
 
 #, c-format
@@ -1999,7 +1938,7 @@
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"Błąd zapisu %s: \n"
+"Błąd podczas zapisywania %s: \n"
 "%s.\n"
 
 #, c-format
@@ -2007,11 +1946,11 @@
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"Błąd dostępu %s: \n"
+"Błąd podczas uzyskiwania dostępu do %s: \n"
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Niemożna zapisać do katalogu."
+msgstr "Nie można zapisać do katalogu."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nie można wysłać pliku o zerowej długości."
@@ -2022,19 +1961,19 @@
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
-"%s nie jest zwykłym plikiem. Na wszelki wypadek nie zostanie on nadpisany.\n"
+"%s nie jest zwykłym plikiem. Na wszelki wypadek nie zostanie on zastąpiony.\n"
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s chce tobie wysłać %s (%s)"
+msgstr "Użytkownik %s chce wysłać %s (%s)"
 
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s chce wysłać tobie plik"
+msgstr "Użytkownik %s chce wysłać plik"
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "Przyjąć prośbę przesłania pliku od %s?"
+msgstr "Zaakceptować żądanie przesłania pliku od %s?"
 
 #, c-format
 msgid ""
@@ -2042,51 +1981,51 @@
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Plik jest gotowy do pobrania z:\n"
+"Plik jest dostępny do pobrania z:\n"
 "Zdalny komputer: %s\n"
-"Nr portu zdalnego komputera: %d"
+"Portu zdalnego komputera: %d"
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s chce przesłać Tobie plik %s"
+msgstr "Użytkownik %s oferuje wysłanie pliku %s"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "%s nie jest poprawną nazwą pliku.\n"
+msgstr "%s nie jest prawidłową nazwą pliku.\n"
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "Oferowanie wysyłki %s do %s"
+msgstr "Oferowanie wysłania %s do %s"
 
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Rozpoczęcie przesyłania pliku %s od %s"
-
-#, fuzzy, c-format
+msgstr "Rozpoczynanie przesyłania pliku %s od %s"
+
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Przesyłanie pliku %s ukończone"
+msgstr "Ukończono przesyłanie pliku <a href=\"file://%s\">%s</a>"
 
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "Przesyłanie pliku %s ukończone"
+msgstr "Ukończono przesyłanie pliku %s"
 
 msgid "File transfer complete"
-msgstr "Przesyłanie pliku ukończone"
-
-#, fuzzy, c-format
+msgstr "Ukończono przesyłanie pliku"
+
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "Anulowałaś/anulowałeś przesyłanie pliku %s"
+msgstr "Anulowano przesyłanie pliku %s"
 
 msgid "File transfer cancelled"
-msgstr "Przesyłanie plików zostało anulowane"
-
-#, fuzzy, c-format
+msgstr "Anulowano przesyłanie pliku"
+
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s anulowała/anulował przesyłanie pliku %s"
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s anulował przesyłanie pliku %s"
+
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s anulowała/anulował przesyłanie pliku"
+msgstr "Użytkownik %s anulował przesyłanie pliku"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2097,124 +2036,142 @@
 msgstr "Przesyłanie pliku od %s nie powiodło się."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Wykonanie polecenie w terminalu"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"aim\", jeśli włączone."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"gg\", jeśli włączone."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"icq\", jeśli włączone."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"irc\", jeśli włączone."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"msnim\", jeśli włączone."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"sip\", jeśli włączone."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"xmpp\", jeśli włączone."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "Polecenie używane do obsługi adresów URL \"ymsgr\", jeśli włączone."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"aim\""
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"gg\""
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"icq\""
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"irc\""
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"msnim\""
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"sip\""
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"xmpp\""
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "Obsługa adresów URL \"ymsgr\""
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"aim\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"gg\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"icq\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"irc\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"msnim\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"sip\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"xmpp\"."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie podane w kluczu \"command\" powinno "
+"obsługiwać adresy URL \"ymsgr\"."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Wartość \"prawda\", jeśli polecenie użyte do obsługi tego typu adresów URL "
+"powinno być wykonywane w terminalu."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"aim\""
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"gg\""
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"icq\""
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"irc\""
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"msnim\""
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"sip\""
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"xmpp\""
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Czy podane polecenie powinno obsługiwać adresy URL \"ymsgr\""
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Dziennik nie ma funkcji odczytu</font></b>"
@@ -2226,10 +2183,10 @@
 msgstr "Zwykły tekst"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "Poprzedni płaski format"
 
 msgid "Logging of this conversation failed."
-msgstr "Zapis tej rozmowy do dziennika zakończył się niepowodzeniem."
+msgstr "Zapisanie tej rozmowy do dziennika nie powiodło się."
 
 msgid "XML"
 msgstr "XML"
@@ -2252,7 +2209,7 @@
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
-"<font color=\"red\"><b>Nie można odnaleźć ścieżki dziennika!</b></font>"
+"<font color=\"red\"><b>Nie można odnaleźć ścieżki dziennika.</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2266,52 +2223,54 @@
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Nie odnaleziono kodeków. Proszę zainstalować kodeki biblioteki GStreamer z "
+"pakietów wtyczek."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-
-#, fuzzy
+"Nie pozostały żadne kodeki. Preferencje kodeków w pliku fs-codecs.conf są za "
+"ścisłe."
+
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Wystąpił nieznany błąd logowania: %s."
-
-#, fuzzy
+msgstr "Wystąpił nieodwracalny błąd biblioteki Farsight2."
+
 msgid "Conference error"
-msgstr "Konferencja została zamknięta"
+msgstr "Błąd konferencji"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Błąd mikrofonu"
 
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Błąd kamery internetowej"
+
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Błąd podczas tworzenia połączenia"
-
-#, fuzzy
+msgstr "Błąd podczas tworzenia sesji: %s"
+
 msgid "Error creating conference."
-msgstr "Błąd podczas tworzenia połączenia"
+msgstr "Błąd podczas tworzenia konferencji."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "Używasz %s, ale plugin wymaga %s."
+msgstr "Używane jest %s, ale ta wtyczka wymaga %s."
 
 msgid "This plugin has not defined an ID."
-msgstr "Ta wtyczka nie ma zdefiniowanego identyfikatora"
+msgstr "Ta wtyczka nie określiła identyfikatora."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Niezgodna wtyczka %d (wymagane %d)"
+msgstr "Magic wtyczki nie zgadza się %d (wymagane %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Niezgodność wersji ABI %d.%d.x (wymagane %d.%d.x)"
-
-#, fuzzy
+msgstr "Wersji ABI nie zgadza się %d.%d.x (wymagane %d.%d.x)"
+
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Ta wtyczka nie zawiera implementacji dla wszystkich wymaganych funkcji"
+msgstr ""
+"Wtyczka nie implementuje wszystkich wymaganych funkcji (list_icon, login i "
+"close)"
 
 #, c-format
 msgid ""
@@ -2322,88 +2281,88 @@
 "ponownie."
 
 msgid "Unable to load the plugin"
-msgstr "Wystąpił błąd podczas włączania wtyczki"
+msgstr "Nie można wczytać wtyczki"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "Nie udało się wczytać wymaganej wtyczki %s."
+msgstr "Nie można wczytać wymaganej wtyczki %s."
 
 msgid "Unable to load your plugin."
-msgstr "Nie można włączyć wtyczki."
-
-#, fuzzy, c-format
+msgstr "Nie można wczytać wtyczki."
+
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "Nie udało się wczytać wymaganej wtyczki %s."
+msgstr "%s wymaga %s, ale jej wyłączenie nie powiodło się."
 
 msgid "Autoaccept"
-msgstr "Automatyczne akceptowanie plików"
+msgstr "Automatyczne akceptowanie"
 
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
-"Umożliwia automatyczne odbieranie przesyłanych plików od wybranych znajomych."
+"Automatycznie akceptuje żądania przesyłania plików od wybranych użytkowników."
 
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Ukończono automatycznie zaakceptowany transfer pliku \"%s\" od \"%s\"."
+msgstr ""
+"Ukończono automatycznie zaakceptowane przesyłanie pliku \"%s\" od \"%s\"."
 
 msgid "Autoaccept complete"
-msgstr "Automatyczne pobieranie pliku zakończone"
+msgstr "Ukończono automatyczne akceptowanie"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Pliki przysyłane przez %s"
 
 msgid "Set Autoaccept Setting"
-msgstr "Ustawienia transmisji plików"
+msgstr "Ustawienia automatycznego akceptowania"
 
 msgid "_Save"
-msgstr "_Zapisz"
+msgstr "Zapi_sz"
 
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 msgid "Ask"
-msgstr "Pytaj"
+msgstr "Zapytaj"
 
 msgid "Auto Accept"
-msgstr "Pobierz"
+msgstr "Automatycznie zaakceptuj"
 
 msgid "Auto Reject"
-msgstr "Odrzuć"
+msgstr "Automatycznie odrzuć"
 
 msgid "Autoaccept File Transfers..."
-msgstr "Ustaw _transmisję plików..."
+msgstr "Automatycznie akceptowane przesyłania plików..."
 
 #. 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 ""
-"Pobierane pliki zapisuj w: \n"
-"(Należy podać dokładną ścieżkę)"
+"Ścieżka do zapisywania plików w\n"
+"(proszę podać pełną ścieżkę)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr "Odrzucenie plików od użytkowników spoza listy znajomych"
+msgstr "Automatyczne odrzucanie od użytkowników spoza listy znajomych"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Powiadomienie gdy zakończy się transfer zaakceptowanego pliku\n"
-"(tylko wtedy gdy nie jest prowadzona rozmowa z wysyłającym)"
-
-#, fuzzy
+"Powiadomienie, kiedy przesłanie automatycznie zaakceptowanego pliku\n"
+"zostanie ukończone (tylko wtedy, kiedy nie jest prowadzona rozmowa z nadawcą)"
+
 msgid "Create a new directory for each user"
-msgstr "Podaj adres katalogu użytkowników, który chcesz przeszukać"
+msgstr "Utworzenie nowego katalogu dla każdego użytkownika"
 
 msgid "Notes"
 msgstr "Notatki"
 
 msgid "Enter your notes below..."
-msgstr "Wpisz swoje notatki poniżej..."
+msgstr "Poniżej można wpisywać notatki..."
 
 msgid "Edit Notes..."
-msgstr "Edytuj notatki..."
+msgstr "Zmodyfikuj notatki..."
 
 #. *< major version
 #. *< minor version
@@ -2414,18 +2373,16 @@
 #. *< priority
 #. *< id
 msgid "Buddy Notes"
-msgstr "Notatki"
+msgstr "Notatki o znajomych"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr "Umożliwia dodawanie notatek na temat poszczególnych znajomych."
+msgstr "Przechowywanie notatek o poszczególnych znajomych."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Dodaje opcję umożliwiającą dodawanie notatek na temat znajomych z twojej "
-"listy."
+msgstr "Dodaje opcję przechowywania notatek o znajomych z listy."
 
 #. *< type
 #. *< ui_requirement
@@ -2434,14 +2391,14 @@
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr "Test szyfrowania"
+msgstr "Test szyfru"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Testuje szyfry dostarczane z biblioteką libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2450,14 +2407,14 @@
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr "Przykład - DBus"
+msgstr "Przykład D-Bus"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "Przykładowa wtyczka DBus"
+msgstr "Przykładowa wtyczka D-Bus"
 
 #. *< type
 #. *< ui_requirement
@@ -2466,18 +2423,17 @@
 #. *< priority
 #. *< id
 msgid "File Control"
-msgstr "Sterowanie z pliku"
+msgstr "Kontrola plikiem"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr ""
-"Pozwala na sterowanie programem pidgin poprzez wprowadzanie poleceń do pliku."
+msgstr "Umożliwia kontrolowanie programu przez podawanie poleceń do pliku."
 
 msgid "Minutes"
-msgstr "Minut"
+msgstr "Minuty"
 
 #. 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.
@@ -2491,22 +2447,22 @@
 msgstr "U_staw"
 
 msgid "None of your accounts are idle."
-msgstr "Żadne z twoich kont nie jest w stanie bezczynności."
+msgstr "Żadne konto nie jest w stanie bezczynności."
 
 msgid "Unset Account Idle Time"
-msgstr "Ustawianie czasu bezczynności konta"
+msgstr "Usuwanie ustawienia czasu bezczynności konta"
 
 msgid "_Unset"
-msgstr "_Skasuj"
+msgstr "_Usuń ustawienie"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Ustaw czas bezczynności dla wszystkich kont"
+msgstr "Ustawienie czasu bezczynności wszystkich kont"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Skasuj ustawiony wcześniej czas bezczynności dla wszystkich kont"
+msgstr "Usunięcie ustawienia czasu bezczynności wszystkich kont"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Pozwala na ręczną konfigurację czasu bezczynności"
+msgstr "Umożliwia ręczną konfigurację czasu bezczynności"
 
 #. *< type
 #. *< ui_requirement
@@ -2521,15 +2477,15 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Testuje obsługę wtyczki IPC, jako klient."
+msgstr "Testowanie obsługi wtyczki IPC jako klient."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Testuje obsługę wtyczki IPC, jako klient. Ta funkcja znajduje wtyczkę "
-"serwera i wywołuje zarejestrowane polecenia."
+"Testowanie obsługo wtyczki IPC jako klient. Ustala położenie wtyczki serwera "
+"i wywołuje zarejestrowane polecenia."
 
 #. *< type
 #. *< ui_requirement
@@ -2544,25 +2500,24 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Testuje obsługę wtyczki IPC, jako serwer."
+msgstr "Testowanie obsługi wtyczki IPC jako serwer."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Testuje obsługę wtyczki IPC jako serwer. Ta funkcja rejestruje polecenia IPC."
+msgstr "Testowanie obsługi wtyczki IPC jako serwer. Rejestruje polecenia IPC."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Ukrywanie wejść/wyjść"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Dla pokoi z więcej niż podaną liczbą osób"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Jeśli użytkownik nie odzywał się w ciągu tylu minut"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Zastosowanie reguł ukrywania do znajomych"
 
 #. *< type
 #. *< ui_requirement
@@ -2571,22 +2526,21 @@
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr "Ukrywanie wejść/wyjść w konferencjach"
+msgstr "Ukrywanie wejść/wyjść"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr "Ukrywa informacje o wejściach/wyjściach"
+msgstr "Ukrywa dodatkowe wiadomości wejść/wyjść."
 
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Umożliwia ukrywanie informacji o wejściach/wyjściach w dużych pokojach "
-"konferencyjnych. Ukrywaniu nie podlegają informacje o aktywnych uczestnikach "
-"konferencji."
+"Ta wtyczka umożliwia ukrywanie wiadomości wejść/wyjść w dużych pokojach, "
+"poza użytkownikami aktywnie uczestniczącymi w rozmowie."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2596,35 +2550,35 @@
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Użytkownik jest rozłączony."
+msgstr "Użytkownik jest w trybie offline."
 
 msgid "Auto-response sent:"
 msgstr "Wysłano automatyczną odpowiedź:"
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s rozłączył się."
+msgstr "Użytkownik %s rozłączył się."
 
 msgid "One or more messages may have been undeliverable."
-msgstr "Jedna lub więcej wiadomości mogła być dostarczona/"
+msgstr "Jedna lub więcej wiadomości mogła nie zostać dostarczona."
 
 msgid "You were disconnected from the server."
-msgstr "Rozłączono z serwerem."
+msgstr "Rozłączono z serwera."
 
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Jesteś teraz rozłączona/rozłączony. Nie możesz odbierać wiadomości dopóki "
-"się nie zalogujesz."
+"Użytkownik jest teraz rozłączony. Wiadomości nie zostaną odbierane, dopóki "
+"użytkownik się nie zaloguje."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
-"Wiadomość nie została wysłana ponieważ maksymalna długość została "
+"Nie można było wysłać wiadomości, ponieważ maksymalna długość została "
 "przekroczona."
 
 msgid "Message could not be sent."
-msgstr "Wiadomość nie została wysłana."
+msgstr "Nie można było wysłać wiadomości."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2648,7 +2602,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2666,21 +2620,21 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "Ogólna konfiguracja czytnika dziennika rozmów"
+msgstr "Ogólna konfiguracja czytnika dzienników rozmów"
 
 msgid "Fast size calculations"
 msgstr "Szybkie obliczanie rozmiaru"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Użycie heurystyki nazw"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "Katalog z plikami"
+msgstr "Katalog dziennika"
 
 #. *< type
 #. *< ui_requirement
@@ -2689,16 +2643,15 @@
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "Czytnik dziennika rozmów"
+msgstr "Czytnik dzienników rozmów"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Dodaje możliwość przeglądania dziennika rozmów z innych komunikatorów."
+msgstr "Dołącza dzienniki innych komunikatorów do przeglądarki dzienników."
 
 #. * 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"
@@ -2706,25 +2659,24 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Podczas oglądania dziennika rozmów, ta wtyczka automatycznie dołączy "
-"zapisane wcześniej rozmowy z innych komunikatorów. W tej chwili wtyczka "
-"odczytuje pliki zapisane przez Adium, MSN Messenger i Trillian.\n"
-"\n"
-"UWAGA: Ta wtyczka nie jest jeszcze skończona i może działać niepoprawnie. "
-"Używaj jej na własną odpowiedzialność!"
+"Podczas przeglądania dzienników rozmów, ta wtyczka automatycznie dołączy "
+"dzienniki z innych komunikatorów. W tej chwili obsługiwane są komunikatory "
+"Adium, MSN Messenger, aMSN i Trillian.\n"
+"\n"
+"UWAGA: ta wtyczka nie jest jeszcze ukończona i może często wywoływać awarie. "
+"Używana jest na własną odpowiedzialność."
 
 msgid "Mono Plugin Loader"
-msgstr "Ładowanie wtyczek Mono"
+msgstr "Wczytywanie wtyczek Mono"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "Wczytuje wtyczki napisane .NET Mono."
+msgstr "Wczytuje wtyczki języka .NET za pomocą Mono."
 
 msgid "Add new line in IMs"
-msgstr ""
-
-#, fuzzy
+msgstr "Dodaje nowy wiersz w wiadomościach"
+
 msgid "Add new line in Chats"
-msgstr "Stosowanie w konferencjach"
+msgstr "Dodaje nowy wiersz w konferencjach"
 
 #. *< magic
 #. *< major version
@@ -2736,47 +2688,52 @@
 #. *< priority
 #. *< id
 msgid "New Line"
-msgstr "Nowa Linia"
+msgstr "Nowy wiersz"
 
 #. *< name
 #. *< version
 msgid "Prepends a newline to displayed message."
-msgstr "Dodaje nową linię przy wyświetlaniu wiadomości."
+msgstr "Poprzedza wyświetlaną wiadomość nowym wierszem."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
-msgstr "Dodaje nową linię do każdej wiadomości."
+msgstr ""
+"Poprzedza wiadomości nowym wierszem, więc reszta wiadomości pojawia się "
+"poniżej nazwy użytkownika w oknie rozmowy."
 
 msgid "Offline Message Emulation"
 msgstr "Emulacja wiadomości offline"
 
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
-"Zapisuje wiadomości wysłane do niedostępnego użytkownika jako powiadomienie."
-
-#, fuzzy
+"Zapis wiadomości wysłanych do użytkownika w trybie offline jako "
+"przechwytywane zdarzenie."
+
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Reszta wiadomości zostanie zapisana jako powiadomienie. Możesz edytować/"
-"kasować powiadomienia z okna \"Powiadomienie o zdarzeniach\""
+"Reszta wiadomości zostanie zapisana jako przechwytywane zdarzenie. Można "
+"zmodyfikować/usunąć zdarzenie z okna dialogowego \"Przechwytywanie zdarzeń\"."
 
 #, 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 ""
+"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?"
 
 msgid "Offline Message"
-msgstr "Nieprzeczytane wiadomości"
+msgstr "Wiadomości w trybie offline"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
-"Możesz edytować/kasować powiadomienia z okna \"Powiadomienie o zdarzeniach\""
+"Można zmodyfikować/usunąć zdarzenie z okna dialogowego \"Przechwytywanie "
+"zdarzeń\""
 
 msgid "Yes"
 msgstr "Tak"
@@ -2785,14 +2742,13 @@
 msgstr "Nie"
 
 msgid "Save offline messages in pounce"
-msgstr "Zapisuj wiadomości offline jako zdarzenie"
+msgstr "Zapisywanie wiadomości offline jako przechwytywane zdarzenie"
 
 msgid "Do not ask. Always save in pounce."
-msgstr "Nie pytaj. Zawsze zapisuj jako zdarzenie."
-
-#, fuzzy
+msgstr "Bez pytania. Zawsze zapisywanie jako przechwytywane zdarzenia."
+
 msgid "One Time Password"
-msgstr "Wprowadź hasło"
+msgstr "Jednorazowe hasło"
 
 #. *< type
 #. *< ui_requirement
@@ -2801,13 +2757,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Obsługa jednorazowych haseł"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Wymusza pojedyncze użycie hasła."
 
 #. *  description
 msgid ""
@@ -2815,6 +2771,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Umożliwia wymuszanie użycia niezapisanego hasła tylko w pojedynczym "
+"pomyślnym połączeniu dla każdego konta.\n"
+"Uwaga: hasło konta nie może być zapisywane."
 
 #. *< type
 #. *< ui_requirement
@@ -2823,16 +2782,16 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Wczytywanie wtyczek w Perlu"
+msgstr "Wczytywanie wtyczek języka Perl"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Pozwala wczytywać wtyczki w języku Perl."
+msgstr "Dostarcza obsługę wczytywania wtyczek języka Perl."
 
 msgid "Psychic Mode"
-msgstr "Tryb Jasnowidza"
+msgstr "Tryb jasnowidza"
 
 msgid "Psychic mode for incoming conversation"
 msgstr "Tryb jasnowidza dla nadchodzących rozmów"
@@ -2841,21 +2800,21 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Włączenie tej wtyczki powoduje, że okna rozmów będą się pojawiały gdy tylko "
-"ktoś rozpocznie do Ciebie pisać. Wtyczka działa z AIM, ICQ, XMPP, Sametime i "
-"Yahoo!"
+"Włączenie tej wtyczki powoduje, że okna rozmów będą się pojawiały, kiedy "
+"inny użytkownik rozpocznie pisanie wiadomości. Wtyczka działa z AIM, ICQ, "
+"XMPP, Sametime i Yahoo!"
 
 msgid "You feel a disturbance in the force..."
-msgstr "Czujesz zaburzenia mocy...."
+msgstr "Wyczuwasz zaburzenia mocy..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "Włączone tylko dla użytkowników z listy znajomych"
+msgstr "Tylko dla użytkowników z listy znajomych"
 
 msgid "Disable when away"
 msgstr "Wyłączone podczas nieobecności"
 
 msgid "Display notification message in conversations"
-msgstr "Wyświetlaj komunikaty informacyjne w oknach rozmów"
+msgstr "Wiadomość powiadomienia w rozmowach"
 
 msgid "Raise psychic conversations"
 msgstr "Automatycznie otwieranie okien rozmów"
@@ -2874,7 +2833,7 @@
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "Test sprawdzający czy wszystkie zdarzenia poprawnie działają."
+msgstr "Test sprawdzający, czy wszystkie sygnały poprawnie działają."
 
 #. *< type
 #. *< ui_requirement
@@ -2890,12 +2849,11 @@
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "Testy sprawdzające czy większość rzeczy działa."
+msgstr "Testy sprawdzające, czy większość rzeczy działa."
 
 #. Scheme name
-#, fuzzy
 msgid "X.509 Certificates"
-msgstr "Eksportowanie certyfikatu PEM X.509"
+msgstr "Certyfikaty X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -2904,14 +2862,14 @@
 #. *< priority
 #. *< id
 msgid "GNUTLS"
-msgstr "GNUTLS"
+msgstr "GnuTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "Dostarcza obsługę SSL z użyciem GNUTLS."
+msgstr "Dostarcza obsługę SSL przez bibliotekę GnuTLS."
 
 #. *< type
 #. *< ui_requirement
@@ -2927,7 +2885,7 @@
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "Dostarcza obsługę SSL z użyciem Mozilla NSS."
+msgstr "Dostarcza obsługę SSL przez bibliotekę NSS Mozilli."
 
 #. *< type
 #. *< ui_requirement
@@ -2943,39 +2901,39 @@
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Dostarcza funkcji obudowującej biblioteki obsługi SSL."
+msgstr "Dostarcza funkcję obudowującą biblioteki obsługi SSL."
 
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s nie jest już nieobecny."
+msgstr "Użytkownik %s nie jest już nieobecny."
 
 #, c-format
 msgid "%s has gone away."
-msgstr "%s jest nieobecny."
+msgstr "Użytkownik %s zaraz wraca."
 
 #, c-format
 msgid "%s has become idle."
-msgstr "%s jest bezczynny."
+msgstr "Użytkownik %s jest bezczynny."
 
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s nie jest już bezczynny."
+msgstr "Użytkownik %s nie jest już bezczynny."
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s zalogował się."
 
 msgid "Notify When"
-msgstr "Powiadamianie gdy"
+msgstr "Powiadamianie, kiedy"
 
 msgid "Buddy Goes _Away"
-msgstr "Użytkownik zmienia status na _zajęty"
+msgstr "Znajomy z_araz wraca"
 
 msgid "Buddy Goes _Idle"
-msgstr "Użytkownik zmienia status na _bezczynny"
+msgstr "Znajomy jest _bezczynny"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Użytkownik loguje się/wylogowuje się"
+msgstr "Znajomy loguje _się/wylogowuje się"
 
 #. *< type
 #. *< ui_requirement
@@ -2993,33 +2951,38 @@
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "Wyświetla w oknie rozmowy zmianę statusu znajomego."
+msgstr ""
+"Powiadamia w oknie rozmowy, kiedy użytkownik zaraz wraca lub jest bezczynny."
 
 msgid "Tcl Plugin Loader"
-msgstr "Wczytywanie wtyczek Tcl"
+msgstr "Wczytywanie wtyczek języka Tcl"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Pozwala na obsługiwanie odczytu wtyczek Tcl"
+msgstr "Dostarcza obsługę wczytywania wtyczek języka Tcl"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"Nie można wykryć instalacji biblioteki ActiveTCL. Aby używać wtyczek języka "
+"Tcl, należy zainstalować bibliotekę ActiveTCL z http://www.activestate.com\n"
 
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-
-#, fuzzy
+"Nie można odnaleźć zestawu narzędzi \"Bonjour dla Windows\" formy Apple, "
+"proszę zobaczyć stronę http://d.pidgin.im/BonjourWindows, aby dowiedzieć się "
+"więcej."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Nie można zainicjować połączenia"
+msgstr "Nie można nasłuchiwać przychodzących połączeń komunikatora"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-"Nie można nawiązać połączenia z lokalnym serwerem mDNS. Sprawdź czy jest on "
-"uruchomiony."
+"Nie można nawiązać połączenia z lokalnym serwerem mDNS. Proszę sprawdzić, "
+"czy jest uruchomiony."
 
 msgid "First name"
 msgstr "Imię"
@@ -3029,7 +2992,7 @@
 
 #. email
 msgid "Email"
-msgstr "Email"
+msgstr "Adres e-mail"
 
 msgid "AIM Account"
 msgstr "Konto AIM"
@@ -3050,106 +3013,96 @@
 msgid "Bonjour Protocol Plugin"
 msgstr "Wtyczka protokołu Bonjour"
 
-#, fuzzy
 msgid "Purple Person"
-msgstr "Nowa osoba"
+msgstr "Osoba biblioteki Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Miejscowość"
+msgstr "Lokalny port"
 
 msgid "Bonjour"
 msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s zamknęła/zamknął rozmowę."
+msgstr "Użytkownik %s zamknął rozmowę."
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Nie można wysłać wiadomości, rozmowa nie może zostać rozpoczęta."
-
-#, fuzzy, c-format
+msgstr "Nie można wysłać wiadomości. Rozmowa nie może zostać rozpoczęta."
+
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Nie można utworzyć gniazda:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Nie można utworzyć gniazda: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Nie można nasłuchiwać na danym gnieździe"
-
-#, fuzzy, c-format
+msgstr "Nie można dowiązać gniazda do portu: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Nie można utworzyć gniazda:\n"
-"%s"
-
-#, fuzzy
+msgstr "Nie można nasłuchiwać na gnieździe: %s"
+
 msgid "Error communicating with local mDNSResponder."
-msgstr "Błąd komunikacji z serwerem"
+msgstr "Błąd podczas komunikowania się z lokalnym programem mDNSResponder."
 
 msgid "Invalid proxy settings"
-msgstr "Niewłaściwe ustawienia pośrednika sieciowego"
+msgstr "Nieprawidłowe ustawienia pośrednika"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Podano niepoprawną nazwę komputera lub numer portu dla podanego typu "
-"pośrednika sieciowego."
+"Podano nieprawidłową nazwę komputera lub numer portu dla podanego typu "
+"pośrednika."
 
 msgid "Token Error"
-msgstr "Błąd tokena"
+msgstr "Błąd tokenu"
 
 msgid "Unable to fetch the token.\n"
 msgstr "Nie można pobrać tokena.\n"
 
 msgid "Save Buddylist..."
-msgstr "Zapisanie listy kontaktów..."
+msgstr "Zapisz listę znajomych..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Twoja lista kontaktów jest pusta, nic nie zostało zapisane do pliku."
+msgstr "Lista znajomych jest pusta, nic nie zostało zapisane do pliku."
 
 msgid "Buddylist saved successfully!"
-msgstr "Lista kontaktów została zapisana!"
-
-#, fuzzy, c-format
+msgstr "Pomyślnie zapisano listę znajomych."
+
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Nie można wczytać listy kontaktów"
+msgstr "Nie można zapisać listy znajomych dla %s do %s"
 
 msgid "Couldn't load buddylist"
-msgstr "Nie można wczytać listy kontaktów"
+msgstr "Nie można wczytać listy znajomych"
 
 msgid "Load Buddylist..."
-msgstr "Wczytanie listy kontaktów..."
+msgstr "Wczytaj listę znajomych..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "Lista kontaktów została wczytana!"
+msgstr "Pomyślnie wczytano listę znajomych."
 
 msgid "Save buddylist..."
-msgstr "Zapis listy znajomych..."
+msgstr "Zapisz listę znajomych..."
 
 msgid "Load buddylist from file..."
-msgstr "Wczytaj listę kontaktów z pliku..."
-
-#, fuzzy
+msgstr "Wczytaj listę znajomych z pliku..."
+
 msgid "You must fill in all registration fields"
-msgstr "Wypełnij pola wymagane do rejestracji."
-
-#, fuzzy
+msgstr "Należy wypełnić wszystkie wymagane pola rejestracji"
+
 msgid "Passwords do not match"
-msgstr "Wprowadzone hasła nie są ze sobą zgodne."
-
-#, fuzzy
+msgstr "Hasła nie zgadzają się"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Nie można zarejestrować nowego konta. Nastąpił błąd.\n"
+msgstr "Nie można zarejestrować nowego konta. Wystąpił nieznany błąd."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Rejestracja nowego konta Gadu-Gadu"
+msgstr "Zarejestrowano nowe konto Gadu-Gadu"
 
 msgid "Registration completed successfully!"
-msgstr "Rejestracja zakończona pomyślnie!"
+msgstr "Pomyślnie ukończono rejestrację."
 
 msgid "Password"
 msgstr "Hasło"
@@ -3158,17 +3111,16 @@
 msgstr "Hasło (ponownie)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Proszę podać tekst CAPTCHA"
+
 msgid "Captcha"
-msgstr "Zapis obrazu"
+msgstr "CAPTCHA"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "Zarejestruj nowe konto Gadu-Gadu"
+msgstr "Rejestracja nowego konta Gadu-Gadu"
 
 msgid "Please, fill in the following fields"
-msgstr "Proszę wypełnić poniższe pola"
+msgstr "Proszę wypełnić następujące pola"
 
 msgid "City"
 msgstr "Miasto"
@@ -3191,58 +3143,61 @@
 msgstr "Kobieta"
 
 msgid "Only online"
-msgstr "Tylko osoby z włączonym komunikatorem"
+msgstr "Tylko znajomi w trybie online"
 
 msgid "Find buddies"
-msgstr "Wyszukaj znajomych"
+msgstr "Wyszukiwanie znajomych"
 
 msgid "Please, enter your search criteria below"
-msgstr "Proszę podać kryteria wyszukiwania"
+msgstr "Proszę poniżej podać kryteria wyszukiwania"
 
 msgid "Fill in the fields."
-msgstr "Wypełnij pola."
+msgstr "Proszę wypełnić pola."
 
 msgid "Your current password is different from the one that you specified."
-msgstr "Twoje aktualne hasło różni się od tego, które podałaś/podałeś."
+msgstr "Bieżące hasło różni się od podanego."
 
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Nie można zmienić hasła. Nastąpił błąd.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Zmiana hasła dla konta Gadu-Gadu"
+msgstr "Zmień hasło konta Gadu-Gadu"
 
 msgid "Password was changed successfully!"
-msgstr "Hasło zostało zmienione!"
+msgstr "Pomyślnie zmieniono hasło."
 
 msgid "Current password"
-msgstr "Aktualne hasło"
+msgstr "Bieżące hasło"
 
 msgid "Password (retype)"
-msgstr "Powtórz hasło:"
+msgstr "Hasło (ponownie)"
 
 msgid "Enter current token"
-msgstr "Wprowadź tekst z obrazka"
+msgstr "Proszę podać obecny token"
 
 msgid "Current token"
-msgstr "Obrazek (token)"
+msgstr "Obecny token"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Wpisz swoje bieżące hasło oraz nowe hasło dla numeru:"
+msgstr ""
+"Proszę podać bieżące hasło i nowe hasło dla identyfikatora użytkownika: "
 
 msgid "Change Gadu-Gadu Password"
 msgstr "Zmiana hasła Gadu-Gadu"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Wybierz konferencję dla: %s"
+msgstr "Wybierz konferencję dla znajomwego: %s"
 
 msgid "Add to chat..."
 msgstr "Dodaj do konferencji..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Dostępny"
 
+#. 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
@@ -3250,7 +3205,7 @@
 msgstr "Zaraz wracam"
 
 msgid "UIN"
-msgstr "Numer identyfikacyjny"
+msgstr "Identyfikator użytkownika"
 
 #. first name
 msgid "First Name"
@@ -3260,35 +3215,34 @@
 msgstr "Rok urodzenia"
 
 msgid "Unable to display the search results."
-msgstr "Nie można wyświetlić wyników wyszukiwania"
+msgstr "Nie można wyświetlić wyników wyszukiwania."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "Przeszukiwanie katalogu publicznego Gadu-Gadu"
+msgstr "Katalog publiczny Gadu-Gadu"
 
 msgid "Search results"
 msgstr "Wyniki wyszukiwania"
 
 msgid "No matching users found"
-msgstr "Nie znaleziono żadnego użytkownika"
+msgstr "Nie odnaleziono pasujących użytkowników"
 
 msgid "There are no users matching your search criteria."
-msgstr "Nie ma użytkowników spełniających Twoje kryteria wyszukiwania."
-
-#, fuzzy
+msgstr "Brak użytkowników spełniających kryteria wyszukiwania."
+
 msgid "Unable to read from socket"
-msgstr "Nie można czytać z gniazda"
+msgstr "Nie można odczytać z gniazda"
 
 msgid "Buddy list downloaded"
-msgstr "Pobrano listę kontaktów"
+msgstr "Pobrano listę znajomych"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr "Twoja lista kontaktów została pobrana z serwera."
+msgstr "Lista znajomych została pobrana z serwera."
 
 msgid "Buddy list uploaded"
-msgstr "Wysłano listę kontaktów"
+msgstr "Wysłano listę znajomych"
 
 msgid "Your buddy list was stored on the server."
-msgstr "Twoja lista kontaktów została wysłana na serwer."
+msgstr "Lista znajomych została wysłana na serwer."
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
@@ -3297,7 +3251,7 @@
 msgstr "Połączono"
 
 msgid "Connection failed"
-msgstr "Błąd połączenia"
+msgstr "Połączenie nie powiodło się"
 
 msgid "Add to chat"
 msgstr "Dodaj do konferencji"
@@ -3305,42 +3259,41 @@
 msgid "Chat _name:"
 msgstr "Nazwa ko_nferencji:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Nie można połączyć się z serwerem."
+msgstr "Nie można rozwiązać nazwy komputera \"%s\": %s"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "łączenie"
+msgstr "Łączenie"
 
 msgid "Chat error"
 msgstr "Błąd konferencji"
 
 msgid "This chat name is already in use"
-msgstr "Nazwa konferencji jest aktualnie używana"
-
-#, fuzzy
+msgstr "Nazwa konferencji jest już używana"
+
 msgid "Not connected to the server"
-msgstr "Nie jesteś połączony z serwerem."
+msgstr "Nie połączono z serwerem"
 
 msgid "Find buddies..."
-msgstr "Szukaj kontaktów..."
+msgstr "Znajdź znajomych..."
 
 msgid "Change password..."
-msgstr "Zmiana hasła..."
+msgstr "Zmień hasło..."
 
 msgid "Upload buddylist to Server"
-msgstr "Wyślij listę kontaktów na serwer"
+msgstr "Wyślij listę znajomych na serwer"
 
 msgid "Download buddylist from Server"
-msgstr "Pobierz listę kontaktów z serwera"
+msgstr "Pobierz listę znajomych z serwera"
 
 msgid "Delete buddylist from Server"
-msgstr "Skasuj listę kontaktów z serwera"
+msgstr "Usuń listę znajomych z serwera"
 
 msgid "Save buddylist to file..."
-msgstr "Zapisz listę kontaktów do pliku..."
+msgstr "Zapisz listę znajomych do pliku..."
 
 #. magic
 #. major_version
@@ -3363,9 +3316,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Użytkownik Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Ustaw dane użytkownika..."
+msgstr "Serwer Gadu-Gadu"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3376,17 +3328,16 @@
 msgstr "obecny temat to: %s"
 
 msgid "No topic is set"
-msgstr "Brak ustawionego tematu"
+msgstr "Nie ustawiono tematu"
 
 msgid "File Transfer Failed"
-msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
-
-#, fuzzy
+msgstr "Przesyłanie plików nie powiodło się"
+
 msgid "Unable to open a listening port."
-msgstr "Nie można otworzyć portu do nasłuchu."
+msgstr "Nie można otworzyć portu nasłuchiwania."
 
 msgid "Error displaying MOTD"
-msgstr "Błąd przy wyświetlaniu wiadomości dnia (MOTD)"
+msgstr "Błąd podczas wyświetlania wiadomości dnia (MOTD)"
 
 msgid "No MOTD available"
 msgstr "Brak dostępnej wiadomości dnia (MOTD)"
@@ -3405,14 +3356,12 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Utracono połączenie z serwerem:\n"
-"%s"
+msgstr "Utracono połączenie z serwerem: %s"
 
 msgid "View MOTD"
-msgstr "Wyświetlanie wiadomości dnia (MOTD)"
+msgstr "Wyświetl wiadomość dnia (MOTD)"
 
 msgid "_Channel:"
 msgstr "_Kanał:"
@@ -3420,24 +3369,23 @@
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Pseudonimy IRC nie mogą zawierać pustych znaków"
+msgstr "Pseudonimy IRC nie mogą zawierać spacji"
 
 msgid "SSL support unavailable"
-msgstr "Brak obsługi SSL"
+msgstr "Obsługa SSL jest niedostępna"
 
 msgid "Unable to connect"
 msgstr "Nie można się połączyć"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Nie można połączyć się z %s"
-
-#, fuzzy, c-format
+msgstr "Nie można połączyć: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Połączenie zostało zamknięte przez serwer."
+msgstr "Połączenie zostało zamknięte przez serwer"
 
 msgid "Users"
 msgstr "Użytkownicy"
@@ -3469,46 +3417,45 @@
 msgstr "Port"
 
 msgid "Encodings"
-msgstr "Kodoawnia"
+msgstr "Kodowania"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "Automatyczne wykrywanie przychodzącego UTF-8"
 
 msgid "Real name"
-msgstr "Prawdziwa nazwa"
+msgstr "Imię i nazwisko"
 
 #.
 #. 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 "Użyj SSL"
+msgstr "Użycie SSL"
 
 msgid "Bad mode"
-msgstr "Niewłaściwy tryb"
+msgstr "Błędny tryb"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Zablokowany na %s przez %s, ustawiono %s temu"
+
+#, c-format
 msgid "Ban on %s"
-msgstr "Powód: %s"
-
-#, fuzzy
+msgstr "Zblokowany na %s"
+
 msgid "End of ban list"
-msgstr "Nie ma na liście"
+msgstr "Koniec listy zablokowanych"
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "Masz zakaz wstępu na %s"
+msgstr "Użytkownik został zablokowany na %s."
 
 msgid "Banned"
-msgstr "Zabanowany"
+msgstr "Zablokowany"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Nie można zbanować %s: lista banów jest pełna"
+msgstr "Nie można zablokować %s: lista zablokowanych jest pełna"
 
 msgid " <i>(ircop)</i>"
 msgstr " <i>(operator IRC)</i>"
@@ -3517,7 +3464,7 @@
 msgstr " <i>(zidentyfikowany)</i>"
 
 msgid "Nick"
-msgstr "Ksywka"
+msgstr "Pseudonim"
 
 msgid "Currently on"
 msgstr "Obecnie na"
@@ -3526,22 +3473,21 @@
 msgstr "Bezczynny od"
 
 msgid "Online since"
-msgstr "Zalogowany od"
+msgstr "W trybie online od"
 
 msgid "<b>Defining adjective:</b>"
-msgstr "<b>Definiowanie przymiotnika:</b>"
-
-#, fuzzy
+msgstr "<b>Określenie przymiotnika:</b>"
+
 msgid "Glorious"
-msgstr "Grupa"
+msgstr "Wspaniały"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s zmieniła/zmienił temat na: %s"
+msgstr "Użytkownik %s zmienił temat na: %s"
 
 #, c-format
 msgid "%s has cleared the topic."
-msgstr "%s skasowała/skasował temat."
+msgstr "Użytkownik %s wyczyścił temat."
 
 #, c-format
 msgid "The topic for %s is: %s"
@@ -3549,13 +3495,13 @@
 
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "Nieznany komunikat \"%s\""
+msgstr "Nieznana wiadomość \"%s\""
 
 msgid "Unknown message"
-msgstr "Nieznany komunikat"
+msgstr "Nieznana wiadomość"
 
 msgid "The IRC server received a message it did not understand."
-msgstr "Serwer IRC otrzymał wiadomość, której nie mógł zinterpretować."
+msgstr "Serwer IRC odebrał wiadomość, której nie mógł zinterpretować."
 
 #, c-format
 msgid "Users on %s: %s"
@@ -3565,7 +3511,7 @@
 msgstr "Czas odpowiedzi"
 
 msgid "The IRC server's local time is:"
-msgstr "Czas lokalny serwera IRC:"
+msgstr "Lokalny czas serwera IRC:"
 
 msgid "No such channel"
 msgstr "Nie ma takiego kanału"
@@ -3578,283 +3524,280 @@
 msgstr "Użytkownik nie jest zalogowany"
 
 msgid "No such nick or channel"
-msgstr "Brak takiego użytkownika lub kanału"
+msgstr "Brak takiego pseudonimu lub kanału"
 
 msgid "Could not send"
 msgstr "Nie można wysłać"
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Przyłączenie się do %s wymaga zaproszenia."
+msgstr "Dołączenie do %s wymaga zaproszenia."
 
 msgid "Invitation only"
 msgstr "Tylko dla zaproszonych"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "Zostałeś wykopany przez %s: (%s)"
+msgstr "Użytkownik został wyrzucony przez %s: (%s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "Wykopany przez %s (%s)"
+msgstr "Wyrzucony przez %s (%s)"
 
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "tryb (%s %s) przez %s"
 
 msgid "Invalid nickname"
-msgstr "Niewłaściwa ksywka"
+msgstr "Nieprawidłowy pseudonim"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Wybrana przez Ciebie ksywka została odrzucona przez serwer. Prawdopodobnie "
-"dlatego, że zawierała niedozwolone znaki."
+"Wybrany pseudonim został odrzucony przez serwer. Prawdopodobnie zawiera "
+"nieprawidłowe znaki."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Wybrana przez Ciebie nazwa konta została odrzucona przez serwer. "
-"Prawdopodobnie dlatego, że zawierała niedozwolone znaki."
+"Wybrana nazwa konta została odrzucona przez serwer. Prawdopodobnie zawiera "
+"nieprawidłowe znaki."
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Nazwa konferencji jest aktualnie używana"
-
-#, fuzzy
+msgstr "Pseudonim \"%s\" jest już używany."
+
 msgid "Nickname in use"
-msgstr "Identyfikator"
+msgstr "Używany pseudonim"
 
 msgid "Cannot change nick"
-msgstr "Nie można zmienić ksywki"
+msgstr "Nie można zmienić pseudonimu"
 
 msgid "Could not change nick"
-msgstr "Nie można zmienić ksywki"
+msgstr "Nie można zmienić pseudonimu"
 
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Opuszczono kanał%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "Błąd: błędny PONG od serwera"
+msgstr "Błąd: nieprawidłowe PONG od serwera"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "Odpowiedź PING -- Opóźnienie: %lu sekund"
+msgstr "Odpowiedź PING - opóźnienie: %lu sekundy"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Nie można przyłączyć się do %s: Wymagana rejestracja."
+msgstr "Nie można dołączyć do %s: wymagana jest rejestracja."
 
 msgid "Cannot join channel"
-msgstr "Nie można dołączyć się do kanału"
+msgstr "Nie można dołączyć do kanału"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Wybrany kanał, lub ksywka jest tymczasowo niedostępny/niedostępna"
+msgstr "Pseudonim lub kanał jest tymczasowo niedostępny."
 
 #, c-format
 msgid "Wallops from %s"
 msgstr "Zbiorowe nadawanie praw operatora od %s"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;zdarzenie do wykonania&gt;:  Wykonuje określone zdarzenie."
+msgstr "action &lt;czynność do wykonania&gt;: wykonuje czynność."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [wiadomość]:  Ustawia komunikat nieobecności, albo powraca ze stanu "
-"nieobecności jeżeli użyto bez parametru."
+"away [wiadomość]: ustawia wiadomość nieobecności lub powraca ze stanu "
+"nieobecności, jeśli nie podano wiadomości."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <pseudonim> <wiadomość>: wysyła wiadomość ctcp do pseudonimu."
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Wyślij polecenie do chanserv"
+msgstr "chanserv: wysyła polecenie do 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;ksywa1&gt; [ksywa2] ...:  Usuwa uprawnienia operatora kanału z "
-"określonych osób. Aby używać tego polecenia, należy być operatorem kanału."
+"deop &lt;pseudonim1&gt; [pseudonim2]...: usuwa stan operatora kanału z "
+"podanych osób. Aby użyć tego polecenia, należy być operatorem kanału."
 
 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;ksywa1&gt; [ksywa2] ...:  Usuwa prawo głosu z określonej osoby, "
-"uniemożliwiając jej rozmowę na moderowanym kanale (+m). Aby używać tego "
+"devoice &lt;pseudonim1&gt; [pseudonim2]...: usuwa prawo głosu z podanej "
+"osoby, uniemożliwiając jej rozmowę na moderowanym kanale (+m). Aby użyć tego "
 "polecenia, należy być operatorem kanału."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;ksywa&gt; [kanał-irc]:  Zaprasza podaną osobę na wybrany kanał, "
-"lub aktualny (jeżeli opcja [kanał-irc] nie zostanie podana)."
+"invite &lt;pseudonim&gt; [pokój]: zaprasza podaną osobę na wybrany lub "
+"bieżący kanał."
 
 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;kanał1&gt;[,kanał2][,...] [klucz1[,klucz2][,...]]:  Powoduje "
-"przyłączenie się do jednego lub kilku kanałów-irc, dodatkowo można podać "
-"klucz dla każdego kanału, jeżeli jest potrzebny."
+"j &lt;pokój1&gt;[,pokój2][,...] [klucz1[,klucz2][,...]]: dołącza do jednego "
+"lub więcej kanałów, opcjonalnie dostarczając klucz kanałom, które tego "
+"wymagają."
 
 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;kanał1&gt;[,kanał2][,...] [klucz1[,klucz2][,...]]:  Powoduje "
-"przyłączenie się do jednego lub kilku kanałów-irc, dodatkowo można podać "
-"klucz dla każdego kanału, jeżeli jest potrzebny."
+"join &lt;pokój1&gt;[,pokój2][,...] [klucz1[,klucz2][,...]]: dołącza do "
+"jednego lub więcej kanałów, opcjonalnie dostarczając klucz kanałom, które "
+"tego wymagają."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;ksywa&gt; [komunikat]:  Usuwa określoną osobę z kanału irc. Aby "
-"używać tego polecenia, należy być operatorem kanału."
+"kick &lt;pseudonim&gt; [wiadomość]: usuwa podaną osobę z kanału. Aby użyć "
+"tego polecenia, należy być operatorem kanału."
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  Wyświetla listę kanałów IRC w sieci. <i>Uwaga: niektóre serwery mogą "
-"cię rozłączyć po wykonaniu tego polecenia.</i>"
+"list: wyświetla listę pokoi konferencji w sieci. <i>Ostrzeżenie: niektóre "
+"serwery mogą rozłączyć po wykonaniu tego polecenia.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;akcja do wykonania&gt;:  Wykonuje określoną akcję."
+msgstr "me &lt;czynność do wykonania&gt;: wykonuje czynność."
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Wyślij polecenie do memoserv"
+msgstr "memoserv: wysyła polecenie do 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;ksywka|kanał&gt;:  Dodaje lub zdejmuje "
-"uprawnienia na kanale."
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;pseudonim|kanał&gt;: ustawia lub usuwa "
+"ustawienie trybu kanału lub użytkownika."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;ksywa&gt; &lt;wiadomość&gt;:  Wysyła prywatną wiadomość do "
-"użytkownika (nie będzie wyświetlona na kanale)."
+"msg &lt;pseudonim&gt; &lt;wiadomość&gt;: wysyła prywatną wiadomość do "
+"użytkownika (nie zostanie wyświetlona na kanale)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr ""
-"names [kanał-irc]:  Wyświetla wszystkich użytkowników na aktualnym kanale."
+msgstr "names [kanał]: wyświetla listę użytkowników na kanale."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;nowa ksywa&gt;:  Zmienia ksywę."
+msgstr "nick &lt;nowy pseudonim&gt;: zmienia pseudonim."
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Wyślij polecenie do nickserv"
-
-#, fuzzy
+msgstr "nickserv: wysyła polecenie do nickserv"
+
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"me &lt;akcja&gt;:  Wysyła akcję w stylu IRC do znajomego lub konferencji."
+msgstr "notice &lt;cel&lt;: wysyła uwagę do użytkownika lub kanału."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;ksywa1&gt; [ksywa2] ...:  Nadaje określonej osobie status operatora "
-"kanału. Aby używać tego polecenia, należy być operatorem kanału."
+"op &lt;pseudonim1&gt; [pseudonim2]...: nadaje podanej osobie stan operatora "
+"kanału. Aby użyć tego polecenia, należy być operatorem kanału."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;wiadomość&gt;:  Jeżeli nie wiesz co to jest, to prawdopodobnie "
-"nie możesz tego używać."
+"operwall &lt;wiadomość&gt;: jeżeli nie wiadomo, co to jest, prawdopodobnie "
+"nie można tego użyć."
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Wyślij polecenie do operserv"
+msgstr "operserv: wysyła polecenie do operserv"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [kanał-irc] [komunikat]:  Powoduje wyjście z aktualnego lub wybranego "
-"kanału, dodatkowo  można ustawić komunikat wyjścia."
+"part [kanał] [wiadomość]: opuszcza bieżący lub wybrany kanał, z opcjonalną "
+"wiadomością."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [ksywa]:  Sprawdza jakie jest opóźnienie pomiędzy użytkownikiem lub "
-"serwerem (jeżeli nie podano użytkownika)."
+"ping [pseudonim]: sprawdza opóźnienie pomiędzy użytkownikiem (lub serwerem, "
+"jeśli nie podano użytkownika)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;ksywa&gt; &lt;wiadomość&gt;:  Wysyła prywatną wiadomość do "
-"użytkownika (nie będzie wyświetlona na kanale)."
+"query &lt;pseudonim&gt; &lt;wiadomość&gt;: wysyła prywatną wiadomość do "
+"użytkownika (nie zostanie wyświetlona na kanale)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [komunikat]: Przerywa połączenie z serwerem z opcjonalnym komunikatem."
+msgstr "quit [wiadomość]: rozłącza z serwera, z opcjonalną wiadomością."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Wysyła polecenie bezpośrednio do serwera."
+msgstr "quote [...]: wysyła surowe polecenie do serwera."
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;ksywa&gt; [wiadomość]:  Usuwa określoną osobę z kanału. Aby "
-"używać tego polecenia, należy być operatorem kanału."
+"remove &lt;pseudonim&gt; [wiadomość]: usuwa podaną osobę z pokoju. Aby użyć "
+"tego polecenia, należy być operatorem kanału."
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: Wyświetla bieżący czas lokalne danego serwera IRC."
+msgstr "time: wyświetla bieżący lokalny czas serwera IRC."
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [nowy temat]:  Wyświetla lub zmienia temat kanału."
+msgstr "topic [nowy temat]: wyświetla lub zmienia temat kanału."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Zmienia ustawienia trybu użytkownika."
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;: ustawia lub usuwa ustawienie trybu "
+"użytkownika."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
-"version [ksywka]: wysyła zapytanie CTCP VERSION do określonego użytkownika"
+msgstr "version [pseudonim]: wysyła żądanie CTCP VERSION do użytkownika"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;ksywa1&gt; [ksywa2] ...:  Przyznaje prawo głosu określonej osobie. "
-"Aby używać tego polecenia, należy być operatorem kanału."
+"voice &lt;pseudonim1&gt; [pseudonim2]...: nadaje prawo głosu podanej osobie. "
+"Aby użyć tego polecenia, należy być operatorem kanału."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;wiadomość&gt;:  Jeżeli nie wiesz co robi to polecenie, to "
-"prawdopodobnie nie możesz go użyć."
+"wallops &lt;wiadomość&gt;: jeżeli nie wiadomo, co to jest, prawdopodobnie "
+"nie można tego użyć."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [serwer] &lt;ksywka&gt;:  Pobiera informacje o użytkowniku"
+msgstr "whois [serwer] &lt;pseudonim&gt;: uzyskuje informacje o użytkowniku."
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [serwer] &lt;ksywka&gt;:  Pobiera informacje o użytkowniku"
+msgstr ""
+"whowas &lt;pseudonim&gt;: uzyskuje informacje o użytkowniku, który właśnie "
+"się wylogował."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "Czas odpowiedzi od %s: %lu sekund"
+msgstr "Czas odpowiedzi od %s: %lu sekundy"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3863,95 +3806,76 @@
 msgstr "Odpowiedź CTCP PING"
 
 msgid "Disconnected."
-msgstr "Rozłączony."
+msgstr "Rozłączono."
 
 msgid "Unknown Error"
-msgstr "Nieznany Błąd"
-
-#, fuzzy
+msgstr "Nieznany błąd"
+
 msgid "Ad-Hoc Command Failed"
-msgstr "Polecenie wyłączone"
-
-#, fuzzy
+msgstr "Polecenie ad-hoc nie powiodło się"
+
 msgid "execute"
-msgstr "Nie oczekiwano"
-
-#, fuzzy
+msgstr "wykonaj"
+
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
-"TLS/SSL."
-
-#, fuzzy
+msgstr "Serwer wymaga TLS/SSL, ale nie odnaleziono obsługi TLS/SSL."
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
-"TLS/SSL."
+msgstr "Wymagana jest szyfrowanie, ale nie odnaleziono obsługi TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Serwer wymaga autoryzacji w czystym tekście przy użyciu niezaszyfrowanego "
-"strumienia danych"
-
-#, fuzzy, c-format
+"Serwer wymaga uwierzytelnienia w zwykłym tekście przez niezaszyfrowany "
+"strumień"
+
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Ten serwer wymaga uwierzytelniania w czystym tekście bez szyfrowania. Czy "
-"zgadzasz się na przesyłanie danych w ten sposób i chcesz kontynuować "
-"uwierzytelnianie?"
+"%s wymaga uwierzytelnienia w zwykłym tekście przez niezaszyfrowane "
+"połączenie. Pozwolić i kontynuować uwierzytelnianie?"
 
 msgid "Plaintext Authentication"
-msgstr "Uwierzytelniania w czystym tekście"
-
-#, fuzzy
+msgstr "Uwierzytelnianie w zwykłym tekście"
+
 msgid "SASL authentication failed"
-msgstr "Autoryzacja nie powiodła się"
-
-#, fuzzy
+msgstr "Uwierzytelnienie SASL nie powiodło się"
+
 msgid "Invalid response from server"
-msgstr "Nieprawidłowa odpowiedź z serwera."
+msgstr "Nieprawidłowa odpowiedź z serwera"
 
 msgid "Server does not use any supported authentication method"
-msgstr "Serwer nie używa żadnej z obsługiwanych metod uwierzytelniania"
+msgstr "Serwer nie używa obsługiwanej metody uwierzytelniania"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Wymagane jest szyfrowanie, ale nie jest dostępne na serwerze."
 
 msgid "Invalid challenge from server"
-msgstr "Nieprawidłowe żądanie od serwera"
-
-#, fuzzy, c-format
+msgstr "Nieprawidłowe wyzwanie od serwera"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "Błąd SASL"
+msgstr "Błąd SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Menedżer połączeń BOSH zakończył sesję."
+
 msgid "No session ID given"
-msgstr "Nie podano powodu."
-
-#, fuzzy
+msgstr "Nie podano identyfikatora sesji"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Nieobsługiwana wersja"
-
-#, fuzzy
+msgstr "Nieobsługiwana wersja protokołu BOSH"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Nie można nawiązać połączenia z serwerem"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem:\n"
-"%s"
-
-#, fuzzy
+msgstr "Nie można nawiązać połączenia z serwerem: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Nie można zainicjować połączenia"
+msgstr "Nie można nawiązać połączenia SSL"
 
 msgid "Full Name"
 msgstr "Imię i nazwisko"
@@ -3963,7 +3887,7 @@
 msgstr "Imię"
 
 msgid "URL"
-msgstr "URL"
+msgstr "Adres URL"
 
 msgid "Street Address"
 msgstr "Ulica"
@@ -3977,7 +3901,7 @@
 msgstr "Rozszerzony adres"
 
 msgid "Locality"
-msgstr "Miejscowość"
+msgstr "Położenie"
 
 msgid "Region"
 msgstr "Region"
@@ -4010,14 +3934,14 @@
 msgstr "Opis"
 
 msgid "Edit XMPP vCard"
-msgstr "Modyfikacja XMPP vCard"
+msgstr "Modyfikacja vCard protokołu XMPP"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Wypełnienie poniższych pól jest opcjonalne. Proszę wprowadzić jedynie te "
-"informacje, które chcesz udostępnić."
+"Wypełnienie poniższych pól jest opcjonalne. Proszę podać tylko te "
+"informacje, które mają zostać udostępnione."
 
 msgid "Client"
 msgstr "Klient"
@@ -4025,9 +3949,8 @@
 msgid "Operating System"
 msgstr "System operacyjny"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Lokalna nazwa pliku:"
+msgstr "Lokalny czas"
 
 msgid "Priority"
 msgstr "Priorytet"
@@ -4037,11 +3960,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s temu"
+
 msgid "Logged Off"
-msgstr "Zalogowany"
+msgstr "Wylogowano"
 
 msgid "Middle Name"
 msgstr "Drugie imię"
@@ -4058,12 +3980,12 @@
 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 ""
-"Zamierzasz usunąć %s ze swojej listy znajomych. Czy chcesz kontynuować?"
+"Użytkownik %s nie będzie już mógł widzieć aktualizacji stanu. Kontynuować?"
 
 msgid "Cancel Presence Notification"
 msgstr "Anuluj powiadamianie o obecności"
@@ -4072,10 +3994,10 @@
 msgstr "Wyłącz ukrywanie"
 
 msgid "Temporarily Hide From"
-msgstr "Tymczasowo ukryj się"
+msgstr "Tymczasowo ukryj z"
 
 msgid "(Re-)Request authorization"
-msgstr "Ponów prośbę o autoryzację"
+msgstr "Ponów prośbę o upoważnienie"
 
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
@@ -4086,22 +4008,24 @@
 msgstr "Rozpocznij _konferencję"
 
 msgid "Log In"
-msgstr "Zaloguj"
+msgstr "Zaloguj się"
 
 msgid "Log Out"
-msgstr "Wyloguj"
-
+msgstr "Wyloguj się"
+
+#. 2
 msgid "Chatty"
 msgstr "Chętny do rozmowy"
 
 msgid "Extended Away"
 msgstr "Wrócę później"
 
+#. 3
 msgid "Do Not Disturb"
-msgstr "Zajęty"
+msgstr "Nie przeszkadzać"
 
 msgid "JID"
-msgstr "Identyfikator JID"
+msgstr "Identyfikator Jabbera"
 
 #. last name
 msgid "Last Name"
@@ -4115,42 +4039,42 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Przeszukaj katalog podając kryteria w pola poniżej. W każdym polu można "
-"używać wzorców nazw (%)"
+"Znajdź kontakt podając kryteria w pola poniżej. Uwaga: można używać wzorców "
+"(%)"
 
 msgid "Directory Query Failed"
-msgstr "Wyszukiwanie zakończyło się błędem"
+msgstr "Odpytanie katalogu nie powiodło się"
 
 msgid "Could not query the directory server."
-msgstr "Nie można wysłać zapytania do serwera z katalogiem."
+msgstr "Nie można odpytać serwera katalogu."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Instrukcje z serwera: %s"
+msgstr "Instrukcje serwera: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Wypełnij jedno lub więcej pól, aby wyszukać użytkowników sieci XMPP."
+msgstr "Proszę wypełnić jedno lub więcej pól, aby wyszukać użytkowników XMPP."
 
 msgid "Email Address"
-msgstr "Adres email"
+msgstr "Adres e-mail"
 
 msgid "Search for XMPP users"
-msgstr "Szukanie użytkownika XMPP"
+msgstr "Wyszukaj użytkowników XMPP"
 
 #. "Search"
 msgid "Search"
-msgstr "Znajdź"
+msgstr "Wyszukaj"
 
 msgid "Invalid Directory"
-msgstr "Niewłaściwy katalog"
+msgstr "Nieprawidłowy katalog"
 
 msgid "Enter a User Directory"
 msgstr "Katalog użytkowników"
 
 msgid "Select a user directory to search"
-msgstr "Podaj adres katalogu użytkowników, który chcesz przeszukać"
+msgstr "Proszę wybrać katalog użytkowników do przeszukania"
 
 msgid "Search Directory"
 msgstr "Przeszukaj katalog"
@@ -4162,28 +4086,28 @@
 msgstr "_Serwer:"
 
 msgid "_Handle:"
-msgstr "_Ksywa w pokoju:"
+msgstr "_Uchwyt:"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s nie jest poprawną nazwą pokoju"
+msgstr "%s nie jest prawidłową nazwą pokoju"
 
 msgid "Invalid Room Name"
-msgstr "Niepoprawna nazwa pokoju"
+msgstr "Nieprawidłowa nazwa pokoju"
 
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s nie jest poprawną nazwą serwera"
+msgstr "%s nie jest prawidłową nazwą serwera"
 
 msgid "Invalid Server Name"
-msgstr "Niepoprawna nazwa serwera"
+msgstr "Nieprawidłowa nazwa serwera"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s nie jest poprawnym uchwytem pokoju"
+msgstr "%s nie jest prawidłowym uchwytem pokoju"
 
 msgid "Invalid Room Handle"
-msgstr "Niepoprawny uchwyt pokoju"
+msgstr "Nieprawidłowy uchwyt pokoju"
 
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
@@ -4192,7 +4116,7 @@
 msgstr "Nie można skonfigurować"
 
 msgid "Room Configuration Error"
-msgstr "Błąd podczas konfiguracji pokoju"
+msgstr "Błąd konfiguracji pokoju"
 
 msgid "This room is not capable of being configured"
 msgstr "Ten pokój nie może być konfigurowany"
@@ -4201,82 +4125,79 @@
 msgstr "Błąd rejestracji"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Zmiana ksywki nie jest dozwolona w pokojach bez obsługi MUC"
+msgstr ""
+"Zmienianie pseudonimu nie jest obsługiwane w pokojach konferencji nie "
+"będących MUC"
 
 msgid "Error retrieving room list"
-msgstr "Nastąpił błąd przy pobieraniu listy pokoi konferencyjnych"
+msgstr "Błąd podczas pobierania listy pokoi"
 
 msgid "Invalid Server"
-msgstr "Niewłaściwy serwer"
+msgstr "Nieprawidłowy serwer"
 
 msgid "Enter a Conference Server"
-msgstr "Podaj adres serwera konferencyjnego"
+msgstr "Proszę podać serwer konferencji"
 
 msgid "Select a conference server to query"
-msgstr "Wpisz adres serwera konferencyjnego, z którego chcesz pobrać listę"
+msgstr "Proszę wybrać serwer konferencji do odpytania"
 
 msgid "Find Rooms"
-msgstr "Szukanie pokoju"
-
-#, fuzzy
+msgstr "Znajdź pokoje"
+
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Przynależności:"
+
 msgid "No users found"
-msgstr "Nie znaleziono żadnego użytkownika"
-
-#, fuzzy
+msgstr "Nie odnaleziono użytkowników"
+
 msgid "Roles:"
-msgstr "Rola"
-
-#, fuzzy
+msgstr "Role:"
+
 msgid "Ping timed out"
-msgstr "Zwykły tekst"
+msgstr "Przekroczono czas oczekiwania na ping"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Nie można odnaleźć alternatywnych metod połączenia XMPP po niepowodzeniu "
+"bezpośredniego połączenia."
 
 msgid "Invalid XMPP ID"
 msgstr "Nieprawidłowy identyfikator XMPP"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
-
-#, fuzzy
+msgstr "Nieprawidłowy identyfikator XMPP. Domena musi zostać ustawiona."
+
 msgid "Malformed BOSH URL"
-msgstr "Nie udało się połączyć z serwerem."
+msgstr "Błędnie sformatowany adresu URL protokołu BOSH"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "Pomyślnie zarejestrowano nowy identyfikator %s@%s "
-
-#, fuzzy, c-format
+msgstr "Pomyślnie zarejestrowano nowe konto %s@%s"
+
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Pomyślnie zarejestrowano nowy identyfikator %s@%s "
+msgstr "Pomyślnie zarejestrowano nowe konto do %s"
 
 msgid "Registration Successful"
-msgstr "Rejestracja zakończona pomyślnie"
+msgstr "Pomyślna rejestracja"
 
 msgid "Registration Failed"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy, c-format
+msgstr "Rejestracja nie powiodła się"
+
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Pomyślnie zarejestrowano nowy identyfikator %s@%s "
-
-#, fuzzy
+msgstr "Pomyślnie usunięto rejestrację z %s"
+
 msgid "Unregistration Successful"
-msgstr "Rejestracja zakończona pomyślnie"
-
-#, fuzzy
+msgstr "Pomyślnie wyrejestrowano"
+
 msgid "Unregistration Failed"
-msgstr "Błąd podczas rejestracji"
+msgstr "Wyrejestrowanie nie powiodło się"
 
 msgid "State"
-msgstr "Stan"
+msgstr "Stan/województwo"
 
 msgid "Postal code"
 msgstr "Kod pocztowy"
@@ -4290,83 +4211,80 @@
 msgid "Already Registered"
 msgstr "Już zarejestrowano"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "Rejestruj"
-
-#, fuzzy
+msgstr "Wyrejestruj"
+
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Wypełnij poniższe informacje aby zarejestrować nowe konto."
+msgstr "Proszę wypełnić poniższe informacje, aby zmienić rejestrację konta."
 
 msgid "Please fill out the information below to register your new account."
-msgstr "Wypełnij poniższe informacje aby zarejestrować nowe konto."
+msgstr "Proszę wypełnić poniższe informacje, aby zarejestrować nowe konto."
 
 msgid "Register New XMPP Account"
-msgstr "Rejestracja nowego konta XMPP"
+msgstr "Zarejestruj nowe konto XMPP"
 
 msgid "Register"
-msgstr "Rejestruj"
+msgstr "Zarejestruj"
 
 #, c-format
 msgid "Change Account Registration at %s"
-msgstr "Zmiana rejestracji konta %s"
+msgstr "Zmień rejestrację konta na %s"
 
 #, c-format
 msgid "Register New Account at %s"
-msgstr "Rejestracja nowego konta %s"
+msgstr "Zarejestruj nowe konto na %s"
 
 msgid "Change Registration"
-msgstr "Zmiana rejestracji"
-
-#, fuzzy
+msgstr "Zmień rejestrację"
+
 msgid "Error unregistering account"
-msgstr "Błąd podczas zmiany informacji o koncie"
+msgstr "Błąd podczas wyrejestrowania konta"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "Pomyślnie wyrejestrowano konto"
 
 msgid "Initializing Stream"
-msgstr "Inicjacja strumienia"
-
-#, fuzzy
+msgstr "Inicjowanie strumienia"
+
 msgid "Initializing SSL/TLS"
-msgstr "Inicjacja strumienia"
+msgstr "Inicjowanie SSL/TLS"
 
 msgid "Authenticating"
-msgstr "Autoryzacja"
+msgstr "Uwierzytelnianie"
 
 msgid "Re-initializing Stream"
-msgstr "Ponowna inicjacja strumienia"
+msgstr "Ponowne inicjowanie strumienia"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Serwer nie obsługuje blokowania"
 
 msgid "Not Authorized"
-msgstr "Brak autoryzacji"
+msgstr "Nie upoważniono"
 
 #. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Nastrój"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "Słucha teraz"
 
 msgid "Both"
 msgstr "Obustronna"
 
 msgid "From (To pending)"
-msgstr "Od strony znajomego (w drugą stronę - oczekuje na autoryzację)"
+msgstr "Od (do oczekuje na upoważnienie)"
 
 msgid "From"
 msgstr "Od"
 
 msgid "To"
-msgstr "Od strony znajomego"
+msgstr "Do"
 
 msgid "None (To pending)"
-msgstr "Brak (Oczekujesz na autoryzację)"
-
+msgstr "Brak (do oczekuje na upoważnienie)"
+
+#. 0
 msgid "None"
 msgstr "Brak"
 
@@ -4374,58 +4292,53 @@
 msgid "Subscription"
 msgstr "Subskrypcja"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "Grupa krwi"
-
-#, fuzzy
+msgstr "Tekst nastroju"
+
 msgid "Allow Buzz"
-msgstr "Zezwól"
-
-#, fuzzy
+msgstr "Pozwolenie na szeptanie"
+
 msgid "Tune Artist"
-msgstr "Artyści"
-
-#, fuzzy
+msgstr "Wykonawca utworu"
+
 msgid "Tune Title"
-msgstr "Tytuł"
+msgstr "Tytuł utworu"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "Album utworu"
 
 msgid "Tune Genre"
-msgstr ""
-
-#, fuzzy
+msgstr "Gatunek utworu"
+
 msgid "Tune Comment"
-msgstr "Komentarz dot. znajomego"
+msgstr "Komentarz utworu"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "Ścieżka utworu"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "Czas utworu"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "Rok utworu"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "Adres URL utworu"
 
 msgid "Password Changed"
-msgstr "Hasło zostało zmienione"
+msgstr "Zmieniono hasło"
 
 msgid "Your password has been changed."
 msgstr "Hasło zostało zmienione."
 
 msgid "Error changing password"
-msgstr "Błąd przy zmianie hasła"
+msgstr "Błąd podczas zmieniania hasła"
 
 msgid "Change XMPP Password"
-msgstr "Zmień hasło XMPP"
+msgstr "Zmiana hasła XMPP"
 
 msgid "Please enter your new password"
-msgstr "Wpisz swoje nowe hasło"
+msgstr "Proszę podać nowe hasło"
 
 msgid "Set User Info..."
 msgstr "Ustaw informacje o użytkowniku..."
@@ -4439,95 +4352,94 @@
 msgstr "Wyszukaj użytkowników..."
 
 msgid "Bad Request"
-msgstr "Niewłaściwe żądanie"
+msgstr "Błędne żądanie"
 
 msgid "Conflict"
 msgstr "Konflikt"
 
 msgid "Feature Not Implemented"
-msgstr "Ta funkcja nie jest jeszcze obsługiwana"
+msgstr "Funkcja nie jest jeszcze zaimplementowana"
 
 msgid "Forbidden"
-msgstr "Zabroniony"
-
-#, fuzzy
+msgstr "Zabronione"
+
 msgid "Gone"
-msgstr "Brak"
+msgstr "Rozłączono"
 
 msgid "Internal Server Error"
-msgstr "Błąd wewnętrzny serwera"
+msgstr "Wewnętrzny błąd serwera"
 
 msgid "Item Not Found"
-msgstr "Obiekt nie został znaleziony"
+msgstr "Nie odnaleziono elementu"
 
 msgid "Malformed XMPP ID"
-msgstr "Niepoprawny Identyfikator XMPP"
+msgstr "Błędnie sformatowany identyfikator XMPP"
 
 msgid "Not Acceptable"
-msgstr "Nie akceptowalne"
+msgstr "Nieakceptowalne"
 
 msgid "Not Allowed"
 msgstr "Zabronione"
 
 msgid "Payment Required"
-msgstr "Wymagana opłata"
+msgstr "Opłata jest wymagana"
 
 msgid "Recipient Unavailable"
 msgstr "Odbiorca jest niedostępny"
 
 msgid "Registration Required"
-msgstr "Wymagana rejestracja"
+msgstr "Rejestracja jest wymagana"
 
 msgid "Remote Server Not Found"
 msgstr "Nie odnaleziono zdalnego serwera"
 
 msgid "Remote Server Timeout"
-msgstr "Upłynął czas oczekiwania na odpowiedź z serwera"
+msgstr "Przekroczono czas oczekiwania zdalnego serwera"
 
 msgid "Server Overloaded"
-msgstr "Serwer przeciążony"
+msgstr "Przeciążony serwer"
 
 msgid "Service Unavailable"
-msgstr "Usługa niedostępna"
+msgstr "Usługa jest niedostępna"
 
 msgid "Subscription Required"
-msgstr "Wymagana subskrypcja"
+msgstr "Subskrypcja jest wymagana"
 
 msgid "Unexpected Request"
 msgstr "Nieoczekiwane żądanie"
 
 msgid "Authorization Aborted"
-msgstr "Przerwana autoryzacja"
+msgstr "Przerwano upoważnienie"
 
 msgid "Incorrect encoding in authorization"
-msgstr "Niewłaściwe kodowanie podczas autoryzacji"
+msgstr "Niepoprawne kodowanie upoważnienia"
 
 msgid "Invalid authzid"
-msgstr "Niepoprawny identyfikator uwierzytelniania"
+msgstr "Nieprawidłowy identyfikator upoważnienia"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Niepoprawny mechanizm autoryzacji"
+msgstr "Nieprawidłowy mechanizm upoważnienia"
 
 msgid "Authorization mechanism too weak"
-msgstr "Mechanizm autoryzacji zbyt słaby"
+msgstr "Mechanizm upoważnienia jest za słaby"
 
 msgid "Temporary Authentication Failure"
-msgstr "Tymczasowe uwierzytelnianie nie powiodło się"
+msgstr "Tymczasowe uwierzytelnienie nie powiodło się"
 
 msgid "Authentication Failure"
 msgstr "Uwierzytelnianie nie powiodło się"
 
 msgid "Bad Format"
-msgstr "Nieprawidłowy format"
+msgstr "Błędny format"
 
 msgid "Bad Namespace Prefix"
-msgstr "Niepoprawny przedrostek przestrzeni nazw"
+msgstr "Błędny przedrostek przestrzeni nazw"
 
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
 msgid "Connection Timeout"
-msgstr "Przekroczono czas połączenia"
+msgstr "Przekroczono czas oczekiwania na połączenie"
 
 msgid "Host Gone"
 msgstr "Komputer został rozłączony"
@@ -4539,19 +4451,19 @@
 msgstr "Niepoprawne adresowanie"
 
 msgid "Invalid ID"
-msgstr "Niepoprawny identyfikator"
+msgstr "Nieprawidłowy identyfikator"
 
 msgid "Invalid Namespace"
-msgstr "Niepoprawna przestrzeń nazw"
+msgstr "Nieprawidłowa przestrzeń nazw"
 
 msgid "Invalid XML"
-msgstr "Niepoprawny XML"
+msgstr "Nieprawidłowy XML"
 
 msgid "Non-matching Hosts"
-msgstr "Nie pasujący komputer"
+msgstr "Niepasujące komputery"
 
 msgid "Policy Violation"
-msgstr "Złamanie zasady"
+msgstr "Naruszenie polityki"
 
 msgid "Remote Connection Failed"
 msgstr "Zdalne połączenie nie powiodło się"
@@ -4569,34 +4481,34 @@
 msgstr "Zamknięcie systemu"
 
 msgid "Undefined Condition"
-msgstr "Niezdefiniowany warunek"
+msgstr "Nieokreślony warunek"
 
 msgid "Unsupported Encoding"
 msgstr "Nieobsługiwane kodowanie"
 
 msgid "Unsupported Stanza Type"
-msgstr "Nieobsługiwany typ stanza"
+msgstr "Nieobsługiwany typ stanzy"
 
 msgid "Unsupported Version"
 msgstr "Nieobsługiwana wersja"
 
 msgid "XML Not Well Formed"
-msgstr "XML nie został poprawnie uformowany"
+msgstr "Niepoprawnie sformatowany XML"
 
 msgid "Stream Error"
 msgstr "Błąd strumienia"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Nie można zbanować użytkownika %s"
+msgstr "Nie można zablokować użytkownika %s"
 
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Nieznany parametr affiliation \"%s\""
+msgstr "Nieznana przynależność: \"%s\""
 
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Nie można zmienić przynależności użytkownika %s na \"%s\""
+msgstr "Nie można zmienić przynależności użytkownika %s jako \"%s\""
 
 #, c-format
 msgid "Unknown role: \"%s\""
@@ -4608,137 +4520,131 @@
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Nie można wykopać użytkownika %s"
-
-#, fuzzy, c-format
+msgstr "Nie można wyrzucić użytkownika %s"
+
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Nie można zbanować użytkownika %s"
-
-#, fuzzy, c-format
+msgstr "Nie można wysłać ping użytkownikowi %s"
+
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr ""
-"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
-"przesyłania plików"
-
-#, fuzzy, c-format
+msgstr "Nie można szeptać, ponieważ nic nie wiadomo o użytkowniku %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr ""
-"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
-"przesyłania plików"
-
-#, fuzzy, c-format
+msgstr "Nie można szeptać, ponieważ użytkownik %s może być w trybie offline."
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
-"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
-"przesyłania plików"
+"Nie można szeptać, ponieważ użytkownik %s nie obsługuje lub nie chce teraz "
+"otrzymywać szeptów."
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr ""
+msgstr "Szeptanie do użytkownika %s..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Szepcz"
+
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s zalogował się."
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s zaszeptał."
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Nie można wysłać wiadomości do %s - niewłaściwy JID"
-
-#, fuzzy, c-format
+msgstr ""
+"Nie można zainicjować multimediów z użytkownikiem %s: nieprawidłowy "
+"identyfikator Jabbera"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
-
-#, fuzzy, c-format
+msgstr ""
+"Nie można zainicjować multimediów z użytkownikiem %s: użytkownik nie jest w "
+"trybie online"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
-
-#, fuzzy
+msgstr ""
+"Nie można zainicjować multimediów z użytkownikiem %s: nie subskrybowano "
+"obecności użytkownika"
+
 msgid "Media Initiation Failed"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy, c-format
+msgstr "Zainicjowanie multimediów nie powiodło się"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Wybierz zasób kontaktu %s na który chcesz wysłać plik"
+msgstr ""
+"Proszę wybrać zasób użytkownika %s, z którym uruchomić sesję multimediów."
 
 msgid "Select a Resource"
 msgstr "Wybór Zasobu"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Rozpocznij _konferencję"
+msgstr "Zainicjuj multimedia"
 
 msgid "config:  Configure a chat room."
-msgstr "config:  Konfiguruje pokój konferencyjny."
+msgstr "config: konfiguruje pokój konferencji."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure:  Konfiguruje pokój konferencyjny"
-
-#, fuzzy
+msgstr "configure: konfiguruje pokój konferencji."
+
 msgid "part [message]:  Leave the room."
-msgstr "part [nazwa pokoju]:  Opuszczenie pokoju."
+msgstr "part [wiadomość]: opuszcza pokój."
 
 msgid "register:  Register with a chat room."
-msgstr "register:  Rejestracja pokoju."
+msgstr "register: rejestruje z pokojem konferencji."
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [nowy temat]:  Podgląd lub zmiana tematu."
-
-#, fuzzy
+msgstr "topic [nowy temat]: wyświetla lub zmienia temat."
+
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr ""
-"ban &lt;użytkownik&gt; [pokój]:  Blokuje dostęp określonego użytkownika do "
-"pokoju."
-
-#, fuzzy
+msgstr "ban &lt;użytkownik&gt; [powód]: blokuje użytkownika z pokoju."
+
 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;użytkownik&gt; &lt;owner|admin|member|outcast|none&gt;: "
-"Ustawia przynależność użytkownika w danym pokoju."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [pseudonim1] "
+"[pseudonim2]...: uzyskuje użytkowników z przynależnością lub ustawia "
+"przynależność użytkowników z pokojem."
+
 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;użytkownik&gt; &lt;moderator|participant|visitor|none&gt;: Zmienia "
-"rolę użytkownika w danym pokoju."
+"role &lt;moderator|participant|visitor|none&gt; [pseudonim1] "
+"[pseudonim2]...: uzyskuje użytkowników z rolami lub ustawia role "
+"użytkowników w pokoju."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"invite &lt;użytkownik&gt; [komunikat]:  Zaprasza użytkownika do danego "
-"pokoju."
-
-#, fuzzy
+msgstr "invite &lt;użytkownik&gt; [wiadomość]: zaprasza użytkownika do pokoju."
+
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr ""
-"join: &lt;pokój&gt; [serwer]:  Przyłącza się do konferencji na serwerze."
-
-#, fuzzy
+msgstr "join: &lt;pokój&gt; [hasło]: dołącza do konferencji na tym serwerze."
+
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;użytkownik&gt; [pokój]:  Wyrzuca użytkownika z pokoju."
+msgstr "kick &lt;użytkownik&gt; [powód]: wyrzuca użytkownika z pokoju."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;użytkownik&gt; &lt;wiadomość&gt;:  Wysyła prywatną wiadomość do "
+"msg &lt;użytkownik&gt; &lt;wiadomość&gt;: wysyła prywatną wiadomość do "
 "innego użytkownika."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
+"ping &lt;identyfikator_Jabbera&gt;:\twysyła ping do użytkownika/składnika/"
+"serwera."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr ""
+msgstr "buzz: szepcze do użytkownika, aby uzyskać jego uwagę"
 
 #. *< type
 #. *< ui_requirement
@@ -4758,47 +4664,46 @@
 msgstr "Domena"
 
 msgid "Require SSL/TLS"
-msgstr "Wymagaj SSL/TLS"
+msgstr "Wymaganie SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
-msgstr "Wymuś użycie starego (port 5223) SSL"
+msgstr "Wymuszenie użycia starego (port 5223) SSL"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
-"Zezwalanie na autoryzację w czystym tekście przez niezaszyfrowane strumienie"
+"Pozwolenie na upoważnianie w zwykłym tekście przez niezaszyfrowane strumienie"
 
 msgid "Connect port"
-msgstr "Port"
+msgstr "Port połączenia"
 
 #. 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 "Serwer"
-
-#, fuzzy
+msgstr "Serwer połączenia"
+
 msgid "File transfer proxies"
-msgstr "Port do przesyłania plików"
+msgstr "Pośredniki przesyłania plików"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "Adres URL protokołu BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "Wyświetlanie niestandardowych emotikon"
+msgstr "Wyświetlanie własnych emotikon"
 
 #, c-format
 msgid "%s has left the conversation."
-msgstr "%s zamknęła/zamknął rozmowę."
+msgstr "Użytkownik %s opuścił rozmowę."
 
 #, c-format
 msgid "Message from %s"
-msgstr "Wiadomość od %s"
+msgstr "Wiadomość od użytkownika %s"
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s zmienił temat na: %s"
+msgstr "Użytkownik %s ustawił temat na: %s"
 
 #, c-format
 msgid "The topic is: %s"
@@ -4806,28 +4711,28 @@
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "Dostarczenie wiadomości do %s nie powiodło się: %s"
+msgstr "Dostarczenie wiadomości do użytkownika %s nie powiodło się: %s"
 
 msgid "XMPP Message Error"
 msgstr "Błąd wiadomości XMPP"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Kod %s)"
+msgstr "(Kod %s)"
 
 msgid "XML Parse error"
-msgstr "Błąd przetwarzania XML"
+msgstr "Błąd podczas przetwarzania XML"
 
 msgid "Unknown Error in presence"
 msgstr "Nieznany błąd obecności"
 
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Błąd przyłączania się do konferencji %s"
+msgstr "Błąd podczas dołączania do konferencji %s"
 
 #, c-format
 msgid "Error in chat %s"
-msgstr "Błąd w konferencji %s"
+msgstr "Błąd konferencji %s"
 
 msgid "Create New Room"
 msgstr "Utworzenie nowego pokoju"
@@ -4840,64 +4745,62 @@
 "ustawienia?"
 
 msgid "_Configure Room"
-msgstr "_Konfiguruj pokój"
+msgstr "S_konfiguruj pokój"
 
 msgid "_Accept Defaults"
-msgstr "_Akceptuj domyślne"
-
-#, fuzzy
+msgstr "Z_aakceptuj domyślne"
+
 msgid "No reason"
-msgstr "Nie podano powodu."
-
-#, fuzzy, c-format
+msgstr "Bez powodu"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Zostałeś wykopany przez %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Użytkownik został wyrzucony: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Wykopany przez %s (%s)"
-
-#, fuzzy
+msgstr "Wyrzucony (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Wystąpił błąd podczas otwierania pliku."
-
-#, fuzzy
+msgstr "Wystąpił błąd przesyłania strumienia bitów w paśmie\n"
+
 msgid "Transfer was closed."
-msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
+msgstr "Przesyłanie zostało zamknięte."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Otwarcie strumienia bitów w paśmie nie powiodło się"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Nie można przesłać pliku do %s, użytkownik nie ma włączonej obsługi "
-"przesyłania plików"
+"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ę"
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Nie można wysłać wiadomości do %s - niewłaściwy JID"
+msgstr ""
+"Nie można wysłać pliku do użytkownika %s, nieprawidłowy identyfikator Jabbera"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
-
-#, fuzzy, c-format
+msgstr "Nie można wysłać pliku do użytkownika %s, nie jest on w trybie online"
+
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Nie można przesłać pliku do %s: użytkownik nie jest połączony z siecią"
-
-#, fuzzy, c-format
+msgstr ""
+"Nie można wysłać pliku do użytkownika %s, nie subskrybowano jego obecności"
+
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "Wybierz zasób kontaktu %s na który chcesz wysłać plik"
+msgstr "Proszę wybrać zasób użytkownika %s, do którego wysłać plik"
 
 msgid "Edit User Mood"
-msgstr "Modyfikuj nastrój użytkownika"
+msgstr "Zmodyfikuj nastrój użytkownika"
 
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Proszę wybrać nastrój z listy."
 
 msgid "Set"
 msgstr "Ustaw"
@@ -4908,23 +4811,24 @@
 msgid "Set User Nickname"
 msgstr "Ustaw pseudonim użytkownika"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Wpisz nową nazwę dla %s"
+msgstr "Proszę podać nowy pseudonim."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Ta informacja jest widoczna dla wszystkich kontaktów na liście, więc należy "
+"wybrać coś odpowiedniego."
 
 msgid "Set Nickname..."
 msgstr "Ustaw pseudonim..."
 
 msgid "Actions"
-msgstr "Działania"
+msgstr "Czynności"
 
 msgid "Select an action"
-msgstr "Wybór działania"
+msgstr "Wybór czynności"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
@@ -4934,35 +4838,34 @@
 msgstr "Nie można dodać \"%s\"."
 
 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "Błąd podczas dodawania znajomego"
+
 msgid "The username specified does not exist."
-msgstr "Nowe formatowanie nie jest poprawne."
+msgstr "Podana nazwa użytkownika nie istnieje."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Błąd synchronizacji listy znajomych przy %s (%s)"
+msgstr "Problem synchronizacji listy znajomych w %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 na lokalnej liście jest w grupie \"%s\", ale nie ma go na serwerze. Czy "
-"chcesz dodać tego znajomego?"
+"Użytkownik %s na lokalnej liście jest w grupie \"%s\", ale nie ma go na "
+"serwerze. Dodać tego znajomego?"
 
 #, 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 znajduje się na lokalnej liście, ale nie ma go na serwerze. Czy chcesz "
-"dodać tego użytkownika?"
+"Użytkownik %s znajduje się na lokalnej liście, ale nie ma go na serwerze. "
+"Dodać tego użytkownika?"
 
 #, c-format
 msgid "Unable to parse message"
-msgstr "Nie udało się przetworzyć wiadomości."
+msgstr "Nie można przetworzyć wiadomości"
 
 #, c-format
 msgid "Syntax Error (probably a client bug)"
@@ -4970,7 +4873,7 @@
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Niepoprawny adres email"
+msgstr "Nieprawidłowy adres e-mail"
 
 #, c-format
 msgid "User does not exist"
@@ -4988,9 +4891,9 @@
 msgid "Invalid username"
 msgstr "Nieprawidłowa nazwa użytkownika"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid friendly name"
-msgstr "Niepoprawna nazwa użytkownika"
+msgstr "Nieprawidłowy pseudonim"
 
 #, c-format
 msgid "List full"
@@ -4998,7 +4901,7 @@
 
 #, c-format
 msgid "Already there"
-msgstr "Już tu jesteś"
+msgstr "Już tu jest"
 
 #, c-format
 msgid "Not on list"
@@ -5006,11 +4909,11 @@
 
 #, c-format
 msgid "User is offline"
-msgstr "Użytkownik jest rozłączony"
+msgstr "Użytkownik jest w trybie offline"
 
 #, c-format
 msgid "Already in the mode"
-msgstr "Jesteś już w tym trybie"
+msgstr "Jest już w tym trybie"
 
 #, c-format
 msgid "Already in opposite list"
@@ -5018,15 +4921,15 @@
 
 #, c-format
 msgid "Too many groups"
-msgstr "Zbyt wiele grup"
+msgstr "Za dużo grup"
 
 #, c-format
 msgid "Invalid group"
-msgstr "Niepoprawna grupa"
+msgstr "Nieprawidłowa grupa"
 
 #, c-format
 msgid "User not in group"
-msgstr "Użytkownik nie należy do grupy"
+msgstr "Użytkownik nie jest w grupie"
 
 #, c-format
 msgid "Group name too long"
@@ -5038,31 +4941,31 @@
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Próba dodania użytkownika do grupy, która nie istnieje"
+msgstr "Próbowano dodać użytkownika do grupy, która nie istnieje"
 
 #, c-format
 msgid "Switchboard failed"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Centrala nie powiodła się"
+
+#, c-format
 msgid "Notify transfer failed"
-msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
+msgstr "Powiadomienie o przesyłaniu nie powiodło się"
 
 #, c-format
 msgid "Required fields missing"
-msgstr "Pominięto wymagane pola"
+msgstr "Brak wymaganych pól"
 
 #, c-format
 msgid "Too many hits to a FND"
-msgstr "Za dużo odwiedzin do FND"
+msgstr "Za dużo odwiedzin FND"
 
 #, c-format
 msgid "Not logged in"
-msgstr "Nie zalogowany"
+msgstr "Niezalogowany"
 
 #, c-format
 msgid "Service temporarily unavailable"
-msgstr "Usługa tymczasowo niedostępna"
+msgstr "Usługa jest tymczasowo niedostępna"
 
 #, c-format
 msgid "Database server error"
@@ -5070,11 +4973,11 @@
 
 #, c-format
 msgid "Command disabled"
-msgstr "Polecenie wyłączone"
+msgstr "Polecenie jest wyłączone"
 
 #, c-format
 msgid "File operation error"
-msgstr "Błąd operacji na pliku"
+msgstr "Błąd działania na pliku"
 
 #, c-format
 msgid "Memory allocation error"
@@ -5086,15 +4989,15 @@
 
 #, c-format
 msgid "Server busy"
-msgstr "Serwer zajęty"
+msgstr "Serwer jest zajęty"
 
 #, c-format
 msgid "Server unavailable"
-msgstr "Serwer niedostępny"
+msgstr "Serwer jest niedostępny"
 
 #, c-format
 msgid "Peer notification server down"
-msgstr ""
+msgstr "Serwer powiadamiania użytkowników nie działa"
 
 #, c-format
 msgid "Database connect error"
@@ -5118,47 +5021,46 @@
 
 #, c-format
 msgid "Session overload"
-msgstr "Sesja przeciążona"
+msgstr "Sesja jest przeciążona"
 
 #, c-format
 msgid "User is too active"
-msgstr "Użytkownik jest zbyt aktywny"
+msgstr "Użytkownik jest za bardzo aktywny"
 
 #, c-format
 msgid "Too many sessions"
-msgstr "Zbyt wiele sesji"
+msgstr "Za dużo sesji"
 
 #, c-format
 msgid "Passport not verified"
-msgstr "Passport nie został zweryfikowany"
+msgstr "Passport nie został sprawdzony"
 
 #, c-format
 msgid "Bad friend file"
-msgstr "Zły plik przyjaciela"
+msgstr "Błędny plik przyjaciela"
 
 #, c-format
 msgid "Not expected"
-msgstr "Nie oczekiwano"
-
-#, fuzzy
+msgstr "Nieoczekiwano"
+
 msgid "Friendly name is changing too rapidly"
-msgstr "Pseudonim zmienia się zbyt szybko"
+msgstr "Pseudonim jest za często zmieniany"
 
 #, c-format
 msgid "Server too busy"
-msgstr "Serwer jest zbyt zajęty"
+msgstr "Serwer jest za bardzo zajęty"
 
 #, c-format
 msgid "Authentication failed"
-msgstr "Autoryzacja nie powiodła się"
+msgstr "Uwierzytelnienie nie powiodło się"
 
 #, c-format
 msgid "Not allowed when offline"
-msgstr "Niedostępne gdy rozłączony"
+msgstr "Niedozwolone w trybie offline"
 
 #, c-format
 msgid "Not accepting new users"
-msgstr "Bez akceptacji nowych użytkowników"
+msgstr "Bez akceptowania nowych użytkowników"
 
 #, c-format
 msgid "Kids Passport without parental consent"
@@ -5166,15 +5068,14 @@
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Konto Passport nie zostało jeszcze zweryfikowane"
-
-#, fuzzy
+msgstr "Konto Passport nie zostało jeszcze sprawdzone"
+
 msgid "Passport account suspended"
-msgstr "Konto Passport nie zostało jeszcze zweryfikowane"
+msgstr "Konto Passport zostało zawieszone"
 
 #, c-format
 msgid "Bad ticket"
-msgstr "Zły bilet"
+msgstr "Błędny bilet"
 
 #, c-format
 msgid "Unknown Error Code %d"
@@ -5184,66 +5085,69 @@
 msgid "MSN Error: %s\n"
 msgstr "Błąd MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Preferowany kontakt"
-
-#, fuzzy
+msgstr "Inne kontakty"
+
 msgid "Non-IM Contacts"
-msgstr "Usunięcie kontaktu"
+msgstr "Kontakty spoza komunikatora"
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"Użytkownik %s wysłał mrugnięcie. <a href='msn-wink://%s'>Naciśnięcie tutaj "
+"odtworzy je</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "Użytkownik %s wysłał mrugnięcie, ale nie można go zapisać"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
+"Użytkownik %s wysłał nagranie dźwiękowe. <a href='audio://%s'>Naciśnięcie "
+"tutaj odtworzy je</a>"
 
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr ""
+msgstr "Użytkownik %s wysłał nagranie dźwiękowe, ale nie można go zapisać"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
+"Użytkownik %s wysłał zaproszenie do konferencji głosowej, która nie jest "
+"jeszcze obsługiwana."
 
 msgid "Nudge"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Szturchnij"
+
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s zalogował się."
+msgstr "%s szturchnął użytkownika."
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#, fuzzy
+msgstr "Szturchanie użytkownika %s..."
+
 msgid "Email Address..."
-msgstr "Adres email"
+msgstr "Adres e-mail..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr "Nowy pseudonim MSN jest zbyt długi."
+msgstr "Nowy pseudonim MSN jest za długi."
 
 msgid "Set your friendly name."
-msgstr "Ustaw pseudonim."
+msgstr "Ustawienie pseudonimu."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Ta nazwa będzie widoczna dla innych użytkowników MSN."
+msgstr "Ta nazwa będzie widoczna dla innych znajomych MSN."
 
 msgid "Set your home phone number."
-msgstr "Ustaw numer telefonu domowego."
+msgstr "Ustawienie numeru telefonu domowego."
 
 msgid "Set your work phone number."
-msgstr "Ustaw numer telefonu do pracy."
+msgstr "Ustawienie numeru telefonu służbowego."
 
 msgid "Set your mobile phone number."
-msgstr "Ustaw numer telefonu komórkowego."
+msgstr "Ustawienie numeru telefonu komórkowego."
 
 msgid "Allow MSN Mobile pages?"
 msgstr "Zezwolić na strony MSN Mobile?"
@@ -5252,8 +5156,8 @@
 "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 ""
-"Zezwolić czy zabronić użytkownikom z listy znajomych na wysyłanie stron MSN "
-"Mobile do telefonu komórkowego lub innego przenośnego urządzenia?"
+"Zezwolić czy zabronić osobom z listy znajomych na wysyłanie stron MSN Mobile "
+"do telefonu komórkowego lub innego przenośnego urządzenia?"
 
 msgid "Allow"
 msgstr "Zezwól"
@@ -5261,38 +5165,35 @@
 msgid "Disallow"
 msgstr "Zabroń"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Komentarz dot. znajomego %s"
-
-#, fuzzy
+msgstr "Zablokowany tekst dla %s"
+
 msgid "No text is blocked for this account."
-msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
+msgstr "Żaden tekst nie jest zablokowany dla tego konta."
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
-
-#, fuzzy
+msgstr "Serwery MSN obecnie blokują następujące wyrażenia regularne:<br/>%s"
+
 msgid "This account does not have email enabled."
-msgstr "Wybrane konto Hotmail może być nieaktywne."
+msgstr "To konto nie ma włączonego adresu e-mail."
 
 msgid "Send a mobile message."
-msgstr "Wyślij wiadomość komórkową."
+msgstr "Wysłanie wiadomości komórkowej."
 
 msgid "Page"
 msgstr "Strona"
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "Gra"
+
 msgid "Working"
-msgstr "Praca"
+msgstr "Pracuje"
 
 msgid "Has you"
-msgstr ""
+msgstr "Posiada użytkownika na swojej liście znajomych"
 
 msgid "Home Phone Number"
 msgstr "Numer telefonu domowego"
@@ -5327,34 +5228,32 @@
 msgid "Album"
 msgstr "Album"
 
-#, fuzzy
 msgid "Game Title"
-msgstr "Tytuł"
+msgstr "Nazwa gry"
 
 msgid "Office Title"
-msgstr ""
+msgstr "Nazwa biura"
 
 msgid "Set Friendly Name..."
-msgstr "Ustaw ksywkę..."
+msgstr "Ustaw pseudonim..."
 
 msgid "Set Home Phone Number..."
 msgstr "Ustaw domowy numer telefonu..."
 
 msgid "Set Work Phone Number..."
-msgstr "Ustaw numer telefonu do miejsca pracy..."
+msgstr "Ustaw numer telefonu służbowego..."
 
 msgid "Set Mobile Phone Number..."
 msgstr "Ustaw numer telefonu komórkowego..."
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Włącz/Wyłącz urządzenia przenośne..."
-
-#, fuzzy
+msgstr "Włącz/wyłącz urządzenia przenośne..."
+
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Włącz/Wyłącz urządzenia przenośne..."
+msgstr "Zezwól/zabroń strony Mobile..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "Wyświetl zablokowany tekst..."
 
 msgid "Open Hotmail Inbox"
 msgstr "Otwórz skrzynkę Hotmail"
@@ -5363,23 +5262,25 @@
 msgstr "Wyślij do urządzenia przenośnego"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "MSN wymaga obsługi SSL. Zainstaluj obsługiwaną bibliotekę SSL."
+msgstr ""
+"MSN wymaga obsługi SSL. Proszę zainstalować obsługiwaną bibliotekę SSL."
 
 #, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-
-#, fuzzy
+"Nie można dodać znajomego %s, ponieważ nazwa użytkownika jest nieprawidłowa. "
+"Nazwy użytkowników muszą być prawidłowymi adresami e-mail."
+
 msgid "Unable to Add"
 msgstr "Nie można dodać"
 
 msgid "Authorization Request Message:"
-msgstr "Treść prośby o autoryzację:"
+msgstr "Wiadomość żądania upoważnienia:"
 
 msgid "Please authorize me!"
-msgstr "Proszę o autoryzację!"
+msgstr "Użytkownik prosi o upoważnienie."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
@@ -5409,7 +5310,7 @@
 msgstr "Coś o mnie"
 
 msgid "Social"
-msgstr ""
+msgstr "Społeczne"
 
 msgid "Marital Status"
 msgstr "Stan cywilny"
@@ -5445,25 +5346,25 @@
 msgstr "Osobiste"
 
 msgid "Significant Other"
-msgstr ""
+msgstr "Inne ważne"
 
 msgid "Home Phone"
 msgstr "Telefon domowy"
 
 msgid "Home Phone 2"
-msgstr "Telefon domowy 2"
+msgstr "Drugi telefon domowy"
 
 msgid "Home Address"
 msgstr "Adres domowy"
 
 msgid "Personal Mobile"
-msgstr "Telefon komórkowy"
+msgstr "Osobisty telefon komórkowy"
 
 msgid "Home Fax"
-msgstr "Fax domowy"
+msgstr "Faks domowy"
 
 msgid "Personal Email"
-msgstr "Email osobisty"
+msgstr "Osobisty adres e-mail"
 
 msgid "Personal IM"
 msgstr "Osobisty komunikator"
@@ -5488,10 +5389,10 @@
 msgstr "Zawód"
 
 msgid "Work Phone"
-msgstr "Telefon do pracy"
+msgstr "Telefon służbowy"
 
 msgid "Work Phone 2"
-msgstr "Drugi telefon do pracy"
+msgstr "Drugi telefon służbowy"
 
 msgid "Work Address"
 msgstr "Adres do pracy"
@@ -5503,17 +5404,16 @@
 msgstr "Pager służbowy"
 
 msgid "Work Fax"
-msgstr "Fax w pracy"
+msgstr "Faks służbowy"
 
 msgid "Work Email"
-msgstr "E-mail służbowy"
+msgstr "Służbowy adres e-mail"
 
 msgid "Work IM"
 msgstr "Służbowy komunikator"
 
-#, fuzzy
 msgid "Start Date"
-msgstr "Stan"
+msgstr "Data rozpoczęcia"
 
 msgid "Favorite Things"
 msgstr "Ulubione rzeczy"
@@ -5539,12 +5439,11 @@
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Program Pidgin nie mógł odnaleźć informacji w profilu użytkownika. "
-"Użytkownik prawdopodobnie nie istnieje."
-
-#, fuzzy
+"Nie można odnaleźć informacji w profilu użytkownika. Użytkownik "
+"prawdopodobnie nie istnieje."
+
 msgid "View web profile"
-msgstr "Ukryj, gdy rozłączony"
+msgstr "Wyświetl profil WWW"
 
 #. *< type
 #. *< ui_requirement
@@ -5555,9 +5454,8 @@
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Wtyczka obsługi protokołu Novell GroupWise Messenger"
+msgstr "Wtyczka protokołu Windows Live Messenger"
 
 msgid "Use HTTP Method"
 msgstr "Użycie metody HTTP"
@@ -5566,29 +5464,27 @@
 msgstr "Serwer metody HTTP"
 
 msgid "Show custom smileys"
-msgstr "Wyświetl niestandardowe emotikony"
+msgstr "Wyświetlanie własnych emotikon"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge: szturcha użytkownika, aby uzyskać jego uwagę"
 
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Uwierzytelnianie Windows Live ID: nie można połączyć"
-
-#, fuzzy
+msgstr "Uwierzytelnianie identyfikatora Windows Live: nie można połączyć"
+
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Uwierzytelnianie Windows Live ID: nie można połączyć"
-
-#, fuzzy, c-format
+msgstr "Uwierzytelnianie identyfikatora Windows Live: nieprawidłowa odpowiedź"
+
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s wysłał do Ciebie wiadomość"
-
-#, fuzzy
+msgstr "Użytkownik %s wysłał szturchnięcie."
+
 msgid "The following users are missing from your addressbook"
-msgstr "Poniżej znajdują się wyniki wyszukiwania"
-
-#, fuzzy, c-format
+msgstr "Brak następujących użytkowników w książce adresowej"
+
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Nieznany błąd (%d)"
+msgstr "Nieznany błąd (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nie można dodać użytkownika"
@@ -5598,13 +5494,11 @@
 msgid "Unknown error (%d)"
 msgstr "Nieznany błąd (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nie można dodać użytkownika"
-
-#, fuzzy
+msgstr "Nie można usunąć użytkownika"
+
 msgid "Mobile message was not sent because it was too long."
-msgstr "Wiadomość nie została wysłana, ponieważ nie jesteś zalogowany."
+msgstr "Wiadomość Mobile nie została wysłana, ponieważ jest za długa."
 
 #, c-format
 msgid ""
@@ -5626,89 +5520,84 @@
 "czasie nastąpi rozłączenie z MSN. Proszę zakończyć wszystkie rozmowy przed "
 "upłynięciem tego czasu.\n"
 "\n"
-"Po zakończeniu konserwacji będzie można zalogować się ponownie."
+"Po ukończeniu konserwacji będzie można zalogować się ponownie."
 msgstr[1] ""
 "Serwer MSN zostanie wyłączony w celach konserwacyjnych za %d minuty. Po tym "
 "czasie nastąpi rozłączenie z MSN. Proszę zakończyć wszystkie rozmowy przed "
 "upłynięciem tego czasu.\n"
 "\n"
-"Po zakończeniu konserwacji będzie można zalogować się ponownie."
+"Po ukończeniu konserwacji będzie można zalogować się ponownie."
 msgstr[2] ""
 "Serwer MSN zostanie wyłączony w celach konserwacyjnych za %d minut. Po tym "
 "czasie nastąpi rozłączenie z MSN. Proszę zakończyć wszystkie rozmowy przed "
 "upłynięciem tego czasu.\n"
 "\n"
-"Po zakończeniu konserwacji będzie można zalogować się ponownie."
+"Po ukończeniu konserwacji będzie można zalogować się ponownie."
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
-
-#, fuzzy
+"Nie wysłano wiadomości, ponieważ system jest niedostępny. Normalnie zdarza "
+"się to, kiedy użytkownik jet zablokowany lub nie istnieje."
+
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "Wiadomość nie została wysłana, ponieważ wysyłamy zbyt szybko:"
-
-#, fuzzy
+msgstr "Nie wysłano wiadomości, ponieważ wiadomości są za szybko wysyłane."
+
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
-
-#, fuzzy
+msgstr "Nie wysłano wiadomości, ponieważ wystąpił nieznany błąd kodowania."
+
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
+msgstr "Nie wysłano wiadomości, ponieważ nastąpił nieznany błąd."
 
 msgid "Writing error"
-msgstr "Błąd zapisu"
+msgstr "Błąd zapisywania"
 
 msgid "Reading error"
-msgstr "Błąd oczytu"
+msgstr "Błąd odczytywania"
 
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Błąd połączenia od %s serwer:\n"
+"Błąd połączenia od serwera %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Nasz protokół nie jest obsługiwany przez serwer."
-
-#, fuzzy
+msgstr "Protokół nie jest obsługiwany przez serwer"
+
 msgid "Error parsing HTTP"
-msgstr "Błąd przetwarzania HTTP."
-
-#, fuzzy
+msgstr "Błąd podczas przetwarzania HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Zalogowano się z innego komputera."
+msgstr "Zalogowano się z innego położenia"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"Serwery MSN są tymczasowo niedostępne. Odczekaj trochę i spróbuj ponownie."
-
-#, fuzzy
+"Serwery MSN są tymczasowo niedostępne. Proszę poczekać i spróbować ponownie."
+
 msgid "The MSN servers are going down temporarily"
-msgstr "Serwery MSN są właśnie tymczasowo wyłączane."
+msgstr "Serwery MSN są tymczasowo wyłączane"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Nie można autoryzować: %s"
+msgstr "Nie można uwierzytelnić: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Twoja lista kontaktów MSN jest tymczasowo niedostępna. Odczekaj i spróbuj "
+"Lista znajomych MSN jest tymczasowo niedostępna. Proszę poczekać i spróbować "
 "ponownie."
 
 msgid "Handshaking"
-msgstr ""
+msgstr "Nawiązywanie połączenia"
 
 msgid "Transferring"
 msgstr "Przesyłanie"
 
 msgid "Starting authentication"
-msgstr "Rozpoczęcie autoryzacji"
+msgstr "Rozpoczynanie uwierzytelniania"
 
 msgid "Getting cookie"
 msgstr "Pobieranie ciasteczka"
@@ -5722,10 +5611,14 @@
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
+"Użytkownik %s zażądał wyświetlenia kamery internetowej, ale te żądanie nie "
+"jest jeszcze obsługiwane."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
+"Użytkownik %s zaprosił do obejrzenia swojej kamery internetowej, ale to nie "
+"jest jeszcze obsługiwane."
 
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
@@ -5737,55 +5630,53 @@
 msgstr "Na obiedzie"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
-"Wiadomość nie została wysłana ponieważ upłynął limit czasu oczekiwania:"
+msgstr "Wiadomość nie została wysłana, ponieważ przekroczono czas oczekiwania:"
 
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
-"Wiadomość nie została wysłana, nie można wysłać będąc w trybie niewidocznym:"
+"Wiadomość nie została wysłana, nie można wysyłać będąc w trybie niewidocznym:"
 
 msgid "Message could not be sent because the user is offline:"
 msgstr ""
-"Wiadomość nie została wysłana, ponieważ użytkownik nie ma włączonego "
-"komunikatora:"
+"Wiadomość nie została wysłana, ponieważ użytkownik jest w trybie offline:"
 
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Wiadomość nie została wysłana, ponieważ wystąpił błąd połączenia:"
 
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Wiadomość nie została wysłana, ponieważ wysyłamy zbyt szybko:"
+msgstr ""
+"Wiadomość nie została wysłana, ponieważ wiadomości są wysyłane za szybko:"
 
 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 ""
-
-#, fuzzy
+"Wiadomość nie została wysłana, ponieważ nie można nawiązać sesji z serwerem. "
+"Prawdopodobnie jest to problem serwera, proszę spróbować ponownie za kilka "
+"minut:"
+
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Wiadomość nie została wysłana, ponieważ wystąpił błąd połączenia:"
+msgstr "Wiadomość nie została wysłana, ponieważ wystąpił błąd centrali:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Dodaj do książki adresowej"
-
-#, fuzzy
+msgstr "Usunąć znajomego z książki adresowej?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Chcesz dodać ten kontakt do swojej listy znajomych?"
-
-#, fuzzy
+msgstr "Usunąć tego znajomego także z książki adresowej?"
+
 msgid "The username specified is invalid."
-msgstr "Nowe formatowanie nie jest poprawne."
+msgstr "Podana nazwa użytkownika jest nieprawidłowa."
 
 #, c-format
 msgid "Friendly name changes too rapidly"
-msgstr "Pseudonim zmienia się zbyt szybko"
+msgstr "Pseudonim jest za często zmieniany"
 
 msgid "This Hotmail account may not be active."
-msgstr "Wybrane konto Hotmail może być nieaktywne."
+msgstr "To konto Hotmail może być nieaktywne."
 
 msgid "Profile URL"
 msgstr "Adres URL profilu"
@@ -5805,7 +5696,7 @@
 
 #, c-format
 msgid "%s is not a valid group."
-msgstr "%s nie jest poprawną nazwą grupy."
+msgstr "%s nie jest prawidłową grupą."
 
 msgid "Unknown error."
 msgstr "Nieznany błąd."
@@ -5814,25 +5705,25 @@
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Nie można zablokować użytkownika na %s (%s)"
+msgstr "Nie można dodać użytkownika na %s (%s)"
 
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Nie można zablokować użytkownika na %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Nie można zablokować użytkownika na %s (%s)"
+msgstr "Nie można zezwolić użytkownikowi na %s (%s)"
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "%s nie został dodany ponieważ Twoja lista znajomych jest pełna."
-
-#, fuzzy, c-format
+msgstr "Nie można dodać użytkownika %s, ponieważ lista znajomych jest pełna."
+
+#, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s nie jest poprawną nazwą grupy."
+msgstr "%s nie jest prawidłowym kontem Passport."
 
 msgid "Service Temporarily Unavailable."
 msgstr "Usługa jest tymczasowo niedostępna."
@@ -5841,38 +5732,93 @@
 msgstr "Nie można zmienić nazwy grupy"
 
 msgid "Unable to delete group"
-msgstr "Nie można skasować grupy"
+msgstr "Nie można usunąć grupy"
 
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s dodał Ciebie do swojej listy znajomych."
+msgstr "Użytkownik %s dodał użytkownika do swojej listy znajomych."
 
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "użytkownik %s usunął Ciebie ze swojej listy znajomych."
+msgstr "użytkownik %s usunął użytkownika ze swojej listy znajomych."
+
+#. 1
+msgid "Angry"
+msgstr "Zagniewany"
+
+#. 2
+msgid "Excited"
+msgstr "Podekscytowany"
+
+#. 3
+msgid "Grumpy"
+msgstr "Zrzędliwy"
+
+#. 4
+msgid "Happy"
+msgstr "Wesoły"
+
+#. 5
+msgid "In Love"
+msgstr "Zakochany"
+
+#. 6
+msgid "Invincible"
+msgstr "Niezwyciężony"
+
+#. 7
+msgid "Sad"
+msgstr "Smutny"
+
+#. 8
+msgid "Hot"
+msgstr "Napalony"
+
+#. 9
+msgid "Sick"
+msgstr "Chory"
+
+#. 10
+msgid "Sleepy"
+msgstr "Śpiący"
 
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Aktualny nastrój"
+msgstr "Obecny nastrój"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Tryby użytkownika"
-
-#, fuzzy
+msgstr "Nowy nastrój"
+
 msgid "Change your Mood"
-msgstr "Zmień hasło"
-
-#, fuzzy
+msgstr "Zmień nastój"
+
 msgid "How do you feel right now?"
-msgstr "Nie ma mnie teraz przy komputerze"
+msgstr "Jak się teraz czujesz?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Podany kod PIN jest nieprawidłowy."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Podany kod PIN ma nieprawidłową długość [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+"Podana data urodzenia jest nieprawidłowa. Poprawna forma to: \"YYYY-MM-DD\"."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Błąd zapisu"
+msgstr "Błąd podczas aktualizacji profilu"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5881,388 +5827,330 @@
 
 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."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "Numer identyfikacyjny"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Sprawdź kod PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Nazwisko"
+msgstr "Wyświetl nazwę"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ukryj numer"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Numer telefonu komórkowego"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil"
+msgstr "Zaktualizuj profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tutaj można zaktualizować profil MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Wyświetl ekran powitalny"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Żaden ekran powitalny nie jest obecnie dostępny"
+
 msgid "About"
-msgstr "O programie %s"
+msgstr "Informacje o"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Zmiana hasła..."
+msgstr "Zmień nastrój..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Zmień hasło..."
+msgstr "Zmień profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Wyświetl _dziennik rozmów"
+msgstr "Wyświetl ekran powitalny..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O programie %s"
+msgstr "Informacje o..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Ta wiadomość jest zbyt duża."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Wysyłany plik jest za duży."
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Nie można połączyć się z serwerem HTTP sieci MXit. Proszę sprawdzić "
+"ustawienia serwera."
+
 msgid "Logging In..."
-msgstr "Logowanie"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Nie można połączyć się z serwerem. Podaj adres serwera z którym chcesz się "
-"połączyć."
-
-#, fuzzy
+msgstr "Logowanie..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Nie można połączyć się z serwerem MXit. Proszę sprawdzić ustawienia serwera."
+
 msgid "Connecting..."
-msgstr "łączenie"
+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 ""
+msgstr "Login MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
-msgstr "Identyfikator"
+msgstr "Pseudonim"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Rejestracja nowego konta XMPP"
-
-#, fuzzy
+msgstr "Zarejestruj nowe konto MXit"
+
 msgid "Please fill in the following fields:"
-msgstr "Proszę wypełnić poniższe pola"
+msgstr "Proszę wypełnić następujące pola:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Błąd podczas łączenia się ze stroną WAP sieci MXit. Proszę spróbować "
+"ponownie później."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit obecnie nie może przetworzyć żądania. Proszę spróbować ponownie później."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Podano błędny kod bezpieczeństwa. Proszę spróbować ponownie później."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Sesja wygasła. Proszę spróbować ponownie później."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Wybrano nieprawidłowy kraj. Proszę spróbować ponownie."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Nie zarejestrowano nazwy użytkownika. Proszę najpierw się zarejestrować."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Nazwa użytkownika jest już zarejestrowana. Proszę wybrać inną nazwę."
+
 msgid "Internal error. Please try again later."
-msgstr "Serwer jest niedostępny, spróbuj później"
+msgstr "Wewnętrzny błąd. Proszę spróbować ponownie później."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie podano kodu bezpieczeństwa"
+
 msgid "Security Code"
-msgstr "Bezpieczeństwo włączone"
+msgstr "Kod bezpieczeństwa"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Wprowadź hasło"
-
-#, fuzzy
+msgstr "Proszę podać kod bezpieczeństwa"
+
 msgid "Your Country"
 msgstr "Kraj"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Preferowany język"
+msgstr "Język"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Wymaga autoryzacji"
+msgstr "Upoważnienie MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Sprawdzenie konta MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Informacje o serwerze"
-
-#, fuzzy
+msgstr "Pobieranie informacji o użytkowniku..."
+
+msgid "Loading menu..."
+msgstr "Wczytywanie menu..."
+
 msgid "Status Message"
-msgstr "Wysyłane wiadomości"
-
-#, fuzzy
+msgstr "Wiadomość stanu"
+
 msgid "Hidden Number"
-msgstr "Drugie imię"
-
-#, fuzzy
+msgstr "Ukryty numer"
+
 msgid "Your Mobile Number..."
-msgstr "Ustaw numer telefonu komórkowego..."
+msgstr "Numer telefonu komórkowego..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Serwer"
-
-#, fuzzy
+msgstr "Serwer WAP"
+
 msgid "Connect via HTTP"
-msgstr "Połącz używając TCP"
+msgstr "Połączenie przez HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Włączenie wyskakującego ekranu powitalnego"
 
 #. 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 "Utracono połączenie z MXit. Proszę połączyć się ponownie."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Błąd wiadomości XMPP"
-
-#, fuzzy
+msgstr "Błąd podczas wysyłania wiadomości"
+
 msgid "Unable to process your request at this time"
-msgstr "Nie można połączyć się z serwerem."
+msgstr "Nie można przetworzyć żądania w tym momencie"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Przekroczono czas oczekiwania na odpowiedź od serwera MXit."
+
 msgid "Successfully Logged In..."
-msgstr "Numer telefonu"
-
-#, fuzzy
+msgstr "Pomyślnie zalogowano..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"Użytkownik %s wysłał zaszyfrowaną wiadomość, która nie jest obsługiwana w "
+"tym kliencie."
+
 msgid "Message Error"
-msgstr "Błąd wiadomości XMPP"
+msgstr "Błąd wiadomości"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie można wykonać przekierowania używając podanego protokołu"
+
+msgid "An internal MXit server error occurred."
+msgstr "Wystąpił wewnętrzny błąd serwera MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Błąd podczas logowania: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Błąd podczas wylogowywania: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Błąd połączenia"
-
-#, fuzzy
+msgstr "Błąd kontaktu"
+
 msgid "Message Sending Error"
-msgstr "Błąd wiadomości XMPP"
-
-#, fuzzy
+msgstr "Błąd podczas wysyłania wiadomości"
+
 msgid "Status Error"
-msgstr "Błąd strumienia"
-
-#, fuzzy
+msgstr "Błąd stanu"
+
 msgid "Mood Error"
-msgstr "Błąd Ikonki"
-
-#, fuzzy
+msgstr "Błąd nastroju"
+
 msgid "Invitation Error"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy
+msgstr "Błąd zaproszenia"
+
 msgid "Contact Removal Error"
-msgstr "Błąd połączenia"
-
-#, fuzzy
+msgstr "Błąd podczas usuwania kontaktu"
+
 msgid "Subscription Error"
-msgstr "Subskrypcja"
-
-#, fuzzy
+msgstr "Błąd subskrypcji"
+
 msgid "Contact Update Error"
-msgstr "Błąd połączenia"
-
-#, fuzzy
+msgstr "Błąd podczas aktualizowania kontaktu"
+
 msgid "File Transfer Error"
-msgstr "Przesyłanie pliku ukończone"
-
-#, fuzzy
+msgstr "Błąd podczas przesyłania plików"
+
 msgid "Cannot create MultiMx room"
-msgstr "Nie można zmienić ksywki"
-
-#, fuzzy
+msgstr "Nie można utworzyć pokoju MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy
+msgstr "Błąd zaproszenia MultiMx"
+
 msgid "Profile Error"
-msgstr "Błąd zapisu"
+msgstr "Błąd profilu"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Odebrano nieprawidłowy pakiet z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x01)."
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Zły"
-
-msgid "Excited"
-msgstr "Podekscytowany"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Grupa"
-
-msgid "Happy"
-msgstr "Wesoły"
-
-msgid "In Love"
-msgstr "Zakochany"
-
-msgid "Invincible"
-msgstr "Niezwyciężony"
-
-msgid "Sad"
-msgstr "Smutny"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Komputer:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Ksywka"
-
-msgid "Sleepy"
-msgstr "Śpiący"
-
-#, fuzzy
+msgstr "Wystąpił błąd połączenia z MXit (poziom odczytu 0x06)"
+
 msgid "Pending"
-msgstr "Wyślij"
-
-#, fuzzy
+msgstr "Oczekujący"
+
 msgid "Invited"
-msgstr "Zaproś"
-
-#, fuzzy
+msgstr "Zaproszeni"
+
 msgid "Rejected"
-msgstr "Odrzuć"
-
-#, fuzzy
+msgstr "Odrzuceni"
+
 msgid "Deleted"
-msgstr "Usuń"
+msgstr "Usunięci"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Reklamy MXit"
+
 msgid "More Information"
-msgstr "Informacje o pracy"
+msgstr "Więcej informacji"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie ma takiego użytkownika: %s"
+
 msgid "User lookup"
-msgstr "Pokoje użytkowników"
-
-#, fuzzy
+msgstr "Wyszukanie użytkowników"
+
 msgid "Reading challenge"
-msgstr "Błąd oczytu"
-
-#, fuzzy
+msgstr "Odczytywanie wyzwania"
+
 msgid "Unexpected challenge length from server"
-msgstr "Nieprawidłowe żądanie od serwera"
+msgstr "Nieoczekiwana długość wyzwania od serwera"
 
 msgid "Logging in"
 msgstr "Logowanie"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "Brak nazwy"
+msgstr "MySpaceIM - nie ustawiono nazwy użytkownika"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "Użytkownik nie posiada nazwy użytkownika MySpace."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-
-#, fuzzy
+msgstr "Ustawić ją teraz (uwaga: NIE MOŻE ZOSTAĆ POTEM ZMIENIONA)?"
+
 msgid "Lost connection with server"
-msgstr ""
-"Utracono połączenie z serwerem\n"
-"%s"
+msgstr "Utracono połączenie z serwerem"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -6271,19 +6159,19 @@
 msgstr "Nowe wiadomości pocztowe"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "Nowe komentarze na blogu"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "Nowe komentarze na profilu"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "Nowe żądania przyjaciół"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "Nowe komentarze zdjęć"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 msgid "IM Friends"
 msgstr "Znajomi"
@@ -6296,16 +6184,21 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"%d znajomy został dodany lub zaktualizowany z serwera (w tym znajomy już "
+"znajdujący się na liście na serwerze)"
 msgstr[1] ""
+"%d znajomych zostało dodanych lub zaktualizowanych z serwera (w tym znajomi "
+"już znajdujący się na liście na serwerze)"
 msgstr[2] ""
-
-#, fuzzy
+"%d znajomych zostało dodany lub zaktualizowanych z serwera (w tym znajomi "
+"już znajdujący się na liście na serwerze)"
+
 msgid "Add contacts from server"
-msgstr "Nieprawidłowa odpowiedź z serwera."
-
-#, fuzzy, c-format
+msgstr "Dodaj kontakty z serwera"
+
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Proces zwrócił kod błędu %d"
+msgstr "Błąd protokołu, kod %d: %s"
 
 #, c-format
 msgid ""
@@ -6313,102 +6206,100 @@
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-
-#, fuzzy
+"%s Hasło ma %zu znaków, czyli więcej niż wynosi maksymalna długość %d. "
+"Proszę skrócić hasło na stronie http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword i spróbować ponownie."
+
 msgid "Incorrect username or password"
-msgstr "Niepoprawny identyfikator lub hasło"
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
 msgid "MySpaceIM Error"
-msgstr ""
-
-#, fuzzy
+msgstr "Błąd MySpaceIM"
+
 msgid "Invalid input condition"
-msgstr "Finalizowanie połączenia"
-
-#, fuzzy
+msgstr "Nieprawidłowy warunek wejścia"
+
 msgid "Failed to add buddy"
-msgstr "Nie można przyłączyć znajomego do konferencji"
-
-#, fuzzy
+msgstr "Dodanie znajomego nie powiodło się"
+
 msgid "'addbuddy' command failed."
-msgstr "Wczytaj listę kontaktów z pliku..."
+msgstr "Polecenie \"addbuddy\" nie powiodło się."
 
 msgid "persist command failed"
-msgstr ""
-
-#, fuzzy
+msgstr "Polecenie \"persist\" nie powiodło się"
+
 msgid "Failed to remove buddy"
-msgstr "Nie można przyłączyć znajomego do konferencji"
+msgstr "Usunięcie znajomego nie powiodło się"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Polecenie \"delbuddy\" nie powiodło się"
 
 msgid "blocklist command failed"
-msgstr ""
-
-#, fuzzy
+msgstr "Polecenie \"blocklist\" nie powiodło się"
+
 msgid "Missing Cipher"
-msgstr "Szyfr"
+msgstr "Brak szyfru"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Nie można odnaleźć szyfru RC4"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Proszę zaktualizować do biblioteki libpurple z obsługą RC4 (>= 2.0.1). "
+"Wtyczka MySpaceIM nie zostanie wczytana."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "Dodaj przyjaciół z witryny MySpace.com"
+
 msgid "Importing friends failed"
-msgstr "Ładowanie wtyczki zakończone niepowodzeniem"
+msgstr "Zaimportowanie przyjaciół nie powiodło się"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "Znajdź ludzi..."
+msgstr "Znajdź osoby..."
 
 msgid "Change IM name..."
-msgstr "Zmień nazwę użytkownika..."
+msgstr "Zmień nazwę komunikatora..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "obsługa adresów URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
+"Nie odnaleziono odpowiedniego konta MySpaceIM do otwarcia tego adresu URL "
+"myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Proszę włączyć odpowiednie konto MySpaceIM i spróbować ponowne."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Wyświetl nazwę ekranu w tekście stanu"
 
 msgid "Show headline in status text"
-msgstr ""
-
-#, fuzzy
+msgstr "Wyświetl nagłówek w tekście stanu"
+
 msgid "Send emoticons"
-msgstr "Opcje dźwięku"
+msgstr "Wyślij emotikony"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Rozdzielczość ekranu (punktów na cal)"
 
 msgid "Base font size (points)"
-msgstr ""
+msgstr "Podstawowy rozmiar czcionki (punkty)"
 
 msgid "User"
 msgstr "Użytkownik"
 
-#, fuzzy
 msgid "Headline"
-msgstr "_Odrzuć"
+msgstr "Nagłówek"
 
 msgid "Song"
 msgstr "Utwór"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "Razem przyjaciół"
 
 msgid "Client Version"
 msgstr "Wersja klienta"
@@ -6418,35 +6309,34 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
-
-#, fuzzy
+"Wystąpił błąd podczas próby ustawienia nazwy użytkownika. Proszę spróbować "
+"ponownie lub odwiedzić stronę http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username, aby ustawić nazwę użytkownika."
+
 msgid "MySpaceIM - Username Available"
-msgstr "Usługa niedostępna"
+msgstr "MySpaceIM - nazwa użytkownika jest dostępna"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "Ta nazwa użytkownika jest dostępna. Ustawić ją?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "PO USTAWIENIU NIE MOŻNA TEGO ZMIENIĆ"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - proszę ustawić nazwę użytkownika"
+
 msgid "This username is unavailable."
-msgstr "Ten temat nie zawiera żadnych emotikonek."
-
-#, fuzzy
+msgstr "Ta nazwa użytkownika jest niedostępna."
+
 msgid "Please try another username:"
-msgstr "Wpisz nową nazwę dla %s"
+msgstr "Proszę spróbować inną nazwę użytkownika:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Brak nazwy"
+msgstr "Nie ustawiono nazwy użytkownika"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Proszę podać nazwę użytkownika, aby sprawdzić jej dostępność:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6455,120 +6345,117 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Wstrząśnij"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s wstrząsnął tobą."
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Wstrząsanie użytkownikiem %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Uderz"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Użytkownik zablokował możliwość kontaktu"
+msgstr "Użytkownik %s uderzył cię."
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "Uderzanie użytkownika %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Temat"
-
-#, fuzzy, c-format
+msgstr "Podpal"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Użytkownik zablokował możliwość kontaktu"
+msgstr "Użytkownik %s podpalił cię."
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Podpalanie użytkownika %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Pocałuj"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s ucałował cię."
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Całowanie użytkownika %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Przytul"
+
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s przytulił cię."
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Przytulanie użytkownika %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Śpiący"
-
-#, fuzzy, c-format
+msgstr "Spoliczkuj"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s spoliczkował cię."
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Policzkowanie użytkownika %s..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Kogut"
-
-#, fuzzy, c-format
+msgstr "Kopnij"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s jest nieobecny."
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s kopnął cię."
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Wyszukiwanie %s"
+msgstr "Kopanie użytkownika %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 ""
-
-#, fuzzy, c-format
+msgstr "Piątka"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s przybił piątkę."
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Przybijanie piątki użytkownikowi %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 ""
-
-#, fuzzy, c-format
+msgstr "Zrób żart"
+
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s zażartował z ciebie."
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Żartowanie z użytkownika %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6578,48 +6465,48 @@
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Pokaż język"
+
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s pokazał ci język."
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Pokazywanie języka użytkownikowi %s..."
 
 msgid "Required parameters not passed in"
-msgstr "Wymagane parametry nie zostały podane"
+msgstr "Wymagane parametry nie zostały przekazane"
 
 msgid "Unable to write to network"
-msgstr "Nie można zapisywać do sieci"
+msgstr "Nie można zapisać do sieci"
 
 msgid "Unable to read from network"
-msgstr "Nie można odczytywać z sieci"
+msgstr "Nie można odczytać z sieci"
 
 msgid "Error communicating with server"
-msgstr "Błąd komunikacji z serwerem"
+msgstr "Błąd podczas komunikowania się z serwerem"
 
 msgid "Conference not found"
-msgstr "Konferencja nie została znaleziona"
+msgstr "Nie odnaleziono konferencji"
 
 msgid "Conference does not exist"
 msgstr "Konferencja nie istnieje"
 
 msgid "A folder with that name already exists"
-msgstr "Folder o takiej nazwie już istnieje"
+msgstr "Katalog o tej nazwie już istnieje"
 
 msgid "Not supported"
-msgstr "Nie obsługiwane"
+msgstr "Nieobsługiwane"
 
 msgid "Password has expired"
-msgstr "Upłynął termin ważności hasła"
+msgstr "Hasło wygasło"
 
 msgid "Incorrect password"
 msgstr "Niepoprawne hasło"
 
 msgid "User not found"
-msgstr "Użytkownik nie został znaleziony"
+msgstr "Nie odnaleziono użytkownika"
 
 msgid "Account has been disabled"
 msgstr "Konto zostało wyłączone"
@@ -6628,78 +6515,72 @@
 msgstr "Serwer nie mógł uzyskać dostępu do katalogu"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "Administrator systemu wyłączył możliwość wykonywania tej operacji"
+msgstr "Administrator systemu wyłączył te działanie"
 
 msgid "The server is unavailable; try again later"
-msgstr "Serwer jest niedostępny, spróbuj później"
+msgstr "Serwer jest niedostępny, proszę spróbować później"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Nie można dodać dwa razy kontaktu to tego samego folderu"
+msgstr "Nie można dodać kontaktu dwa razy do tego samego katalogu"
 
 msgid "Cannot add yourself"
-msgstr "Nie można dodać siebie samego"
+msgstr "Nie można dodać siebie"
 
 msgid "Master archive is misconfigured"
-msgstr "Główne archiwum nie jest skonfigurowane"
+msgstr "Główne archiwum jest błędnie skonfigurowane"
 
 msgid "Could not recognize the host of the username you entered"
-msgstr ""
+msgstr "Nie można rozpoznać komputera podanej nazwy użytkownika"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr ""
-"Konto zostało zablokowane ze względu na zbyt dużą ilość prób zalogowania z "
-"błędnym hasłem"
+msgstr "Konto zostało wyłączone, ponieważ podano za dużo niepoprawnych haseł"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Nie można dodać do konwersacji dwa razy tej samej osoby"
+msgstr "Nie można dodać tej samej osoby dwa razy do rozmowy"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Osiągnięto ograniczenie maksymalnej liczby kontaktów"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "Podano niewłaściwą nazwę użytkownika"
+msgstr "Podano niepoprawną nazwę użytkownika"
 
 msgid "An error occurred while updating the directory"
-msgstr "Nastąpił błąd podczas aktualizacji katalogu"
+msgstr "Wystąpił błąd podczas aktualizowania katalogu"
 
 msgid "Incompatible protocol version"
-msgstr "Niekompatybilna wersja protokołu"
+msgstr "Niezgodna wersja protokołu"
 
 msgid "The user has blocked you"
-msgstr "Użytkownik zablokował możliwość kontaktu"
+msgstr "Użytkownik zablokował użytkownika"
 
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 "Wersja demonstracyjna nie pozwala na zalogowanie więcej niż dziesięciu "
-"użytkowników za jednym razem"
+"użytkowników jednocześnie"
 
 msgid "The user is either offline or you are blocked"
-msgstr ""
-"Użytkownik jest rozłączony, lub ma włączoną blokadę używanego przez ciebie "
-"konta"
+msgstr "Użytkownik jest w trybie offline lu zablokował użytkownika"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Nieznany błąd: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Nie można zbanować użytkownika %s"
+msgstr "Nie można się zalogować: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Nie można wysłać wiadomości. Nie można pobrać szczegółów dla użytkownika (%"
-"s)."
+"Nie można wysłać wiadomości. Nie można uzyskać szczegółów użytkownika (%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Nie można dodać %s do listy znajomych (%s)."
+msgstr "Nie można dodać użytkownika %s do listy znajomych (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
@@ -6724,20 +6605,20 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Nie można przenieść użytkownika %s do folderu %s w liście dostępnej na "
-"serwerze. Błąd podczas tworzenia folderu (%s)."
+"Nie można przenieść użytkownika %s do katalogu %s na liście na serwerze. "
+"Błąd podczas tworzenia katalogu (%s)."
 
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Nie można dodać %s do listy znajomych. Wystąpił błąd podczas tworzenia "
-"folderu na liście po stronie serwera (%s)."
+"Nie można dodać użytkownika %s do listy znajomych. Błąd podczas tworzenia "
+"katalogu na liście na serwerze (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "Nie można pobrać szczegółów dla użytkownika %s (%s)."
+msgstr "Nie można uzyskać szczegółów użytkownika %s (%s)."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
@@ -6745,36 +6626,35 @@
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Nie można dodać %s do listy zablokowanych (%s)."
+msgstr "Nie można dodać użytkownika %s do listy zablokowanych (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Nie można dodać %s do listy dopuszczonych (%s)."
+msgstr "Nie można dodać użytkownika %s do listy dopuszczonych (%s)."
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Nie można usunąć %s z listy prywatnej (%s)."
+msgstr "Nie można usunąć użytkownika %s z listy prywatnej (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Nie można zmienić ustawień prywatności po stronie serwera (%s)."
+msgstr "Nie można zmienić ustawień prywatności na serwerze (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nie można utworzyć konferencji (%s)."
 
 msgid "Error communicating with server. Closing connection."
-msgstr "Błąd komunikacji z serwerem. Zamykanie połączenia."
+msgstr "Błąd podczas komunikowania się z serwerem. Zamykanie połączenia."
 
 msgid "Telephone Number"
 msgstr "Numer telefonu"
 
-#, fuzzy
 msgid "Personal Title"
-msgstr "Telefon komórkowy"
+msgstr "Tytuł osoby"
 
 msgid "Mailstop"
-msgstr ""
+msgstr "Przegródka pocztowa"
 
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
@@ -6790,7 +6670,7 @@
 
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "Konferencja GrupWise %d"
+msgstr "Konferencja GroupWise %d"
 
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
@@ -6800,10 +6680,10 @@
 
 #, c-format
 msgid "%s has been invited to this conversation."
-msgstr "%s został zaproszony do tej konwersacji."
+msgstr "Użytkownik %s został zaproszony do tej rozmowy."
 
 msgid "Invitation to Conversation"
-msgstr "Zaproszenie do konwersacji "
+msgstr "Zaproszenie do rozmowy"
 
 #, c-format
 msgid ""
@@ -6816,20 +6696,19 @@
 "Wysłane: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Czy chcesz przyłączyć się do konwersacji?"
+msgstr "Dołączyć do rozmowy?"
 
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"%s zdaje się być rozłączony i nie odebrał wiadomości którą właśnie wysłano."
-
-#, fuzzy
+"%s jest w trybie offline i nie odebrał wiadomości, którą właśnie wysłano."
+
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
-"Nie można połączyć się z serwerem. Podaj adres serwera z którym chcesz się "
+"Nie można połączyć się z serwerem. Proszę podać adres serwera, z którym się "
 "połączyć."
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6846,7 +6725,7 @@
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Wtyczka obsługi protokołu Novell GroupWise Messenger"
+msgstr "Wtyczka protokołu Novell GroupWise Messenger"
 
 msgid "Server address"
 msgstr "Adres serwera"
@@ -6855,40 +6734,35 @@
 msgstr "Port serwera"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Nieprawidłowa odpowiedź z serwera HTTP."
+msgstr "Odebrano nieoczekiwaną odpowiedź z adresu %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 ""
-"Zbyt częste próby łączenia i rozłączania. Zaczekaj dziesięć minut i spróbuj "
-"ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
-"wydłuży."
+"Za częste próby połączenia i rozłączenia. Proszę poczekać dziesięć minut i "
+"spróbować ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania "
+"jeszcze się wydłuży."
 
 #. 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 ""
-"Błąd tłumaczenia nazwy %s na adres IP: \n"
-"%s"
+msgstr "Błąd podczas żądania adresu %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
+msgstr "AOL nie umożliwia uwierzytelnienia nazwy użytkownika w tym miejscu"
+
 msgid "Could not join chat room"
-msgstr "Nie można połączyć"
-
-#, fuzzy
+msgstr "Nie można dołączyć do pokoju konferencji"
+
 msgid "Invalid chat room name"
-msgstr "Niepoprawna nazwa pokoju"
-
-#, fuzzy
+msgstr "Nieprawidłowa nazwa pokoju konferencji"
+
 msgid "Received invalid data on connection with server"
-msgstr "Nie udało się połączyć z serwerem."
+msgstr "Odebrano nieprawidłowe dane na połączeniu z serwerem"
 
 #. *< type
 #. *< ui_requirement
@@ -6904,7 +6778,7 @@
 msgstr "Wtyczka protokołu AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "Nazwa użytkownika ICQ..."
 
 #. *< type
 #. *< ui_requirement
@@ -6923,79 +6797,74 @@
 msgstr "Kodowanie"
 
 msgid "The remote user has closed the connection."
-msgstr "Rozmówca zamknął połączenie."
-
-#, fuzzy
+msgstr "Zdalny użytkownik zamknął połączenie."
+
 msgid "The remote user has declined your request."
-msgstr "Rozmówca zamknął połączenie."
-
-#, fuzzy, c-format
+msgstr "Zdalny użytkownik odmówił żądania."
+
+#, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
-"Utracono połączenie z serwerem:\n"
-"%s"
+msgstr "Utracono połączenie ze zdalnym użytkownikiem:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr ""
-
-#, fuzzy
+msgstr "Odebrano nieprawidłowe dane na połączeniu ze zdalnym użytkownikiem."
+
 msgid "Unable to establish a connection with the remote user."
-msgstr ""
-"Nie można nawiązać połączenia z serwerem:\n"
-"%s"
+msgstr "Nie można nawiązać połączenia ze zdalnym użytkownikiem."
 
 msgid "Direct IM established"
-msgstr "Ustanowiono bezpośrednie połączenie"
+msgstr "Nawiązano bezpośrednie połączenie"
 
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
+"Użytkownik %s próbował wysłać plik %s, ale tylko pliki do %s są dozwolone "
+"przez bezpośrednie połączenie. Proszę spróbować przesyłania plików.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgstr "Plik %s ma %s, czyli więcej niż maksymalny rozmiar %s."
 
 msgid "Invalid error"
-msgstr "Niepoprawny błąd"
+msgstr "Nieprawidłowy błąd"
 
 msgid "Invalid SNAC"
-msgstr "Niepoprawne SNAC"
+msgstr "Nieprawidłowe SNAC"
 
 msgid "Rate to host"
-msgstr ""
-
-#, fuzzy
+msgstr "Prędkość do serwera"
+
 msgid "Rate to client"
-msgstr "Ostatni znany klient"
+msgstr "Prędkość do klienta"
 
 msgid "Service unavailable"
-msgstr "Usługa niedostępna"
+msgstr "Usługa jest niedostępna"
 
 msgid "Service not defined"
-msgstr "Usługa nie została zdefiniowana"
+msgstr "Usługa nie została określona"
 
 msgid "Obsolete SNAC"
 msgstr "Przestarzałe SNAC"
 
 msgid "Not supported by host"
-msgstr "Nie obsługiwane przez serwer"
+msgstr "Nieobsługiwane przez serwer"
 
 msgid "Not supported by client"
-msgstr "Nie obsługiwane przez klienta"
+msgstr "Nieobsługiwane przez klienta"
 
 msgid "Refused by client"
-msgstr "Odmowa klienta"
+msgstr "Klient odmówił"
 
 msgid "Reply too big"
-msgstr "Odpowiedź zbyt duża"
+msgstr "Odpowiedź jest za duża"
 
 msgid "Responses lost"
-msgstr "Zgubiono odpowiedzi"
+msgstr "Utracono odpowiedzi"
 
 msgid "Request denied"
-msgstr "Odmowa realizacji żądania"
+msgstr "Odmówiono żądanie"
 
 msgid "Busted SNAC payload"
 msgstr "Uszkodzona treść SNAC"
@@ -7007,13 +6876,13 @@
 msgstr "W lokalnej liście zezwoleń/blokad"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
 
 msgid "User temporarily unavailable"
-msgstr "Użytkownik tymczasowo niedostępny"
+msgstr "Użytkownik jest tymczasowo niedostępny"
 
 msgid "No match"
 msgstr "Nie pasuje"
@@ -7031,46 +6900,42 @@
 msgstr "Niedostępne w AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Nie można odebrać wiadomości z powodu kontroli rodzicielskiej"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie można wysłać wiadomości SMS bez zaakceptowania warunków"
+
 msgid "Cannot send SMS"
-msgstr "Nie można wysłać pliku"
+msgstr "Nie można wysłać wiadomości SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Nie można wysłać katalogu."
+msgstr "Nie można wysłać wiadomości SMS do tego kraju"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Nie można wysłać wiadomości SMS do nieznanego kraju"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Konta botów nie mogą inicjować wiadomości"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Konto bota nie może wysłać wiadomości do tego użytkownika"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Konto bota osiągnęło ograniczenie liczby wiadomości"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Konto bota osiągnęło dzienne ograniczenie liczby wiadomości"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Konto bota osiągnęło miesięczne ograniczenie liczby wiadomości"
+
 msgid "Unable to receive offline messages"
-msgstr "Wysłanie wiadomości nie powiodło się."
-
-#, fuzzy
+msgstr "Nie można odebrać wiadomości w trybie offline"
+
 msgid "Offline message store full"
-msgstr "Nieprzeczytane wiadomości"
+msgstr "Przechowalnia wiadomości w trybie offline jest pełna"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7078,20 +6943,21 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(Wystąpił błąd podczas odbierania tej wiadomości. Znajomy, z którym "
-"rozmawiasz używa prawdopodobnie innego kodowania niż przewidywane. Jeśli "
-"wiesz, jakiego kodowania używa, możesz je sprecyzować w opcjach swojego "
-"konta AIM/ICQ.)"
+"(Wystąpił błąd podczas odbierania tej wiadomości. Znajomy używa "
+"prawdopodobnie innego kodowania niż oczekiwane. Jeśli wiadomo, jakiego "
+"kodowania używa, można je podać w zaawansowanych opcjach konta AIM/ICQ)."
 
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(Wystąpił błąd podczas odbierania tej wiadomości. Używane jest inne "
+"kodowanie niż użytkownika %s, lub użytkownik %s posiada klienta z błędami)."
 
 #. Label
 msgid "Buddy Icon"
-msgstr "Ikona użytkownika"
+msgstr "Ikona znajomego"
 
 msgid "Voice"
 msgstr "Głos"
@@ -7127,25 +6993,25 @@
 msgstr "Serwer przekazujący ICQ"
 
 msgid "Old ICQ UTF8"
-msgstr "Stare ICQ UTF8"
+msgstr "Poprzednie ICQ UTF-8"
 
 msgid "Trillian Encryption"
-msgstr "Szyfrowanie Trillian"
+msgstr "Szyfrowanie programu Trillian"
 
 msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgstr "ICQ UTF-8"
 
 msgid "Hiptop"
 msgstr "Hiptop"
 
 msgid "Security Enabled"
-msgstr "Bezpieczeństwo włączone"
+msgstr "Bezpieczeństwo jest włączone"
 
 msgid "Video Chat"
 msgstr "Konferencja wideo"
 
 msgid "iChat AV"
-msgstr "iCzat AV"
+msgstr "iChat AV"
 
 msgid "Live Video"
 msgstr "Wideo na żywo"
@@ -7153,9 +7019,8 @@
 msgid "Camera"
 msgstr "Aparat"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Identyfikator"
+msgstr "Współdzielenie ekranu"
 
 msgid "Free For Chat"
 msgstr "Chciałby pogadać"
@@ -7166,9 +7031,8 @@
 msgid "Occupied"
 msgstr "Zajęty"
 
-#, fuzzy
 msgid "Web Aware"
-msgstr "Strona WWW"
+msgstr "Na stronie WWW"
 
 msgid "Invisible"
 msgstr "Niewidoczny"
@@ -7180,28 +7044,25 @@
 msgstr "Poziom ostrzeżenia"
 
 msgid "Buddy Comment"
-msgstr "Komentarz dot. znajomego"
-
-#, fuzzy, c-format
+msgstr "Komentarz o znajomym"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Nie udało się połączyć z serwerem BOS:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Nie można połączyć się z serwerem uwierzytelniania: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Nie można połączyć się z serwerem."
-
-#, fuzzy
+msgstr "Nie można połączyć się z serwerem BOS: %s"
+
 msgid "Username sent"
-msgstr "Brak nazwy"
+msgstr "Wysłano nazwę użytkownika"
 
 msgid "Connection established, cookie sent"
-msgstr "Ustanowiono połączenie, ciasteczko wysłane"
+msgstr "Nawiązano połączenie, wysłano ciasteczko"
 
 #. TODO: Don't call this with ssi
 msgid "Finalizing connection"
-msgstr "Finalizowanie połączenia"
+msgstr "Dokańczanie połączenia"
 
 #, c-format
 msgid ""
@@ -7209,90 +7070,87 @@
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-
-#, fuzzy, c-format
+"Nie można zalogować jako %s, ponieważ nazwa użytkownika jest nieprawidłowa. "
+"Nazwy użytkowników muszą być prawidłowymi adresami e-mail lub zaczynać się "
+"od litery i zawierać tylko litery, liczby i spacje lub zawierać tylko liczby."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu na "
-"TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %s."
+"Połączenie może zostać wkrótce zerwane. Jeśli tak się stanie, proszę "
+"odwiedzić %s, aby uzyskać aktualizacje."
 
 msgid "Unable to get a valid AIM login hash."
-msgstr ""
-"Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania do AIM."
+msgstr "Nie można uzyskać prawidłowej funkcji mieszającej logowania AIM."
 
 msgid "Unable to get a valid login hash."
-msgstr "Program Pidgin nie był w stanie otrzymać poprawnego klucza logowania."
+msgstr "Nie można uzyskać prawidłowej funkcji mieszającej logowania."
 
 msgid "Received authorization"
-msgstr "Otrzymano autoryzację"
+msgstr "Otrzymano upoważnienie"
 
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Użytkownik nie istnieje"
+msgstr "Nazwa użytkownika nie istnieje"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Twoje konto jest w tej chwili zawieszone."
+msgstr "Konto jest obecnie zawieszone"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usługa AOL Instant Messenger jest tymczasowo niedostępna."
 
 #. 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 ""
-"Zbyt częste próby łączenia i rozłączania. Zaczekaj dziesięć minut i spróbuj "
-"ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
-"wydłuży."
+"Za częste próby połączenia i rozłączenia za pomocą nazwy użytkownika. Proszę "
+"poczekać dziesięć minut i spróbować ponownie. Jeśli próba zostanie podjęta "
+"teraz, czas oczekiwania jeszcze się wydłuży."
 
 #. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Wersja klienta, której używasz, jest zbyt stara. Uaktualnij ją z %s."
+msgstr "Używana wersja klienta jest za stara. Proszę zaktualizować na %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Zbyt częste próby łączenia i rozłączania. Zaczekaj dziesięć minut i spróbuj "
-"ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
-"wydłuży."
-
-#, fuzzy
+"Za częste próby połączenia i rozłączenia za pomocą adresu IP. Proszę "
+"poczekać minutę i spróbować ponownie. Jeśli próba zostanie podjęta teraz, "
+"czas oczekiwania jeszcze się wydłuży."
+
 msgid "The SecurID key entered is invalid"
-msgstr "Nowe formatowanie nie jest poprawne."
+msgstr "Podany klucz SecurID jest nieprawidłowy"
 
 msgid "Enter SecurID"
-msgstr ""
+msgstr "Proszę podać klucz SecurID"
 
 msgid "Enter the 6 digit number from the digital display."
-msgstr ""
+msgstr "Proszę podać sześciocyfrowy numer z ekranu cyfrowego."
 
 msgid "Password sent"
-msgstr "Hasło wysłane"
+msgstr "Wysłano hasło"
 
 msgid "Unable to initialize connection"
 msgstr "Nie można zainicjować połączenia"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Proszę o autoryzację abym mógł Ciebie dodać do swojej listy znajomych."
+msgstr "Prośba o upoważnienie, aby dodać użytkownika do listy znajomych."
 
 msgid "No reason given."
 msgstr "Nie podano powodu."
 
 msgid "Authorization Denied Message:"
-msgstr "Komunikat o odmowie autoryzacji:"
+msgstr "Wiadomość odmowy upoważnienia:"
 
 #, c-format
 msgid ""
@@ -7300,17 +7158,17 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"Użytkownik %u odrzucił prośbę o dodanie go do listy znajomych z "
-"następującego powodu:\n"
+"Użytkownik %u odrzucił żądanie dodania go do listy znajomych z następującego "
+"powodu:\n"
 "%s"
 
 msgid "ICQ authorization denied."
-msgstr "Odmowa autoryzacji ICQ."
+msgstr "Odmowa upoważnienia ICQ."
 
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "Użytkownik %u zaakceptował prośbę o dodanie go do listy znajomych."
+msgstr "Użytkownik %u zaakceptował żądanie dodania go do listy znajomych."
 
 #, c-format
 msgid ""
@@ -7319,7 +7177,7 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Otrzymano wiadomość specjalną\n"
+"Odebrano wiadomość specjalną\n"
 "\n"
 "Od: %s [%s]\n"
 "%s"
@@ -7331,7 +7189,7 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Otrzymano stronę ICQ\n"
+"Odebrano stronę ICQ\n"
 "\n"
 "Od: %s [%s]\n"
 "%s"
@@ -7343,37 +7201,40 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"Otrzymano email ICQ od %s [%s]\n"
+"Odebrano wiadomość e-mail ICQ od %s [%s]\n"
 "\n"
 "Treść wiadomości:\n"
 "%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "Użytkownik ICQ %u przysłał kontakt: %s (%s)"
+msgstr "Użytkownik ICQ %u wysłał znajomego: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Chcesz dodać ten kontakt do swojej listy znajomych?"
+msgstr "Dodać tego znajomego do listy?"
 
 msgid "_Add"
-msgstr "_Dodaj"
+msgstr "Dod_aj"
 
 msgid "_Decline"
-msgstr "_Odrzuć"
+msgstr "O_drzuć"
 
 #, 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] "Pominięto %hu wiadomość od %s ponieważ była ona niepoprawna."
-msgstr[1] "Pominięto %hu wiadomości od %s ponieważ były one niepoprawna."
-msgstr[2] "Pominięto %hu wiadomości od %s ponieważ były one niepoprawna."
+msgstr[0] ""
+"Pominięto %hu wiadomość od użytkownika %s, ponieważ była nieprawidłowa."
+msgstr[1] ""
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ były nieprawidłowe."
+msgstr[2] ""
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ były nieprawidłowe."
 
 #, 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] "Pominięto %hu wiadomość od %s ponieważ była ona zbyt duża."
-msgstr[1] "Pominięto %hu wiadomości od %s ponieważ były one zbyt duże."
-msgstr[2] "Pominięto %hu wiadomości od %s ponieważ były one zbyt duże."
+msgstr[0] "Pominięto %hu wiadomość od użytkownika %s, ponieważ była za duża."
+msgstr[1] "Pominięto %hu wiadomości od użytkownika %s, ponieważ były za duże."
+msgstr[2] "Pominięto %hu wiadomości od użytkownika %s, ponieważ były za duże."
 
 #, c-format
 msgid ""
@@ -7381,57 +7242,70 @@
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"Pominięto %hu wiadomość od %s ponieważ przekroczono limit szybkości."
+"Pominięto %hu wiadomość od użytkownika %s, ponieważ przekroczono "
+"ograniczenie prędkości."
 msgstr[1] ""
-"Pominięto %hu wiadomości od %s ponieważ przekroczono limit szybkości."
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ przekroczono "
+"ograniczenie prędkości."
 msgstr[2] ""
-"Pominięto %hu wiadomości od %s ponieważ przekroczono limit szybkości."
-
-#, fuzzy, c-format
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ przekroczono "
+"ograniczenie prędkości."
+
+#, 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] "Pominięto %hu wiadomość od %s ponieważ była ona zbyt okrutna."
-msgstr[1] "Pominięto %hu wiadomości od %s ponieważ były one zbyt okrutna."
-msgstr[2] "Pominięto %hu wiadomości od %s ponieważ były one zbyt okrutna."
-
-#, fuzzy, c-format
+msgstr[0] ""
+"Pominięto %hu wiadomość od użytkownika %s, ponieważ ma on za wysoki poziom "
+"ostrzeżenia."
+msgstr[1] ""
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ ma on za wysoki poziom "
+"ostrzeżenia."
+msgstr[2] ""
+"Pominięto %hu wiadomości od użytkownika %s, ponieważ ma on za wysoki poziom "
+"ostrzeżenia."
+
+#, 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] "Pominięto %hu wiadomość od %s ponieważ jesteś zbyt okrutna/okrutny."
+msgstr[0] ""
+"Pominięto %hu wiadomość od użytkownika %s z powodu za wysokiego poziomu "
+"ostrzeżenia."
 msgstr[1] ""
-"Pominięto %hu wiadomości od %s ponieważ jesteś zbyt okrutna/okrutny."
+"Pominięto %hu wiadomości od użytkownika %s z powodu za wysokiego poziomu "
+"ostrzeżenia."
 msgstr[2] ""
-"Pominięto %hu wiadomości od %s ponieważ jesteś zbyt okrutna/okrutny."
+"Pominięto %hu wiadomości od użytkownika %s z powodu za wysokiego poziomu "
+"ostrzeżenia."
 
 #, 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] "Pominięto %hu wiadomość od %s z nieznanych powodów."
-msgstr[1] "Pominięto %hu wiadomości od %s z nieznanych powodów."
-msgstr[2] "Pominięto %hu wiadomości od %s z nieznanych powodów."
-
-#, fuzzy, c-format
+msgstr[0] "Pominięto %hu wiadomość od użytkownika %s z nieznanego powodu."
+msgstr[1] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
+msgstr[2] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
+
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Nie można wysłać wiadomości (%s)."
+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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nie można wysłać wiadomości do %s:"
-
-#, fuzzy, c-format
+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:"
+msgstr "Nie można wysłać wiadomości do %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
-msgstr "Informacje o użytkowniku nie są dostępne: %s"
+msgstr "Informacje o użytkowniku są niedostępne: %s"
 
 msgid "Unknown reason."
 msgstr "Nieznany powód."
@@ -7440,10 +7314,10 @@
 msgstr "Zalogowany od"
 
 msgid "Member Since"
-msgstr "Zapisany od"
+msgstr "Członek od"
 
 msgid "Capabilities"
-msgstr "Funkcje klienta"
+msgstr "Możliwości"
 
 msgid "Your AIM connection may be lost."
 msgstr "Połączenie AIM może zostać utracone."
@@ -7454,25 +7328,24 @@
 "characters.]"
 msgstr ""
 "[Nie można wyświetlić wiadomości od tego użytkownika, ponieważ zawiera ona "
-"niewłaściwe znaki.]"
-
-#, fuzzy
+"nieprawidłowe znaki]."
+
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"Ostatnia akcja nie została podjęta, ponieważ przekroczono limit prędkości "
-"wysyłania. Zaczekaj 10 sekund i spróbuj ponownie."
+"Ostatnia czynność nie została wykonana, ponieważ przekroczono ograniczenie "
+"prędkości. Proszę poczekać dziesięć sekund i spróbować ponownie.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Nastąpiło rozłączenie z pokojem konferencji %s."
+msgstr "Rozłączono z pokoju konferencji %s."
 
 msgid "Mobile Phone"
 msgstr "Telefon komórkowy"
 
 msgid "Personal Web Page"
-msgstr "Prywatna strona WWW"
+msgstr "Osobista strona WWW"
 
 #. aim_userinfo_t
 #. strip_html_tags
@@ -7497,89 +7370,89 @@
 msgid "Pop-Up Message"
 msgstr "Wiadomość wyskakująca"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "Wystąpił następujący błąd podczas wczytywania %s: %s"
-msgstr[1] "Wystąpił następujący błąd podczas wczytywania %s: %s"
-msgstr[2] "Wystąpił następujący błąd podczas wczytywania %s: %s"
+msgstr[0] "Następująca nazwa użytkownika jest powiązana z %s"
+msgstr[1] "Następujące nazwy użytkowników są powiązane z %s"
+msgstr[2] "Następujące nazwy użytkowników są powiązane z %s"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Nie znaleziono żadnych wyników dla adresu email %s"
+msgstr "Nie odnaleziono żadnych wyników dla adresu e-mail %s"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Powinnaś/powinieneś otrzymać email proszący o potwierdzenie %s."
+msgstr "Powinno się otrzymać wiadomość e-mail proszącą o potwierdzenie %s."
 
 msgid "Account Confirmation Requested"
-msgstr "Wymagane potwierdzenie konta"
-
-#, fuzzy, c-format
+msgstr "Potwierdzenie konta jest wymagane"
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"Błąd 0x%04x: Nie można sformatować identyfikatora, ponieważ nowa forma różni "
-"się od oryginału."
-
-#, fuzzy, c-format
+"Błąd 0x%04x: nie można sformatować nazwy użytkownika, ponieważ żądana nazwa "
+"różni się od oryginału."
+
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"Błąd 0x%04x: Nie można sformatować identyfikatora, ponieważ jest on "
-"niepoprawny."
-
-#, fuzzy, c-format
+"Błąd 0x%04x: nie można sformatować nazwy użytkownika, ponieważ jest "
+"nieprawidłowa."
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"Błąd 0x%04x: Nie można sformatować identyfikatora, ponieważ nowa forma jest "
-"zbyt długa."
-
-#, fuzzy, c-format
+"Błąd 0x%04x: nie można sformatować nazwy użytkownika, ponieważ żądana nazwa "
+"jest za długa."
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ w kolejce czeka inna "
-"prośba dla tego samego identyfikatora."
-
-#, fuzzy, c-format
+"Błąd 0x%04x: nie można zmienić adresu e-mail, ponieważ jest już oczekujące "
+"żądanie dla tej nazwy użytkownika."
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ podany adres jest "
-"skojarzony ze zbyt wieloma identyfikatorami."
+"Błąd 0x%04x: nie można zmienić adresu e-mail, ponieważ podany adres jest "
+"skojarzony z za dużą ilością nazw użytkowników."
 
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"Błąd 0x%04x: Nie można zmienić adresu email, ponieważ podany adres jest "
+"Błąd 0x%04x: nie można zmienić adresu e-mail, ponieważ podany adres jest "
 "nieprawidłowy."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "Błąd 0x%04x: Nieznany błąd."
+msgstr "Błąd 0x%04x: nieznany błąd."
 
 msgid "Error Changing Account Info"
-msgstr "Błąd podczas zmiany informacji o koncie"
+msgstr "Błąd podczas zmieniania informacji o koncie"
 
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "Adres email dla %s to %s"
+msgstr "Adres e-mail dla %s to %s"
 
 msgid "Account Info"
-msgstr "Dane konta"
+msgstr "Informacje o koncie"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Obraz IM nie został wysłany. Wymagane jest bezpośrednie połączenie aby "
-"przesyłać obrazy."
+"Obraz komunikatora nie został wysłany. Tylko za pomocą bezpośredniego "
+"połączenia można wysyła obrazy."
 
 msgid "Unable to set AIM profile."
 msgstr "Nie można ustawić profilu AIM."
@@ -7589,9 +7462,9 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Prawdopodobnie zażądano zmian w ustawieniach profilu przed zakończeniem "
-"procedury logowania. Profil pozostanie nieustawiony; spróbuj zmienić "
-"ustawienia gdy połączenie będzie w pełni zestawione."
+"Prawdopodobnie zażądano ustawienia profilu przed ukończeniem procedury "
+"logowania. Profil pozostanie nieustawiony; proszę spróbować ustawić go po "
+"pełnym połączeniu."
 
 #, c-format
 msgid ""
@@ -7611,7 +7484,7 @@
 "skrócony."
 
 msgid "Profile too long."
-msgstr "Profil jest zbyt długi."
+msgstr "Profil jest za długi."
 
 #, c-format
 msgid ""
@@ -7621,17 +7494,17 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Maksymalna długość komunikatu nieobecności (%d bajt) została przekroczona. "
-"Komunikat został skrócony."
+"Maksymalna długość wiadomości nieobecności (%d bajt) została przekroczona. "
+"Wiadomość została skrócona."
 msgstr[1] ""
-"Maksymalna długość komunikatu nieobecności (%d bajty) została przekroczona. "
-"Komunikat został skrócony."
+"Maksymalna długość wiadomości nieobecności (%d bajty) została przekroczona. "
+"Wiadomość została skrócona."
 msgstr[2] ""
-"Maksymalna długość komunikatu nieobecności (%d bajtów) została przekroczona. "
-"Komunikat został skrócony."
+"Maksymalna długość wiadomości nieobecności (%d bajtów) została przekroczona. "
+"Wiadomość została skrócona."
 
 msgid "Away message too long."
-msgstr "Zbyt długi komunikat nieobecności."
+msgstr "Za długa wiadomość nieobecności."
 
 #, c-format
 msgid ""
@@ -7639,8 +7512,10 @@
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-
-#, fuzzy
+"Nie można dodać znajomego %s, ponieważ nazwa użytkownika jest nieprawidłowa. "
+"Nazwy użytkowników muszą być prawidłowymi adresami e-mail lub zaczynać się "
+"od litery i zawierać tylko litery, liczby i spacje lub zawierać tylko liczby."
+
 msgid "Unable to Retrieve Buddy List"
 msgstr "Nie można pobrać listy znajomych"
 
@@ -7648,41 +7523,44 @@
 "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 ""
+"Serwery AIM tymczasowo nie mogły wysłać listy znajomych. Nie została ona "
+"utracona i prawdopodobnie będzie dostępna za kilka minut."
 
 msgid "Orphans"
 msgstr "Osieroceni"
 
-#, 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 ""
-"Nie udało się dodać kontaktu %s, ponieważ jest za dużo osób na liście. Usuń "
-"którąś osobę i spróbuj ponownie."
+"Nie można dodać znajomego %s, ponieważ jest za dużo znajomych na liście. "
+"Proszę usunąć kogoś i spróbować ponownie."
 
 msgid "(no name)"
 msgstr "(bez nazwy)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Wykonanie polecenia zakończyło się niepowodzeniem z nieznanego powodu."
-
-#, fuzzy, c-format
+msgstr "Nie można dodać znajomego %s z nieznanego powodu."
+
+#, 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 "Użytkownik %s zezwolił na dodanie do listy. Dodać go?"
+msgstr ""
+"Użytkownik %s udzielił pozwolenia na dodanie go do listy znajomych. Dodać go?"
 
 msgid "Authorization Given"
-msgstr "Autoryzacja przyznana"
+msgstr "Przyznano upoważnienie"
 
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Użytkownik %s zezwolił na dodanie go do listy użytkowników."
+msgstr "Użytkownik %s zaakceptował żądanie dodania go do listy znajomych."
 
 msgid "Authorization Granted"
-msgstr "Udzielono autoryzacji"
+msgstr "Udzielono upoważnienie"
 
 #. Denied
 #, c-format
@@ -7691,191 +7569,185 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"Użytkownik %s odrzucił prośbę o dodanie go do listy użytkowników z "
+"Użytkownik %s odrzucił żądanie dodania go do listy użytkowników z "
 "następującego powodu:\n"
 "%s"
 
 msgid "Authorization Denied"
-msgstr "Odmowa autoryzacji"
+msgstr "Odmowa upoważnienia"
 
 msgid "_Exchange:"
 msgstr "_Wymiana:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Obraz IM nie został wysłany. Nie można wysyłać obrazów IM w konferencjach "
-"AIM."
+"Obraz komunikatora nie został wysłany. Nie można wysłać obrazów komunikatora "
+"w konferencjach AIM."
 
 msgid "iTunes Music Store Link"
-msgstr "Link do sklepu muzycznego iTunes"
+msgstr "Odnośnik do sklepu muzycznego iTunes"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Komentarz dot. znajomego %s"
+msgstr "Komentarz o znajomym %s"
 
 msgid "Buddy Comment:"
 msgstr "Komentarz o znajomym:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Wybrano otworzenie bezpośredniego połączenia z %s."
+msgstr "Wybrano otwarcie bezpośredniego połączenia z %s."
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"Funkcja ta ujawnia drugiej stronie adres IP, może to stanowić pewne "
-"zagrożenie dla prywatności. Czy chcesz kontynuować?"
+"Ta funkcja ujawnia adres IP, może to stanowić pewne zagrożenie "
+"bezpieczeństwa. Kontynuować?"
 
 msgid "C_onnect"
-msgstr "Połącz"
-
-#, fuzzy
+msgstr "P_ołącz"
+
 msgid "You closed the connection."
-msgstr "Połączenie zostało zamknięte przez serwer."
+msgstr "Zamknięto połączenie."
 
 msgid "Get AIM Info"
-msgstr "Pobierz Informacje AIM"
+msgstr "Pobierz informacje AIM"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "Modyfikacja komentarza o znajomym"
+msgstr "Zmodyfikuj komentarz o znajomym"
 
 msgid "Get Status Msg"
-msgstr "Pobranie wiadomość o stanie"
-
-#, fuzzy
+msgstr "Pobierz wiadomość stanu"
+
 msgid "End Direct IM Session"
-msgstr "Ustanowiono bezpośrednie połączenie"
+msgstr "Zakończ sesję bezpośredniego połączenia"
 
 msgid "Direct IM"
 msgstr "Połączenie bezpośrednie"
 
 msgid "Re-request Authorization"
-msgstr "Ponownie poproś o autoryzację"
+msgstr "Ponownie zażądaj upoważnienia"
 
 msgid "Require authorization"
-msgstr "Wymaga autoryzacji"
+msgstr "Wymagaj upoważnienia"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
+msgstr "W sieci WWW (włączenie spowoduje otrzymywanie niechcianych wiadomości)"
 
 msgid "ICQ Privacy Options"
 msgstr "Opcje prywatności ICQ"
 
 msgid "The new formatting is invalid."
-msgstr "Nowe formatowanie nie jest poprawne."
-
-#, fuzzy
+msgstr "Nowe formatowanie jest nieprawidłowe."
+
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Formatowanie identyfikatora może zmienić wyłącznie wielkość liter i odstępy."
+"Formatowanie nazwy użytkownika może zmienić wyłącznie wielkość liter i "
+"spacje."
 
 msgid "Change Address To:"
 msgstr "Zmiana adresu na:"
 
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>nie oczekujesz na autoryzację</i>"
+msgstr "<i>upoważnienie nie jest oczekiwane</i>"
 
 msgid "You are awaiting authorization from the following buddies"
-msgstr "Oczekujesz na autoryzację od następujących osób"
+msgstr "Oczekiwane jest upoważnienie od następujących znajomych"
 
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Można ponownie poprosić o autoryzację te osoby, klikając na nich prawym "
-"przyciskiem i wybierając \"Ponownie poproś o autoryzację\"."
+"Można ponownie zażądać upoważnienia od tych znajomych, naciskają ma nich "
+"prawym przyciskiem myszy i wybierając \"Ponownie zażądaj upoważnienia\"."
 
 msgid "Find Buddy by Email"
-msgstr "Wyszukiwanie użytkownika wg adresu email"
+msgstr "Znajdź użytkownika według adresu e-mail"
 
 msgid "Search for a buddy by email address"
-msgstr "Szukaj znajomych według adresu email"
+msgstr "Wyszukaj znajomego według adresu e-mail"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Podaj adres email znajomego, którego chcesz znaleźć."
+msgstr "Proszę podać adres e-mail wyszukiwanego znajomego."
 
 msgid "_Search"
-msgstr "Zn_ajdź"
-
-#, fuzzy
+msgstr "Wy_szukaj"
+
 msgid "Set User Info (web)..."
-msgstr "Ustaw dane użytkownika (URL)..."
+msgstr "Ustaw informacje o użytkowniku (WWW)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "Zmiana hasła (URL)"
-
-#, fuzzy
+msgstr "Zmień hasło (WWW)"
+
 msgid "Configure IM Forwarding (web)"
-msgstr "Konfiguracja przesyłania IM (URL)"
+msgstr "Skonfiguruj przekierowanie komunikatora (WWW)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "Opcje związane z prywatnością..."
+msgstr "Ustaw opcje prywatności..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "Potwierdzenie konta"
+msgstr "Potwierdź konto"
 
 msgid "Display Currently Registered Email Address"
-msgstr "Wyświetl aktualnie zarejestrowany adres email"
+msgstr "Wyświetl aktualnie zarejestrowany adres e-mail"
 
 msgid "Change Currently Registered Email Address..."
-msgstr "Zmień aktualnie zarejestrowany adres email..."
+msgstr "Zmień aktualnie zarejestrowany adres e-mail..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Pokazuj użytkowników oczekujących na autoryzację"
+msgstr "Wyświetl znajomych oczekujących na upoważnienie"
 
 msgid "Search for Buddy by Email Address..."
-msgstr "Szukaj znajomych według adresu email..."
+msgstr "Wyszukaj znajomych według adresu e-mail..."
 
 msgid "Search for Buddy by Information"
-msgstr "Wyszukaj znajomego na podstawie informacji"
-
-#, fuzzy
+msgstr "Wyszukaj znajomych według informacji"
+
 msgid "Use clientLogin"
-msgstr "Użytkownik nie jest zalogowany"
-
-#, fuzzy
+msgstr "Użycie logowania klienta"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"Zawsze używaj serwera proxy ICQ do transferu plików\n"
-"(wolniej, ale nie odkrywa twojego adresu IP)"
+"Zawsze używanie serwera pośrednika AIM/ICQ\n"
+"do przesyłania plików i bezpośrednich połączeń\n"
+"(wolniejsze, ale nie ujawnia adresu IP)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "Zezwolenie na wiele jednoczesnych logowań"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
-"Prośba %s o nawiązanie połączenia z komputerem %s:%hu w celu rozpoczęcia "
-"bezpośredniej rozmowy."
+"Proszenie %s o połączenie z komputerem na %s:%hu, aby użyć bezpośredniego "
+"połączenia."
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Próba połączenia z %s:%hu."
 
 msgid "Attempting to connect via proxy server."
-msgstr "Próba połączenia przez serwer pośredniczący (proxy)."
+msgstr "Próba połączenia przez serwer pośrednika."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s poprosił o bezpośrednie połączenie z %s"
+msgstr "Użytkownik %s poprosił o bezpośrednie połączenie z %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 ""
-"Wymagane jest bezpośrednie połączenie pomiędzy dwoma komputerami i jest "
-"konieczne do przesyłu obrazów. Ponieważ adres IP będzie udostępniony drugiej "
-"stronie, może się to wiązać z zagrożeniem prywatności."
+"Wymagane jest bezpośrednie połączenie między dwoma komputerami i jest "
+"wymagane dla obrazów komunikatora. Ponieważ adres IP zostanie ujawniony, "
+"może się to wiązać z zagrożeniem prywatności."
 
 msgid "Aquarius"
 msgstr "Wodnik"
@@ -7952,25 +7824,23 @@
 msgid "Other"
 msgstr "Inny"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Niewidoczny"
+msgstr "Widoczne"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Tylko dla przyjaciół"
+
 msgid "Private"
-msgstr "Prywatność"
+msgstr "Prywatne"
 
 msgid "QQ Number"
 msgstr "Numer QQ"
 
 msgid "Country/Region"
-msgstr "Kraj/Region"
+msgstr "Kraj/region"
 
 msgid "Province/State"
-msgstr ""
+msgstr "Prowincja/stan"
 
 msgid "Zipcode"
 msgstr "Kod pocztowy"
@@ -7978,498 +7848,431 @@
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Prośba o autoryzację"
+msgstr "Upoważnij dodawanie"
 
 msgid "Cellphone Number"
 msgstr "Numer telefonu komórkowego"
 
-#, fuzzy
 msgid "Personal Introduction"
 msgstr "Informacje osobiste"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Miasto"
-
-#, fuzzy
+msgstr "Miasto/obszar"
+
 msgid "Publish Mobile"
-msgstr "Telefon komórkowy"
-
-#, fuzzy
+msgstr "Publikacja telefonu komórkowego"
+
 msgid "Publish Contact"
-msgstr "Alias kontaktu"
-
-#, fuzzy
+msgstr "Publikacja kontaktu"
+
 msgid "College"
-msgstr "_Zwiń"
-
-#, fuzzy
+msgstr "Koledż"
+
 msgid "Horoscope"
-msgstr "Koń"
-
-#, fuzzy
+msgstr "Horoskop"
+
 msgid "Zodiac"
 msgstr "Znak zodiaku"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Zablokowane"
-
-#, fuzzy
+msgstr "Grupa krwi"
+
 msgid "True"
-msgstr "Byk"
-
-#, fuzzy
+msgstr "Prawda"
+
 msgid "False"
-msgstr "Błąd"
-
-#, fuzzy
+msgstr "Fałsz"
+
 msgid "Modify Contact"
-msgstr "Modyfikacja konta"
-
-#, fuzzy
+msgstr "Zmodyfikuj kontakt"
+
 msgid "Modify Address"
-msgstr "Adres domowy"
-
-#, fuzzy
+msgstr "Zmodyfikuj adres"
+
 msgid "Modify Extended Information"
-msgstr "Informacje o znajomym"
-
-#, fuzzy
+msgstr "Zmodyfikuj rozszerzone informacje"
+
 msgid "Modify Information"
-msgstr "Informacje o znajomym"
-
-#, fuzzy
+msgstr "Zmodyfikuj informacje"
+
 msgid "Update"
-msgstr "Ostatnia aktualizacja"
-
-#, fuzzy
+msgstr "Zaktualizuj"
+
 msgid "Could not change buddy information."
-msgstr "Proszę podać informacje o znajomym."
+msgstr "Nie można zmienić informacji o znajomym."
 
 msgid "Mobile"
-msgstr "Dostępny pod telefonem komórkowym"
+msgstr "Telefon komórkowy"
 
 msgid "Note"
-msgstr "Uwagi"
+msgstr "Notatka"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Ikona użytkownika"
+msgstr "Notatka o użytkowniku"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Zmień notatkę o użytkowniku"
+
 msgid "_Modify"
-msgstr "Modyfikuj"
-
-#, fuzzy
+msgstr "Zm_odyfikuj"
+
 msgid "Memo Modify"
-msgstr "Modyfikuj"
-
-#, fuzzy
+msgstr "Modyfikacja notatki"
+
 msgid "Server says:"
-msgstr "Serwer zajęty"
+msgstr "Komunikat serwera:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Żądanie zostało zaakceptowane."
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Żądanie zostało odrzucone."
+
+#, c-format
 msgid "%u requires verification"
-msgstr "Wymaga autoryzacji"
-
-#, fuzzy
+msgstr "%u wymaga sprawdzenia"
+
 msgid "Add buddy question"
-msgstr "Dodać do listy znajomych?"
-
-#, fuzzy
+msgstr "Dodaj pytanie znajomego"
+
 msgid "Enter answer here"
-msgstr "Katalog użytkowników"
+msgstr "Proszę tutaj podać odpowiedź"
 
 msgid "Send"
 msgstr "Wyślij"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Niewłaściwa ksywka"
+msgstr "Nieprawidłowa odpowiedź."
 
 msgid "Authorization denied message:"
-msgstr "Komunikat o odmowie autoryzacji:"
-
-#, fuzzy
+msgstr "Wiadomość odmowy upoważnienia:"
+
 msgid "Sorry, you're not my style."
-msgstr "Przykro mi, nie jesteś w moim typie..."
-
-#, fuzzy, c-format
+msgstr "Przykro mi, nie jesteś w moim typie."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "Rozpoczęcie autoryzacji"
-
-#, fuzzy
+msgstr "%u wymaga upoważnienia"
+
 msgid "Add buddy authorize"
-msgstr "Dodać do listy znajomych?"
-
-#, fuzzy
+msgstr "Dodaj upoważnienie znajomego"
+
 msgid "Enter request here"
-msgstr "Podaj adres serwera konferencyjnego"
-
-#, fuzzy
+msgstr "Proszę tutaj podać żądanie"
+
 msgid "Would you be my friend?"
-msgstr "Czy nadpisać plik?"
-
-#, fuzzy
+msgstr "Chcesz zostać moim przyjacielem?"
+
 msgid "QQ Buddy"
-msgstr "Dodaj użytkownika"
-
-#, fuzzy
+msgstr "Znajomy QQ"
+
 msgid "Add buddy"
-msgstr "Dodaj użytkownika"
-
-#, fuzzy
+msgstr "Dodaj znajomego"
+
 msgid "Invalid QQ Number"
-msgstr "Niepoprawny identyfikator QQid"
-
-#, fuzzy
+msgstr "Nieprawidłowy numer QQ"
+
 msgid "Failed sending authorize"
-msgstr "Proszę o autoryzację!"
-
-#, fuzzy, c-format
+msgstr "Wysłanie upoważnienia nie powiodło się"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Nie można przyłączyć znajomego do konferencji"
-
-#, fuzzy, c-format
+msgstr "Usunięcie znajomego %u nie powiodło się"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "użytkownik %s usunął Ciebie ze swojej listy znajomych."
-
-#, fuzzy
+msgstr "Usunięcie z listy znajomych użytkownika %d nie powiodło się"
+
 msgid "No reason given"
-msgstr "Nie podano powodu."
+msgstr "Nie podano powodu"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "Zabity przez %s (%s)"
-
-#, fuzzy
+msgstr "Dodano przez użytkownika %s"
+
 msgid "Would you like to add him?"
-msgstr "Czy nadpisać plik?"
-
-#, fuzzy, c-format
+msgstr "Dodać go?"
+
+#, c-format
 msgid "Rejected by %s"
-msgstr "Odrzuć"
+msgstr "Odrzucono przez użytkownika %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomość: %s"
 
 msgid "ID: "
-msgstr "ID: "
+msgstr "Identyfikator: "
 
 msgid "Group ID"
-msgstr "ID Grupy"
+msgstr "Identyfikator grupy"
 
 msgid "QQ Qun"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ Qun"
+
 msgid "Please enter Qun number"
-msgstr "Wpisz nową nazwę dla %s"
+msgstr "Proszę podać numer Qun"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
-
-#, fuzzy
+msgstr "Można wyszukiwać tylko trwałe Qun\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Niewłaściwe ustawienia pośrednika sieciowego"
-
-#, fuzzy
+msgstr "(Nieprawidłowy ciąg UTF-8)"
+
 msgid "Not member"
-msgstr "Zapisany od"
-
-#, fuzzy
+msgstr "Nie jest członkiem"
+
 msgid "Member"
-msgstr "Zapisany od"
-
-#, fuzzy
+msgstr "Członek"
+
 msgid "Requesting"
-msgstr "Okno dialogowe z żądaniem"
-
-#, fuzzy
+msgstr "Żądanie"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Administrator"
+
 msgid "Notice"
-msgstr "Uwagi"
-
-#, fuzzy
+msgstr "Uwaga"
+
 msgid "Detail"
-msgstr "Domyślny"
-
-#, fuzzy
+msgstr "Szczegół"
+
 msgid "Creator"
-msgstr "Utwórz"
-
-#, fuzzy
+msgstr "Twórca"
+
 msgid "About me"
-msgstr "O programie %s"
-
-#, fuzzy
+msgstr "O mnie"
+
 msgid "Category"
-msgstr "Błąd konferencji"
-
-#, fuzzy
+msgstr "Kategoria"
+
 msgid "The Qun does not allow others to join"
-msgstr ""
-"Wersja demonstracyjna nie pozwala na zalogowanie więcej niż dziesięciu "
-"użytkowników za jednym razem"
-
-#, fuzzy
+msgstr "Qun nie umożliwia dołączania innym"
+
 msgid "Join QQ Qun"
-msgstr "Przyłącz do konferencji"
+msgstr "Dołącz do QQ Qun"
 
 msgid "Input request here"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Wejście żądania w tym miejscu"
+
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Numer telefonu"
+msgstr "Pomyślnie dołączono do Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "Pomyślnie dołączono do Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
-
-#, fuzzy
+msgstr "Qun %u odmówił dołączenia"
+
 msgid "QQ Qun Operation"
-msgstr "Opcje dźwięku"
-
-#, fuzzy
+msgstr "Działanie QQ Qun"
+
 msgid "Failed:"
-msgstr "Błąd"
+msgstr "Niepowodzenie:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Dołącz do Qun, nieznana odpowiedź"
+
 msgid "Quit Qun"
-msgstr "Przyłącz do konferencji"
+msgstr "Wyjdź z Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-
-#, fuzzy
+"Proszę zauważyć, że jeśli przeprowadza je \n"
+"twórca, te działanie może usunąć tę Qun."
+
 msgid "Sorry, you are not our style"
-msgstr "Przykro mi, nie jesteś w moim typie..."
-
-#, fuzzy
+msgstr "Przykro mi, nie jesteś w naszym typie"
+
 msgid "Successfully changed Qun members"
-msgstr "Numer telefonu"
-
-#, fuzzy
+msgstr "Pomyślnie zmieniono członków Qun"
+
 msgid "Successfully changed Qun information"
-msgstr "Informacja o kanale"
+msgstr "Pomyślnie zmieniono informacje o Qun"
 
 msgid "You have successfully created a Qun"
-msgstr ""
-
-#, fuzzy
+msgstr "Pomyślnie utworzono Qun"
+
 msgid "Would you like to set up detailed information now?"
-msgstr "Czy chcesz użyć tego obrazka jako ikony użytkownika dla tej osoby?"
-
-#, fuzzy
+msgstr "Ustawić teraz szczegółowe informacje?"
+
 msgid "Setup"
-msgstr "Uruchomienie"
+msgstr "Ustawienia"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "Użytkownik %u zażądał dołączenia do Qun %u dla %s"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Użytkownik %u żąda dołączenia do Qun %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Nie można przyłączyć znajomego do konferencji"
+msgstr "Dołączenie do Qun %u nie powiodło się, działanie administratora %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-
-#, fuzzy, c-format
+"<b>Dołączenie do Qun %u zostało zaakceptowane przez administratora %u dla %"
+"s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Usunięcie znajomego"
-
-#, fuzzy, c-format
+msgstr "<b>Usunięto znajomego %u.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Usunięcie znajomego"
-
-#, fuzzy, c-format
+msgstr "<b>Dołączył nowy znajomy %u.</b>"
+
+#, c-format
 msgid "Unknown-%d"
-msgstr "Nieznany"
-
-#, fuzzy
+msgstr "Nieznany-%d"
+
 msgid "Level"
 msgstr "Poziom"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
-msgstr "Dostępny pod telefonem komórkowym"
-
-#, fuzzy
+msgstr " Z telefonu komórkowego"
+
 msgid " BindMobile"
-msgstr "Dostępny pod telefonem komórkowym"
-
-#, fuzzy
+msgstr " Dowiąż telefon komórkowy"
+
 msgid " Video"
-msgstr "Wideo na żywo"
-
-#, fuzzy
+msgstr " Wideo"
+
 msgid " Zone"
-msgstr "Brak"
+msgstr " Strefa"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flaga"
 
 msgid "Ver"
-msgstr ""
-
-#, fuzzy
+msgstr "Wersja"
+
 msgid "Invalid name"
-msgstr "Niewłaściwa ksywka"
-
-#, fuzzy
+msgstr "Nieprawidłowa nazwa"
+
 msgid "Select icon..."
-msgstr "Wybierz katalog..."
-
-#, fuzzy, c-format
+msgstr "Wybierz ikonę..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Czas logowania</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
+msgstr "<b>Razem znajomych w trybie online</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>Ostatnie odświeżenie</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Serwer</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Znacznik klienta</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Rozmowa z %s dnia %s:</b><br>"
-
-#, fuzzy, c-format
+msgstr "<b>Tryb połączenia</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Rozmowa z %s dnia %s:</b><br>"
-
-#, fuzzy, c-format
+msgstr "<b>IP Internetu</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Wysłano</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Rozmowa z %s dnia %s:</b><br>"
-
-#, fuzzy, c-format
+msgstr "<b>Wysłano ponownie</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Utracono</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Rozmowa z %s dnia %s:</b><br>"
-
-#, fuzzy, c-format
+msgstr "<b>Odebrano</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Odebrano duplikat</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Czas</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy
+msgstr "<b>IP</b>: %s<br>\n"
+
 msgid "Login Information"
-msgstr "Informacje przydatne przy debugowaniu"
+msgstr "Informacje logowania"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Pierwszy autor</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Współtwórcy kodu</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Wspaniali twórcy łat</b>:<br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy
+msgstr "<p><b>Podziękowania</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
+msgstr "<p><b>Skrupulatni testerzy</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "i wiele więcej, proszę dać o sobie znać... dziękuję!"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>A także wszyscy chłopcy na zapleczu...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<i>Każdy może dołączyć!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "O programie %s"
-
-#, fuzzy
+msgstr "O programie OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Zapisz ikonę"
+msgstr "Zmień ikonę"
 
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informacje przydatne przy debugowaniu"
+msgstr "Informacje o koncie"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Zaktualizuj wszystkie Qun QQ"
+
 msgid "About OpenQ"
-msgstr "O programie %s"
-
-#, fuzzy
+msgstr "O programie OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Adres domowy"
+msgstr "Zmodyfikuj notatkę o znajomym"
 
 #. *< type
 #. *< ui_requirement
@@ -8481,235 +8284,212 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "Wtyczka protokołu ICQ"
-
-#, fuzzy
+msgstr "Wtyczka protokołu QQ"
+
 msgid "Auto"
-msgstr "Użytkownik do autoryzacji"
-
-#, fuzzy
+msgstr "Automatyczny"
+
 msgid "Select Server"
-msgstr "Wybór użytkownika"
+msgstr "Wybór serwera"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "Połącz używając TCP"
-
-#, fuzzy
+msgstr "Połączenie przez TCP"
+
 msgid "Show server notice"
-msgstr "Port serwera"
-
-#, fuzzy
+msgstr "Wyświetlanie uwag serwera"
+
 msgid "Show server news"
-msgstr "Adres serwera"
+msgstr "Wyświetlanie aktualności serwera"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Wyświetlanie pokoju konferencji po nadejściu wiadomości"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Niepoprawny błąd"
-
-#, fuzzy
+msgstr "Czas między wznowieniami (sekundy)"
+
 msgid "Update interval (seconds)"
-msgstr "Niepoprawny błąd"
-
-#, fuzzy
+msgstr "Czas między aktualizacjami (sekundy)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Nie można pobrać informacji o serwerze"
+msgstr "Nie można odszyfrować odpowiedzi serwera"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Żądanie tokena nie powiodło się, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Niepoprawny identyfikator QQid"
+msgstr "Nieprawidłowy token len, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX nie jest obecnie obsługiwane"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Wymagana rejestracja"
+msgstr "Wymagana jest aktywacja"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
-
-#, fuzzy
+msgstr "Nieznany kod odpowiedzi podczas logowania się (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Żądanie uwagi od %s..."
-
-#, fuzzy
+msgstr "Żądanie CAPTCHA"
+
 msgid "Checking captcha"
-msgstr "Żądanie uwagi od %s..."
-
-#, fuzzy
+msgstr "Sprawdzanie CAPTCHA"
+
 msgid "Failed captcha verification"
-msgstr "Niepowodzenie podczas uwierzytelniania Yahoo!"
-
-#, fuzzy
+msgstr "Sprawdzenie CAPTCHA nie powiodło się"
+
 msgid "Captcha Image"
-msgstr "Zapis obrazu"
-
-#, fuzzy
+msgstr "Obraz CAPTCHA"
+
 msgid "Enter code"
-msgstr "Wprowadź hasło"
-
-#, fuzzy
+msgstr "Proszę podać kod"
+
 msgid "QQ Captcha Verification"
-msgstr "Weryfikacja Certyfikatu SSL"
-
-#, fuzzy
+msgstr "Sprawdzanie CAPTCHA QQ"
+
 msgid "Enter the text from the image"
-msgstr "Podaj nazwę dodawanej grupy"
+msgstr "Proszę podać tekst z obrazu"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Nieznana odpowiedź podczas sprawdzania hasła (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#, fuzzy
+"Nieznany kod odpowiedzi podczas logowania się (0x%02X):\n"
+"%s"
+
 msgid "Socket error"
-msgstr "Błąd tokena"
-
-#, fuzzy
+msgstr "Błąd gniazda"
+
 msgid "Getting server"
-msgstr "Ustaw dane użytkownika..."
-
-#, fuzzy
+msgstr "Pobieranie serwera"
+
 msgid "Requesting token"
-msgstr "Odmowa realizacji żądania"
-
-#, fuzzy
+msgstr "Żądanie tokena"
+
 msgid "Unable to resolve hostname"
-msgstr "Nie można połączyć się z serwerem."
-
-#, fuzzy
+msgstr "Nie można rozwiązać nazwy komputera"
+
 msgid "Invalid server or port"
-msgstr "Niepoprawny błąd"
-
-#, fuzzy
+msgstr "Nieprawidłowy serwer lub port"
+
 msgid "Connecting to server"
-msgstr "Łączenie z serwerem SILC"
-
-#, fuzzy
+msgstr "Łączenie z serwerem"
+
 msgid "QQ Error"
-msgstr "Błąd QQid"
-
-#, fuzzy, c-format
+msgstr "Błąd QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Serwer przekazujący ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Aktualności serwera:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Od"
-
-#, fuzzy, c-format
+msgstr "Od %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instrukcje z serwera: %s"
-
-#, fuzzy
+msgstr ""
+"Uwaga serwera od %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Nieznany powód"
+msgstr "Nieznane POLECENIE SERWERA"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"Błąd odpowiedzi %s(0x%02X)\n"
+"Pokój %u, odpowiedź 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Polecenie"
-
-#, fuzzy
+msgstr "Polecenie Qun QQ"
+
 msgid "Unable to decrypt login reply"
-msgstr "Nie można pobrać informacji o serwerze"
-
-#, fuzzy
+msgstr "Nie można odszyfrować odpowiedzi logowania"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Nieznany powód"
-
-#, fuzzy
+msgstr "Nieznane POLECENIE LOGOWANIA"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Nieznany powód"
-
-#, fuzzy, c-format
+msgstr "Nieznane POLECENIE KLIENTA"
+
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s zmieniła/zmienił temat na: %s"
-
-#, fuzzy
+msgstr "Użytkownik %d odmówił przyjęcia pliku %s"
+
 msgid "File Send"
-msgstr "Przesyłanie plików nie powiodło się"
-
-#, fuzzy, c-format
+msgstr "Wysłano plik"
+
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d anulowała/anulował przesyłanie pliku %s"
+msgstr "Użytkownik %d anulował przesyłanie pliku %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Nazwa grupy:</b> %s<br>"
+
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Tytuł grupy:</b> %s<br>"
+msgstr "<b>Identyfikator grupy programu Notes:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informacje o grupie %s"
 
-#, fuzzy
 msgid "Notes Address Book Information"
-msgstr "Dodaj do książki adresowej"
+msgstr "Informacje o książce adresowej programu Notes"
 
 msgid "Invite Group to Conference..."
 msgstr "Zaproś grupę do konferencji..."
 
 msgid "Get Notes Address Book Info"
-msgstr "Dodaj do książki adresowej"
-
-#, fuzzy
+msgstr "Uzyskaj informacje o książce adresowej programu Notes"
+
 msgid "Sending Handshake"
-msgstr "Wysyłanie ciasteczka"
-
-#, fuzzy
+msgstr "Wysyłanie powitania"
+
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Oczekiwanie na potwierdzenie zalogowania"
+msgstr "Oczekiwanie na potwierdzenie powitania"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "Potwierdzono powitania, wysyłanie logowania"
 
 msgid "Waiting for Login Acknowledgement"
 msgstr "Oczekiwanie na potwierdzenie zalogowania"
@@ -8718,10 +8498,10 @@
 msgstr "Logowanie zostało przekierowane"
 
 msgid "Forcing Login"
-msgstr "Wymuszanie logowania"
+msgstr "Wymuszanie zalogowania"
 
 msgid "Login Acknowledged"
-msgstr "Logowanie potwierdzone"
+msgstr "Potwierdzono zalogowanie"
 
 msgid "Starting Services"
 msgstr "Uruchamianie usług"
@@ -8729,17 +8509,17 @@
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Administrator Sametime zostawił następujący komunikat na serwerze %s"
+msgstr "Administrator Sametime zostawił następujące ogłoszenie na serwerze %s"
 
 msgid "Sametime Administrator Announcement"
 msgstr "Ogłoszenie administratora Sametime"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr "Powiadomienie od %s"
+msgstr "Ogłoszenie od %s"
 
 msgid "Conference Closed"
-msgstr "Konferencja została zamknięta"
+msgstr "Zamknięto konferencję"
 
 msgid "Unable to send message: "
 msgstr "Nie można wysłać wiadomości: "
@@ -8749,7 +8529,7 @@
 msgstr "Nie można wysłać wiadomości do %s:"
 
 msgid "Place Closed"
-msgstr "Miejsce zostało zamknięte"
+msgstr "Zamknięto miejsce"
 
 msgid "Microphone"
 msgstr "Mikrofon"
@@ -8758,14 +8538,13 @@
 msgstr "Głośniki"
 
 msgid "Video Camera"
-msgstr "Kamera video"
+msgstr "Kamera wideo"
 
 msgid "File Transfer"
-msgstr "Przesyłanie pliku ukończone"
-
-#, fuzzy
+msgstr "Przesyłanie plików"
+
 msgid "Supports"
-msgstr "wsparcie"
+msgstr "Obsługuje"
 
 msgid "External User"
 msgstr "Zewnętrzny użytkownik"
@@ -8778,8 +8557,8 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Proszę podać temat nowej konferencji, oraz treść zaproszenia, które zostanie "
-"wysłane do %s"
+"Proszę podać temat nowej konferencji i wiadomość zaproszenia, która zostanie "
+"wysłana do %s"
 
 msgid "New Conference"
 msgstr "Nowa konferencja"
@@ -8802,6 +8581,9 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
+"Proszę wybrać konferencję z poniższej listy, aby wysłać zaproszenie "
+"użytkownikowi %s. Należy wybrać \"Utwórz nową konferencję\", aby utworzyć "
+"nową konferencję."
 
 msgid "Invite to Conference"
 msgstr "Zaproś do konferencji"
@@ -8810,26 +8592,27 @@
 msgstr "Zaproś do konferencji..."
 
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "Wyślij ogłoszenie TESTOWE"
 
 msgid "Topic:"
 msgstr "Temat:"
 
 msgid "No Sametime Community Server specified"
-msgstr ""
+msgstr "Nie podano serwera społeczności 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 ""
-
-#, fuzzy
+"Ż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 "Reset połączenia"
+msgstr "Ustawienia połączenia Meanwhile"
 
 msgid "No Sametime Community Server Specified"
-msgstr ""
+msgstr "Nie podano serwera społeczności Sametime"
 
 msgid "Connect"
 msgstr "Połącz"
@@ -8848,15 +8631,16 @@
 msgstr "Identyfikator Sametime"
 
 msgid "An ambiguous user ID was entered"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Podano niejednoznaczny identyfikator użytkownika"
+
+#, 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 ""
-"Odnaleziono więcej niż jednego użytkownika o tej samej nazwie. Wybierz "
-"właściwego użytkownika, którego chcesz dodać do listy znajomych."
+"Użytkownik \"%s\" może odnosić się do dowolnego z poniższych użytkowników. "
+"Proszę wybrać poprawnego użytkownika z poniższej listy, aby dodać go do "
+"listy znajomych."
 
 msgid "Select User"
 msgstr "Wybór użytkownika"
@@ -8869,17 +8653,19 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
+"Identyfikator \"%s\" nie pasuje do żadnego użytkownika w społeczności "
+"Sametime. Ten wpis został usunięty z listy znajomych."
 
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"Błąd odczytu pliku %s: \n"
-"%s.\n"
+"Błąd podczas odczytywania pliku %s: \n"
+"%s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Lista znajomych przechowywana na zdalnym komputerze"
+msgstr "Zdalnie przechowywana lista znajomych"
 
 msgid "Buddy List Storage Mode"
 msgstr "Tryb przechowywania listy znajomych"
@@ -8888,39 +8674,37 @@
 msgstr "Tylko lokalna lista znajomych"
 
 msgid "Merge List from Server"
-msgstr "Rozłączono z serwerem."
+msgstr "Połącz listę z serwera"
 
 msgid "Merge and Save List to Server"
 msgstr "Połącz i zapisz listę na serwerze"
 
 msgid "Synchronize List with Server"
-msgstr "Synchronizuj listę z serwerem"
+msgstr "Zsynchronizuj listę z serwerem"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Import listy Sametime dla konta %s"
+msgstr "Zaimportuj listę Sametime dla konta %s"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Eksport listy Sametime dla konta %s"
+msgstr "Wyeksportuj listę Sametime dla konta %s"
 
 msgid "Unable to add group: group exists"
-msgstr "Nie można dodać grupy - grupa już istnieje"
+msgstr "Nie można dodać grupy: grupa już istnieje"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Grupa o nazwie \"%s\" już istnieje w Twojej liście znajomych."
+msgstr "Grupa o nazwie \"%s\" już istnieje na liście znajomych."
 
 msgid "Unable to add group"
 msgstr "Nie można dodać grupy"
 
-#, fuzzy
 msgid "Possible Matches"
-msgstr "Nic nie znaleziono"
-
-#, fuzzy
+msgstr "Możliwe wyniki"
+
 msgid "Notes Address Book group results"
-msgstr "Dodaj do książki adresowej"
+msgstr "Wyniki grupy książki adresowej programu Notes"
 
 #, c-format
 msgid ""
@@ -8928,32 +8712,37 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-
-#, fuzzy
+"Identyfikator \"%s\" może odnosić się do dowolnej grupy książki adresowej "
+"programu Notes. Proszę wybrać poprawną grupę z poniższej listy, aby dodać ją "
+"do listy znajomych."
+
 msgid "Select Notes Address Book"
-msgstr "Dodaj do książki adresowej"
+msgstr "Wybór książki adresowej programu Notes"
 
 msgid "Unable to add group: group not found"
-msgstr "Nie można dodać do grupy - grupa nie została odnaleziona"
+msgstr "Nie można dodać do grupy: nie odnaleziono grupy"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-
-#, fuzzy
+"Identyfikator \"%s\" nie pasuje do żadnej grupy książki adresowej programu "
+"Notes w społeczności Sametime."
+
 msgid "Notes Address Book Group"
-msgstr "Dodaj do książki adresowej"
+msgstr "Grupa książki adresowej programu 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 ""
+"Proszę podać nazwę grupy książki adresowej w poniższym polu, aby dodać grupę "
+"i jej członków do listy znajomych."
 
 #, c-format
 msgid "Search results for '%s'"
-msgstr "Wyniki wyszukiwania dla '%s'"
+msgstr "Wyniki wyszukiwania dla \"%s\""
 
 #, c-format
 msgid ""
@@ -8961,50 +8750,56 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"Identyfikator \"%s\" może odnosić się do dowolnego z poniższych "
+"użytkowników. Można dodać tych użytkowników do listy znajomych lub wysłać im "
+"wiadomości za pomocą poniższych przycisków czynności."
 
 msgid "Search Results"
 msgstr "Wyniki wyszukiwania"
 
 msgid "No matches"
-msgstr "Nic nie znaleziono"
+msgstr "Brak wyników"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
+"Identyfikator \"%s\" nie pasuje do żadnego użytkownika w społeczności "
+"Sametime."
 
 msgid "No Matches"
-msgstr "Nic nie znaleziono"
+msgstr "Brak wyników"
 
 msgid "Search for a user"
-msgstr "Szukanie użytkownika"
+msgstr "Wyszukaj użytkownika"
 
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
+"Proszę podać nazwę lub częściowy identyfikator w poniższym polu, aby "
+"wyszukać pasujących użytkowników w społeczności Sametime."
 
 msgid "User Search"
 msgstr "Wyszukiwanie użytkownika"
 
 msgid "Import Sametime List..."
-msgstr "Import listy Sametime..."
+msgstr "Zaimportuj listę Sametime..."
 
 msgid "Export Sametime List..."
-msgstr "Eksport listy Sametime..."
-
-#, fuzzy
+msgstr "Wyeksportuj listę Sametime..."
+
 msgid "Add Notes Address Book Group..."
-msgstr "Dodaj do książki adresowej"
+msgstr "Dodaj grupę książki adresowej programu Notes..."
 
 msgid "User Search..."
 msgstr "Wyszukiwanie użytkownika..."
 
 msgid "Force login (ignore server redirects)"
-msgstr "Wymuś logowanie (ignorując przekierowania)"
+msgstr "Wymuszenie logowania (ignorowanie przekierowań serwera)"
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr "Ukryj identyfikator klienta"
+msgstr "Ukrycie tożsamości klienta"
 
 #, c-format
 msgid "User %s is not present in the network"
@@ -9014,25 +8809,25 @@
 msgstr "Akceptacja klucza"
 
 msgid "Cannot perform the key agreement"
-msgstr "Nie można zaakceptować klucza"
+msgstr "Nie można wykonać akceptacji klucza"
 
 msgid "Error occurred during key agreement"
-msgstr "Nastąpił błąd podczas akceptowania klucza"
+msgstr "Wystąpił błąd podczas akceptacji klucza"
 
 msgid "Key Agreement failed"
-msgstr "Akceptowanie klucza zakończyło się niepowodzeniem"
+msgstr "Akceptacja klucza nie powiodło się"
 
 msgid "Timeout during key agreement"
-msgstr "Upłynął limit czasu oczekiwania na akceptację klucza"
+msgstr "Przekroczono czas oczekiwania podczas akceptacji klucza"
 
 msgid "Key agreement was aborted"
-msgstr "Akceptacja klucza została przerwana"
+msgstr "Przerwano akceptację klucza"
 
 msgid "Key agreement is already started"
-msgstr "Proces akceptacji klucza jest już rozpoczęty"
+msgstr "Akceptacja klucza jest już rozpoczęta"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr "Nie można rozpocząć akceptacji klucza z sobą samym"
+msgstr "Nie można rozpocząć akceptacji klucza ze sobą"
 
 msgid "The remote user is not present in the network any more"
 msgstr "Zdalny użytkownik nie jest już obecny na sieci"
@@ -9042,8 +8837,8 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"Otrzymano prośbę akceptacji klucza od %s. Czy chcesz rozpocząć proces "
-"akceptacji klucza?"
+"Odebrano żądanie akceptacji klucza od użytkownika %s. Wykonać akceptację "
+"klucza?"
 
 #, c-format
 msgid ""
@@ -9056,7 +8851,7 @@
 "Zdalnym porcie: %d"
 
 msgid "Key Agreement Request"
-msgstr "Prośba akceptacji klucza"
+msgstr "Żądanie akceptacji klucza"
 
 msgid "IM With Password"
 msgstr "Wiadomość z hasłem"
@@ -9093,9 +8888,9 @@
 "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 ""
-"Nie można otrzymać powiadomień o stanie użytkownika dopóki nie zostanie "
-"zaimportowany jego klucz publiczny. Można użyć polecenia Pobierz klucz "
-"publiczny, aby go otrzymać."
+"Nie można odbierać powiadomień znajomego, dopóki nie zostanie zaimportowany "
+"jego klucz publiczny. Można użyć polecenia Pobierz klucz publiczny, aby go "
+"uzyskać."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -9110,27 +8905,28 @@
 "a public key."
 msgstr ""
 "Aby dodać znajomego należy najpierw zaimportować jego klucz publiczny. W tym "
-"celu przyciśnij przycisk Importuj."
+"celu należy nacisnąć przycisk Zaimportuj."
 
 msgid "_Import..."
-msgstr "_Import..."
+msgstr "Zai_mportuj..."
 
 msgid "Select correct user"
-msgstr "Wybierz właściwego użytkownika"
+msgstr "Wybór właściwego użytkownika"
 
 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 ""
 "Odnaleziono więcej niż jednego użytkownika z tym samym kluczem publicznym. "
-"Wybierz właściwego użytkownika, którego chcesz dodać do listy znajomych."
+"Proszę wybrać właściwego użytkownika, który ma zostać dodany do listy "
+"znajomych."
 
 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 ""
-"Odnaleziono więcej niż jednego użytkownika o tej samej nazwie. Wybierz "
-"właściwego użytkownika, którego chcesz dodać do listy znajomych."
+"Odnaleziono więcej niż jednego użytkownika o tej samej nazwie. Proszę wybrać "
+"właściwego użytkownika, który ma zostać dodany do listy znajomych."
 
 msgid "Detached"
 msgstr "Oderwany"
@@ -9142,7 +8938,7 @@
 msgstr "Obudźcie mnie"
 
 msgid "Hyper Active"
-msgstr "Bardzo Aktywny"
+msgstr "Hiperaktywny"
 
 msgid "Robot"
 msgstr "Robot"
@@ -9175,10 +8971,10 @@
 msgstr "Strefa czasowa"
 
 msgid "Geolocation"
-msgstr "Położenie"
+msgstr "Położenie geograficzne"
 
 msgid "Reset IM Key"
-msgstr "Reset klucza wiadomości"
+msgstr "Przywróć klucz wiadomości"
 
 msgid "IM with Key Exchange"
 msgstr "Wiadomość z wymianą kluczy"
@@ -9193,7 +8989,7 @@
 msgstr "Zabij użytkownika"
 
 msgid "Draw On Whiteboard"
-msgstr "Rysowanie na tablicy"
+msgstr "Rysuj na tablicy"
 
 msgid "_Passphrase:"
 msgstr "_Hasło:"
@@ -9241,12 +9037,12 @@
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Odcisk klucza założyciela:</b><br>%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Odcisk klucza założyciela:</b><br>%s"
+msgstr "<br><b>Czytelny odcisk klucza założyciela:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr "Dodanie klucza publicznego kanału"
+msgstr "Dodaj klucz publiczny kanału"
 
 #. Add new public key
 msgid "Open Public Key..."
@@ -9266,17 +9062,17 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Autoryzacja kanału może służyć do zabezpieczenia przed wstępem osób "
-"niepowołanych. Można ją zrealizować w oparciu o hasła i lub podpisy cyfrowe. "
-"Jeżeli będzie ustawione hasło, trzeba je będzie podać aby móc się "
-"przyłączyć. Jeżeli do kanału zostanie przypisana lista kluczy publicznych, "
-"to wstęp będą miały tylko osoby których klucze będą na tej liście."
+"Uwierzytelnienie kanału jest używane do zabezpieczenia przed wstępem osób "
+"nieupoważnionych. Może być oparta o hasła lub podpisy cyfrowe. Jeżeli "
+"zostanie ustawione hasło, wymagane jest podanie go, aby móc dołączyć. Jeśli "
+"zostaną ustawione klucze publiczne, wstęp będą miały tylko osoby, których "
+"klucze znajdują się na liście."
 
 msgid "Channel Authentication"
-msgstr "Autoryzacja kanału"
+msgstr "Uwierzytelnienie kanału"
 
 msgid "Add / Remove"
-msgstr "Dodaj / Usuń"
+msgstr "Dodaj/usuń"
 
 msgid "Group Name"
 msgstr "Nazwa grupy"
@@ -9286,18 +9082,18 @@
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Podaj nazwę i hasło prywatnej grupy kanału %s."
+msgstr "Proszę podać nazwę i hasło prywatnej grupy kanału %s."
 
 msgid "Add Channel Private Group"
-msgstr "Dodanie nowej prywatnej grupy kanału"
+msgstr "Dodaj nową prywatną grupę kanału"
 
 msgid "User Limit"
 msgstr "Ograniczenie użytkowników"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Ustawia ograniczenie użytkowników na kanale. Ustawienie zero = brak "
-"ograniczeń."
+"Ustawia ograniczenie użytkowników na kanale. Należy ustawić zero, aby "
+"przywrócić ograniczenie."
 
 msgid "Invite List"
 msgstr "Lista zaproszonych"
@@ -9308,46 +9104,43 @@
 msgid "Add Private Group"
 msgstr "Dodaj prywatną grupę"
 
-#, fuzzy
 msgid "Reset Permanent"
-msgstr "Usuń kanał tajny"
+msgstr "Przywróć trwałe"
 
 msgid "Set Permanent"
-msgstr ""
+msgstr "Ustaw trwałe"
 
 msgid "Set User Limit"
 msgstr "Ustaw ograniczenie użytkowników"
 
 msgid "Reset Topic Restriction"
-msgstr "Usuń ograniczenia tematu"
+msgstr "Przywróć ograniczenie tematu"
 
 msgid "Set Topic Restriction"
-msgstr "Ustaw ograniczenia tematu"
+msgstr "Ustaw ograniczenie tematu"
 
 msgid "Reset Private Channel"
-msgstr "Usuń kanał prywatny"
+msgstr "Przywróć kanał prywatny"
 
 msgid "Set Private Channel"
 msgstr "Ustaw kanał prywatny"
 
 msgid "Reset Secret Channel"
-msgstr "Usuń kanał tajny"
+msgstr "Przywróć tajny kanał"
 
 msgid "Set Secret Channel"
-msgstr "Ustaw kanał tajny"
+msgstr "Ustaw tajny kanał"
 
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"Aby uzyskać dostęp do prywatnej grupy należy wcześniej przyłączyć się do "
-"kanału %s"
+msgstr "Należy dołączyć do kanału %s przed dołączeniem do prywatnej grupy"
 
 msgid "Join Private Group"
 msgstr "Dołącz do prywatnej grupy"
 
 msgid "Cannot join private group"
-msgstr "Nie można przyłączyć się do prywatnej grupy"
+msgstr "Nie można dołączyć do prywatnej grupy"
 
 msgid "Call Command"
 msgstr "Wywołaj polecenie"
@@ -9364,26 +9157,23 @@
 msgid "Error during file transfer"
 msgstr "Błąd podczas przesyłania pliku"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s rozłączony"
+msgstr "Rozłączono zdalny"
 
 msgid "Permission denied"
 msgstr "Brak dostępu"
 
 msgid "Key agreement failed"
-msgstr "Akceptacja klucza zakończyła się niepowodzeniem"
-
-#, fuzzy
+msgstr "Akceptacja klucza nie powiodła się"
+
 msgid "Connection timed out"
-msgstr "Przekroczono czas połączenia"
-
-#, fuzzy
+msgstr "Przekroczono czas oczekiwania na połączenie"
+
 msgid "Creating connection failed"
-msgstr "Błąd połączenia"
+msgstr "Utworzenie połączenia nie powiodło się"
 
 msgid "File transfer session does not exist"
-msgstr "Brak sesji do przesyłania plików"
+msgstr "Sesja przesyłania plików nie istnieje"
 
 msgid "No file transfer session active"
 msgstr "Brak aktywnej sesji przesyłania plików"
@@ -9392,7 +9182,7 @@
 msgstr "Przesyłanie plików zostało już rozpoczęte"
 
 msgid "Could not perform key agreement for file transfer"
-msgstr "Nie można zaakceptować kluczy do przesyłania plików"
+msgstr "Nie można wykonać akceptacji kluczy do przesyłania plików"
 
 msgid "Could not start the file transfer"
 msgstr "Nie można rozpocząć przesyłania pliku"
@@ -9400,44 +9190,43 @@
 msgid "Cannot send file"
 msgstr "Nie można wysłać pliku"
 
-#, fuzzy
 msgid "Error occurred"
-msgstr "Błąd "
+msgstr "Wystąpił błąd"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s zmienił temat w <I>%s</I> na: %s"
+msgstr "Użytkownik %s zmienił temat w <I>%s</I> na: %s"
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> ustawił tryb kanału <I>%s</I> na: %s"
+msgstr "Użytkownik <I>%s</I> ustawił tryb kanału <I>%s</I> na: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> usunął wszystkie tryby kanału <I>%s</I>"
+msgstr "Użytkownik <I>%s</I> usunął wszystkie tryby kanału <I>%s</I>"
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> ustawił tryb kanału <I>%s</I> na: %s"
+msgstr "Użytkownik <I>%s</I> ustawił tryb kanału <I>%s</I> na: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I> usunął wszystkie tryby kanału <I>%s</I>"
+msgstr "Użytkownik <I>%s</I> usunął wszystkie tryby kanału <I>%s</I>"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "Wyrzucony z kanału <I>%s</I> przez <I>%s</I> (%s)"
+msgstr "Wyrzucono z kanału <I>%s</I> przez użytkownika <I>%s</I> (%s)"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "Zabity przez %s (%s)"
+msgstr "Zabito przez użytkownika %s (%s)"
 
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "Zabity przez %s (%s)"
+msgstr "Zabito przez %s (%s)"
 
 msgid "Server signoff"
-msgstr "Rozłączenie z serwrem"
+msgstr "Rozłączono z serwerem"
 
 msgid "Personal Information"
 msgstr "Informacje osobiste"
@@ -9446,7 +9235,7 @@
 msgstr "Data urodzenia"
 
 msgid "Job Role"
-msgstr "Obowiązki w pracy"
+msgstr "Stanowisko pracy"
 
 msgid "Organization"
 msgstr "Organizacja"
@@ -9455,28 +9244,27 @@
 msgstr "Jednostka"
 
 msgid "Join Chat"
-msgstr "Przyłącz do konferencji"
+msgstr "Dołącz do konferencji"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "Jesteś założycielem kanału <I>%s</I>"
+msgstr "Użytkownik jest założycielem kanału <I>%s</I>"
 
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Założycielem kanału <I>%s</I> jest <I>%s</I>"
 
 msgid "Real Name"
-msgstr "Prawdziwe imię"
+msgstr "Imię i nazwisko"
 
 msgid "Status Text"
-msgstr "Opis stanu"
+msgstr "Tekst stanu"
 
 msgid "Public Key Fingerprint"
 msgstr "Odcisk klucza publicznego"
 
-#, fuzzy
 msgid "Public Key Babbleprint"
-msgstr "Odcisk klucza publicznego"
+msgstr "Czytelny odcisk klucza publicznego"
 
 msgid "_More..."
 msgstr "_Więcej..."
@@ -9494,14 +9282,13 @@
 msgstr "Nie można zmienić pseudonimu"
 
 msgid "Roomlist"
-msgstr "Lista pokojów"
+msgstr "Lista pokoi"
 
 msgid "Cannot get room list"
-msgstr "Nie można pobrać listy pokojów"
-
-#, fuzzy
+msgstr "Nie można pobrać listy pokoi"
+
 msgid "Network is empty"
-msgstr "Statystyki sieci"
+msgstr "Sieć jest pusta"
 
 msgid "No public key was received"
 msgstr "Nie odebrano żadnego klucza publicznego"
@@ -9538,19 +9325,19 @@
 msgstr ""
 "Czas uruchomienia lokalnego serwera: %s\n"
 "Czas działania lokalnego serwera: %s\n"
-"Ilość klientów lokalnego serwera: %d\n"
-"Ilość kanałów lokalnego serwera: %d\n"
-"Ilość operatorów lokalnego serwera: %d\n"
-"Ilość operatorów lokalnego routera: %d\n"
-"Ilość klientów lokalnej komórki: %d\n"
-"Ilość kanałów lokalnej komórki: %d\n"
-"Ilość serwerów lokalnej komórki: %d\n"
-"Ogólna liczba klientów: %d\n"
-"Ogólna liczba kanałów: %d\n"
-"Ogólna liczba serwerów: %d\n"
-"Ogólna liczba routerów: %d\n"
-"Ogólna liczba operatorów serwerów: %d\n"
-"Ogólna liczba operatorów routerów: %d\n"
+"Klienci lokalnego serwera: %d\n"
+"Kanały lokalnego serwera: %d\n"
+"Operatorzy lokalnego serwera: %d\n"
+"Operatorzy lokalnego routera: %d\n"
+"Klienci lokalnej komórki: %d\n"
+"Kanały lokalnej komórki: %d\n"
+"Serwery lokalnej komórki: %d\n"
+"Razem klientów: %d\n"
+"Razem kanałów: %d\n"
+"Razem serwerów: %d\n"
+"Razem routerów: %d\n"
+"Razem operatorów serwerów: %d\n"
+"Razem operatorów routerów: %d\n"
 
 msgid "Network Statistics"
 msgstr "Statystyki sieci"
@@ -9559,20 +9346,19 @@
 msgstr "Ping"
 
 msgid "Ping failed"
-msgstr "Wykonanie polecenia ping nie powiodło się"
+msgstr "Polecenie ping nie powiodło się"
 
 msgid "Ping reply received from server"
-msgstr "Otrzymano odpowiedź ping od serwera"
+msgstr "Odebrano odpowiedź ping od serwera"
 
 msgid "Could not kill user"
 msgstr "Nie można zabić użytkownika"
 
 msgid "WATCH"
-msgstr ""
-
-#, fuzzy
+msgstr "OBSERWUJ"
+
 msgid "Cannot watch user"
-msgstr "Nie można dodać siebie samego"
+msgstr "Nie można obserwować użytkownika"
 
 msgid "Resuming session"
 msgstr "Wznawianie sesji"
@@ -9581,22 +9367,22 @@
 msgstr "Uwierzytelnianie połączenia"
 
 msgid "Verifying server public key"
-msgstr "Weryfikacja klucza publicznego serwera"
+msgstr "Sprawdzanie klucza publicznego serwera"
 
 msgid "Passphrase required"
-msgstr "Wymagane jest hasło"
+msgstr "Hasło jest wymagane"
 
 #, 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 ""
-"Odebrano klucz publiczny od %s. Lokalna kopia różni się jednak od tego "
-"klucza. Czy zaakceptować ten klucz publiczny?"
+"Odebrano klucz publiczny użytkownika %s. Lokalna kopia nie pasuje od tego "
+"klucza. Zaakceptować ten klucz publiczny?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "Odebrano klucz publiczny od %s. Czy chcesz go zaakceptować?"
+msgstr "Odebrano klucz publiczny użytkownika %s. Zaakceptować go?"
 
 #, c-format
 msgid ""
@@ -9605,38 +9391,40 @@
 "%s\n"
 "%s\n"
 msgstr ""
+"Odcisk i czytelny odcisk klucza %s:\n"
+"\n"
+"%s\n"
+"%s\n"
 
 msgid "Verify Public Key"
-msgstr "Weryfikacja klucza publicznego"
+msgstr "Sprawdź klucz publiczny"
 
 msgid "_View..."
-msgstr "_Podgląd..."
+msgstr "_Wyświetl..."
 
 msgid "Unsupported public key type"
-msgstr "Nieobsługiwany rodzaj klucza publicznego"
+msgstr "Nieobsługiwany typ klucza publicznego"
 
 msgid "Disconnected by server"
-msgstr "Rozłączenie przez serwer"
-
-#, fuzzy
+msgstr "Rozłączono przez serwer"
+
 msgid "Error connecting to SILC Server"
-msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
+msgstr "Błąd podczas łączenia z serwerem SILC"
 
 msgid "Key Exchange failed"
-msgstr "Wymiana kluczy zakończyła się niepowodzeniem"
+msgstr "Wymiana kluczy nie powiodła się"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Wznowienie odłączonej sesji zakończyło się niepowodzeniem. Należy połączyć "
-"się ponownie aby nawiązać nowe połączenie."
+"Wznowienie odłączonej sesji nie powiodło się. Naciśnięcie przycisku Połącz "
+"ponownie utworzy nowe połączenie."
 
 msgid "Performing key exchange"
-msgstr "Wymiana kluczy"
-
-#, fuzzy
+msgstr "Wykonywanie wymiany kluczy"
+
 msgid "Unable to load SILC key pair"
-msgstr "Nie można wczytać pary kluczy SILC: %s"
+msgstr "Nie można wczytać pary kluczy SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9645,24 +9433,22 @@
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Nie można zainicjować protokołu SILC"
 
-#, fuzzy
 msgid "Error loading SILC key pair"
-msgstr "Tworzenie pary kluczy SILC..."
-
-#, fuzzy, c-format
+msgstr "Błąd podczas wczytywania pary kluczy SILC"
+
+#, c-format
 msgid "Download %s: %s"
-msgstr "Użytkownicy na %s: %s"
+msgstr "Pobierz %s: %s"
 
 msgid "Your Current Mood"
 msgstr "Aktualny nastrój"
 
 #, c-format
 msgid "Normal"
-msgstr "Normalna"
+msgstr "Normalny"
 
 msgid "In love"
 msgstr "Zakochany"
@@ -9687,71 +9473,70 @@
 msgstr "Aktualny stan"
 
 msgid "Online Services"
-msgstr "Usługi sieciowe"
+msgstr "Usługi online"
 
 msgid "Let others see what services you are using"
-msgstr "Zezwalaj innym na podgląd używanych usług"
+msgstr "Inni użytkownicy mogą widzieć używane usługi"
 
 msgid "Let others see what computer you are using"
-msgstr "Zezwalaj innym na podgląd informacji o komputerze"
+msgstr "Inni użytkownicy mogą widzieć informacje o komputerze"
 
 msgid "Your VCard File"
-msgstr "Plik z wizytówką (VCard)"
-
-#, fuzzy
+msgstr "Plik vCard"
+
 msgid "Timezone (UTC)"
-msgstr "Strefa czasowa"
+msgstr "Strefa czasowa (UTC)"
 
 msgid "User Online Status Attributes"
-msgstr "Atrybuty stanu połączonych użytkowników"
+msgstr "Atrybuty stanu użytkowników w trybie online"
 
 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 ""
-"Można pozwolić innym użytkownikom na podgląd informacji stanu oraz "
-"osobistych. Wpisz swoje dane które będą prezentowane innym użytkownikom."
+"Można pozwolić innym użytkownikom na podgląd informacji stanu i informacji "
+"osobistych. Proszę wypełnić informacje o sobie, które mają widzieć inni "
+"użytkownicy."
 
 msgid "Message of the Day"
 msgstr "Wiadomość dnia"
 
 msgid "No Message of the Day available"
-msgstr "Brak wiadomości dnia (MOTD)"
+msgstr "Brak wiadomości dnia"
 
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Brak wiadomości dnia (MOTD) powiązanej z tym połączeniem"
+msgstr "Brak wiadomości dnia powiązanej z tym połączeniem"
 
 msgid "Create New SILC Key Pair"
-msgstr "Utwórz nową parę kluczy SLIC"
+msgstr "Utwórz nową parę kluczy SILC"
 
 msgid "Passphrases do not match"
-msgstr "Hasła nie są zgodne."
-
-#, fuzzy
+msgstr "Hasła nie pasują"
+
 msgid "Key Pair Generation failed"
-msgstr "Akceptacja klucza zakończyła się niepowodzeniem"
+msgstr "Utworzenie pary kluczy nie powiodło się"
 
 msgid "Key length"
 msgstr "Długość klucza"
 
 msgid "Public key file"
-msgstr "Plik z kluczem publicznym"
+msgstr "Plik klucza publicznego"
 
 msgid "Private key file"
-msgstr "Plik z kluczem prywatnym"
+msgstr "Plik klucza prywatnego"
 
 msgid "Passphrase (retype)"
-msgstr "Powtórz hasło:"
+msgstr "Hasło (ponownie)"
 
 msgid "Generate Key Pair"
-msgstr "Generuj parę kluczy"
+msgstr "Utwórz parę kluczy"
 
 msgid "Online Status"
-msgstr "Stan podłączenia"
+msgstr "Stan trybu online"
 
 msgid "View Message of the Day"
-msgstr "Podgląd wiadomości dnia (MOTD)"
+msgstr "Wyświetl wiadomość dnia"
 
 msgid "Create SILC Key Pair..."
 msgstr "Utwórz parę kluczy SILC..."
@@ -9761,14 +9546,14 @@
 msgstr "Użytkownik <I>%s</I> nie jest obecny w sieci"
 
 msgid "Topic too long"
-msgstr "Temat jest zbyt długi"
+msgstr "Temat jest za długi"
 
 msgid "You must specify a nick"
-msgstr "Należy podać ksywę"
+msgstr "Należy podać pseudonim"
 
 #, c-format
 msgid "channel %s not found"
-msgstr "kanał %s nie został znaleziony"
+msgstr "nie odnaleziono kanału %s"
 
 #, c-format
 msgid "channel modes for %s: %s"
@@ -9780,124 +9565,119 @@
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Ustawienie cmodes dla %s zakończyło się niepowodzeniem"
+msgstr "Ustawienie cmodes dla %s nie powiodło się"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Nieznane polecenie: %s (może być spowodowane błędem w Pidgin)"
+msgstr "Nieznane polecenie: %s (może być błędem klienta)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanał]:  Powoduje wyjście z aktualnego kanału"
+msgstr "part [kanał]: opuszcza konferencję"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanał]:  Powoduje wyjście z aktualnego kanału"
+msgstr "leave [kanał]: opuszcza konferencję"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;nowy temat&gt;]:  Wyświetla lub zmienia temat"
+msgstr "topic [&lt;nowy temat&gt;]: wyświetla lub zmienia temat"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanał&gt; [&lt;hasło&gt;]:  Przyłącza się do kanału w tej sieci"
+msgstr "join &lt;kanał&gt; [&lt;hasło&gt;]: dołącza do kanału w tej sieci"
 
 msgid "list:  List channels on this network"
-msgstr "list:  Wyświetla listę kanałów w tej sieci"
+msgstr "list: wyświetla listę kanałów w tej sieci"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;ksywa&gt;:  Wyświetla informacje o określonym użytkowniku"
+msgstr "whois &lt;pseudonim&gt;: wyświetla informacje o pseudonimie"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"msg &lt;ksywa&gt; &lt;wiadomość&gt;:  Wysyła wiadomość prywatną do "
+"msg &lt;pseudonim&gt; &lt;wiadomość&gt;: wysyła prywatną wiadomość do "
 "użytkownika"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;ksywa&gt; [&lt;wiadomość&gt;]:  Wysyła wiadomość prywatną do "
+"query &lt;pseudonim&gt; [&lt;wiadomość&gt;]: wysyła prywatną wiadomość do "
 "użytkownika"
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  Wyświetla wiadomości dnia (MOTD) serwera"
+msgstr "motd: wyświetla wiadomość dnia serwera"
 
 msgid "detach:  Detach this session"
-msgstr "detach:  Odłącza sesję"
+msgstr "detach: odłącza tę sesję"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-"quit [komunikat]: Przerywa połączenie z serwerem z opcjonalnym komunikatem"
+msgstr "quit [wiadomość]: rozłącza z serwerem, z opcjonalną wiadomością"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;polecenie&gt;:  Wywołuje dowolne polecenie klienta silc"
+msgstr "call &lt;polecenie&gt;: wywołuje dowolne polecenie klienta SILC"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;ksywa&gt; [-pubkey|&lt;powód&gt;]:  Ubija wskazanego użytkownika"
+msgstr "kill &lt;pseudonim&gt; [-pubkey|&lt;powód&gt;]: zabija pseudonim"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;nowa_ksywa&gt;:  Zmienia ksywę"
+msgstr "nick &lt;nowy_pseudonim&gt;: zmienia pseudonim"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;ksywa&gt;:  Wyświetla informacje o określonym użytkowniku"
+msgstr "whowas &lt;pseudonim&gt;: wyświetla informacje o pseudonimie"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;kanał&gt; [+|-&lt;tryby&gt;] [argumenty]:  Zmienia lub wyświetla "
-"ustawienia trybów kanału"
+"cmode &lt;kanał&gt; [+|-&lt;tryby&gt;] [parametry]: zmienia lub wyświetla "
+"tryby kanału"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cmode &lt;kanał&gt; +|-&lt;tryby&gt; &lt;ksywa&gt;:  Zmienia ustawienia "
-"trybów określonego użytkownika kanału"
+"cmode &lt;kanał&gt; +|-&lt;tryby&gt; &lt;pseudonim&gt;: zmienia tryby "
+"pseudonimu na kanale"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;usermodes&gt;:  Ustawia tryby użytkownika w sieci"
+msgstr "umode &lt;tryby_użytkownika&gt;: ustawia tryby użytkownika w sieci"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;ksywa&gt; [-klucz_publiczny]:  Powoduje uzyskanie uprawnień "
-"operatora serwera"
+"oper &lt;pseudonim&gt; [-pubkey]: uzyskuje uprawnienia operatora serwera"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanał&gt; [-|+]&lt;ksywa&gt;:  Zaprasza użytkownika lub dodaje/"
+"invite &lt;kanał&gt; [-|+]&lt;pseudonim&gt;: zaprasza pseudonim lub dodaje/"
 "usuwa go z listy osób zaproszonych na kanał"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanał&gt; &lt;ksywa&gt; [komentarz]:  Wyrzuca określonego "
-"użytkownika z kanału"
+"kick &lt;kanał&gt; &lt;pseudonim&gt; [komentarz]: wyrzuca klienta z kanału"
 
 msgid "info [server]:  View server administrative details"
 msgstr ""
-"info [serwer]:  Wyświetla szczegółowe informacje administracyjne serwera"
+"info [serwer]: wyświetla szczegółowe informacje administracyjne serwera"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;kanał&gt; +|-&lt;ksywa&gt;]:  Blokuje klienta w kanle"
+msgstr "ban [&lt;kanał&gt; +|-&lt;pseudonim&gt;]: blokuje klienta w kanale"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;ksywa|serwer&gt;:  Pobiera klucz publiczny serwera lub użytkownika"
+"getkey &lt;pseudonim|serwer&gt;: pobiera klucz publiczny klienta lub serwera"
 
 msgid "stats:  View server and network statistics"
-msgstr "stats:  Wyświetla statystyki serwera i sieci"
+msgstr "stats: wyświetla statystyki serwera i sieci"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping:  Wysyła PING do połączonego serwera"
+msgstr "ping: wysyła PING do połączonego serwera"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;kanał&gt;:  Wyświetla listę użytkowników na danym kanale"
+msgstr "users &lt;kanał&gt;: wyświetla użytkowników na kanale"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanał(y)&gt;:  Wyświetla "
-"listę użytkowników wg podanych kryteriów"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanały&gt;: wyświetla listę "
+"podanych użytkowników na kanałach"
 
 #. *< type
 #. *< ui_requirement
@@ -9913,18 +9693,16 @@
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr ""
-"Protokół Secure Internet Live Conferencing (SILC) (Bezpieczne Internetowe "
-"Konferencje na Żywo)"
+msgstr "Protokół SILC (Secure Internet Live Conferencing)"
 
 msgid "Network"
 msgstr "Sieć"
 
 msgid "Public Key file"
-msgstr "Plik z kluczem publicznym"
+msgstr "Plik klucza publicznego"
 
 msgid "Private Key file"
-msgstr "Plik z kluczem prywatnym"
+msgstr "Plik klucza prywatnego"
 
 msgid "Cipher"
 msgstr "Szyfr"
@@ -9933,7 +9711,7 @@
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Użycie doskonałej magii przekierowania"
 
 msgid "Public key authentication"
 msgstr "Uwierzytelnianie kluczem publicznym"
@@ -9942,27 +9720,26 @@
 msgstr "Blokowanie wiadomości bez wymiany klucza"
 
 msgid "Block messages to whiteboard"
-msgstr "Blokuj wiadomości do tabicly"
+msgstr "Blokowanie wiadomości do tablicy"
 
 msgid "Automatically open whiteboard"
-msgstr "Automatycznie otwieraj tabilcę"
+msgstr "Automatyczne otwieranie tablicy"
 
 msgid "Digitally sign and verify all messages"
-msgstr "Podpisuj cyfrowo i weryfikuj wszystkie wiadomości"
+msgstr "Cyfrowe podpisywanie i sprawdzanie wszystkich wiadomości"
 
 msgid "Creating SILC key pair..."
 msgstr "Tworzenie pary kluczy SILC..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Tworzenie pary kluczy SILC..."
+msgstr "Nie można utworzyć pary kluczy 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 "Prawdziwe imię: \t%s\n"
+msgstr "Imię i nazwisko: \t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
@@ -9970,7 +9747,7 @@
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Email: \t\t%s\n"
+msgstr "Adres e-mail: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -9990,11 +9767,11 @@
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Długość klucza: \t%d bitów\n"
-
-#, fuzzy, c-format
+msgstr "Długość klucza: \t%d bity\n"
+
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Powód: %s"
+msgstr "Wersja: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10006,21 +9783,19 @@
 "%s\n"
 "\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Odcisk klucza publicznego:\n"
-"%s\n"
-"\n"
+"Czytelny odcisk klucza publicznego:\n"
+"%s"
 
 msgid "Public Key Information"
 msgstr "Informacje o kluczu publicznym"
 
-#, fuzzy
 msgid "Paging"
-msgstr "Ping"
+msgstr "Stronicowanie"
 
 msgid "Video Conferencing"
 msgstr "Konferencje wideo"
@@ -10036,94 +9811,87 @@
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
+msgstr "Użytkownik %s wysłał wiadomość do tablicy. Otworzyć ją?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr ""
+msgstr "Użytkownik %s wysłał wiadomość do tablicy kanału %s. Otworzyć ją?"
 
 msgid "Whiteboard"
-msgstr "Tablica do rysowania"
+msgstr "Tablica"
 
 msgid "No server statistics available"
-msgstr "Serwer nie posiada statystyk"
+msgstr "Brak dostępnych statystyk serwera"
 
 msgid "Error during connecting to SILC Server"
-msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
+msgstr "Błąd podczas łączenia z serwerem SILC"
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Błąd: Niezgodność wersji, należy zaktualizować oprogramowanie klienta"
+msgstr "Błąd: niezgodna wersja, należy zaktualizować klienta"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Błąd: Druga strona nie obsługuje/nie ufa zaproponowanemu kluczowi publicznemu"
+msgstr "Błąd: zdalny nie ufa/nie obsługuje klucza publicznego"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Błąd: Druga strona nie obsługuje zaproponowanej grupy KE"
+msgstr "Błąd: zdalny nie obsługuje zaproponowanej grupy KE"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Błąd: Druga strona nie obsługuje zaproponowanego szyfrowania"
+msgstr "Błąd: zdalny nie obsługuje zaproponowanego szyfru"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Błąd: Druga strona nie obsługuje zaproponowanego PKCS"
+msgstr "Błąd: zdalny nie obsługuje zaproponowanego PKCS"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Błąd: Druga strona nie obsługuje zaproponowanej funkcji hashującej"
+msgstr "Błąd: zdalny nie obsługuje zaproponowanej funkcji mieszającej"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Błąd: Druga strona nie obsługuje zaproponowanego HMAC"
+msgstr "Błąd: zdalny nie obsługuje zaproponowanego HMAC"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "Błąd: Niewłaściwy podpis"
+msgstr "Błąd: niepoprawny podpis"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Błąd: Niewłaściwe ciasteczko (cookie)"
+msgstr "Błąd: nieprawidłowe ciasteczko"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Błąd: Uwierzytelnianie nie powiodło się"
-
-#, fuzzy
+msgstr "Błąd: uwierzytelnienie nie powiodło się"
+
 msgid "Unable to initialize SILC Client connection"
 msgstr "Nie można zainicjować połączenia klienta SILC"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Brak nazwy"
-
-#, fuzzy, c-format
+msgstr "Jan Bezimienny"
+
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Nie można wczytać pary kluczy SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Nie można utworzyć połączenia"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Nieznany powód."
-
-#, fuzzy
+msgstr "Nieznana odpowiedź serwera"
+
 msgid "Unable to create listen socket"
-msgstr "Nie można utworzyć gniazda"
-
-#, fuzzy
+msgstr "Nie można utworzyć gniazda nasłuchiwania"
+
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "nazwy użytkownika SIP nie mogą zawierać odstępów ani znaku @"
-
-#, fuzzy
+msgstr "Nazwy użytkowników SIP nie mogą zawierać spacji ani symboli @"
+
 msgid "SIP connect server not specified"
-msgstr "Port serwera"
+msgstr "Nie podano serwera połączenia SIP"
 
 #. *< type
 #. *< ui_requirement
@@ -10134,44 +9902,41 @@
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "wtyczka protokołu SIP/SIMPLE"
+msgstr "Wtyczka protokołu SIP/SIMPLE"
 
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Wtyczka protokołu SIP/SIMPLE"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-"Opublikuj status (zwróć uwagę na to że każdy będzie mógł Ciebie obserwować)"
+msgstr "Publikacja stanu (uwaga: każdy będzie mógł obserwować użytkownika)"
 
 msgid "Use UDP"
-msgstr "Używaj UDP"
+msgstr "Użycie UDP"
 
 msgid "Use proxy"
-msgstr "Używaj serwerów pośredniczących (proxy)"
+msgstr "Użycie pośrednika"
 
 msgid "Proxy"
-msgstr "Pośrednik (proxy)"
+msgstr "Pośrednik"
 
 msgid "Auth User"
-msgstr "Użytkownik do autoryzacji"
+msgstr "Uwierzytelnienie użytkownika"
 
 msgid "Auth Domain"
-msgstr "Domena do autoryzacji"
+msgstr "Domena uwierzytelnienia"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;pokój&gt;:  Przyłącza do pokoju konferencyjnego w sieci Yahoo"
-
-#, fuzzy
+msgstr "join &lt;pokój&gt;: dołącza do pokoju konferencji w sieci Yahoo!"
+
 msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Wyświetla listę kanałów w tej sieci"
+msgstr "list: wyświetla listę pokoi w sieci Yahoo!"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
+msgstr "doodle: żąda od użytkownika rozpoczęcia sesji Doodle"
+
 msgid "Yahoo ID..."
-msgstr "Identyfikator Yahoo!"
+msgstr "Identyfikator Yahoo!..."
 
 #. *< type
 #. *< ui_requirement
@@ -10183,9 +9948,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Wtyczka protokołu Yahoo"
+msgstr "Wtyczka protokołu Yahoo!"
 
 msgid "Pager server"
 msgstr "Serwer pagera"
@@ -10194,33 +9958,31 @@
 msgstr "Port pagera"
 
 msgid "File transfer server"
-msgstr "Serwer do przesyłania plików"
+msgstr "Serwer przesyłania plików"
 
 msgid "File transfer port"
-msgstr "Port do przesyłania plików"
+msgstr "Port przesyłania plików"
 
 msgid "Chat room locale"
-msgstr "Ustawienia lokalne pokoju konferencyjnego"
+msgstr "Lokalizacja pokoju konferencji"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorowanie zaproszeń do pokojów konferencyjnych"
+msgstr "Ignorowanie zaproszeń do konferencji"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Użycie pośrednika konta dla połączeń SSL"
 
 msgid "Chat room list URL"
-msgstr "URL z listą pokoi konferencyjnych"
+msgstr "Adres URL listy pokoi konferencji"
 
 msgid "Yahoo Chat server"
-msgstr "Serwer konferencji Yahoo"
-
-#, fuzzy
+msgstr "Serwer konferencji Yahoo!"
+
 msgid "Yahoo Chat port"
-msgstr "Serwer konferencji Yahoo"
-
-#, fuzzy
+msgstr "Port konferencji Yahoo!"
+
 msgid "Yahoo JAPAN ID..."
-msgstr "Identyfikator Yahoo!"
+msgstr "Identyfikator Yahoo! Japan..."
 
 #. *< type
 #. *< ui_requirement
@@ -10232,66 +9994,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Wtyczka protokołu Yahoo"
+msgstr "Wtyczka protokołu Yahoo! Japan"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
+"Użytkownik %s wysyłał zaproszenie kamery internetowej, które nie jest "
+"jeszcze obsługiwane."
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Wiadomość SMS nie została dostarczona"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Wiadomość Yahoo! nie została wysłana."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "Wiadomość systemowa Yahoo! dla %s:"
+msgstr "Wiadomość systemu Yahoo! dla %s:"
 
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"Użytkownik %s odrzucił prośbę o dodanie go do listy z następującego powodu: %"
+"Użytkownik %s odrzucił żądanie dodania go do listy z następującego powodu: %"
 "s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "Użytkownik %s odrzucił prośbę o dodanie go do listy."
+msgstr "Użytkownik %s odrzucił żądania dodania go do listy."
 
 msgid "Add buddy rejected"
-msgstr "Dodanie znajomego zostało odrzucone"
+msgstr "Odrzucono dodanie znajomego"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Nie udało się połączyć z serwerem."
+msgstr "Odebrano nieprawidłowe dane"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
-"ten problem."
+"Zablokowano konto: za dużo nieudanych prób zalogowania. Zalogowanie na "
+"stronę WWW Yahoo! może to naprawić."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
-"ten problem."
+"Zablokowano konto: nieznany powód. Zalogowanie na stronę WWW Yahoo! może to "
+"naprawić."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Niepoprawny identyfikator lub hasło"
+msgstr "Brak nazwy użytkownika lub hasła"
 
 #, c-format
 msgid ""
@@ -10299,88 +10058,78 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"Serwer Yahoo zażądał użycia nierozpoznanej metody uwierzytelnienia. Ta "
-"wersja programu Pidgin prawdopodobnie nie będzie w stanie pomyślnie "
-"zalogować się do Yahoo. Sprawdź %s w celu pobrania uaktualnień."
+"Serwer Yahoo! zażądał użycia nierozpoznanej metody uwierzytelniania. "
+"Prawdopodobnie nie będzie można pomyślnie zalogować się do Yahoo!. Proszę "
+"sprawdzić %s, aby zaktualizować."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Niepowodzenie podczas uwierzytelniania Yahoo!"
+msgstr "Uwierzytelnianie Yahoo! nie powiodło się"
 
 #, 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 ""
-"Próbowano zignorować %s, lecz użytkownik ten znajduje się na liście "
-"znajomych. Kliknięcie przycisku \"Tak\" spowoduje usunięcie i ignorowanie "
-"tej osoby."
+"Próbowano zignorować użytkownika %s, ale znajduje się on na liście "
+"znajomych. Naciśnięcie przycisku \"Tak\" usunie i zignoruje znajomego."
 
 msgid "Ignore buddy?"
-msgstr "Ignorować znajomego?"
-
-#, fuzzy
+msgstr "Zignorować znajomego?"
+
 msgid "Invalid username or password"
-msgstr "Niepoprawny identyfikator lub hasło"
-
-#, fuzzy
+msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
+
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
-"ten problem."
+"Konto zostało zablokowane z powodu za dużej ilości nieudanych prób "
+"zalogowania. Proszę spróbować zalogować się na stronie WWW Yahoo!."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Nieznany błąd 52. Ponowne połączenie powinno to naprawić."
 
 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 ""
+"Błąd 1013: podana nazwa użytkownika jest nieprawidłowa. Najczęstszym powodem "
+"tego błędu jest podanie adresu e-mail zamiast identyfikatora Yahoo!."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
-"ten problem."
-
-#, fuzzy, c-format
+"Nieznany błąd numer %d. Zalogowanie na stronę WWW Yahoo! może to naprawić."
+
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Nie można dodać znajomego %s do grupy %s na liście serwerowej związanej z "
-"kontem %s."
-
-#, fuzzy
+"Nie można dodać znajomego %s do grupy %s na liście serwera na koncie %s."
+
 msgid "Unable to add buddy to server list"
-msgstr "Nie można dołączyć znajomego do listy serwerowej"
+msgstr "Nie można dodać znajomego do listy serwera"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#, fuzzy
+msgstr "[Słyszalne%s/%s/%s.swf] %s"
+
 msgid "Received unexpected HTTP response from server"
-msgstr "Nieprawidłowa odpowiedź z serwera HTTP."
-
-#, fuzzy, c-format
+msgstr "Odebrano nieoczekiwaną odpowiedź z serwera HTTP"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Utracono połączenie z serwerem:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Utracono połączenie z %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem:\n"
-"%s"
+msgstr "Nie można nawiązać połączenia z %s: %s"
 
 msgid "Not at Home"
 msgstr "Poza domem"
 
-#, fuzzy
 msgid "Not at Desk"
-msgstr "Poza domem"
+msgstr "Poza biurkiem"
 
 msgid "Not in Office"
 msgstr "Poza biurem"
@@ -10392,28 +10141,25 @@
 msgstr "Wyszedł na chwilę"
 
 msgid "Not on server list"
-msgstr "Brak na liście serwerowej"
-
-#, fuzzy
+msgstr "Brak na liście serwera"
+
 msgid "Appear Online"
-msgstr "Wygląda na rozłączony"
-
-#, fuzzy
+msgstr "Wygląda na tryb online"
+
 msgid "Appear Permanently Offline"
-msgstr "Wygląda na rozłączony"
+msgstr "Wygląda na trwały tryb offline"
 
 msgid "Presence"
 msgstr "Obecność"
 
 msgid "Appear Offline"
-msgstr "Wygląda na rozłączony"
-
-#, fuzzy
+msgstr "Wygląda na tryb offline"
+
 msgid "Don't Appear Permanently Offline"
-msgstr "Wygląda na rozłączony"
+msgstr "Nie wygląda na rwały tryb offline"
 
 msgid "Join in Chat"
-msgstr "Przyłącz się do konferencji"
+msgstr "Dołącz do konferencji"
 
 msgid "Initiate Conference"
 msgstr "Rozpocznij konferencję"
@@ -10421,41 +10167,40 @@
 msgid "Presence Settings"
 msgstr "Ustawienia obecności"
 
-#, fuzzy
 msgid "Start Doodling"
-msgstr "Rozpoczyna pisanie"
+msgstr "Rozpocznij sesję Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Wybierz identyfikator do aktywacji"
 
 msgid "Join whom in chat?"
-msgstr "Kogo przyłączyć do konferencji?"
+msgstr "Kogo dołączyć do konferencji?"
 
 msgid "Activate ID..."
-msgstr "Aktywacja ID..."
-
-#, fuzzy
+msgstr "Aktywuj identyfikator..."
+
 msgid "Join User in Chat..."
-msgstr "Przyłącz do konferencji..."
-
-#, fuzzy
+msgstr "Dołącz użytkownika do konferencji..."
+
 msgid "Open Inbox"
-msgstr "Otwórz skrzynkę Hotmail"
+msgstr "Otwórz skrzynkę odbiorczą"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"Nie można wysłać wiadomości SMS. Nie można uzyskać operatora sieci "
+"komórkowej."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Nie można wysłać wiadomości SMS. Nieznany operator sieci komórkowej."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Uzyskiwanie operatora sieci komórkowej, aby wysłać wiadomość 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 "Wysłano żądanie Doodle."
 
 msgid "Unable to connect."
 msgstr "Nie można się połączyć."
@@ -10463,15 +10208,15 @@
 msgid "Unable to establish file descriptor."
 msgstr "Nie można ustanowić deskryptora pliku."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s chce przesłać Tobie plik %s"
+msgstr "Użytkownik %s próbuje wysłać grupę %d plików.\n"
 
 msgid "Write Error"
 msgstr "Błąd zapisu"
 
 msgid "Yahoo! Japan Profile"
-msgstr "Profil Yahoo! Japonia"
+msgstr "Profil Yahoo! Japan"
 
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
@@ -10480,15 +10225,14 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
-"Niestety, profile oznaczone jako zawierające treści dla dorosłych nie są "
-"jeszcze obsługiwane."
+"Profile oznaczone jako zawierające treści dla dorosłych nie są jeszcze "
+"obsługiwane."
 
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Jeżeli chcesz obejrzeć ten profil, musisz otworzyć ten odnośnik za pomocą "
-"przeglądarki WWW:"
+"Aby wyświetlić ten profil, należy odwiedzić ten odnośnik w przeglądarce WWW:"
 
 msgid "Yahoo! ID"
 msgstr "Identyfikator Yahoo!"
@@ -10497,7 +10241,7 @@
 msgstr "Hobby"
 
 msgid "Latest News"
-msgstr "Ostatnie wiadomości"
+msgstr "Ostatnie aktualności"
 
 msgid "Home Page"
 msgstr "Strona domowa"
@@ -10514,39 +10258,38 @@
 msgid "Last Update"
 msgstr "Ostatnia aktualizacja"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Przepraszamy, ale ten profil jest w języku, który nie jest jeszcze "
-"obsługiwany."
+"Ten profil jest w języku lub formatowaniu, które nie jest jeszcze "
+"obsługiwane."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"Nie można pobrać profilu użytkownika. Najczęściej błąd ten jest spowodowany "
-"tymczasowymi kłopotami po stronie serwera. Spróbuj później."
+"Nie można pobrać profilu użytkownika. Najprawdopodobniej są to tymczasowe "
+"problemy ze strony serwera. Proszę spróbować później."
 
 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 ""
-"Nie można pobrać profilu użytkownika. Najczęściej oznacza to, że użytkownik "
-"nie istnieje. Czasami jednak Yahoo! ma problemy ze znalezieniem profilu "
-"użytkownika. Jeżeli masz pewność, że użytkownik istnieje, spróbuj pobrać "
-"jego profil o innej porze."
+"Nie można pobrać profilu użytkownika. Najprawdopodobniej oznacza to, że "
+"użytkownik nie istnieje. Czasami jednak Yahoo! ma problemy z odnalezieniem "
+"profilu użytkownika. Jeśli użytkownik na pewno istnieje, proszę spróbować "
+"później."
 
 msgid "The user's profile is empty."
 msgstr "Profil użytkownika jest pusty."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s zalogował się."
+msgstr "Użytkownik %s odmówił dołączenia."
 
 msgid "Failed to join chat"
-msgstr "Nie można przyłączyć się do konferencji"
+msgstr "Dołączenie do konferencji nie powiodło się"
 
 #. -6
 msgid "Unknown room"
@@ -10564,21 +10307,21 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"Nieznany błąd. Możliwe, że będziesz musiała/musiał się wylogować na pięć "
-"minut, aby mieć możliwość ponownego dołączenia do konferencji"
+"Nieznany błąd. Należy wylogować się i poczekać pięć minut przed możliwością "
+"ponownego dołączenia do pokoju konferencji"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Prowadzisz teraz dyskusję w %s."
+msgstr "Prowadzona jest rozmowa w %s."
 
 msgid "Failed to join buddy in chat"
-msgstr "Nie można przyłączyć znajomego do konferencji"
+msgstr "Dołączenie znajomego do konferencji nie powiodło się"
 
 msgid "Maybe they're not in a chat?"
 msgstr "Może nie ma ich na konferencji?"
 
 msgid "Fetching the room list failed."
-msgstr "Błąd przy pobieraniu listy pokoi."
+msgstr "Pobieranie listy pokoi nie powiodło się."
 
 msgid "Voices"
 msgstr "Rozmowy głosowe"
@@ -10587,7 +10330,7 @@
 msgstr "Kamery internetowe"
 
 msgid "Connection problem"
-msgstr "Błąd połączenia"
+msgstr "Problem połączenia"
 
 msgid "Unable to fetch room list."
 msgstr "Nie można pobrać listy pokoi."
@@ -10595,30 +10338,29 @@
 msgid "User Rooms"
 msgstr "Pokoje użytkowników"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Wystąpiły problemy przy połączeniu z serwerem YCHT."
+msgstr "Problem połączenia z serwerem YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(Wystąpił błąd przy konwersji tej wiadomości. Sprawdź opcję \"Kodowanie\" w "
-"edytorze kont)"
+"(Wystąpił błąd podczas konwertowania tej wiadomości.\t Proszę sprawdzić "
+"opcję \"Kodowanie\" w edytorze kont)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Nie można wysłać wiadomości do konferencji %s,%s,%s"
+msgstr "Nie można wysłać do konferencji %s,%s,%s"
 
 msgid "Hidden or not logged-in"
-msgstr "Ukryty lub nie zalogowany"
+msgstr "Ukryty lub niezalogowany"
 
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Przy %s od %s"
 
 msgid "Anyone"
-msgstr "Ktokolwiek"
+msgstr "Każdy"
 
 msgid "_Class:"
 msgstr "_Klasa:"
@@ -10627,64 +10369,64 @@
 msgstr "_Instancja:"
 
 msgid "_Recipient:"
-msgstr "_Odbiorca:"
+msgstr "Odbio_rca:"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Próba subskrypcji %s,%s,%s zakończyła się niepowodzeniem"
+msgstr "Próba subskrypcji %s,%s,%s nie powiodła się"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;ksywa&gt;: Znajduje użytkownika"
+msgstr "zlocate &lt;pseudonim&gt;: ustala położenie użytkownika"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;ksywa&gt;: Znajduje użytkownika"
+msgstr "zl &lt;pseudonim&gt;: ustala położenie użytkownika"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instancja&gt;: Ustawia instancję używaną w tej klasie"
+msgstr "instance &lt;instancja&gt;: ustawia instancję używaną w tej klasie"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instancja&gt;: Ustawia instancję używaną w tej klasie"
+msgstr "inst &lt;instancja&gt;: ustawia instancję używaną w tej klasie"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instance&gt;: Ustawia instancję używaną w tej klasie"
+msgstr "topic &lt;instancja&gt;: ustawia instancję używaną w tej klasie"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"sub &lt;klasa&gt; &lt;instancja&gt; &lt;odbiorca&gt;: Przyłącza do nowej "
+"sub &lt;klasa&gt; &lt;instancja&gt; &lt;odbiorca&gt;: dołącza do nowej "
 "konferencji"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-"zi &lt;instancja&gt;: Wysyła wiadomość do &lt;wiadomość,<i>instancja</i>,"
+"zi &lt;instancja&gt;: wysyła wiadomość do &lt;wiadomość,<i>instancja</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;klasa&gt; &lt;instancja&gt;: Wysyła wiadomość do &lt;<i>klasa</i>,"
+"zci &lt;klasa&gt; &lt;instancja&gt;: wysyła wiadomość do &lt;<i>klasa</i>,"
 "<i>instancja</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;klasa&gt; &lt;instancja&gt; &lt;odbiorca&gt;: Wysyła wiadomość do "
+"zcir &lt;klasa&gt; &lt;instancja&gt; &lt;odbiorca&gt;: wysyła wiadomość do "
 "&lt;<i>klasa</i>,<i>instancja</i>,<i>odbiorca</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;instancja&gt; &lt;odbiorca&gt;: Wysyła wiadomość do &lt;WIADOMOŚĆ,"
+"zir &lt;instancja&gt; &lt;odbiorca&gt;: wysyła wiadomość do &lt;WIADOMOŚĆ,"
 "<i>instancja</i>,<i>odbiorca</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;klasa&gt;: Wysyła wiadomość do &lt;<i>klasa</i>,OSOBISTA,*&gt;"
+msgstr "zc &lt;klasa&gt;: wysyła wiadomość do &lt;<i>klasa</i>,OSOBISTA,*&gt;"
 
 msgid "Resubscribe"
-msgstr "Ponowienie subskrypcji"
+msgstr "Ponownie subskrybuj"
 
 msgid "Retrieve subscriptions from server"
 msgstr "Pobierz subskrypcje z serwera"
@@ -10703,54 +10445,52 @@
 msgstr "Wtyczka protokołu Zephyr"
 
 msgid "Use tzc"
-msgstr "_Używaj tzc"
+msgstr "Użycie tzc"
 
 msgid "tzc command"
-msgstr "Komenda tzc"
+msgstr "Polecenie tzc"
 
 msgid "Export to .anyone"
-msgstr "Eksprot do .anyone"
+msgstr "Eksport do .anyone"
 
 msgid "Export to .zephyr.subs"
 msgstr "Eksport do .zephyr.subs"
 
 msgid "Import from .anyone"
-msgstr "Import od .anyone"
+msgstr "Import z .anyone"
 
 msgid "Import from .zephyr.subs"
 msgstr "Import z .zephyr.subs"
 
 msgid "Realm"
-msgstr "Kraina"
+msgstr "Obszar"
 
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Nie można ustawić roli \"%s\" dla użytkownika: %s"
+msgstr "Nie można przetworzyć odpowiedzi od pośrednika HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Błąd połączenia z serwerem pośredniczącym (HTTP proxy) %d"
+msgstr "Błąd połączenia serwera pośrednika HTTP %d"
 
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Odmowa dostępu: serwer pośrednika HTTP zabronił tunelowania portu %d"
+
+#, c-format
 msgid "Error resolving %s"
-msgstr ""
-"Błąd tłumaczenia nazwy %s na adres IP: \n"
-"%s"
+msgstr "Błąd podczas rozwiązywania %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr "Żądanie uwagi od %s..."
+msgstr "Żądanie uwagi od użytkownika %s..."
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s zażądał Twojej uwagi!"
+msgstr "Użytkownik %s zażądał uwagi."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -10765,7 +10505,7 @@
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
 msgid "_Accept"
-msgstr "_Akceptuj"
+msgstr "Z_aakceptuj"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
@@ -10774,59 +10514,55 @@
 msgstr "Nie ma mnie teraz przy komputerze"
 
 msgid "saved statuses"
-msgstr "zapisane statusy"
+msgstr "zapisane stany"
 
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s jest teraz znany jako %s.\n"
+msgstr "Użytkownik %s jest teraz znany jako %s.\n"
 
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s zaprosił %s do pokoju konferencyjnego %s:\n"
+"Użytkownik %s zaprosił %s do pokoju konferencji %s:\n"
 "%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "Użytkownik %s zaprasza %s do pokoju konferencyjnego:%s\n"
+msgstr "Użytkownik %s zaprosił %s do pokoju konferencji %s\n"
 
 msgid "Accept chat invitation?"
 msgstr "Zaakceptować zaproszenie do konferencji?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Sortuj"
+msgstr "Skrót"
 
 msgid "The text-shortcut for the smiley"
-msgstr "Dowiązanie tekstowe do emotikony"
+msgstr "Skrót tekstowy do emotikony"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Zapis obrazu"
+msgstr "Zapisany obraz"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Zapisany obraz (który trzeba będzie teraz zrobić)"
 
 msgid "SSL Connection Failed"
 msgstr "Połączenie SSL nie powiodło się"
 
 msgid "SSL Handshake Failed"
-msgstr "Synchronizacja SSL nie powiodła się"
+msgstr "Powitanie SSL nie powiodło się"
 
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
-
-#, fuzzy
+msgstr "Użytkownik SSL zaprezentował nieprawidłowy certyfikat"
+
 msgid "Unknown SSL error"
-msgstr "Nieznany błąd"
-
-#, fuzzy
+msgstr "Nieznany błąd SSL"
+
 msgid "Unset"
-msgstr "_Skasuj"
+msgstr "Usuń ustawienie"
 
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać"
@@ -10835,35 +10571,35 @@
 msgstr "Wrócę później"
 
 msgid "Listening to music"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Słucham muzyki"
+
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s zmienił status z %s na %s"
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s (%s) zmienił stan z %s na %s"
+
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s nazywa się teraz %s"
-
-#, fuzzy, c-format
+msgstr "Użytkownik %s (%s) jest teraz %s"
+
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s nie jest już %s"
+msgstr "Użytkownik %s (%s) nie jest już %s"
 
 #, c-format
 msgid "%s became idle"
-msgstr "%s stał się nieaktywny"
+msgstr "Użytkownik %s jest bezczynny"
 
 #, c-format
 msgid "%s became unidle"
-msgstr "%s stał się aktywny"
+msgstr "Użytkownik %s nie jest już bezczynny"
 
 #, c-format
 msgid "+++ %s became idle"
-msgstr "+++ %s jest bezczynny."
+msgstr "+++ %s jest bezczynny"
 
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s powrócił z ze stanu bezczynności"
+msgstr "+++ %s nie jest już bezczynny"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10925,32 +10661,33 @@
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "Nie można otworzyć %s: przekierowano za wiele razy"
 
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nie można połączyć się z %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Błąd odczytu z %s: %s"
+msgstr ""
+"Błąd podczas odczytywania z %s: odpowiedź jest za długa (ograniczenie do %d "
+"bajtów)"
 
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"Nie można zaalokować odpowiedniej ilości pamięci do pomieszczenia zawartości "
-"%s. Możliwe, że ten serwer www wysyła jakieś dane, aby uszkodzić Twoje "
-"oprogramowanie."
+"Nie można przydzielić wystarczającej ilości pamięci, aby przechować "
+"zawartość %s. Serwer WWW może próbować złośliwych działań."
 
 #, c-format
 msgid "Error reading from %s: %s"
-msgstr "Błąd odczytu z %s: %s"
+msgstr "Błąd podczas odczytywania z %s: %s"
 
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "Błąd zapisu do %s: %s"
+msgstr "Błąd podczas zapisywania do %s: %s"
 
 #, c-format
 msgid "Unable to connect to %s: %s"
@@ -10958,58 +10695,60 @@
 
 #, c-format
 msgid " - %s"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr " - %s"
+
+#, c-format
 msgid " (%s)"
-msgstr "%s (%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "Inne oprogramowanie na komputerze przerwało połączenie."
 
 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "Rozmówca zamknął połączenie."
+msgstr "Zdalny komputer zamknął połączenie."
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "Przekroczono czas połączenia"
+msgstr "Przekroczono czas oczekiwania na połączenie."
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "Reset połączenia"
+msgstr "Odrzucono połączenie."
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Nazwa konferencji jest aktualnie używana"
+msgstr "Adres jest już używany."
 
 #, c-format
 msgid "Error Reading %s"
-msgstr "Błąd odczytu %s"
-
-#, fuzzy, c-format
+msgstr "Błąd podczas odczytywania %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 ""
-"Wystąpił błąd podczas odczytu Twojego %s.  Dane nie zostały wczytane, a "
-"stary plik został zmieniony na %s~."
+"Wystąpił błąd podczas odczytywania %s. Plik nie został wczytany, a nazwa "
+"poprzedniego została zmieniona na %s~."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Rozmawianie przez komunikator. Obsługuje sieci AIM, Google Talk, Jabber/"
+"XMPP, MSN, Yahoo oraz więcej"
 
 msgid "Internet Messenger"
-msgstr "Komunikator Internetowy"
+msgstr "Komunikator internetowy"
 
 msgid "Pidgin Internet Messenger"
-msgstr "Komunikator Internetowy Pidgin"
+msgstr "Komunikator internetowy Pidgin"
 
 msgid "Orientation"
 msgstr "Ułożenie"
@@ -11025,37 +10764,36 @@
 msgstr "Pro_tokół:"
 
 msgid "_Username:"
-msgstr "_Użytkownik:"
+msgstr "_Nazwa użytkownika:"
 
 msgid "Remember pass_word"
-msgstr "Z_apamiętanie hasła"
+msgstr "_Zapamiętanie hasła"
 
 #. Build the user options frame.
 msgid "User Options"
 msgstr "Opcje użytkownika"
 
 msgid "_Local alias:"
-msgstr "_Lokalna nazwa:"
+msgstr "_Lokalny alias:"
 
 msgid "New _mail notifications"
-msgstr "Powiadamianie o nowej _poczcie"
+msgstr "Powiada_mianie o nowej poczcie"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
-
-#, fuzzy
+msgstr "Użycie tej _ikony użytkownika dla tego konta:"
+
 msgid "Ad_vanced"
-msgstr "_Zaawansowane"
+msgstr "Zaa_wansowane"
 
 msgid "Use GNOME Proxy Settings"
-msgstr "Ustawienia pośrednika sieciowego z GNOME"
+msgstr "Użycie ustawień pośrednika środowiska GNOME"
 
 msgid "Use Global Proxy Settings"
-msgstr "Globalne ustawienia pośrednika sieciowego"
+msgstr "Użycie globalnych ustawień pośrednika"
 
 msgid "No Proxy"
-msgstr "Brak pośrednika"
+msgstr "Bez pośrednika"
 
 msgid "HTTP"
 msgstr "HTTP"
@@ -11067,7 +10805,7 @@
 msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr "Ustawienia środowiska"
+msgstr "Użycie ustawień środowiskowych"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -11075,14 +10813,14 @@
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "Jeśli spojrzysz naprawdę blisko"
+msgstr "Jeśli spojrzysz naprawdę blisko,"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
 msgstr "ujrzysz łączące się w pary motyle"
 
 msgid "Proxy _type:"
-msgstr "_Rodzaj pośrednika:"
+msgstr "_Typ pośrednika:"
 
 msgid "_Host:"
 msgstr "_Komputer:"
@@ -11091,27 +10829,25 @@
 msgstr "_Port:"
 
 msgid "Pa_ssword:"
-msgstr "_Hasło:"
-
-#, fuzzy
+msgstr "Ha_sło:"
+
 msgid "Unable to save new account"
-msgstr "Nie można utworzyć połączenia"
+msgstr "Nie można zapisać nowego konta"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Konto o podanych kryteriach już istnieje."
 
 msgid "Add Account"
-msgstr "Dodawanie konta"
+msgstr "Dodanie konta"
 
 msgid "_Basic"
 msgstr "_Podstawowe"
 
 msgid "Create _this new account on the server"
-msgstr "Utwórz _nowe konto na serwerze"
-
-#, fuzzy
+msgstr "_Utworzenie nowego konta na serwerze"
+
 msgid "P_roxy"
-msgstr "Pośrednik (proxy)"
+msgstr "Poś_rednik"
 
 msgid "Enabled"
 msgstr "Włączone"
@@ -11119,7 +10855,7 @@
 msgid "Protocol"
 msgstr "Protokół"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -11131,238 +10867,223 @@
 "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'>Witaj w komunikatorze %s!</span>\n"
-"\n"
-"Nie masz skonfigurowanych żadnych kont w programie %s. Wciśnij przycisk "
-"<b>Dodaj</b> znajdujący się poniżej i skonfiguruj swoje pierwsze konto. Tym "
-"samym sposobem można dodać więcej kont i nawiązać kilka połączeń z różnymi "
-"sieciami.\n"
-"\n"
-"Możesz w każdej chwili powrócić do tego okna wybierając z głównego menu "
-"programu %s <b>Konta->Dodaj/Edytuj</b>"
+"<span size='larger' weight='bold'>Witaj w programie %s!</span>\n"
+"\n"
+"Nie skonfigurowano jeszcze żadnych kont komunikatora. Aby rozpocząć łączenie "
+"się za pomocą programu %s, należy najpierw nacisnąć poniższy przycisk "
+"<b>Dodaj...</b> i skonfigurować konto. Aby program %s łączył się z wieloma "
+"kontami, należy nacisnąć przycisk <b>Dodaj...</b> ponownie, aby je "
+"skonfigurować.\n"
+"\n"
+"Można wrócić do tego okna, aby dodać, zmodyfikować lub usunąć konta z menu "
+"<b>Konta->Zarządzaj kontami</b> w oknie listy znajomych"
 
 #. Buddy List
 msgid "Background Color"
 msgstr "Kolor tła"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "Kolor tła listy znajomych"
+
 msgid "Layout"
-msgstr "Lew"
+msgstr "Układ"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "Układ ikon, nazw i stanów listy znajomych"
 
 #. 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 "Kolor tła"
+msgstr "Kolor tła rozwinięcia"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "Kolor tła rozwiniętej grupy"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Rozwiń"
+msgstr "Rozwinięty tekst"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy grupa jest rozwinięta"
 
 #. 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 "Wybór koloru tła"
+msgstr "Koloru tła zwinięcia"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "Kolor tła zwiniętej grupy"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_Zwiń"
+msgstr "Zwinięty tekst"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy grupa jest zwinięta"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Wybór koloru tła"
+msgstr "Kolor tła kontaktu/rozmowy"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "Kolor tła kontaktu lub rozmowy"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "Sortuj"
+msgstr "Tekst kontaktu"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy kontakt jest rozwinięty"
 
 #. 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 "Dostępny"
+msgstr "Tekst trybu online"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy znajomy jest w trybie online"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "Zaraz wracam"
+msgstr "Tekst niobecności"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy znajomy jest nieobecny"
 
 #. 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 "Rozłączony"
-
-#, fuzzy
+msgstr "Tekst trybu offline"
+
 msgid "The text information for when a buddy is offline"
-msgstr "Zmiana informacji o użytkowniku dla %s"
+msgstr "Informacja tekstowa, kiedy znajomy jest w trybie offline"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "Grupa krwi"
+msgstr "Tekst bezczynności"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy znajomy jest bezczynny"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "Wysłano wiadomość"
+msgstr "Tekst wiadomości"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Informacja tekstowa, kiedy znajomy posiada nieprzeczytaną wiadomość"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Tekst wiadomości (pseudonim powiedział)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
-
-#, fuzzy
+"Informacja tekstowa, kiedy w rozmowie jest nieprzeczytana wiadomość "
+"zawierająca pseudonim użytkownika"
+
 msgid "The text information for a buddy's status"
-msgstr "Zmiana informacji o użytkowniku dla %s"
+msgstr "Informacja tekstowa stanu znajomego"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d kontakt ma nazwę %s. Połączyć go?"
+msgstr[1] "%d kontakty mają nazwę %s. Połączyć ich?"
+msgstr[2] "%d kontaktów ma nazwę %s. Połączyć ich?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
-
-#, fuzzy
+"Połączenie tych kontaktów spowoduje współdzielenie pojedynczego wpisu na "
+"liście znajomych i używanie pojedynczego okna rozmowy. Można oddzielić je "
+"ponownie przez wybranie \"Rozwiń\" z menu kontekstowego kontaktu"
+
 msgid "Please update the necessary fields."
-msgstr "Proszę uaktualniać niezbędne pola."
-
-#, fuzzy
+msgstr "Proszę zaktualizować wymagane pola."
+
 msgid "A_ccount"
-msgstr "Konto"
+msgstr "Ko_nto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
-"Wprowadź informacje dotyczące konferencji do której chcesz się przyłączyć.\n"
-
-#, fuzzy
+"Proszę podać odpowiednie informacje o konferencji, do której dołączyć.\n"
+
 msgid "Room _List"
-msgstr "Lista pokoi"
+msgstr "_Lista pokoi"
 
 msgid "_Block"
-msgstr "_Zablokuj"
+msgstr "Za_blokuj"
 
 msgid "Un_block"
-msgstr "Odbl_okuj"
+msgstr "Od_blokuj"
 
 msgid "Move to"
 msgstr "Przenieś do"
 
 msgid "Get _Info"
-msgstr "_Informacje"
+msgstr "Pobierz _informacje"
 
 msgid "I_M"
-msgstr "_Wiadomość"
-
-#, fuzzy
+msgstr "Wiado_mość"
+
 msgid "_Audio Call"
-msgstr "_Dodaj konferencję"
+msgstr "Rozmow_a głosowa"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Rozmowa głosowa/_wideo"
+
 msgid "_Video Call"
-msgstr "Konferencja wideo"
+msgstr "Rozmowa _wideo"
 
 msgid "_Send File..."
-msgstr "Wyślij _plik"
+msgstr "_Wyślij plik..."
 
 msgid "Add Buddy _Pounce..."
-msgstr "Dodaj przechwytywanie zdarzeń"
+msgstr "Dodaj przechwytywanie _zdarzeń..."
 
 msgid "View _Log"
 msgstr "Wyświetl _dziennik rozmów"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Ukryj, gdy rozłączony"
-
-#, fuzzy
+msgstr "Ukryj w trybie offline"
+
 msgid "Show When Offline"
-msgstr "Wyświetlaj, gdy rozłączony"
+msgstr "Wyświetl w trybie offline"
 
 msgid "_Alias..."
-msgstr "_Zmień nazwę..."
+msgstr "_Alias..."
 
 msgid "_Remove"
 msgstr "_Usuń"
 
 msgid "Set Custom Icon"
-msgstr "Ustaw własną ikonę..."
+msgstr "Ustaw własną ikonę"
 
 msgid "Remove Custom Icon"
 msgstr "Usuń własną ikonę"
 
 msgid "Add _Buddy..."
-msgstr "Dodaj użytkownika"
+msgstr "Dodaj _znajomego..."
 
 msgid "Add C_hat..."
-msgstr "Dodaj konferencję"
+msgstr "Dodaj _konferencję..."
 
 msgid "_Delete Group"
 msgstr "_Usuń grupę"
@@ -11372,18 +11093,16 @@
 
 #. join button
 msgid "_Join"
-msgstr "_Przyłącz się"
+msgstr "_Dołącz"
 
 msgid "Auto-Join"
-msgstr "Automatyczne przyłączanie się"
-
-#, fuzzy
+msgstr "Automatyczne dołączenie"
+
 msgid "Persistent"
-msgstr "Perski"
-
-#, fuzzy
+msgstr "Trwałe"
+
 msgid "_Edit Settings..."
-msgstr "Edytuj ustawienia"
+msgstr "Zmodyfikuj ustawi_enia..."
 
 msgid "_Collapse"
 msgstr "_Zwiń"
@@ -11392,76 +11111,74 @@
 msgstr "_Rozwiń"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/Narzędzia/Wyłączenie dźwięków"
+msgstr "/Narzędzia/Wyciszenie dźwięków"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Żadne z używanych w chwili obecnej kont nie umożliwia dodania znajomych z "
-"tej sieci."
+"Nie zalogowano do żadnego konta, do którego można dodać tego znajomego."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "Nieznany kod błędu %d"
+msgstr "Nieznany typ węzła"
 
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Znajomi"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Znajomi/Nowa wiadomość..."
+msgstr "/Znajomi/Nowa wiado_mość..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Znajomi/Przyłącz się do _konferencji..."
+msgstr "/Znajomi/Dołącz do _konferencji..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Znajomi/Informacje o _użytkowniku..."
+msgstr "/Znajomi/_Informacje o użytkowniku..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Znajomi/Wyświetl _dziennik rozmów użytkownika..."
+msgstr "/Znajomi/_Dziennik rozmów użytkownika..."
 
 msgid "/Buddies/Sh_ow"
-msgstr "/Znajomi/_Wyświetl"
+msgstr "/Znajomi/Wyświ_etlanie"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Znajomi/Wyświetl/_Rozłączonych"
+msgstr "/Znajomi/Wyświetlanie/Znajomi w trybie _offline"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Znajomi/Wyświetl/P_uste grupy"
+msgstr "/Znajomi/Wyświetlanie/Pust_e grupy"
 
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Znajomi/Wyświetl/_Statusy"
+msgstr "/Znajomi/Wyświetlanie/_Szczegóły znajomych"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Znajomi/Wyświetl/I_nformacje o bezczynności"
+msgstr "/Znajomi/Wyświetlanie/I_nformacje o bezczynności"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Znajomi/Wyświetl/_Ikony protokołów"
+msgstr "/Znajomi/Wyświetlanie/Ikony p_rotokołów"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Znajomi/_Sortuj listę"
+msgstr "/Znajomi/_Sortowanie znajomych"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Znajomi/_Dodaj znajomego..."
+msgstr "/Znajomi/Dod_aj znajomego..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Znajomi/Dodaj _konferencję.."
+msgstr "/Znajomi/Dodaj ko_nferencję..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Znajomi/Dodaj _grupę..."
+msgstr "/Znajomi/Dodaj g_rupę..."
 
 msgid "/Buddies/_Quit"
 msgstr "/Znajomi/Za_kończ"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_Konta"
+msgstr "/Kont_a"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/Konta/Zarządzaj..."
+msgstr "/Konta/Zarządzaj kontami"
 
 #. Tools
 msgid "/_Tools"
@@ -11473,72 +11190,68 @@
 msgid "/Tools/_Certificates"
 msgstr "/Narzędzia/_Certyfikaty"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Narzędzia/Prywatność"
+msgstr "/Narzędzia/Własne _emotikony"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Narzędzia/W_tyczki"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/Narzędzia/_Ustawienia"
+msgstr "/Narzędzia/_Preferencje"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/Narzędzia/P_rywatność"
+msgstr "/Narzędzia/Prywa_tność"
 
 msgid "/Tools/_File Transfers"
-msgstr "/Narzędzia/Przesyłanie _plików"
+msgstr "/Narzędzia/Przesyłanie p_lików"
 
 msgid "/Tools/R_oom List"
-msgstr "/Narzędzia/Lista pokoi"
+msgstr "/Narzędzia/Lista p_okoi"
 
 msgid "/Tools/System _Log"
-msgstr "/Narzędzia/Dziennik _systemowy"
+msgstr "/Narzędzia/_Dziennik systemowy"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/Narzędzia/Wyłącz _dźwięk"
+msgstr "/Narzędzia/Wyci_szenie dźwięków"
 
 #. Help
 msgid "/_Help"
 msgstr "/Pomo_c"
 
 msgid "/Help/Online _Help"
-msgstr "/Help/Pomoc w _sieci"
+msgstr "/Help/Pomo_c online"
 
 msgid "/Help/_Debug Window"
-msgstr "/Pomoc/_Okno debuggera"
+msgstr "/Pomoc/Okno _debugowania"
 
 msgid "/Help/_About"
 msgstr "/Pomoc/_O programie"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Konto:</b> %s"
-
-#, fuzzy, c-format
+msgstr "<b>Konto:</b> %s"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Konto:</b> %s"
-
-#, fuzzy, c-format
+"<b>Mieszkańcy:</b> %d"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>Konto:</b> %s"
-
-#, fuzzy
+"<b>Temat:</b> %s"
+
 msgid "(no topic set)"
-msgstr "Brak ustawionego tematu"
+msgstr "(nie ustawiono tematu)"
 
 msgid "Buddy Alias"
-msgstr "Alias"
+msgstr "Alias znajomego"
 
 msgid "Logged In"
 msgstr "Zalogowany"
@@ -11547,17 +11260,16 @@
 msgstr "Ostatnio widziany"
 
 msgid "Spooky"
-msgstr ""
+msgstr "Niesamowite"
 
 msgid "Awesome"
-msgstr ""
+msgstr "Fajne"
 
 msgid "Rockin'"
-msgstr ""
-
-#, fuzzy
+msgstr "Wstrząsające"
+
 msgid "Total Buddies"
-msgstr "Znajomi"
+msgstr "Razem znajomych"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -11575,7 +11287,7 @@
 msgstr "/Znajomi/Nowa wiadomość..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Znajomi/Przyłącz się do _konferencji..."
+msgstr "/Znajomi/Dołącz do konferencji..."
 
 msgid "/Buddies/Get User Info..."
 msgstr "/Znajomi/Pobierz informacje o użytkowniku..."
@@ -11598,50 +11310,50 @@
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d nieprzeczytana wiadomość od %s\n"
-msgstr[1] "%d nieprzeczytanych wiadomości od %s\n"
-msgstr[2] "%d nieprzeczytanych Wiadomości od %s\n"
+msgstr[0] "%d nieprzeczytana wiadomość od użytkownika %s\n"
+msgstr[1] "%d nieprzeczytane wiadomości od użytkownika %s\n"
+msgstr[2] "%d nieprzeczytanych wiadomości od użytkownika %s\n"
 
 msgid "Manually"
 msgstr "Ręcznie"
 
 msgid "By status"
-msgstr "Według statusu"
+msgstr "Według stanu"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Według ostatniej aktywności w dzienniku"
 
 #, c-format
 msgid "%s disconnected"
-msgstr "%s rozłączony"
+msgstr "Użytkownik %s został rozłączony"
 
 #, c-format
 msgid "%s disabled"
-msgstr "%s wyłączony"
-
-#, fuzzy
+msgstr "Użytkownik %s wyłączony"
+
 msgid "Reconnect"
-msgstr "Połącz"
+msgstr "Połącz ponownie"
 
 msgid "Re-enable"
 msgstr "Włącz ponownie"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "FAQ protokołu SSL"
 
 msgid "Welcome back!"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Witaj z powrotem!"
+
+#, 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] "Zalogowano się z innego komputera."
-msgstr[1] "Zalogowano się z innego komputera."
-msgstr[2] "Zalogowano się z innego komputera."
+msgstr[0] "%d konto zostało wyłączone, ponieważ zalogowano z innego położenia:"
+msgstr[1] "%d konta zostały wyłączone, ponieważ zalogowano z innego położenia:"
+msgstr[2] ""
+"%d kont zostało wyłączonych, ponieważ zalogowano z innego położenia:"
 
 msgid "<b>Username:</b>"
-msgstr "<b>Użytkownik:</b>"
+msgstr "<b>Nazwa użytkownika:</b>"
 
 msgid "<b>Password:</b>"
 msgstr "<b>Hasło:</b>"
@@ -11661,62 +11373,58 @@
 "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'>Witaj w programie %s!</span>\n"
+"\n"
+"Nie włączono żadnych kont. Proszę włączyć konta z okna <b>Konta</b> w "
+"<b>Konta->Zarządzaj kontami</b>. Po włączeniu kont można się zalogować, "
+"ustawić stan i rozmawiać z przyjaciółmi."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Znajomi/Pokaż/Wyświetlaj _nieobecnych"
-
-#, fuzzy
+msgstr "/Znajomi/Wyświetlanie/Znajomi w trybie offline"
+
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Znajomi/Pokaż/Wyświetlaj p_uste grupy"
-
-#, fuzzy
+msgstr "/Znajomi/Wyświetlanie/Puste grupy"
+
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Znajomi/Pokaż/Wyświetlaj informacje o statusach"
-
-#, fuzzy
+msgstr "/Znajomi/Wyświetlanie/Szczegóły znajomych"
+
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Znajomi/Pokaż/Wyświetlaj czas _bezczynności"
-
-#, fuzzy
+msgstr "/Znajomi/Wyświetlanie/Czas bezczynności"
+
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Znajomi/Pokaż/Wyświetlaj ikony protokołów"
-
-#, fuzzy
+msgstr "/Znajomi/Wyświetlanie/Ikony protokołów"
+
 msgid "Add a buddy.\n"
-msgstr "Dodaj użytkownika"
-
-#, fuzzy
+msgstr "Dodanie znajomego.\n"
+
 msgid "Buddy's _username:"
-msgstr "_Nazwa użytkownika:"
-
-#, fuzzy
+msgstr "Nazwa _użytkownika:"
+
 msgid "(Optional) A_lias:"
-msgstr "Dodatkowe informacje:"
-
-#, fuzzy
+msgstr "(Opcjonalny) a_lias:"
+
 msgid "Add buddy to _group:"
-msgstr "Dodać do listy znajomych?"
+msgstr "Dodanie znajomego do g_rupy:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Ten protokół nie obsługuje pokojów konferencyjnych."
+msgstr "Ten protokół nie obsługuje pokojów konferencji."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"W tej chwili brak jest zarejestrowanego protokołu, które umożliwiają "
-"prowadzenie konferencji."
+"Obecnie nie zalogowano za pomocą protokołu, który posiada możliwość "
+"konferencji."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Proszę wprowadzić nazwę oraz odpowiednie informacje dla konferencji, którą "
-"chcesz dodać do listy znajomych.\n"
+"Proszę podać alias i odpowiednie informacje o konferencji, która ma zostać "
+"dodana do listy znajomych.\n"
 
 msgid "A_lias:"
 msgstr "A_lias:"
@@ -11724,16 +11432,14 @@
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Automatycznie dołącz podczas połączenia konta."
-
-#, fuzzy
+msgstr "Aut_omatyczne dołączanie podczas połączenia konta"
+
 msgid "_Remain in chat after window is closed."
-msgstr "Ukryj, gdy okno jest zamknięte."
+msgstr "Pozostawanie w konfe_rencji po zamknięciu okna"
 
 msgid "Please enter the name of the group to be added."
-msgstr "Podaj nazwę dodawanej grupy."
+msgstr "Proszę podać nazwę dodawanej grupy."
 
 msgid "Enable Account"
 msgstr "Włącz konto"
@@ -11745,10 +11451,10 @@
 msgstr "<PurpleMain>/Konta/"
 
 msgid "_Edit Account"
-msgstr "M_odyfikuj konto"
+msgstr "Zm_odyfikuj konto"
 
 msgid "No actions available"
-msgstr "Brak dostępnych akcji"
+msgstr "Brak dostępnych czynności"
 
 msgid "_Disable"
 msgstr "_Wyłącz"
@@ -11757,11 +11463,10 @@
 msgstr "/Narzędzia"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Znajomi/Sortuj znajomych"
-
-#, fuzzy
+msgstr "/Znajomi/Sortowanie znajomych"
+
 msgid "Type the host name for this certificate."
-msgstr "Wpisz nazwę hosta dla tego certyfikatu."
+msgstr "Proszę podać nazwę komputera dla tego certyfikatu."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11771,52 +11476,49 @@
 msgstr "Nieznane polecenie."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Wybrana osoba nie jest połączona tym samym protokołem co konferencja."
+msgstr "Ten znajomy nie jest połączony tym samym protokołem, co konferencja."
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"Żadne z używanych w chwili obecnej kont nie ma możliwości zapraszania "
-"znajomych do konferencji"
+"Obecnie nie zalogowano za pomocą konta, które może zapraszać znajomych."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Zaproszenie użytkownika do pokoju konferencyjnego"
+msgstr "Zaproszenie znajomego do pokoju konferencji"
 
 msgid "_Buddy:"
-msgstr "_Użytkownik:"
+msgstr "_Znajomy:"
 
 msgid "_Message:"
 msgstr "_Wiadomość:"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Rozmowa z %s</h1>\n"
+msgstr "<h1>Rozmowa z użytkownikiem %s</h1>\n"
 
 msgid "Save Conversation"
 msgstr "Zapisz rozmowę"
 
 msgid "Find"
-msgstr "Szukaj"
+msgstr "Znajdź"
 
 msgid "_Search for:"
-msgstr "_Poszukiwane wyrażenie:"
+msgstr "Wy_szukiwanie:"
 
 msgid "Un-Ignore"
-msgstr "Odwołanie ignorowania"
+msgstr "Usuń zignorowanie"
 
 msgid "Ignore"
-msgstr "Ignorowanie"
-
-#, fuzzy
+msgstr "Zignoruj"
+
 msgid "Get Away Message"
-msgstr "Wysyłane wiadomości"
-
-#, fuzzy
+msgstr "Uzyskaj wiadomość nieobecności"
+
 msgid "Last Said"
 msgstr "Ostatnio powiedziane"
 
 msgid "Unable to save icon file to disk."
-msgstr "Nie można zapisać wybranej ikonki na dysk."
+msgstr "Nie można zapisać pliku ikony na dysku."
 
 msgid "Save Icon"
 msgstr "Zapisz ikonę"
@@ -11831,15 +11533,13 @@
 msgstr "Zapisz ikonę jako..."
 
 msgid "Set Custom Icon..."
-msgstr "Ustaw ikonkę..."
-
-#, fuzzy
+msgstr "Ustaw własną ikonkę..."
+
 msgid "Change Size"
-msgstr "Zmiana Statusu"
-
-#, fuzzy
+msgstr "Zmień rozmiar"
+
 msgid "Show All"
-msgstr "Pokaż"
+msgstr "Wyświetl wszystko"
 
 #. Conversation menu
 msgid "/_Conversation"
@@ -11848,95 +11548,90 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Rozmowa/Nowa _wiadomość..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Rozmowa/Z_aproś..."
+msgstr "/Rozmowa/_Dołącz do konferencji..."
 
 msgid "/Conversation/_Find..."
-msgstr "/Rozmowa/_Szukaj..."
+msgstr "/Rozmowa/_Znajdź..."
 
 msgid "/Conversation/View _Log"
 msgstr "/Rozmowa/Wyświetl _dziennik rozmów"
 
 msgid "/Conversation/_Save As..."
-msgstr "/Rozmowa/Z_apisz jako..."
+msgstr "/Rozmowa/Zapi_sz jako..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Rozmowa/Wyczyść okno"
-
-#, fuzzy
+msgstr "/Rozmowa/Wy_czyść okno"
+
 msgid "/Conversation/M_edia"
-msgstr "/Rozmowa/Więcej"
-
-#, fuzzy
+msgstr "/Rozmowa/Multim_edia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Rozmowa/Więcej"
-
-#, fuzzy
+msgstr "/Rozmowa/Multimedia/Rozmow_a głosowa"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Rozmowa/Więcej"
-
-#, fuzzy
+msgstr "/Rozmowa/Multimedia/Rozmowa _wideo"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Rozmowa/Wyświetl _dziennik rozmów"
+msgstr "/Rozmowa/Multimedia/_Rozmowa głosowa\\/wideo"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Rozmowa/_Wyślij plik..."
+msgstr "/Rozmowa/Wyślij p_lik..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Rozmowa/Dodaj przechwytywanie _zdarzeń..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Rozmowy/P_obierz informacje"
+msgstr "/Rozmowy/_Pobierz informacje"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Rozmowa/Z_aproś..."
 
 msgid "/Conversation/M_ore"
-msgstr "/Rozmowa/Więcej"
+msgstr "/Rozmowa/Więc_ej"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Rozmowy/Z_mień nazwę..."
+msgstr "/Rozmowy/_Alias..."
 
 msgid "/Conversation/_Block..."
 msgstr "/Rozmowa/Za_blokuj..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/Rozmowa/Odblokuj..."
+msgstr "/Rozmowa/Od_blokuj..."
 
 msgid "/Conversation/_Add..."
-msgstr "/Rozmowa/D_odaj..."
+msgstr "/Rozmowa/Dod_aj..."
 
 msgid "/Conversation/_Remove..."
 msgstr "/Rozmowa/_Usuń..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Rozmowa/Wstaw od_nośnik..."
+msgstr "/Rozmowa/Wstaw odnośni_k..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Rozmowa/Wstaw o_braz..."
+msgstr "/Rozmowa/Wstaw _obraz..."
 
 msgid "/Conversation/_Close"
-msgstr "/Rozmowa/_Zamknij"
+msgstr "/Rozmowa/Za_mknij"
 
 #. Options
 msgid "/_Options"
 msgstr "/_Opcje"
 
 msgid "/Options/Enable _Logging"
-msgstr "/Opcje/_Zapis do dziennika"
+msgstr "/Opcje/Zapis do _dziennika"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/Opcje/Włącz _dźwięki"
+msgstr "/Opcje/Włą_czenie dźwięków"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Opcje/Wyświetl narzędzia _formatowania tekstu"
+msgstr "/Opcje/Wyświetlanie pasków narzędziowych forma_towania"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Opcje/Wyświetlaj informacje o _czasie"
+msgstr "/Opcje/_Wyświetlanie dat"
 
 msgid "/Conversation/More"
-msgstr "/Rozmowa/_Więcej"
+msgstr "/Rozmowa/Więcej"
 
 msgid "/Options"
 msgstr "/Opcje"
@@ -11952,17 +11647,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Rozmowa/Wyświetl dziennik rozmów"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Rozmowa/_Więcej"
-
-#, fuzzy
+msgstr "/Rozmowa/Multimedia/Rozmowa głosowa"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Rozmowa/Wyświetl dziennik rozmów"
-
-#, fuzzy
+msgstr "/Rozmowa/Multimedia/Rozmowa wideo"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Rozmowa/_Więcej"
+msgstr "/Rozmowa/Multimedia/Rozmowa głosowa\\/wideo"
 
 msgid "/Conversation/Send File..."
 msgstr "/Rozmowa/Wyślij plik..."
@@ -11971,7 +11663,7 @@
 msgstr "/Rozmowa/Dodaj przechwytywanie zdarzeń..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Rozmowa/Dane osoby"
+msgstr "/Rozmowa/Pobierz informacje"
 
 msgid "/Conversation/Invite..."
 msgstr "/Rozmowa/Zaproś..."
@@ -12001,22 +11693,24 @@
 msgstr "/Opcje/Zapis do dziennika"
 
 msgid "/Options/Enable Sounds"
-msgstr "/Opcje/Włącz dźwięki"
+msgstr "/Opcje/Włączenie dźwięków"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Opcje/Pokaż pasek narzędzi do formatowania tekstu"
+msgstr "/Opcje/Wyświetlanie pasków narzędziowych formatowania"
 
 msgid "/Options/Show Timestamps"
-msgstr "/Opcje/Pokaż datownik"
+msgstr "/Opcje/Wyświetlanie dat"
 
 msgid "User is typing..."
 msgstr "Użytkownik coś pisze..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s przestał pisać do Ciebie (%s)"
+msgstr ""
+"\n"
+"Użytkownik %s przestał pisać"
 
 #. Build the Send To menu
 msgid "S_end To"
@@ -12037,14 +11731,13 @@
 msgstr[2] "%d osób w pokoju"
 
 msgid "Typing"
-msgstr "Wpisujesz"
+msgstr "Pisanie"
 
 msgid "Stopped Typing"
-msgstr "Zakończył(a) pisanie"
-
-#, fuzzy
+msgstr "Zatrzymanie pisania"
+
 msgid "Nick Said"
-msgstr "Ksywka"
+msgstr "Pseudonim powiedział"
 
 msgid "Unread Messages"
 msgstr "Nieprzeczytane wiadomości"
@@ -12053,82 +11746,79 @@
 msgstr "Nowe zdarzenie"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Czyści okno rozmowy."
+msgstr "clear: czyści wszystkie okna rozmów."
 
 msgid "Confirm close"
 msgstr "Potwierdzenie zamknięcia"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr ""
-"W oknie które chcesz zamknąć znajdują się nieprzeczytane przez Ciebie "
-"wiadomości. Czy na pewno chcesz zamknąć to okno?"
+msgstr "W oknie są nieprzeczytane wiadomości. Na pewno je zamknąć?"
 
 msgid "Close other tabs"
-msgstr "Zamknij pozostałe zakładki"
+msgstr "Zamknij inne karty"
 
 msgid "Close all tabs"
-msgstr "Zamknij wszystkie zakładki"
+msgstr "Zamknij wszystkie karty"
 
 msgid "Detach this tab"
-msgstr "Odłącz tę zakładkę"
+msgstr "Odłącz tę kartę"
 
 msgid "Close this tab"
-msgstr "Zamknij tę zakładkę"
+msgstr "Zamknij tę kartę"
 
 msgid "Close conversation"
-msgstr "Zamyka rozmowę"
+msgstr "Zamknij rozmowę"
 
 msgid "Last created window"
-msgstr "Ostatnio utworzone okno"
+msgstr "Ostatnie utworzone okno"
 
 msgid "Separate IM and Chat windows"
-msgstr "Oddzielne okno dla konferencji"
+msgstr "Oddzielne okno dla rozmów i konferencji"
 
 msgid "New window"
 msgstr "Nowe okno"
 
 msgid "By group"
-msgstr "Wg grupy"
+msgstr "Według grup"
 
 msgid "By account"
-msgstr "Wg konta"
+msgstr "Według konta"
 
 msgid "Save Debug Log"
-msgstr "Zapis komunikatów diagnostycznych"
+msgstr "Zapis do dziennika debugowania"
 
 msgid "Invert"
-msgstr "Odwrócony filtr"
+msgstr "Odwróć"
 
 msgid "Highlight matches"
-msgstr "Podświetlanie szukanych słów"
+msgstr "Wyróżnianie wyników"
 
 msgid "_Icon Only"
-msgstr "Tylko i_konki"
+msgstr "Tylko _ikona"
 
 msgid "_Text Only"
 msgstr "Tylko _tekst"
 
 msgid "_Both Icon & Text"
-msgstr "_Ikonki i tekst"
+msgstr "I_kona i tekst"
 
 msgid "Filter"
 msgstr "Filtr"
 
 msgid "Right click for more options."
-msgstr ""
-"kliknięcie prawym przyciskiem myszy wyświetli więcej opcji wyszukiwania."
+msgstr "Naciśnięcie prawym przyciskiem myszy wyświetli więcej opcji."
 
 msgid "Level "
-msgstr "Poziom"
+msgstr "Poziom "
 
 msgid "Select the debug filter level."
-msgstr "Wybierz filtr debugera."
+msgstr "Proszę wybrać poziom filtru debugowania."
 
 msgid "All"
 msgstr "Wszystko"
 
 msgid "Misc"
-msgstr "Misc"
+msgstr "Różne"
 
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -12137,291 +11827,285 @@
 msgstr "Błąd "
 
 msgid "Fatal Error"
-msgstr "Błąd wewnętrzny"
+msgstr "Błąd krytyczny"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "władca błędów"
+
 msgid "artist"
-msgstr "Artyści"
+msgstr "artysta"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "dźwięk i wideo"
 
 msgid "support"
 msgstr "wsparcie"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "programista i webmaster"
+msgstr "webmaster"
 
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Starszy współtwórca/ocena jakości"
 
 msgid "win32 port"
-msgstr "wersja win32"
+msgstr "port dla Win32"
 
 msgid "maintainer"
 msgstr "opiekun"
 
-#, fuzzy
 msgid "libfaim maintainer"
-msgstr "opiekun"
+msgstr "opiekun biblioteki libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
-msgstr ""
-
-#, fuzzy
+msgstr "haker i wyznaczony kierowca"
+
 msgid "support/QA"
-msgstr "wsparcie"
+msgstr "wsparcie/ocena jakości"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
-msgstr "autor pierwszych wersji"
+msgstr "autor pierwszej wersji"
 
 msgid "lead developer"
 msgstr "główny programista"
 
 msgid "Afrikaans"
-msgstr "Afrykańsko-burski"
+msgstr "afrykanerski"
 
 msgid "Arabic"
-msgstr "Arabski"
+msgstr "arabski"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "białoruski (alfabet łaciński)"
 
 msgid "Bulgarian"
-msgstr "Bułgarski"
+msgstr "bułgarski"
 
 msgid "Bengali"
-msgstr "Bengalski"
+msgstr "bengalski"
 
 msgid "Bosnian"
-msgstr "Bośniacki"
+msgstr "bośniacki"
 
 msgid "Catalan"
-msgstr "Kataloński"
+msgstr "kataloński"
 
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "walencki - kataloński"
 
 msgid "Czech"
-msgstr "Czeski"
+msgstr "czeski"
 
 msgid "Danish"
-msgstr "Duński"
+msgstr "duński"
 
 msgid "German"
-msgstr "Niemiecki"
+msgstr "niemiecki"
 
 msgid "Dzongkha"
-msgstr "Dzongka"
+msgstr "dzongka"
 
 msgid "Greek"
-msgstr "Grecki"
+msgstr "grecki"
 
 msgid "Australian English"
-msgstr "Australijski Angielski"
+msgstr "australijski angielski"
 
 msgid "Canadian English"
-msgstr "Kanadyjski Angielski"
+msgstr "kanadyjski angielski"
 
 msgid "British English"
-msgstr "Brytyjski Angielski"
+msgstr "brytyjski angielski"
 
 msgid "Esperanto"
-msgstr "Esperanto"
+msgstr "esperanto"
 
 msgid "Spanish"
-msgstr "Hiszpański"
-
-#, fuzzy
+msgstr "hiszpański"
+
 msgid "Estonian"
-msgstr "Bośniacki"
+msgstr "estoński"
 
 msgid "Basque"
-msgstr ""
+msgstr "baskijski"
 
 msgid "Persian"
-msgstr "Perski"
+msgstr "perski"
 
 msgid "Finnish"
-msgstr "Fiński"
+msgstr "fiński"
 
 msgid "French"
-msgstr "Francuski"
-
-#, fuzzy
+msgstr "francuski"
+
 msgid "Irish"
-msgstr "Kurdyjski"
+msgstr "irlandzki"
 
 msgid "Galician"
-msgstr "Galicyjski"
+msgstr "galicyjski"
 
 msgid "Gujarati"
-msgstr "Gudżaracki"
+msgstr "gudżaracki"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Gudżaracki zespół tłumaczenia"
 
 msgid "Hebrew"
-msgstr "Hebrajski"
+msgstr "hebrajski"
 
 msgid "Hindi"
-msgstr "Hinduski"
+msgstr "hindi"
 
 msgid "Hungarian"
-msgstr "Węgierski"
-
-#, fuzzy
+msgstr "węgierski"
+
 msgid "Armenian"
-msgstr "Rumuński"
+msgstr "armeński"
 
 msgid "Indonesian"
-msgstr "Indonezyjski"
+msgstr "indonezyjski"
 
 msgid "Italian"
-msgstr "Włoski"
+msgstr "włoski"
 
 msgid "Japanese"
-msgstr "Japoński"
+msgstr "japoński"
 
 msgid "Georgian"
-msgstr "Gruziński"
-
-#, fuzzy
+msgstr "gruziński"
+
 msgid "Ubuntu Georgian Translators"
-msgstr "Aktualni tłumacze"
-
-#, fuzzy
+msgstr "Tłumacze Ubuntu na język gruziński"
+
 msgid "Khmer"
-msgstr "Inny"
+msgstr "khmerski"
 
 msgid "Kannada"
-msgstr "Kannada"
+msgstr "kannada"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Zespół tłumaczenia na język kannada"
 
 msgid "Korean"
-msgstr "Koreański"
+msgstr "koreański"
 
 msgid "Kurdish"
-msgstr "Kurdyjski"
-
-#, fuzzy
+msgstr "kurdyjski"
+
 msgid "Lao"
-msgstr "Lew"
+msgstr "laotański"
 
 msgid "Lithuanian"
-msgstr "Litewski"
+msgstr "litewski"
 
 msgid "Macedonian"
-msgstr "Macedoński"
-
-#, fuzzy
+msgstr "macedoński"
+
 msgid "Mongolian"
-msgstr "Macedoński"
+msgstr "mongolski"
+
+msgid "Malay"
+msgstr "malajski"
 
 msgid "Bokmål Norwegian"
-msgstr "Norweski Bokmål"
+msgstr "norweski bokmål"
 
 msgid "Nepali"
-msgstr "Nepalski"
+msgstr "nepalski"
 
 msgid "Dutch, Flemish"
-msgstr "Holenderski, Flamandzki"
+msgstr "holenderski (flamandzki)"
 
 msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "norweski nynorsk"
 
 msgid "Occitan"
-msgstr ""
+msgstr "oksytański"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "pendżabski"
 
 msgid "Polish"
-msgstr "Polski"
+msgstr "polski"
 
 msgid "Portuguese"
-msgstr "Portugalski"
+msgstr "portugalski"
 
 msgid "Portuguese-Brazil"
-msgstr "Portugalski - Brazylia"
-
-#, fuzzy
+msgstr "portugalski (Brazylia)"
+
 msgid "Pashto"
-msgstr "Zdjęcie"
+msgstr "pasztuński"
 
 msgid "Romanian"
-msgstr "Rumuński"
+msgstr "rumuński"
 
 msgid "Russian"
-msgstr "Rosyjski"
+msgstr "rosyjski"
 
 msgid "Slovak"
-msgstr "Słowacki"
+msgstr "słowacki"
 
 msgid "Slovenian"
-msgstr "Słoweński"
+msgstr "słoweński"
 
 msgid "Albanian"
-msgstr "Albański"
+msgstr "albański"
 
 msgid "Serbian"
-msgstr "Serbski"
+msgstr "serbski"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "sinhala"
 
 msgid "Swedish"
-msgstr "Szwedzki"
+msgstr "szwedzki"
 
 msgid "Swahili"
-msgstr ""
+msgstr "suahili"
 
 msgid "Tamil"
-msgstr "Tamilski"
+msgstr "tamilski"
 
 msgid "Telugu"
-msgstr "Telugu"
+msgstr "telugu"
 
 msgid "Thai"
-msgstr "Tajlandzki"
+msgstr "tajlandzki"
 
 msgid "Turkish"
-msgstr "Turecki"
+msgstr "turecki"
+
+msgid "Ukranian"
+msgstr "ukraiński"
 
 msgid "Urdu"
-msgstr ""
+msgstr "urdu"
 
 msgid "Vietnamese"
-msgstr "Wietnamski"
+msgstr "wietnamski"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M. Thanh i Zespół Gnome-Vi"
 
 msgid "Simplified Chinese"
-msgstr "Chiński uproszczony"
+msgstr "chiński uproszczony"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "chiński (Hong Kong)"
 
 msgid "Traditional Chinese"
-msgstr "Chiński tradycyjny"
+msgstr "chiński tradycyjny"
 
 msgid "Amharic"
-msgstr "Amharski"
+msgstr "amharski"
 
 #, c-format
 msgid "About %s"
@@ -12439,12 +12123,24 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<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>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -12455,36 +12151,46 @@
 "primary language is <b>English</b>.  You are welcome to post in another "
 "language, but the responses may be less helpful.<br/><br/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<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/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">Kanał IRC:</FONT> #pidgin w sieci irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin na irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">MUC protokołu XMPP:</FONT> devel@conference.pidgin."
+"im<BR><BR>"
 
 msgid "Current Developers"
-msgstr "Programiści aktywnie uczestniczący w projekcie"
+msgstr "Obecni programiści"
 
 msgid "Crazy Patch Writers"
-msgstr ""
+msgstr "Twórcy łat"
 
 msgid "Retired Developers"
 msgstr "Poprzedni programiści"
 
 msgid "Retired Crazy Patch Writers"
-msgstr ""
+msgstr "Poprzedni twórcy łat"
 
 msgid "Current Translators"
-msgstr "Aktualni tłumacze"
+msgstr "Obecni tłumacze"
 
 msgid "Past Translators"
 msgstr "Poprzedni tłumacze"
 
 msgid "Debugging Information"
-msgstr "Informacje przydatne przy debugowaniu"
+msgstr "Informacje debugowania"
 
 msgid "_Name"
 msgstr "_Nazwa"
@@ -12499,21 +12205,21 @@
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Proszę wprowadzić identyfikator lub nazwę osoby, której informacje należy "
-"wyświetlić."
+"Proszę podać nazwę użytkownika lub alias osoby, której informacje mają "
+"zostać wyświetlone."
 
 msgid "View User Log"
-msgstr "Dziennik rozmów użytkownika"
+msgstr "Wyświetlenie dziennika rozmów użytkownika"
 
 msgid "Alias Contact"
 msgstr "Alias kontaktu"
 
 msgid "Enter an alias for this contact."
-msgstr "Proszę wprowadzić nazwę dla tego kontaktu."
+msgstr "Proszę podać alias dla tego kontaktu."
 
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "Proszę wprowadzić nazwę dla %s."
+msgstr "Proszę podać nazwę dla użytkownika %s."
 
 msgid "Alias Buddy"
 msgstr "Alias znajomego"
@@ -12522,7 +12228,7 @@
 msgstr "Alias konferencji"
 
 msgid "Enter an alias for this chat."
-msgstr "Proszę wprowadzić nazwę dla tej konferencji."
+msgstr "Proszę podać alias dla tej konferencji."
 
 #, c-format
 msgid ""
@@ -12532,14 +12238,14 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Zamierzasz usunąć kontakt zawierający %s i %d inny kontakt z listy "
-"znajomych. Czy chcesz kontynuować?"
+"Za chwilę zostanie usunięty kontakt zawierający %s i %d inny znajomy z "
+"listy. Kontynuować?"
 msgstr[1] ""
-"Zamierzasz usunąć kontakt zawierający %s i %d inne kontakty z listy "
-"znajomych. Czy chcesz kontynuować?"
+"Za chwilę zostanie usunięty kontakt zawierający %s i %d innych znajomych z "
+"listy. Kontynuować?"
 msgstr[2] ""
-"Zamierzasz usunąć kontakt zawierający %s i %d innych kontaktów z listy "
-"znajomych. Czy chcesz kontynuować?"
+"Za chwilę zostanie usunięty kontakt zawierający %s i %d innych znajomych z "
+"listy. Kontynuować?"
 
 msgid "Remove Contact"
 msgstr "Usunięcie kontaktu"
@@ -12552,10 +12258,11 @@
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"Zamierzasz połączyć grupę o nazwie %s z grupą %s. Czy chcesz kontynuować?"
+"Za chwilę zostaną połączone grupy o nazwie %s z grupą o nazwie%s. "
+"Kontynuować?"
 
 msgid "Merge Groups"
-msgstr "Połącz grupy"
+msgstr "Połączenie grup"
 
 msgid "_Merge Groups"
 msgstr "_Połącz grupy"
@@ -12565,52 +12272,49 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"Zamierzasz usunąć grupę %s i wszystkie znajdujące się tam osoby ze swojej "
-"listy. Czy chcesz kontynuować?"
+"Za chwilę zostanie usunięta grupa %s i wszyscy jej członkowie z listy "
+"znajomych. Kontynuować?"
 
 msgid "Remove Group"
 msgstr "Usunięcie grupy"
 
 msgid "_Remove Group"
-msgstr "_Usunięcie Grupy"
+msgstr "_Usuń Grupę"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"Zamierzasz usunąć %s ze swojej listy znajomych. Czy chcesz kontynuować?"
+msgstr "Za chwilę zostanie usunięty znajomy %s z listy. Kontynuować?"
 
 msgid "Remove Buddy"
 msgstr "Usunięcie znajomego"
 
 msgid "_Remove Buddy"
-msgstr "_Usunięcie znajomego"
+msgstr "_Usuń znajomego"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"Zamierzasz usunąć konferencję %s ze swojej listy znajomych. Czy chcesz "
-"kontynuować?"
+"Za chwilę zostanie usunięta konferencja %s z listy znajomych. Kontynuować?"
 
 msgid "Remove Chat"
 msgstr "Usunięcie konferencji"
 
 msgid "_Remove Chat"
-msgstr "Usunięcie _konferencji"
+msgstr "Usuń konfe_rencję"
 
 msgid "Right-click for more unread messages...\n"
 msgstr ""
-"kliknięcie prawym przyciskiem myszy wyświetli więcej nieprzeczytanych "
+"Naciśnięcie prawym przyciskiem myszy wyświetli więcej nieprzeczytanych "
 "wiadomości...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Zmiana Statusu"
+msgstr "_Zmień stan"
 
 msgid "Show Buddy _List"
-msgstr "Wyświetl listę znajomych"
+msgstr "Wyświetlanie _listy znajomych"
 
 msgid "_Unread Messages"
 msgstr "_Nieprzeczytane wiadomości"
@@ -12618,32 +12322,26 @@
 msgid "New _Message..."
 msgstr "Nowa wiado_mość..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/_Konta"
-
-#, fuzzy
+msgstr "Kont_a"
+
 msgid "Plu_gins"
-msgstr "Wtyczki"
-
-#, fuzzy
+msgstr "_Wtyczki"
+
 msgid "Pr_eferences"
-msgstr "Ustawienia"
-
-#, fuzzy
+msgstr "_Preferencje"
+
 msgid "Mute _Sounds"
-msgstr "Wyłączenie dźwięków"
-
-#, fuzzy
+msgstr "Wyci_szenie dźwięków"
+
 msgid "_Blink on New Message"
-msgstr "Migotanie przy nowej wiadomości"
-
-#, fuzzy
+msgstr "Migotanie p_rzy nowej wiadomości"
+
 msgid "_Quit"
-msgstr "Zakończ"
+msgstr "Za_kończ"
 
 msgid "Not started"
-msgstr "Nie rozpoczęto przesyłania"
+msgstr "Nie rozpoczęto"
 
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Odbieranie jako:</b>"
@@ -12655,21 +12353,21 @@
 msgstr "<b>Wysyłanie do:</b>"
 
 msgid "<b>Sending As:</b>"
-msgstr "<b>Wysyłanie z konta:</b>"
+msgstr "<b>Wysyłanie jako:</b>"
 
 msgid "There is no application configured to open this type of file."
-msgstr "Żadna aplikacja nie jest skonfigurowana do obsługi tego typu plików."
+msgstr "Żaden program nie jest skonfigurowana do otwierania tego typu plików."
 
 msgid "An error occurred while opening the file."
 msgstr "Wystąpił błąd podczas otwierania pliku."
 
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "Błąd uruchamiania %s: %s."
+msgstr "Błąd podczas uruchamiania %s: %s"
 
 #, c-format
 msgid "Error running %s"
-msgstr "Błąd uruchamiania %s"
+msgstr "Błąd podczas wykonywania %s"
 
 #, c-format
 msgid "Process returned error code %d"
@@ -12679,32 +12377,32 @@
 msgstr "Nazwa pliku:"
 
 msgid "Local File:"
-msgstr "Lokalna nazwa pliku:"
+msgstr "Lokalny plik:"
 
 msgid "Speed:"
-msgstr "Szybkość:"
+msgstr "Prędkość:"
 
 msgid "Time Elapsed:"
-msgstr "Upłynęło:"
+msgstr "Upłynęło czasu:"
 
 msgid "Time Remaining:"
-msgstr "Pozostało:"
+msgstr "Pozostało czasu:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "Zamknij to okno, po zakończeniu wszystkich transferow"
+msgstr "Zamknięcie tego okna po u_kończeniu wszystkich przesyłań"
 
 msgid "C_lear finished transfers"
-msgstr "Wyczyść ukończone transfery"
+msgstr "_Czyszczenie ukończonych przesyłań"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Szczegóły transfery plików"
+msgstr "_Szczegóły przesyłania plików"
 
 msgid "Paste as Plain _Text"
-msgstr "Wklej jako _czysty tekst"
+msgstr "Wklej jako zwykły _tekst"
 
 msgid "_Reset formatting"
-msgstr "Wyczyść _formatowanie"
+msgstr "P_rzywróć formatowanie"
 
 msgid "Disable _smileys in selected text"
 msgstr "Wyłącz _emotikony w zaznaczonym tekście"
@@ -12715,94 +12413,88 @@
 msgid "Color to draw hyperlinks."
 msgstr "Kolor wyświetlania odnośników."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Kolor odnośnika"
-
-#, fuzzy
+msgstr "Kolor odwiedzonych odnośników"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Kolor odnośników pod kursorem myszki."
+msgstr "Kolor wyświetlania odnośników po ich odwiedzeniu (lub aktywowaniu)."
 
 msgid "Hyperlink prelight color"
 msgstr "Kolor podświetlonego odnośnika"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kolor odnośników pod kursorem myszki."
-
-#, fuzzy
+msgstr "Kolor wyświetlania odnośników pod kursorem myszy."
+
 msgid "Sent Message Name Color"
-msgstr "Wysyłane wiadomości"
+msgstr "Kolor nazwy wysyłanej wiadomości"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
-
-#, fuzzy
+msgstr "Kolor wyświetlania nazwy wysłanej wiadomości."
+
 msgid "Received Message Name Color"
-msgstr "Odebrane wiadomości"
+msgstr "Kolor nazwy odebranej wiadomości"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "Kolor wyświetlania nazwy odebranej wiadomości."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "Kolor nazwy \"uwagi\""
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
+"Kolor wyświetlania nazwy odebranej wiadomości zawierającej nazwę użytkownika."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "Kolor nazwy wiadomości czynności"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "Kolor wyświetlania nazwy wiadomości czynności."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Kolor nazwy wiadomości czynności dla wyszeptanej wiadomości"
 
 msgid "Color to draw the name of a whispered action message."
 msgstr ""
+"Kolor wyświetlania nazwy wiadomości czynności dla wyszeptanej wiadomości."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Kolor nazwy wyszeptanej wiadomości"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
-
-#, fuzzy
+msgstr "Kolor wyświetlania nazwy wyszeptanej wiadomości."
+
 msgid "Typing notification color"
-msgstr "Likwidowanie powiadomienia"
-
-#, fuzzy
+msgstr "Kolor powiadomienia o pisaniu"
+
 msgid "The color to use for the typing notification"
-msgstr "Powiadamianie o nowej poczcie"
-
-#, fuzzy
+msgstr "Kolor używany do powiadomień o pisaniu"
+
 msgid "Typing notification font"
-msgstr "_Wyświetlenie okna z powiadomieniem"
+msgstr "Czcionka powiadomienia o pisaniu"
 
 msgid "The font to use for the typing notification"
-msgstr ""
-
-#, fuzzy
+msgstr "Czcionka używana do powiadomień o pisaniu"
+
 msgid "Enable typing notification"
-msgstr "Powiadamianie o nowej poczcie"
+msgstr "Włączenie powiadomień o pisaniu"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>Nieznany typ pliku</span>\n"
-"\n"
-"Przyjmujemy, że jest w formacie PNG."
+"<span size='larger' weight='bold'>Nierozpoznany typ pliku</span>\n"
+"\n"
+"Domyślnie przyjmowany jest format PNG."
 
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"Nieznany typ pliku\n"
-"\n"
-"Przyjmujemy, że jest w formacie PNG."
+"Nierozpoznany typ pliku\n"
+"\n"
+"Domyślnie przyjmuje się format PNG."
 
 #, c-format
 msgid ""
@@ -12810,7 +12502,7 @@
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>Błąd podczas zapisu obrazka</span>\n"
+"<span size='larger' weight='bold'>Błąd podczas zapisywania obrazu</span>\n"
 "\n"
 "%s"
 
@@ -12820,7 +12512,7 @@
 "\n"
 "%s"
 msgstr ""
-"Błąd podczas zapisu obrazka\n"
+"Błąd podczas zapisywania obrazu\n"
 "\n"
 "%s"
 
@@ -12828,10 +12520,10 @@
 msgstr "Zapis obrazu"
 
 msgid "_Save Image..."
-msgstr "Zapisz _obraz..."
+msgstr "Zapi_sz obraz..."
 
 msgid "_Add Custom Smiley..."
-msgstr "_Dodaj własną emotikonę..."
+msgstr "Dod_aj własną emotikonę..."
 
 msgid "Select Font"
 msgstr "Wybór czcionki"
@@ -12852,48 +12544,50 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Podaj adres URL i opis wstawianego odnośnika. Opis nie jest obowiązkowy."
+"Proszę podać adres URL i opis wstawianego odnośnika. Opis jest opcjonalny."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Wpisz adres URL wstawianego odnośnika."
+msgstr "Proszę podać adres URL wstawianego odnośnika."
 
 msgid "Insert Link"
-msgstr "Wstaw odnośnik"
+msgstr "Wstawienie odnośnika"
 
 msgid "_Insert"
 msgstr "_Wstaw"
 
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Nie można zapisać obrazu: %s\n"
+msgstr "Przechowanie obrazu nie powiodło się: %s\n"
 
 msgid "Insert Image"
-msgstr "Wstaw obraz"
+msgstr "Wstawienie obrazu"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"Ta emotikona jest wyłączona, ponieważ istnieje własna emotikona dla tego "
+"skrótu:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "Uśmiech!"
 
 msgid "_Manage custom smileys"
-msgstr "_Zarządzaj niestandardowymi emotikonami"
+msgstr "_Zarządzaj własnymi emotikonami"
 
 msgid "This theme has no available smileys."
-msgstr "Ten temat nie zawiera żadnych emotikon."
+msgstr "Ten motyw nie posiada emotikon."
 
 msgid "_Font"
 msgstr "_Czcionka"
 
-#, fuzzy
 msgid "Group Items"
-msgstr "ID Grupy"
+msgstr "Elementy grupy"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Elementy nie będące w grupach"
 
 msgid "Bold"
 msgstr "Pogrubienie"
@@ -12914,16 +12608,14 @@
 msgstr "Zmniejsz rozmiar czcionki"
 
 msgid "Font Face"
-msgstr "_Krój czcionki"
+msgstr "Krój czcionki"
 
 msgid "Foreground Color"
-msgstr "Kolor pisma"
-
-#, fuzzy
+msgstr "Kolor czcionki"
+
 msgid "Reset Formatting"
-msgstr "Wyczyść _formatowanie"
-
-#, fuzzy
+msgstr "Przywróć formatowanie"
+
 msgid "Insert IM Image"
 msgstr "Wstaw obraz"
 
@@ -12931,141 +12623,145 @@
 msgstr "Wstaw emotikonę"
 
 msgid "<b>_Bold</b>"
-msgstr "<b>_Pogrubiona</b>"
+msgstr "<b>Pogru_bienie</b>"
 
 msgid "<i>_Italic</i>"
-msgstr " <i>P_ochylona</i>"
+msgstr "<i>P_ochylenie</i>"
 
 msgid "<u>_Underline</u>"
-msgstr "<u>Po_dkreślona</u>"
+msgstr "<u>Po_dkreślenie</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger' weight='bold'>Przekreślona</span>"
+msgstr "<span strikethrough='true'>Przekreślenie</span>"
 
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span size='larger' weight='bold'>Większa</span>"
+msgstr "<span size='larger'>Powię_kszenie</span>"
 
 msgid "_Normal"
 msgstr "_Normalna"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr "<span size='smaller'>_Mniejsza</span>"
+msgstr "<span size='smaller'>Pomniej_szenie</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 "_Krój"
+msgstr "_Krój czcionki"
 
 msgid "Foreground _color"
-msgstr "_Kolor czcionki"
+msgstr "K_olor czcionki"
 
 msgid "Bac_kground color"
-msgstr "Kolor _tła"
+msgstr "_Kolor tła"
 
 msgid "_Image"
-msgstr "_Obrazek"
+msgstr "_Obraz"
 
 msgid "_Link"
-msgstr "_Odnośnik"
+msgstr "O_dnośnik"
 
 msgid "_Horizontal rule"
-msgstr "Linia pozioma"
+msgstr "_Linia pozioma"
 
 msgid "_Smile!"
-msgstr "_Uśmiechnij się!"
-
-#, fuzzy
+msgstr "_Uśmiech!"
+
 msgid "Log Deletion Failed"
-msgstr "Połączenie SSL nie powiodło się"
+msgstr "Usunięcie dziennika rozmów nie powiodło się"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "Proszę sprawdzić uprawnienia i spróbować ponownie."
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Na pewno chcesz usunąć zapis rozmowy z %s, która ma datę rozpoczęcia %s ?"
+"Na pewno trwale usunąć dziennik rozmowy z użytkownikiem %s, rozpoczętej dnia "
+"%s?"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "Na pewno chcesz usunąć zapis rozmowy w %s datowaną na %s?"
-
-#, fuzzy, c-format
+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?"
-msgstr "Na pewno chcesz usunąć zapis rozmowy w %s datowaną na %s?"
-
-#, fuzzy
+msgstr "Na pewno trwale usunąć dziennik systemowy rozpoczęty dnia %s?"
+
 msgid "Delete Log?"
-msgstr "Usuń"
-
-#, fuzzy
+msgstr "Usunąć dziennik?"
+
 msgid "Delete Log..."
-msgstr "Usuń"
+msgstr "Usuń dziennik..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Rozmowa w %s z dnia %s</span>"
+msgstr "<span size='larger' weight='bold'>Rozmowa w %s dnia %s</span>"
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Rozmowa z %s dnia %s</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Rozmowa z użytkownikiem %s dnia %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "_Przeglądaj katalog z dziennikami rozmów"
+msgstr "_Przeglądaj katalog dzienników rozmów"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. Napisz \"%s -h\" aby uzyskać więcej informacji.\n"
+msgstr "%s %s. Należy podać \"%s -h\", aby uzyskać więcej informacji.\n"
 
 #, c-format
 msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Użycie: %s [OPCJA]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "KATALOG"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "używa KATALOGU dla plików konfiguracji"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "wyświetla komunikaty debugowania na standardowym wyjściu"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "wymusza tryb online, niezależnie od stanu sieci"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "wyświetla tę pomoc i kończy pracę"
 
 msgid "allow multiple instances"
-msgstr ""
+msgstr "pozwala na wiele instancji"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "bez automatycznego logowania"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAZWA"
 
 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 ""
+"włącza podane konta (opcjonalny parametr NAZWA\n"
+"                      podaje używane konta, oddzielone przecinkami.\n"
+"                      Bez tego tylko pierwsze konto zostanie włączone)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "używany ekran X"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "wyświetla bieżącą wersję i kończy pracę"
 
 #, c-format
 msgid ""
@@ -13082,27 +12778,40 @@
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"Program %s %s miał awarię i próbował zrzucić plik core.\n"
+"To jest błąd w oprogramowaniu nie powstały z winy użytkownika.\n"
+"\n"
+"Jeśli można powtórzyć awarię, proszę powiadomić programistów\n"
+"zgłaszając błąd na stronie:\n"
+"%ssimpleticket/\n"
+"\n"
+"Proszę upewnić się, że podano czynność wykonywaną w trakcie\n"
+"awarii oraz wysłano wyjątek z pliku core. Jeśli nie wiadomo,\n"
+"jak uzyskać wyjątek, proszę przeczytać instrukcje na stronie\n"
+"%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
+"Kończenie pracy, ponieważ inny klient biblioteki libpurple jest już "
+"uruchomiony.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Multimedia"
 
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/Multimedia/_Rozłącz się"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "Użytkownik %s chce rozpocząć sesję głosową/wideo."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "Użytkownik %s chce rozpocząć sesję wideo."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Rozmowa przychodząca"
 
 msgid "_Pause"
 msgstr "_Wstrzymaj"
@@ -13110,53 +12819,51 @@
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s ma %d nową wiadomość."
-msgstr[1] "%s ma %d nowe wiadomości."
-msgstr[2] "%s ma %d nowych wiadomości."
+msgstr[0] "Użytkownik %s ma %d nową wiadomość."
+msgstr[1] "Użytkownik %s ma %d nowe wiadomości."
+msgstr[2] "Użytkownik %s ma %d nowych wiadomości."
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>Masz %d nowy email.</b>"
-msgstr[1] "<b>Masz %d nowe emaile.</b>"
-msgstr[2] "<b>Masz %d nowych emaili.</b>"
+msgstr[0] "<b>%d nowa wiadomość e-mail.</b>"
+msgstr[1] "<b>%d nowe wiadomości e-mail.</b>"
+msgstr[2] "<b>%d nowych wiadomości e-mail.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Polecenie przeglądarki \"%s\" jest niepoprawne."
+msgstr "Polecenie przeglądarki \"%s\" jest nieprawidłowe."
 
 msgid "Unable to open URL"
 msgstr "Nie można otworzyć adresu URL"
 
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Błąd uruchamiania \"%s\": %s"
+msgstr "Błąd podczas uruchamiania \"%s\": %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Wybrano \"ręczne\" polecenie przeglądarki, lecz nie ustawiono polecenia."
-
-#, fuzzy
+"Wybrano \"ręczne\" polecenie przeglądarki, ale nie ustawiono polecenia."
+
 msgid "No message"
-msgstr "Nieznany komunikat"
+msgstr "Brak wiadomości"
 
 msgid "Open All Messages"
 msgstr "Otwórz wszystkie wiadomości"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
-
-#, fuzzy
+msgstr "<span weight=\"bold\" size=\"larger\">Nowa wiadomość e-mail.</span>"
+
 msgid "New Pounces"
 msgstr "Nowe przechwytywanie zdarzeń"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Odrzuć"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Nowe przechwytywanie zdarzenia.</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Następujące wtyczki zostaną wyłączone."
@@ -13165,54 +12872,49 @@
 msgstr "Kilka wtyczek zostanie wyłączonych."
 
 msgid "Unload Plugins"
-msgstr "Odłącz wtyczki"
-
-#, fuzzy
+msgstr "Wyłącz wtyczki"
+
 msgid "Could not unload plugin"
-msgstr "Nie można wczytać klucza publicznego"
+msgstr "Nie można wyłączyć wtyczki"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
-
-#, fuzzy, c-format
+"Nie można teraz wyłączyć wtyczki, ale zostanie ona wyłączona podczas "
+"następnego uruchomienia."
+
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Błąd: %s\n"
-"Sprawdź na stronie autora wtyczki czy jest dostępna nowa wersja.</span>"
-
-#, fuzzy
+"<span foreground=\"red\" weight=\"bold\">Błąd: %s\n"
+"Proszę sprawdzić stronę WWW wtyczki, aby uzyskać aktualizację.</span>"
+
 msgid "Author"
-msgstr "Autoryzuj"
-
-#, fuzzy
+msgstr "Autor"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>Wysyłanie do:</b>"
-
-#, fuzzy
+msgstr "<b>Napisane przez:</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>Wysyłanie z konta:</b>"
-
-#, fuzzy
+msgstr "<b>Strona WWW:</b>"
+
 msgid "<b>Filename:</b>"
-msgstr "<b>Użytkownik:</b>"
+msgstr "<b>Nazwa pliku:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "Konfiguruj wtyczkę"
+msgstr "Skonfig_uruj wtyczkę"
 
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Szczegółowe informacje o wtyczce</b>"
 
 msgid "Select a file"
-msgstr "Wybierz plik"
-
-#, fuzzy
+msgstr "Wybór pliku"
+
 msgid "Modify Buddy Pounce"
-msgstr "Modyfikacja zdarzenia"
+msgstr "Zmodyfikuj przechwytywanie zdarzenie"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -13222,7 +12924,7 @@
 msgstr "_Konto:"
 
 msgid "_Buddy name:"
-msgstr "_Nazwa użytkownika:"
+msgstr "Nazwa _znajomego:"
 
 msgid "Si_gns on"
 msgstr "Z_alogowanie"
@@ -13231,173 +12933,161 @@
 msgstr "_Wylogowanie"
 
 msgid "Goes a_way"
-msgstr "Zmiana statusu na _zajęty"
+msgstr "Zmiana stanu na _zajęty"
 
 msgid "Ret_urns from away"
-msgstr "Powrót z zajętości"
+msgstr "Powrót ze stan_u nieobecności"
 
 msgid "Becomes _idle"
-msgstr "Przejście w stan bezczynności"
+msgstr "Przejście w stan bezczynnośc_i"
 
 msgid "Is no longer i_dle"
-msgstr "Powrót ze stanu bezczynności"
+msgstr "Powrót ze stanu bezczynnoś_ci"
 
 msgid "Starts _typing"
-msgstr "Rozpoczęcie _pisania"
+msgstr "Rozpoczęcie pi_sania"
 
 msgid "P_auses while typing"
-msgstr "Wstrzymanie pisania"
+msgstr "Wstrzym_anie pisania"
 
 msgid "Stops t_yping"
-msgstr "Zakończenie _pisania"
+msgstr "Zatrzymanie pisa_nia"
 
 msgid "Sends a _message"
-msgstr "Wysyłanie wiadomości"
+msgstr "Wysłanie wiado_mości"
 
 msgid "Ope_n an IM window"
-msgstr "Otworzenie okna rozmowy"
+msgstr "Otwarcie ok_na rozmowy"
 
 msgid "_Pop up a notification"
-msgstr "_Wyświetlenie okna z powiadomieniem"
+msgstr "_Wyświetlenie powiadomienia"
 
 msgid "Send a _message"
 msgstr "Wysłanie wiado_mości"
 
 msgid "E_xecute a command"
-msgstr "Wyko_nanie polecenie"
+msgstr "Wyko_nanie polecenia"
 
 msgid "P_lay a sound"
 msgstr "O_dtworzenie dźwięku"
 
 msgid "Brows_e..."
-msgstr "_Przeglądaj..."
+msgstr "Prz_eglądaj..."
 
 msgid "Br_owse..."
-msgstr "Prz_eglądaj..."
+msgstr "Przegląd_aj..."
 
 msgid "Pre_view"
 msgstr "Podg_ląd"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Aktywne tylko gdy jestem dostępny"
+msgstr "Przechwytywanie tylko, kiedy stan nie jest d_ostępny"
 
 msgid "_Recurring"
-msgstr "_Powtarzanie"
+msgstr "Powta_rzanie"
 
 msgid "Pounce Target"
-msgstr "Źródło zdarzeń"
-
-#, fuzzy
+msgstr "Cel zdarzeń"
+
 msgid "Started typing"
-msgstr "Rozpoczyna pisanie"
-
-#, fuzzy
+msgstr "Rozpoczęcie pisania"
+
 msgid "Paused while typing"
-msgstr "Wstrzymuje pisanie"
-
-#, fuzzy
+msgstr "Wstrzymanie pisania"
+
 msgid "Signed on"
-msgstr "loguje się"
-
-#, fuzzy
+msgstr "Zalogowanie"
+
 msgid "Returned from being idle"
-msgstr "%s przestał być bezczynny (%s)"
-
-#, fuzzy
+msgstr "Powrót ze stanu bezczynności"
+
 msgid "Returned from being away"
-msgstr "wraca"
-
-#, fuzzy
+msgstr "Powrót ze stanu nieobecności"
+
 msgid "Stopped typing"
-msgstr "Zakończył(a) pisanie"
-
-#, fuzzy
+msgstr "Zatrzymanie pisania"
+
 msgid "Signed off"
-msgstr "wylogowuje się"
-
-#, fuzzy
+msgstr "Wylogowanie"
+
 msgid "Became idle"
-msgstr "przechodzi w stan bezczynności"
-
-#, fuzzy
+msgstr "Przejście w stan bezczynności"
+
 msgid "Went away"
-msgstr "Podczas nieobecności"
-
-#, fuzzy
+msgstr "Przejście do stanu nieobecności"
+
 msgid "Sent a message"
-msgstr "Wysłanie wiado_mości"
-
-#, fuzzy
+msgstr "Wysłanie wiadomości"
+
 msgid "Unknown.... Please report this!"
-msgstr ""
-"Przechwycono nieznane zdarzenie. Proszę zawiadomić autorów programu Pidgin!"
+msgstr "Nieznane... Proszę to zgłosić."
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "Domyślny"
+msgstr "(Własne)"
+
+msgid "Penguin Pimps"
+msgstr "Pingwinki"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Domyślny motyw dźwięków programu Pidgin"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Lista znajomych"
+msgstr "Domyślny motyw listy znajomych programu Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Domyślny motyw ikon stanu programu Pidgin"
+
 msgid "Theme failed to unpack."
-msgstr "Nie udało się rozpakować zestawu emotikon."
-
-#, fuzzy
+msgstr "Rozpakowanie motywu nie powiodło się."
+
 msgid "Theme failed to load."
-msgstr "Nie udało się rozpakować zestawu emotikon."
-
-#, fuzzy
+msgstr "Wczytanie motywu nie powiodło się."
+
 msgid "Theme failed to copy."
-msgstr "Nie udało się rozpakować zestawu emotikon."
-
-msgid "Install Theme"
-msgstr "Instalowanie emotikonek"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Wybierz zestaw emotikonek z poniższej listy. Nowe ikonki można zainstalować "
-"przeciągając je na listę motywów."
-
-msgid "Icon"
-msgstr "Ikonka"
+msgstr "Skopiowanie motywu nie powiodło się."
+
+msgid "Theme Selections"
+msgstr "Wybór motywu"
+
+#. 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 ""
+"Proszę wybrać motyw do użycia z poniższej listy. Nowe motywy\n"
+"można zainstalować przeciągając je na listę motywów."
+
+msgid "Buddy List Theme:"
+msgstr "Motyw listy znajomych:"
+
+msgid "Status Icon Theme:"
+msgstr "Motyw ikony stanu:"
+
+msgid "Sound Theme:"
+msgstr "Motyw dźwięków:"
+
+msgid "Smiley Theme:"
+msgstr "Motyw emotikon:"
 
 msgid "Keyboard Shortcuts"
-msgstr "Skróty klawiaturowe"
+msgstr "Skróty klawiszowe"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Zamykanie r_ozmów za pomocą klawisza Escape"
 
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "Lista znajomych"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona obszaru powiadamiania"
 
 msgid "_Show system tray icon:"
-msgstr "Wyświetlaj ikonę obszaru powiadamiania:"
+msgstr "Wyświetlanie ikony ob_szaru powiadamiania:"
 
 msgid "On unread messages"
-msgstr "Gdy są nieprzeczytane wiadomości"
-
-#, fuzzy
+msgstr "Kiedy są nieprzeczytane wiadomości"
+
 msgid "Conversation Window"
-msgstr "Okna rozmów"
+msgstr "Okno rozmów"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ukrywanie nowych rozmów:"
@@ -13405,19 +13095,18 @@
 msgid "When away"
 msgstr "Podczas nieobecności"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "Przeniesienia okna rozmów na _wierzch"
+msgstr "Minimali_zowanie nowych okien rozmów"
 
 #. All the tab options!
 msgid "Tabs"
 msgstr "Karty"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "_Wyświetlanie wiadomości i konferencji w kartach"
+msgstr "Wyświe_tlanie wiadomości i konferencji w kartach"
 
 msgid "Show close b_utton on tabs"
-msgstr "Wyświetlanie przycisku _zamknięcia"
+msgstr "Wyświetlanie przycisku _zamknięcia na kartach"
 
 msgid "_Placement:"
 msgstr "_Położenie:"
@@ -13441,22 +13130,22 @@
 msgstr "Pionowo z prawej"
 
 msgid "N_ew conversations:"
-msgstr "Nowe _rozmowy:"
+msgstr "Now_e rozmowy:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "Wyświetlanie _formatowania w przychodzących wiadomościach"
+msgstr "Wyświetlanie f_ormatowania wiadomości przychodzących"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Zamykanie wiadomości po zamknięciu zakładki"
+msgstr "Zamykanie wiadomości po zamknięciu karty"
 
 msgid "Show _detailed information"
-msgstr "Wyświetlanie _statusów"
+msgstr "Wyświetlanie _szczegółowych informacji"
 
 msgid "Enable buddy ic_on animation"
-msgstr "Animowanie ik_on znajomych"
+msgstr "Animowane i_kony znajomych"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Informowanie rozmówców pisaniu"
+msgstr "Powiadamia_nie znajomych o pisaniu"
 
 msgid "Highlight _misspelled words"
 msgstr "Wyróżnianie _błędów pisowni"
@@ -13468,19 +13157,16 @@
 msgstr "_Migotanie okna po odebraniu wiadomości"
 
 msgid "Minimum input area height in lines:"
-msgstr "Minimalna wysokość pola tekstowego w liniach:"
+msgstr "Minimalna wysokość pola wprowadzania tekstu w wierszach:"
 
 msgid "Font"
-msgstr "Font"
-
-msgid "Use document font from _theme"
-msgstr "Używanie fontu dokumentu z aktualnego _tematu"
+msgstr "Czcionka"
 
 msgid "Use font from _theme"
-msgstr "Używanie fontu z aktualnego _tematu"
+msgstr "Użycie czcionki z mo_tywu"
 
 msgid "Conversation _font:"
-msgstr "Czc_ionka rozmowy:"
+msgstr "_Czcionka rozmowy:"
 
 msgid "Default Formatting"
 msgstr "Domyślne formatowanie"
@@ -13489,31 +13175,27 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"To jest przykładowy wygląd wiadomości wychodzącej. Tak będą wyglądały "
-"napisane przez Ciebie wiadomości jeżeli będzie używany protokół obsługujący "
-"formatowanie tekstu."
+"Tak będzie wyglądał tekst wiadomości wychodzącej podczas używania protokołów "
+"obsługujących formatowanie."
 
 msgid "Cannot start proxy configuration program."
-msgstr "Nie można uruchomić aplikacji konfigurującej proxy."
-
-#, fuzzy
+msgstr "Nie można uruchomić programu konfiguracji pośrednika."
+
 msgid "Cannot start browser configuration program."
-msgstr "Nie można uruchomić aplikacji konfigurującej proxy."
-
-#, fuzzy
+msgstr "Nie można uruchomić programu konfiguracji przeglądarki."
+
 msgid "Disabled"
-msgstr "_Wyłącz"
-
-#, fuzzy, c-format
+msgstr "Wyłączone"
+
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Automatyczne wykrywanie adresu IP"
-
-#, fuzzy
+msgstr "_Automatyczne wykrywanie adresu IP: %s"
+
 msgid "ST_UN server:"
-msgstr "Serwer _STUN:"
+msgstr "Serwer ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Przykład: stunserver.org</span>"
+msgstr "<span style=\"italic\">Przykład: serwer_stun.org</span>"
 
 msgid "Public _IP:"
 msgstr "Publiczne _IP:"
@@ -13522,82 +13204,32 @@
 msgstr "Porty"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
-
-#, fuzzy
+msgstr "Automatyczn_e przekierowanie portów routera"
+
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ręcznie określony zakres portów na których będzie nasłuchiwał program"
-
-#, fuzzy
+msgstr "_Ręcznie podany zakres portów do nasłuchiwania:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Początkowy:"
+
 msgid "_End:"
-msgstr "_Rozwiń"
+msgstr "Koń_cowy:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
-
-#, fuzzy
+msgstr "Serwer przekaźnika (TURN)"
+
 msgid "_TURN server:"
-msgstr "Serwer _STUN:"
-
-#, fuzzy
+msgstr "Serwer _TURN:"
+
 msgid "Use_rname:"
-msgstr "_Użytkownik:"
-
-#, fuzzy
+msgstr "Na_zwa użytkownika:"
+
 msgid "Pass_word:"
-msgstr "Hasło:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Serwer pośredniczący i przeglądarka"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Aplikacja konfigurująca proxy nie została znaleziona.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Aplikacja konfigurująca przeglądarkę nie została znaleziona.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Konfiguracja proxy i przeglądarki jest ustawiana\n"
-"w oknie preferencji GNOME"
-
-msgid "Configure _Proxy"
-msgstr "_Konfiguruj proxy"
-
-msgid "Configure _Browser"
-msgstr "_Konfiguruj przeglądarkę"
-
-msgid "Proxy Server"
-msgstr "Serwer pośredniczący"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Rodzaj pośrednika:"
-
-msgid "No proxy"
-msgstr "Bez pośrednika"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Użytkownik:"
+msgstr "_Hasło:"
 
 msgid "Seamonkey"
-msgstr "Seamonkey"
+msgstr "SeaMonkey"
 
 msgid "Opera"
 msgstr "Opera"
@@ -13611,12 +13243,11 @@
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "_Akceptuj domyślne"
+msgstr "Domyślna środowiska"
 
 msgid "GNOME Default"
-msgstr "Domyślnej przeglądarki z GNOME"
+msgstr "Domyślna środowiska GNOME"
 
 msgid "Galeon"
 msgstr "Galeon"
@@ -13631,25 +13262,35 @@
 msgstr "Epiphany"
 
 msgid "Manual"
-msgstr "Wybrana ręcznie"
+msgstr "Ręcznie"
 
 msgid "Browser Selection"
 msgstr "Wybór przeglądarki"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Preferencje przeglądarki są konfigurowane w preferencjach środowiska GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Program konfiguracji przeglądarki nie został odnaleziony.</b>"
+
+msgid "Configure _Browser"
+msgstr "Sk_onfiguruj przeglądarkę"
+
 msgid "_Browser:"
 msgstr "_Przeglądarka:"
 
 msgid "_Open link in:"
-msgstr "_Otwarcie odnośnika w:"
+msgstr "_Otwieranie odnośników w:"
 
 msgid "Browser default"
-msgstr "Domyślnej przeglądarce"
+msgstr "Domyślna przeglądarka"
 
 msgid "Existing window"
-msgstr "Istniejącym oknie"
+msgstr "Istnieje okno"
 
 msgid "New tab"
-msgstr "Nowej zakładce"
+msgstr "Nowa karta"
 
 #, c-format
 msgid ""
@@ -13657,19 +13298,49 @@
 "(%s for URL)"
 msgstr ""
 "_Ręcznie:\n"
-"(%s dla URL)"
+"(%s dla adresu URL)"
+
+msgid "Proxy Server"
+msgstr "Serwer pośrednika"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Preferencje pośrednika są konfigurowane w preferencjach środowiska GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Program konfiguracji pośrednika nie został odnaleziony.</b>"
+
+msgid "Configure _Proxy"
+msgstr "S_konfiguruj pośrednika"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Użycie zdalnego _DNS za pomocą pośredników SOCKS 4"
+
+msgid "Proxy t_ype:"
+msgstr "_Typ pośrednika:"
+
+msgid "No proxy"
+msgstr "Bez pośrednika"
+
+msgid "P_ort:"
+msgstr "_Port:"
+
+msgid "User_name:"
+msgstr "_Nazwa użytkownika:"
 
 msgid "Log _format:"
-msgstr "Format dziennika:"
+msgstr "_Format dziennika:"
 
 msgid "Log all _instant messages"
-msgstr "Zapis wszystkich _wiadomości"
+msgstr "Zapisywanie wszystkich _wiadomości"
 
 msgid "Log all c_hats"
-msgstr "Zapis wszystkich _konferencji"
+msgstr "Zapisywanie wszystkich _konferencji"
 
 msgid "Log all _status changes to system log"
-msgstr "Zapis zmian statusu do dziennika systemowego"
+msgstr "Zapisywanie wszystkich zmian _stanu do dziennika systemowego"
 
 msgid "Sound Selection"
 msgstr "Wybór dźwięków"
@@ -13699,13 +13370,13 @@
 msgstr "Najgłośniej"
 
 msgid "_Method:"
-msgstr "_Metoda:"
+msgstr "Metod_a:"
 
 msgid "Console beep"
 msgstr "Sygnał konsoli"
 
 msgid "No sounds"
-msgstr "Wyłączenie dźwięków"
+msgstr "Bez dźwięków"
 
 #, c-format
 msgid ""
@@ -13722,134 +13393,125 @@
 msgstr "_Dźwięki w aktywnym oknie rozmowy"
 
 msgid "_Enable sounds:"
-msgstr "_Włącz dźwięki:"
+msgstr "Włącz_enie dźwięków:"
 
 msgid "V_olume:"
 msgstr "Gł_ośność:"
 
 msgid "Play"
-msgstr "Odtwarzanie"
+msgstr "Odtwórz"
 
 msgid "_Browse..."
 msgstr "_Przeglądaj..."
 
 msgid "_Reset"
-msgstr "_Przywróć"
+msgstr "P_rzywróć"
 
 msgid "_Report idle time:"
-msgstr "Sposób wyznaczania bezczynności:"
+msgstr "_Zgłaszanie czasu bezczynności:"
 
 msgid "Based on keyboard or mouse use"
-msgstr "Na podstawie ruchów myszki i klaw."
+msgstr "Na podstawie ruchów klawiatury i myszy"
+
+msgid "_Minutes before becoming idle:"
+msgstr "_Minuty przed zmianą stanu:"
+
+msgid "Change to this status when _idle:"
+msgstr "Zm_iana na ten stan podczas bezczynności:"
 
 msgid "_Auto-reply:"
 msgstr "_Automatyczna odpowiedź:"
 
 msgid "When both away and idle"
-msgstr "Podczas nieobecności z powodu bezczynności"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatyczny status \"Zaraz wracam\""
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Czas (w minutach) do zmiany statusu:"
-
-msgid "Change status when _idle"
-msgstr "Zmiana Statusu po wykryciu bezczynności"
-
-msgid "Change _status to:"
-msgstr "Zmiana _statusu na:"
+msgstr "Podczas nieobecności i bezczynności"
 
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "Status ustawiany po uruchomieniu programu"
+msgstr "Stan ustawiany podczas uruchomienia"
 
 msgid "Use status from last _exit at startup"
-msgstr "Użycie statusu z ostatniej sesji programu"
+msgstr "Użycie stanu z ostatniej s_esji programu"
 
 msgid "Status to a_pply at startup:"
-msgstr "Status, który zostanie ustawiony zaraz po starcie:"
+msgstr "Stan _ustawiany podczas uruchamiania:"
 
 msgid "Interface"
 msgstr "Interfejs"
 
-msgid "Smiley Themes"
-msgstr "Zestawy emotikon"
-
 msgid "Browser"
 msgstr "Przeglądarka"
 
 msgid "Status / Idle"
-msgstr "Status / Bezczynność"
+msgstr "Stan/bezczynność"
+
+msgid "Themes"
+msgstr "Motywy"
 
 msgid "Allow all users to contact me"
-msgstr "Zezwalaj wszystkim na kontaktowanie się ze mną"
+msgstr "Zezwalanie wszystkim użytkownikom na kontakt"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Zezwalaj tylko użytkownikom z listy znajomych"
+msgstr "Zezwalanie tylko użytkownikom z listy znajomych"
 
 msgid "Allow only the users below"
-msgstr "Zezwalaj tylko użytkownikom z poniższej listy"
+msgstr "Zezwalanie tylko poniższym użytkownikom"
 
 msgid "Block all users"
-msgstr "Blokuj wszystkich użytkowników"
+msgstr "Blokowanie wszystkich użytkowników"
 
 msgid "Block only the users below"
-msgstr "Blokuj tylko użytkowników z poniższej listy"
+msgstr "Blokowanie tylko poniższych użytkowników"
 
 msgid "Privacy"
 msgstr "Prywatność"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Zmiany ustawień prywatności następują natychmiast."
+msgstr "Zmiany ustawień prywatności są uwzględniane natychmiast."
 
 msgid "Set privacy for:"
 msgstr "Ustawienie prywatności dla:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "Usuń"
+msgstr "Usuń wszyst_ko"
 
 msgid "Permit User"
 msgstr "Zezwolenie dla użytkownika"
 
 msgid "Type a user you permit to contact you."
-msgstr "Podaj użytkownika, który ma pozwolenie na kontakt."
+msgstr "Proszę podać użytkownika, który ma pozwolenie na kontakt."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
-"Podaj identyfikator użytkownika, który ma mieć możliwość kontaktowania się z "
-"Tobą."
+"Proszę podać nazwę użytkownika, który ma mieć możliwość kontaktowania się."
 
 msgid "_Permit"
-msgstr "_Zezowlenie"
+msgstr "_Zezwolenie"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "Zezwolić %s na kontaktowanie się?"
+msgstr "Zezwolić użytkownikowi %s na kontaktowanie się?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Czy na pewno zezwolić %s kontaktowanie się?"
+msgstr "Na pewno zezwolić użytkownikowi %s na kontaktowanie się?"
 
 msgid "Block User"
 msgstr "Blokowanie użytkownika"
 
 msgid "Type a user to block."
-msgstr "Podaj użytkownika do zablokowania."
+msgstr "Proszę podać użytkownika do zablokowania."
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "Podaj nazwę użytkownika którego należy zablokować."
+msgstr "Proszę podać nazwę użytkownika, który ma zostać zablokowany."
 
 #, c-format
 msgid "Block %s?"
-msgstr "Zablokować %s?"
+msgstr "Zablokować użytkownika %s?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Czy na pewno zablokować %s?"
+msgstr "Na pewno zablokować użytkownika %s?"
 
 msgid "Apply"
 msgstr "Zastosuj"
@@ -13858,13 +13520,13 @@
 msgstr "Ten plik już istnieje"
 
 msgid "Would you like to overwrite it?"
-msgstr "Czy nadpisać plik?"
+msgstr "Zastąpić go?"
 
 msgid "Overwrite"
-msgstr "Nadpisz"
+msgstr "Zastąp"
 
 msgid "Choose New Name"
-msgstr "Wybierz nową nazwę"
+msgstr "Wybór nowej nazwy"
 
 msgid "Select Folder..."
 msgstr "Wybierz katalog..."
@@ -13875,30 +13537,30 @@
 
 #. add button
 msgid "_Add Chat"
-msgstr "_Dodaj konferencję"
+msgstr "Dod_aj konferencję"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Na pewno chcesz usunąć wybrane statusy"
+msgstr "Na pewno usunąć wybrane zapisane stany?"
 
 #. Use button
 msgid "_Use"
 msgstr "_Użyj"
 
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Ten tytuł został już użyty. Musisz wymyślić inną nazwę."
+msgstr "Ten tytuł jest już używany. Należy wybrać unikalny tytuł."
 
 msgid "Different"
-msgstr "Inna"
+msgstr "Różne"
 
 msgid "_Title:"
 msgstr "_Tytuł:"
 
 msgid "_Status:"
-msgstr "_Status:"
+msgstr "_Stan:"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "Używaj innych statusów dla poszczególnych kont"
+msgstr "Użycie _różnych stanów dla poszczególnych kont"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
@@ -13906,69 +13568,61 @@
 
 #, c-format
 msgid "Status for %s"
-msgstr "Status dla %s"
+msgstr "Stan dla %s"
 
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
+msgstr "Własna emotikona dla \"%s\" już istnieje. Proszę wybrać inny skrót."
 
 msgid "Custom Smiley"
-msgstr "Niestandardowa emotikona"
-
-#, fuzzy
+msgstr "Własna emotikona"
+
 msgid "Duplicate Shortcut"
-msgstr "Poprawianie duplikatów"
+msgstr "Duplikat skrótu"
 
 msgid "Edit Smiley"
-msgstr "Modyfikuj emotikonę"
+msgstr "Modyfikacja emotikony"
 
 msgid "Add Smiley"
-msgstr "Dodaj emotikonę"
-
-#, fuzzy
+msgstr "Dodanie emotikony"
+
 msgid "_Image:"
-msgstr "_Obrazek"
+msgstr "_Obraz:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Sortuj"
+msgstr "_Tekst skrótu:"
 
 msgid "Smiley"
 msgstr "Emotikona"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Sortuj"
+msgstr "Tekst skrótu"
 
 msgid "Custom Smiley Manager"
-msgstr "Menadżer niestandardowych emotikon"
-
-#, fuzzy
+msgstr "Menadżer własnych emotikon"
+
 msgid "Select Buddy Icon"
-msgstr "Wybór znajomego"
-
-#, fuzzy
+msgstr "Wybór ikony znajomego"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
-
-#, fuzzy
+msgstr "Naciśnięcie zmieni ikonę znajomego dla tego konta."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Używanie poniższej ikony użytkownika dla tego konta:"
+msgstr "Naciśnięcie zmieni ikonę znajomego dla wszystkich kont."
 
 msgid "Waiting for network connection"
 msgstr "Oczekiwanie na połączenie sieciowe"
 
 msgid "New status..."
-msgstr "Nowy status..."
+msgstr "Nowy stan..."
 
 msgid "Saved statuses..."
-msgstr "Zapisane statusy"
-
-#, fuzzy
+msgstr "Zapisane stany..."
+
 msgid "Status Selector"
-msgstr "Opis stanu"
+msgstr "Wybór stanu"
 
 msgid "Google Talk"
 msgstr "Google Talk"
@@ -13978,7 +13632,7 @@
 msgstr "Wystąpił następujący błąd podczas wczytywania %s: %s"
 
 msgid "Failed to load image"
-msgstr "Nie udało się wczytać obrazka"
+msgstr "Wczytanie obrazu nie powiodło się"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -13989,43 +13643,43 @@
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"%s nie mógł wysłać katalogu. Będziesz musiała/musiał wysłać pliki pojedynczo."
+"Użytkownik %s nie mógł wysłać katalogu. Należy wysłać pliki pojedynczo."
 
 msgid "You have dragged an image"
-msgstr "Upuściłaś/Upuściłeś obrazek"
+msgstr "Upuszczono obraz"
 
 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 ""
-"Możesz przesłać ten obrazek do danej osoby, wstawić go jako część "
-"wiadomości, albo użyć jej jako ikonki dla tego użytkownika."
+"Można wysłać ten obraz jako przesyłanie pliku, wstawić go do tej wiadomości "
+"lub użyć go jako ikony znajomego dla tego użytkownika."
 
 msgid "Set as buddy icon"
-msgstr "Ustaw jako ikonkę użytkownika"
+msgstr "Ustaw jako ikonę znajomego"
 
 msgid "Send image file"
-msgstr "Wyślij plik z obrazkiem"
+msgstr "Wyślij plik obrazu"
 
 msgid "Insert in message"
-msgstr "Wstaw do rozmowy"
+msgstr "Wstaw do wiadomości"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Czy chcesz użyć tego obrazka jako ikony użytkownika dla tej osoby?"
+msgstr "Ustawić jako ikonę znajomego dla tego użytkownika?"
 
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Możesz przesłać ten obrazek do danej osoby, wstawić go jako część "
-"wiadomości, albo użyć jej jako ikonki dla tego użytkownika."
+"Można wysłać ten obraz jako przesyłanie pliku lub użyć go jako ikony "
+"znajomego dla tego użytkownika."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Możesz wstawić ten obrazek do wiadomości, lub użyć go jako ikonkę dla danego "
-"użytkownika."
+"Można wstawić ten obraz do tej wiadomości lub użyć go jako ikonę znajomego "
+"dla tego użytkownika"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -14033,15 +13687,14 @@
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "Nie można wysłać odnośnika z pulpitu"
-
-#, fuzzy
+msgstr "Nie można wysłać aktywatora"
+
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"Upuściłaś/Upuściłeś element pulpitu. Prawdopodobnie zamierzałaś/zamierzałeś "
-"przesłać obiekt na, który wskazuje ten element."
+"Upuszczono aktywator pulpitu. Najprawdopodobniej zamierzano wysłać cel tego "
+"aktywatora zamiast jego samego."
 
 #, c-format
 msgid ""
@@ -14055,56 +13708,51 @@
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Plik '%s' jest zbyt duży jak na %s.  Spróbuj mniejszego obrazka.\n"
+msgstr "Plik \"%s\" jest za duży dla %s. Proszę spróbować mniejszego obrazu.\n"
 
 msgid "Icon Error"
-msgstr "Błąd Ikonki"
+msgstr "Błąd ikony"
 
 msgid "Could not set icon"
-msgstr "Nie można ustawić ikonki"
+msgstr "Nie można ustawić ikony"
 
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Nie można odczytać pliku '%s': %s"
+msgstr "Otwarcie pliku \"%s\" nie powiodło się: %s"
 
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Nie można odczytać obrazka '%s': przyczyna nieznana, prawdopodobnie "
-"uszkodzony plik"
-
-#, fuzzy
+"Wczytanie obrazu \"%s\" nie powiodło się: powód jest nieznany, "
+"prawdopodobnie plik jest uszkodzony"
+
 msgid "_Open Link"
-msgstr "_Otwarcie odnośnika w:"
+msgstr "_Otwórz odnośnik"
 
 msgid "_Copy Link Location"
-msgstr "_Skopiuj adres odnośnika"
+msgstr "S_kopiuj adres odnośnika"
 
 msgid "_Copy Email Address"
-msgstr "Skopiuj a_dres email"
-
-#, fuzzy
+msgstr "S_kopiuj adres e-mail"
+
 msgid "_Open File"
-msgstr "Otwórz plik..."
-
-#, fuzzy
+msgstr "_Otwórz plik"
+
 msgid "Open _Containing Directory"
-msgstr "Katalog z plikami"
+msgstr "Otwórz _katalog"
 
 msgid "Save File"
 msgstr "Zapisz plik"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "O_dtworzenie dźwięku"
-
-#, fuzzy
+msgstr "O_dtwórz dźwięk"
+
 msgid "_Save File"
-msgstr "Zapisz plik"
+msgstr "Zapi_sz plik"
 
 msgid "Select color"
-msgstr "Wybierz kolor"
+msgstr "Wybór koloru"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -14112,51 +13760,46 @@
 msgstr "Pidgin"
 
 msgid "_Alias"
-msgstr "_Nazwa"
+msgstr "_Alias"
 
 msgid "Close _tabs"
 msgstr "Zamknij _karty"
 
 msgid "_Get Info"
-msgstr "Pobierz _informacje"
+msgstr "_Pobierz informacje"
 
 msgid "_Invite"
 msgstr "_Zaproś"
 
 msgid "_Modify..."
-msgstr "_Modyfikuj..."
+msgstr "Zm_odyfikuj..."
 
 msgid "_Add..."
-msgstr "_Dodaj..."
+msgstr "Dod_aj..."
 
 msgid "_Open Mail"
 msgstr "_Otwórz pocztę"
 
 msgid "_Edit"
-msgstr "_Modyfikuj"
-
-#, fuzzy
+msgstr "_Edycja"
+
 msgid "Pidgin Tooltip"
-msgstr "Pidgin"
+msgstr "Podpowiedź programu Pidgin"
 
 msgid "Pidgin smileys"
-msgstr "Emotikonki Pidgina"
-
-msgid "Penguin Pimps"
-msgstr "Pingwinki"
+msgstr "Emotikony programu Pidgin"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr "Wybranie tego zestawy wyłącza emotikonki."
+msgstr "Wybranie tego motywu wyłącza graficzne emotikony."
 
 msgid "none"
 msgstr "brak"
 
-#, fuzzy
 msgid "Small"
-msgstr "Email"
+msgstr "Małe"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Mniejsza wersja domyślnych emotikon"
 
 msgid "Response Probability:"
 msgstr "Prawdopodobieństwo odpowiedzi:"
@@ -14166,14 +13809,14 @@
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "Maksymalny czas na odpowiedź:"
+msgstr "Maksymalny czas oczekiwania na odpowiedź:"
 
 msgid "minutes"
-msgstr "minut"
+msgstr "minuty"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "Maksymalna różnica ostatnio-widziany:"
 
 #. threshold spinner
 msgid "Threshold:"
@@ -14191,30 +13834,30 @@
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Przewiduje prawdopodobieństwo odpowiedzi, przez znajomych."
+msgstr "Wtyczka przewidywania dostępności kontaktu."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr ""
+msgstr "Wyświetla informacje statystyczne o dostępności znajomych"
 
 msgid "Buddy is idle"
 msgstr "Znajomy jest bezczynny"
 
 msgid "Buddy is away"
-msgstr "Użytkownik jest zajęty"
+msgstr "Znajomy zaraz wraca"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Użytkownik ma status \"wrócę później\""
+msgstr "Użytkownik ma stan \"wrócę później\""
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Znajomy korzysta z telefonu komórkowego"
+msgstr "Znajomy używa telefonu komórkowego"
 
 msgid "Buddy is offline"
-msgstr "Użytkownik jest rozłączony"
+msgstr "Użytkownik jest w trybie offline"
 
 msgid "Point values to use when..."
-msgstr "Wskaż wartości używane gdy..."
+msgstr "Wskazywanie używanych wartości, kiedy..."
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
@@ -14224,10 +13867,10 @@
 "przy nawiązywaniu kontaktu.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Używaj ostatniego znajomego w przypadku takiej samej ilości punktów."
+msgstr "Użycie ostatniego znajomego w przypadku równej ilości punktów"
 
 msgid "Point values to use for account..."
-msgstr "Wskaż wartości używane dla konta..."
+msgstr "Wskazywanie używanej wartości dla konta..."
 
 #. *< type
 #. *< ui_requirement
@@ -14244,33 +13887,33 @@
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Pozwala na kontrolowanie wartości związanych z różnymi stanami znajomych."
+"Umożliwia kontrolowanie wartości powiązanych z różnymi stanami znajomych."
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Pozwala na zmianę wartości punktowych stanów bezczynny/nieobecny/poza siecią "
+"Umożliwia zmienianie wartości punktowych stanów bezczynny/nieobecny/offline "
 "przy obliczeniach priorytetu kontaktu."
 
 msgid "Conversation Colors"
-msgstr "Kolorowanie rozmów"
+msgstr "Kolory rozmów"
 
 msgid "Customize colors in the conversation window"
-msgstr "Umożliwia ustawienie własnych kolorów w oknach rozmów"
+msgstr "Dostosowuje kolory w oknach rozmów"
 
 msgid "Error Messages"
-msgstr "Informacje o błędach"
+msgstr "Komunikaty błędów"
 
 msgid "Highlighted Messages"
 msgstr "Wyróżnione wiadomości"
 
 msgid "System Messages"
-msgstr "Dziennik systemowy"
+msgstr "Komunikaty systemowe"
 
 msgid "Sent Messages"
-msgstr "Wysyłane wiadomości"
+msgstr "Wysłane wiadomości"
 
 msgid "Received Messages"
 msgstr "Odebrane wiadomości"
@@ -14283,104 +13926,94 @@
 msgstr "Ignorowanie formatowania w wiadomościach przychodzących"
 
 msgid "Apply in Chats"
-msgstr "Stosowanie w konferencjach"
+msgstr "Zastosowywanie w konferencjach"
 
 msgid "Apply in IMs"
-msgstr "Stosowanie w wiadomościach"
+msgstr "Zastosowywanie w wiadomościach"
 
 #. 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 "Adres serwera"
-
-#, fuzzy
+msgstr "Żądanie adresu serwera"
+
 msgid "Enter an XMPP Server"
-msgstr "Podaj adres serwera konferencyjnego"
-
-#, fuzzy
+msgstr "Proszę podać serwer XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Wpisz adres serwera konferencyjnego, z którego chcesz pobrać listę"
-
-#, fuzzy
+msgstr "Wybór serwera XMPP do odpytania"
+
 msgid "Find Services"
-msgstr "Usługi sieciowe"
-
-#, fuzzy
+msgstr "Znajdź usługi"
+
 msgid "Add to Buddy List"
-msgstr "Wyślij listę znajomych"
-
-#, fuzzy
+msgstr "Dodaj do listy znajomych"
+
 msgid "Gateway"
-msgstr "zaraz wraca"
-
-#, fuzzy
+msgstr "Brama"
+
 msgid "Directory"
-msgstr "Katalog z plikami"
-
-#, fuzzy
+msgstr "Katalog"
+
 msgid "PubSub Collection"
-msgstr "Wybór dźwięków"
+msgstr "Zbiór PubSub"
 
 msgid "PubSub Leaf"
-msgstr ""
-
-#, fuzzy
+msgstr "Karta PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Opis"
+msgstr ""
+"\n"
+"<b>Opis:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Ustaw informację katalogu"
-
-#, fuzzy
+msgstr "Wykrywanie usług"
+
 msgid "_Browse"
-msgstr "_Przeglądarka:"
-
-#, fuzzy
+msgstr "_Przeglądaj"
+
 msgid "Server does not exist"
-msgstr "Użytkownik nie istnieje"
-
-#, fuzzy
+msgstr "Serwer nie istnieje"
+
 msgid "Server does not support service discovery"
-msgstr "Serwer nie używa żadnej z obsługiwanych metod uwierzytelniania"
-
-#, fuzzy
+msgstr "Serwer nie obsługuje wykrywania usług"
+
 msgid "XMPP Service Discovery"
-msgstr "Ustaw informację katalogu"
+msgstr "Wykrywanie usług XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Umożliwia przeglądanie i rejestrowanie usług."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
+msgstr ""
+"Ta wtyczka jest przydatna do rejestrowania przestarzałych transportów lub "
+"innych usług XMPP."
 
 msgid "By conversation count"
-msgstr "W zależności od ilości rozmów"
+msgstr "Według liczby rozmów"
 
 msgid "Conversation Placement"
-msgstr "Umieszczanie rozmów"
+msgstr "Rozmieszczanie rozmów"
 
 #. 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 ""
-"Uwaga: Aby ta wtyczka funkcjonowała w ustawieniach należy opcję \"Nowe "
-"rozmowy\" ustawić na \"W zależności od ilości rozmów\"."
+"Uwaga: preferencja dla \"Nowe rozmowy\" musi zostać ustawiona na \"Według "
+"liczby rozmów\"."
 
 msgid "Number of conversations per window"
-msgstr "Ilość rozmów w jednym oknie"
+msgstr "Liczba rozmów w jednym oknie"
 
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
-"Konferencje i wiadomości w oddzielnych oknach przy rozmieszczaniu po liczbie"
+"Oddzielanie okien wiadomości i konferencji podczas rozmieszczania według "
+"liczby"
 
 #. *< type
 #. *< ui_requirement
@@ -14402,8 +14035,8 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Ogranicza ilość rozmów w jednym oknie, dodatkowo może rozdzielać zwykłe "
-"wiadomości i konferencje"
+"Ogranicza liczbę rozmów w jednym oknie, opcjonalnie oddzielając wiadomości "
+"od konferencji"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -14435,7 +14068,6 @@
 msgstr "Dostarcza obsługę gestów myszy"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -14443,20 +14075,18 @@
 " • 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 ""
-"Dodaje obsługę gestów w oknach wiadomości.\n"
-"Przesuń mysz z wciśniętym środkowym przyciskiem, tak jak opisano poniżej:\n"
-"\n"
-"W dół a potem w prawo - zamyka rozmowę.\n"
-"W górę a potem w lewo - przełącza na poprzednią rozmowę.\n"
-"W górę a potem w prawo - przełącza na następną rozmowę."
+"Umożliwia obsługę gestami myszy w oknach rozmów. Przesunięcie myszy z "
+"wciśniętym środkowym przyciskiem wykona następujące czynności:\n"
+" • W dół, a następnie w prawo zamyka rozmowę.\n"
+" • W górę, a następnie w lewo przełącza na poprzednią rozmowę.\n"
+" • W górę, a następnie w prawo przełącza na następną rozmowę."
 
 msgid "Instant Messaging"
-msgstr "Komunikatory"
+msgstr "Komunikator"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-"Wybierz osobę ze swojej książki adresowej poniżej, lub dodaj nową osobę."
+msgstr "Proszę wybrać osobę z poniższej książki adresowej lub dodać nową."
 
 msgid "Group:"
 msgstr "Grupa:"
@@ -14467,46 +14097,49 @@
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "Wybór znajomego"
+msgstr "Wybierz znajomego"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Wybierz osobę którą chcesz dodać z książki adresowej, albo utwórz nowy wpis."
+"Proszę wybrać osobę z książki adresowej, do której dodać tego znajomego lub "
+"utworzyć nową osobę."
 
 #. Add the expander
 msgid "User _details"
-msgstr "Szczegóły dotyczące _użytkownika"
+msgstr "_Szczegóły użytkownika"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_Skojarzenie kontaktu"
+msgstr "Powiąż zn_ajomego"
 
 msgid "Unable to send email"
-msgstr "Wysłanie wiadomości email nie powiodło się."
+msgstr "Nie można wysłać wiadomości e-mail"
 
 msgid "The evolution executable was not found in the PATH."
-msgstr "Plik wykonywalny programu evolution nie znajduje się w zmiennej PATH."
+msgstr ""
+"Plik wykonywalny programu Evolution nie został odnaleziony w zmiennej PATH."
 
 msgid "An email address was not found for this buddy."
-msgstr "Nie znaleziono adresu email dla tego znajomego."
+msgstr "Nie odnaleziono adresu e-mail dla tego znajomego."
 
 msgid "Add to Address Book"
 msgstr "Dodaj do książki adresowej"
 
 msgid "Send Email"
-msgstr "Wyślij Email"
+msgstr "Wyślij wiadomość e-mail"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "Konfiguracja integracji z Evolution"
+msgstr "Konfiguracja integracji z programem Evolution"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-"Zaznacz konta dla których chcesz użyć automatycznego dodawania znajomych."
+"Proszę wybrać wszystkie konta, do których znajomi powinni być automatycznie "
+"dodawani."
 
 #. *< type
 #. *< ui_requirement
@@ -14515,28 +14148,27 @@
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "Integracja z Evolution"
+msgstr "Integracja z programem Evolution"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr "Umożliwia integrację z programem Evolution."
+msgstr "Dostarcza integrację z programem Evolution."
 
 msgid "Please enter the person's information below."
-msgstr "Wprowadź informacje o użytkowniku."
-
-#, fuzzy
+msgstr "Proszę poniżej podać informacje o osobie."
+
 msgid "Please enter the buddy's username and account type below."
-msgstr "Podaj identyfikator znajomego oraz nazwę konta."
+msgstr "Proszę poniżej podać nazwę znajomego i typ konta."
 
 msgid "Account type:"
-msgstr "Rodzaj konta:"
+msgstr "Typ konta:"
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "Dodatkowe informacje:"
+msgstr "Opcjonalne informacje:"
 
 msgid "First name:"
 msgstr "Imię:"
@@ -14545,7 +14177,7 @@
 msgstr "Nazwisko:"
 
 msgid "Email:"
-msgstr "Email:"
+msgstr "Adres e-mail:"
 
 #. *< type
 #. *< ui_requirement
@@ -14554,20 +14186,23 @@
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "Test sygnałów GTK"
+msgstr "Test sygnałów GTK+"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "Test sprawdzający czy wszystkie sygnały interfejsu działają poprawnie."
-
-#, fuzzy, c-format
+msgstr ""
+"Test sprawdzający, czy wszystkie sygnały interfejsu działają poprawnie."
+
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "Notatki"
+msgstr ""
+"\n"
+"<b>Notatka o znajomym</b>: %s"
 
 msgid "History"
 msgstr "Historia"
@@ -14579,26 +14214,25 @@
 #. *< priority
 #. *< id
 msgid "Iconify on Away"
-msgstr "Zwijanie do ikony"
+msgstr "Minimalizacja do ikony podczas nieobecności"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Minimalizuje do ikony listę znajomych i okna rozmów gdy użytkownika nie ma "
-"przy komputerze."
+msgstr "Minimalizuje listę znajomych i rozmowy podczas nieobecności."
 
 msgid "Mail Checker"
 msgstr "Sprawdzanie poczty"
 
 msgid "Checks for new local mail."
-msgstr "Sprawdza czy jest nowa lokalna poczta."
+msgstr "Sprawdza, czy jest nowa lokalna poczta."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Dodaje do listy znajomych mały wskaźnik informujący o nowej lokalnej poczcie."
+"Dodaje do listy znajomych mały wskaźnik wyświetlający informacje o nowej "
+"poczcie."
 
 msgid "Markerline"
 msgstr "Odkreślenie"
@@ -14606,24 +14240,23 @@
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Rysuje linię odkreślającą nowe wiadomości w rozmowie."
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "Odkreślenie"
+msgstr "Przejdź do odkreślenia"
 
 msgid "Draw Markerline in "
-msgstr "Odkreślenie nowych wiadomości"
+msgstr "Rysowanie odkreślenia w "
 
 msgid "_IM windows"
-msgstr "Stosowanie w _rozmowach"
+msgstr "Oknach w_iadomości"
 
 msgid "C_hat windows"
-msgstr "Stosowanie w _konferencjach"
+msgstr "Oknach _konferencji"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Zażądano sesji wiadomości muzycznych. Proszę kliknąć w ikonę MM, aby "
+"Zażądano sesji wiadomości muzycznych. Proszę nacisnąć ikonę MM, aby "
 "zaakceptować."
 
 msgid "Music messaging session confirmed."
@@ -14633,7 +14266,7 @@
 msgstr "Wiadomości muzyczne"
 
 msgid "There was a conflict in running the command:"
-msgstr "Nastąpił konflikt podczas uruchamiania polecenia:"
+msgstr "Wystąpił konflikt podczas wykonywania polecenia:"
 
 msgid "Error Running Editor"
 msgstr "Błąd podczas uruchamiania edytora"
@@ -14649,7 +14282,7 @@
 msgstr "Ścieżka do edytora nut"
 
 msgid "_Apply"
-msgstr "_Zastosuj"
+msgstr "Z_astosuj"
 
 #. *< type
 #. *< ui_requirement
@@ -14663,68 +14296,64 @@
 msgstr "Wtyczka do grupowego komponowania utworów muzycznych."
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"Wtyczka wiadomości muzycznych pozwala kilku osobom na pracowanie nad utworem "
-"muzycznym poprzez edycję nut w czasie rzeczywistym."
+"Wtyczka wiadomości muzycznych umożliwia wielu użytkownikom na jednoczesną "
+"pracę nad utworem muzycznym przez modyfikowanie nut w czasie rzeczywistym."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "Powiadamianie o zmianach w"
-
-#, fuzzy
+msgstr "Powiadamianie dla"
+
 msgid "\t_Only when someone says your username"
-msgstr "\t_Tylko gdy ktoś wymawia Twoje imię"
+msgstr "\tTylk_o, kiedy ktoś wymawia nazwę użytkownika"
 
 msgid "_Focused windows"
-msgstr "Oknach _aktywnych"
+msgstr "A_ktywnych oknach"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
 msgstr "Metody powiadamiania"
 
 msgid "Prepend _string into window title:"
-msgstr "Poprzedzanie tytułu okna _napisem:"
+msgstr "Poprzedzanie tytułu okna napi_sem:"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "Wstawianie _liczby wiadomości do tytułu okna"
+msgstr "Wstawianie liczby nowych wiad_omości do tytułu okna"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
-msgstr "Wstawianie _liczby wiadomości do właściwości X"
+msgstr "Wstawianie liczby nowych wiadomości do właściwości _X"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "_Ustawienie podpowiedzi \"PILNY\" menedżera okien"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Stosowanie w _konferencjach"
+msgstr "_Miganie okna"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "Przeniesienia okna rozmów na _wierzch"
+msgstr "Przenoszenie okn_a rozmowy na wierzch"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "Przeniesienia okna rozmów na _wierzch"
+msgstr "_Wyświetlanie okna rozmowy"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "Likwidowanie powiadomienia"
+msgstr "Usunięcie powiadomień"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Usunięcie po _aktywacji okna rozmowy"
+msgstr "Usunięcie po a_ktywacji okna rozmowy"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "Usunięcie po _kliknięciu okna rozmowy"
+msgstr "Usunięcie po _naciśnięciu okna rozmowy"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
@@ -14732,11 +14361,11 @@
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "Usunięcie po _wysłaniu wiadomości"
+msgstr "Usunięcie po wysłaniu wiado_mości"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "Usunięcie po p_rzełączeniu na zakładkę rozmowy"
+msgstr "Usunięcie po przełączeniu na _kartę rozmowy"
 
 #. *< type
 #. *< ui_requirement
@@ -14745,7 +14374,7 @@
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "Powiadamianie o zdarzeniach"
+msgstr "Powiadamianie o wiadomościach"
 
 #. *< name
 #. *< version
@@ -14753,7 +14382,8 @@
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
-"Dostarcza wiele sposobów na powiadomienie o nieprzeczytanych wiadomościach."
+"Dostarcza wiele sposobów powiadomienia użytkownika o nieprzeczytanych "
+"wiadomościach."
 
 #. *< type
 #. *< ui_requirement
@@ -14762,13 +14392,13 @@
 #. *< priority
 #. *< id
 msgid "Pidgin Demonstration Plugin"
-msgstr "Wtyczka demonstracyjna Pidgina"
+msgstr "Wtyczka demonstracyjna programu Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "Przykładowa wtyczka która coś robi - patrz opis."
+msgstr "Przykładowa wtyczka, która coś robi - proszę zobaczyć opis."
 
 #. *  description
 msgid ""
@@ -14777,43 +14407,44 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"To jest naprawdę doskonała wtyczka która wiele robi:\n"
-"- Oznajmia kto napisał program kiedy się logujesz\n"
-"- Wypisuje przychodzący tekst od tyłu\n"
-"- Wysyła wiadomość do osób na liście w momencie ich zalogowania"
+"To jest naprawdę doskonała wtyczka, która wiele robi:\n"
+"- Oznajmia, kto napisał program podczas logowania\n"
+"- Przepisuje przychodzący tekst od tyłu\n"
+"- Wysyła wiadomość do osób na liście zaraz po ich zalogowaniu"
 
 msgid "Hyperlink Color"
 msgstr "Kolor odnośnika"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Kolor odnośnika"
+msgstr "Kolor odwiedzonego odnośnika"
 
 msgid "Highlighted Message Name Color"
 msgstr "Kolor nazwy wyróżnionej wiadomości"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Likwidowanie powiadomienia"
+msgstr "Kolor powiadomienia o pisaniu"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr "Poziome odstępy w GtkTreeView"
+msgstr "Poziome odstępy w widgecie GtkTreeView"
 
 msgid "Conversation Entry"
-msgstr "Pole do wprowadzania tekstu przy rozmowie"
+msgstr "Wpis rozmowy"
+
+msgid "Conversation History"
+msgstr "Historia rozmów"
 
 msgid "Request Dialog"
-msgstr "Okno dialogowe z żądaniem"
+msgstr "Okno dialogowe żądania"
 
 msgid "Notify Dialog"
-msgstr "Informacyjne okno dialogowe"
+msgstr "Okno dialogowe powiadomienia"
 
 msgid "Select Color"
-msgstr "Wybierz kolor"
+msgstr "Wybór koloru"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr "Wybór czcionki dla interfejsu"
+msgstr "Wybór czcionki interfejsu"
 
 #, c-format
 msgid "Select Font for %s"
@@ -14823,71 +14454,65 @@
 msgstr "Czcionka interfejsu GTK+"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Zestaw skrótów klawiszowych GTK+"
-
-#, fuzzy
+msgstr "Motyw skrótów tekstu GTK+"
+
 msgid "Disable Typing Notification Text"
-msgstr "Powiadamianie o nowej poczcie"
-
-#, fuzzy
+msgstr "Wyłączenie tekstu powiadamiania o pisaniu"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Kontrola tematów GTK+ w Pidgin"
-
-#, fuzzy
+msgstr "Ustawienia kontroli motywów GTK+"
+
 msgid "Colors"
-msgstr "Zamknij"
+msgstr "Kolory"
 
 msgid "Fonts"
 msgstr "Czcionki"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Różne"
 
 msgid "Gtkrc File Tools"
 msgstr "Narzędzia plików gtkrc"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Zapis ustawień do %s%sgtkrc-2.0"
+msgstr "Zapisz ustawienia do pliku %s%sgtkrc-2.0"
 
 msgid "Re-read gtkrc files"
-msgstr "Odczytaj ustawienia z plików gtkrc"
+msgstr "Ponownie odczytaj pliki gtkrc"
 
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Kontrola tematów GTK+ w Pidgin"
+msgstr "Kontrola motywów GTK+ w programie Pidgin"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "Umożliwia modyfikację często używanych opcji gtkrc."
+msgstr "Dostarcza dostęp do często używanych ustawień gtkrc."
 
 msgid "Raw"
 msgstr "Surowy"
 
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Pozwala na wysyłanie niesformatowanego strumienia w protokołach tekstowych."
+msgstr "Umożliwia wysyłanie surowego tekstu w protokołach tekstowych."
 
 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 ""
-"Pozwala na wysyłanie niesformatowanego strumienia w protokołach tekstowych "
-"(Jabber, MSN, IRC, TOC). Naciśnij \"Enter\" w polu do wprowadzania tekstu "
-"aby wysłać tekst. Obserwuj okno debugera."
+"Umożliwia wysyłanie surowego tekstu w protokołach tekstowych (XMPP, MSN, "
+"IRC, TOC). Naciśnięcie przycisku \"Enter\" w polu wprowadzania tekstu wysyła "
+"go. Należy obserwować okno debugowania."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Można zaktualizować do %s %s."
 
 msgid "New Version Available"
 msgstr "Dostępna jest nowa wersja"
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
-
-#, fuzzy
+msgstr "Później"
+
 msgid "Download Now"
-msgstr "Użytkownicy na %s: %s"
+msgstr "Pobierz teraz"
 
 #. *< type
 #. *< ui_requirement
@@ -14902,15 +14527,15 @@
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
-msgstr "Sprawdza okresowo czy wydana została nowa wersja programu."
+msgstr "Sprawdza okresowo nowe wydania."
 
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Sprawdza okresowo czy wydano nową wersję programu, oraz powiadamia "
-"użytkownika wyświetlając listę zmian."
+"Sprawdza okresowo nowe wydania i powiadamia użytkownika wyświetlając listę "
+"zmian."
 
 #. *< major version
 #. *< minor version
@@ -14920,163 +14545,150 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_Wyślij do"
+msgstr "Przycisk Wyślij"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "Ukrywanie okien rozmów"
+msgstr "Przycisk Wyślij w oknie rozmowy."
 
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
 msgstr ""
+"Dodaje przycisk Wyślij do obszaru wprowadzania okna rozmowy. Przeznaczone do "
+"używania w przpadkach, kiedy nie ma fizycznej klawiatury."
 
 msgid "Duplicate Correction"
 msgstr "Poprawianie duplikatów"
 
 msgid "The specified word already exists in the correction list."
-msgstr "Wybrane słowo już istnieje w liście słów korygujących."
+msgstr "Podany wyraz już istnieje na liście poprawianych wyrazów."
 
 msgid "Text Replacements"
 msgstr "Zastępowanie tekstu"
 
 msgid "You type"
-msgstr "Wpisanie"
+msgstr "Wpisane"
 
 msgid "You send"
-msgstr "Wysyła"
+msgstr "Wysłane"
 
 msgid "Whole words only"
-msgstr "Tylko całe słowa"
+msgstr "Tylko całe wyrazy"
 
 msgid "Case sensitive"
-msgstr "Rozróżnianie wielkości liter"
+msgstr "Rozróżnianie małych i wielkich liter"
 
 msgid "Add a new text replacement"
 msgstr "Dodaj nowe zastąpienie tekstu"
 
 msgid "You _type:"
-msgstr "_Wpisanie:"
+msgstr "_Wpisane:"
 
 msgid "You _send:"
-msgstr "Wy_słanie:"
+msgstr "Wy_słane:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Rozróżnianie wielkości liter"
+msgstr ""
+"Dokładn_e rozróżnianie małych i wielkich liter (odznaczenie powoduje "
+"automatyczne obsługiwanie wielkości liter)"
 
 msgid "Only replace _whole words"
-msgstr "Zastępowanie wyłącznie całych słów"
+msgstr "Zastępowanie tylko całych _wyrazów"
 
 msgid "General Text Replacement Options"
 msgstr "Ogólne opcje zastępowania tekstu"
 
 msgid "Enable replacement of last word on send"
-msgstr "Włącz zastępowanie ostatniego słowa przy wysyłaniu"
+msgstr "Włączenie zastępowania ostatniego wyrazu podczas wysyłania"
 
 msgid "Text replacement"
 msgstr "Zastępowanie tekstu"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Zastępuje tekst w wychodzących wiadomościach zgodnie z określonymi regułami."
-
-#, fuzzy
+"Zastępuje tekst w wychodzących wiadomościach zgodnie z regułami określonymi "
+"przez użytkownika."
+
 msgid "Just logged in"
-msgstr "Nie zalogowany"
-
-#, fuzzy
+msgstr "Właśnie zalogowano"
+
 msgid "Just logged out"
-msgstr "Nie zalogowany"
+msgstr "Właśnie wylogowano"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Ikona kontaktu/\n"
+"Ikona nieznanej osoby"
+
 msgid "Icon for Chat"
-msgstr "Dołącz do konferencji"
-
-#, fuzzy
+msgstr "Ikona konferencji"
+
 msgid "Ignored"
-msgstr "Ignorowanie"
-
-#, fuzzy
+msgstr "Ignorowany"
+
 msgid "Founder"
-msgstr "Głośniej"
+msgstr "Założyciel"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "Operator"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Zastępca operatora"
+
 msgid "Authorization dialog"
-msgstr "Autoryzacja przyznana"
-
-#, fuzzy
+msgstr "Okno dialogowe upoważnienia"
+
 msgid "Error dialog"
-msgstr "Błąd "
-
-#, fuzzy
+msgstr "Okno dialogowe błędu"
+
 msgid "Information dialog"
-msgstr "Informacje"
+msgstr "Okno dialogowe informacji"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Okno dialogowe poczty"
+
 msgid "Question dialog"
-msgstr "Okno dialogowe z żądaniem"
-
-#, fuzzy
+msgstr "Okno dialogowe pytania"
+
 msgid "Warning dialog"
-msgstr "Poziom ostrzeżenia"
+msgstr "Okno dialogowe ostrzeżenia"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Jaki to rodzaj okna dialogowego?"
+
 msgid "Status Icons"
-msgstr "Status dla %s"
-
-#, fuzzy
+msgstr "Ikony stanu"
+
 msgid "Chatroom Emblems"
-msgstr "Ustawienia lokalne pokoju konferencyjnego"
-
-#, fuzzy
+msgstr "Emblematy pokoi konferencji"
+
 msgid "Dialog Icons"
-msgstr "Zapisz ikonę"
-
-#, fuzzy
+msgstr "Ikony okna dialogowego"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Kontrola tematów GTK+ w Pidgin"
-
-#, fuzzy
+msgstr "Edytor motywów ikon programu Pidgin"
+
 msgid "Contact"
-msgstr "Informacje o kontakcie"
-
-#, fuzzy
+msgstr "Kontakt"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Lista znajomych"
-
-#, fuzzy
+msgstr "Edytor motywu listy znajomych programu Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lista znajomych"
+msgstr "Zmodyfikuj motyw listy znajomych"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Zmodyfikuj motyw ikon"
 
 #. *< type
 #. *< ui_requirement
@@ -15085,16 +14697,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Kontrola tematów GTK+ w Pidgin"
+msgstr "Edytor motywów programu Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Kontrola tematów GTK+ w Pidgin"
+msgstr "Edytor motywów programu Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -15113,7 +14723,7 @@
 msgstr "Lista znajomych przesuwająca się w poziomie."
 
 msgid "Display Timestamps Every"
-msgstr "Wyświetlanie datownika co"
+msgstr "Wyświetlanie daty co"
 
 #. *< type
 #. *< ui_requirement
@@ -15128,18 +14738,18 @@
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "Wyświetla datownik w stylu iChat-a"
+msgstr "Wyświetlenie daty w stylu programu iChat"
 
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "Dodaje daty w stylu iChat-a do rozmowy co N minut."
+msgstr "Wyświetlenie daty w stylu programu iChat do rozmowy co N minut."
 
 msgid "Timestamp Format Options"
-msgstr "Format znacznika czasu - opcje"
+msgstr "Opcje formatu daty"
 
 #, c-format
 msgid "_Force 24-hour time format"
-msgstr "_Używaj 24-godzinnego formatu czasu"
+msgstr "_Wymuszenie 24 godzinnego formatu czasu"
 
 msgid "Show dates in..."
 msgstr "Wyświetlanie dat w..."
@@ -15151,10 +14761,10 @@
 msgstr "Dla opóźnionych wiadomości"
 
 msgid "For delayed messages and in chats"
-msgstr "Dla opóźnionych wiadomości w konferencjach"
+msgstr "Dla opóźnionych wiadomości i w konferencjach"
 
 msgid "_Message Logs:"
-msgstr "_Dzienniku wiadomości"
+msgstr "Dzienniki wiado_mości:"
 
 #. *< type
 #. *< ui_requirement
@@ -15163,51 +14773,45 @@
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Format znacznika czasu w wiadomościach"
+msgstr "Formaty daty wiadomości"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "Zmień format znacznika czasu w wiadomościach."
+msgstr "Dostosowuje formaty daty wiadomości."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Umożliwia dostosowanie znacznika czasu wyświetlanego przy rozmowach i "
-"zapisywanego w dzienniku rozmów."
-
-#, fuzzy
+"Ta wtyczka umożliwia użytkownikowi dostosowanie formatów daty wiadomości i "
+"dziennika."
+
 msgid "Audio"
-msgstr "Użytkownik do autoryzacji"
-
-#, fuzzy
+msgstr "Dźwięk"
+
 msgid "Video"
-msgstr "Wideo na żywo"
+msgstr "Obraz"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Wyjście"
+
 msgid "_Plugin"
-msgstr "Wtyczki"
-
-#, fuzzy
+msgstr "_Wtyczka"
+
 msgid "_Device"
-msgstr "Urządzenie"
+msgstr "Urzą_dzenie"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Wejście"
+
 msgid "P_lugin"
-msgstr "Wtyczki"
-
-#, fuzzy
+msgstr "W_tyczka"
+
 msgid "D_evice"
-msgstr "Urządzenie"
+msgstr "Urządz_enie"
 
 #. *< magic
 #. *< major version
@@ -15218,18 +14822,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Edytuj ustawienia"
+msgstr "Ustawienia dźwięku/wideo"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Konfiguruje mikrofon i kamerę internetową."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Konfiguruje ustawienia mikrofonu i kamery internetowej dla rozmów głosowych/"
+"wideo."
 
 msgid "Opacity:"
 msgstr "Nieprzezroczystość:"
@@ -15239,13 +14844,13 @@
 msgstr "Okna rozmów"
 
 msgid "_IM window transparency"
-msgstr "Przezroczystość okien _wiadomości"
+msgstr "Przezroczystość okien w_iadomości"
 
 msgid "_Show slider bar in IM window"
-msgstr "Wyświetlanie _suwaka przezroczystości w oknie wiadomości"
+msgstr "Wyświetlanie pa_ska przezroczystości w oknie wiadomości"
 
 msgid "Remove IM window transparency on focus"
-msgstr "Usuń przezroczystość okien wiadomości, po ich aktywacji"
+msgstr "Usuń przezroczystość okna wiadomości po aktywacji"
 
 msgid "Always on top"
 msgstr "Zawsze na wierzchu"
@@ -15258,7 +14863,7 @@
 msgstr "_Przezroczystość okna listy znajomych"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Wyłączenie przezroczystości okna listy znajomych gdy jest aktywne"
+msgstr "Usuń przezroczystość okna listy znajomych po aktywacji"
 
 #. *< type
 #. *< ui_requirement
@@ -15282,10 +14887,10 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Wtyczka pozwalająca na regulację przezroczystością okna rozmowy i listy "
+"Wtyczka pozwalająca na regulację przezroczystością okien rozmów i listy "
 "znajomych.\n"
 "\n"
-"* Uwaga: Wtyczka wymaga Win2000 lub WinXP."
+"* Uwaga: ta wtyczka wymaga systemu Windows 2000 lub nowszego."
 
 #. Autostart
 msgid "Startup"
@@ -15293,37 +14898,36 @@
 
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Uruchomienie %s podczas startu systemu windows"
+msgstr "Uruchomienie programu %s podczas _startu systemu Windows"
 
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "Zezwolenie na wiele instancji"
 
 msgid "_Dockable Buddy List"
 msgstr "_Zakotwiczenie listy znajomych"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "O_kno listy znajomych zawsze na wierzchu"
+msgstr "O_kno listy znajomych zawsze na wierzchu:"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Tylko gdy jest zadokowane"
+msgstr "Tylko podczas zadokowania"
 
 msgid "Windows Pidgin Options"
-msgstr "Pidgwin - Opcje "
+msgstr "Opcje programu Pidgin dla systemu Windows"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "Opcje specyficzne dla wersji dla Windows."
-
-#, fuzzy
+msgstr "Opcje specyficzne dla programu Pidgin dla Windows."
+
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Umożliwia kontrolę nad parametrami specyficznymi dla Windows jak np. "
+"Dostarcza opcje specyficzne dla programu Pidgin dla Windows, takie jak "
 "dokowanie listy znajomych."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Wylogowany.</font>"
+msgstr "<font color='#777777'>Wylogowano.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15335,629 +14939,26 @@
 msgstr "Konsola XMPP"
 
 msgid "Account: "
-msgstr "Konto:"
+msgstr "Konto: "
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Nie połączony z XMPP</font>"
+msgstr "<font color='#777777'>Niepołączono z XMPP</font>"
 
 msgid "Insert an <iq/> stanza."
-msgstr "Wstaw stanzę <iq/>."
+msgstr "Wstaw strofę <iq/>."
 
 msgid "Insert a <presence/> stanza."
-msgstr "Wstaw stanzę <presence/>."
-
-#, fuzzy
+msgstr "Wstaw strofę <presence/>."
+
 msgid "Insert a <message/> stanza."
-msgstr "Wstaw stanzę <presence/>."
+msgstr "Wstaw strofę <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Wysyłaj i odbieraj surowe stanzy XMPP"
+msgstr "Wysyłanie i odbieranie surowych strof XMPP."
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Komunikator internetowy obsługujący wiele protokołów"
-
-#~ msgid "_Start port:"
-#~ msgstr "Początkowy zakres portów:"
-
-#~ msgid "_End port:"
-#~ msgstr "Końcowy zakres portów:"
-
-#~ msgid "_User:"
-#~ msgstr "_Użytkownik:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "Wersja biblioteki GTK+"
-
-#, fuzzy
-#~ msgid "Calling ... "
-#~ msgstr "Obliczanie..."
-
-#, fuzzy
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Niepoprawny mechanizm autoryzacji"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Ukrywanie wejść/wyjść w konferencjach - konfiguracja"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Minimalny rozmiar pokoju konferencyjnego"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Czas nieaktywności (w minutach)"
-
-#, fuzzy
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "Nie udało się połączyć z serwerem."
-
-#, fuzzy
-#~ msgid "Failed to open the file"
-#~ msgstr "Nie można odczytać pliku '%s': %s"
-
-#, fuzzy
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Nie można wczytać pary kluczy SILC: %s"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr ""
-#~ "Twoje konto zostało zablokowane, zaloguj się przez stronę WWW Yahoo!."
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr ""
-#~ "Użytkownik %s odrzucił zaproszenie do pokoju konferencji \"%s\" z powodu "
-#~ "\"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "Zaproszenie odrzucone"
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "Pośrednik (proxy)"
-
-#~ msgid "_Resume"
-#~ msgstr "_Kontynuuj"
-
-#, 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\n"
-#~ "Użycie: %s [OPCJE]...\n"
-#~ "\n"
-#~ "  -c, --config=KAT    używa wybranego KATalogu z plikami "
-#~ "konfiguracyjnymi\n"
-#~ "  -d, --debug         wyświetla komunikaty przydatne przy debugowaniu na "
-#~ "standardowe wyjście\n"
-#~ "  -h, --help          wyświetla ten komunikat pomocy\n"
-#~ "  -n, --nologin       wyłącza automatyczne logowanie\n"
-#~ "  -v, --version       wyświetla numer aktualnej wersji\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\n"
-#~ "Użycie: %s [OPCJE]...\n"
-#~ "\n"
-#~ "  -c, --config=KAT    używa wybranego KATalogu z plikami "
-#~ "konfiguracyjnymi\n"
-#~ "  -d, --debug         wyświetla komunikaty przydatne przy debugowaniu na "
-#~ "standardowe wyjście\n"
-#~ "  -h, --help          wyświetla ten komunikat pomocy\n"
-#~ "  -n, --nologin       wyłącza automatyczne logowanie\n"
-#~ "  -v, --version       wyświetla numer aktualnej wersji\n"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "Nie można otworzyć gniazda"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Nie można nasłuchiwać na danym gnieździe"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Nie można czytać z gniazda"
-
-#~ msgid "Connection failed."
-#~ msgstr "Błąd połączenia."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Serwer został rozłączony"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Nie można utworzyć gniazda"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Nie można połączyć się z serwerem"
-
-#~ msgid "Read error"
-#~ msgstr "Błąd oczytu"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie można nawiązać połączenia z serwerem:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Błąd zapisu"
-
-#, fuzzy
-#~ msgid "Service Discovery Info"
-#~ msgstr "Ustaw informację katalogu"
-
-#, fuzzy
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Rozszerzony adres"
-
-#, fuzzy
-#~ msgid "Multi-User Chat"
-#~ msgstr "Alias konferencji"
-
-#, fuzzy
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Użytkownik nie posiada informacji w katalogu."
-
-#, fuzzy
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Polecenie"
-
-#, fuzzy
-#~ msgid "XHTML-IM"
-#~ msgstr "HTML"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Błąd podczas rejestracji"
-
-#, fuzzy
-#~ msgid "User Location"
-#~ msgstr "Położenie"
-
-#, fuzzy
-#~ msgid "User Avatar"
-#~ msgstr "Wyszukiwanie użytkownika"
-
-#, fuzzy
-#~ msgid "Chat State Notifications"
-#~ msgstr "Powiadamianie o stanie znajomych"
-
-#~ msgid "Software Version"
-#~ msgstr "Wersja oprogramowania"
-
-#, fuzzy
-#~ msgid "Stream Initiation"
-#~ msgstr "Ułożenie"
-
-#, fuzzy
-#~ msgid "User Activity"
-#~ msgstr "Ograniczenie użytkowników"
-
-#, fuzzy
-#~ msgid "Entity Capabilities"
-#~ msgstr "Funkcje klienta"
-
-#, fuzzy
-#~ msgid "User Tune"
-#~ msgstr "Użytkownik"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Wiadomość z wymianą kluczy"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Adres email"
-
-#, fuzzy
-#~ msgid "Jingle"
-#~ msgstr "Przyłącz się"
-
-#, fuzzy
-#~ msgid "User Nickname"
-#~ msgstr "Nazwa użytkownika"
-
-#, fuzzy
-#~ msgid "Jingle Video"
-#~ msgstr "Wideo na żywo"
-
-#, fuzzy
-#~ msgid "Message Receipts"
-#~ msgstr "Odebrano wiadomość"
-
-#, fuzzy
-#~ msgid "Public Key Publishing"
-#~ msgstr "Plik z kluczem publicznym"
-
-#, fuzzy
-#~ msgid "User Chatting"
-#~ msgstr "Opcje użytkownika"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Tryby użytkownika"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Nazwa użytkownika"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Ograniczenie użytkowników"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Szyfrowanie Trillian"
-
-#~ msgid "Read Error"
-#~ msgstr "Błąd oczytu"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Nie udało się połączyć z serwerem."
-
-#, fuzzy
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Kolejka jest pełna"
-
-#, fuzzy
-#~ msgid "Unparseable message"
-#~ msgstr "Nie udało się przetworzyć wiadomości."
-
-#, fuzzy
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Nie można połączyć się z serwerem"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Logowanie zakończyło się niepowodzeniem (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Wylogowano, ponieważ zalogowano się na to samo konto z innego komputera."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Błąd. Obsługa SSL nie jest zainstalowana."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Niepoprawne hasło."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie udało się połączyć z serwerem BOS:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu "
-#~ "na TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %"
-#~ "s."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Nie można się połączyć"
-
-#, fuzzy
-#~ msgid "Invalid username."
-#~ msgstr "Niewłaściwa ksywka"
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Nie można pobrać informacji o serwerze"
-
-#, fuzzy
-#~ msgid "Connection lost"
-#~ msgstr "Połączenie zamknięte"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Nie można przetłumaczyć nazwy hosta"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Połączenie zamknięte (zapisywanie)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Reset połączenia"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Błąd odczytu z gniazda: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Nie można połączyć się ze zdalnym komputerem"
-
-#~ msgid "Could not write"
-#~ msgstr "Nie można zapisywać"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Nie można otworzyć gniazd do nasłuchiwania"
-
-#, fuzzy
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nie można odnaleźć adresu hosta"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Niepoprawne hasło"
-
-#, fuzzy
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie można nawiązać połączenia z serwerem:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonia"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Japoński serwer pagera"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Japoński serwer do przesyłania plików"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Utracono połączenie z serwerem\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Nie można odnaleźć adresu hosta"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada "
-#~ "obsługi TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Ukrywanie okien rozmów"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Proszę wprowadzić dowiązanie do emotikony."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Proszę wybrać obraz emotikony."
-
-#, fuzzy
-#~ msgid "Activate which ID?"
-#~ msgstr "Aktywacja ID..."
-
-#~ msgid "Cursor Color"
-#~ msgstr "Kolor kursora"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Kolor drugiego kursora"
-
-#~ msgid "Interface colors"
-#~ msgstr "Kolory interfejsu"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Rozmiar Widgetów"
-
-#, fuzzy
-#~ msgid "Invite message"
-#~ msgstr "Wstaw do rozmowy"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Wpisz kogo chcesz zaprosić, dodatkowo można podać tekst zaproszenia."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Nie można pobrać listy znajomych"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Wyszukiwanie %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Połączenie z %s nie powiodło się"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Logowanie: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Nie można zapisać pliku %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Nie można odczytać pliku %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Wiadomość zbyt długa, odcięto ostatnie %s bajtów."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s nie jest w tej chwili zalogowany."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Ostrzeżenie %s jest niedozwolone."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Wiadomość została odrzucona, przekroczono ograniczenie prędkości serwera."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Konferencja w %s jest niedostępna."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Zbyt szybkie wysyłanie wiadomości do %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Pominięto wiadomość od %s ponieważ była zbyt duża."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Pominięto wiadomość od %s ponieważ była wysłana zbyt szybko."
-
-#~ msgid "Failure."
-#~ msgstr "Awaria."
-
-#~ msgid "Too many matches."
-#~ msgstr "Zbyt wiele dopasowań."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Potrzeba więcej kwalifikatorów."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Usługa katalogu tymczasowo niedostępna."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Zastrzeżone wyszukiwanie email."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Zignorowano słowo kluczowe."
-
-#~ msgid "No keywords."
-#~ msgstr "Brak słów kluczowych."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Użytkownik nie posiada informacji w katalogu."
-
-#~ msgid "Country not supported."
-#~ msgstr "Kraj nie jest obsługiwany."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Nieznana awaria: %s."
-
-#, fuzzy
-#~ msgid "Incorrect username or password."
-#~ msgstr "Niepoprawny identyfikator lub hasło."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Usługa jest tymczasowo niedostępna."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Twój poziom ostrzeżeń jest zbyt wysoki aby można się było zalogować."
-
-#~ msgid ""
-#~ "You have been connecting and disconnecting too frequently.  Wait ten "
-#~ "minutes and try again.  If you continue to try, you will need to wait "
-#~ "even longer."
-#~ msgstr ""
-#~ "Zbyt często się łączono i rozłączano. Zaczekaj dziesięć minut i spróbuj "
-#~ "ponownie. W razie podejmowania dalszych prób, okres oczekiwania się "
-#~ "wydłuży."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Wystąpił nieznany błąd, %d. Informacja: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Niewłaściwa nazwa grupy"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Połączenie zamknięte"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Oczekiwanie na odpowiedź..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC jest dostępny. Można ponownie wysłać wiadomości."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Pomyślnie zmieniono hasło"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Pobierz informację katalogu"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Ustaw informację katalogu"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Nie można otworzyć %s do zapisu!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Przesyłanie pliku zakończyło się niepowodzeniem, prawdopodobnie druga "
-#~ "strona anulowała transmisję."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Nie można nawiązać połączenia do przesyłania."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Nie udało się zapisać nagłówka pliku. Plik nie zostanie przesłany."
-
-#~ msgid "Save As..."
-#~ msgstr "Zapisz jako..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s prosi %s o akceptację %d pliku: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s prosi %s o akceptację %d plików: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s prosi o wysłanie pliku"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Wtyczka protokołu TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "Opcje %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opcje pośrednika sieciowego"
-
-#~ msgid "By log size"
-#~ msgstr "Według rozmiaru dziennika"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Otwórz odnośnik w przeglądarce"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "Obraz emotikony"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Skrót emotikony"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Migotanie okna po odebraniu wiadomości"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Połączenie może wkrótce zostać zerwane. Sugerowana jest zmiana protokołu "
-#~ "na TOC zanim problem zostanie rozwiązany. Uaktualnienia będą dostępne na %"
-#~ "s."
--- a/po/ru.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/ru.po	Sat Jan 09 02:00:18 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
+"POT-Creation-Date: 2009-12-05 19:57-0800\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -23,7 +23,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 msgid "Finch"
-msgstr "Зяблик"
+msgstr "Finch"
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
@@ -1537,14 +1537,13 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL для вышеуказанного: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
-
-#, fuzzy
+msgstr "Пожалуйста, подождите пока TinyURL получает короткий адрес ..."
+
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Только создайте TinyURL для адресов такой длины или большей"
+msgstr "Создайте TinyURL для адресов только с такой длиной или больше"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "Приставка адреса TinyURL (или другого)"
@@ -1564,6 +1563,7 @@
 msgid "Online"
 msgstr "В сети"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Не в сети"
 
@@ -1675,6 +1675,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Сертификат не является доверенным, потому что сейчас нет других доверенных "
+"сертификатов, которые могли бы подтвердить этот"
 
 #, fuzzy
 msgid "The certificate is not valid yet."
@@ -2223,10 +2225,13 @@
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Кодеки не найдены. Найти эти кодеки вы можете в пакетах модулей GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"Не осталось кодеков. Настройки вашего кодека в fs-codecs.conf слишком "
+"жёсткие."
 
 #, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
@@ -2237,10 +2242,10 @@
 msgstr "Конференция закрыта"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Проблема с вашим микрофоном"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "Проблема с вашей веб-камерой"
 
 #, fuzzy, c-format
 msgid "Error creating session: %s"
@@ -2509,14 +2514,14 @@
 "Тестовый модуль поддержки IPC в качестве сервера. Регистрирует команды IPC."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Спрятать Объединения/Разделения"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Для комнат с большим количеством людей, чем указано"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Если пользователь не говорил указанное количество минут"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Применить правила скрытия к собеседникам"
@@ -3189,10 +3194,12 @@
 msgid "Add to chat..."
 msgstr "Добавить к чату..."
 
+#. 0
 #. Global
 msgid "Available"
 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
@@ -3823,6 +3830,13 @@
 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 "
@@ -3834,25 +3848,38 @@
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-msgid "SASL authentication failed"
-msgstr "Аутентификация SASL провалилась"
-
-msgid "Invalid response from server"
-msgstr "Неверный отклик от сервера"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "Вы запросили шифрование, но оно недоступно на сервере."
 
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+msgid "SASL authentication failed"
+msgstr "Аутентификация SASL провалилась"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Ошибка SASL: %s"
 
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Не удаётся настроить"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Не удалось открыть прослушиваемый порт."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Неверный запрос с сервера"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Получен непредвиденный HTTP-отклик от сервера."
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Управление соединениями BOSH прервало ваш сеанс."
 
@@ -3952,13 +3979,21 @@
 msgid "Resource"
 msgstr "Ресурс"
 
-#, c-format
-msgid "%s ago"
+#, fuzzy
+msgid "Uptime"
+msgstr "Обновить"
+
+#, c-format
+msgid "%s"
 msgstr ""
 
 msgid "Logged Off"
 msgstr "Вышел из сети"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s назад"
+
 msgid "Middle Name"
 msgstr "Отчество"
 
@@ -4006,12 +4041,14 @@
 msgid "Log Out"
 msgstr "Выйти"
 
+#. 2
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
@@ -4152,6 +4189,8 @@
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Не могу найти замену для XMPP-методов соединения после неудачи "
+"подсоединиться напрямую."
 
 msgid "Invalid XMPP ID"
 msgstr "Неверный XMPP ID"
@@ -4276,6 +4315,7 @@
 msgid "None (To pending)"
 msgstr "Нет (Ожидать)"
 
+#. 0
 msgid "None"
 msgstr "Нет"
 
@@ -4671,7 +4711,7 @@
 msgstr "Прокси передачи файлов"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH-адрес"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4756,7 +4796,7 @@
 msgstr "Не удалось произвести передачу файлов"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Не удалось открыть внутриполосный поток байт"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4826,9 +4866,8 @@
 msgstr "Не удаётся добавить \"%s\"."
 
 msgid "Buddy Add error"
-msgstr "Ошибка добавления приятеля"
-
-#, fuzzy
+msgstr "Ошибка добавления собеседника"
+
 msgid "The username specified does not exist."
 msgstr "Указанное имя пользователя не существует."
 
@@ -5087,14 +5126,18 @@
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s подмигнул. <a href='msn-wink://%s'>Щёлкните здесь, чтобы воспроизвести "
+"это</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s подмигнул, но это не может быть сохранено"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
+"%s послал голосовой клип. <a href='audio://%s'>Щёлкните здесь для "
+"воспроизведения</a>"
 
 #, fuzzy, c-format
 msgid "%s sent a voice clip, but it could not be saved"
@@ -5262,9 +5305,10 @@
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Не могу добавить приятеля %s, потому что имя пользователя неверное.  Имена "
-"пользователей должны быть правильными адресами эл.почты или начинаться с "
-"буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
+"Не могу добавить собеседника %s, потому что имя пользователя неверное.  "
+"Имена пользователей должны быть правильными адресами эл.почты или начинаться "
+"с буквы и содержать только буквы, цифры и пробелы, или содержать только "
+"цифры."
 
 #, fuzzy
 msgid "Unable to Add"
@@ -5673,11 +5717,11 @@
 
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Удалить приятеля из адресной книги?"
+msgstr "Удалить собеседника из Адресной Книги?"
 
 #, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Вы хотите также удалить этого приятеля из вашей адресной книги?"
+msgstr "Вы хотите также удалить этого собеседника из вашей адресной книги?"
 
 msgid "The username specified is invalid."
 msgstr "Указанное имя пользователя недопустимо."
@@ -5753,28 +5797,86 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s удалил вас из своего списка собеседников."
 
+#. 1
+msgid "Angry"
+msgstr "Рассерженный"
+
+#. 2
+msgid "Excited"
+msgstr "Возбуждённый"
+
+#. 3
+#, fuzzy
+msgid "Grumpy"
+msgstr "Группа"
+
+#. 4
+msgid "Happy"
+msgstr "Счастливый"
+
+#. 5
+msgid "In Love"
+msgstr "Влюблённый"
+
+#. 6
+msgid "Invincible"
+msgstr "Непобедимый"
+
+#. 7
+msgid "Sad"
+msgstr "Печальный"
+
+#. 8
+#, fuzzy
+msgid "Hot"
+msgstr "_Узел:"
+
+#. 9
+#, fuzzy
+msgid "Sick"
+msgstr "Псевдоним"
+
+#. 10
+msgid "Sleepy"
+msgstr "Сонный"
+
 #. show current mood
 #, fuzzy
 msgid "Current Mood"
 msgstr "Ваше текущее настроение"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Настроение пользователя"
-
-#, fuzzy
+msgstr "Новое настроение"
+
 msgid "Change your Mood"
-msgstr "Изменить пароль"
-
-#, fuzzy
+msgstr "Изменить ваше настроение"
+
 msgid "How do you feel right now?"
-msgstr "Прямо сейчас меня здесь нет"
+msgstr "Как вы сейчас?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Введённый PIN-код неправильный."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Введённый PIN-код неправильной длины [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN-код неправильный. Он должен содержать только цифры [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "Два введённых PIN-кода не совпадают."
+
+msgid "The name you entered is invalid."
+msgstr "Введённое имя неправильное."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Введённая вами дата рождения неправильная. Формат такой: 'ГГГГ-ММ-ДД'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Ошибка записи"
+msgstr "Ошибка Обновления Профиля"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5783,222 +5885,223 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
+"Информация о вашем профиле ещё не получена. Пожалуйста, попробуйте позже."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Проверьте PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Фамилия"
+msgstr "Показать имя"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Скрыть мой номер"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Номер мобильного телефона"
-
-#, fuzzy
+msgstr "Номер мобильного"
+
 msgid "Update your Profile"
-msgstr "Профиль пользователя"
+msgstr "Обновить ваш профиль"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Здесь вы можете обновить ваш MXit-профиль"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Показать заставку"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Сейчас нет доступных экранов-заставок"
+
 msgid "About"
-msgstr "Обо мне"
+msgstr "Про"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Изменить пароль..."
+msgstr "Изменить настроение..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Изменить пароль..."
+msgstr "Изменить профиль..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Просмотреть журнал..."
+msgstr "Показать заставку..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Обо мне"
+msgstr "О модуле..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Сообщение слишком велико."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Файл, которые вы пытаетесь отправить слишком велик!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Не удаётся соединиться с сервером HTTP MXit. Пожалуйста, проверьте ваши "
+"настройки сервера."
+
 msgid "Logging In..."
-msgstr "Входит в сеть"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
-"хотите соединиться."
-
-#, fuzzy
+msgstr "Входит в сеть..."
+
+#, fuzzy
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Не удаётся соединиться с сервером MXit. Пожалуйста, проверьте ваши настройки "
+"сервера."
+
 msgid "Connecting..."
-msgstr "Соединение"
+msgstr "Соединение..."
+
+#, fuzzy
+msgid "The nick name you entered is invalid."
+msgstr "Введённый ключ SecurID неверный."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Введённый ключ SecurID неверный."
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "Имя входа MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Псевдоним"
 
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
-msgstr "Зарегистрировать новую учётную запись XMPP"
-
-#, fuzzy
+msgstr "Зарегистрировать новую учётную запись MXit"
+
 msgid "Please fill in the following fields:"
-msgstr "Заполните следующие поля"
+msgstr "Пожалуйста, заполните следующие поля:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Ошибка связи с сайтом MXit WAP. Пожалуйста, попробуйте позже."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit не может сейчас обработать апрос. Пожалуйста, попробуйте позже."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Введён ошибочный код безопасности. Пожалуйста, попробуйте позже."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Ваш сеанс истёк. Пожалуйста, попробуйте позже."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Выбрана неправильная страна. Пожалуйста, попробуйте ещё раз."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Имя пользователя не зарегистрировано. Пожалуйста, сначала зарегистрируйтесь."
 
 msgid "Username is already registered. Please choose another username."
 msgstr ""
-
-#, fuzzy
+"Имя пользователя уже зарегистрировано. Пожалуйста, выберите другое имя."
+
 msgid "Internal error. Please try again later."
-msgstr "Сервер недоступен; повторите попытку позже"
+msgstr "Внутренняя ошибка. Пожалуйста, попробуйте позже."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Вы не ввели код безопасности"
+
 msgid "Security Code"
-msgstr "Безопасность включена"
+msgstr "Код безопасности"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Введите код"
-
-#, fuzzy
+msgstr "Введите код безопасности"
+
 msgid "Your Country"
-msgstr "Страна"
-
-#, fuzzy
+msgstr "Ваша страна"
+
 msgid "Your Language"
-msgstr "Предпочитаемый язык"
+msgstr "Ваш язык"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Требовать авторизацию"
+msgstr "Авторизация MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Подтверждение учётной записи MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Информация о сервере"
-
-#, fuzzy
+msgstr "Получение информации о пользователе..."
+
+msgid "Loading menu..."
+msgstr "Загрузка меню..."
+
 msgid "Status Message"
-msgstr "Отправленные сообщения"
-
-#, fuzzy
+msgstr "Сообщения состояния"
+
 msgid "Hidden Number"
-msgstr "Отчество"
-
-#, fuzzy
+msgstr "Скрытый номер"
+
 msgid "Your Mobile Number..."
-msgstr "Ввести номер мобильного телефона..."
+msgstr "Номер мобильного телефона..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Сервер"
-
-#, fuzzy
+msgstr "WAP-сервер"
+
 msgid "Connect via HTTP"
-msgstr "Соединение по TCP"
+msgstr "Соединение через HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Включить контекстное меню экрана-заставки"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Мы потеряли соединение с MXit. Пожалуйста, пересоединитесь."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Ошибка сообщения XMPP"
-
-#, fuzzy
+msgstr "Ошибка отправки сообщения"
+
 msgid "Unable to process your request at this time"
-msgstr "Не удаётся соединиться с сервером."
+msgstr "Не удаётся сейчас обработать ваш запрос"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Истекло время во время ожидания ответа от сервера MXit."
+
 msgid "Successfully Logged In..."
-msgstr "Успешно подсоединён Qun"
-
-#, fuzzy
+msgstr "Успешно вошёл в сеть..."
+
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
+
 msgid "Message Error"
-msgstr "Ошибка сообщения XMPP"
+msgstr "Сообщение об ошибке"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Не могу осуществить перенаправление используя указанный протокол"
+
+#, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Произошла неизвестная ошибка подключения: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Ошибка SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Ошибка SASL: %s"
 
 #, fuzzy
 msgid "Contact Error"
@@ -6050,86 +6153,52 @@
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Получен неправильный пакет от MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Рассерженный"
-
-msgid "Excited"
-msgstr "Возбуждённый"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Группа"
-
-msgid "Happy"
-msgstr "Счастливый"
-
-msgid "In Love"
-msgstr "Влюблённый"
-
-msgid "Invincible"
-msgstr "Непобедимый"
-
-msgid "Sad"
-msgstr "Печальный"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Узел:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Псевдоним"
-
-msgid "Sleepy"
-msgstr "Сонный"
+msgstr "Возникла ошибка соединения с MXit. (этап чтения 0x06)"
 
 #, fuzzy
 msgid "Pending"
-msgstr "Отправка"
+msgstr "Рассмотрение"
 
 #, fuzzy
 msgid "Invited"
-msgstr "Пригласить"
+msgstr "Приглашено"
 
 #, fuzzy
 msgid "Rejected"
-msgstr "Отвергнуть"
+msgstr "Отклонено"
 
 #, fuzzy
 msgid "Deleted"
-msgstr "Удалить"
+msgstr "Удалено"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Реклама MXit"
+
 msgid "More Information"
-msgstr "Информация о работе"
+msgstr "Больше информации"
 
 #, c-format
 msgid "No such user: %s"
@@ -6192,13 +6261,13 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"Приятель %d был добавлен или обновлён с сервера (включая приятелей, которые "
-"уже в списке на стороне сервера)"
+"Собесденик %d был добавлен или обновлён с сервера (включая собеседников, "
+"которые уже в списке на стороне сервера)"
 msgstr[1] ""
-"Приятели %d были добавлены или обновлены с сервера (включая приятелей, "
+"Собеседники %d были добавлены или обновлены с сервера (включая собеседников, "
 "которые уже в списке на стороне сервера)"
 msgstr[2] ""
-"Приятели %d были добавлены или обновлены с сервера (включая приятелей, "
+"Собеседники %d были добавлены или обновлены с сервера (включая собеседников, "
 "которые уже в списке на стороне сервера)"
 
 msgid "Add contacts from server"
@@ -6320,6 +6389,9 @@
 "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 - Имя пользователя доступно"
@@ -6768,7 +6840,7 @@
 msgstr "Ошибка запроса маркера входа"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL не позволяет вашему экранному имени аутентифицироваться здесь"
 
 msgid "Could not join chat room"
 msgstr "Не удалось присоединиться к чату"
@@ -6917,10 +6989,10 @@
 msgstr "Не в AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Не могу принять сообщение из-за родительского контроля"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgstr "Не могу отправить SMS без принятия условий"
 
 #, fuzzy
 msgid "Cannot send SMS"
@@ -6933,22 +7005,22 @@
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Не могу отправить SMS в неизвестную страну"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Учётные записи-боты не могут порождать сообщения"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Учётная запись-бот не может слать сообщения этому пользователю"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Учётная запись-бот достигла предела сообщений"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Учётная запись-бот достигла дневной предел сообщений"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "Учётная запись-бот достигла месячный предел сообщений"
 
 #, fuzzy
 msgid "Unable to receive offline messages"
@@ -6964,10 +7036,10 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(Тут произошла ошибка получения сообщения.  Приятель, с которым вы общаетесь "
-"возможно использует кодировку, не ту, которая указана.  Если вы знаете, "
-"какую кодировку он использует, вы можете указать её в расширенных настройках "
-"для своей учётной записи AIM/ICQ.)"
+"(Тут произошла ошибка получения сообщения.  Собеседник, с которым вы "
+"общаетесь возможно использует кодировку, не ту, которая указана.  Если вы "
+"знаете, какую кодировку он использует, вы можете указать её в расширенных "
+"настройках для своей учётной записи AIM/ICQ.)"
 
 #, c-format
 msgid ""
@@ -7173,7 +7245,7 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Пожалуйста, авторизируйте меня, чтобы я мог добавить вас в свой список "
-"приятелей."
+"собеседников"
 
 msgid "No reason given."
 msgstr "Причина не указана."
@@ -7537,13 +7609,14 @@
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Не могу добавить приятеля %s, потому что имя пользователя неверное.  Имена "
-"пользователей должны быть правильными адресами эл.почты или начинаться с "
-"буквы и содержать только буквы, цифры и пробелы, или содержать только цифры."
+"Не могу добавить собеседника %s, потому что имя пользователя неверное.  "
+"Имена пользователей должны быть правильными адресами эл.почты или начинаться "
+"с буквы и содержать только буквы, цифры и пробелы, или содержать только "
+"цифры."
 
 #, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Не могу Загрузить список приятелей"
+msgstr "Не могу Загрузить список собеседников"
 
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
@@ -7960,7 +8033,7 @@
 msgstr "Значок собеседника"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "Измените его/её значок как захотите"
 
 #, fuzzy
 msgid "_Modify"
@@ -7975,10 +8048,10 @@
 msgstr "Сервер занят"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Ваш запрос был принят."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Ваш запрос был отклонён."
 
 #, fuzzy, c-format
 msgid "%u requires verification"
@@ -8027,7 +8100,7 @@
 
 #, fuzzy
 msgid "Add buddy"
-msgstr "Добавить приятеля"
+msgstr "Добавить собеседника"
 
 #, fuzzy
 msgid "Invalid QQ Number"
@@ -8256,7 +8329,7 @@
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Всего приятелей в сети</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"
@@ -8326,7 +8399,7 @@
 msgstr "<p><b>Исходный автор</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "и ещё, пожалуйста, дайте мне знать... спасибо!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>И все мальчики в задней комнате...</i><br>\n"
@@ -8766,7 +8839,7 @@
 "entry has been removed from your buddy list."
 msgstr ""
 "Идентификатор '%s' не совпадает ни с одним пользователем в вашем временном "
-"сообществе. Эта запись будет удалена из вашего списка приятелей."
+"сообществе. Эта запись будет удалена из вашего списка собеседников."
 
 #, c-format
 msgid ""
@@ -8826,7 +8899,7 @@
 msgstr ""
 "Идентификатор '%s' вероятно может ссылаться на любую группу следующей "
 "адресной книги замечаний. Пожалуйста, выберите корректную группу из списка "
-"ниже, чтобы добавить её в ваш список приятелей."
+"ниже, чтобы добавить её в ваш список собеседников."
 
 msgid "Select Notes Address Book"
 msgstr "Выберите адресную книгу замечаний"
@@ -8850,7 +8923,7 @@
 "group and its members to your buddy list."
 msgstr ""
 "Введите имя группы адресной книги замечаний в поле ниже, чтобы добавить "
-"группу и её членов в ваш список приятелей"
+"группу и её членов в ваш список собеседников"
 
 #, c-format
 msgid "Search results for '%s'"
@@ -10099,7 +10172,7 @@
 msgstr "Игнорировать приглашения в конференции и чаты"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Используйте прокси учётной записи для SSL-соединений"
 
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
@@ -10133,7 +10206,7 @@
 msgstr "%s послал вам приглашение к веб-камере, которое ещё не поддерживается."
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Ваше SMS не было доставлено"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
@@ -10201,7 +10274,7 @@
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 "Вы попытались не обратить внимание на %s, но пользователь в вашем списке "
-"приятелей. Щелчок \"Да\" удалит и проигнорирует приятеля."
+"собеседников. Щелчок \"Да\" удалит и проигнорирует собеседника."
 
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
@@ -10219,12 +10292,14 @@
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Неизвестная ошибка 52.  Пересоединение должно исправить это."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Ошибка 1013: введённое вами имя пользователя некорректно.  Скорее всего это "
+"произошло из-за того, что вы ввели ваш e-mail адрес вместо вашего Yahoo! ID."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10307,7 +10382,7 @@
 msgstr "Начать бездельничать"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Выберите ID, который вы хотите активировать"
 
 msgid "Join whom in chat?"
 msgstr "К кому присоединиться в чате?"
@@ -10322,13 +10397,13 @@
 msgstr "Открыть входящие"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Не могу отправить SMS. Не могу определить мобильного оператора."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Не могу отправить SMS. Неизвестный мобильный оператор."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Определение мобильного оператора для отправки SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10881,6 +10956,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Переписка мгновенными сообщениями.  Поддерживает AIM, Google Talk, Jabber/"
+"XMPP, MSN, Yahoo и не только"
 
 msgid "Internet Messenger"
 msgstr "Клиент обмена мгновенными сообщениями"
@@ -11029,29 +11106,28 @@
 
 #, fuzzy
 msgid "Layout"
-msgstr "Лаосский"
+msgstr "Внешний вид"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "Внешний вид значков, имени и состояния списка собеседников"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Цвет фона"
+msgstr "Цвет фона в развёрнутом состоянии"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "Цвет фона развёрнутой группы"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
 #, fuzzy
 msgid "Expanded Text"
-msgstr "Р_азвернуть"
+msgstr "Развёрнутый текст"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "Текстовая информация, когда группа развёрнута"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
@@ -11060,7 +11136,7 @@
 msgstr "Выбрать цвет фона"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "Цвет фона свёрнутой группы"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
@@ -11069,7 +11145,7 @@
 msgstr "_Свернуть"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Текстовая информация, когда группа свёрнута"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
@@ -11079,7 +11155,7 @@
 msgstr "Выбрать цвет фона"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "Цвет фона контакта или переписки"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
@@ -11088,7 +11164,7 @@
 msgstr "Ярлык"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "Текстовая информация, когда контакт развёрнут"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
@@ -11097,7 +11173,7 @@
 msgstr "В сети"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "Текстовая информация, когда собеседник в сети"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11106,7 +11182,7 @@
 msgstr "Отошёл"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "Текстовая информация, когда собеседник отошёл"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
@@ -11125,7 +11201,7 @@
 msgstr "Текст настроения"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "Текстовая информация, когда собеседник простаивает"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11134,17 +11210,19 @@
 msgstr "Сообщение отправлено"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Текстовая информация, когда у собеседника есть непрочитанные сообщения"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Текст (кто-то сказал) сообщения"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
+"Текстовая информация, когда в переписке есть непрочитанные сообщения, в "
+"которых упоминается ваш псевдоним"
 
 #, fuzzy
 msgid "The text information for a buddy's status"
@@ -11172,7 +11250,7 @@
 
 #, fuzzy
 msgid "A_ccount"
-msgstr "Учётная запись"
+msgstr "_Учётная запись"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11204,7 +11282,7 @@
 msgstr "_Добавить чат"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "Аудио/_Видео звонок"
 
 #, fuzzy
 msgid "_Video Call"
@@ -11485,7 +11563,7 @@
 msgstr "По статусу"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "По последней активности журнала"
 
 #, c-format
 msgid "%s disconnected"
@@ -11502,7 +11580,7 @@
 msgstr "Включить повторно"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL ЧаВо"
 
 msgid "Welcome back!"
 msgstr "Добро пожаловать назад!"
@@ -11643,7 +11721,7 @@
 msgstr "Неизвестная команда."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Этот приятель не такого же протокола, как этот чат."
+msgstr "Этот собеседник не такого же протокола, как этот чат."
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
@@ -12017,7 +12095,7 @@
 msgstr "Ка-Хин Чон"
 
 msgid "voice and video"
-msgstr ""
+msgstr "голос и видео"
 
 msgid "support"
 msgstr "поддержка"
@@ -12112,7 +12190,7 @@
 msgstr "Эстонский"
 
 msgid "Basque"
-msgstr ""
+msgstr "Баскский"
 
 msgid "Persian"
 msgstr "Персидский"
@@ -12123,7 +12201,6 @@
 msgid "French"
 msgstr "Французский"
 
-#, fuzzy
 msgid "Irish"
 msgstr "Ирландский"
 
@@ -12145,9 +12222,8 @@
 msgid "Hungarian"
 msgstr "Венгерский"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Румынский"
+msgstr "Армянский"
 
 msgid "Indonesian"
 msgstr "Индонезийский"
@@ -12164,9 +12240,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Переводчики Ubuntu на грузинский"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Другое"
+msgstr "Кхмерский"
 
 msgid "Kannada"
 msgstr "Каннада"
@@ -12193,6 +12268,10 @@
 msgid "Mongolian"
 msgstr "Монгольский"
 
+#, fuzzy
+msgid "Malay"
+msgstr "Мужчина"
+
 msgid "Bokmål Norwegian"
 msgstr "Букмол"
 
@@ -12248,7 +12327,7 @@
 msgstr "Шведский"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Суахили"
 
 msgid "Tamil"
 msgstr "Тамильский"
@@ -12262,6 +12341,10 @@
 msgid "Turkish"
 msgstr "Турецкий"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Армянский"
+
 msgid "Urdu"
 msgstr "Урду"
 
@@ -12326,6 +12409,12 @@
 "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\">Помощь от других пользователей 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/>"
 
 #, fuzzy, c-format
 msgid ""
@@ -12905,43 +12994,47 @@
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Использование: %s [ПАРАМЕТР]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "КАТ"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "используйте КАТ для файлов конфигурации"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "напечатать отладочные сообщения в stdout"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "всё равно в сети, несмотря на сетевое состояние"
 
 msgid "display this help and exit"
-msgstr ""
-
-#, fuzzy
+msgstr "показать эту справку и выйти"
+
 msgid "allow multiple instances"
-msgstr "Разрешить множественные одновременные входы"
+msgstr "разрешить одновременные входы"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "не входить автоматически"
 
 msgid "NAME"
-msgstr ""
+msgstr "ИМЯ"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
+"включить указанные учётные записи (необязательный аргумент ИМЯ\n"
+"                      использовать указанные учётные записи, через запятую.\n"
+"                      Без этого только первая учётная запись будет включена)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "Использовать X-дисплей"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "показать текущую версию и выйти"
 
 #, c-format
 msgid ""
@@ -12975,21 +13068,21 @@
 msgstr "Выхожу, потому что уже запущен другой клиент libpurple.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Медиа"
 
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/Медиа/_Повесить трубку"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s желает начать аудио/видео сеанс с вами."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s желает начать видеосеанс с вами."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Входящий Звонок"
 
 msgid "_Pause"
 msgstr "_Пауза"
@@ -13038,7 +13131,7 @@
 msgstr "Новое правило для собеседника"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "Распустить"
 
 #, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
@@ -13171,11 +13264,11 @@
 
 #, fuzzy
 msgid "Started typing"
-msgstr "Начинает набор сообщения"
+msgstr "Начал набор сообщения"
 
 #, fuzzy
 msgid "Paused while typing"
-msgstr "Приостанавливает набор сообщения"
+msgstr "Приостановил набор сообщения"
 
 #, fuzzy
 msgid "Signed on"
@@ -13183,11 +13276,11 @@
 
 #, fuzzy
 msgid "Returned from being idle"
-msgstr "%s перестал бездействовать (%s)"
+msgstr "Перестал бездействовать"
 
 #, fuzzy
 msgid "Returned from being away"
-msgstr "Возвращается"
+msgstr "Вернулся"
 
 #, fuzzy
 msgid "Stopped typing"
@@ -13195,65 +13288,77 @@
 
 #, fuzzy
 msgid "Signed off"
-msgstr "Выходит"
+msgstr "Вышел"
 
 #, fuzzy
 msgid "Became idle"
-msgstr "Начинает бездействовать"
+msgstr "Начал бездействовать"
 
 #, fuzzy
 msgid "Went away"
-msgstr "Во время отсутствия"
+msgstr "Отошёл"
 
 #, fuzzy
 msgid "Sent a message"
-msgstr "Отправить сообщение"
+msgstr "Отправил сообщение"
 
 #, fuzzy
 msgid "Unknown.... Please report this!"
 msgstr "Неизвестное событие слежения. Сообщите об этом!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(по умолчанию)"
+msgstr "(По вкусу)"
+
+msgid "Penguin Pimps"
+msgstr "Нежные пингвины"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Звуковая тема Pidgin по умолчанию"
 
 #, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Список собеседников"
+msgstr "Тема списка собеседников Pidgin по умолчанию"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Тема значков состояния Pidgin по умолчанию"
 
 #, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Не удалось распаковать тему смайликов."
+msgstr "Не удалось распаковать тему."
 
 #, fuzzy
 msgid "Theme failed to load."
-msgstr "Не удалось распаковать тему смайликов."
+msgstr "Не удалось загрузить тему."
 
 #, fuzzy
 msgid "Theme failed to copy."
-msgstr "Не удалось распаковать тему смайликов."
-
-msgid "Install Theme"
-msgstr "Установить тему"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+msgstr "Не удалось скопировать тему."
+
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Выбор браузера"
+
+#. Instructions
+#, fuzzy
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
 "быть установлены перетаскиванием их в список тем."
 
-msgid "Icon"
-msgstr "Значок"
+msgid "Buddy List Theme:"
+msgstr "Тема Списка собеседников:"
+
+msgid "Status Icon Theme:"
+msgstr "Тема значков состояния:"
+
+msgid "Sound Theme:"
+msgstr "Звуковая тема:"
+
+msgid "Smiley Theme:"
+msgstr "Тема смайликов:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
@@ -13261,11 +13366,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "З_акрывать беседы клавишей Escape"
 
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "Список собеседников"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Значок системного лотка"
@@ -13276,9 +13376,8 @@
 msgid "On unread messages"
 msgstr "При наличии непрочитанных сообщений"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Окна бесед"
+msgstr "Окно беседы"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Скрывать новые беседы:"
@@ -13353,9 +13452,6 @@
 msgid "Font"
 msgstr "Шрифт"
 
-msgid "Use document font from _theme"
-msgstr "Использовать шрифт документа из _темы"
-
 msgid "Use font from _theme"
 msgstr "Использовать шрифт из _темы"
 
@@ -13375,21 +13471,18 @@
 msgid "Cannot start proxy configuration program."
 msgstr "Не могу запустить программу настройки прокси."
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "Не могу запустить программу настройки веб-проводника"
-
-#, fuzzy
+msgstr "Не могу запустить программу настройки веб-проводника."
+
 msgid "Disabled"
-msgstr "_Выключить"
-
-#, fuzzy, c-format
+msgstr "Отключено"
+
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Определять IP-адрес _автоматически"
-
-#, fuzzy
+msgstr "И_спользовать автоматически определённый IP-адрес: %s"
+
 msgid "ST_UN server:"
-msgstr "ST_UN-сервер:"
+msgstr "_STUN сервер:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
@@ -13413,68 +13506,23 @@
 
 #, fuzzy
 msgid "_End:"
-msgstr "Р_азвернуть"
+msgstr "Коне_ц:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Реле сервер (TURN)"
 
 #, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-сервер:"
+msgstr "_TURN-сервер:"
 
 #, fuzzy
 msgid "Use_rname:"
-msgstr "Имя пользователя:"
+msgstr "Им_я пользователя:"
 
 #, fuzzy
 msgid "Pass_word:"
-msgstr "Пароль:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Прокси-сервер &amp; браузер"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Программа настройки прокси не найдена.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Программа настройки веб-проводника не найдена.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Настройки Прокси & Веб-проводника выставлены\n"
-"в Предпочтениях GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Настроить _прокси"
-
-msgid "Configure _Browser"
-msgstr "Настроить _браузер"
-
-msgid "Proxy Server"
-msgstr "Прокси-сервер"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Использовать удалённый DNS с прокси SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Т_ип прокси:"
-
-msgid "No proxy"
-msgstr "Нет прокси"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "П_орт:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Имя пользователя:"
+msgstr "Паро_ль:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13515,6 +13563,18 @@
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+"Настройки Прокси & Веб-проводника выставлены\n"
+"в Предпочтениях GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Программа настройки веб-проводника не найдена.</b>"
+
+msgid "Configure _Browser"
+msgstr "Настроить _браузер"
+
 msgid "_Browser:"
 msgstr "_Браузер:"
 
@@ -13538,6 +13598,42 @@
 "_Вручную:\n"
 "(%s для URL)"
 
+msgid "Proxy Server"
+msgstr "Прокси-сервер"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+"Настройки Прокси & Веб-проводника выставлены\n"
+"в Предпочтениях GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Программа настройки прокси не найдена.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Настроить _прокси"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+#, fuzzy
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Использовать удалённый DNS с прокси SOCKS4"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Т_ип прокси:"
+
+msgid "No proxy"
+msgstr "Нет прокси"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "П_орт:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Имя пользователя:"
+
 msgid "Log _format:"
 msgstr "_Формат журнала:"
 
@@ -13626,25 +13722,19 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Основываясь на использовании клавиатуры или мыши"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Минут до начала бездействия:"
+
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "Менять статус при _бездействии"
+
 msgid "_Auto-reply:"
 msgstr "_Автоматический ответ:"
 
 msgid "When both away and idle"
 msgstr "Во время отсутствия и бездействия"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Авто-\"Отошёл\""
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Минут до начала бездействия:"
-
-msgid "Change status when _idle"
-msgstr "Менять статус при _бездействии"
-
-msgid "Change _status to:"
-msgstr "Менять _статус на:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Статус при запуске"
@@ -13658,15 +13748,16 @@
 msgid "Interface"
 msgstr "Интерфейс"
 
-msgid "Smiley Themes"
-msgstr "Темы смайликов"
-
 msgid "Browser"
 msgstr "Браузер"
 
 msgid "Status / Idle"
 msgstr "Статус / Бездействие"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Темы смайликов"
+
 msgid "Allow all users to contact me"
 msgstr "Разрешить доступ всем пользователям"
 
@@ -13887,7 +13978,7 @@
 "use it as the buddy icon for this user."
 msgstr ""
 "Вы можете послать эту картинку передачей файла, вставить её в сообщение или "
-"использовать её как иконку приятеля для этого пользователя"
+"использовать её как иконку собеседника для этого пользователя"
 
 msgid "Set as buddy icon"
 msgstr "Установить в качестве значка собеседника"
@@ -13908,14 +13999,14 @@
 "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
@@ -14035,9 +14126,6 @@
 msgid "Pidgin smileys"
 msgstr "Смайлики Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Нежные пингвины"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Выбор этого выключит графические эмоции."
 
@@ -14088,7 +14176,7 @@
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr "Отображает статистическую информацию о доступности ваших приятелей"
+msgstr "Отображает статистическую информацию о доступности ваших собеседников"
 
 msgid "Buddy is idle"
 msgstr "Собеседник бездействует"
@@ -14097,11 +14185,11 @@
 msgstr "Собеседник отошёл"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Приятель \"давно\" отошёл"
+msgstr "Собеседник \"давно\" отошёл"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Приятель на мобильном"
+msgstr "Собеседник на мобильном"
 
 msgid "Buddy is offline"
 msgstr "Собеседник не в сети"
@@ -14113,11 +14201,11 @@
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"Приятель с <i>наибольшими очками</i> - это тот приятель, который будет иметь "
-"приоритет в контакте.\n"
+"Собеседник с <i>наибольшими очками</i> - это тот собеседник, который будет "
+"иметь приоритет в контакте.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Используйте предыдущего приятеля, когда очков поровну"
+msgstr "Используйте предыдущего собеседника, когда очков поровну"
 
 msgid "Point values to use for account..."
 msgstr "Значения очков для использования для учётной записи..."
@@ -14138,7 +14226,7 @@
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Разрешает управление значениями, соотнесёнными с различными состояниями "
-"приятелей."
+"собеседников."
 
 #. *< description
 msgid ""
@@ -14146,7 +14234,7 @@
 "in contact priority computations."
 msgstr ""
 "Разрешает изменение значения очков состояний простоя/отсутствия/не в сети "
-"для вычисления приоритета контактов приятелей."
+"для вычисления приоритета контактов собеседников."
 
 msgid "Conversation Colors"
 msgstr "Цвета беседы"
@@ -14248,7 +14336,7 @@
 msgstr "Информация о службе Разъяснения"
 
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "Позволяет просматривать и регистрировать службы."
 
 #, fuzzy
 msgid ""
@@ -14384,7 +14472,7 @@
 msgstr "Исполняемый файл evolution не был найден в PATH."
 
 msgid "An email address was not found for this buddy."
-msgstr "Адрес эл.почты не был найден для этого приятеля."
+msgstr "Адрес эл.почты не был найден для этого собеседника."
 
 msgid "Add to Address Book"
 msgstr "Добавить в адресную книгу"
@@ -14698,6 +14786,10 @@
 msgid "Conversation Entry"
 msgstr "Область ввода окна беседы"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "Область ввода окна беседы"
+
 msgid "Request Dialog"
 msgstr "Диалог запроса"
 
@@ -14723,21 +14815,21 @@
 
 #, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Включить набор уведомления"
+msgstr "Отключить уведомление о наборе текста"
 
 #, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Управление темой GTK+ для Pidgin"
+msgstr "Установки управления темой GTK+"
 
 #, fuzzy
 msgid "Colors"
-msgstr "Закрыть"
+msgstr "Цвета"
 
 msgid "Fonts"
 msgstr "Шрифты"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Разное"
 
 msgid "Gtkrc File Tools"
 msgstr "Инструменты файла Gtkrc"
@@ -14897,18 +14989,20 @@
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"Значок для контакта/\n"
+"Значок для неизвестной личности"
 
 #, fuzzy
 msgid "Icon for Chat"
-msgstr "Присоединиться к чату"
+msgstr "Значок для переписки"
 
 #, fuzzy
 msgid "Ignored"
-msgstr "Игнорировать"
+msgstr "Проигнорировано"
 
 #, fuzzy
 msgid "Founder"
-msgstr "Громко"
+msgstr "Поисковик"
 
 #. A user in a chat room who has special privileges.
 #, fuzzy
@@ -14918,7 +15012,7 @@
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "Полу-оператор"
 
 #, fuzzy
 msgid "Authorization dialog"
@@ -14933,7 +15027,7 @@
 msgstr "Информация"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "Диалоговое окно почты"
 
 #, fuzzy
 msgid "Question dialog"
@@ -14944,7 +15038,7 @@
 msgstr "Уровень предупреждения"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "Какой это тип диалогового окна?"
 
 #, fuzzy
 msgid "Status Icons"
@@ -14975,7 +15069,7 @@
 msgstr "Список собеседников"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Тема редактирования значков"
 
 #. *< type
 #. *< ui_requirement
@@ -15078,35 +15172,33 @@
 "Этот модуль позволяет пользователю изменять форматы времени сообщений для "
 "бесед и журналов."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Авто"
-
-#, fuzzy
+msgstr "Аудио"
+
 msgid "Video"
-msgstr " Видео"
+msgstr "Видео"
 
 msgid "Output"
-msgstr ""
+msgstr "Вывод"
 
 #, fuzzy
 msgid "_Plugin"
-msgstr "Модули"
+msgstr "_Модули"
 
 #, fuzzy
 msgid "_Device"
-msgstr "Устройство"
+msgstr "_Устройство"
 
 msgid "Input"
-msgstr ""
+msgstr "Ввод"
 
 #, fuzzy
 msgid "P_lugin"
-msgstr "Модули"
+msgstr "М_одули"
 
 #, fuzzy
 msgid "D_evice"
-msgstr "Устройство"
+msgstr "У_стройство"
 
 #. *< magic
 #. *< major version
@@ -15124,11 +15216,11 @@
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Изменить ваш микрофон и веб-камеру."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "Изменить настройки микрофона и веб-камеры для головых/видео звонков."
 
 msgid "Opacity:"
 msgstr "Непрозрачность:"
@@ -15260,6 +15352,28 @@
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
 #, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(По умолчанию)"
+
+#~ msgid "Install Theme"
+#~ msgstr "Установить тему"
+
+#~ msgid "Icon"
+#~ msgstr "Значок"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Использовать шрифт документа из _темы"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Прокси-сервер &amp; браузер"
+
+#~ msgid "Auto-away"
+#~ msgstr "Авто-\"Отошёл\""
+
+#~ msgid "Change _status to:"
+#~ msgstr "Менять _статус на:"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
 #~ "Корневой сертификат, попытавшийся в этот раз подтвердиться, неизвестен "
@@ -15965,7 +16079,7 @@
 
 #, fuzzy
 #~ msgid "Add into %d's buddy list"
-#~ msgstr "Добавить в список приятелей для %d"
+#~ msgstr "Добавить в список собеседников для %d"
 
 #, fuzzy
 #~ msgid "QQ Number Error"
@@ -16019,7 +16133,7 @@
 
 #, fuzzy
 #~ msgid "Do you add the buddy?"
-#~ msgstr "Хотите добавить приятеля?"
+#~ msgstr "Хотите добавить собеседника?"
 
 #, fuzzy
 #~ msgid "%s added you [%s] to buddy list"
--- a/po/sl.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/sl.po	Sat Jan 09 02:00:18 2010 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-08-28 18:51+0100\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
+"PO-Revision-Date: 2009-11-24 01:00+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
@@ -635,9 +635,8 @@
 msgid "Enable Sounds"
 msgstr "Vključi zvoke"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Zaprli ste povezavo."
+msgstr "Niste povezani."
 
 msgid "<AUTO-REPLY> "
 msgstr "<SAMODEJNI ODGOVOR>"
@@ -650,9 +649,8 @@
 msgstr[2] "Seznam %d uporabnikov:\n"
 msgstr[3] "Seznam %d uporabnikov:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Podprte možnosti razhroščevanja:  različica"
+msgstr "Podprte možnosti razhroščevanja: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Tak ukaz ne obstaja (v tem sklopu)."
@@ -1538,10 +1536,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL za zgornje: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Počakajte trenutek, da TinyURL pridobi krajši URL ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
@@ -1561,6 +1559,7 @@
 msgid "Online"
 msgstr "Prisoten"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Brez povezave"
 
@@ -1671,6 +1670,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 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."
@@ -1904,9 +1905,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Postopek razločevanja je bil prekinjen brez odgovora na vašo zahtevo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Napaka pri razločevanju %s: %d"
+msgstr "Napaka pri pretvarjanju %s v punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2222,15 +2223,12 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Prišlo je do napake Farsight2, od katere si ni mogoče opomoči."
 
-#, fuzzy
 msgid "Conference error"
 msgstr "Konferenčna napaka."
 
-#, fuzzy
 msgid "Error with your microphone"
 msgstr "Napaka na vašem mikrofonu."
 
-#, fuzzy
 msgid "Error with your webcam"
 msgstr "Napaka na vaši spletni kameri."
 
@@ -3198,10 +3196,12 @@
 msgid "Add to chat..."
 msgstr "Dodaj k pomenku ..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Na voljo"
 
+#. 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
@@ -4014,12 +4014,14 @@
 msgid "Log Out"
 msgstr "Odjavi se"
 
+#. 2
 msgid "Chatty"
 msgstr "Pomenek"
 
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
@@ -4282,6 +4284,7 @@
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
+#. 0
 msgid "None"
 msgstr "brez"
 
@@ -4587,9 +4590,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [soba]:  Zapusti sobo."
+msgstr "part [sporočilo]:  Zapusti sobo."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
@@ -5251,7 +5253,7 @@
 msgstr ""
 "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5487,9 +5489,8 @@
 msgid "Unknown error (%d)"
 msgstr "Neznana napaka (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Ni mogoče dodati uporabnika"
+msgstr "Ni mogoče odstraniti uporabnika"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilnega sporočila ni mogoče poslati, ker je predolgo."
@@ -5735,28 +5736,82 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s vas je odstranil(a) s svojega seznama prijateljev."
 
+#. 1
+msgid "Angry"
+msgstr "Jezen"
+
+#. 2
+msgid "Excited"
+msgstr "Razburjen"
+
+#. 3
+msgid "Grumpy"
+msgstr "Tečno"
+
+#. 4
+msgid "Happy"
+msgstr "Vesel"
+
+#. 5
+msgid "In Love"
+msgstr "Zaljubljen"
+
+#. 6
+msgid "Invincible"
+msgstr "Nepremagljiv"
+
+#. 7
+msgid "Sad"
+msgstr "Žalosten"
+
+#. 8
+msgid "Hot"
+msgstr "Vroče"
+
+#. 9
+msgid "Sick"
+msgstr "Bolno"
+
+#. 10
+msgid "Sleepy"
+msgstr "Zaspan"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Vaše trenutno razpoloženje"
+msgstr "Trenutno razpoloženje"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Razpoloženje"
-
-#, fuzzy
+msgstr "Novo razpoloženje"
+
 msgid "Change your Mood"
-msgstr "Spremeni geslo"
-
-#, fuzzy
+msgstr "Spremeni razpoloženje"
+
 msgid "How do you feel right now?"
-msgstr "Trenutno nisem tukaj"
+msgstr "Kako se počutite?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Vneseni PIN ni veljaven."
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Vneseni PIN ni veljavne dolžine [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+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 birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Vneseni rojstni datum ni veljaven. Pravilna oblika je: 'LLLL-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Napaka pri pisanju"
+msgstr "Napaka pri posodobitvi profila"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5764,354 +5819,298 @@
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Podatki o vašem profilu še niso pridobljen. Poskusite znova kasneje."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Preveri PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Družinsko ime"
+msgstr "Pojavno ime"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skrij mojo številko"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Št. mobilnega telefona"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil Yahoo!"
+msgstr "Posodobite svoj profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tukaj lahko posodobite svoj profil MXit"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Pokaži pozdravno okno"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Trenutno ni na voljo nobenega pozdravnega okna"
+
 msgid "About"
-msgstr "O meni"
+msgstr "O programu"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Spremeni geslo ..."
+msgstr "Spremeni razpoloženje ..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Spremeni geslo ..."
+msgstr "Spremeni profil ..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Pokaži dnevnik ..."
+msgstr "Pokaži pozdravno okno ..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O meni"
+msgstr "O razširitvi ..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Sporočilo je preveliko."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "Datoteka, ki jo želite poslati, je prevelika!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Povezava s strežnikom MXit HTTP ni možna. Preverite svoje nastavitve "
+"strežnika."
+
 msgid "Logging In..."
-msgstr "Prijavljanje"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se "
-"želite povezati."
-
-#, fuzzy
+msgstr "Prijavljanje ..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"S strežnikom MXit se ni mogoče povezati. Preverite nastavitve svojega "
+"strežnika."
+
 msgid "Connecting..."
-msgstr "Povezovanje"
+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 ""
+msgstr "Prijavno ime MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Vzdevek"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registriraj nov račun za XMPP"
-
-#, fuzzy
+msgstr "Registriraj nov račun za MXit"
+
 msgid "Please fill in the following fields:"
-msgstr "Prosimo, izpolnite naslednja polja"
+msgstr "Izpolnite naslednja polja:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Napaka pri navezovanju stika z mestom MXit WAP. Poskusite znova kasneje."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit trenutno ne more obdelati zahteve. Poskusite znova kasneje."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Vnesena napačna varnostna koda. Poskusite znova kasneje."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Vaša seja je potekla. Poskusite znova kasneje."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Izbrana neveljavna država. Poskusite znova kasneje."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Uporabniško ime ni registrirano. Najprej se registrirajte."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Uporabniško ime je že registrirano. Izberite drugo ime."
+
 msgid "Internal error. Please try again later."
-msgstr "Strežnik ni na voljo; poskusite pozneje"
+msgstr "Notranja napaka. Poskusite znova pozneje."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Niste vnesli varnostne kode."
+
 msgid "Security Code"
-msgstr "Varnost vključena"
+msgstr "Varnostna koda"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Vnesite kodo"
-
-#, fuzzy
+msgstr "Vnesite varnostno kodo"
+
 msgid "Your Country"
-msgstr "Država"
-
-#, fuzzy
+msgstr "Vaša država"
+
 msgid "Your Language"
-msgstr "Priljubljen jezik"
+msgstr "Vaš jezik"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Zahtevaj pooblastilo"
+msgstr "Pooblastitev MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Overjanje računa MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Informacije o strežniku"
-
-#, fuzzy
+msgstr "Pridobivanje podatkov o uporabniku ..."
+
+msgid "Loading menu..."
+msgstr "Nalaganje menija ..."
+
 msgid "Status Message"
-msgstr "Poslana sporočila"
-
-#, fuzzy
+msgstr "Sporočilo stanja"
+
 msgid "Hidden Number"
-msgstr "Drugo ime"
-
-#, fuzzy
+msgstr "Skrita številka"
+
 msgid "Your Mobile Number..."
-msgstr "Nastavi št. mobilnega telefona ..."
+msgstr "Vaša mobilna številka ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Strežnik"
-
-#, fuzzy
+msgstr "Strežnik WAP"
+
 msgid "Connect via HTTP"
-msgstr "Poveži prek TCP"
+msgstr "Poveži prek HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Omogoči pozdravno okno ob zagonu"
 
 #. 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 "Povezava z MXite je izgubljena. Znova se povežite."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Napaka sporočila XMPP"
-
-#, fuzzy
+msgstr "Napaka pošiljanja sporočila"
+
 msgid "Unable to process your request at this time"
-msgstr "Imena strežnika ni mogoče razločiti"
+msgstr "Vaše zahteve v tem trenutku ni mogoče obdelati"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Časovna prekoračitev med čakanjem na odgovor strežnika MXit."
+
 msgid "Successfully Logged In..."
-msgstr "Uspešno ste se pridružili Qunu"
-
-#, fuzzy
+msgstr "Uspešno prijavljeni ..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s vam je poslal šifrirano sporočilo, kar še ni podprto v odjemalcu."
+
 msgid "Message Error"
-msgstr "Napaka sporočila XMPP"
+msgstr "Napaka sporočila"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Preusmeritve ni mogoče izvršiti z navedenim protokolom"
+
+msgid "An internal MXit server error occurred."
+msgstr "Prišlo je do notranje napake strežnika MXit."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Napaka prijave: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Napaka odjave: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Napaka na povezavi"
-
-#, fuzzy
+msgstr "Napaka stika"
+
 msgid "Message Sending Error"
-msgstr "Napaka sporočila XMPP"
-
-#, fuzzy
+msgstr "Napaka pošiljanja sporočila"
+
 msgid "Status Error"
-msgstr "Napaka toka"
-
-#, fuzzy
+msgstr "Napaka stanja"
+
 msgid "Mood Error"
-msgstr "Napaka ikone"
-
-#, fuzzy
+msgstr "Napaka razpoloženja"
+
 msgid "Invitation Error"
-msgstr "Napaka pri odjavi"
-
-#, fuzzy
+msgstr "Napaka povabila"
+
 msgid "Contact Removal Error"
-msgstr "Napaka na povezavi"
-
-#, fuzzy
+msgstr "Napaka odstranitve stika"
+
 msgid "Subscription Error"
-msgstr "Naročilo"
-
-#, fuzzy
+msgstr "Napaka naročanja"
+
 msgid "Contact Update Error"
-msgstr "Napaka na povezavi"
-
-#, fuzzy
+msgstr "Napaka posodobitve stikov"
+
 msgid "File Transfer Error"
-msgstr "Prenos datotek"
-
-#, fuzzy
+msgstr "Napaka prenosa datoteke"
+
 msgid "Cannot create MultiMx room"
-msgstr "Opozorila ni mogoče ustvariti"
-
-#, fuzzy
+msgstr "Sobe MultiMx ni mogoče ustvariti"
+
 msgid "MultiMx Invitation Error"
-msgstr "Napaka pri odjavi"
-
-#, fuzzy
+msgstr "Napaka povabila MultiMx"
+
 msgid "Profile Error"
-msgstr "Napaka pri pisanju"
+msgstr "Napaka profila"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Sprejet neveljaven paket z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Napaka povezave v MXit. (faza branja 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Napaka povezave v MXit. (faza branja 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Napaka povezave v MXit. (faza branja 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Napaka povezave v MXit. (faza branja 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Napaka povezave v MXit. (faza branja 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Jezen"
-
-msgid "Excited"
-msgstr "Razburjen"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Združi"
-
-msgid "Happy"
-msgstr "Vesel"
-
-msgid "In Love"
-msgstr "Zaljubljen"
-
-msgid "Invincible"
-msgstr "Nepremagljiv"
-
-msgid "Sad"
-msgstr "Žalosten"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Strežnik:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Vzdevek"
-
-msgid "Sleepy"
-msgstr "Zaspan"
-
-#, fuzzy
+msgstr "Napaka povezave v MXit. (faza branja 0x06)"
+
 msgid "Pending"
-msgstr "Pošiljanje"
-
-#, fuzzy
+msgstr "Čakajoči"
+
 msgid "Invited"
-msgstr "Povabi"
-
-#, fuzzy
+msgstr "Povabljeni"
+
 msgid "Rejected"
-msgstr "Zavrni"
-
-#, fuzzy
+msgstr "Zavrnjeni"
+
 msgid "Deleted"
-msgstr "Izbriši"
+msgstr "Izbrisani"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Oglaševanje MXit"
+
 msgid "More Information"
-msgstr "Informacije o zaposlitvi"
+msgstr "Več informacij"
 
 #, c-format
 msgid "No such user: %s"
@@ -6891,46 +6890,42 @@
 msgstr "Na omrežju AOL ni dovoljeno"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Sporočila ne morete prejeti zaradi starševskega nadzora"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "SMS ni mogoče poslati brez sprejetja pogojev"
+
 msgid "Cannot send SMS"
-msgstr "Ni mogoče poslati datoteke"
+msgstr "Ni mogoče poslati SMS-a"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Mape ni mogoče poslati."
+msgstr "SMS-a v to državo ni mogoče poslati."
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "SMS ni mogoče poslati v neznano državo"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Računi bot ne morejo začeti klepetov"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Račun bot ne more klepetati s tem uporabnikom"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Račun bot je dosegel številsko omejitev sporočil"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Račun bot je dosegel dnevno omejitev sporočil"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Račun bot je dosegel mesečno omejitev sporočil"
+
 msgid "Unable to receive offline messages"
-msgstr "Sporočila ni mogoče poslati."
-
-#, fuzzy
+msgstr "Sporočil stanja nepovezanosti ni mogoče prejemati."
+
 msgid "Offline message store full"
-msgstr "Brezpovezavno sporočilo"
+msgstr "Shramba sporočil ob nepovezanosti je polna"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7101,14 +7096,13 @@
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
 #. 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 ""
 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
-"poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
+"poskusite znova. Če ne počakate sedaj, boste čakali še dlje."
 
 #. client too old
 #, c-format
@@ -7118,7 +7112,6 @@
 "pri %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 "
@@ -7128,7 +7121,7 @@
 "poskusite znova. Če ne počakate sedaj, boste čakali še dlje."
 
 msgid "The SecurID key entered is invalid"
-msgstr "Vnešeni ključ SecurID ni veljaven"
+msgstr "Vneseni ključ SecurID ni veljaven"
 
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
@@ -7283,22 +7276,22 @@
 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."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Sporočila (%s) ni mogoče poslati."
+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"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ni moč poslati sporočila k %s:"
-
-#, fuzzy, c-format
+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:"
+msgstr "Ni moč poslati sporočila k %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7327,14 +7320,13 @@
 "[Ni mogoče prikazati sporočila tega uporabnika, ker vsebuje neveljavne "
 "znake.]"
 
-#, 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 ""
 "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."
+"znova.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10177,13 +10169,13 @@
 msgstr "Odpri prejeto pošto"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "SMS ni mogoče poslati. Mobilnega operaterja ni mogoče pridobiti."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "SMS ni mogoče poslati. Neznan mobilni operater."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Pridobivanje mobilnega operaterja za pošiljanje SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10740,6 +10732,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Klepetajte s svetom. Podpira AIM, Google Talk, Jabber/XMPP, MSN, Yahoo in "
+"druge."
 
 msgid "Internet Messenger"
 msgstr "Spletni sel"
@@ -12012,6 +12006,10 @@
 msgid "Mongolian"
 msgstr "mongolsko"
 
+#, fuzzy
+msgid "Malay"
+msgstr "Moški"
+
 msgid "Bokmål Norwegian"
 msgstr "norveško (Bokmål)"
 
@@ -12081,6 +12079,10 @@
 msgid "Turkish"
 msgstr "turško"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "armensko"
+
 msgid "Urdu"
 msgstr "urdujsko"
 
@@ -12715,7 +12717,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "MAPA"
 
 msgid "use DIR for config files"
 msgstr "uporabi DIR za prilagoditvene datoteke"
@@ -12736,17 +12738,17 @@
 msgstr "ne prijavi se samodejno"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "IME"
+
 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 ""
-"omogoči navedene račune (neobvezen argument IME\n"
+"omogoči naveden(e) račun(e) (neobvezen argument IME\n"
 "                      določa račune, ki naj bodo uporabljeni, ločene z "
-"vejicami."
+"vejicami;\n"
+"                      brez tega bo omogočen le prvi račun)"
 
 msgid "X display to use"
 msgstr "Zaslon X, ki naj bo uporabljen"
@@ -13015,21 +13017,19 @@
 msgstr "Neznano ... Poročajte o tem!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(privzeto)"
+msgstr "(po meri)"
+
+msgid "Penguin Pimps"
+msgstr "Pingvinske ikone (Penguin Pimps)"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Privzeta zvočna tema za Pidgin"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Urejevalnik tem seznama prijateljev Pidgin"
+msgstr "Privzeta tema seznama prijateljev Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Privzeta tema ikon stanja za Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Teme ni mogoče razpakirati."
@@ -13040,18 +13040,29 @@
 msgid "Theme failed to copy."
 msgstr "Teme ni mogoče kopirati."
 
-msgid "Install Theme"
-msgstr "Namesti temo"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"S spodnjega seznama izberite vrsto smejčkov, ki jih želite uporabljati. Nove "
-"teme lahko namestite, če jih povlečete in spustite na seznam."
-
-msgid "Icon"
-msgstr "Ikona"
+msgid "Theme Selections"
+msgstr "Izbire tem"
+
+#. 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 ""
+"S spodnjega seznama izberite temo, ki jih želite uporabljati.\n"
+"Nove teme lahko namestite, če jih povlečete in spustite na seznam tem."
+
+msgid "Buddy List Theme:"
+msgstr "Tema seznama prijateljev:"
+
+msgid "Status Icon Theme:"
+msgstr "Tema ikon stanja:"
+
+msgid "Sound Theme:"
+msgstr "Zvočna tema:"
+
+msgid "Smiley Theme:"
+msgstr "Teme za smejčke:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Tipke za bližnjice"
@@ -13059,10 +13070,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Zapri pomenke s tipko Esc"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Tema seznama prijateljev"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona na pladnju"
@@ -13149,9 +13156,6 @@
 msgid "Font"
 msgstr "Pisava"
 
-msgid "Use document font from _theme"
-msgstr "Uporabi pisavo dokumenta iz _teme"
-
 msgid "Use font from _theme"
 msgstr "Uporabi pisavo iz _teme"
 
@@ -13174,17 +13178,15 @@
 msgid "Cannot start browser configuration program."
 msgstr "Konfiguracijskega programa brskalnika ni mogoče zagnati."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Onemogoči"
+msgstr "Onemogočeno"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Uporabi _samozaznani naslov IP: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Strežnik:"
+msgstr "Strežnik ST_UN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
@@ -13198,79 +13200,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Omogoči samodejno prepošiljanje vrat usmerjevalnika"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ročno določi obseg vrat za poslušanje"
-
-#, fuzzy
+msgstr "_Ročno določi obseg vrat za poslušanje:"
+
 msgid "_Start:"
-msgstr "_Stanje:"
-
-#, fuzzy
+msgstr "_Začetek:"
+
 msgid "_End:"
-msgstr "_Razširi"
+msgstr "_Konec:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relejski strežnik (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Strežnik:"
-
-#, fuzzy
+msgstr "Strežnik _TURN:"
+
 msgid "Use_rname:"
-msgstr "Uporabniško ime:"
-
-#, fuzzy
+msgstr "Upo_rabniško ime:"
+
 msgid "Pass_word:"
-msgstr "Geslo:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Posredovalni strežnik in brskalnik"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>Konfiguracijskega programa posredovalnega strežnika ni mogoče najti.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Konfiguracijskega programa brskalnika ni mogoče najti.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Nastavitve posredovalnega strežnika in brskalnika določite\n"
-"v nastavitvah GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Prilagodi po_sredovalni strežnik"
-
-msgid "Configure _Browser"
-msgstr "Prilagodi _brskalnik"
-
-msgid "Proxy Server"
-msgstr "Posredovalni strežnik"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Uporabi oddaljeni DNS s posredovalnimi strežniki SOCKS4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Vrsta posredovalnega s_trežnika:"
-
-msgid "No proxy"
-msgstr "brez posredovalnega strežnika"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Vrata:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Uporabniško ime:"
+msgstr "Ges_lo:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13311,6 +13261,15 @@
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Nastavitve brskalnika določite v nastavitvah GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Konfiguracijskega programa brskalnika ni mogoče najti.</b>"
+
+msgid "Configure _Browser"
+msgstr "Prilagodi _brskalnik"
+
 msgid "_Browser:"
 msgstr "_Brskalnik:"
 
@@ -13334,6 +13293,36 @@
 "_Ročno:\n"
 "(%s namesto URL)"
 
+msgid "Proxy Server"
+msgstr "Posredovalni strežnik"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Nastavitve posredovalnega strežnika določite v nastavitvah GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+"<b>Konfiguracijskega programa posredovalnega strežnika ni mogoče najti.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Prilagodi po_sredovalni strežnik"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Uporabi oddaljeni _DNS s posredovalnimi strežniki SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "Vrsta posredovalnega s_trežnika:"
+
+msgid "No proxy"
+msgstr "brez posredovalnega strežnika"
+
+msgid "P_ort:"
+msgstr "_Vrata:"
+
+msgid "User_name:"
+msgstr "_Uporabniško ime:"
+
 msgid "Log _format:"
 msgstr "Oblika _dnevnika:"
 
@@ -13417,25 +13406,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "glede na rabo tipkovnice ali miške"
 
+msgid "_Minutes before becoming idle:"
+msgstr "Število _minut pred nedejavnostjo:"
+
+msgid "Change to this status when _idle:"
+msgstr "Spremeni stanje ob _nedejavnosti:"
+
 msgid "_Auto-reply:"
 msgstr "_Samodejni odziv"
 
 msgid "When both away and idle"
 msgstr "ob odsotnosti in nedejavnosti"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Samodejna odsotnost"
-
-msgid "_Minutes before becoming idle:"
-msgstr "Število _minut pred nedejavnostjo:"
-
-msgid "Change status when _idle"
-msgstr "Spremeni stanje ob _nedejavnosti"
-
-msgid "Change _status to:"
-msgstr "Spremeni _stanje v:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Stanje ob zagonu"
@@ -13449,15 +13431,15 @@
 msgid "Interface"
 msgstr "Vmesnik"
 
-msgid "Smiley Themes"
-msgstr "Teme za smejčke"
-
 msgid "Browser"
 msgstr "Brskalnik"
 
 msgid "Status / Idle"
 msgstr "Stanje / Nedejaven"
 
+msgid "Themes"
+msgstr "Teme"
+
 msgid "Allow all users to contact me"
 msgstr "Dovoli vsem uporabnikom, da stopijo v stik z mano"
 
@@ -13799,9 +13781,6 @@
 msgid "Pidgin smileys"
 msgstr "Smejčki Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Pingvinske ikone (Penguin Pimps)"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "S to izbiro onemogočite grafične smejčke."
 
@@ -14442,6 +14421,9 @@
 msgid "Conversation Entry"
 msgstr "Vnos pogovora"
 
+msgid "Conversation History"
+msgstr "Zgodovina pogovora"
+
 msgid "Request Dialog"
 msgstr "Pogovorno okno zahteve"
 
@@ -14907,9 +14889,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Zaženi %s ob zagonu sistema"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "dovoli več hkratnih prijav"
+msgstr "Dovoli več hkratnih prijav"
 
 msgid "_Dockable Buddy List"
 msgstr "Le_pljiv seznam prijateljev"
@@ -14972,6 +14953,27 @@
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
+#~ msgid "(Default)"
+#~ msgstr "(privzeto)"
+
+#~ 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:"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
--- a/po/stats.pl	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/stats.pl	Sat Jan 09 02:00:18 2010 +0000
@@ -30,6 +30,7 @@
 $lang{en_AU} = "English (Australian)";
 $lang{en_CA} = "English (Canadian)";
 $lang{en_GB} = "English (British)";
+$lang{ms_MY} = "Malay";
 $lang{my_MM} = "Burmese (Myanmar)";
 $lang{pt_BR} = "Portuguese (Brazilian)";
 $lang{'sr@latin'} = "Serbian (Latin)";
--- a/po/uk.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/uk.po	Sat Jan 09 02:00:18 2010 +0000
@@ -1,15 +1,17 @@
 # Ukrainian translation to Pidgin.
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Pidgin package.
+#
 # Maxim V. Dziumanenko <mvd@mylinux.com.ua>, 2004-2005.
+# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2005-08-21 10:43+0300\n"
-"Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
+"POT-Creation-Date: 2009-11-23 10:31-0800\n"
+"PO-Revision-Date: 2009-09-01 06:06+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"
@@ -19,13 +21,12 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "Французька"
-
-#, fuzzy, c-format
+msgstr "Finch"
+
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Наберіть `%s -h' для отримання додаткової інформації.\n"
+msgstr "%s. Спробуйте `%s -h' для більш детальної інформації.\n"
 
 #, c-format
 msgid ""
@@ -38,6 +39,14 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"%s\n"
+"Використання: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    використовувати DIR для конфігураційних файлів\n"
+"  -d, --debug         друкувати повідомлення зневадження до stderr\n"
+"  -h, --help          показати цю допомогу та вийти\n"
+"  -n, --nologin       не входити у мережу автоматично\n"
+"  -v, --version       показати поточну версію і вийти\n"
 
 #, c-format
 msgid ""
@@ -45,43 +54,43 @@
 "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 added"
-msgstr "Обліковий запис була вимкнена"
+msgstr "Обліковий запис не був доданий"
 
 msgid "Username of an account must be non-empty."
-msgstr ""
+msgstr "Ім'я користувача облікового запису не має бути порожнім."
 
 msgid "New mail notifications"
-msgstr "Сповіщення про нову пошту"
+msgstr "Сповіщати про нову пошту"
 
 msgid "Remember password"
 msgstr "Запам'ятати пароль"
 
 msgid "There are no protocol plugins installed."
-msgstr ""
+msgstr "Не встановлений жоден додаток протоколів."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(Можливо, ви забули зробити 'make install'.)"
 
 msgid "Modify Account"
 msgstr "Зміна облікового запису"
 
-#, fuzzy
 msgid "New Account"
-msgstr "Обліковий запис"
+msgstr "Новий обліковий запис"
 
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Ім'я користувача"
+msgstr "Ім'я користувача:"
 
 msgid "Password:"
 msgstr "Пароль:"
@@ -90,9 +99,8 @@
 msgstr "Псевдонім:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Вас було роз'єднано з сервером."
+msgstr "Створити цей обліковий запис на сервері"
 
 #. Cancel button
 #. Cancel
@@ -108,9 +116,8 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Ви дійсно бажаєте видалити %s?"
 
-#, fuzzy
 msgid "Delete Account"
-msgstr "Обліковий запис"
+msgstr "Видалити обліковий запис"
 
 #. Delete button
 msgid "Delete"
@@ -119,33 +126,30 @@
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Чи очікуєте авторизацію від наступних користувачів"
+msgstr "Ви можете увімкнути/вимкнути облікові записи з наступного переліку."
 
 #. Add button
 msgid "Add"
 msgstr "Додати"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "З_мінити"
-
-#, fuzzy, c-format
+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%s"
+msgstr "%s%s%s%s зробив(ла)%s своїм контактом %s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Додати користувача у список?"
-
-#, fuzzy, c-format
+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."
-
-#, fuzzy
+msgstr "%s%s%s%s хоче додати %s до свого переліку контактів%s%s"
+
 msgid "Authorize buddy?"
-msgstr "Авторизувати"
+msgstr "Авторизувати контакт?"
 
 msgid "Authorize"
 msgstr "Авторизувати"
@@ -158,53 +162,47 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-
-#, fuzzy, c-format
+"В мережі: %d\n"
+"Всього: %d"
+
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s на %s (%s)"
-
-#, fuzzy, c-format
+msgstr "Обліковий запис: %s (%s)"
+
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#, fuzzy
+"Востаннє в мережі: %s ago"
+
 msgid "Default"
-msgstr "типовий переглядач Gnome"
-
-#, fuzzy
+msgstr "Типовий"
+
 msgid "You must provide a username for the buddy."
-msgstr "Введіть назву групи, що додаватиметься."
+msgstr "Ви маєте надати контакту ім'я."
 
 msgid "You must provide a group."
-msgstr ""
-
-#, fuzzy
+msgstr "Ви маєте вказати групу."
+
 msgid "You must select an account."
-msgstr "Необхідно вказати псевдонім"
+msgstr "Ви маєте вибрати обліковий запис."
 
 msgid "The selected account is not online."
-msgstr ""
-
-#, fuzzy
+msgstr "Обраний обліковий запис не в мережі."
+
 msgid "Error adding buddy"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
+msgstr "Помилка під час додавання контакту"
 
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "Повідомлення (необов'язкове) :"
-
-#, fuzzy
+msgstr "Прізвисько (не обов'язково)"
+
 msgid "Add in group"
-msgstr "Додати групу"
+msgstr "Додати до групи"
 
 msgid "Account"
 msgstr "Обліковий запис"
@@ -212,9 +210,8 @@
 msgid "Add Buddy"
 msgstr "Додати користувача"
 
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "Введіть користувача для стеження."
+msgstr "Будь ласка, введіть інформацію про користувача."
 
 msgid "Chats"
 msgstr "Розмови"
@@ -226,11 +223,9 @@
 msgid "Alias"
 msgstr "Псевдонім"
 
-#, fuzzy
 msgid "Group"
-msgstr "Група:"
-
-#, fuzzy
+msgstr "Група"
+
 msgid "Auto-join"
 msgstr "Авто-приєднання"
 
@@ -238,53 +233,43 @@
 msgstr "Додати розмову"
 
 msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#, fuzzy
+msgstr "Пізніше ви можете відредагувати більше інформації з контекстного меню."
+
 msgid "Error adding group"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
-
-#, fuzzy
+msgstr "Помилка додавання до групи"
+
 msgid "You must give a name for the group to add."
-msgstr "Введіть назву групи, що додаватиметься."
+msgstr "Ви маєте надати назву групі, що додаватиметься."
 
 msgid "Add Group"
 msgstr "Додати групу"
 
-#, fuzzy
 msgid "Enter the name of the group"
-msgstr "Введіть назву групи, що додаватиметься."
-
-#, fuzzy
+msgstr "Введіть назву групи"
+
 msgid "Edit Chat"
-msgstr "Додати розмову"
+msgstr "Редагувати розмову"
 
 msgid "Please Update the necessary fields."
-msgstr ""
-
-#, fuzzy
+msgstr "Будь ласка, оновіть необхідні поля."
+
 msgid "Edit"
-msgstr "_Правка"
-
-#, fuzzy
+msgstr "Редагувати"
+
 msgid "Edit Settings"
-msgstr "використовувати параметри оточення"
+msgstr "Редагувати налаштування"
 
 msgid "Information"
 msgstr "Інформація"
 
-#, fuzzy
 msgid "Retrieving..."
-msgstr "З'єднання..."
+msgstr "Отримання..."
 
 msgid "Get Info"
 msgstr "Отримати інформацію"
 
-#, fuzzy
 msgid "Add Buddy Pounce"
-msgstr "Додати _правило"
+msgstr "Додати стеження за контактом"
 
 msgid "Send File"
 msgstr "Надіслати файл"
@@ -292,56 +277,52 @@
 msgid "Blocked"
 msgstr "Заблоковано"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "Не допускається не у мережі"
-
-#, fuzzy, c-format
+msgstr "Показувати, коли не у мережі"
+
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "Введіть нову назву для обраної групи."
-
-#, fuzzy
+msgstr "Будь ласка, введіть нову назву для %s"
+
 msgid "Rename"
-msgstr "Пере_йменувати"
-
-#, fuzzy
+msgstr "Змінити ім'я"
+
 msgid "Set Alias"
-msgstr "Псевдонім"
+msgstr "Встановити псевдонім"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "Введіть порожній рядок, щоб скинути назву"
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
+"Видалення цього контакту спричинить до видалення всіх контактів у ньому"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-
-#, fuzzy, c-format
+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?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "Підтвердити обліковий запис"
+msgstr "Підтвердити вилучення"
 
 msgid "Remove"
 msgstr "Видалити"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Список контактів"
+msgstr "Перелік контактів"
 
 msgid "Place tagged"
-msgstr ""
+msgstr "Місце позначене"
 
 msgid "Toggle Tag"
-msgstr ""
-
-#, fuzzy
+msgstr "Перемкнути тег"
+
 msgid "View Log"
-msgstr "Переглянути _журнал"
+msgstr "Переглянути журнал"
 
 #. General
 msgid "Nickname"
@@ -350,39 +331,35 @@
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "Бездіяльний"
-
-#, fuzzy
+msgstr "Без дій"
+
 msgid "On Mobile"
-msgstr "Відправити на мобільний"
+msgstr "Розмовляю по мобільному"
 
 msgid "New..."
 msgstr "Створити..."
 
-#, fuzzy
 msgid "Saved..."
-msgstr "Збереження файлу..."
+msgstr "Збережений..."
 
 msgid "Plugins"
-msgstr "Модулі"
-
-#, fuzzy
+msgstr "Додатки"
+
 msgid "Block/Unblock"
-msgstr "Блокувати"
+msgstr "Блокувати/Розблокувати"
 
 msgid "Block"
 msgstr "Блокувати"
 
-#, fuzzy
 msgid "Unblock"
-msgstr "Блокувати"
-
-#, fuzzy
+msgstr "Розблокувати"
+
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Введіть ідентифікатор користувача, якому ви бажаєте відправити повідомлення."
+"Будь ласка, введіть ім'я користувача або прізвисько особи, яку ви бажаєте "
+"заблокувати чи розблокувати."
 
 #. Not multiline
 #. Not masked?
@@ -391,142 +368,127 @@
 msgstr "Гаразд"
 
 msgid "New Instant Message"
-msgstr "Нове повідомлення"
-
-#, fuzzy
+msgstr "Нове миттєве повідомлення"
+
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Введіть ідентифікатор користувача, якому ви бажаєте відправити повідомлення."
-
-#, fuzzy
+"Введіть ім'я користувача або прізвисько особи, якій ви бажаєте надіслати "
+"повідомлення."
+
 msgid "Channel"
-msgstr "_Канал:"
+msgstr "Канал"
 
 msgid "Join a Chat"
 msgstr "Приєднатися до розмови"
 
-#, fuzzy
 msgid "Please enter the name of the chat you want to join."
-msgstr "Введіть URL та опис посилання, що ви бажаєте вставити."
-
-#, fuzzy
+msgstr "Будь ласка, введіть назву балачки, до якої хочете приєднатися."
+
 msgid "Join"
-msgstr "При_єднатись"
-
-#, fuzzy
+msgstr "Приєднатись"
+
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Введіть ідентифікатор користувача, журнал якого ви бажаєте переглянути."
+"Будь ласка, введіть ім'я користувача або прізвисько особи, журнал якої "
+"хочете переглянути."
 
 #. Create the "Options" frame.
-#, fuzzy
 msgid "Options"
-msgstr "/П_араметри"
-
-#, fuzzy
+msgstr "Налаштування"
+
 msgid "Send IM..."
-msgstr "Збереження файлу..."
-
-#, fuzzy
+msgstr "Надіслати повідомлення.."
+
 msgid "Block/Unblock..."
-msgstr "Блокувати"
-
-#, fuzzy
+msgstr "Блокувати/Розблокувати..."
+
 msgid "Join Chat..."
 msgstr "Приєднатись до розмови..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "Переглянути _журнал"
-
-#, fuzzy
+msgstr "Переглянути журнал..."
+
 msgid "View All Logs"
-msgstr "Переглянути _журнал"
+msgstr "Переглянути всі журнали"
 
 msgid "Show"
-msgstr ""
-
-#, fuzzy
+msgstr "Показати"
+
 msgid "Empty groups"
-msgstr "за групою"
-
-#, fuzzy
+msgstr "Порожні групи"
+
 msgid "Offline buddies"
-msgstr "Затіняти _бездіяльних користувачів"
-
-#, fuzzy
+msgstr "Користувачі, які не в мережі"
+
 msgid "Sort"
-msgstr "Порт"
-
-#, fuzzy
+msgstr "Впорядкувати"
+
 msgid "By Status"
-msgstr "за статусом"
-
-#, fuzzy
+msgstr "За станом"
+
 msgid "Alphabetically"
-msgstr "за алфавітом"
-
-#, fuzzy
+msgstr "За алфавітом"
+
 msgid "By Log Size"
-msgstr "за розміром журналу"
-
-#, fuzzy
+msgstr "За розміром журналу"
+
 msgid "Buddy"
-msgstr "_Користувач:"
+msgstr "Приятель"
 
 msgid "Chat"
 msgstr "Розмова"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "Група:"
-
-#, fuzzy
+msgstr "Групування"
+
 msgid "Certificate Import"
-msgstr "З'єднатися"
+msgstr "Імпорт сертифікату"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Визначити назву вузла"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Напишіть назву вузла, кому належить цей сертифікат"
 
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Файл %s не може бути імпортований.\n"
+"Впевніться, що файл доступний для читання та у форматі PEM.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Помилка імпортування сертифікату"
 
 msgid "X.509 certificate import failed"
-msgstr ""
-
-#, fuzzy
+msgstr "Помилка імпорту сертифікату X.509"
+
 msgid "Select a PEM certificate"
-msgstr "Вибір файлу"
+msgstr "Вибрати сертифікат PEM"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Невдалий експорт %s.\n"
+"Перевірте, чи маєте ви права на запис до теки призначення\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Помилка експорту сертифікату"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Помилка експорту сертифікату X.509"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "Експорт сертифікату PEM X.509"
 
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
+msgstr "Сертифікат для %s"
 
 #, c-format
 msgid ""
@@ -535,24 +497,27 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Загальна назва: %s\n"
+"\n"
+"Відбиток SHA1:\n"
+"%s\""
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL сертифікат вузла"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Дійсно видалити сертифікат для %s?"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Підтвердити видалення сертифікату"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Менеджер сертифікатів"
 
 #. Creating the user splits
-#, fuzzy
 msgid "Hostname"
-msgstr "Вузол пішов"
+msgstr "Назва вузла"
 
 msgid "Info"
 msgstr "Інформація"
@@ -561,13 +526,13 @@
 msgid "Close"
 msgstr "Закрити"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s на %s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s (%s)"
+
+#, c-format
 msgid "%s disconnected."
-msgstr "З'єднання розірвано."
+msgstr "%s від'єднався."
 
 #, c-format
 msgid ""
@@ -576,10 +541,13 @@
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-
-#, fuzzy
+"%s\n"
+"\n"
+"Finch не буде намагатись перез'єднатись поки ви не виправите всі помилки та "
+"не увімкните обліковий запис знову."
+
 msgid "Re-enable Account"
-msgstr "Зареєструвати новий обліковий запис Jabber"
+msgstr "Ще раз увімкнути обіковий запис"
 
 msgid "No such command."
 msgstr "Немає такої команди."
@@ -591,100 +559,96 @@
 msgid "Your command failed for an unknown reason."
 msgstr "Вашу команду не виконано з невідомої причини."
 
-#, fuzzy
 msgid "That command only works in chats, not IMs."
-msgstr "Ця команда працює лише у розмовах, не у бесідах."
-
-#, fuzzy
+msgstr "Ця команда працює лише у балачках, не у бесідах."
+
 msgid "That command only works in IMs, not chats."
-msgstr "Ця команда працює лише у бесідах, не у розмовах."
+msgstr "Ця команда працює лише у бесідах, не у балачках."
 
 msgid "That command doesn't work on this protocol."
 msgstr "Ця команда не працює з цим протоколом."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
-
-#, fuzzy, c-format
+msgstr "Повідомлення не надіслано, тому що ви не увійшли."
+
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s на %s (%s)"
+msgstr "%s (%s -- %s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s [%s]"
+
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "Користувач пише..."
-
-#, fuzzy
+msgstr ""
+"\n"
+"%s друкує..."
+
 msgid "You have left this chat."
-msgstr "Ви розмовляєте у розмові"
+msgstr "Ви залишили цю балачку"
 
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
+"Облаковий запис від'єднаний і ви вже не у розмові. Ви приєднаєтесь до неї "
+"автоматично, коли обліковий запис перез'єднається."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
+"Ведення журналу розпочалось. Майбутні повідомлення у цій бесіді будуть "
+"записані до нього."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-
-#, fuzzy
+"Ведення журналу зупинене. Майбутні повідомлення у цій бесіді не будуть "
+"записані до нього."
+
 msgid "Send To"
-msgstr "_Надіслати як"
-
-#, fuzzy
+msgstr "Надіслати до"
+
 msgid "Conversation"
-msgstr "Бесіди"
+msgstr "Бесіда"
 
 msgid "Clear Scrollback"
-msgstr ""
-
-#, fuzzy
+msgstr "Очистити прокрутку"
+
 msgid "Show Timestamps"
-msgstr "Час"
-
-#, fuzzy
+msgstr "Показати дату і час"
+
 msgid "Add Buddy Pounce..."
-msgstr "Додати _правило"
-
-#, fuzzy
+msgstr "Додати стеження за контактом..."
+
 msgid "Invite..."
-msgstr "Запросити"
-
-#, fuzzy
+msgstr "Запросити..."
+
 msgid "Enable Logging"
-msgstr "/Параметри/Вести журнал"
-
-#, fuzzy
+msgstr "Увімкнути ведення журналу"
+
 msgid "Enable Sounds"
-msgstr "/Параметри/Відтворювати звуки"
+msgstr "Увімкнути звуки"
 
 #, fuzzy
 msgid "You are not connected."
 msgstr "Не вдається встановити з'єднання"
 
-#, fuzzy
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <АВТО_ВІДПОВІДЬ>: %s\n"
+msgstr "<АВТОВІДПОВІДЬ> "
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Перелік %d користувача:\n"
+msgstr[1] "Перелік %d користувачів:\n"
+msgstr[2] "Перелік %d користувачів:\n"
 
 #, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Підтримувані параметри налагодження: version"
+msgstr "Підтримувані параметри зневадження: version"
 
 msgid "No such command (in this context)."
 msgstr "Немає такої команди (у цьому контексті)."
@@ -701,10 +665,14 @@
 "%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 "
@@ -720,8 +688,8 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;параметр&gt;:  Надіслати різноманітну налагоджувальну інформацію "
-"до поточної бесіди."
+"debug &lt;параметр&gt;:  Надіслати різноманітну інформацію зневадження до "
+"поточної бесіди."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Очищає прокрутку бесіди."
@@ -730,25 +698,25 @@
 msgstr "help &lt;команда&gt;:  Довідка з конкретної команди."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "користувачі: Показати перелік користувачів чату."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "plugins: показати вікно додатків."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "buddylist: показати вікно переліку контактів."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "accounts: показати вікно обікових записів."
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debugwin: показати вікно зневадження."
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs: показати вікно налаштувань."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses: показати вікно savedstatuses."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -757,34 +725,37 @@
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Встановлює "
+"колір для різних класів повідомлень у вікні розмов.<br>    &lt;class&gt;: "
+"receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>ПРИКЛАД:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "Не вдається відкрити файл."
 
 msgid "Debug Window"
-msgstr "Вікно налагодження"
+msgstr "Вікно зневадження"
 
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#, fuzzy
 msgid "Clear"
-msgstr "Закрити"
-
-#, fuzzy
+msgstr "Очистити"
+
 msgid "Filter:"
-msgstr "Помилка"
+msgstr "Фільтр:"
 
 msgid "Pause"
 msgstr "Пауза"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Передавання файлу до %s припинено.\n"
-msgstr[1] "Передавання файлу до %s припинено.\n"
-msgstr[2] "Передавання файлу до %s припинено.\n"
+msgstr[0] "Передавання файлів - %d%% of %d файлу"
+msgstr[1] "Передавання файлів - %d%% of %d файлів"
+msgstr[2] "Передавання файлів - %d%% of %d файлів"
 
 #. Create the window.
 msgid "File Transfers"
@@ -799,9 +770,8 @@
 msgid "Size"
 msgstr "Розмір"
 
-#, fuzzy
 msgid "Speed"
-msgstr "Швидкість:"
+msgstr "Швидкість"
 
 msgid "Remaining"
 msgstr "Залишилось"
@@ -809,18 +779,16 @@
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #. presence
 msgid "Status"
-msgstr "Статус"
+msgstr "Стан"
 
 msgid "Close this window when all transfers finish"
-msgstr ""
-
-#, fuzzy
+msgstr "Закрити вікно, коли завершаться всі передавання"
+
 msgid "Clear finished transfers"
-msgstr "О_чищати завершені передавання"
-
-#, fuzzy
+msgstr "Очищати завершені передавання"
+
 msgid "Stop"
-msgstr "Hiptop"
+msgstr "Зупинити"
 
 msgid "Waiting for transfer to begin"
 msgstr "Очікування початку передачі"
@@ -831,155 +799,148 @@
 msgid "Failed"
 msgstr "Помилка"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f кБ/с"
 
-#, fuzzy
 msgid "Sent"
-msgstr "_Встановити"
-
-#, fuzzy
+msgstr "Надіслані"
+
 msgid "Received"
-msgstr "Надсилання повідомлення"
+msgstr "Отримані"
 
 msgid "Finished"
 msgstr "Завершено"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
-
-#, fuzzy
+msgstr "Файл збережений як %s."
+
 msgid "Sending"
-msgstr "Надіслати"
-
-#, fuzzy
+msgstr "Надсилання"
+
 msgid "Receiving"
-msgstr "Залишилось"
-
-#, fuzzy, c-format
+msgstr "Отримання"
+
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Бесіда з %s"
-
-#, fuzzy, c-format
+msgstr "Бесіда у %s на %s"
+
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Бесіда з %s"
+msgstr "Бесіда з %s на %s"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
+"Системні події будуть записані до журналу тільки поді, коли опція "
+"\"Записувати всі зміни статусу до системного журналу\" увімкнена."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
+"Миттєві повідомлення будуть записані до журналу тільки тоді, коли опція "
+"\"Записувати до журналу всі повідомлення\" увімкнена"
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
+"Балачки будуть записані да журналу тільки тоді, коли опція \"Записувати до "
+"журналу всі балачки\" увімкнена."
 
 msgid "No logs were found"
-msgstr ""
-
-#, fuzzy
+msgstr "Не знайдений жоднен журнал"
+
 msgid "Total log size:"
-msgstr "за розміром журналу"
+msgstr "Загальний розмір журналу:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Прокрутити/Шукати..."
+
+#, c-format
 msgid "Conversations in %s"
-msgstr "Бесіда з %s"
+msgstr "Бесіда в %s"
 
 #, c-format
 msgid "Conversations with %s"
 msgstr "Бесіда з %s"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Бесіди"
+msgstr "Всі бесіди"
 
 msgid "System Log"
 msgstr "Системний журнал"
 
-#, fuzzy
 msgid "Calling..."
-msgstr "Підрахунок..."
+msgstr "Телефоную..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Відповісти"
 
 #. Number of actions
 msgid "Accept"
 msgstr "Прийняти"
 
-#, fuzzy
 msgid "Reject"
-msgstr "Скинути"
+msgstr "Відхилити"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Виклик в прогресі."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Ваш виклик був завершений."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s бажає розпочати аудіосеанс з вами."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s намагається розпочати з вами тип сесії, який не підтримується."
+
 msgid "You have rejected the call."
-msgstr "Ви від'єднались від каналу%s%s"
+msgstr "Ви відхилили дзвінок."
 
 msgid "call: Make an audio call."
-msgstr ""
-
-#, fuzzy
+msgstr "call: зробити голосовий дзвінок."
+
 msgid "Emails"
-msgstr "Ел.пошта"
+msgstr "Ел. пошта"
 
 msgid "You have mail!"
-msgstr ""
-
-#, fuzzy
+msgstr "Ви маєте лист!"
+
 msgid "Sender"
-msgstr "Стать"
+msgstr "Відправник"
 
 msgid "Subject"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Тема"
+
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s має %d нове повідомлення."
-msgstr[1] "%s має %d нових повідомлення."
-msgstr[2] "%s має %d нових повідомлень."
-
-#, fuzzy
+msgstr[0] "%s (%s) має %d нове повідомлення."
+msgstr[1] "%s (%s) має %d нові повідомлення."
+msgstr[2] "%s (%s) має %d нових повідомлень."
+
 msgid "New Mail"
-msgstr "Ел.пошта"
+msgstr "Нова пошта"
 
 #, c-format
 msgid "Info for %s"
-msgstr "Інформація для %s"
+msgstr "Інформація про %s"
 
 msgid "Buddy Information"
 msgstr "Інформація про користувача"
 
-#, fuzzy
 msgid "Continue"
-msgstr "З'єднання"
+msgstr "Продовжити"
 
 msgid "IM"
 msgstr "Повідомлення"
@@ -987,26 +948,23 @@
 msgid "Invite"
 msgstr "Запросити"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(немає імені)"
+msgstr "(немає)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "УІН"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
-
-#, fuzzy
+msgstr "ПОМИЛКА"
+
 msgid "loading plugin failed"
-msgstr "Помилка Ping"
+msgstr "Не вдалося завантажити додаток"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "вивантаження додатку зазнало невдачі"
 
 #, c-format
 msgid ""
@@ -1017,38 +975,42 @@
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"Назва: %s\n"
+"Збірка: %s\n"
+"Опис: %s\n"
+"Автор: %s\n"
+"Адреса в мережі: %s\n"
+"Назва файлу: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "Додаток має бути завантажений до того, як ви зможете налаштувати його."
 
 msgid "No configuration options for this plugin."
-msgstr ""
-
-#, fuzzy
+msgstr "Немає опцій налаштувань для цього додатку."
+
 msgid "Error loading plugin"
-msgstr "Забезпечує підтримку завантаження модулів perl."
+msgstr "Помилка завантаження додатку"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "Вибраний файл не є дійсним додатком."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-
-#, fuzzy
+"Будь ласка, відкрийте вікно зневадження та спробуйте знову, щоб уточнити "
+"повідомлення про помилку."
+
 msgid "Select plugin to install"
-msgstr "Вибір файлу"
-
-#, fuzzy
+msgstr "Виберіть додаток, який необхідно встановити"
+
 msgid "You can (un)load plugins from the following list."
-msgstr "Чи очікуєте авторизацію від наступних користувачів"
+msgstr "Ви можете завантажити чи вивантажити додатки з наступного переліку."
 
 msgid "Install Plugin..."
-msgstr ""
-
-#, fuzzy
+msgstr "Встановити додатки..."
+
 msgid "Configure Plugin"
-msgstr "Налаштувати кімнату"
+msgstr "Налаштування додатків"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1059,127 +1021,106 @@
 msgstr "Параметри"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Введіть користувача для стеження."
+msgstr "Будь ласка, введіть контакт, за яким потрібно стежити."
 
 msgid "New Buddy Pounce"
-msgstr "Нове правило"
+msgstr "Нове правило стеження"
 
 msgid "Edit Buddy Pounce"
-msgstr "Змінити правило"
+msgstr "Редагувати правило стеження"
 
 msgid "Pounce Who"
-msgstr "За ким слідкувати"
+msgstr "За ким стежити"
 
 #. Account:
 msgid "Account:"
 msgstr "Обліковий запис:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "І_м'я користувача:"
+msgstr "Ім'я контакту:"
 
 #. Create the "Pounce When Buddy..." frame.
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "Коли реагувати"
-
-#, fuzzy
+msgstr "Стежити, коли контакт..."
+
 msgid "Signs on"
-msgstr "_Увійшов"
-
-#, fuzzy
+msgstr "Увійшов"
+
 msgid "Signs off"
-msgstr "Ви_йшов"
-
-#, fuzzy
+msgstr "Вийшов"
+
 msgid "Goes away"
-msgstr "при відсутності"
-
-#, fuzzy
+msgstr "Відходить"
+
 msgid "Returns from away"
-msgstr "_Повернувся"
-
-#, fuzzy
+msgstr "Повернувся"
+
 msgid "Becomes idle"
-msgstr "%s має стан бездіяльності"
-
-#, fuzzy
+msgstr "Став бездіяльним"
+
 msgid "Is no longer idle"
-msgstr "%s виходить зі стану бездіяльності."
-
-#, fuzzy
+msgstr "Вже не бездіяльний"
+
 msgid "Starts typing"
-msgstr "Користувач почав _набирати"
-
-#, fuzzy
+msgstr "Починає друкувати"
+
 msgid "Pauses while typing"
-msgstr "Користувач пише..."
-
-#, fuzzy
+msgstr "Припинив друкувати"
+
 msgid "Stops typing"
-msgstr "Користувач припинив н_абирати"
-
-#, fuzzy
+msgstr "Закінчує друкувати"
+
 msgid "Sends a message"
-msgstr "Надіслати пові_домлення"
+msgstr "Надсилає повідомлення"
 
 #. Create the "Action" frame.
-#, fuzzy
 msgid "Action"
-msgstr "Розташування"
-
-#, fuzzy
+msgstr "Дія"
+
 msgid "Open an IM window"
-msgstr "_Відкрити вікно бесіди"
-
-#, fuzzy
+msgstr "Відкрити вікно бесіди"
+
 msgid "Pop up a notification"
-msgstr "Показати _сповіщення"
-
-#, fuzzy
+msgstr "Показати виринаюче сповіщення"
+
 msgid "Send a message"
-msgstr "Надіслати пові_домлення"
-
-#, fuzzy
+msgstr "Надіслати повідомлення"
+
 msgid "Execute a command"
-msgstr "Ви_конати команду"
-
-#, fuzzy
+msgstr "Виконати команду"
+
 msgid "Play a sound"
-msgstr "В_ідтворити звук"
-
-#, fuzzy
+msgstr "Відтворити звук"
+
 msgid "Pounce only when my status is not Available"
-msgstr "Розмова у %s недоступна."
+msgstr "Стежити тільки коли мій статус не \"Відсутній\""
 
 msgid "Recurring"
-msgstr ""
-
-#, fuzzy
+msgstr "Періодичний"
+
 msgid "Cannot create pounce"
-msgstr "Не вдається змінити псевдонім"
+msgstr "Не вдається створити стеження"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "Ви не маєте жодного облікового запису."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ви повинні створити обліковий запис перед тип як створити стеження."
+
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Ви дійсно бажаєте видалити %s?"
-
-#, fuzzy
+msgstr "Ви впевнені, що бажаєте видалити стеження на %s для %s?"
+
 msgid "Buddy Pounces"
-msgstr "Нове правило"
+msgstr "Стеження за контактами"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s починає писати вам (%s)"
-
-#, fuzzy, c-format
+msgstr "%s починає друкувати вам (%s)"
+
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s починає писати вам (%s)"
+msgstr "%s призупинився, коли вам друкував (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1195,7 +1136,7 @@
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s припиняє писати вам (%s)"
+msgstr "%s припиняє друкувати  вам (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
@@ -1209,64 +1150,54 @@
 msgid "%s has gone away. (%s)"
 msgstr "%s відходить. (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s бажає надіслати вам %s (%s)"
+msgstr "%s надіслав нам повідомлення. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
 msgstr "Невідома подія стеження. Сповістіть про це!"
 
 msgid "Based on keyboard use"
-msgstr ""
-
-#, fuzzy
+msgstr "Оснований на використанні клавіатури"
+
 msgid "From last sent message"
-msgstr "C_ontrol-Enter надсилає повідомлення"
+msgstr "З останнього надісланого повідомлення"
 
 msgid "Never"
-msgstr "ніколи"
-
-#, fuzzy
+msgstr "Ніколи"
+
 msgid "Show Idle Time"
-msgstr "Встановити час бездіяльності облікового запису"
-
-#, fuzzy
+msgstr "Показати час бездіяльності"
+
 msgid "Show Offline Buddies"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "Показати контакти, що не в мережі"
+
 msgid "Notify buddies when you are typing"
-msgstr "_Сповіщати користувачів, про те що ви їм пишете"
-
-#, fuzzy
+msgstr "Сповіщати користувачів, коли ви їм пишете"
+
 msgid "Log format"
-msgstr "_Формат журналу:"
+msgstr "Формат журналу"
 
 msgid "Log IMs"
-msgstr ""
-
-#, fuzzy
+msgstr "Записувати повідомлення до журналу"
+
 msgid "Log chats"
-msgstr "Записувати усі _розмови"
+msgstr "Журнал розмов"
 
 msgid "Log status change events"
-msgstr ""
-
-#, fuzzy
+msgstr "Записувати до журналу зміни стану"
+
 msgid "Report Idle time"
-msgstr "Показувати _час бездіяльності"
-
-#, fuzzy
+msgstr "Звітувати про час бездіяльності"
+
 msgid "Change status when idle"
-msgstr "Ав_томатично встановлювати статус \"Відійшов\""
-
-#, fuzzy
+msgstr "Змінювати стан коли бездіяльний"
+
 msgid "Minutes before changing status"
-msgstr "_Хвилин до встановлення статусу \"Відійшов\""
-
-#, fuzzy
+msgstr "Хвилин до зміни стану"
+
 msgid "Change status to"
-msgstr "Змінити адресу на:"
+msgstr "Змінити стан на"
 
 msgid "Conversations"
 msgstr "Бесіди"
@@ -1275,15 +1206,13 @@
 msgstr "Журнали"
 
 msgid "You must fill all the required fields."
-msgstr ""
-
-#, fuzzy
+msgstr "Ви повинні заповнити всі необхідні поля."
+
 msgid "The required fields are underlined."
-msgstr "Не вдається завантажити необхідний модуль %s."
-
-#, fuzzy
+msgstr "Необхідні поля підкреслені."
+
 msgid "Not implemented yet."
-msgstr "Функція не реалізована"
+msgstr "Ще не реалізована."
 
 msgid "Save File..."
 msgstr "Збереження файлу..."
@@ -1291,16 +1220,14 @@
 msgid "Open File..."
 msgstr "Відкривання файлу"
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "Розташування"
+msgstr "Виберіть місцезнаходження..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
-
-#, fuzzy
+msgstr "Натисніть 'Enter' щоб знайти більше кімнат у цій категорії."
+
 msgid "Get"
-msgstr "_Встановити"
+msgstr "Отримати"
 
 #. Create the window.
 msgid "Room List"
@@ -1333,83 +1260,71 @@
 msgid "Others talk in chat"
 msgstr "Інші розмовляють у розмові"
 
-#, fuzzy
 msgid "Someone says your username in chat"
 msgstr "Хтось назвав ваше ім'я у розмові"
 
 msgid "GStreamer Failure"
-msgstr ""
+msgstr "Помилка GStreamer"
 
 msgid "GStreamer failed to initialize."
-msgstr ""
-
-#, fuzzy
+msgstr "Не вдається ініціалізувати GStreamer."
+
 msgid "(default)"
-msgstr "типовий переглядач Gnome"
-
-#, fuzzy
+msgstr "(типовий)"
+
 msgid "Select Sound File ..."
-msgstr "Вибір файлу"
-
-#, fuzzy
+msgstr "Виберіть звуковий файл..."
+
 msgid "Sound Preferences"
-msgstr "Параметри"
-
-#, fuzzy
+msgstr "Налаштування звуку"
+
 msgid "Profiles"
-msgstr "Профіль"
+msgstr "Профілі"
 
 msgid "Automatic"
 msgstr "автоматично"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "сигнал динаміком"
+msgstr "Сигнал динаміком"
 
 msgid "Command"
 msgstr "команда"
 
-#, fuzzy
 msgid "No Sound"
-msgstr "Звуки"
+msgstr "Немає звуку"
 
 msgid "Sound Method"
 msgstr "Метод відтворення звуку"
 
-#, fuzzy
 msgid "Method: "
-msgstr "_Метод:"
-
-#, fuzzy, c-format
+msgstr "Метод: "
+
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"_Команда відтворення:\n"
+"Звукова команда\n"
 "(%s для назви файлу)"
 
 #. Sound options
 msgid "Sound Options"
 msgstr "Параметри звуку"
 
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "Звуки, коли вікно бесіди має _фокус"
-
-#, fuzzy
+msgstr "Звуки, коли вікно бесіди у фокусі"
+
 msgid "Always"
-msgstr "Користувач відійшов"
-
-#, fuzzy
+msgstr "Завжди"
+
 msgid "Only when available"
-msgstr "Недоступний"
-
-#, fuzzy
+msgstr "Тільки коли доступний"
+
 msgid "Only when not available"
-msgstr "Розмова у %s недоступна."
+msgstr "Тільки коли недоступний"
 
 msgid "Volume(0-100):"
-msgstr ""
+msgstr "Гучність (0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1418,9 +1333,8 @@
 msgid "Event"
 msgstr "Подія"
 
-#, fuzzy
 msgid "File"
-msgstr "Помилка"
+msgstr "Файл"
 
 msgid "Test"
 msgstr "Перевірка"
@@ -1431,25 +1345,23 @@
 msgid "Choose..."
 msgstr "Вибрати..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Ви дійсно бажаєте видалити %s?"
-
-#, fuzzy
+msgstr "Ви впевнені, що бажаєте видалити \"%s\""
+
 msgid "Delete Status"
-msgstr "Мережний стан"
-
-#, fuzzy
+msgstr "Видалити стан"
+
 msgid "Saved Statuses"
-msgstr "Статистика сервера"
+msgstr "Збережені стани"
 
 #. title
 #. optional information
 msgid "Title"
-msgstr "Звання"
+msgstr "Назва"
 
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1463,141 +1375,129 @@
 msgstr "Повідомлення:"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "_Застосувати"
-
-#, fuzzy
+msgstr "Використати"
+
 msgid "Invalid title"
-msgstr "Неправильний ідентифікатор авторизації"
-
-#, fuzzy
+msgstr "Невірний заголовок"
+
 msgid "Please enter a non-empty title for the status."
-msgstr "Введіть нову назву для обраної групи."
-
-#, fuzzy
+msgstr "Будь ласка, введіть назву для стану."
+
 msgid "Duplicate title"
-msgstr "Файл публічного ключа"
-
-#, fuzzy
+msgstr "Подвоїти назву"
+
 msgid "Please enter a different title for the status."
-msgstr "Введіть нову назву для обраної групи."
-
-#, fuzzy
+msgstr "Будь ласка, введіть іншу назву для стану."
+
 msgid "Substatus"
-msgstr "Статус"
+msgstr "Підстан"
 
 msgid "Status:"
-msgstr "Статус:"
-
-#, fuzzy
+msgstr "Стан:"
+
 msgid "Message:"
-msgstr "_Повідомлення:"
-
-#, fuzzy
+msgstr "Повідомлення:"
+
 msgid "Edit Status"
-msgstr "Сімейний стан"
+msgstr "Редагувати стан"
 
 msgid "Use different status for following accounts"
-msgstr ""
+msgstr "Використовувати рідний статус для наступних облікових записів"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "Зберегти _та застосувати"
+msgstr "Зберегти та використати"
 
 msgid "Certificates"
-msgstr ""
+msgstr "Сертифікати"
 
 msgid "Sounds"
 msgstr "Звуки"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "Статус"
-
-#, fuzzy
+msgstr "Стани"
+
 msgid "Error loading the plugin."
-msgstr "Забезпечує підтримку завантаження модулів perl."
-
-#, fuzzy
+msgstr "Помилка завантаження додатку."
+
 msgid "Couldn't find X display"
-msgstr "Не вдається надіслати файл"
-
-#, fuzzy
+msgstr "Не вдається знайти дисплей X"
+
 msgid "Couldn't find window"
-msgstr "Не вдається надіслати файл"
+msgstr "Не вдається знайти вікно"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "Додаток не може бути завантажений, тому що зібраний без підтримки X11."
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 msgid "Clipboard plugin"
-msgstr ""
+msgstr "Додаток буферу обміну"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
-
-#, fuzzy, c-format
+"Якщо вміст gnt clipboard зміниться, зробити його доступним для X, якщо це "
+"можливо."
+
+#, c-format
 msgid "%s just signed on"
-msgstr "%s входить"
-
-#, fuzzy, c-format
+msgstr "%s щойно увійшов"
+
+#, c-format
 msgid "%s just signed off"
-msgstr "%s виходить"
-
-#, fuzzy, c-format
+msgstr "%s щойно вийшов"
+
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s бажає надіслати вам файл"
+msgstr "%s надіслав вам повідомлення"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s сказав ваше прізвисько у %s"
+
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "Надіслати пові_домлення"
-
-#, fuzzy
+msgstr "%s надіслав повідомлення у %s"
+
 msgid "Buddy signs on/off"
-msgstr "Користувач не у мережі:"
+msgstr "Користувач увійшов/вийшов"
 
 msgid "You receive an IM"
-msgstr ""
-
-#, fuzzy
+msgstr "Ви отримали повідомлення"
+
 msgid "Someone speaks in a chat"
-msgstr "Хтось назвав ваше ім'я у розмові"
-
-#, fuzzy
+msgstr "Хтось говорить у балачці"
+
 msgid "Someone says your name in a chat"
-msgstr "Хтось назвав ваше ім'я у розмові"
-
+msgstr "Хтось сказав ваше ім'я у балачці"
+
+#, fuzzy
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "Сповіщати то"
 
 msgid "Beep too!"
-msgstr ""
-
+msgstr "Також сигнал динаміком!"
+
+#, fuzzy
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "Встановити підказку \"_ТЕРМІНОВО\" менеджера вікон"
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Додаток Toaster"
+
+#, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "Бесіда з %s"
+msgstr "<b>Бесіда з %s на %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Додаток \"Історії\" потребує \"Ведення журналу\""
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1605,10 +1505,13 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-
-#, fuzzy
+"Ведення журналу може бути увімкнене у Сервіс -> Параметри -> Журнали.\n"
+"\n"
+"Увімкнення журналу для миттєвих повідомлень та/або балачок увімкне історію "
+"для того ж типу розмов."
+
 msgid "GntHistory"
-msgstr "Історія"
+msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Показує записи недавніх бесід у вікнах нових бесід."
@@ -1617,7 +1520,7 @@
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"При відкриванні нової бесіди, цей модуль вставить останню бесіду у поточну "
+"При відкриванні нової бесіди, цей додаток вставить останню бесіду у поточну "
 "бесіду."
 
 #, c-format
@@ -1625,6 +1528,8 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Отримання TinyURL..."
 
 #, c-format
 msgid "TinyURL for above: %s"
@@ -1633,21 +1538,24 @@
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr ""
 
+#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr ""
+msgstr "Створити тільки TinyURL для url-посилань цієї довжини або більше"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Префікс адреси TinyURL (або інший)"
+
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
-
+msgstr "Додаток TinyURL"
+
+#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"Коли отримується повідомлення з URL-посиланням, використовувати TinyURL для "
+"легково копіювання"
 
 msgid "Online"
 msgstr "У мережі"
@@ -1655,77 +1563,69 @@
 msgid "Offline"
 msgstr "Не в мережі"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "Затіняти _бездіяльних користувачів"
-
-#, fuzzy
+msgstr "Контакти в мережі"
+
 msgid "Offline Buddies"
-msgstr "Затіняти _бездіяльних користувачів"
-
-#, fuzzy
+msgstr "Контакти не в мережі"
+
 msgid "Online/Offline"
-msgstr "У мережі з"
+msgstr "В мережі/не в мережі"
 
 msgid "Meebo"
-msgstr ""
-
-#, fuzzy
+msgstr "Meebo"
+
 msgid "No Grouping"
-msgstr "Звуки"
+msgstr "Немає групування"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Вкладені підгрупи"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Вкладені підгрупи (експериментально)"
 
 #, fuzzy
 msgid "Provides alternate buddylist grouping options."
 msgstr "Забезпечує інтеграцію з Ximian Evolution."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: Пошуки рядка в журналі вище."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr ""
-
-#, fuzzy
+msgstr "Додаток \"Останній журнал\"."
+
 msgid "accounts"
-msgstr "Облікові записи"
-
-#, fuzzy
+msgstr "облікові записи"
+
 msgid "Password is required to sign on."
-msgstr "Термін дії паролю вийшов"
+msgstr "Щоб увійти необхідний пароль."
 
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Введіть пароль для %s (%s)"
 
-#, fuzzy
 msgid "Enter Password"
-msgstr "Зміна паролю"
-
-#, fuzzy
+msgstr "Введіть пароль"
+
 msgid "Save password"
-msgstr "Новий пароль"
+msgstr "Зберегти пароль"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Відсутній модуль протоколу для %s"
+msgstr "Відсутній додаток протоколу для %s"
 
 msgid "Connection Error"
 msgstr "Помилка з'єднання"
 
 msgid "New passwords do not match."
-msgstr "Нові паролі не співпадають."
+msgstr "Нові паролі не збігаються."
 
 msgid "Fill out all fields completely."
 msgstr "Заповніть повністю всі поля."
@@ -1759,12 +1659,14 @@
 msgid "Buddies"
 msgstr "Користувачі"
 
-#, fuzzy
 msgid "buddy list"
-msgstr "Список контактів"
-
+msgstr "перелік контактів"
+
+#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
+"Сертифікат, наданий \"%s\", підписаний ним же. Він не може бути перевірений "
+"автоматично."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
@@ -1773,78 +1675,86 @@
 
 #, fuzzy
 msgid "The certificate is not valid yet."
-msgstr "Вказана назва екрану неправильна."
-
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
+
+#, fuzzy
 msgid "The certificate has expired and should not be considered valid."
-msgstr ""
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr ""
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Ви не маєте бази даних кореневих сертифікатів, тому не можливо перевірити "
+"справжність цього сертифікату."
 
 #, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Вказана назва екрану неправильна."
-
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
+
+#, fuzzy
 msgid "The certificate has been revoked."
-msgstr ""
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
 
 #, fuzzy
 msgid "An unknown certificate error occurred."
 msgstr "Невідома помилка підключення: %s"
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(НЕ ЗБІГАЄТЬСЯ)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s надав наступний сертифікат для одноразового використання:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Загальна назва: %s %s\n"
+"Відбиток (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Одностороння перевірка сертифікату"
 
 #. Scheme name
 #. Pool name
+#, fuzzy
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Імпорт сертифікату"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Кеш пірів SSL"
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Прийняти запрошення до розмови?"
+msgstr "Прийняти сертифікат для %s?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Перевірка сертифікату SSL"
 
 msgid "_View Certificate..."
-msgstr ""
-
-#, c-format
+msgstr "_Переглянути сертифікат..."
+
+#, fuzzy, c-format
 msgid "The certificate for %s could not be validated."
-msgstr ""
+msgstr "Набір сертифікатів, що представлений для %s, невірний."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr ""
+msgstr "Полилка SSL сертифікату"
 
 #, fuzzy
 msgid "Unable to validate certificate"
@@ -1866,40 +1776,43 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Загальна назва: %s\n"
+"\n"
+"Відбиток (SHA1): %s\n"
+"\n"
+"Дата активації: %s\n"
+"Чинний до: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "Інформація про профіль"
+msgstr "Інформація про сертифікат"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "Помилка реєстрації"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Помилка реєстрації"
-
-#, fuzzy, c-format
+msgstr "Помилка видалення реєстації"
+
+#, c-format
 msgid "+++ %s signed on"
-msgstr "%s входить"
-
-#, fuzzy, c-format
+msgstr "+++ %s увійшов"
+
+#, c-format
 msgid "+++ %s signed off"
-msgstr "%s виходить"
+msgstr "+++ %s вийшов"
 
 #. Undocumented
 #. Unknown error
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#, fuzzy
 msgid "Unable to send message: The message is too large."
-msgstr "Не вдається відправити повідомлення. Повідомлення завелике."
-
-#, fuzzy, c-format
+msgstr "Не вдається надіслати повідомлення. Повідомлення занадто велике."
+
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "Не вдається відправити повідомлення %s:"
+msgstr "Не вдається надіслати повідомлення до %s."
 
 msgid "The message is too large."
 msgstr "Повідомлення надто довге."
@@ -1910,9 +1823,8 @@
 msgid "Send Message"
 msgstr "Надсилання повідомлення"
 
-#, fuzzy
 msgid "_Send Message"
-msgstr "Надсилання повідомлення"
+msgstr "Надіслати повідомлення"
 
 #, c-format
 msgid "%s entered the room."
@@ -1936,11 +1848,10 @@
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s залишив кімнату (%s)"
-
-#, fuzzy
+msgstr "%s залишив кімнату (%s)."
+
 msgid "Invite to chat"
-msgstr "Створити конференцію"
+msgstr "Запросити до балачки"
 
 #. Put our happy label in it.
 msgid ""
@@ -1950,46 +1861,43 @@
 "Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
 "необов'язковий текст запрошення."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "Не вдається встановити режими каналу для %s"
-
-#, fuzzy, c-format
+msgstr "Не вдається отримати з'єднання: %s"
+
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "Не вдається зберегти зображення: %s\n"
-
-#, fuzzy, c-format
+msgstr "Не вдається отримати ім'я: %s"
+
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Не вдається зберегти зображення: %s\n"
+msgstr "Помилка отримання назви сервера: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-
-#, fuzzy
+msgstr "Сервер D-BUS Purple не запущений з вказаних нижче причин"
+
 msgid "No name"
-msgstr "Вузол пішов"
+msgstr "Немає імені"
 
 #, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "Не вдається створити сокет"
+msgstr "Не вдається створити новий процес резолву"
 
 #, fuzzy
 msgid "Unable to send request to resolver process\n"
 msgstr "Не вдається відправити повідомлення %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
+"Помилка отримання назви вузла %s:\n"
+"%s"
+
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
+msgstr "Помилка отримання назви вузла %s: %d"
 
 #, fuzzy, c-format
 msgid ""
@@ -2003,18 +1911,15 @@
 
 #, fuzzy, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
+msgstr "Помилка отримання назви вузла %s: %d"
+
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "Помилка ідентифікації"
+msgstr "Помилка створення потоку : %s"
 
 #. Data is assumed to be the destination bn
-#, fuzzy
 msgid "Unknown reason"
-msgstr "Помилка невідома."
+msgstr "Невідома причина"
 
 #, c-format
 msgid ""
@@ -2041,7 +1946,7 @@
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "Немає прав на запис до теки."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Не можна відправляти файл розміром 0 байтів."
@@ -2087,13 +1992,13 @@
 msgid "Offering to send %s to %s"
 msgstr "Пропозиція надіслати %s до %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Задовольнити запит передавання файлу %s?"
-
-#, fuzzy, c-format
+msgstr "Починається передавання %s до %s"
+
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Передавання файлу %s  завершено"
+msgstr "Передавання файлу <A HREF=\"file://%s\">%s</A> завершено"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2102,148 +2007,169 @@
 msgid "File transfer complete"
 msgstr "Передавання файлу завершено"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Ви скасували передавання %s"
 
 msgid "File transfer cancelled"
 msgstr "Передавання файлу скасовано"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s скасував передавання %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s скасував передавання файлу"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Передавання файлу до %s припинено.\n"
-
-#, fuzzy, c-format
+msgstr "Невдале передавання файлу до '%s'."
+
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Передавання файлу від %s припинено.\n"
+msgstr "Невдале передавання файлу від %s."
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Запустити команду в терміналі"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "Команда використовується для обробки \"aim\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "Команда використовується для обробки \"gg\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "Команда використовується для обробки \"icq\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "Команда використовується для обробки \"irc\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
+"Команда використовується для обробки \"msnim\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "Команда використовується для обробки \"sip\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
+"Команда використовується для обробки \"xmpp\" URL-адрес, якщо увімкнено"
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
+"Команда використовується для обробки \"ymsgr\" URL-адрес, якщо увімкнено"
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"aim\""
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"gg\""
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"icq\""
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"irc\""
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"msnim\""
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"sip\""
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"xmpp\""
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "Обробник URL-посилань \"ymsgr\""
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"aim\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"gg\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"icq\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"irc\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"msnim\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"sip\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"xmpp\" URL-"
+"посилання"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"Так, якщо команда визначена у \"command\" повина обробляти \"ymsgr\" URL-"
+"посилання"
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Так, якщо команда, що використовується для обробки цього типу URL-посилань, "
+"має бути запущена у терміналі."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"aim\" URL-посилання"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"gg\" URL-посилання"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"icq\" URL-посилання"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"irc\" URL-посилання"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"msnim\" URL-посилання"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"sip\" URL-посилання"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"xmpp\" URL-посилання"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Чи визначена команда повина оброблювати \"ymsgr\" URL-посилання"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -2257,10 +2183,11 @@
 msgstr "звичайний текст"
 
 msgid "Old flat format"
-msgstr ""
-
+msgstr "Старий плоский формат"
+
+#, fuzzy
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "%s був запрошений до цієї бесіди."
 
 msgid "XML"
 msgstr "XML"
@@ -2307,28 +2234,29 @@
 
 #, fuzzy
 msgid "Conference error"
-msgstr "З'єднання розірвано"
-
+msgstr "Помилка конференції."
+
+#, fuzzy
 msgid "Error with your microphone"
-msgstr ""
-
+msgstr "Помилка з мікрофоном."
+
+#, fuzzy
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Помилка з веб-камерою."
+
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Помилка при створенні з'єднання"
-
-#, fuzzy
+msgstr "Помилка створення сеансу: %s"
+
 msgid "Error creating conference."
-msgstr "Помилка при створенні з'єднання"
+msgstr "Помилка створенні конференції."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "Ви використовуєте %s, але додаток потребує %s."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "Додаток не визначив ID."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2336,38 +2264,36 @@
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "Версії ABI не збігаюється %d.%d.x (необхідна %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
+"Додатком не впроваджені всі необхідні функції ((list_icon, login та close)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Не знайдено необхідний модуль %s. Встановіть цей модуль та спробуйте знову."
-
-#, fuzzy
+"Не знайдено необхідний додаток %s. Встановіть цей додаток та спробуйте знову."
+
 msgid "Unable to load the plugin"
-msgstr "Pidgin не вдається завантажити ваш модуль."
+msgstr "Не вдається завантажити додаток"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "Не вдається завантажити необхідний модуль %s."
-
-#, fuzzy
+msgstr "Не вдається завантажити необхідний додаток %s."
+
 msgid "Unable to load your plugin."
-msgstr "Pidgin не вдається завантажити ваш модуль."
+msgstr "Не вдається завантажити ваш додаток."
 
 #, fuzzy, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "Не вдається завантажити необхідний модуль %s."
 
-#, fuzzy
 msgid "Autoaccept"
-msgstr "Прийняти"
+msgstr "Прийняти автоматично"
 
 #, fuzzy
 msgid "Auto-accept file transfer requests from selected users."
@@ -2377,15 +2303,17 @@
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Задовольнити запит передавання файлу %s?"
 
+#, fuzzy
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "Незавершено"
 
 #, fuzzy, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Задовольнити запит передавання файлу %s?"
 
+#, fuzzy
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "Автоматично приймати передачі файлів..."
 
 msgid "_Save"
 msgstr "З_берегти"
@@ -2394,48 +2322,45 @@
 msgstr "_Скасувати"
 
 msgid "Ask"
-msgstr ""
-
-#, fuzzy
+msgstr "Запитати"
+
 msgid "Auto Accept"
-msgstr "Прийняти"
-
-#, fuzzy
+msgstr "Автоматично прийняти"
+
 msgid "Auto Reject"
-msgstr "Автоматичне перез'єднання"
-
-#, fuzzy
+msgstr "Автоматично відхилити"
+
 msgid "Autoaccept File Transfers..."
-msgstr "Передавання файлів"
+msgstr "Автоматично приймати передачі файлів..."
 
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-
-#, fuzzy
+"Шлях де зберігати файли\n"
+"(Будь ласка, вкажіть повний шлях)"
+
 msgid "Automatically reject from users not in buddy list"
-msgstr "Дозволити лише користувачам зі списку контактів"
+msgstr "Автоматично відхилити від користувачів, які не в переліку контактів"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Виберіть сервер конференцій для опитування"
-
-#, fuzzy
+msgstr "Створити нову теку для кожного користувача"
+
 msgid "Notes"
 msgstr "Примітки"
 
+#, fuzzy
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Нижче введіть інформацію про особу."
 
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Редагувати нотатки..."
 
 #. *< major version
 #. *< minor version
@@ -2445,9 +2370,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "Користувачі"
+msgstr "Примітки користувача"
 
 #. *< name
 #. *< version
@@ -2455,9 +2379,8 @@
 msgstr ""
 
 #. *< summary
-#, fuzzy
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Додати користувача у список контактів"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2466,7 +2389,7 @@
 #. *< priority
 #. *< id
 msgid "Cipher Test"
-msgstr ""
+msgstr "Тест шифра"
 
 #. *< name
 #. *< version
@@ -2482,14 +2405,14 @@
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr ""
+msgstr "Приклад DBus"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr ""
+msgstr "Приклад додатку DBus"
 
 #. *< type
 #. *< ui_requirement
@@ -2497,9 +2420,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "Керування Pidgin з файлу"
+msgstr "Керування файлів"
 
 #. *< name
 #. *< version
@@ -2524,18 +2446,17 @@
 msgstr "_Встановити"
 
 msgid "None of your accounts are idle."
-msgstr ""
+msgstr "Жоден з ваши облікових записів не бездіяльний."
 
 #, fuzzy
 msgid "Unset Account Idle Time"
 msgstr "Встановити час бездіяльності облікового запису"
 
-#, fuzzy
 msgid "_Unset"
-msgstr "_Застосувати"
+msgstr "_Зняти"
 
 msgid "Set Idle Time for All Accounts"
-msgstr ""
+msgstr "Встановити час бездіяння для всіх облікових записів"
 
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr ""
@@ -2557,14 +2478,14 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Перевірочний модуль підтримки IPC у якості клієнта."
+msgstr "Перевірочний додаток підтримки IPC у якості клієнта."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Перевірочний модуль підтримки IPC у якості клієнта. Визначає розташування "
+"Перевірочний додаток підтримки IPC у якості клієнта. Визначає розташування "
 "серверного модуля та викликає зареєстровані команди."
 
 #. *< type
@@ -2580,12 +2501,12 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Перевірочний модуль підтримки IPC у якості сервера."
+msgstr "Перевірочний додаток підтримки IPC у якості сервера."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Перевірочний модуль підтримки IPC у якості сервера. Реєструє команди IPC."
+"Перевірочний додаток підтримки IPC у якості сервера. Реєструє команди IPC."
 
 #, fuzzy
 msgid "Hide Joins/Parts"
@@ -2599,7 +2520,7 @@
 msgstr ""
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Застосувати правила приховування для контакту"
 
 #. *< type
 #. *< ui_requirement
@@ -2607,8 +2528,9 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#, fuzzy
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "Приховування вікна бесід"
 
 #. *< name
 #. *< version
@@ -2627,22 +2549,21 @@
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
 msgid "(UTC)"
-msgstr ""
-
-#, fuzzy
+msgstr "(UTC)"
+
 msgid "User is offline."
-msgstr "Користувач не у мережі"
+msgstr "Користувач не в мережі."
 
 #, fuzzy
 msgid "Auto-response sent:"
-msgstr "Автоматичне перез'єднання"
-
-#, fuzzy, c-format
+msgstr "%s надіслав вам повідомлення"
+
+#, c-format
 msgid "%s has signed off."
-msgstr "%s виходить (%s)"
+msgstr "%s вийшов."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "Одне або декілька повідомлень можуть дути недоставлені."
 
 msgid "You were disconnected from the server."
 msgstr "Вас було роз'єднано з сервером."
@@ -2651,6 +2572,7 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
+"Ви зараз роз'єднані. Повідомлення не будуть доставлені, поки ви не увійдете."
 
 #, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -2658,53 +2580,49 @@
 
 #, fuzzy
 msgid "Message could not be sent."
-msgstr "Ваше повідомлення Yahoo! не відправлено."
+msgstr "Неможливо запустити Brasero"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
-msgstr ""
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Fire"
-msgstr "Firefox"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Messenger Plus!"
-msgstr "Повідомлення від %s"
+msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "Надсилання повідомлення"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr ""
+msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "aMSN"
-msgstr "MSN"
+msgstr "aMSN"
 
 #. Add general preferences.
 #, fuzzy
@@ -2712,15 +2630,15 @@
 msgstr "Параметри значка лотка"
 
 msgid "Fast size calculations"
-msgstr ""
-
+msgstr "Швидке обчислення розміру"
+
+#, fuzzy
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Введіть назву групи"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "_Шукати:"
+msgstr "Тека з журналами"
 
 #. *< type
 #. *< ui_requirement
@@ -2728,9 +2646,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "Сервер входу"
+msgstr "Оглядач журналів"
 
 #. *< name
 #. *< version
@@ -2747,19 +2664,18 @@
 "at your own risk!"
 msgstr ""
 
-#, fuzzy
 msgid "Mono Plugin Loader"
-msgstr "Завантажувач модулів Tcl"
+msgstr "Завантажувач додатка Mono"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ""
-
+msgstr "Завантажує додаток .NET з Mono."
+
+#, fuzzy
 msgid "Add new line in IMs"
-msgstr ""
-
-#, fuzzy
+msgstr "Додати новий рядок у розмові"
+
 msgid "Add new line in Chats"
-msgstr "Псевдонім розмови"
+msgstr "Додати новий рядок у розмові"
 
 #. *< magic
 #. *< major version
@@ -2770,9 +2686,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "нове вікно"
+msgstr "Новий рядок"
 
 #. *< name
 #. *< version
@@ -2786,29 +2701,35 @@
 "the username in the conversation window."
 msgstr ""
 
+#, fuzzy
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Нове повідомлення"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
-
+msgstr "Зберегти повідомлення, надіслані користувачеві, як стеження."
+
+#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
+"Решта повідомлень будуть збережені як стеження. Ви можете редагувати/"
+"видалити стеження з діалогу \"Стеження за контактами\""
 
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-
-#, fuzzy
+"\"%s\" зараз не в мережі. Ви хочете зберегти решту повідомлення в стеження "
+"та автоматично надіслати його, коли \"%s\" повернеться?"
+
 msgid "Offline Message"
-msgstr "Не у мережі "
+msgstr "Повідомлення, коли не в мережі"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
+"Ви можете редагувати/видалити стеження з діалогу \"Стеження за контактами\"\""
 
 msgid "Yes"
 msgstr "Так"
@@ -2817,14 +2738,14 @@
 msgstr "Ні"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Зберегти повідомлення не в мережі в стеження"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "Не питати. Завжди зберегти в стеження."
 
 #, fuzzy
 msgid "One Time Password"
-msgstr "Зміна паролю"
+msgstr "Введіть пароль для %s (%s)"
 
 #. *< type
 #. *< ui_requirement
@@ -2833,7 +2754,7 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Підтримка One Time Password"
 
 #. *< name
 #. *< version
@@ -2855,16 +2776,17 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Завантажувач модулів Perl"
+msgstr "Завантажувач додатків Perl"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Забезпечує підтримку завантаження модулів perl."
-
+msgstr "Забезпечує підтримку завантаження додатків perl."
+
+#, fuzzy
 msgid "Psychic Mode"
-msgstr ""
+msgstr "Неправильний режим"
 
 msgid "Psychic mode for incoming conversation"
 msgstr ""
@@ -2873,6 +2795,8 @@
 "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, and Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr ""
@@ -2881,16 +2805,15 @@
 msgid "Only enable for users on the buddy list"
 msgstr "Дозволити лише користувачам зі списку контактів"
 
-#, fuzzy
 msgid "Disable when away"
-msgstr "%s відходить"
+msgstr "Вимкнути, коли відійшов"
 
 msgid "Display notification message in conversations"
 msgstr ""
 
 #, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Вікна бесід"
+msgstr "Кількість бесід у вікні"
 
 #. *< type
 #. *< ui_requirement
@@ -2915,7 +2838,7 @@
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "Простий модуль"
+msgstr "Простий додаток"
 
 #. *< name
 #. *< version
@@ -2926,7 +2849,7 @@
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "Сертифікати X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -2992,9 +2915,9 @@
 msgid "%s is no longer idle."
 msgstr "%s виходить зі стану бездіяльності."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed on."
-msgstr "%s входить (%s)"
+msgstr "%s увійшов."
 
 msgid "Notify When"
 msgstr "Коли сповіщати"
@@ -3007,7 +2930,7 @@
 
 #, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "Користувач входить у мережу"
+msgstr "Користувач увійшов/вийшов"
 
 #. *< type
 #. *< ui_requirement
@@ -3016,7 +2939,7 @@
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Повідомлення про стан користувача"
+msgstr "Сповіщення про стан користувача"
 
 #. *< name
 #. *< version
@@ -3026,14 +2949,14 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Повідомляє у вікні бесід коли користувач відходить або повертається, входить "
+"Сповіщає у вікні бесід коли користувач відходить або повертається, входить "
 "чи виходить зі стану бездіяльний."
 
 msgid "Tcl Plugin Loader"
-msgstr "Завантажувач модулів Tcl"
+msgstr "Завантажувач додатків Tcl"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Забезпечує підтримку модулів на мові Tcl"
+msgstr "Забезпечує підтримку додатків на мові Tcl"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -3053,25 +2976,21 @@
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 
-#, fuzzy
 msgid "First name"
-msgstr "Ім'я:"
-
-#, fuzzy
+msgstr "Ім'я"
+
 msgid "Last name"
-msgstr "Прізвище:"
+msgstr "Прізвище"
 
 #. email
 msgid "Email"
 msgstr "Ел.пошта"
 
-#, fuzzy
 msgid "AIM Account"
-msgstr "Додавання облікового запису"
-
-#, fuzzy
+msgstr "Обліковий запис AIM"
+
 msgid "XMPP Account"
-msgstr "Обліковий запис"
+msgstr "Обліковий запис XMPP"
 
 #. *< type
 #. *< ui_requirement
@@ -3083,45 +3002,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Bonjour Protocol Plugin"
-msgstr "Модуль протоколу Yahoo"
+msgstr "Додаток протоколу Bonjour"
 
 #, fuzzy
 msgid "Purple Person"
 msgstr "Нова особа"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Район"
+msgstr "Локальний порт"
 
 msgid "Bonjour"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bonjour"
+
+#, c-format
 msgid "%s has closed the conversation."
 msgstr "%s закрив вікно бесіди."
 
-#, fuzzy
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Не вдається відправити повідомлення. Повідомлення завелике."
+msgstr "Не вдається відправити повідомлення, розмова не може бути розпочата."
 
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
-msgstr "Не вдається створити сокет"
+msgstr ""
+"Не вдається створити сокет:\n"
+"%s"
 
 #, fuzzy, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Не вдається створити сокет"
+msgstr "ПОМИЛКА: неможливо відкрити TCP-порт"
 
 #, fuzzy, c-format
 msgid "Unable to listen on socket: %s"
-msgstr "Не вдається створити сокет"
+msgstr ""
+"Не вдається створити сокет:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "Помилка зв'язку з сервером"
+msgstr "Помилка зв'язку сервером. З'єднання закривається."
 
 msgid "Invalid proxy settings"
 msgstr "Неправильні параметри проксі"
@@ -3134,64 +3054,60 @@
 
 #, fuzzy
 msgid "Token Error"
-msgstr "Невідома помилка"
+msgstr "Помилка з'єднання"
 
 #, fuzzy
 msgid "Unable to fetch the token.\n"
 msgstr "Не вдається завантажити перелік кімнат."
 
-#, fuzzy
 msgid "Save Buddylist..."
-msgstr "Надсилання списку контактів"
+msgstr "Збереження переліку контактів..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 
-#, fuzzy
 msgid "Buddylist saved successfully!"
-msgstr "Пароль успішно змінено"
-
-#, fuzzy, c-format
+msgstr "Перелік контактів успішно збережений!"
+
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Не вдається імпортувати список контактів з сервера"
+msgstr ""
 
 #, fuzzy
 msgid "Couldn't load buddylist"
-msgstr "Не вдається експортувати список контактів"
-
-#, fuzzy
+msgstr "Завантажити перелік контактів з файлу..."
+
 msgid "Load Buddylist..."
-msgstr "_Псевдонім користувача..."
-
-#, fuzzy
+msgstr "Завантаження переліку контактів..."
+
 msgid "Buddylist loaded successfully!"
-msgstr "Пароль успішно змінено"
+msgstr "Перелік контактів успішно завантажений!"
 
 #, fuzzy
 msgid "Save buddylist..."
-msgstr "Надсилання списку контактів"
-
-#, fuzzy
+msgstr "Збереження переліку контактів..."
+
 msgid "Load buddylist from file..."
-msgstr "Імпортувати список контактів з сервера"
-
+msgstr "Завантажити перелік контактів з файлу..."
+
+#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr ""
+msgstr "Заповніть повністю всі поля."
 
 #, fuzzy
 msgid "Passwords do not match"
-msgstr "Нові паролі не співпадають."
+msgstr "Нові паролі не збігаються."
 
 #, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не вдається створити нове з'єднання."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
+msgstr "Зареєстрований новий обліковий запис Gadu-Gadu"
 
 #, fuzzy
 msgid "Registration completed successfully!"
-msgstr "Реєстрацію завершено успішно"
+msgstr "Перелік контактів успішно збережений!"
 
 msgid "Password"
 msgstr "Пароль"
@@ -3200,31 +3116,30 @@
 msgstr "Пароль (ще раз)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "Введіть текст captcha"
 
 #, fuzzy
 msgid "Captcha"
-msgstr "Збереження зображення"
-
-#, fuzzy
+msgstr "Зображення Captcha"
+
 msgid "Register New Gadu-Gadu Account"
-msgstr "Зареєструвати новий обліковий запис Jabber"
+msgstr "Зареєструвати новий обліковий запис Gadu-Gadu"
 
 msgid "Please, fill in the following fields"
-msgstr ""
+msgstr "Будь ласка, заповніть наступні поля"
 
 msgid "City"
 msgstr "Місто"
 
 msgid "Year of birth"
-msgstr ""
+msgstr "Рік народження"
 
 #. gender
 msgid "Gender"
 msgstr "Стать"
 
 msgid "Male or female"
-msgstr ""
+msgstr "Чоловік чи жінка"
 
 #. 0
 msgid "Male"
@@ -3233,23 +3148,21 @@
 msgid "Female"
 msgstr "Жінка"
 
-#, fuzzy
 msgid "Only online"
-msgstr "У мережі"
-
-#, fuzzy
+msgstr "Тільки коли в мережі"
+
 msgid "Find buddies"
-msgstr "Затіняти _бездіяльних користувачів"
+msgstr "Знайти контакти"
 
 #, fuzzy
 msgid "Please, enter your search criteria below"
 msgstr "Введіть новий пароль"
 
 msgid "Fill in the fields."
-msgstr ""
+msgstr "Заповніть поля"
 
 msgid "Your current password is different from the one that you specified."
-msgstr ""
+msgstr "Ваш поточний пароль і той, який ви ввели відрізняються."
 
 #, fuzzy
 msgid "Unable to change password. Error occurred.\n"
@@ -3261,23 +3174,21 @@
 
 #, fuzzy
 msgid "Password was changed successfully!"
-msgstr "Пароль успішно змінено"
-
-#, fuzzy
+msgstr "Пароль було змінено."
+
 msgid "Current password"
-msgstr "Неправильний пароль."
-
-#, fuzzy
+msgstr "Поточний пароль"
+
 msgid "Password (retype)"
-msgstr "Пароль відправлено"
+msgstr "Пароль (передрукуйте)"
 
 #, fuzzy
 msgid "Enter current token"
-msgstr "%s наразі не у мережі."
+msgstr "поточна тема : %s"
 
 #, fuzzy
 msgid "Current token"
-msgstr "Наразі на"
+msgstr "Поточний пароль"
 
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
@@ -3285,15 +3196,14 @@
 
 #, fuzzy
 msgid "Change Gadu-Gadu Password"
-msgstr "Не вдається змінити пароль Gadu-Gadu"
-
-#, fuzzy, c-format
+msgstr "Заміна паролю для %s:"
+
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Видалити розмову зі списку контактів"
-
-#, fuzzy
+msgstr "Вибрати розмову для контакту: %s"
+
 msgid "Add to chat..."
-msgstr "Додати _розмову"
+msgstr "Додати до розмови..."
 
 #. Global
 msgid "Available"
@@ -3303,10 +3213,10 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 msgid "Away"
-msgstr "Користувач відійшов"
+msgstr "Відійшов"
 
 msgid "UIN"
-msgstr "УІН"
+msgstr "UIN"
 
 #. first name
 msgid "First Name"
@@ -3320,27 +3230,24 @@
 msgstr "Не вдається запросити користувача (%s)."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#, fuzzy
+msgstr "Публічний каталог Gadu-Gadu"
+
 msgid "Search results"
 msgstr "Результати пошуку"
 
-#, fuzzy
 msgid "No matching users found"
-msgstr "Невідповідні вузли"
+msgstr "Не знайдені користувачі зі збігами"
 
 #, fuzzy
 msgid "There are no users matching your search criteria."
 msgstr "Введіть новий пароль"
 
-#, fuzzy
 msgid "Unable to read from socket"
-msgstr "Не вдається прочитати сокет"
+msgstr "Не вдається прочитати з сокету"
 
 #, fuzzy
 msgid "Buddy list downloaded"
-msgstr "Користувач бездіяльний:"
+msgstr "Завантаження списку контактів"
 
 #, fuzzy
 msgid "Your buddy list was downloaded from the server."
@@ -3348,42 +3255,37 @@
 
 #, fuzzy
 msgid "Buddy list uploaded"
-msgstr "Відображення користувачів"
-
-#, fuzzy
+msgstr "Завантаження списку контактів"
+
 msgid "Your buddy list was stored on the server."
-msgstr "Список контактів, що зберігається на сервері Gadu-Gadu."
+msgstr "Ваш перелік контактів був збережений на сервері."
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
 msgid "Connected"
-msgstr "З'єднатися"
+msgstr "З'єднаний"
 
 msgid "Connection failed"
 msgstr "Не вдається встановити з'єднання"
 
-#, fuzzy
 msgid "Add to chat"
-msgstr "Додати розмову"
-
-#, fuzzy
+msgstr "Додати до розмови"
+
 msgid "Chat _name:"
-msgstr "Прізвище:"
+msgstr "Прізвисько:"
 
 #, fuzzy, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Не вдається перевірити доступність сервера"
+msgstr "Не вдається з'єднатися з %s: %s"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
 msgstr "З'єднання"
 
-#, fuzzy
 msgid "Chat error"
-msgstr "Помилка читання"
+msgstr "Помилка розмови"
 
 #, fuzzy
 msgid "This chat name is already in use"
@@ -3391,31 +3293,26 @@
 
 #, fuzzy
 msgid "Not connected to the server"
-msgstr "Вас було роз'єднано з сервером."
-
-#, fuzzy
+msgstr "З'єднано з сервером з: %s"
+
 msgid "Find buddies..."
-msgstr "Затіняти _бездіяльних користувачів"
-
-#, fuzzy
+msgstr "Знайти контакти..."
+
 msgid "Change password..."
 msgstr "Змінити пароль..."
 
 #, fuzzy
 msgid "Upload buddylist to Server"
-msgstr "Експортувати список контактів на сервер"
-
-#, fuzzy
+msgstr "Не вдається з'єднатися з сервером."
+
 msgid "Download buddylist from Server"
-msgstr "Видалити список контактів з сервера"
-
-#, fuzzy
+msgstr "Звантажити перелік контактів з сервера"
+
 msgid "Delete buddylist from Server"
-msgstr "Видалити список контактів з сервера"
-
-#, fuzzy
+msgstr "Видалити перелік контактів з сервера"
+
 msgid "Save buddylist to file..."
-msgstr "Надсилання списку контактів"
+msgstr "Зберегти перелік контактів у файл..."
 
 #. magic
 #. major_version
@@ -3429,19 +3326,17 @@
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Модуль протоколу Gadu-Gadu"
+msgstr "Додаток протоколу Gadu-Gadu"
 
 #. summary
 msgid "Polish popular IM"
-msgstr ""
-
-#, fuzzy
+msgstr "Відомий польський IM"
+
 msgid "Gadu-Gadu User"
-msgstr "Пошукова система Gadu-Gadu"
-
-#, fuzzy
+msgstr "Користувач Gadu-Gadu"
+
 msgid "GG server"
-msgstr "Встановити інформацію про користувача..."
+msgstr "Сервер GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3454,13 +3349,12 @@
 msgid "No topic is set"
 msgstr "Тему не встановлено"
 
-#, fuzzy
 msgid "File Transfer Failed"
-msgstr "Передавання файлу скасовано"
+msgstr "Не вдалося передати файл"
 
 #, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Pidgin не вдається відрити порт для прослуховування."
+msgstr "Неможливо відкрити потік чи перелік програвання"
 
 msgid "Error displaying MOTD"
 msgstr "Помилка відображення MOTD"
@@ -3484,7 +3378,7 @@
 #. TODO: do we really want to disconnect on a failure to write?
 #, fuzzy, c-format
 msgid "Lost connection with server: %s"
-msgstr "Вас було роз'єднано з сервером."
+msgstr "Втрата з'єднання з сервером"
 
 msgid "View MOTD"
 msgstr "Переглянути MOTD"
@@ -3506,13 +3400,13 @@
 msgstr "Не вдається з'єднатись"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy, c-format
+msgstr "Не вдається з'єднатися: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Помилка при створенні з'єднання"
+msgstr "Сервер закрив з'єднання"
 
 msgid "Users"
 msgstr "Користувачі"
@@ -3529,11 +3423,11 @@
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "Модуль протоколу IRC"
+msgstr "Додаток протоколу IRC"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Найменш поганий модуль протоколу IRC ....."
+msgstr "Найменш поганий додаток протоколу IRC ....."
 
 #. host to connect to
 msgid "Server"
@@ -3547,7 +3441,7 @@
 msgstr "Кодування"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "Автоматично виявляти вхідні повідомлення з UTF-8"
 
 msgid "Real name"
 msgstr "Справжнє ім'я"
@@ -3556,24 +3450,22 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#, fuzzy
 msgid "Use SSL"
-msgstr "SSL"
+msgstr "Використовувати SSL"
 
 msgid "Bad mode"
 msgstr "Неправильний режим"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Заборонений на %s %s'ом, встановлений %s тому"
+
+#, c-format
 msgid "Ban on %s"
-msgstr "Не вдається приєднатись %s:"
-
-#, fuzzy
+msgstr "Заборонений на %s"
+
 msgid "End of ban list"
-msgstr "Відсутній у списку"
+msgstr "Кінець переліку заборонених"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3598,9 +3490,8 @@
 msgid "Currently on"
 msgstr "Наразі на"
 
-#, fuzzy
 msgid "Idle for"
-msgstr "Бездіяльний"
+msgstr "Без дії"
 
 msgid "Online since"
 msgstr "У мережі з"
@@ -3610,15 +3501,15 @@
 msgstr "<br><b>Визначальний прикметник:</b> Славний<br>"
 
 msgid "Glorious"
-msgstr ""
+msgstr "Чудовий"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s змінив тему на: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s змінив тему на: %s"
+msgstr "%s видалив тему."
 
 #, c-format
 msgid "The topic for %s is: %s"
@@ -3682,15 +3573,14 @@
 msgstr "режим (%s %s) встановлено %s"
 
 msgid "Invalid nickname"
-msgstr "Неправильне прізвисько"
-
-#, fuzzy
+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 "
@@ -3702,13 +3592,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Такий файл вже існує"
-
-#, fuzzy
+msgstr "Прізвисько \"%s\" вже існує."
+
 msgid "Nickname in use"
-msgstr "Прізвисько"
+msgstr "Прізвисько використовується"
 
 msgid "Cannot change nick"
 msgstr "Не вдається змінити псевдонім"
@@ -3727,9 +3616,9 @@
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Відповідь PING -- затримка: %lu секунд"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Вимагається реєстрація"
+msgstr "Неможливо приєднатися до %s: необхідна реєстрація."
 
 msgid "Cannot join channel"
 msgstr "Не вдається приєднатись до каналу"
@@ -3753,17 +3642,16 @@
 "повідомлення не задане, видалити повідомлення про відсутність."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
-
-#, fuzzy
+msgstr "ctcp <nick> <msg>: надсилає ctcp msg до контакту."
+
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]:  Надіслати серверу команду без обробки."
+msgstr "chanserv: Надіслати команду до chanserv"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;прізвисько1&gt; [прізвисько2] ...:  Забрати у користувача статус "
+"deop &lt;прізвисько1&gt; [прізвисько2] ...:  Забрати у користувача стан "
 "оператора каналу. Для цього необхідно бути оператором каналу."
 
 msgid ""
@@ -3771,7 +3659,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;прізвисько1&gt; [прізвисько2] ...:  Забрати у користувача статус "
+"devoice &lt;прізвисько1&gt; [прізвисько2] ...:  Забрати у користувача стан "
 "голосу на каналі, позбавивши його можливості говорити, якщо канал "
 "модерований (+m). Для цього необхідно бути оператором каналу."
 
@@ -3813,9 +3701,8 @@
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;дія для виконання&gt;:  Виконати дію."
 
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]:  Надіслати серверу команду без обробки."
+msgstr "memoserv: Надіслати команду до memoserv"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3835,11 +3722,10 @@
 msgstr "names [канал]:  Вивести перелік присутніх на каналі користувачів."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;нове прізвисько&gt;:  Змінити власний псевдонім."
-
-#, fuzzy
+msgstr "nick &lt;нове прізвисько&gt;:  Змінити власне прізвисько."
+
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]:  Надіслати серверу команду без обробки."
+msgstr "nickserv: Надіслати команду до nickserv"
 
 #, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
@@ -3910,7 +3796,7 @@
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Встановити або зняти режим користувача."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [nick]: надіслана запитана користувачем CTCP VERSION"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
@@ -3953,11 +3839,10 @@
 
 #, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Команда відключена"
-
-#, fuzzy
+msgstr "Вашу команду не виконано з невідомої причини."
+
 msgid "execute"
-msgstr "Не передбачено"
+msgstr "виконати"
 
 #, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
@@ -3988,45 +3873,40 @@
 msgid "SASL authentication failed"
 msgstr "Ідентифікація завершилась невдало"
 
-#, fuzzy
 msgid "Invalid response from server"
-msgstr "Недопустима відповідь від сервера."
+msgstr "Неправильна відповідь від сервера"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не використовує жодного підтримуваного методу ідентифікації"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Ви вимагаєте шифрування, але на сервері воно не відсутнє."
 
 msgid "Invalid challenge from server"
 msgstr "Неправильний запит з серверу"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Помилка читання"
+msgstr "Помилка SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Менеджер з'єднань BOSH припинив вашу сесію."
+
 msgid "No session ID given"
-msgstr "Причина не вказана."
-
-#, fuzzy
+msgstr "Не вказаний ID сеансу"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Непідтримувана версія"
-
-#, fuzzy
+msgstr "Непідтримувана версія протоколу BOSH"
+
 msgid "Unable to establish a connection with the server"
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
-#, fuzzy, c-format
+msgstr "Не вдається встановити з'єднання з сервером"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
-#, fuzzy
+msgstr "Не вдається встановити з'єднання з сервером: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Не вдається створити нове з'єднання."
+msgstr "Не вдається створити з'єднання SSL"
 
 msgid "Full Name"
 msgstr "Повне ім'я"
@@ -4084,41 +3964,35 @@
 msgid "Description"
 msgstr "Опис"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "Змінити картку Jabber "
+msgstr "Редагувати vCard XMPP"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "Всі наступні елементи є необов'язковими. Заповнюйте на власний розсуд."
 
-#, fuzzy
 msgid "Client"
-msgstr "Місто"
-
-#, fuzzy
+msgstr "Клієнт"
+
 msgid "Operating System"
-msgstr "Приховувати операційну систему"
-
-#, fuzzy
+msgstr "Операційна система"
+
 msgid "Local Time"
-msgstr "Локальний файл:"
-
-#, fuzzy
+msgstr "Місцевий час"
+
 msgid "Priority"
-msgstr "Порт"
+msgstr "Перевага"
 
 msgid "Resource"
 msgstr "Ресурс"
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s тому"
+
 msgid "Logged Off"
-msgstr "Не у мережі"
+msgstr "Вийшов"
 
 msgid "Middle Name"
 msgstr "Прізвище"
@@ -4142,7 +4016,7 @@
 msgstr "Ви видаляєте %s зі списку контактів. Бажаєте продовжити?"
 
 msgid "Cancel Presence Notification"
-msgstr "Скасувати повідомлення про присутність"
+msgstr "Скасувати сповіщення про присутність"
 
 msgid "Un-hide From"
 msgstr "Показатися для"
@@ -4161,32 +4035,34 @@
 msgid "Initiate _Chat"
 msgstr "Почати _розмову"
 
-#, fuzzy
 msgid "Log In"
 msgstr "Вхід"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "Не у мережі"
-
+msgstr "Вихід"
+
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "Готовий розмовляти"
 
 msgid "Extended Away"
-msgstr "Розширений статус \"Відійшов\""
+msgstr "Розширений стан \"Відійшов\""
 
 msgid "Do Not Disturb"
 msgstr "Не турбувати"
 
 msgid "JID"
-msgstr ""
+msgstr "JID"
 
 #. last name
 msgid "Last Name"
 msgstr "Прізвище"
 
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "Наступне є наслідком вашого пошуку"
 
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
@@ -4196,17 +4072,17 @@
 
 #, fuzzy
 msgid "Directory Query Failed"
-msgstr "Не вдається створити пряме з'єднання"
+msgstr "Помилка встановлення віддаленого з'єднання"
 
 #, fuzzy
 msgid "Could not query the directory server."
-msgstr "Не вдається розпочати передавання файлу"
+msgstr "Сервер не зміг отримати доступ до каталогу"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, fuzzy, c-format
 msgid "Server Instructions: %s"
-msgstr "Інформація про сервер"
+msgstr "Неправильний сервер"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
@@ -4214,29 +4090,25 @@
 msgid "Email Address"
 msgstr "Адреса ел.пошти"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "_Шукати:"
+msgstr "Шукати XMPP користувачів"
 
 #. "Search"
 msgid "Search"
 msgstr "Шукати"
 
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "Недопустима помилка"
-
-#, fuzzy
+msgstr "Невірна тека"
+
 msgid "Enter a User Directory"
-msgstr "Не можна відправляти каталог."
+msgstr "Введіть каталог користувача"
 
 #, fuzzy
 msgid "Select a user directory to search"
 msgstr "Виберіть сервер конференцій для опитування"
 
-#, fuzzy
 msgid "Search Directory"
-msgstr "_Шукати:"
+msgstr "Каталог пошуку"
 
 msgid "_Room:"
 msgstr "_Кімната:"
@@ -4288,7 +4160,7 @@
 
 #, fuzzy
 msgid "Error retrieving room list"
-msgstr "Помилка завантаження списку кімнат"
+msgstr "Не вдається отримати список кімнат"
 
 msgid "Invalid Server"
 msgstr "Неправильний сервер"
@@ -4302,45 +4174,40 @@
 msgid "Find Rooms"
 msgstr "Знайти кімнати"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Псевдонім:"
-
-#, fuzzy
+msgstr "Зв'язки:"
+
 msgid "No users found"
-msgstr "Невідповідні вузли"
-
-#, fuzzy
+msgstr "Не знайдено жодного користувача"
+
 msgid "Roles:"
-msgstr "Посада"
+msgstr "Ролі:"
 
 #, fuzzy
 msgid "Ping timed out"
-msgstr "звичайний текст"
+msgstr "Вийшов час очікування з'єднання"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
 
-#, fuzzy
 msgid "Invalid XMPP ID"
-msgstr "Неправильний ID"
+msgstr "Невірний XMPP ID"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
-
-#, fuzzy
+msgstr "Невірний XMPP ID. Має бути вказаний домен."
+
 msgid "Malformed BOSH URL"
-msgstr "Не вдається з'єднатися з сервером."
+msgstr "Підробна BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Реєстрація %s@%s завершена успішно"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Реєстрація %s@%s завершена успішно"
+msgstr "Реєстрація до %s завершена успішно"
 
 msgid "Registration Successful"
 msgstr "Реєстрацію завершено успішно"
@@ -4352,18 +4219,15 @@
 msgid "Registration from %s successfully removed"
 msgstr "Реєстрація %s@%s завершена успішно"
 
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "Реєстрацію завершено успішно"
-
-#, fuzzy
+msgstr "Успішне видалення реєстрації"
+
 msgid "Unregistration Failed"
-msgstr "Реєстрація завершилась невдало"
+msgstr "Невдале видалення реєтрації"
 
 msgid "State"
 msgstr "Область"
 
-#, fuzzy
 msgid "Postal code"
 msgstr "Поштовий індекс"
 
@@ -4376,9 +4240,8 @@
 msgid "Already Registered"
 msgstr "Вже зареєстровано"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "Зареєструвати"
+msgstr "Видалити реєстрацію"
 
 #, fuzzy
 msgid ""
@@ -4388,9 +4251,8 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "Заповніть наступні поля для реєстрації нового облікового запису."
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "Зареєструвати новий обліковий запис Jabber"
+msgstr "Зареєструвати новий обліковий запис XMPP"
 
 msgid "Register"
 msgstr "Зареєструвати"
@@ -4401,7 +4263,7 @@
 
 #, fuzzy, c-format
 msgid "Register New Account at %s"
-msgstr "Зареєструвати новий обліковий запис Jabber"
+msgstr "Перевірити наявність нової версії під час запуску"
 
 #, fuzzy
 msgid "Change Registration"
@@ -4411,15 +4273,15 @@
 msgid "Error unregistering account"
 msgstr "Помилка зміни інформації про обліковий запис"
 
+#, fuzzy
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "Перелік контактів успішно збережений!"
 
 msgid "Initializing Stream"
 msgstr "Ініціалізація потоку"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Ініціалізація потоку"
+msgstr "Ініціалізація SSL/TLS"
 
 msgid "Authenticating"
 msgstr "Ідентифікація"
@@ -4428,7 +4290,7 @@
 msgstr "Повторна ініціалізація потоку"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Сервер не підтримує блокування"
 
 msgid "Not Authorized"
 msgstr "Не авторизований"
@@ -4438,7 +4300,7 @@
 msgstr "Настрій"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "Зараз слухаю"
 
 msgid "Both"
 msgstr "Обидві"
@@ -4455,50 +4317,56 @@
 msgid "None (To pending)"
 msgstr "Немає (для очікування)"
 
+#. 0
 msgid "None"
-msgstr "немає"
+msgstr "Немає"
 
 #. subscription type
 msgid "Subscription"
 msgstr "Підписка"
 
-#, fuzzy
 msgid "Mood Text"
 msgstr "Настрій"
 
 #, fuzzy
 msgid "Allow Buzz"
-msgstr "Дозволити"
-
+msgstr "Дозволити гостьовий доступ"
+
+#, fuzzy
 msgid "Tune Artist"
-msgstr ""
+msgstr "Ім'я виконавця"
 
 #, fuzzy
 msgid "Tune Title"
-msgstr "Звання"
-
+msgstr "Невірний заголовок"
+
+#, fuzzy
 msgid "Tune Album"
-msgstr ""
-
+msgstr "Назва альбому"
+
+#, fuzzy
 msgid "Tune Genre"
-msgstr ""
+msgstr "Жанр станції:"
 
 #, fuzzy
 msgid "Tune Comment"
 msgstr "Коментар користувача"
 
+#, fuzzy
 msgid "Tune Track"
-msgstr ""
+msgstr "Назва доріжки"
 
 #, fuzzy
 msgid "Tune Time"
-msgstr "Час"
-
+msgstr "Час відповіді"
+
+#, fuzzy
 msgid "Tune Year"
-msgstr ""
-
+msgstr "Рік народження"
+
+#, fuzzy
 msgid "Tune URL"
-msgstr ""
+msgstr "URL профілю"
 
 msgid "Password Changed"
 msgstr "Пароль змінено"
@@ -4509,9 +4377,8 @@
 msgid "Error changing password"
 msgstr "Помилка зміни паролю"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "Зміна паролю"
+msgstr "Змінити пароль XMPP"
 
 msgid "Please enter your new password"
 msgstr "Введіть новий пароль"
@@ -4524,9 +4391,8 @@
 msgstr "Змінити пароль..."
 
 #. }
-#, fuzzy
 msgid "Search for Users..."
-msgstr "_Шукати:"
+msgstr "Шукати користувачів..."
 
 msgid "Bad Request"
 msgstr "Неправильний запит"
@@ -4549,9 +4415,8 @@
 msgid "Item Not Found"
 msgstr "Елемент не знайдено"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Неправильний Jabber ID"
+msgstr "Підробний XMPP ID"
 
 msgid "Not Acceptable"
 msgstr "Недопустимо"
@@ -4680,29 +4545,29 @@
 msgid "Unable to ban user %s"
 msgstr "Не вдається заборонити користувача %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Невідома команда: %s"
-
-#, fuzzy, c-format
+msgstr "Невідомі приєднання: \"%s\""
+
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Не вдається запросити користувача (%s)."
-
-#, fuzzy, c-format
+msgstr "Не вдалося приєднати користувача %s як \"%s\""
+
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Невідома команда: %s"
-
-#, fuzzy, c-format
+msgstr "Невідома роль: \"%s\""
+
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Не вдається відправити повідомлення: %s"
+msgstr "Не вдається встановити роль \"%s\" для користувача: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не вдається видалити користувача %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Не вдається заборонити користувача %s"
+msgstr "Не вдається послати ping користувачу %s"
 
 #, fuzzy, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
@@ -4730,7 +4595,7 @@
 
 #, fuzzy, c-format
 msgid "%s has buzzed you!"
-msgstr "Користувач заблокував вас"
+msgstr "%s збуджує вас!"
 
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4748,7 +4613,7 @@
 
 #, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Реєстрація завершилась невдало"
+msgstr "Помилка встановлення віддаленого з'єднання"
 
 #, fuzzy, c-format
 msgid ""
@@ -4758,13 +4623,12 @@
 "Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
 "переглянути."
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "Вибір файлу"
+msgstr "Виберіть ресурс"
 
 #, fuzzy
 msgid "Initiate Media"
-msgstr "Почати _розмову"
+msgstr "Імпортування медіа"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Налаштувати кімнату."
@@ -4802,7 +4666,8 @@
 
 #, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;кімната&gt; [сервер]:  приєднатися до цього сервера."
+msgstr ""
+"join &lt;канал&gt; [&lt;пароль&gt;]:  Приєднатися до розмови у цій мережі"
 
 #, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
@@ -4831,28 +4696,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "Модуль протоколу MSN"
+msgstr "Додаток протоколу XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "Румунська"
+msgstr "Домен"
 
 msgid "Require SSL/TLS"
-msgstr ""
-
-#, fuzzy
+msgstr "Потребує SSL/TLS"
+
 msgid "Force old (port 5223) SSL"
-msgstr "Примусово використовувати старий SSL"
+msgstr "Примусово старий (порт 5223) SSL"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Дозволити ідентифікацію звичайним текстом через нешифровані потоки"
 
-#, fuzzy
 msgid "Connect port"
-msgstr "З'єднатися"
+msgstr "Порт для з'єднання"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
@@ -4860,22 +4721,20 @@
 msgid "Connect server"
 msgstr "З'єднатися з сервером"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "Порт передавання файлів"
+msgstr "Проксі передавання файлів"
 
 msgid "BOSH URL"
 msgstr ""
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Показати подробиці про користувача"
-
-#, fuzzy, c-format
+msgstr "Показати нетипові смайли"
+
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s закрив вікно бесіди."
+msgstr "%s залишив розмову."
 
 #, c-format
 msgid "Message from %s"
@@ -4893,13 +4752,12 @@
 msgid "Message delivery to %s failed: %s"
 msgstr "Не вдається доставити повідомлення для %s: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Помилка повідомлення Jabber"
-
-#, fuzzy, c-format
+msgstr "Помилка повідомлення XMPP"
+
+#, c-format
 msgid "(Code %s)"
-msgstr " (Код %s)"
+msgstr "(Код %s)"
 
 msgid "XML Parse error"
 msgstr "Помилка аналізу XML"
@@ -4925,33 +4783,30 @@
 "Ви створюєте нову кімнату. Бажаєте налаштувати її або прийняти типові "
 "параметри?"
 
-#, fuzzy
 msgid "_Configure Room"
-msgstr "Налаштувати кімнату"
+msgstr "_Налаштувати кімнату"
 
 #, fuzzy
 msgid "_Accept Defaults"
-msgstr "Прийняти типові параметри"
-
-#, fuzzy
+msgstr "Автоматично прийняти"
+
 msgid "No reason"
-msgstr "Причина не вказана."
+msgstr "Причина не вказана"
 
 #, fuzzy, c-format
 msgid "You have been kicked: (%s)"
 msgstr "Ви були видалені оператором %s: (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Видалений оператором %s (%s)"
+msgstr "Викинутий (%s)"
 
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Помилка при відкриванні файлу."
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "Передавання файлу скасовано"
+msgstr "Передавання було закрито."
 
 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -4964,19 +4819,17 @@
 msgid "File Send Failed"
 msgstr "Не вдається відправити файл"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Не вдається відправити повідомлення %s:"
-
-#, fuzzy, c-format
+msgstr "Не вдалося надіслати файл до %s, невірний JID"
+
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+msgstr "Не вдалося надіслати файл до %s, користувач не в мережі"
 
 #, fuzzy, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr ""
-"Не вдається надіслати файл до %s, користувач не підтримує прийом файлів"
+msgstr "Не вдалося надіслати файл до %s, ..."
 
 #, fuzzy, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
@@ -4984,45 +4837,37 @@
 "Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
 "переглянути."
 
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "Режими користувача"
+msgstr "Редагувати настрій користувача"
 
 msgid "Please select your mood from the list."
-msgstr ""
-
-#, fuzzy
+msgstr "Будь ласка, виберіть ваш настрій з переліку."
+
 msgid "Set"
-msgstr "_Встановити"
-
-#, fuzzy
+msgstr "Встановити"
+
 msgid "Set Mood..."
-msgstr "Збереження файлу..."
-
-#, fuzzy
+msgstr "Встановити настрій..."
+
 msgid "Set User Nickname"
-msgstr "Встановити межу кількості користувачів"
-
-#, fuzzy
+msgstr "Встановити прізвисько користувача"
+
 msgid "Please specify a new nickname for you."
-msgstr "Введіть нову назву для обраної групи."
+msgstr "Будь ласка, визначте для себе нове прізвисько."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "Прізвисько"
-
-#, fuzzy
+msgstr "Встановити прізвисько..."
+
 msgid "Actions"
-msgstr "Облікові записи"
-
-#, fuzzy
+msgstr "Дії"
+
 msgid "Select an action"
-msgstr "Вибір файлу"
+msgstr "Вибрати дію"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
@@ -5031,13 +4876,11 @@
 msgid "Unable to add \"%s\"."
 msgstr "Не вдається додати \"%s\"."
 
-#, fuzzy
 msgid "Buddy Add error"
-msgstr "Помилка списку контактів"
-
-#, fuzzy
+msgstr "Помилка додавання контакту"
+
 msgid "The username specified does not exist."
-msgstr "Вказана назва екрану неправильна."
+msgstr "Визначене ім'я користувача не існує."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5063,9 +4906,9 @@
 msgid "Unable to parse message"
 msgstr "Не вдається розібрати повідомлення"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Синтаксична помилка (можливо, помилка у Pidgin)"
+msgstr "Синтаксична помилка (можливо, помилка клієнта)"
 
 #, c-format
 msgid "Invalid email address"
@@ -5079,19 +4922,19 @@
 msgid "Fully qualified domain name missing"
 msgstr "Пропущено повну назву домену"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Already logged in"
-msgstr "Вже у мережі"
-
-#, fuzzy, c-format
+msgstr "Вже увійшов"
+
+#, c-format
 msgid "Invalid username"
 msgstr "Неправильне ім'я користувача"
 
 #, fuzzy, c-format
 msgid "Invalid friendly name"
-msgstr "Неправильне дружнє ім'я"
-
-#, fuzzy, c-format
+msgstr "Неправильна назва кімнати"
+
+#, c-format
 msgid "List full"
 msgstr "Список повний"
 
@@ -5145,7 +4988,7 @@
 
 #, fuzzy, c-format
 msgid "Notify transfer failed"
-msgstr "Не вдається передати сповіщення"
+msgstr "Помилка встановлення віддаленого з'єднання"
 
 #, c-format
 msgid "Required fields missing"
@@ -5161,7 +5004,7 @@
 
 #, fuzzy, c-format
 msgid "Service temporarily unavailable"
-msgstr "Служба тимчасово недоступна"
+msgstr "Користувач тимчасово недоступний"
 
 #, c-format
 msgid "Database server error"
@@ -5193,7 +5036,7 @@
 
 #, fuzzy, c-format
 msgid "Peer notification server down"
-msgstr "Сервер сповіщення вимкнений"
+msgstr "Сервер вимкнений (залиште корабель)"
 
 #, c-format
 msgid "Database connect error"
@@ -5269,7 +5112,7 @@
 
 #, fuzzy
 msgid "Passport account suspended"
-msgstr "Паспортний обліковий запис ще не підтверджений"
+msgstr "Ваш обліковий запис наразі заблокований."
 
 #, c-format
 msgid "Bad ticket"
@@ -5283,13 +5126,12 @@
 msgid "MSN Error: %s\n"
 msgstr "Помилка MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Уподобаний контакт"
+msgstr "Інші контакти"
 
 #, fuzzy
 msgid "Non-IM Contacts"
-msgstr "Видалити контакт"
+msgstr "Ви отримали повідомлення"
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
@@ -5312,19 +5154,18 @@
 msgstr ""
 
 msgid "Nudge"
-msgstr ""
+msgstr "Штовхнути ліктем"
 
 #, fuzzy, c-format
 msgid "%s has nudged you!"
-msgstr "%s відходить."
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#, fuzzy
+msgstr "Штовхаю ліктем %s..."
+
 msgid "Email Address..."
-msgstr "Адреса ел.пошти"
+msgstr "Адреса електронної пошти..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше нове дружнє ім'я MSN занадто довге."
@@ -5363,7 +5204,7 @@
 
 #, fuzzy, c-format
 msgid "Blocked Text for %s"
-msgstr "Коментар користувача для %s"
+msgstr "Введіть пароль для %s (%s)"
 
 msgid "No text is blocked for this account."
 msgstr ""
@@ -5383,26 +5224,22 @@
 msgstr "Сторінка"
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "Граю у гру"
+
 msgid "Working"
-msgstr "Попередити"
+msgstr "Працюю"
 
 msgid "Has you"
-msgstr ""
-
-#, fuzzy
+msgstr "Має вас"
+
 msgid "Home Phone Number"
-msgstr "Ввести номер домашнього телефону"
-
-#, fuzzy
+msgstr "Номер домашнього телефону"
+
 msgid "Work Phone Number"
-msgstr "Ввести номер робочого телефону"
-
-#, fuzzy
+msgstr "Номер робочого телефону"
+
 msgid "Mobile Phone Number"
-msgstr "Ввести номер мобільного телефону"
+msgstr "Номер мобільного телефону"
 
 msgid "Be Right Back"
 msgstr "Незабаром повернусь"
@@ -5410,11 +5247,9 @@
 msgid "Busy"
 msgstr "Зайнятий"
 
-#, fuzzy
 msgid "On the Phone"
 msgstr "Розмовляю по телефону"
 
-#, fuzzy
 msgid "Out to Lunch"
 msgstr "Відійшов на обід"
 
@@ -5424,59 +5259,52 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
-msgstr "Адреса"
+msgstr "Виконавець"
 
 msgid "Album"
-msgstr ""
-
-#, fuzzy
+msgstr "Альбом"
+
 msgid "Game Title"
-msgstr "Звання"
-
-#, fuzzy
+msgstr "Назва гри"
+
 msgid "Office Title"
-msgstr "Звання"
+msgstr "Назва офісу"
 
 #, fuzzy
 msgid "Set Friendly Name..."
-msgstr "Ввести дружнє ім'я"
-
-#, fuzzy
+msgstr "Введіть ваше дружнє ім'я."
+
 msgid "Set Home Phone Number..."
-msgstr "Ввести номер домашнього телефону"
-
-#, fuzzy
+msgstr "Встановити номер домашнього телефону..."
+
 msgid "Set Work Phone Number..."
-msgstr "Ввести номер робочого телефону"
-
-#, fuzzy
+msgstr "Встановити номер робочого телефону..."
+
 msgid "Set Mobile Phone Number..."
-msgstr "Ввести номер мобільного телефону"
+msgstr "Встановити номер мобільного телефону..."
 
 #, fuzzy
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Дозволити/заборонити мобільні пристрої"
+msgstr "Ввімкнути/вимкнути підтримку проксі"
 
 #, fuzzy
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Дозволити/заборонити мобільні сторінки"
+msgstr "Увімкнути мобільні сторінки MSN?"
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "Переглянути заблокований текст..."
 
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "Відкрити скриньку вхідних Hotmail"
 
 msgid "Send to Mobile"
 msgstr "Відправити на мобільний"
 
-#, fuzzy
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"Для MSN необхідна підтримка SSL. Встановіть підтримувану бібліотеку SSL. За "
-"додатковою інформацією звертайтесь на http://Pidgin.sf.net/faq-ssl.php"
+"Для MSN необхідна підтримка SSL. Будь ласка, встановіть підтримувану "
+"бібліотеку SSL."
 
 #, fuzzy, c-format
 msgid ""
@@ -5487,7 +5315,6 @@
 "неправильний. Ідентифікатори користувачів повинні містити лише літери, числа "
 "та пробіли, або містити лише цифри."
 
-#, fuzzy
 msgid "Unable to Add"
 msgstr "Не вдається додати"
 
@@ -5495,21 +5322,19 @@
 msgstr "Повідомлення із запитом авторизації"
 
 msgid "Please authorize me!"
-msgstr "Будь-ласка, авторизуйте мене!"
+msgstr "Будь ласка, авторизуйте мене!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#, fuzzy
 msgid "_OK"
-msgstr "Гаразд"
+msgstr "_Гаразд"
 
 msgid "Error retrieving profile"
 msgstr "Помилка зчитування профілю"
 
-#, fuzzy
 msgid "General"
-msgstr "Стать"
+msgstr "Загальне"
 
 msgid "Age"
 msgstr "Вік"
@@ -5532,77 +5357,68 @@
 msgid "Marital Status"
 msgstr "Сімейний стан"
 
-#, fuzzy
 msgid "Interests"
-msgstr "Вст_авити"
-
-#, fuzzy
+msgstr "Зацікавленості"
+
 msgid "Pets"
-msgstr "Порти"
-
-#, fuzzy
+msgstr "Домашні тварини"
+
 msgid "Hometown"
-msgstr "Вузол невідомий"
+msgstr "Місто проживання"
 
 msgid "Places Lived"
-msgstr ""
+msgstr "Місця, де жив"
 
 msgid "Fashion"
-msgstr ""
+msgstr "Мода"
 
 msgid "Humor"
-msgstr ""
+msgstr "Гумор"
 
 msgid "Music"
-msgstr ""
+msgstr "Музика"
 
 msgid "Favorite Quote"
 msgstr "Улюблена цитата"
 
-#, fuzzy
 msgid "Contact Info"
-msgstr "Дані про обліковий запис"
-
-#, fuzzy
+msgstr "Інформація контакту"
+
 msgid "Personal"
-msgstr "Особиста веб-сторінка"
-
+msgstr "Особисте"
+
+#, fuzzy
 msgid "Significant Other"
-msgstr ""
-
-#, fuzzy
+msgstr "Інші контакти"
+
 msgid "Home Phone"
-msgstr "Домашня сторінка"
-
-#, fuzzy
+msgstr "Домашній телефон"
+
 msgid "Home Phone 2"
-msgstr "Ввести номер домашнього телефону"
+msgstr "Домашній телефон 2"
 
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#, fuzzy
 msgid "Personal Mobile"
-msgstr "Особиста веб-сторінка"
-
-#, fuzzy
+msgstr "Особистий мобільний"
+
 msgid "Home Fax"
-msgstr "Домашня сторінка"
-
-#, fuzzy
+msgstr "Домашній факс"
+
 msgid "Personal Email"
-msgstr "Особиста веб-сторінка"
+msgstr "Особиста електронна адреса"
 
 #, fuzzy
 msgid "Personal IM"
-msgstr "Особиста веб-сторінка"
+msgstr "Надіслати повідомлення.."
 
 msgid "Anniversary"
-msgstr ""
+msgstr "Річниця"
 
 #. Business
 msgid "Work"
-msgstr ""
+msgstr "Робота"
 
 msgid "Job Title"
 msgstr "Назва роботи"
@@ -5613,42 +5429,36 @@
 msgid "Department"
 msgstr "Департамент"
 
-#, fuzzy
 msgid "Profession"
-msgstr "Перебіг"
-
-#, fuzzy
+msgstr "Фах"
+
 msgid "Work Phone"
-msgstr "Телефон"
-
-#, fuzzy
+msgstr "Робочий телефон"
+
 msgid "Work Phone 2"
-msgstr "Ввести номер робочого телефону"
+msgstr "Робочий телефон 2"
 
 msgid "Work Address"
 msgstr "Робоча адреса"
 
-#, fuzzy
 msgid "Work Mobile"
-msgstr "Відправити на мобільний"
-
-#, fuzzy
+msgstr "Робочий мобільний"
+
 msgid "Work Pager"
-msgstr "Веб-сторінка"
+msgstr "Робочий пейджер"
 
 msgid "Work Fax"
-msgstr ""
-
-#, fuzzy
+msgstr "Робочий номер факсу"
+
 msgid "Work Email"
-msgstr "Ел.пошта"
-
+msgstr "Робоча адреса ел. пошти"
+
+#, fuzzy
 msgid "Work IM"
-msgstr ""
-
-#, fuzzy
+msgstr "Надіслати повідомлення.."
+
 msgid "Start Date"
-msgstr "Область"
+msgstr "Дата початку"
 
 msgid "Favorite Things"
 msgstr "Улюблені речі"
@@ -5679,9 +5489,8 @@
 "Pidgin не вдається знайти інформацію про профіль користувача. Швидше за все "
 "користувач не існує."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "Не допускається не у мережі"
+msgstr "Переглянути профіль в тенетах"
 
 #. *< type
 #. *< ui_requirement
@@ -5692,20 +5501,17 @@
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Модуль протоколу Novell GroupWise Messenger"
+msgstr "Додаток протоколу Windows Live Messenger"
 
 msgid "Use HTTP Method"
 msgstr "Використовувати метод HTTP"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "Перевірочний сервер IPC"
-
-#, fuzzy
+msgstr "Метод сервера HTTP"
+
 msgid "Show custom smileys"
-msgstr "Показати подробиці про користувача"
+msgstr "Показати нетипові смайли"
 
 #, fuzzy
 msgid "nudge: nudge a user to get their attention"
@@ -5721,31 +5527,30 @@
 
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s бажає надіслати вам файл"
+msgstr "%s надіслав нам повідомлення. (%s)"
 
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Невідома помилка"
-
-#, fuzzy
+msgstr "Невідома помилка (%d): %s"
+
 msgid "Unable to add user"
-msgstr "Не вдається заборонити користувача %s"
+msgstr "Не вдається додати користувача"
 
 #. Unknown error!
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "Невідома помилка"
+msgstr "Невідома помилка (%d)"
 
 #, fuzzy
 msgid "Unable to remove user"
-msgstr "Не вдається заборонити користувача %s"
-
-#, fuzzy
+msgstr "Не вдається додати користувача"
+
 msgid "Mobile message was not sent because it was too long."
-msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
+msgstr ""
+"Повідомлення на мобільний не було надіслано, тому що воно занадто довге"
 
 #, c-format
 msgid ""
@@ -5801,21 +5606,20 @@
 msgid "Reading error"
 msgstr "Помилка читання"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"Невідома помилка від сервера %s (%s):\n"
+"Помилка з'єднання з сервером %s:\n"
 "%s"
 
 #, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "Цей протокол не підтримується сервером."
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "Помилка розбору HTTP."
+msgstr "Помилка розбору HTTP"
 
 #, fuzzy
 msgid "You have signed on from another location"
@@ -5836,7 +5640,7 @@
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Список контактів MSN тимчасово недоступний. Зачекайте, та пізніше спробуйте "
+"Перелік контактів MSN тимчасово недоступний. Зачекайте, та пізніше спробуйте "
 "ще раз."
 
 msgid "Handshaking"
@@ -5886,9 +5690,9 @@
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Неможливо надіслати повідомлення через помилку зв'язку:"
 
-#, fuzzy
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Неможливо надіслати повідомлення, тому що користувач не у мережі:"
+msgstr ""
+"Повідомлення не може бути надіслане, тому що ми надсилаємо занадто часто:"
 
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
@@ -5902,24 +5706,21 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Неможливо надіслати повідомлення через невідому помилку:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Додати до адресної книги"
-
-#, fuzzy
+msgstr "Видалити контакт з адресної книги?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Бажаєте додати цей контакт у список контактів?"
-
-#, fuzzy
+msgstr "Ви бажаєте також видалити цей контакт з адресної книги?"
+
 msgid "The username specified is invalid."
-msgstr "Вказана назва екрану неправильна."
+msgstr "Вказане ім'я користувача неправильне."
 
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Дружнє ім'я змінюється занадто швидко"
 
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "Обліковий запис Hotmail може бути неактивним."
 
 msgid "Profile URL"
 msgstr "URL профілю"
@@ -5934,9 +5735,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "Модуль протоколу AIM/ICQ"
+msgstr "Додаток протоколу MSN"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5963,7 +5763,7 @@
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "Не вдається додати %s, тому що список контактів повний."
+msgstr "Не вдається додати %s, тому що перелік контактів повний."
 
 #, c-format
 msgid "%s is not a valid passport account."
@@ -5971,21 +5771,64 @@
 
 #, fuzzy
 msgid "Service Temporarily Unavailable."
-msgstr "Служба тимчасово недоступна"
+msgstr "Користувач тимчасово недоступний"
 
 msgid "Unable to rename group"
-msgstr "Не вдається перейменувати групу"
+msgstr "Не вдається змінити назву групи"
 
 msgid "Unable to delete group"
 msgstr "Не вдається видалити групу"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "Користувач %s бажає додати %s до власного списку контактів."
-
-#, fuzzy, c-format
+msgstr "%s додав вас до своєї адресної книги."
+
+#, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "Користувач %s бажає додати %s до власного списку контактів."
+msgstr "%s вилучив вас зі своєї адресної книги."
+
+#. 1
+msgid "Angry"
+msgstr "Розлючений"
+
+#. 2
+msgid "Excited"
+msgstr "Схвильований"
+
+#. 3
+#, fuzzy
+msgid "Grumpy"
+msgstr "Група"
+
+#. 4
+msgid "Happy"
+msgstr "Щасливий"
+
+#. 5
+msgid "In Love"
+msgstr "Закоханий"
+
+#. 6
+msgid "Invincible"
+msgstr "Непереможний"
+
+#. 7
+msgid "Sad"
+msgstr "Сумний"
+
+#. 8
+#, fuzzy
+msgid "Hot"
+msgstr "В_узол:"
+
+#. 9
+#, fuzzy
+msgid "Sick"
+msgstr "Прізвисько"
+
+#. 10
+msgid "Sleepy"
+msgstr "Сонливий"
 
 #. show current mood
 #, fuzzy
@@ -5995,13 +5838,37 @@
 #. add all moods to list
 #, fuzzy
 msgid "New Mood"
-msgstr "Режими користувача"
+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 - неправильний."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Ключ SecurID - неправильний."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+#, fuzzy
+msgid "The two PINs you entered do not match."
+msgstr "Нові паролі не збігаються."
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "Ключ SecurID - неправильний."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
 
 #. show error to user
@@ -6020,7 +5887,7 @@
 #. pin
 #, fuzzy
 msgid "PIN"
-msgstr "УІН"
+msgstr "UIN"
 
 msgid "Verify PIN"
 msgstr ""
@@ -6037,11 +5904,11 @@
 #. mobile number
 #, fuzzy
 msgid "Mobile Number"
-msgstr "Ввести номер мобільного телефону"
+msgstr "Номер мобільного телефону"
 
 #, fuzzy
 msgid "Update your Profile"
-msgstr "Встановити профіль"
+msgstr "Профіль користувача"
 
 msgid "Here you can update your MXit profile"
 msgstr ""
@@ -6055,7 +5922,7 @@
 
 #, fuzzy
 msgid "About"
-msgstr "Про Pidgin"
+msgstr "Про мене"
 
 #. display / change mood
 #, fuzzy
@@ -6070,39 +5937,48 @@
 #. display splash-screen
 #, fuzzy
 msgid "View Splash..."
-msgstr "Переглянути _журнал"
+msgstr "Переглянути журнал..."
 
 #. display plugin version
 #, fuzzy
 msgid "About..."
-msgstr "Про Pidgin"
+msgstr "Про мене"
 
 #. the file is too big
 #, fuzzy
 msgid "The file you are trying to send is too large!"
 msgstr "Повідомлення надто довге."
 
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+#, fuzzy
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
+"спробуйте ще."
 
 #, fuzzy
 msgid "Logging In..."
-msgstr "Журнали"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Не вдається з'єднатись з сервером. Введіть адресу сервера, з яким ви бажаєте "
-"з'єднатись."
+msgstr "Входжу"
+
+#, fuzzy
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Pidgin неспроможний з'єднатися з сервером списку контактів. Пізніше "
+"спробуйте ще."
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "З'єднання"
 
+#, fuzzy
+msgid "The nick name you entered is invalid."
+msgstr "Ключ SecurID - неправильний."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Ключ SecurID - неправильний."
+
 #. mxit login name
 msgid "MXit Login Name"
 msgstr ""
@@ -6115,10 +5991,11 @@
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
-msgstr "Зареєструвати новий обліковий запис Jabber"
-
+msgstr "Зареєструвати новий обліковий запис XMPP"
+
+#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr ""
+msgstr "Будь ласка, заповніть наступні поля"
 
 #. no reply from the WAP site
 #, fuzzy
@@ -6168,7 +6045,7 @@
 #. ask for input
 #, fuzzy
 msgid "Enter Security Code"
-msgstr "Зміна паролю"
+msgstr "Введіть код"
 
 #, fuzzy
 msgid "Your Country"
@@ -6190,9 +6067,12 @@
 msgid "Retrieving User Information..."
 msgstr "Інформація про сервер"
 
+msgid "Loading menu..."
+msgstr ""
+
 #, fuzzy
 msgid "Status Message"
-msgstr "Надсилання повідомлення"
+msgstr "Надіслані повідомлення"
 
 #, fuzzy
 msgid "Hidden Number"
@@ -6200,7 +6080,7 @@
 
 #, fuzzy
 msgid "Your Mobile Number..."
-msgstr "Ввести номер мобільного телефону"
+msgstr "Встановити номер мобільного телефону..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6210,7 +6090,7 @@
 
 #, fuzzy
 msgid "Connect via HTTP"
-msgstr "З'єднання"
+msgstr "З'єднання по TCP"
 
 msgid "Enable splash-screen popup"
 msgstr ""
@@ -6223,33 +6103,50 @@
 #. packet could not be queued for transmission
 #, fuzzy
 msgid "Message Send Error"
-msgstr "Помилка повідомлення Jabber"
+msgstr "Помилка повідомлення XMPP"
 
 #, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Не вдається перевірити доступність сервера"
+msgstr "Не вдається отримати назву вузла"
 
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
 
 #, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Номер телефон"
+msgstr "Успішно приєднатись до Qun"
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
 
 #, fuzzy
 msgid "Message Error"
-msgstr "Помилка повідомлення Jabber"
+msgstr "Помилка повідомлення XMPP"
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Невідома помилка підключення: %s"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Помилка SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Помилка SASL: %s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Помилка з'єднання"
 
 #, fuzzy
 msgid "Message Sending Error"
-msgstr "Помилка повідомлення Jabber"
+msgstr "Помилка повідомлення XMPP"
 
 #, fuzzy
 msgid "Status Error"
@@ -6257,11 +6154,11 @@
 
 #, fuzzy
 msgid "Mood Error"
-msgstr "Невідома помилка"
+msgstr "Помилка значка"
 
 #, fuzzy
 msgid "Invitation Error"
-msgstr "Помилка реєстрації"
+msgstr "Помилка видалення реєстації"
 
 #, fuzzy
 msgid "Contact Removal Error"
@@ -6281,11 +6178,11 @@
 
 #, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Не вдається змінити псевдонім"
+msgstr "Не вдається створити стеження"
 
 #, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Помилка реєстрації"
+msgstr "Помилка видалення реєстації"
 
 #, fuzzy
 msgid "Profile Error"
@@ -6318,42 +6215,9 @@
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Розлючений"
-
-msgid "Excited"
-msgstr "Схвильований"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Група:"
-
-msgid "Happy"
-msgstr "Щасливий"
-
-msgid "In Love"
-msgstr "Закоханий"
-
-msgid "Invincible"
-msgstr "Непереможний"
-
-msgid "Sad"
-msgstr "Сумний"
-
-#, fuzzy
-msgid "Hot"
-msgstr "В_узол:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Прізвисько"
-
-msgid "Sleepy"
-msgstr "Сонливий"
-
 #, fuzzy
 msgid "Pending"
-msgstr "Надіслати"
+msgstr "Надсилання"
 
 #, fuzzy
 msgid "Invited"
@@ -6361,7 +6225,7 @@
 
 #, fuzzy
 msgid "Rejected"
-msgstr "Скинути"
+msgstr "Відхилити"
 
 #, fuzzy
 msgid "Deleted"
@@ -6376,63 +6240,57 @@
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
+msgstr "Немає такого користувача: %s"
+
 msgid "User lookup"
-msgstr "Кімнати користувача"
-
-#, fuzzy
+msgstr "Пошук користувачів"
+
 msgid "Reading challenge"
-msgstr "Читання даних"
-
-#, fuzzy
+msgstr "Читається запит"
+
 msgid "Unexpected challenge length from server"
-msgstr "Неправильний запит з серверу"
-
-#, fuzzy
+msgstr "Неочікувана довжина запиту з сервера"
+
 msgid "Logging in"
-msgstr "Журнали"
-
-#, fuzzy
+msgstr "Входжу"
+
 msgid "MySpaceIM - No Username Set"
-msgstr "Не вказано ідентифікатор користувача."
+msgstr "MySpaceIM - не встановлене ім'я користувача"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "Здається, ви не маєте імені користувача MySpace"
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
-
-#, fuzzy
+"Ви хочете встановити його зараз? (Зауважте: ЙОГО НЕ МОЖНА БУДЕ ЗМІНИТИ!)"
+
 msgid "Lost connection with server"
-msgstr "Вас було роз'єднано з сервером."
+msgstr "Втрата з'єднання з сервером"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
-#, fuzzy
 msgid "New mail messages"
-msgstr "Нове повідомлення про відсутність"
+msgstr "Нове поштове повідомлення"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "Нові коментарі до блоґу"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "Нові коментарі до профілю"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "Нові запити друзів!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "Нові коментарі до зображень"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 #, fuzzy
 msgid "IM Friends"
-msgstr "Вікна _бесід"
+msgstr "Всього друзів"
 
 #, c-format
 msgid ""
@@ -6445,13 +6303,12 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "Недопустима відповідь від сервера."
+msgstr "Додати контакти з сервера"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr ""
+msgstr "Помилка протоколу, код %d: %s"
 
 #, c-format
 msgid ""
@@ -6460,68 +6317,68 @@
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "Неправильне прізвисько або пароль."
+msgstr "Неправильне ім'я користувача або пароль"
 
 msgid "MySpaceIM Error"
-msgstr ""
-
-#, fuzzy
+msgstr "Помилка MySpaceIM"
+
 msgid "Invalid input condition"
-msgstr "Завершення встановлення з'єднання"
-
-#, fuzzy
+msgstr "Невірні вхідні умови"
+
 msgid "Failed to add buddy"
-msgstr "Не вдається приєднатися до користувача у кімнаті"
-
-#, fuzzy
+msgstr "Не вдається додати контакт"
+
 msgid "'addbuddy' command failed."
-msgstr "Імпортувати список контактів з сервера"
+msgstr "помилка команди 'addbuddy'."
 
 #, fuzzy
 msgid "persist command failed"
-msgstr "Помилка панелі перемикання"
-
-#, fuzzy
+msgstr "Помилка встановлення віддаленого з'єднання"
+
 msgid "Failed to remove buddy"
-msgstr "Не вдається приєднатися до користувача у кімнаті"
-
+msgstr "Не вдалося вилучити контакт"
+
+#, fuzzy
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "Помилка встановлення віддаленого з'єднання"
 
 #, fuzzy
 msgid "blocklist command failed"
-msgstr "Помилка панелі перемикання"
+msgstr "Помилка встановлення віддаленого з'єднання"
 
 msgid "Missing Cipher"
-msgstr ""
+msgstr "Відсутній шифр"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Не знайдений шифр RC4"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"Оновіть до libpurple з підтримкою RC4t (>= 2.0.1). Додаток MySpaceIM не буде "
+"завантажений."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Додати друзів з MySpace.com"
 
 #, fuzzy
 msgid "Importing friends failed"
-msgstr "Неправильний дружній файл"
+msgstr "Імпортування з Amarok зазнало невдачі"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr ""
-
-#, fuzzy
+msgstr "Знайти людей..."
+
 msgid "Change IM name..."
-msgstr "Змінити пароль..."
-
+msgstr "Змінити ім'я IM..."
+
+#, fuzzy
 msgid "myim URL handler"
 msgstr ""
+"_Вручну:\n"
+"(%s для URL)"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
@@ -6532,39 +6389,32 @@
 msgid "Show display name in status text"
 msgstr ""
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "Показувати _псевдоніми у вкладках/заголовках"
-
-#, fuzzy
+msgstr "Показувати заголовок у тексту стану"
+
 msgid "Send emoticons"
-msgstr "Параметри звуку"
+msgstr "Надіслати емоції"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#, fuzzy
+msgstr "Роздільна здатність екрану (точок на дюйм)"
+
 msgid "Base font size (points)"
-msgstr "Більший розмір шрифту"
-
-#, fuzzy
+msgstr "Розмір основного шрифту (точки)"
+
 msgid "User"
-msgstr "Користувачі"
-
-#, fuzzy
+msgstr "Користувач"
+
 msgid "Headline"
-msgstr "Відмовитись"
-
-#, fuzzy
+msgstr "Заголовок"
+
 msgid "Song"
-msgstr "С_ортування:"
+msgstr "Пісня"
 
 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "Всього друзів"
+
 msgid "Client Version"
-msgstr "Закрити бесіду"
+msgstr "Версія клієнта"
 
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
@@ -6572,34 +6422,30 @@
 "to set your username."
 msgstr ""
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "Служба недоступна"
+msgstr "MySpaceIM - ім'я користувача доступне"
 
 msgid "This username is available. Would you like to set it?"
 msgstr ""
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "ВСТАНОВЛЮЄТЬСЯ ОДИН РАЗ, ЙОГО НЕ МОЖНА БУДЕ ЗМІНИТИ!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - Будь ласка, вкажіть ім'я користувача"
+
 msgid "This username is unavailable."
-msgstr "Ця тема не має доступних значків емоцій."
-
-#, fuzzy
+msgstr "Ім'я користувача недоступне."
+
 msgid "Please try another username:"
-msgstr "Введіть нову назву для обраної групи."
+msgstr "Будь ласка, спробуйте інше ім'я користувача:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Не вказано ідентифікатор користувача."
+msgstr "Не встановлене ім'я користувача"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Будь ласка, введіть ім'я користувача, щоб перевірити його наявність:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6608,15 +6454,15 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Вразити"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr ""
+msgstr "%s вразив вас!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Вражаю %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 #, fuzzy
@@ -6625,7 +6471,7 @@
 
 #, fuzzy, c-format
 msgid "%s has whacked you!"
-msgstr "Користувач заблокував вас"
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Whacking %s..."
@@ -6634,13 +6480,12 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Тема"
-
-#, fuzzy, c-format
+msgstr "Збуджувати"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Користувач заблокував вас"
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Torching %s..."
@@ -6648,67 +6493,65 @@
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "Обцілувати"
 
 #, fuzzy, c-format
 msgid "%s has smooched you!"
-msgstr "Користувач заблокував вас"
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Обціловує %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "Обійняти"
 
 #, fuzzy, c-format
 msgid "%s has hugged you!"
-msgstr "%s відходить."
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Обіймаю %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Словацька"
-
-#, fuzzy, c-format
+msgstr "Дати ляпаса"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s припиняє писати вам (%s)"
+msgstr "%s дав вам ляпаса!"
 
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Відійшов"
-
-#, fuzzy, c-format
+msgstr "Вщіпнути"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s відходить."
-
-#, fuzzy, c-format
+msgstr "%s вщіпнув вас!"
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Пошук %s"
+msgstr "Щіпаю %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Дати п'ять"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s входить (%s)"
+msgstr "%s дав вам п'ять!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Даю п'ять %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6716,9 +6559,9 @@
 msgid "Punk"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s has punk'd you!"
-msgstr ""
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Punking %s..."
@@ -6734,9 +6577,9 @@
 msgid "Raspberry"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s has raspberried you!"
-msgstr ""
+msgstr "%s збуджує вас!"
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -6769,9 +6612,8 @@
 msgid "Password has expired"
 msgstr "Термін дії паролю вийшов"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Неправильний пароль."
+msgstr "Неправильний пароль"
 
 msgid "User not found"
 msgstr "Користувач не знайдений"
@@ -6817,7 +6659,7 @@
 
 #, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "Ви ввели неправильне ім'я користувача"
+msgstr "Неправильне ім'я користувача або пароль"
 
 msgid "An error occurred while updating the directory"
 msgstr "Помилка при оновленні каталогу"
@@ -6842,9 +6684,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Невідома помилка: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Не вдається заборонити користувача %s"
+msgstr "Не вдається увійти: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6889,8 +6731,8 @@
 "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)."
@@ -7005,7 +6847,7 @@
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Модуль протоколу Novell GroupWise Messenger"
+msgstr "Додаток протоколу Novell GroupWise Messenger"
 
 msgid "Server address"
 msgstr "Адреса сервера"
@@ -7027,20 +6869,18 @@
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Помилка при створенні з'єднання"
+msgstr "Помилка запиту %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
-#, fuzzy
 msgid "Could not join chat room"
-msgstr "Не вдається встановити з'єднання"
-
-#, fuzzy
+msgstr "Не вдалося приєднатися до кімнати балачки"
+
 msgid "Invalid chat room name"
-msgstr "Неправильна назва кімнати"
+msgstr "Неправильна назва кімнати балачки"
 
 #, fuzzy
 msgid "Received invalid data on connection with server"
@@ -7056,13 +6896,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "Модуль протоколу AIM/ICQ"
-
-#, fuzzy
+msgstr "Додаток протоколу AIM"
+
 msgid "ICQ UIN..."
-msgstr "ICQ УІН"
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -7074,9 +6912,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "Модуль протоколу IRC"
+msgstr "Додаток протоколу ICQ"
 
 msgid "Encoding"
 msgstr "Кодування"
@@ -7098,11 +6935,13 @@
 
 #, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
+msgstr ""
+"Не вдалося встановити з'єднання з сервером:\n"
+"%s"
 
 #, fuzzy
 msgid "Direct IM established"
-msgstr "Пряме з'єднання з %s встановлено"
+msgstr "Пряме з'єднання AIM"
 
 #, c-format
 msgid ""
@@ -7163,10 +7002,10 @@
 msgstr "У локальному дозволено/заборонено"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "Рівень небезпеки занадто високий (відправник)"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "Рівень небезпеки занадто високий (отримувач)"
 
 msgid "User temporarily unavailable"
 msgstr "Користувач тимчасово недоступний"
@@ -7226,7 +7065,7 @@
 
 #, fuzzy
 msgid "Offline message store full"
-msgstr "Не у мережі "
+msgstr "Повідомлення, коли не в мережі"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7307,9 +7146,8 @@
 msgid "Camera"
 msgstr "Відеокамера"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Ідентифікатор"
+msgstr "Спільний екран"
 
 msgid "Free For Chat"
 msgstr "Готовий до розмови"
@@ -7337,15 +7175,14 @@
 
 #, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "Не вдається з'єднатися для передавання."
+msgstr "Не вдається додати користувача у список на сервері"
 
 #, fuzzy, c-format
 msgid "Unable to connect to BOS server: %s"
 msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy
 msgid "Username sent"
-msgstr "Не вказано ідентифікатор користувача."
+msgstr "Ім'я користувача надіслане"
 
 msgid "Connection established, cookie sent"
 msgstr "З'єднання встановлено, відправлено дані"
@@ -7385,14 +7222,12 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Користувач не існує"
+msgstr "Ім'я користувача не існує"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Ваш обліковий запис наразі заблокований."
+msgstr "Ваш обліковий запис наразі призупинений"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -7438,11 +7273,11 @@
 
 #, fuzzy
 msgid "Unable to initialize connection"
-msgstr "Не вдається створити нове з'єднання."
+msgstr "Не вдається створити з'єднання"
 
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
-"Будь-ласка, авторизуйте мене, щоб я міг додати вас до мого списку контактів."
+"Будь ласка, авторизуйте мене, щоб я міг додати вас до мого списку контактів."
 
 msgid "No reason given."
 msgstr "Причина не вказана."
@@ -7456,7 +7291,7 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"Користувач %u не дозволив додавати його у ваш список контактів з наступної "
+"Користувач %u не дозволив додавати його у ваш перелік контактів з наступної "
 "причини:\n"
 "%s"
 
@@ -7509,15 +7344,13 @@
 msgstr "Користувач ICQ %u надіслав вам контакт: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Бажаєте додати цей контакт у список контактів?"
-
-#, fuzzy
+msgstr "Бажаєте додати цей контакт у перелік контактів?"
+
 msgid "_Add"
-msgstr "Додати"
-
-#, fuzzy
+msgstr "_Додати"
+
 msgid "_Decline"
-msgstr "Відмовитись"
+msgstr "_Відмовитись"
 
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
@@ -7764,14 +7597,15 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "Максимальна довжина профілю складає %d байт. Pidgin обрізав його."
+msgstr[0] ""
+"Максимальна довжина повідомлення складає %d байт. Pidgin обрізав його."
 msgstr[1] "Максимальна довжина профілю складає %d байти. Pidgin обрізав його."
 msgstr[2] "Максимальна довжина профілю складає %d байтів. Pidgin обрізав його."
 
 msgid "Profile too long."
 msgstr "Профіль занадто довгий."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7779,11 +7613,11 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Максимальна довжина повідмлення складає %d байт. Pidgin обрізав його."
+"Максимальна довжина повідомлення складає %d байт. Pidgin обрізав його."
 msgstr[1] ""
-"Максимальна довжина повідмлення складає %d байти. Pidgin обрізав його."
+"Максимальна довжина повідомлення складає %d байти. Pidgin обрізав його."
 msgstr[2] ""
-"Максимальна довжина повідмлення складає %d байтів. Pidgin обрізав його."
+"Максимальна довжина повідомлення складає %d байтів. Pidgin обрізав його."
 
 msgid "Away message too long."
 msgstr "Повідомлення про відсутність надто довге."
@@ -7798,9 +7632,8 @@
 "неправильний. Ідентифікатори користувачів повинні містити лише літери, числа "
 "та пробіли, або містити лише цифри."
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Не вдається завантажити список контактів"
+msgstr "Не вдається отримати перелік контактів"
 
 #, fuzzy
 msgid ""
@@ -7855,7 +7688,7 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"Користувач %s не дозволив додати його у ваш список контактів з наступної "
+"Користувач %s не дозволив додати його у ваш перелік контактів з наступної "
 "причини:\n"
 "%s"
 
@@ -7871,7 +7704,7 @@
 "AIM."
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "Посилання до музичної крамниці iTunes"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7892,17 +7725,14 @@
 "Ваша ІР адреса стане відомою, тому це може становити загрозу "
 "конфіденційності. Бажаєте продовжити?"
 
-#, fuzzy
 msgid "C_onnect"
-msgstr "З'єднатися"
-
-#, fuzzy
+msgstr "_З'єднатися"
+
 msgid "You closed the connection."
-msgstr "Помилка при створенні з'єднання"
-
-#, fuzzy
+msgstr "Ви закрили з'єднання."
+
 msgid "Get AIM Info"
-msgstr "Отримати інформацію"
+msgstr "Отримати інформацію AIM"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
@@ -7913,7 +7743,7 @@
 
 #, fuzzy
 msgid "End Direct IM Session"
-msgstr "Пряме з'єднання з %s встановлено"
+msgstr "Пряме з'єднання AIM"
 
 msgid "Direct IM"
 msgstr "Пряме з'єднання"
@@ -7921,16 +7751,14 @@
 msgid "Re-request Authorization"
 msgstr "Повторний запит авторизації"
 
-#, fuzzy
 msgid "Require authorization"
-msgstr "Запитати авторизацію"
+msgstr "Потребує авторизації"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#, fuzzy
 msgid "ICQ Privacy Options"
-msgstr "Параметри проксі"
+msgstr "Параменти приватності ICQ"
 
 msgid "The new formatting is invalid."
 msgstr "Нове форматування недопустиме."
@@ -7966,27 +7794,24 @@
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Введіть адресу email адресу, якого ви шукаєте."
 
-#, fuzzy
 msgid "_Search"
-msgstr "Шукати"
-
-#, fuzzy
+msgstr "По_шук"
+
 msgid "Set User Info (web)..."
-msgstr "Встановити інформацію про користувача(URL)..."
+msgstr "Встановити інформацію про користувача (веб)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "Змінити пароль (URL)"
+msgstr "Змінити пароль (веб)"
 
 #, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "Налаштувати переправлення повідомлень (URL)"
+msgstr "Ввімкнути UPnP перенаправлення портів для порту веб-сервера"
 
 #. ICQ actions
 #, fuzzy
 msgid "Set Privacy Options..."
-msgstr "Показати більше параметрів"
+msgstr "Параменти приватності ICQ"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8005,7 +7830,7 @@
 
 #, fuzzy
 msgid "Search for Buddy by Email Address..."
-msgstr "Шукати користувача за адресою ел.пошти..."
+msgstr "Шукати користувача за адресою ел.пошти"
 
 msgid "Search for Buddy by Information"
 msgstr "Шукати користувача за інформацією"
@@ -8021,7 +7846,7 @@
 msgstr ""
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "Дозволити декілька одночасних входів"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
@@ -8029,7 +7854,7 @@
 
 #, fuzzy, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Спроба створення прямого з'єднання з %s у %s:%hu"
+msgstr "Не вдається з'єднатись з вузлом"
 
 #, fuzzy
 msgid "Attempting to connect via proxy server."
@@ -8049,197 +7874,163 @@
 "розкрита, це може вважатись загрозою безпеці."
 
 msgid "Aquarius"
-msgstr ""
-
-#, fuzzy
+msgstr "Водолій"
+
 msgid "Pisces"
-msgstr "значки"
-
-#, fuzzy
+msgstr "Риби"
+
 msgid "Aries"
-msgstr "Адреса"
-
-#, fuzzy
+msgstr "Овен"
+
 msgid "Taurus"
-msgstr "Турецька"
-
-#, fuzzy
+msgstr "Віл"
+
 msgid "Gemini"
-msgstr "Німецька"
-
-#, fuzzy
+msgstr "Близнюки"
+
 msgid "Cancer"
-msgstr "Скасувати"
+msgstr "Рак"
 
 msgid "Leo"
-msgstr ""
+msgstr "Лев"
 
 msgid "Virgo"
-msgstr ""
+msgstr "Діва"
 
 msgid "Libra"
-msgstr ""
-
-#, fuzzy
+msgstr "Ваги"
+
 msgid "Scorpio"
-msgstr "Підписка"
+msgstr "Скорпіон"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "Стрілець"
 
 msgid "Capricorn"
-msgstr ""
-
-#, fuzzy
+msgstr "Козеріг"
+
 msgid "Rat"
-msgstr "Необроблений"
+msgstr "Пацюк"
 
 msgid "Ox"
-msgstr ""
-
-#, fuzzy
+msgstr "Віл"
+
 msgid "Tiger"
-msgstr "Час"
+msgstr "Тигр"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "Кріль"
 
 msgid "Dragon"
-msgstr ""
-
-#, fuzzy
+msgstr "Дракон"
+
 msgid "Snake"
-msgstr "Зберегти"
-
-#, fuzzy
+msgstr "Змія"
+
 msgid "Horse"
-msgstr "Порти"
+msgstr "Кінь"
 
 msgid "Goat"
-msgstr ""
-
-#, fuzzy
+msgstr "Коза"
+
 msgid "Monkey"
-msgstr "немає"
-
-#, fuzzy
+msgstr "Мавпа"
+
 msgid "Rooster"
-msgstr "Зареєструвати"
+msgstr "Півень"
 
 msgid "Dog"
-msgstr ""
-
-#, fuzzy
+msgstr "Пес"
+
 msgid "Pig"
-msgstr "Ping"
-
-#, fuzzy
+msgstr "Свиня"
+
 msgid "Other"
-msgstr "Opera"
-
-#, fuzzy
+msgstr "Інше"
+
 msgid "Visible"
-msgstr "Невидимий"
+msgstr "Видимий"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Тільки друзі"
+
 msgid "Private"
-msgstr "Конфіденційність"
+msgstr "Особисте"
 
 msgid "QQ Number"
-msgstr ""
-
-#, fuzzy
+msgstr "Номер QQ"
+
 msgid "Country/Region"
-msgstr "Країна"
+msgstr "Країна/Область"
 
 msgid "Province/State"
-msgstr ""
-
-#, fuzzy
+msgstr "Провінція/Штат"
+
 msgid "Zipcode"
 msgstr "Поштовий індекс"
 
-#, fuzzy
 msgid "Phone Number"
-msgstr "Номер телефон"
+msgstr "Номер телефону"
 
 #, fuzzy
 msgid "Authorize adding"
-msgstr "Авторизувати"
-
-#, fuzzy
+msgstr "Додається {0} з {1} до {2}"
+
 msgid "Cellphone Number"
-msgstr "Номер телефон"
+msgstr "Номер стільникового телефону"
 
 #, fuzzy
 msgid "Personal Introduction"
-msgstr "Особиста інформація"
-
-#, fuzzy
+msgstr "Особистий мобільний"
+
 msgid "City/Area"
-msgstr "Місто"
-
-#, fuzzy
+msgstr "Місто/Область "
+
 msgid "Publish Mobile"
-msgstr "Особиста веб-сторінка"
-
-#, fuzzy
+msgstr ""
+
 msgid "Publish Contact"
-msgstr "Псевдонім контакту"
-
-#, fuzzy
+msgstr ""
+
 msgid "College"
-msgstr "_Згорнути"
-
-#, fuzzy
+msgstr "Коледж"
+
 msgid "Horoscope"
-msgstr "Порти"
+msgstr "Гороскоп"
 
 msgid "Zodiac"
-msgstr ""
-
-#, fuzzy
+msgstr "Зодіак"
+
 msgid "Blood"
-msgstr "Заблоковано"
-
-#, fuzzy
+msgstr "Кров"
+
 msgid "True"
-msgstr "Турецька"
-
-#, fuzzy
+msgstr "Так"
+
 msgid "False"
-msgstr "Помилка"
-
-#, fuzzy
+msgstr "Ні"
+
 msgid "Modify Contact"
-msgstr "Зміна облікового запису"
-
-#, fuzzy
+msgstr "Змінити обліковий запис"
+
 msgid "Modify Address"
-msgstr "Домашня адреса"
-
-#, fuzzy
+msgstr "Змінити адресу"
+
 msgid "Modify Extended Information"
-msgstr "Інформація про користувача"
-
-#, fuzzy
+msgstr "Змінити додаткову інформацію"
+
 msgid "Modify Information"
-msgstr "Інформація про користувача"
-
-#, fuzzy
+msgstr "Змінити інформацію"
+
 msgid "Update"
-msgstr "Останнє оновлення"
+msgstr "Оновити"
 
 #, fuzzy
 msgid "Could not change buddy information."
-msgstr "Введіть користувача для стеження."
-
-#, fuzzy
+msgstr "Не вдається додати користувача у список на сервері"
+
 msgid "Mobile"
-msgstr "Мобільний Телефон"
+msgstr "Мобільний"
 
 msgid "Note"
 msgstr "Примітки"
@@ -8247,171 +8038,150 @@
 #. callback
 #, fuzzy
 msgid "Buddy Memo"
-msgstr "Значок користувача"
+msgstr "Авторизувати контакт?"
 
 msgid "Change his/her memo as you like"
 msgstr ""
 
-#, fuzzy
 msgid "_Modify"
 msgstr "З_мінити"
 
 #, fuzzy
 msgid "Memo Modify"
-msgstr "З_мінити"
-
-#, fuzzy
+msgstr "Зміна облікового запису"
+
 msgid "Server says:"
-msgstr "Сервер зайнятий"
+msgstr "Сервер каже:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Ваш запит прийнятий."
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ваш запит відхилений."
+
+#, c-format
 msgid "%u requires verification"
-msgstr "Запитати авторизацію"
+msgstr "%u потребує перевірки"
 
 #, fuzzy
 msgid "Add buddy question"
-msgstr "Додати користувача у список?"
+msgstr "Додати стеження за контактом"
 
 #, fuzzy
 msgid "Enter answer here"
-msgstr "Не можна відправляти каталог."
+msgstr "Введіть тут запит"
 
 msgid "Send"
 msgstr "Надіслати"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Неправильний пароль"
+msgstr "Невірна відповідь."
 
 #, fuzzy
 msgid "Authorization denied message:"
 msgstr "Повідомлення відмови у авторизації:"
 
 msgid "Sorry, you're not my style."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Вибачте, ви не в моєму стилі."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "Початок ідентифікації"
+msgstr "%u потребує авторизації"
 
 #, fuzzy
 msgid "Add buddy authorize"
-msgstr "Додати користувача у список?"
-
-#, fuzzy
+msgstr "Додати стеження за контактом"
+
 msgid "Enter request here"
-msgstr "Увійти на сервер конференцій"
-
-#, fuzzy
+msgstr "Введіть тут запит"
+
 msgid "Would you be my friend?"
-msgstr "Бажаєте переписати його?"
-
-#, fuzzy
+msgstr "Бажаєте бути моїм другом?"
+
 msgid "QQ Buddy"
-msgstr "Додати користувача"
-
-#, fuzzy
+msgstr "Користувач QQ"
+
 msgid "Add buddy"
 msgstr "Додати користувача"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Неправильна назва кімнати"
-
-#, fuzzy
+msgstr "Невірний номер QQ"
+
 msgid "Failed sending authorize"
-msgstr "Будь-ласка, авторизуйте мене!"
+msgstr "Будь ласка, авторизуйте мене!"
 
 #, fuzzy, c-format
 msgid "Failed removing buddy %u"
-msgstr "Не вдається приєднатися до користувача у кімнаті"
+msgstr "Не вдається додати контакт"
 
 #, fuzzy, c-format
 msgid "Failed removing me from %d's buddy list"
 msgstr "Видалити користувача зі списку контактів"
 
-#, fuzzy
 msgid "No reason given"
-msgstr "Причина не вказана."
+msgstr "Причина не вказана"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "Ви були знищені оператором %s (%s)"
-
-#, fuzzy
+msgstr "Ви були додані %s'ом"
+
 msgid "Would you like to add him?"
-msgstr "Бажаєте переписати його?"
-
-#, fuzzy, c-format
+msgstr "Ви бажаєте додати його?"
+
+#, c-format
 msgid "Rejected by %s"
-msgstr "Скинути"
-
-#, fuzzy, c-format
+msgstr "Відхилено %s'ом"
+
+#, c-format
 msgid "Message: %s"
-msgstr "_Повідомлення:"
+msgstr "Повідомлення: %s"
 
 msgid "ID: "
-msgstr ""
-
-#, fuzzy
+msgstr "ID: "
+
 msgid "Group ID"
-msgstr "Група:"
+msgstr "ID групи"
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
 #, fuzzy
 msgid "Please enter Qun number"
-msgstr "Введіть нову назву для обраної групи."
+msgstr "Будь ласка, введіть інформацію про користувача."
 
 msgid "You can only search for permanent Qun\n"
 msgstr ""
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "Неправильні параметри проксі"
-
-#, fuzzy
+msgstr "(Неправильний рядок UTF-8)"
+
 msgid "Not member"
-msgstr "Член з"
-
-#, fuzzy
+msgstr "Не член"
+
 msgid "Member"
-msgstr "Член з"
-
-#, fuzzy
+msgstr "Член"
+
 msgid "Requesting"
-msgstr "Неоднозначний запит"
+msgstr "Запитується"
 
 msgid "Admin"
-msgstr ""
-
-#, fuzzy
+msgstr "Адміністратор"
+
 msgid "Notice"
 msgstr "Примітки"
 
-#, fuzzy
 msgid "Detail"
 msgstr "Подробиці"
 
-#, fuzzy
 msgid "Creator"
-msgstr "Закрити"
-
-#, fuzzy
+msgstr "Створювач"
+
 msgid "About me"
-msgstr "Про Pidgin"
-
-#, fuzzy
+msgstr "Про мене"
+
 msgid "Category"
-msgstr "Помилка читання"
+msgstr "Категорія"
 
 #, fuzzy
 msgid "The Qun does not allow others to join"
@@ -8419,66 +8189,58 @@
 "Оціночна версія не дозволяє використовувати більше ніж десять користувачів "
 "одночасно"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "Приєднатися до розмови"
+msgstr "Приєднатись до QQ Qun"
 
 msgid "Input request here"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Введіть запит"
+
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Номер телефон"
+msgstr "Успішно приєднатись до Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "Успішно приєднатись до Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u заборонив приєднатися"
 
 #, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Параметри звуку"
-
-#, fuzzy
+msgstr "Команда QQ Qun"
+
 msgid "Failed:"
-msgstr "Помилка"
+msgstr "Невдача:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Приєднано до Qun, невідома відповідь"
+
 msgid "Quit Qun"
-msgstr "Приєднатися до розмови"
+msgstr "Вийти з QQ Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Вибачте, я на хвилинку відійшов(відійшла)!"
-
-#, fuzzy
+msgstr "Вибачте, ви не в моєму стилі."
+
 msgid "Successfully changed Qun members"
-msgstr "Номер телефон"
-
-#, fuzzy
+msgstr "Успішно змінені члени Qun"
+
 msgid "Successfully changed Qun information"
-msgstr "Інформація про канал"
+msgstr "Успішно змінена інформація Qun"
 
 msgid "You have successfully created a Qun"
-msgstr ""
-
-#, fuzzy
+msgstr "Ви успішно створили Qun"
+
 msgid "Would you like to set up detailed information now?"
-msgstr "Бажаєте приєднатися до бесіди?"
-
-#, fuzzy
+msgstr "Ви бажаєте встановити детальнішу інформацію зараз?"
+
 msgid "Setup"
-msgstr "_Встановити"
+msgstr "Встановлення"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
@@ -8486,180 +8248,167 @@
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
+msgstr "%u дав запит приєднатися до Qun %u"
 
 #, fuzzy, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Не вдається приєднатися до користувача у кімнаті"
+msgstr "Не вдається приєднатися до Qun %u, operated by admin %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Видалити користувача"
-
-#, fuzzy, c-format
+msgstr "<b>Контакт %u видалений.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Видалити користувача"
-
-#, fuzzy, c-format
+msgstr "<b>Приєднався новий контакт %u.</b>"
+
+#, c-format
 msgid "Unknown-%d"
-msgstr "Невідомо"
-
-#, fuzzy
+msgstr "Невідомо-%d"
+
 msgid "Level"
-msgstr "ніколи"
+msgstr "Рівень"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
-msgstr "Мобільний Телефон"
+msgstr " З мобільного"
 
 #, fuzzy
 msgid " BindMobile"
 msgstr "Мобільний Телефон"
 
-#, fuzzy
 msgid " Video"
-msgstr "Живе відео"
-
-#, fuzzy
+msgstr "Відео"
+
 msgid " Zone"
-msgstr "немає"
+msgstr "Зона"
 
 msgid "Flag"
-msgstr ""
+msgstr "Прапор"
 
 msgid "Ver"
-msgstr ""
-
-#, fuzzy
+msgstr "Версія"
+
 msgid "Invalid name"
-msgstr "Неправильне ім'я користувача"
-
-#, fuzzy
+msgstr "Невірне ім'я"
+
 msgid "Select icon..."
-msgstr "Вибрати колір тексту"
-
-#, fuzzy, c-format
+msgstr "Вибрати значок..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+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> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Всього контактів поза мережею</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+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>"
-
-#, fuzzy, c-format
+msgstr "<b>Сервер</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Бездіяльний:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Режим з'єднання</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>IP адреса:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Моя зовнішня IP-адреса</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Псевдонім:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Надіслано</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Загублено</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Отримано</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Псевдонім:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Час</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy
+msgstr "<b>IP</b>: %s<br>\n"
+
 msgid "Login Information"
-msgstr "Інформація про користувача"
+msgstr "Реєстраційна інформація"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Початковий автор</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Код внесли</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy
+msgstr ""
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Псевдонім:</b> %s<br>"
-
-#, fuzzy
+msgstr ""
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Користувач:</b> %s<br>"
+msgstr ""
 
 msgid "and more, please let me know... thank you!))"
 msgstr ""
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>Та всі хлопці закулісами...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<i>Раді будемо вашій співпраці. Приєднуйтесь!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Про Pidgin"
-
-#, fuzzy
+msgstr "Про OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Збереження значка"
+msgstr "Змінити значок"
 
 msgid "Change Password"
 msgstr "Зміна паролю"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Інформація про користувача"
+msgstr "Інформація про обліковий запис"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Оновити всі QQ Quns"
+
 msgid "About OpenQ"
-msgstr "Про Pidgin"
+msgstr "Про OpenQ"
 
 #, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Домашня адреса"
+msgstr "Помилка під час додавання контакту"
 
 #. *< type
 #. *< ui_requirement
@@ -8671,49 +8420,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "Модуль протоколу IRC"
-
-#, fuzzy
+msgstr "Додаток протоколу QQ"
+
 msgid "Auto"
-msgstr "Авторизувати"
-
-#, fuzzy
+msgstr "Автоматично"
+
 msgid "Select Server"
-msgstr "Вибрати колір тексту"
+msgstr "Виберіть сервер"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "З'єднання"
-
-#, fuzzy
+msgstr "З'єднання по TCP"
+
 msgid "Show server notice"
-msgstr "Показати менше параметри"
-
-#, fuzzy
+msgstr "Показати повідомлення сервера"
+
 msgid "Show server news"
-msgstr "Показати менше параметри"
+msgstr "Показати новини сервера"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "Показати кімнату балачки, коли надійшло повідомлення"
 
 #, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Помилка читання"
-
-#, fuzzy
+msgstr "Час оновлення в секундах"
+
 msgid "Update interval (seconds)"
-msgstr "Помилка читання"
+msgstr "Час оновлення (с)"
 
 #, fuzzy
 msgid "Unable to decrypt server reply"
@@ -8725,122 +8467,120 @@
 
 #, fuzzy, c-format
 msgid "Invalid token len, %d"
-msgstr "Неправильний ідентифікатор авторизації"
+msgstr "Неправильні параметри проксі"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX зараз не підтримується"
 
 #. need activation
 #. need activation
 #. need activation
 #, fuzzy
 msgid "Activation required"
-msgstr "Вимагається реєстрація"
+msgstr "Вимагається оплата"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "Неоднозначний запит"
+msgstr "Запитується captcha"
 
 msgid "Checking captcha"
-msgstr ""
-
-#, fuzzy
+msgstr "Перевірка captcha"
+
 msgid "Failed captcha verification"
-msgstr "Ідентифікація Yahoo! завершилась невдало"
-
-#, fuzzy
+msgstr "Помилка перевірки captcha"
+
 msgid "Captcha Image"
-msgstr "Збереження зображення"
-
-#, fuzzy
+msgstr "Зображення Captcha"
+
 msgid "Enter code"
-msgstr "Зміна паролю"
+msgstr "Введіть код"
 
 msgid "QQ Captcha Verification"
-msgstr ""
-
-#, fuzzy
+msgstr "Пеервірка Captcha QQ"
+
 msgid "Enter the text from the image"
-msgstr "Введіть назву групи, що додаватиметься."
+msgstr "Введіть текст з зображення"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Невідома відповідь під час перевірки паролю (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#, fuzzy
+"Невідома відповідь під час входу (0x%02X):\n"
+"%s"
+
 msgid "Socket error"
-msgstr "Невідома помилка"
-
-#, fuzzy
+msgstr "Помилка сокету"
+
 msgid "Getting server"
-msgstr "Встановити інформацію про користувача..."
+msgstr "Отримання сервера"
 
 #, fuzzy
 msgid "Requesting token"
-msgstr "Запит заборонено"
+msgstr "Сесія добігла кінця - запитуємо новий вхід\n"
 
 #, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Не вдається перевірити доступність сервера"
-
-#, fuzzy
+msgstr "Не вдається отримати назву вузла"
+
 msgid "Invalid server or port"
-msgstr "Неправильне ім'я користувача чи пароль"
-
-#, fuzzy
+msgstr "Неправильний сервер або порт"
+
 msgid "Connecting to server"
-msgstr "З'єднання з SILC сервером"
-
-#, fuzzy
+msgstr "З'єднання з сервером"
+
 msgid "QQ Error"
-msgstr "Помилка читання"
-
-#, fuzzy, c-format
+msgstr "Помилка QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Транзитний сервер ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Новини сервера:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s на %s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Від"
-
-#, fuzzy, c-format
+msgstr "Від %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Інформація про сервер"
-
-#, fuzzy
+msgstr ""
+"Зауваження щодо сервера від %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Помилка невідома."
+msgstr "Невідома SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"Помилка відповіді %s(0x%02X)\n"
+"Кімната %u, відповідь 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "команда"
+msgstr "Команда QQ Qun"
 
 #, fuzzy
 msgid "Unable to decrypt login reply"
@@ -8848,51 +8588,46 @@
 
 #, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Помилка невідома."
+msgstr "Невідома SERVER CMD"
 
 #, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "Помилка невідома."
+msgstr "Невідома SERVER CMD"
 
 #, fuzzy, c-format
 msgid "%d has declined the file %s"
-msgstr "%s змінив тему на: %s"
-
-#, fuzzy
+msgstr "Частковий файл %s (%s) не має джерел"
+
 msgid "File Send"
-msgstr "Не вдається відправити файл"
+msgstr "Передавання файлів"
 
 #, fuzzy, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%s скасував передавання %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Назва групи:</b> %s<br>"
+
+#, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Користувач:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>ID групи Notes:</b> %s<br>"
+
+#, c-format
 msgid "Info for Group %s"
-msgstr "Інформація для %s"
-
-#, fuzzy
+msgstr "Інформація про групу %s"
+
 msgid "Notes Address Book Information"
-msgstr "Дані про роботу"
-
-#, fuzzy
+msgstr "Інформація адресної книги Notes"
+
 msgid "Invite Group to Conference..."
-msgstr "Створити конференцію"
-
-#, fuzzy
+msgstr "Запросити групу до конференції..."
+
 msgid "Get Notes Address Book Info"
-msgstr "Додати до адресної книги"
-
-#, fuzzy
+msgstr "Отримати інформацію адресної книги Notes"
+
 msgid "Sending Handshake"
-msgstr "Надсилання cookie"
+msgstr ""
 
 #, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
@@ -8901,103 +8636,91 @@
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
+#, fuzzy
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#, fuzzy
+msgstr "Очікування початку передачі"
+
 msgid "Login Redirected"
-msgstr "Сервер входу"
-
-#, fuzzy
+msgstr "Вхід перенаправлений"
+
 msgid "Forcing Login"
-msgstr "Вхід"
+msgstr "Примусовий вхід"
 
 msgid "Login Acknowledged"
-msgstr ""
-
-#, fuzzy
+msgstr "Вхід підтверджений"
+
 msgid "Starting Services"
-msgstr "Мережні служби"
+msgstr "Запускається служба"
 
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
+msgstr "Адміністратор Sametime встановив наступне оголошення на сервері %s"
 
 msgid "Sametime Administrator Announcement"
-msgstr ""
+msgstr "Оголошення адміністратора Sametime"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "Оголошення від %s"
 
 #, fuzzy
 msgid "Conference Closed"
-msgstr "З'єднання розірвано"
-
-#, fuzzy
+msgstr "Місце закрите"
+
 msgid "Unable to send message: "
-msgstr "Не вдається відправити повідомлення: %s"
+msgstr "Не вдається відправити повідомлення: "
 
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Не вдається відправити повідомлення %s:"
 
-#, fuzzy
 msgid "Place Closed"
-msgstr "Скасовано"
+msgstr "Місце закрите"
 
 msgid "Microphone"
-msgstr ""
+msgstr "Мікрофон"
 
 msgid "Speakers"
 msgstr ""
 
-#, fuzzy
 msgid "Video Camera"
-msgstr "Відеорозмова"
-
-#, fuzzy
+msgstr "Відеокамера"
+
 msgid "File Transfer"
 msgstr "Передавання файлів"
 
-#, fuzzy
 msgid "Supports"
-msgstr "підтримка"
-
-#, fuzzy
+msgstr "Підтримка"
+
 msgid "External User"
-msgstr "Зробити попередження користувачу"
-
-#, fuzzy
+msgstr "Зовнішній користувач"
+
 msgid "Create conference with user"
-msgstr "Виберіть сервер конференцій для опитування"
+msgstr "Створити конференцію з користувачем"
 
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-
-#, fuzzy
+"Будь ласка, введіть тему нової конференції та повідомлення, що буде "
+"надіслане для запрошення до %s"
+
 msgid "New Conference"
-msgstr "Створити конференцію"
-
-#, fuzzy
+msgstr "Нова конференція"
+
 msgid "Create"
-msgstr "Дата"
-
-#, fuzzy
+msgstr "Створити"
+
 msgid "Available Conferences"
-msgstr "Створити конференцію"
-
-#, fuzzy
+msgstr "Наявні конференції"
+
 msgid "Create New Conference..."
-msgstr "Створити конференцію"
-
-#, fuzzy
+msgstr "Створити нову конференцію..."
+
 msgid "Invite user to a conference"
-msgstr "Створити конференцію"
+msgstr "Запросити користувача до конференції"
 
 #, c-format
 msgid ""
@@ -9006,16 +8729,14 @@
 "this user to."
 msgstr ""
 
-#, fuzzy
 msgid "Invite to Conference"
-msgstr "Створити конференцію"
-
-#, fuzzy
+msgstr "Запросити до конференції"
+
 msgid "Invite to Conference..."
-msgstr "Створити конференцію"
+msgstr "Запросити до конференції..."
 
 msgid "Send TEST Announcement"
-msgstr ""
+msgstr "Надіслати оголошення TEST"
 
 msgid "Topic:"
 msgstr "Тема:"
@@ -9030,9 +8751,8 @@
 "Please enter one below to continue logging in."
 msgstr ""
 
-#, fuzzy
 msgid "Meanwhile Connection Setup"
-msgstr "Помилка встановлення віддаленого з'єднання"
+msgstr "Встановлення з'єднання Meanwhile"
 
 #, fuzzy
 msgid "No Sametime Community Server Specified"
@@ -9043,18 +8763,16 @@
 
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
-
-#, fuzzy
+msgstr "Невідомо (0x%04x)<br>"
+
 msgid "Last Known Client"
-msgstr "Оцінити клієнта"
-
-#, fuzzy
+msgstr "Останній відомий клієнт"
+
 msgid "User Name"
 msgstr "Ім'я користувача"
 
 msgid "Sametime ID"
-msgstr ""
+msgstr "Sametime ID"
 
 msgid "An ambiguous user ID was entered"
 msgstr ""
@@ -9067,76 +8785,70 @@
 "Знайдено декілька користувачів з однаковими іменами. Виберіть зі списку "
 "одного з них, щоб додати до списку контактів."
 
-#, fuzzy
 msgid "Select User"
-msgstr "Вибрати колір тексту"
+msgstr "Вибрати користувача"
 
 #, fuzzy
 msgid "Unable to add user: user not found"
-msgstr "Не вдається додати користувача %s (%s)"
+msgstr "Не вдається додати групу: група не знайдена"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
+"Ідентифікатор '%s' не збігається ні з одним користувачем у вашій спільноті "
+"Sametime. Він вилучений з вашого переліку контактів."
 
 #, fuzzy, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
+msgstr "Помилка читання файлу-джерела часткового файлу (%s - %s): %s"
 
 #, fuzzy
 msgid "Remotely Stored Buddy List"
-msgstr "Надсилання списку контактів"
+msgstr "Тільки місцевий перелік контактів"
 
 #, fuzzy
 msgid "Buddy List Storage Mode"
-msgstr "Сортування списку контактів"
-
-#, fuzzy
+msgstr "Тільки місцевий перелік контактів"
+
 msgid "Local Buddy List Only"
-msgstr "_Закріплений список контактів"
-
-#, fuzzy
+msgstr "Тільки місцевий перелік контактів"
+
 msgid "Merge List from Server"
-msgstr "Видалити список контактів з сервера"
-
-#, fuzzy
+msgstr "Об'єднати з переліком контактів з сервера"
+
 msgid "Merge and Save List to Server"
-msgstr "На сервер відправлено неправильне значення CHL"
+msgstr "Об'єднати та зберегти перелік на сервері"
 
 msgid "Synchronize List with Server"
-msgstr ""
+msgstr "Синхронізувати перелік з сервером"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
+msgstr "Імпортувати перелік Sametime для облікового запису %s"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
-
-#, fuzzy
+msgstr "Експортувати перелік Sametime для облікового запису %s"
+
 msgid "Unable to add group: group exists"
-msgstr "Не вдається додати \"%s\" до списку заборон (%s)."
+msgstr "Не вдається додати групу: група існує"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
-
-#, fuzzy
+msgstr "Група \"%s\" вже існує у вашому переліку контактів."
+
 msgid "Unable to add group"
-msgstr "Не вдається перейменувати групу"
+msgstr "Не вдається додати групу"
 
 msgid "Possible Matches"
-msgstr ""
+msgstr "Можливі збіги"
 
 msgid "Notes Address Book group results"
-msgstr ""
+msgstr "Результати групової адресної книги Notes"
 
 #, c-format
 msgid ""
@@ -9145,13 +8857,11 @@
 "to your buddy list."
 msgstr ""
 
-#, fuzzy
 msgid "Select Notes Address Book"
-msgstr "Додати до адресної книги"
-
-#, fuzzy
+msgstr "Вибрати адресну книгу Notes"
+
 msgid "Unable to add group: group not found"
-msgstr "Не вдається прочитати з мережі"
+msgstr "Не вдається додати групу: група не знайдена"
 
 #, c-format
 msgid ""
@@ -9159,18 +8869,17 @@
 "Sametime community."
 msgstr ""
 
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "Додати до адресної книги"
+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 ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Search results for '%s'"
-msgstr "Результати пошуку"
+msgstr "Результати пошуку для '%s'"
 
 #, c-format
 msgid ""
@@ -9178,11 +8887,13 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
+"Пошуковий вираз \"%s\" може посилатись на будь-якого з нижчеподаних "
+"користувачів. Ви можете додати цих користувачів до вашого переліку контактів "
+"або надіслати їм повідомлення, натиснувши кнопку нижче."
 
 msgid "Search Results"
 msgstr "Результати пошуку"
 
-#, fuzzy
 msgid "No matches"
 msgstr "Немає збігів"
 
@@ -9190,43 +8901,39 @@
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#, fuzzy
 msgid "No Matches"
 msgstr "Немає збігів"
 
-#, fuzzy
 msgid "Search for a user"
-msgstr "_Шукати:"
+msgstr "Шукати користувача"
 
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#, fuzzy
 msgid "User Search"
-msgstr "Шукати"
+msgstr "Пошук користувачів"
 
 msgid "Import Sametime List..."
-msgstr ""
+msgstr "Імпортувати перелік Sametime..."
 
 msgid "Export Sametime List..."
-msgstr ""
-
-#, fuzzy
+msgstr "Експортувати перелік Sametime..."
+
 msgid "Add Notes Address Book Group..."
-msgstr "Додати до адресної книги"
-
-#, fuzzy
+msgstr "Додати групу адресної книги Notes..."
+
 msgid "User Search..."
-msgstr "Шукати"
+msgstr "Пошук користувачів..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "Примусовий вхід (нехтувати перенаправленнями сервера)"
 
 #. pretend to be Sametime Connect
+#, fuzzy
 msgid "Hide client identity"
-msgstr ""
+msgstr "Перевірочний клієнт IPC"
 
 #, c-format
 msgid "User %s is not present in the network"
@@ -9333,9 +9040,8 @@
 "Щоб додати користувача необхідно імпортувати його/її ключ. Щоб імпортувати "
 "ключ, натисніть \"Імпортувати\""
 
-#, fuzzy
 msgid "_Import..."
-msgstr "Імпортувати..."
+msgstr "_Імпортувати..."
 
 msgid "Select correct user"
 msgstr "Виберіть коректного користувача"
@@ -9415,7 +9121,7 @@
 msgstr "Знищити користувача"
 
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "Малювати на дошці"
 
 msgid "_Passphrase:"
 msgstr "_Парольна фраза:"
@@ -9568,9 +9274,8 @@
 msgid "Cannot join private group"
 msgstr "Не вдається приєднатись до особистої групи"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "команда"
+msgstr "Виконати команду"
 
 msgid "Cannot call command"
 msgstr "Не вдається виконати команду"
@@ -9584,9 +9289,8 @@
 msgid "Error during file transfer"
 msgstr "Помилка при передаванні файлу"
 
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "З'єднання розірвано."
+msgstr ""
 
 msgid "Permission denied"
 msgstr "Доступ заборонено"
@@ -9594,15 +9298,12 @@
 msgid "Key agreement failed"
 msgstr "Не вдається виконати узгодження ключів"
 
-#, fuzzy
 msgid "Connection timed out"
 msgstr "Вийшов час очікування з'єднання"
 
-#, fuzzy
 msgid "Creating connection failed"
 msgstr "Не вдається встановити з'єднання"
 
-#, fuzzy
 msgid "File transfer session does not exist"
 msgstr "Сеанси передавання файлів не існують"
 
@@ -9622,7 +9323,7 @@
 msgstr "Не вдається надіслати файл"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "Трапилась помилка"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -9685,12 +9386,11 @@
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Засновником каналу на <I>%s</I> є <I>%s</I>"
 
-#, fuzzy
 msgid "Real Name"
 msgstr "Справжнє ім'я"
 
 msgid "Status Text"
-msgstr "Текст статусу"
+msgstr "Текст стану"
 
 msgid "Public Key Fingerprint"
 msgstr "Відбитки публічного ключа"
@@ -9698,9 +9398,8 @@
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint публічного ключа"
 
-#, fuzzy
 msgid "_More..."
-msgstr "Додатково..."
+msgstr "_Більше..."
 
 msgid "Detach From Server"
 msgstr "Розірвати з'єднання з сервером"
@@ -9720,9 +9419,8 @@
 msgid "Cannot get room list"
 msgstr "Не вдається отримати список кімнат"
 
-#, fuzzy
 msgid "Network is empty"
-msgstr "Статистика мережі"
+msgstr "Мережа порожня"
 
 msgid "No public key was received"
 msgstr "Не було прийнято публічних ключів"
@@ -9789,11 +9487,10 @@
 msgstr "Не вдається знищити користувача"
 
 msgid "WATCH"
-msgstr ""
-
-#, fuzzy
+msgstr "WATCH"
+
 msgid "Cannot watch user"
-msgstr "Не можна додавати себе самого"
+msgstr "Неможливо слідкувати за користувачем"
 
 msgid "Resuming session"
 msgstr "Відновлення сеансу"
@@ -9812,7 +9509,7 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"Отримано публічний ключ %s. Локальна копія не співпадає з цим ключем. Досі "
+"Отримано публічний ключ %s. Локальна копія не збігається з цим ключем. Досі "
 "хочете прийняти цей публічний ключ?"
 
 #, c-format
@@ -9834,9 +9531,8 @@
 msgid "Verify Public Key"
 msgstr "Перевірити публічний ключ"
 
-#, fuzzy
 msgid "_View..."
-msgstr "Переглянуті..."
+msgstr "_Переглянути..."
 
 msgid "Unsupported public key type"
 msgstr "Непідтримуваний тип публічного ключа"
@@ -9844,7 +9540,6 @@
 msgid "Disconnected by server"
 msgstr "З'єднання розірвано сервером"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Помилка при з'єднанні з сервером SILC"
 
@@ -9862,7 +9557,7 @@
 
 #, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "Не вдається завантажити публічний ключ"
+msgstr "Не вдається завантажити пару ключів SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
@@ -9873,15 +9568,14 @@
 
 #, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
-
-#, fuzzy
+msgstr "Не вдається ініціалізувати протокол SILC"
+
 msgid "Error loading SILC key pair"
-msgstr "Створення пари ключів SILC..."
-
-#, fuzzy, c-format
+msgstr "Помилка завантаження пари ключів SILC key"
+
+#, c-format
 msgid "Download %s: %s"
-msgstr "Користувачі %s: %s"
+msgstr "Звантаження %s: %s"
 
 msgid "Your Current Mood"
 msgstr "Ваш поточний настрій"
@@ -9890,7 +9584,6 @@
 msgid "Normal"
 msgstr "Нормально"
 
-#, fuzzy
 msgid "In love"
 msgstr "Закоханий"
 
@@ -9907,12 +9600,11 @@
 msgid "MMS"
 msgstr "MMS"
 
-#, fuzzy
 msgid "Video conferencing"
 msgstr "Відеоконференція"
 
 msgid "Your Current Status"
-msgstr "Ваш поточний статус"
+msgstr "Ваш поточний стан"
 
 msgid "Online Services"
 msgstr "Мережні служби"
@@ -9926,19 +9618,18 @@
 msgid "Your VCard File"
 msgstr "Ваш файл VCard"
 
-#, fuzzy
 msgid "Timezone (UTC)"
-msgstr "Часовий пояс"
+msgstr "Часовий пояс (UTC)"
 
 msgid "User Online Status Attributes"
-msgstr "Атрибути мережного статусу користувача"
+msgstr "Атрибути стану в мережі користувача"
 
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Ви можете дозволити іншим користувачам бачити ваш статус та вашу особисту "
+"Ви можете дозволити іншим користувачам бачити ваш стан та вашу особисту "
 "інформацію. Введіть інформацію, яку ви бажаєте дати змогу бачити іншим "
 "користувачам."
 
@@ -9951,37 +9642,29 @@
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Немає повідомлення дня, що відповідає цьому з'єднанню"
 
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "Створення пари ключів SILC..."
-
-#, fuzzy
+msgstr "Створення нової пари ключів SILC"
+
 msgid "Passphrases do not match"
-msgstr "Нові паролі не співпадають."
-
-#, fuzzy
+msgstr "Нові паролі не збігаються."
+
 msgid "Key Pair Generation failed"
-msgstr "Не вдається виконати узгодження ключів"
-
-#, fuzzy
+msgstr "Не вдалося створити пару ключів"
+
 msgid "Key length"
-msgstr "Довжина ключа: \t%d біт\n"
-
-#, fuzzy
+msgstr "Довжина ключа"
+
 msgid "Public key file"
 msgstr "Файл публічного ключа"
 
-#, fuzzy
 msgid "Private key file"
 msgstr "Файл приватного ключа"
 
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "Пароль відправлено"
-
-#, fuzzy
+msgstr "Пароль (ще раз)"
+
 msgid "Generate Key Pair"
-msgstr "Файл приватного ключа"
+msgstr "Створення пару ключів"
 
 msgid "Online Status"
 msgstr "Мережний стан"
@@ -9989,9 +9672,8 @@
 msgid "View Message of the Day"
 msgstr "Переглянути повідомлення дня"
 
-#, fuzzy
 msgid "Create SILC Key Pair..."
-msgstr "Створення пари ключів SILC..."
+msgstr "Створити пару ключів SILC..."
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -10019,9 +9701,9 @@
 msgid "Failed to set cmodes for %s"
 msgstr "Не вдається встановити режими каналу для %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Невідома команда: %s, (можливо, помилка Pidgin)"
+msgstr "Невідома команда: %s, (можливо, помилка клієнта)"
 
 msgid "part [channel]:  Leave the chat"
 msgstr "part [канал]:  Залишити розмову"
@@ -10090,7 +9772,7 @@
 "користувача чи каналу"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;режими_користувача&gt;:  Встановити ваш режим у мережі"
+msgstr "umode &lt;режими _користувача&gt;:  Встановити ваш режим у мережі"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
@@ -10145,7 +9827,7 @@
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "Модуль протоколу SILC"
+msgstr "Додаток протоколу SILC"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
@@ -10161,10 +9843,10 @@
 msgstr "Файл приватного ключа"
 
 msgid "Cipher"
-msgstr ""
+msgstr "Шифр"
 
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
@@ -10175,12 +9857,13 @@
 msgid "Block IMs without Key Exchange"
 msgstr "Блокувати повідомлення без обміну ключами"
 
+#, fuzzy
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "Вкажіть користувача, якого блокувати."
 
 #, fuzzy
 msgid "Automatically open whiteboard"
-msgstr "_Автоматично розкривати контакти"
+msgstr "Не вдається відкрити сокет"
 
 #, fuzzy
 msgid "Digitally sign and verify all messages"
@@ -10191,7 +9874,7 @@
 
 #, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Створення пари ключів SILC..."
+msgstr "Не вдалося створити пару ключів SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10204,9 +9887,9 @@
 msgid "User Name: \t%s\n"
 msgstr "Ім'я користувача: \t%s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Ел.пошта: \t%s\n"
+msgstr "Ел. пошта: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
@@ -10224,13 +9907,13 @@
 msgid "Algorithm: \t%s\n"
 msgstr "Алгоритм: \t%s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Довжина ключа: \t%d біт\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Організація: \t%s\n"
+msgstr "Версія: \t%s\n"
 
 #, c-format
 msgid ""
@@ -10279,7 +9962,7 @@
 msgstr ""
 
 msgid "Whiteboard"
-msgstr ""
+msgstr "Дошка"
 
 msgid "No server statistics available"
 msgstr "Немає доступної статистики серверу"
@@ -10331,21 +10014,19 @@
 msgid "Unable to initialize SILC Client connection"
 msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Вузол пішов"
+msgstr "Іван Безімян"
 
 #, fuzzy, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Не вдається завантажити публічний ключ"
-
-#, fuzzy
+msgstr "Не вдається завантажити пару ключів SILC: %s"
+
 msgid "Unable to create connection"
-msgstr "Не вдається створити нове з'єднання."
+msgstr "Не вдається створити з'єднання"
 
 #, fuzzy
 msgid "Unknown server response"
-msgstr "Невідома помилка."
+msgstr "Невідома відповідь сервера."
 
 #, fuzzy
 msgid "Unable to create listen socket"
@@ -10357,7 +10038,7 @@
 
 #, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Показати менше параметри"
+msgstr "Сервер не додано: неприпустимий порт."
 
 #. *< type
 #. *< ui_requirement
@@ -10367,33 +10048,28 @@
 #. *< id
 #. *< name
 #. *< version
-#, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Модуль протоколу SILC"
+msgstr "Додаток протоколу SIP/SIMPLE"
 
 #. *  summary
-#, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Модуль протоколу SILC"
+msgstr "Додаток протоколу SIP/SIMPLE"
 
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#, fuzzy
 msgid "Use UDP"
-msgstr "ID користувача"
-
-#, fuzzy
+msgstr "Використовувати UDP"
+
 msgid "Use proxy"
-msgstr "без проксі"
-
-#, fuzzy
+msgstr "Використовувати проксі"
+
 msgid "Proxy"
-msgstr "без проксі"
+msgstr "Проксі"
 
 #, fuzzy
 msgid "Auth User"
-msgstr "Користувач AP"
+msgstr "Перелік %d користувача:"
 
 #, fuzzy
 msgid "Auth Domain"
@@ -10402,16 +10078,14 @@
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
 
-#, fuzzy
 msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Список каналів цієї мережі"
+msgstr "list: перелік кімнат в мережі Yahoo"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10425,23 +10099,21 @@
 #. *  description
 #, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Модуль протоколу Yahoo"
+msgstr "Додаток протоколу Yahoo"
 
 #, fuzzy
 msgid "Pager server"
-msgstr "Проксі-сервер"
+msgstr "Неправильний сервер"
 
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#, fuzzy
 msgid "File transfer server"
-msgstr "Вузол передавання файлів"
+msgstr "Сервер передавання файлів"
 
 msgid "File transfer port"
 msgstr "Порт передавання файлів"
 
-#, fuzzy
 msgid "Chat room locale"
 msgstr "Локаль кімнати розмов"
 
@@ -10451,20 +10123,17 @@
 msgid "Use account proxy for SSL connections"
 msgstr ""
 
-#, fuzzy
 msgid "Chat room list URL"
-msgstr "Url переліку розмов"
+msgstr "URL переліку розмов"
 
 msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
+msgstr "Сервер розмов Yahoo"
+
 msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
-#, fuzzy
+msgstr "Порт Yahoo Chat"
+
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo JAPAN ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -10478,14 +10147,14 @@
 #. *  description
 #, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Модуль протоколу Yahoo"
+msgstr "Додаток протоколу Yahoo"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Ваше SMS-повідомлення не доставлене"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше повідомлення Yahoo! не відправлено."
@@ -10530,9 +10199,8 @@
 "Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Неправильне прізвисько або пароль."
+msgstr "Відсутнє ім'я користувача або пароль"
 
 #, fuzzy, c-format
 msgid ""
@@ -10559,9 +10227,8 @@
 msgid "Ignore buddy?"
 msgstr "Ігнорувати користувача?"
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "Неправильне прізвисько або пароль."
+msgstr "Неправильне ім'я користувача або пароль"
 
 #, fuzzy
 msgid ""
@@ -10572,7 +10239,7 @@
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Невідома помилка 52. Повторне з'єднання має виправити її."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
@@ -10596,29 +10263,27 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Недопустима відповідь від сервера."
-
-#, fuzzy, c-format
+msgstr "Отримана неприпустима відповідь HTTP від сервера"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "Бесіда з %s"
+msgstr "Втрата з'єднання з %s: %s"
 
 #, fuzzy, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "Не вдається встановити SSL-з'єднання з сервером."
-
-#, fuzzy
+msgstr ""
+"Не вдалося встановити з'єднання з сервером:\n"
+"%s"
+
 msgid "Not at Home"
 msgstr "Не вдома"
 
-#, fuzzy
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#, fuzzy
 msgid "Not in Office"
-msgstr "Не у офісі"
+msgstr "Не в офісі"
 
 msgid "On Vacation"
 msgstr "У відпустці"
@@ -10629,17 +10294,15 @@
 msgid "Not on server list"
 msgstr "Не у списку сервера"
 
-#, fuzzy
 msgid "Appear Online"
-msgstr " не у мережі"
+msgstr "З'явився в мережі"
 
 #, fuzzy
 msgid "Appear Permanently Offline"
-msgstr " не у мережі"
-
-#, fuzzy
+msgstr "Показувати, коли не у мережі"
+
 msgid "Presence"
-msgstr "Параметри"
+msgstr "Присутність"
 
 msgid "Appear Offline"
 msgstr " не у мережі"
@@ -10654,12 +10317,11 @@
 msgid "Initiate Conference"
 msgstr "Створити конференцію"
 
-#, fuzzy
 msgid "Presence Settings"
-msgstr "використовувати параметри оточення"
+msgstr "Налаштування присутності"
 
 msgid "Start Doodling"
-msgstr ""
+msgstr "Розпочати балачку"
 
 msgid "Select the ID you want to activate"
 msgstr ""
@@ -10672,10 +10334,10 @@
 
 #, fuzzy
 msgid "Join User in Chat..."
-msgstr "Приєднатися до користувача у розмові..."
+msgstr "До кого приєднатись у розмові?"
 
 msgid "Open Inbox"
-msgstr ""
+msgstr "Відкрити теку вхідних"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
@@ -10690,7 +10352,7 @@
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Надіслати запит на балачку."
 
 msgid "Unable to connect."
 msgstr "Не вдається встановити з'єднання."
@@ -10698,11 +10360,10 @@
 msgid "Unable to establish file descriptor."
 msgstr "Не вдається встановити дескриптор файлу."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "Пропозиція надіслати %s до %s"
-
-#, fuzzy
+msgstr "%s намагається надіслати вам %d файлів.\n"
+
 msgid "Write Error"
 msgstr "Помилка запису"
 
@@ -10719,13 +10380,12 @@
 "Профілі, позначені як такі, що містять вміст лише для дорослих, наразі не "
 "підтримуються."
 
-#, fuzzy
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "Якщо ви бажаєте переглянути цей профіль, вам слід відвідати це посилання у "
-"веб-переглядачі"
+"переглядачі тенет:"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
@@ -10751,10 +10411,9 @@
 msgid "Last Update"
 msgstr "Останнє оновлення"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "Схоже, цей профіль на мові, яка наразі не підтримується."
+msgstr "Схоже, цей профіль на мові або у форматі, які наразі не підтримується."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10777,23 +10436,20 @@
 
 #, fuzzy, c-format
 msgid "%s has declined to join."
-msgstr "%s входить (%s)"
+msgstr "%s увійшов."
 
 msgid "Failed to join chat"
 msgstr "Не вдається приєднатися до розмови"
 
 #. -6
-#, fuzzy
 msgid "Unknown room"
-msgstr "Невідома помилка"
+msgstr "Невідома кімната"
 
 #. -15
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "Можливо, він не у кімнаті розмов?"
+msgstr "Можливо, кімната переповнена"
 
 #. -35
-#, fuzzy
 msgid "Not available"
 msgstr "Недоступний"
 
@@ -10841,13 +10497,12 @@
 "(Помилка перетворення повідомлення. Перевірте параметр \"Кодування\" у "
 "редакторі облікових записів)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Не вдається надіслати у розмову %s,%s,%s"
-
-#, fuzzy
+msgstr "Не вдається відправити до балачки %s,%s,%s"
+
 msgid "Hidden or not logged-in"
-msgstr "<b>Прихований або не у мережі"
+msgstr "Прихований або не в мережі"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -10885,10 +10540,9 @@
 "inst &lt;екземпляр&gt;: Встановити екземпляр, що буде використовуватись у "
 "цьому класі"
 
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;екземпляр&gt;: Встановити екземпляр, що буде використовуватись у "
+"topic &lt;instance&gt;: Встановити екземпляр, що буде використовуватись у "
 "цьому класі"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
@@ -10944,15 +10598,13 @@
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Модуль протоколу Zephyr"
-
-#, fuzzy
+msgstr "Додаток протоколу Zephyr"
+
 msgid "Use tzc"
-msgstr "Відділ"
-
-#, fuzzy
+msgstr "Використовувати tzc"
+
 msgid "tzc command"
-msgstr "Немає такої команди."
+msgstr "Команда tzc"
 
 msgid "Export to .anyone"
 msgstr "Експортувати у .anyone"
@@ -10960,82 +10612,77 @@
 msgid "Export to .zephyr.subs"
 msgstr "Експортувати у .zephyr.subs"
 
-#, fuzzy
 msgid "Import from .anyone"
-msgstr "Експортувати у .anyone"
-
-#, fuzzy
+msgstr "Імпортувати з .anyone"
+
 msgid "Import from .zephyr.subs"
-msgstr "Експортувати у .zephyr.subs"
-
-#, fuzzy
+msgstr "Імпорт з .zephyr.subs"
+
 msgid "Realm"
-msgstr "Справжнє ім'я"
+msgstr ""
 
 msgid "Exposure"
 msgstr "Експозиція"
 
 #, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Не вдається відправити повідомлення: %s"
-
-#, fuzzy, c-format
+msgstr "Не вдається встановити роль \"%s\" для користувача: %s"
+
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Помилка з'єднання з проксі %d"
-
-#, fuzzy, c-format
+msgstr "Помилка з'єднання з HTTP-проксі %d"
+
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Доступ заборонено: проксі-сервер забороняє тунелювання порту %d."
-
-#, fuzzy, c-format
+msgstr "В доступ відмовлено: HTTP проксі-сервер забороняє тунелювання порту %d"
+
+#, c-format
 msgid "Error resolving %s"
-msgstr "Помилка підключення до розмови %s"
+msgstr "Помилка отримання назви вузла %s"
 
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s запитує вашу інформацію"
+msgstr "%s привернув вашу увагу!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "Так"
-
-#, fuzzy
+msgstr "_Так"
+
 msgid "_No"
-msgstr "Ні"
+msgstr "_Ні"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#, fuzzy
 msgid "_Accept"
-msgstr "Прийняти"
+msgstr "_Прийняти"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr ""
-
-#, fuzzy
+msgstr "Я зараз не тут"
+
 msgid "saved statuses"
-msgstr "Статистика сервера"
+msgstr "збережені стани"
 
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s відомий як %s.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s запросив %s у кімнату розмов %s\n"
+msgstr ""
+"%s запросив %s до кімнати балачок %s:\n"
+"%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
@@ -11045,24 +10692,22 @@
 msgstr "Прийняти запрошення до розмови?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Комбінації клавіш"
+msgstr "Комбінація клавіші"
 
 msgid "The text-shortcut for the smiley"
-msgstr ""
+msgstr "Комбінація клавіш для смайлу"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Збереження зображення"
-
+msgstr "Збережене зображення"
+
+#, fuzzy
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
-
-#, fuzzy
+msgstr "Збережене зображення. ()"
+
 msgid "SSL Connection Failed"
-msgstr "Не вдається встановити з'єднання"
+msgstr "Помилка з'єднання SSL"
 
 msgid "SSL Handshake Failed"
 msgstr "Не вдається виконати узгодження SSL"
@@ -11071,36 +10716,32 @@
 msgid "SSL peer presented an invalid certificate"
 msgstr "Ви ввели неправильне ім'я користувача"
 
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Невідома помилка"
-
-#, fuzzy
+msgstr "Невідома помилка SSL"
+
 msgid "Unset"
-msgstr "Відділ"
-
-#, fuzzy
+msgstr "Зняти"
+
 msgid "Do not disturb"
 msgstr "Не турбувати"
 
-#, fuzzy
 msgid "Extended away"
-msgstr "Розширений статус \"Відійшов\""
+msgstr "Розширений стан \"Відійшов\""
 
 msgid "Listening to music"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Слухаю музику"
+
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s змінив тему на: %s"
-
-#, fuzzy, c-format
+msgstr "%s (%s) змінив стан з %s на %s"
+
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s тепер відомий як %s"
-
-#, fuzzy, c-format
+msgstr "%s (%s) тепер %s"
+
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s повертається."
+msgstr "%s (%s) більше не %s"
 
 #, c-format
 msgid "%s became idle"
@@ -11110,13 +10751,13 @@
 msgid "%s became unidle"
 msgstr "%s виходить зі стану бездіяльності"
 
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s became idle"
-msgstr "%s має стан бездіяльності"
-
-#, fuzzy, c-format
+msgstr "+++ %s став бездіяльним"
+
+#, c-format
 msgid "+++ %s became unidle"
-msgstr "%s виходить зі стану бездіяльності"
+msgstr "+++ %s став небездіяльним"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -11126,7 +10767,7 @@
 #.
 #, c-format
 msgid "%x %X"
-msgstr ""
+msgstr "%x %X"
 
 msgid "Calculating..."
 msgstr "Підрахунок..."
@@ -11134,61 +10775,59 @@
 msgid "Unknown."
 msgstr "Невідомо."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "секунда"
-msgstr[1] "секунди"
-msgstr[2] "секунди"
-
-#, fuzzy, c-format
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунди"
+msgstr[2] "%d секунд"
+
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "день"
-msgstr[1] "дні"
-msgstr[2] "днів"
+msgstr[0] "%d доба"
+msgstr[1] "%d доби"
+msgstr[2] "%d діб"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#, fuzzy, c-format
+msgstr[0] "%s, %d година"
+msgstr[1] "%s, %d години"
+msgstr[2] "%s, %d годин"
+
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "година"
-msgstr[1] "години"
-msgstr[2] "годин"
-
-#, fuzzy, c-format
+msgstr[0] "%d година"
+msgstr[1] "%d години"
+msgstr[2] "%d годин"
+
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "хвилина"
-msgstr[1] "хвилини"
-msgstr[2] "хвилин"
-
-#, fuzzy, c-format
+msgstr[0] "%s, %d хвилина"
+msgstr[1] "%s, %d хвилини"
+msgstr[2] "%s, %d хвилин"
+
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "хвилина"
-msgstr[1] "хвилини"
-msgstr[2] "хвилин"
+msgstr[0] "%d хвилина"
+msgstr[1] "%d хвилини"
+msgstr[2] "%d хвилин"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy, c-format
+msgstr "Не вдається з'єднатися з %s"
+
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
 
 #, c-format
 msgid ""
@@ -11196,29 +10835,25 @@
 "server may be trying something malicious."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
+msgstr "Помилка читання з %s: %s"
+
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"Помилка запису %s: \n"
-"%s.\n"
-
-#, fuzzy, c-format
+msgstr "Помилка запису до %s: %s"
+
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Не вдається з'єднатися з сервером."
+msgstr "Не вдається з'єднатися з %s: %s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr " - %s"
+
+#, c-format
 msgid " (%s)"
-msgstr "%s на %s (%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
@@ -11228,28 +10863,26 @@
 #. 10054
 #, fuzzy, c-format
 msgid "Remote host closed connection."
-msgstr "%s закрив вікно бесіди."
+msgstr "Спроба доступу без уповноваження. З'єднання розірвано."
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "Вийшов час очікування з'єднання"
+msgstr "Сплинув час очікування з'єднання."
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "З'єднання розірвано"
+msgstr "З'єднання відхилене."
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Такий файл вже існує"
-
-#, fuzzy, c-format
+msgstr "Адреса вже використовується."
+
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"Помилка читання %s: \n"
-"%s.\n"
+msgstr "Помилка читання %s"
 
 #, fuzzy, c-format
 msgid ""
@@ -11265,11 +10898,10 @@
 
 #, fuzzy
 msgid "Internet Messenger"
-msgstr "Обмін миттєвими повідомленнями"
-
-#, fuzzy
+msgstr "Messenger Plus!"
+
 msgid "Pidgin Internet Messenger"
-msgstr "Обмін миттєвими повідомленнями"
+msgstr "Клієнт обміну миттєвими повідомленнями Pidgin"
 
 msgid "Orientation"
 msgstr "Орієнтація"
@@ -11281,40 +10913,34 @@
 msgid "Login Options"
 msgstr "Параметри входу"
 
-#, fuzzy
 msgid "Pro_tocol:"
-msgstr "Протокол:"
+msgstr "_Протокол:"
 
 msgid "_Username:"
 msgstr "_Ім'я користувача"
 
-#, fuzzy
 msgid "Remember pass_word"
-msgstr "Запам'ятати пароль"
+msgstr "Запам'ятати _пароль"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "Меню користувача"
-
-#, fuzzy
+msgstr "Налаштування користувача"
+
 msgid "_Local alias:"
-msgstr "Локальний файл:"
-
-#, fuzzy
+msgstr "_Місцеве прізвисько:"
+
 msgid "New _mail notifications"
-msgstr "Сповіщення про нову пошту"
+msgstr "_Сповіщення про нову пошту"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
-
-#, fuzzy
+msgstr "Встановити цей _значок контакту для цього облікового запису:"
+
 msgid "Ad_vanced"
-msgstr "_Скасувати"
-
-#, fuzzy
+msgstr "_Розширені"
+
 msgid "Use GNOME Proxy Settings"
-msgstr "використовувати глобальні параметри проксі"
+msgstr "Використовувати налаштування проксі GNOME"
 
 msgid "Use Global Proxy Settings"
 msgstr "використовувати глобальні параметри проксі"
@@ -11356,32 +10982,28 @@
 msgstr "_Порт:"
 
 msgid "Pa_ssword:"
-msgstr "Па_роль"
-
-#, fuzzy
+msgstr "Па_роль:"
+
 msgid "Unable to save new account"
-msgstr "Не вдається створити нове з'єднання."
+msgstr "Не вдається зберегти новий обліковий запис"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Обліковий запис з визначеними критеріями вже існує"
 
 msgid "Add Account"
 msgstr "Додавання облікового запису"
 
-#, fuzzy
 msgid "_Basic"
-msgstr "Повернувся"
+msgstr "_Основне"
 
 msgid "Create _this new account on the server"
-msgstr ""
-
-#, fuzzy
+msgstr "Створити цей _новий обліковий запис на сервері"
+
 msgid "P_roxy"
-msgstr "без проксі"
-
-#, fuzzy
+msgstr "_Проксі"
+
 msgid "Enabled"
-msgstr "Помилка"
+msgstr "Увімкнути"
 
 msgid "Protocol"
 msgstr "Протокол"
@@ -11398,9 +11020,19 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
+"<span size='larger' weight='bold'>Ласкаво просимо до %s!</span>\n"
+"\n"
+"Ви не налаштували жодного обікового запису миттєвих повідомлень. Щоб "
+"розпочати з'єднання з %s натисніть кнопку <b>Додати...</b> нижче та "
+"налаштуйте ваш перший обліковий запис. Якщо ви хочете, щоб %s з'єднався з "
+"декількома облаковими записами, написніть <b>Додати...</b> ще раз, щоб "
+"налаштувати їх всі.\n"
+"\n"
+"Ви можете повернутися до цього вікна, щоб додати, редагувати, вилучити "
+"облікові записи з <b>Обл. записи->Керування обліковими записами</b> у вікні "
+"переліку контактів"
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
 msgstr "Колір тла"
 
@@ -11408,9 +11040,8 @@
 msgid "The background color for the buddy list"
 msgstr "Бажаєте додати цей контакт у список контактів?"
 
-#, fuzzy
 msgid "Layout"
-msgstr "Не у мережі"
+msgstr "Шаблон"
 
 #, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
@@ -11428,9 +11059,8 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Розгорнути"
+msgstr "Розгорнутий текст"
 
 msgid "The text information for when a group is expanded"
 msgstr ""
@@ -11446,9 +11076,8 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_Згорнути"
+msgstr "Згорнутий текст"
 
 msgid "The text information for when a group is collapsed"
 msgstr ""
@@ -11465,18 +11094,16 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "Комбінації клавіш"
+msgstr "Текст контакту"
 
 msgid "The text information for when a contact is expanded"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "У мережі"
+msgstr "Текст у мережі"
 
 #, fuzzy
 msgid "The text information for when a buddy is online"
@@ -11484,9 +11111,8 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "Користувач відійшов"
+msgstr "Текст відійшов"
 
 #, fuzzy
 msgid "The text information for when a buddy is away"
@@ -11494,9 +11120,8 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Не в мережі"
+msgstr "Текст не в мережі"
 
 #, fuzzy
 msgid "The text information for when a buddy is offline"
@@ -11504,9 +11129,8 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "Настрій"
+msgstr "Текст без дій"
 
 #, fuzzy
 msgid "The text information for when a buddy is idle"
@@ -11551,11 +11175,10 @@
 msgstr ""
 
 msgid "Please update the necessary fields."
-msgstr ""
-
-#, fuzzy
+msgstr "Будь ласка, оновіть необхідні поля."
+
 msgid "A_ccount"
-msgstr "Обліковий запис:"
+msgstr "_Обліковий запис"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11564,56 +11187,47 @@
 "Введіть відповідну інформацію про розмову, до якого ви бажали б "
 "приєднатись.\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "Перелік кімнат"
-
-#, fuzzy
+msgstr "Перелік _кімнат"
+
 msgid "_Block"
-msgstr "Блокувати"
-
-#, fuzzy
+msgstr "_Блокувати"
+
 msgid "Un_block"
-msgstr "Блокувати"
+msgstr "_Розблокувати"
 
 msgid "Move to"
-msgstr ""
+msgstr "Перемістити до"
 
 msgid "Get _Info"
-msgstr "_Інформ"
+msgstr "Отримати _інформацію"
 
 msgid "I_M"
-msgstr "_Повідомл"
-
-#, fuzzy
+msgstr "_Повідомлення"
+
 msgid "_Audio Call"
-msgstr "Додати розмову"
+msgstr "_Голосовий дзвінок"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Аудіо/_Відеодзвінок"
+
 msgid "_Video Call"
-msgstr "Відеорозмова"
-
-#, fuzzy
+msgstr "_Відеодзвінок"
+
 msgid "_Send File..."
-msgstr "_Надіслати файл"
-
-#, fuzzy
+msgstr "_Надіслати файл..."
+
 msgid "Add Buddy _Pounce..."
-msgstr "Додати _правило"
+msgstr "Додати _стеження за контактом..."
 
 msgid "View _Log"
 msgstr "Переглянути _журнал"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Не допускається не у мережі"
-
-#, fuzzy
+msgstr "Сховати, коли не в мережі"
+
 msgid "Show When Offline"
-msgstr "Не допускається не у мережі"
+msgstr "Показувати, коли не у мережі"
 
 msgid "_Alias..."
 msgstr "_Псевдонім..."
@@ -11621,27 +11235,23 @@
 msgid "_Remove"
 msgstr "В_идалити"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Інше"
-
-#, fuzzy
+msgstr "Встановити нетиповий значок"
+
 msgid "Remove Custom Icon"
-msgstr "Видалити контакт"
-
-#, fuzzy
+msgstr "Вилучити нетиповий значок"
+
 msgid "Add _Buddy..."
-msgstr "Додати користувача"
-
-#, fuzzy
+msgstr "Додати _користувача..."
+
 msgid "Add C_hat..."
-msgstr "Додати розмову"
+msgstr "Додати _розмову..."
 
 msgid "_Delete Group"
 msgstr "В_идалити групу"
 
 msgid "_Rename"
-msgstr "Пере_йменувати"
+msgstr "_Змінити ім'я"
 
 #. join button
 msgid "_Join"
@@ -11650,13 +11260,11 @@
 msgid "Auto-Join"
 msgstr "Авто-приєднання"
 
-#, fuzzy
 msgid "Persistent"
-msgstr "Дозволити"
-
-#, fuzzy
+msgstr "Постійний"
+
 msgid "_Edit Settings..."
-msgstr "використовувати параметри оточення"
+msgstr "_Редагувати налаштування..."
 
 msgid "_Collapse"
 msgstr "_Згорнути"
@@ -11664,9 +11272,8 @@
 msgid "_Expand"
 msgstr "_Розгорнути"
 
-#, fuzzy
 msgid "/Tools/Mute Sounds"
-msgstr "Вимкнути звук"
+msgstr "/Сервіс/Вимкнути звук"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -11677,9 +11284,8 @@
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "Неправильний код помилки %d"
+msgstr "Невідомий тип вузла"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -11697,33 +11303,26 @@
 msgid "/Buddies/View User _Log..."
 msgstr "/Контакти/Переглянути _журнал користувача..."
 
-#, fuzzy
 msgid "/Buddies/Sh_ow"
-msgstr "/Контакти/Ві_д'єднатись"
-
-#, fuzzy
+msgstr "/Контакти/По_казати"
+
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Контакти/Показати _відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Тих, хто _не в мережі"
+
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Контакти/Показати _порожні групи"
-
-#, fuzzy
+msgstr "/Контакти/Показати/_Порожні групи"
+
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/_Подробиці користувачів"
+
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/_Час бездіяння"
+
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Контакти/Показати _порожні групи"
-
-#, fuzzy
+msgstr "/Контакти/Показати/_Значки протоколів"
+
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Контакти/Показувати відсутніх користувачів"
+msgstr "/Контакти/_Впорядкувати користувачів"
 
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Контакти/Додати _користувача..."
@@ -11738,33 +11337,27 @@
 msgstr "/Контакти/Ви_йти"
 
 #. Accounts menu
-#, fuzzy
 msgid "/_Accounts"
-msgstr "Облікові записи"
-
-#, fuzzy
+msgstr "/_Обл. записи"
+
 msgid "/Accounts/Manage Accounts"
-msgstr "Облікові записи"
+msgstr "/Обл. записи/Керування обліковими записами"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/С_ервіс"
 
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Сервіс/_Стеження за користувачами"
 
-#, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/Сервіс/П_араметри"
-
-#, fuzzy
+msgstr "/Сервіс/С_ертифікати"
+
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Сервіс/С_татус"
-
-#, fuzzy
+msgstr "/Сервіс/Нетипові _смайли"
+
 msgid "/Tools/Plu_gins"
-msgstr "/Сервіс/Дії над модулями"
+msgstr "/Сервіс/_Модулі"
 
 msgid "/Tools/Pr_eferences"
 msgstr "/Сервіс/П_араметри"
@@ -11778,13 +11371,11 @@
 msgid "/Tools/R_oom List"
 msgstr "/Сервіс/_Перелік кімнат"
 
-#, fuzzy
 msgid "/Tools/System _Log"
-msgstr "/Сервіс/Переглянути системний _журнал"
-
-#, fuzzy
+msgstr "/Сервіс/Системний _журнал"
+
 msgid "/Tools/Mute _Sounds"
-msgstr "Вимкнути звук"
+msgstr "/Сервіс/Вимкнути _звук"
 
 #. Help
 msgid "/_Help"
@@ -11794,16 +11385,14 @@
 msgstr "/Довідка/Довідка у _мережі"
 
 msgid "/Help/_Debug Window"
-msgstr "/Довідка/Вікно _налагодження"
+msgstr "/Довідка/Вікно _зневадження"
 
 msgid "/Help/_About"
 msgstr "/Довідка/_Про програму"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Обліковий запис:</b> %s"
+msgstr "<b>Обліковий запис:</b> %s"
 
 #, fuzzy, c-format
 msgid ""
@@ -11813,77 +11402,67 @@
 "\n"
 "<b>Обліковий запис:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#, fuzzy
+"<b>Тема:</b> %s"
+
 msgid "(no topic set)"
-msgstr "Тему не встановлено"
-
-#, fuzzy
+msgstr "(тема не встановлена)"
+
 msgid "Buddy Alias"
-msgstr "Список контактів"
-
-#, fuzzy
+msgstr "Прізвисько контакту"
+
 msgid "Logged In"
-msgstr "Не у мережі"
-
-#, fuzzy
+msgstr "Увійшов"
+
 msgid "Last Seen"
-msgstr "Прізвище:"
+msgstr "Востаннє в мережі"
 
 msgid "Spooky"
-msgstr ""
+msgstr "Жахливий"
 
 msgid "Awesome"
-msgstr ""
+msgstr "Чудовий"
 
 msgid "Rockin'"
 msgstr ""
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "Користувачі"
-
-#, fuzzy, c-format
+msgstr "Всього контактів"
+
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Бездіяльний (%dh%02dm) "
-
-#, fuzzy, c-format
+msgstr "Без дій %dдб %dгод %02dхв"
+
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "Бездіяльний (%dh%02dm) "
-
-#, fuzzy, c-format
+msgstr "Без дій %dгод %02dхв"
+
+#, c-format
 msgid "Idle %dm"
-msgstr "Бездіяльний (%dm) "
-
-#, fuzzy
+msgstr "Без дій %dхв"
+
 msgid "/Buddies/New Instant Message..."
-msgstr "/Контакти/_Створити повідомлення..."
+msgstr "/Контакти/Нове повідомлення..."
 
 msgid "/Buddies/Join a Chat..."
 msgstr "/Контакти/Приєднатись до розмови..."
 
-#, fuzzy
 msgid "/Buddies/Get User Info..."
-msgstr "/Контакти/Отримати _інформацію про користувача..."
-
-#, fuzzy
+msgstr "/Контакти/Отримати інформацію про контакт..."
+
 msgid "/Buddies/Add Buddy..."
-msgstr "/Контакти/Додати _користувача..."
-
-#, fuzzy
+msgstr "/Контакти/Додати контакт..."
+
 msgid "/Buddies/Add Chat..."
-msgstr "/Контакти/Додати _розмову..."
-
-#, fuzzy
+msgstr "/Контакти/Додати розмову..."
+
 msgid "/Buddies/Add Group..."
-msgstr "/Контакти/Додати _групу..."
+msgstr "/Контакти/Додати групу..."
 
 msgid "/Tools/Privacy"
 msgstr "/Сервіс/Конфіденційність"
@@ -11891,45 +11470,41 @@
 msgid "/Tools/Room List"
 msgstr "/Сервіс/Перелік кімнат"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "Повідомлення від %s"
-msgstr[1] "Повідомлення від %s"
-msgstr[2] "Повідомлення від %s"
-
-#, fuzzy
+msgstr[0] "%d непрочитане повідомлення від %s\n"
+msgstr[1] "%d непрочитані повідомлення від %s\n"
+msgstr[2] "%d непрочитаних повідомлення від %s\n"
+
 msgid "Manually"
-msgstr "інший"
+msgstr "Вручну"
 
 msgid "By status"
-msgstr "за статусом"
+msgstr "За станом"
 
 msgid "By recent log activity"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "По останній активності журналу"
+
+#, c-format
 msgid "%s disconnected"
-msgstr "З'єднання розірвано."
-
-#, fuzzy, c-format
+msgstr "%s роз'єднаний"
+
+#, c-format
 msgid "%s disabled"
-msgstr "Команда відключена"
-
-#, fuzzy
+msgstr "%s вимкнений"
+
 msgid "Reconnect"
-msgstr "_Повторне з'єднання"
-
-#, fuzzy
+msgstr "Перез'єднатись"
+
 msgid "Re-enable"
-msgstr "Зареєструвати новий обліковий запис Jabber"
+msgstr "Ще раз увімкнути обіковий запис"
 
 msgid "SSL FAQs"
-msgstr ""
-
-#, fuzzy
+msgstr "ЧаПи SSL"
+
 msgid "Welcome back!"
-msgstr "%s повертається"
+msgstr "З поверненням!"
 
 #, fuzzy, c-format
 msgid "%d account was disabled because you signed on from another location:"
@@ -11939,23 +11514,17 @@
 msgstr[1] "Ви увійшли з іншого місця."
 msgstr[2] "Ви увійшли з іншого місця."
 
-#, fuzzy
 msgid "<b>Username:</b>"
-msgstr ""
-"\n"
-"<b>Попереджений:</b>"
-
-#, fuzzy
+msgstr "<b>Ім'я користувача:</b>"
+
 msgid "<b>Password:</b>"
-msgstr "<b>_Пароль:</b>"
-
-#, fuzzy
+msgstr "<b>Пароль:</b>"
+
 msgid "_Login"
-msgstr "Вхід"
-
-#, fuzzy
+msgstr "_Вхід"
+
 msgid "/Accounts"
-msgstr "Облікові записи"
+msgstr "Обл. записи"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -11966,45 +11535,42 @@
 "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>. Щойно ви увімкнете обліковий запис, ви "
+"зможете увійти, встановити свій стан, та спілкуватися з вашими друзями."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Тих, хто не в мережі"
+
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Контакти/Показувати порожні групи"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Порожні групи"
+
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Подробиці користувачів"
+
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Час бездіяння"
+
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Контакти/Показувати порожні групи"
-
-#, fuzzy
+msgstr "/Контакти/Показати/Значки протоколів"
+
 msgid "Add a buddy.\n"
-msgstr "Додати _користувача"
-
-#, fuzzy
+msgstr "Додати користувача.\n"
+
 msgid "Buddy's _username:"
 msgstr "І_м'я користувача:"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "Необов'язкова інформація:"
-
-#, fuzzy
+msgstr "(Необов'язково) Прізвисько:"
+
 msgid "Add buddy to _group:"
-msgstr "Додати користувача у список?"
+msgstr "Додати користувача до _групи:"
 
 msgid "This protocol does not support chat rooms."
 msgstr "Цей протокол не підтримує кімнати для розмов."
@@ -12021,15 +11587,15 @@
 "Введіть псевдонім та відповідну інформацію про розмову, яку ви бажаєте "
 "додати до списку контактів.\n"
 
-#, fuzzy
 msgid "A_lias:"
-msgstr "Псевдонім:"
+msgstr "Прізвисько:"
 
 msgid "_Group:"
 msgstr "_Група:"
 
+#, fuzzy
 msgid "Auto_join when account connects."
-msgstr ""
+msgstr "Автоматично _приєднатися, коли обліковий запис стане \"в мережі\""
 
 msgid "_Remain in chat after window is closed."
 msgstr ""
@@ -12037,46 +11603,40 @@
 msgid "Please enter the name of the group to be added."
 msgstr "Введіть назву групи, що додаватиметься."
 
-#, fuzzy
 msgid "Enable Account"
-msgstr "Обліковий запис"
+msgstr "Увімкнути обліковий запис"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/Обл. записи/Увімкнути обліковий запис"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
-
-#, fuzzy
+msgstr "<PurpleMain>/Обл. записи/"
+
 msgid "_Edit Account"
-msgstr "_Обліковий запис"
+msgstr "_Редагувати обліковий запис"
 
 msgid "No actions available"
 msgstr "Немає доступних дій"
 
-#, fuzzy
 msgid "_Disable"
-msgstr "Видимий"
-
-#, fuzzy
+msgstr "_Вимкнути"
+
 msgid "/Tools"
-msgstr "/С_ервіс"
-
-#, fuzzy
+msgstr "/Сервіс"
+
 msgid "/Buddies/Sort Buddies"
-msgstr "/Контакти/Показувати відсутніх користувачів"
-
+msgstr "/Контакти/Впорядкувати користувачів"
+
+#, fuzzy
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "Напишіть назву вузла, кому належить цей сертифікат"
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Сервер"
-
-#, fuzzy
+msgstr "SSL сервери"
+
 msgid "Unknown command."
-msgstr "Невідома команда"
+msgstr "Невідома команда."
 
 #, fuzzy
 msgid "That buddy is not on the same protocol as this chat."
@@ -12116,13 +11676,11 @@
 msgid "Ignore"
 msgstr "Ігнорувати"
 
-#, fuzzy
 msgid "Get Away Message"
-msgstr "Нове повідомлення про відсутність"
-
-#, fuzzy
+msgstr "Отримати повідомлення про відсутність"
+
 msgid "Last Said"
-msgstr "Прізвище:"
+msgstr "Сказане в останній раз"
 
 msgid "Unable to save icon file to disk."
 msgstr "Не вдається зберегти файл значка на диск."
@@ -12139,16 +11697,14 @@
 msgid "Save Icon As..."
 msgstr "Зберегти значок як..."
 
-#, fuzzy
 msgid "Set Custom Icon..."
-msgstr "Інше"
-
-#, fuzzy
+msgstr "Встановити нетиповий значок..."
+
 msgid "Change Size"
-msgstr "Змінити адресу на:"
+msgstr "Змінити розмір"
 
 msgid "Show All"
-msgstr ""
+msgstr "Показати всі"
 
 #. Conversation menu
 msgid "/_Conversation"
@@ -12157,9 +11713,8 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Бесіда/Створити _повідомлення"
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Бесіда/_Запросити..."
+msgstr "/Бесіда/Приєднатись до _балачки..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Бесіда/З_найти..."
@@ -12170,31 +11725,26 @@
 msgid "/Conversation/_Save As..."
 msgstr "/Бесіда/Зберегти _як..."
 
-#, fuzzy
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Бесіда/О_чистити"
-
-#, fuzzy
+msgstr "/Бесіда/О_чистити прокрутку"
+
 msgid "/Conversation/M_edia"
-msgstr "/Бесіда/_Закрити"
-
-#, fuzzy
+msgstr "/Бесіда/_Медіа"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Бесіда/_Закрити"
-
-#, fuzzy
+msgstr "/Бесіда/Медіа/_Аудіовиклик"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Бесіда/_Закрити"
-
-#, fuzzy
+msgstr "/Бесіда/Медіа/_Відеовиклик"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Бесіда/Переглянути _журнал"
+msgstr ""
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Бесіда/Наді_слати файл..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Бесіда/Додати _правило..."
+msgstr "/Бесіда/Додати _правило стеження..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/Бесіда/_Отримати інформацію"
@@ -12202,9 +11752,8 @@
 msgid "/Conversation/In_vite..."
 msgstr "/Бесіда/_Запросити..."
 
-#, fuzzy
 msgid "/Conversation/M_ore"
-msgstr "/Бесіда/_Закрити"
+msgstr "/Бесіда/_Більше"
 
 msgid "/Conversation/Al_ias..."
 msgstr "/Бесіда/Пс_евдонім..."
@@ -12212,9 +11761,8 @@
 msgid "/Conversation/_Block..."
 msgstr "/Бесіда/_Блокувати..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/Бесіда/_Блокувати..."
+msgstr "/Бесіда/_Розблокувати..."
 
 msgid "/Conversation/_Add..."
 msgstr "/Бесіда/_Додати..."
@@ -12241,50 +11789,44 @@
 msgid "/Options/Enable _Sounds"
 msgstr "/Параметри/Увімкнути _звук"
 
-#, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Параметри/Показувати панель _форматування"
 
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Параметри/Показувати _час повідомлень"
 
-#, fuzzy
 msgid "/Conversation/More"
-msgstr "/Бесіда/_Закрити"
-
-#, fuzzy
+msgstr "/Бесіда/Більше"
+
 msgid "/Options"
-msgstr "/П_араметри"
+msgstr "/Параметри"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#, fuzzy
 msgid "/Conversation"
-msgstr "/_Бесіда"
+msgstr "/Бесіда"
 
 msgid "/Conversation/View Log"
 msgstr "/Бесіда/Переглянути журнал"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Бесіда/_Закрити"
-
-#, fuzzy
+msgstr "/Бесіда/Медіа/Аудіовиклик"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Бесіда/Переглянути журнал"
+msgstr "/Бесіда/Медіа/Відеовиклик"
 
 #, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Бесіда/_Закрити"
+msgstr "/Бесіда/Більше"
 
 msgid "/Conversation/Send File..."
 msgstr "/Бесіда/Надіслати файл..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Бесіда/Додати правило..."
+msgstr "/Бесіда/Додати правило стеження..."
 
 msgid "/Conversation/Get Info"
 msgstr "/Бесіда/Отримати інформацію..."
@@ -12298,9 +11840,8 @@
 msgid "/Conversation/Block..."
 msgstr "/Бесіда/Блокувати..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/Бесіда/Блокувати..."
+msgstr "/Бесіда/Розблокувати..."
 
 msgid "/Conversation/Add..."
 msgstr "/Бесіда/Додати..."
@@ -12320,7 +11861,6 @@
 msgid "/Options/Enable Sounds"
 msgstr "/Параметри/Відтворювати звуки"
 
-#, fuzzy
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Параметри/Показувати панель форматування"
 
@@ -12328,22 +11868,22 @@
 msgstr "/Параметри/Показувати час повідомлень"
 
 msgid "User is typing..."
-msgstr "Користувач пише..."
-
-#, fuzzy, c-format
+msgstr "Користувач друкує..."
+
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s припиняє писати вам (%s)"
+msgstr ""
+"\n"
+"%s припинив друкувати"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "_Надіслати як"
-
-#, fuzzy
+msgstr "_Надіслати до"
+
 msgid "_Send"
-msgstr "Надіслати"
+msgstr "_Надіслати"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
@@ -12356,49 +11896,41 @@
 msgstr[1] "%d користувача у кімнаті"
 msgstr[2] "%d користувачів у кімнаті"
 
-#, fuzzy
 msgid "Typing"
-msgstr "Ping"
-
-#, fuzzy
+msgstr "Друкує"
+
 msgid "Stopped Typing"
-msgstr "Ping"
-
-#, fuzzy
+msgstr "Припинив друкувати"
+
 msgid "Nick Said"
-msgstr "Прізвисько"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unread Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "Непрочитані повідомлення"
+
 msgid "New Event"
-msgstr "Подія"
-
-#, fuzzy
+msgstr "Нова подія"
+
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Очищає прокрутку бесіди."
-
-#, fuzzy
+msgstr "clear: Очищає всі прокрутки бесід."
+
 msgid "Confirm close"
-msgstr "Підтвердити обліковий запис"
-
-#, fuzzy
+msgstr "Підтвердити закриття"
+
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Ви дійсно бажаєте видалити %s?"
+msgstr "Ви маєте непрочитані повідомлення. Ви дійсно хочете закрити вікно?"
 
 msgid "Close other tabs"
-msgstr ""
+msgstr "Закрити інші вкладки"
 
 msgid "Close all tabs"
-msgstr ""
+msgstr "Закрити всі вкладки"
 
 msgid "Detach this tab"
-msgstr ""
+msgstr "Від'єднати цю вкладку"
 
 msgid "Close this tab"
-msgstr ""
+msgstr "Закрити цю вкладку"
 
 msgid "Close conversation"
 msgstr "Закрити бесіду"
@@ -12421,78 +11953,71 @@
 msgid "Save Debug Log"
 msgstr "Зберегти налагоджувальну інформацію у журнал"
 
-#, fuzzy
 msgid "Invert"
-msgstr "Вст_авити"
+msgstr "Обернути"
 
 msgid "Highlight matches"
-msgstr ""
+msgstr "Підсвічувати збіги"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "Тільки _значок"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "Тільки _текст"
 
 msgid "_Both Icon & Text"
-msgstr ""
-
-#, fuzzy
+msgstr "_І текст, і значок"
+
 msgid "Filter"
-msgstr "Помилка"
-
-#, fuzzy
+msgstr "Фільтр"
+
 msgid "Right click for more options."
-msgstr "Показати більше параметрів"
+msgstr "Права кнопка миші для більших опцій."
 
 msgid "Level "
-msgstr ""
+msgstr "Рівень"
 
 msgid "Select the debug filter level."
-msgstr ""
-
-#, fuzzy
+msgstr "Вибрати рівень фільтрування повідомлень відлагоджування"
+
 msgid "All"
-msgstr "Дозволити"
+msgstr "Всі"
 
 msgid "Misc"
-msgstr ""
-
-#, fuzzy
+msgstr "Різне"
+
 msgid "Warning"
-msgstr "Попередити"
-
-#, fuzzy
+msgstr "Застереження"
+
 msgid "Error "
 msgstr "Помилка"
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "Внутрішня помилка"
-
+msgstr "Фатальна помилка"
+
+#, fuzzy
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "Головний архів не налаштований"
+
 msgid "artist"
-msgstr "Адреса"
+msgstr "виконавець"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "голос та відео"
 
 msgid "support"
 msgstr "підтримка"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "розробник та вебмайстер"
-
+msgstr "вебмайстер"
+
+#, fuzzy
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Сприяти Banshee"
 
 msgid "win32 port"
 msgstr "порт win32"
@@ -12500,20 +12025,18 @@
 msgid "maintainer"
 msgstr "особа, що підтримує"
 
-#, fuzzy
 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]"
 msgstr "хакер та призначений машиніст [lazy bum]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "підтримка"
+msgstr "підтримка/контроль якості"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "початковий автор"
@@ -12522,45 +12045,43 @@
 msgstr "головний розробник"
 
 msgid "Afrikaans"
-msgstr ""
-
-#, fuzzy
+msgstr "Афріканс"
+
 msgid "Arabic"
-msgstr "Амхарська"
+msgstr "Арабська"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Білоруська (латиниця)"
 
 msgid "Bulgarian"
 msgstr "Болгарська"
 
 msgid "Bengali"
-msgstr ""
-
-#, fuzzy
+msgstr "Бенгальська"
+
 msgid "Bosnian"
-msgstr "Румунська"
+msgstr "Боснійська"
 
 msgid "Catalan"
 msgstr "Каталонська"
 
 msgid "Valencian-Catalan"
-msgstr ""
+msgstr "Валенсійська-каталонська"
 
 msgid "Czech"
 msgstr "Чеська"
 
 msgid "Danish"
-msgstr "Датська"
+msgstr "Данська"
 
 msgid "German"
 msgstr "Німецька"
 
 msgid "Dzongkha"
-msgstr ""
+msgstr "Дзонгка"
 
 msgid "Greek"
-msgstr ""
+msgstr "Грецька"
 
 msgid "Australian English"
 msgstr "Австралійська англійська"
@@ -12572,7 +12093,7 @@
 msgstr "Британська англійська"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "Есперанто"
 
 msgid "Spanish"
 msgstr "Іспанська"
@@ -12581,11 +12102,10 @@
 msgstr "Естонська"
 
 msgid "Basque"
-msgstr ""
-
-#, fuzzy
+msgstr "Баскська"
+
 msgid "Persian"
-msgstr "Сербська"
+msgstr "Перська"
 
 msgid "Finnish"
 msgstr "Фінська"
@@ -12593,19 +12113,17 @@
 msgid "French"
 msgstr "Французька"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Турецька"
-
-#, fuzzy
+msgstr "Ірландська"
+
 msgid "Galician"
-msgstr "Італійська"
+msgstr "Галісійська"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "Гуджараті"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Команда перекладачів Гуйараті"
 
 msgid "Hebrew"
 msgstr "Іврит"
@@ -12616,13 +12134,11 @@
 msgid "Hungarian"
 msgstr "Угорська"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Румунська"
-
-#, fuzzy
+msgstr "Вірменська"
+
 msgid "Indonesian"
-msgstr "Македонська"
+msgstr "Індонезійська"
 
 msgid "Italian"
 msgstr "Італійська"
@@ -12633,30 +12149,26 @@
 msgid "Georgian"
 msgstr "Грузинська"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "Поточні перекладачі"
-
-#, fuzzy
+msgstr "Перекладачі Ubuntu грузинською"
+
 msgid "Khmer"
-msgstr "Opera"
-
-#, fuzzy
+msgstr "Кхмерська"
+
 msgid "Kannada"
-msgstr "Заборонено"
+msgstr "Канада"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Канадська команда перекладачів"
 
 msgid "Korean"
 msgstr "Корейська"
 
-#, fuzzy
 msgid "Kurdish"
-msgstr "Турецька"
+msgstr "Курдська"
 
 msgid "Lao"
-msgstr ""
+msgstr "Лао"
 
 msgid "Lithuanian"
 msgstr "Литовська"
@@ -12664,27 +12176,23 @@
 msgid "Macedonian"
 msgstr "Македонська"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Македонська"
-
-#, fuzzy
+msgstr "Монгольська"
+
 msgid "Bokmål Norwegian"
-msgstr "Норвезька"
+msgstr "Норвезька (букмол)"
 
 msgid "Nepali"
-msgstr ""
-
-#, fuzzy
+msgstr "Непальська"
+
 msgid "Dutch, Flemish"
-msgstr "Голландська; фламандська"
-
-#, fuzzy
+msgstr "Голландська, фламандська"
+
 msgid "Norwegian Nynorsk"
-msgstr "Норвезька (Нюнорськ)"
+msgstr "Норвезька (Нюнорск)"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Оксітанська"
 
 msgid "Punjabi"
 msgstr "Пенджабі"
@@ -12698,9 +12206,8 @@
 msgid "Portuguese-Brazil"
 msgstr "Бразильська португальська"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "Фотографія"
+msgstr "Пушту"
 
 msgid "Romanian"
 msgstr "Румунська"
@@ -12721,29 +12228,28 @@
 msgstr "Сербська"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "Сингалійська"
 
 msgid "Swedish"
 msgstr "Шведська"
 
 msgid "Swahili"
-msgstr ""
-
-#, fuzzy
+msgstr "Свахілі"
+
 msgid "Tamil"
-msgstr "Термінал"
+msgstr "Тамільська"
 
 msgid "Telugu"
-msgstr ""
+msgstr "Телугу"
 
 msgid "Thai"
-msgstr ""
+msgstr "Тайська"
 
 msgid "Turkish"
 msgstr "Турецька"
 
 msgid "Urdu"
-msgstr ""
+msgstr "Урду"
 
 msgid "Vietnamese"
 msgstr "В'єтнамська"
@@ -12755,7 +12261,7 @@
 msgstr "Китайська спрощена"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "Китайська (Гон Конг)"
 
 msgid "Traditional Chinese"
 msgstr "Китайська традиційна"
@@ -12763,9 +12269,9 @@
 msgid "Amharic"
 msgstr "Амхарська"
 
-#, fuzzy, c-format
+#, c-format
 msgid "About %s"
-msgstr "Про Pidgin"
+msgstr "Про %s"
 
 #, c-format
 msgid ""
@@ -12779,12 +12285,23 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
+"%s - це графічний модульний клієнт миттєвих повідомлень оснований на "
+"бібліотеці libpurple, яка здатна з'єднуватись з AIM, MSN, Yahoo!, XMPP, ICQ, "
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"MySpaceIM, Gadu-Gadu, та QQ всіма одночасно.  Він написаний використовуючи "
+"GTK+.<BR><BR>Ви можете змінювати та розповсюджувати програму у відповідності "
+"з ліцензією GPL (версія 2 або новіша).  Копія GPL міститься у файлі \"COPYING"
+"\", що розповсюджується з %s.  Авторське право на %s належить його "
+"розробникам. Дивіться файл \"COPYRIGHT\" повного переліку розробників. Ми не "
+"даємо гарантій на цю програму.<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -12796,18 +12313,17 @@
 "language, but the responses may be less helpful.<br/><br/>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr "<FONT SIZE=\"4\">Канал IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #Pidgin на irc.freenode.net<BR><BR>"
-
-#, fuzzy
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+
 msgid "Current Developers"
-msgstr "Колишні розробники"
+msgstr "Поточні розробники"
 
 msgid "Crazy Patch Writers"
 msgstr "Одержимі автори латок"
@@ -12815,7 +12331,6 @@
 msgid "Retired Developers"
 msgstr "Колишні розробники"
 
-#, fuzzy
 msgid "Retired Crazy Patch Writers"
 msgstr "Одержимі автори латок"
 
@@ -12825,13 +12340,11 @@
 msgid "Past Translators"
 msgstr "Попередні перекладачі"
 
-#, fuzzy
 msgid "Debugging Information"
-msgstr "Інформація про користувача"
-
-#, fuzzy
+msgstr "Інформація зневадження"
+
 msgid "_Name"
-msgstr "Ім'я"
+msgstr "_Ім'я"
 
 msgid "_Account"
 msgstr "_Обліковий запис"
@@ -12847,9 +12360,8 @@
 "Введіть ідентифікатор користувача, інформацію про якого ви бажаєте "
 "переглянути."
 
-#, fuzzy
 msgid "View User Log"
-msgstr "Журнал користувача"
+msgstr "Переглянути журнал користувача"
 
 msgid "Alias Contact"
 msgstr "Псевдонім контакту"
@@ -12890,9 +12402,8 @@
 msgid "Remove Contact"
 msgstr "Видалити контакт"
 
-#, fuzzy
 msgid "_Remove Contact"
-msgstr "Видалити контакт"
+msgstr "_Вилучити контакт"
 
 #, fuzzy, c-format
 msgid ""
@@ -12902,13 +12413,11 @@
 "Ви видаляєте групу %s та всіх її членів зі списку контактів. Бажаєте "
 "продовжити?"
 
-#, fuzzy
 msgid "Merge Groups"
-msgstr "Видалити групу"
-
-#, fuzzy
+msgstr "Злити групи"
+
 msgid "_Merge Groups"
-msgstr "В_идалити групу"
+msgstr "_Злити групи"
 
 #, c-format
 msgid ""
@@ -12921,9 +12430,8 @@
 msgid "Remove Group"
 msgstr "Видалити групу"
 
-#, fuzzy
 msgid "_Remove Group"
-msgstr "Видалити групу"
+msgstr "Вилучити _групу"
 
 #, c-format
 msgid ""
@@ -12945,57 +12453,45 @@
 msgid "Remove Chat"
 msgstr "Видалити розмову"
 
-#, fuzzy
 msgid "_Remove Chat"
-msgstr "Видалити розмову"
+msgstr "Вилучити _розмову"
 
 #, fuzzy
 msgid "Right-click for more unread messages...\n"
 msgstr "Показати більше параметрів"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Змінити адресу на:"
-
-#, fuzzy
+msgstr "Змінити _стан"
+
 msgid "Show Buddy _List"
-msgstr "Список контактів"
-
-#, fuzzy
+msgstr "Показати _перелік контактів"
+
 msgid "_Unread Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "_Непрочитані повідомлення"
+
 msgid "New _Message..."
-msgstr "Нове повідомлення.."
-
-#, fuzzy
+msgstr "_Нове повідомлення.."
+
 msgid "_Accounts"
-msgstr "Облікові записи"
-
-#, fuzzy
+msgstr "_Облікові записи"
+
 msgid "Plu_gins"
-msgstr "Модулі"
-
-#, fuzzy
+msgstr "_Модулі"
+
 msgid "Pr_eferences"
-msgstr "Параметри"
-
-#, fuzzy
+msgstr "_Параметри"
+
 msgid "Mute _Sounds"
-msgstr "Вимкнути звук"
-
-#, fuzzy
+msgstr "Вимкнути _звук"
+
 msgid "_Blink on New Message"
-msgstr "Нове повідомлення.."
-
-#, fuzzy
+msgstr "_Блимати, коли є нове повідомлення"
+
 msgid "_Quit"
-msgstr "Вийти"
-
-#, fuzzy
+msgstr "_Вийти"
+
 msgid "Not started"
-msgstr "Не підтримується"
+msgstr "Не запущений"
 
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Прийом як:</b>"
@@ -13015,17 +12511,17 @@
 msgid "An error occurred while opening the file."
 msgstr "Помилка при відкриванні файлу."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "Помилка запуску <b>%s</b>: %s"
-
-#, fuzzy, c-format
+msgstr "Помилка запуску %s: %s"
+
+#, c-format
 msgid "Error running %s"
-msgstr "Помилка підключення до розмови %s"
+msgstr "Помилка запуску %s"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "Процес повернув код помилки %d"
 
 msgid "Filename:"
 msgstr "Назва файлу:"
@@ -13045,25 +12541,21 @@
 msgid "Close this window when all transfers _finish"
 msgstr ""
 
-#, fuzzy
 msgid "C_lear finished transfers"
 msgstr "О_чищати завершені передавання"
 
 #. "Download Details" arrow
-#, fuzzy
 msgid "File transfer _details"
-msgstr "Приховати подробиці завантаження"
-
-#, fuzzy
+msgstr "Подробиці _передавання файлів"
+
 msgid "Paste as Plain _Text"
-msgstr "Вст_авити як текст"
-
-#, fuzzy
+msgstr "Вст_авити як звичайний текст"
+
 msgid "_Reset formatting"
-msgstr "О_чистити форматування"
+msgstr "_Скинути форматування"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "Вимкнути _смайли у вибраному тексті"
 
 msgid "Hyperlink color"
 msgstr "Колір гіперпосилання"
@@ -13071,9 +12563,8 @@
 msgid "Color to draw hyperlinks."
 msgstr "Колір для відображення гіперпосилань"
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Колір гіперпосилання"
+msgstr "Колір відвіданого гіперпосилання"
 
 #, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
@@ -13081,7 +12572,7 @@
 
 #, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Колір гіперпосилання"
+msgstr "Колір відвіданого гіперпосилання"
 
 #, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
@@ -13089,20 +12580,21 @@
 
 #, fuzzy
 msgid "Sent Message Name Color"
-msgstr "Надсилання повідомлення"
+msgstr "%s надіслав нам повідомлення. (%s)"
 
 msgid "Color to draw the name of a message you sent."
 msgstr ""
 
 #, fuzzy
 msgid "Received Message Name Color"
-msgstr "Надсилання повідомлення"
+msgstr "Отримано повідомлення, що починає бесіду"
 
 msgid "Color to draw the name of a message you received."
 msgstr ""
 
+#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "Колір відвіданого гіперпосилання"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -13125,24 +12617,20 @@
 msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "Видалення сповіщень"
-
-#, fuzzy
+msgstr "Колір сповіщення про друк"
+
 msgid "The color to use for the typing notification"
-msgstr "Сповіщення про нову пошту"
-
-#, fuzzy
+msgstr "Колір для сповіщення про друк"
+
 msgid "Typing notification font"
-msgstr "Показати _сповіщення"
+msgstr "Шрифт сповіщення про друк"
 
 msgid "The font to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "Сповіщення про нову пошту"
+msgstr "Увімкнути сповіщення про друк"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -13151,7 +12639,7 @@
 msgstr ""
 "<span size='larger' weight='bold'>Невідомий тип файлу</span>\n"
 "\n"
-"Вважається PNG."
+"Вважається, що PNG."
 
 msgid ""
 "Unrecognized file type\n"
@@ -13160,7 +12648,7 @@
 msgstr ""
 "Невідомий тип файлу\n"
 "\n"
-"Вважається PNG."
+"Вважається, що PNG."
 
 #, c-format
 msgid ""
@@ -13188,9 +12676,8 @@
 msgid "_Save Image..."
 msgstr "З_берегти зображення..."
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "Показати подробиці про користувача"
+msgstr "_Додати нетиповий смайл..."
 
 msgid "Select Font"
 msgstr "Вибір шрифту"
@@ -13236,25 +12723,22 @@
 msgstr ""
 
 msgid "Smile!"
-msgstr "Посмішка!"
-
-#, fuzzy
+msgstr "Смайл!"
+
 msgid "_Manage custom smileys"
-msgstr "Показати подробиці про користувача"
+msgstr "_Керування нетиповими смайлами"
 
 msgid "This theme has no available smileys."
-msgstr "Ця тема не має доступних значків емоцій."
-
-#, fuzzy
+msgstr "Ця тема не має доступних значків смайлів."
+
 msgid "_Font"
-msgstr "_Обліковий запис"
-
-#, fuzzy
+msgstr "_Шрифт"
+
 msgid "Group Items"
-msgstr "Назва групи"
+msgstr "Групувати елементи"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Розгрупувати елементи"
 
 msgid "Bold"
 msgstr "Жирний"
@@ -13266,96 +12750,79 @@
 msgstr "Підкреслений"
 
 msgid "Strikethrough"
-msgstr ""
-
-#, fuzzy
+msgstr "Перекреслений"
+
 msgid "Increase Font Size"
-msgstr "Ігнорувати _розмір шрифту"
+msgstr "Збільшити розмір шрифту"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Зменшити розмір шрифту"
 
 msgid "Font Face"
 msgstr "Вид шрифту"
 
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Колір шрифту"
 
-#, fuzzy
 msgid "Reset Formatting"
-msgstr "Типове форматування"
-
-#, fuzzy
+msgstr "Скинути форматування"
+
 msgid "Insert IM Image"
 msgstr "Вставити зображення"
 
-#, fuzzy
 msgid "Insert Smiley"
-msgstr "Вставити посмішку"
-
-#, fuzzy
+msgstr "Вставити смайл"
+
 msgid "<b>_Bold</b>"
-msgstr "<b>_Пароль:</b>"
-
-#, fuzzy
+msgstr "<b>_Жирний</b>"
+
 msgid "<i>_Italic</i>"
-msgstr " <i>(оператор IRC)</i>"
-
-#, fuzzy
+msgstr "<i>_Курсив</i>"
+
 msgid "<u>_Underline</u>"
-msgstr "Підкреслений"
+msgstr "<u>_Підкреслений</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#, fuzzy
+msgstr "<span strikethrough='true'>Перекреслений</span>"
+
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Pidgin %s</span>"
-
-#, fuzzy
+msgstr "<span size='larger'>_Більший</span>"
+
 msgid "_Normal"
-msgstr "Нормально"
+msgstr "_Нормальний"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+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'
-#, fuzzy
 msgid "_Font face"
-msgstr "Вид шрифту"
-
-#, fuzzy
+msgstr "_Тип шрифту"
+
 msgid "Foreground _color"
-msgstr "Колір шрифту"
-
-#, fuzzy
+msgstr "Колір _шрифту"
+
 msgid "Bac_kground color"
-msgstr "Колір тла"
-
-#, fuzzy
+msgstr "Колір _тла"
+
 msgid "_Image"
-msgstr "Збереження зображення"
-
-#, fuzzy
+msgstr "_Зображення"
+
 msgid "_Link"
-msgstr "При_єднатись"
+msgstr "_Посилання"
 
 msgid "_Horizontal rule"
-msgstr ""
-
-#, fuzzy
+msgstr "_Горизонтальна прокрутка"
+
 msgid "_Smile!"
-msgstr "Посмішка!"
-
-#, fuzzy
+msgstr "_Смайл!"
+
 msgid "Log Deletion Failed"
-msgstr "Не вдається встановити з'єднання"
+msgstr "Помилка видалення журналу"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "Перевірити права та спробувати знову"
 
 #, c-format
 msgid ""
@@ -13375,13 +12842,11 @@
 "s?"
 msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "Видалити"
-
-#, fuzzy
+msgstr "Видалити журнал?"
+
 msgid "Delete Log..."
-msgstr "Видалити"
+msgstr "Видалити журнал..."
 
 #, fuzzy, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -13399,11 +12864,11 @@
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "_Переглянути теку з журналами"
+
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Наберіть `%s -h' для отримання додаткової інформації.\n"
+msgstr "%s %s. Спробуйте `%s -h' для детальнішої інформації.\n"
 
 #, c-format
 msgid ""
@@ -13427,11 +12892,12 @@
 msgid "display this help and exit"
 msgstr ""
 
+#, fuzzy
 msgid "allow multiple instances"
-msgstr ""
+msgstr "Дозволити декілька одночасних входів"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "не входити автоматично"
 
 msgid "NAME"
 msgstr ""
@@ -13443,10 +12909,10 @@
 msgstr ""
 
 msgid "X display to use"
-msgstr ""
+msgstr "Використовувати дисплей X"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "Показати поточну версію та вийти"
 
 #, c-format
 msgid ""
@@ -13469,21 +12935,21 @@
 msgstr ""
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Медія"
 
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/Медіа/_Відповісти"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s бажає розпочати з вами голосовий/відео сеанс."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s бажає розпочати з вами відеосеанс."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Вхідний виклик"
 
 msgid "_Pause"
 msgstr "_Пауза"
@@ -13498,67 +12964,54 @@
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "<b>%d новий лист.</b>"
+msgstr[1] "<b>%d нові листи.</b>"
+msgstr[2] "<b>%d нових листів.</b>"
 
 #, fuzzy, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Команда запуску веб-переглядача <b>%s</b> є неправильною."
+msgstr "Вказане ім'я користувача неправильне."
 
 msgid "Unable to open URL"
 msgstr "Не вдається відкрити URL"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Помилка запуску <b>%s</b>: %s"
+msgstr "Помилка запуску \"%s\": %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Було вибрано веб-переглядач \"інший\", але команду не було задано."
 
-#, fuzzy
 msgid "No message"
-msgstr "(1 повідомлення)"
-
-#, fuzzy
+msgstr "Немає повідомлень"
+
 msgid "Open All Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "Відкрити всі повідомлення"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
-"\n"
-"%s"
-
-#, fuzzy
+msgstr "<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>"
+
 msgid "New Pounces"
-msgstr "Нове правило"
+msgstr "Нове стеження"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Відкинути"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ви отримали пошту!</span>\n"
-"\n"
-"%s"
+msgstr "<span weight=\"bold\" size=\"larger\">Ви вистежили!</span>"
 
 msgid "The following plugins will be unloaded."
-msgstr ""
+msgstr "Наступні додатки будуть вивантажені:"
 
 msgid "Multiple plugins will be unloaded."
-msgstr ""
-
-#, fuzzy
+msgstr "Будуть вивантажені декілька додатків."
+
 msgid "Unload Plugins"
-msgstr "Модулі"
-
-#, fuzzy
+msgstr "Вивантажити додатки"
+
 msgid "Could not unload plugin"
-msgstr "Не вдається завантажити публічний ключ"
+msgstr "Не вдається вивантажити додаток"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
@@ -13570,43 +13023,36 @@
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-
-#, fuzzy
+"<span foreground=\"red\" weight=\"bold\">Помилка: %s\n"
+"Перевірте сторінку тенет додатку на оновлення.</span>"
+
 msgid "Author"
-msgstr "Авторизувати"
-
-#, fuzzy
+msgstr "Автор"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>Надсилання для:</b>"
-
-#, fuzzy
+msgstr "<b>Написаний:</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>%s:</b> "
-
-#, fuzzy
+msgstr "<b>Сторінка тенет:</b>"
+
 msgid "<b>Filename:</b>"
-msgstr ""
-"\n"
-"<b>Попереджений:</b>"
-
-#, fuzzy
+msgstr "<b>Назва файлу:</b>"
+
 msgid "Configure Pl_ugin"
-msgstr "Налаштувати кімнату"
+msgstr "Налаштувати _додаток"
 
 msgid "<b>Plugin Details</b>"
-msgstr ""
+msgstr "<b>Подробиці додатку</b>"
 
 msgid "Select a file"
 msgstr "Вибір файлу"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Змінити правило"
+msgstr "Змінити стеження за контактом"
 
 #. Create the "Pounce on Whom" frame.
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "За ким слідкувати"
+msgstr "Стежити за ким"
 
 msgid "_Account:"
 msgstr "_Обліковий запис:"
@@ -13614,52 +13060,42 @@
 msgid "_Buddy name:"
 msgstr "І_м'я користувача:"
 
-#, fuzzy
 msgid "Si_gns on"
-msgstr "_Увійшов"
-
-#, fuzzy
+msgstr "Увійшов"
+
 msgid "Signs o_ff"
-msgstr "Ви_йшов"
-
-#, fuzzy
+msgstr "_Вийшов"
+
 msgid "Goes a_way"
-msgstr "Користувач _відійшов"
-
-#, fuzzy
+msgstr "_Відійшов"
+
 msgid "Ret_urns from away"
 msgstr "_Повернувся"
 
-#, fuzzy
 msgid "Becomes _idle"
-msgstr "%s має стан бездіяльності"
-
-#, fuzzy
+msgstr "Став _бездіяльним"
+
 msgid "Is no longer i_dle"
-msgstr "%s виходить зі стану бездіяльності."
-
-#, fuzzy
+msgstr "Вже _не бездіяльний"
+
 msgid "Starts _typing"
-msgstr "Користувач почав _набирати"
+msgstr "Почав _друкувати"
 
 msgid "P_auses while typing"
-msgstr ""
-
-#, fuzzy
+msgstr "_Призупинився, коли друкував"
+
 msgid "Stops t_yping"
-msgstr "Користувач припинив н_абирати"
-
-#, fuzzy
+msgstr "Припинив д_рукувати"
+
 msgid "Sends a _message"
-msgstr "Надіслати пові_домлення"
+msgstr "Надіслав пові_домлення"
 
 #, fuzzy
 msgid "Ope_n an IM window"
-msgstr "_Відкрити вікно бесіди"
-
-#, fuzzy
+msgstr "Прозорість вікна _бесіди"
+
 msgid "_Pop up a notification"
-msgstr "Показати _сповіщення"
+msgstr "Показати _виринаюче сповіщення"
 
 msgid "Send a _message"
 msgstr "Надіслати пові_домлення"
@@ -13670,11 +13106,9 @@
 msgid "P_lay a sound"
 msgstr "В_ідтворити звук"
 
-#, fuzzy
 msgid "Brows_e..."
 msgstr "_Огляд..."
 
-#, fuzzy
 msgid "Br_owse..."
 msgstr "_Огляд..."
 
@@ -13682,142 +13116,137 @@
 msgstr "П_еревірка"
 
 msgid "P_ounce only when my status is not Available"
-msgstr ""
+msgstr "_Стежити тільки коли мій стан не \"Доступний\""
 
 msgid "_Recurring"
-msgstr ""
-
-#, fuzzy
+msgstr "_Періодичний"
+
 msgid "Pounce Target"
-msgstr "Коли реагувати"
-
-#, fuzzy
+msgstr "Ціль стеження"
+
 msgid "Started typing"
-msgstr "Користувач почав _набирати"
-
-#, fuzzy
+msgstr "Почав друкувати"
+
 msgid "Paused while typing"
-msgstr "Користувач пише..."
-
-#, fuzzy
+msgstr "Призупинив друк"
+
 msgid "Signed on"
-msgstr "_Увійшов"
+msgstr "Увійшов"
 
 #, fuzzy
 msgid "Returned from being idle"
-msgstr "П_ерестав бути бездіяльним"
+msgstr "%s повертається зі стану бездіяльності (%s)"
 
 #, fuzzy
 msgid "Returned from being away"
-msgstr "_Повернувся"
-
-#, fuzzy
+msgstr "%s повертається (%s)"
+
 msgid "Stopped typing"
-msgstr "Ping"
-
-#, fuzzy
+msgstr "Завершив друкувати"
+
 msgid "Signed off"
-msgstr "Ви_йшов"
-
-#, fuzzy
+msgstr "Вийшов"
+
 msgid "Became idle"
-msgstr "%s має стан бездіяльності"
-
-#, fuzzy
+msgstr "Став бездіяльним"
+
 msgid "Went away"
-msgstr "при відсутності"
-
-#, fuzzy
+msgstr "Відійшов"
+
 msgid "Sent a message"
-msgstr "Надіслати пові_домлення"
-
-#, fuzzy
+msgstr "Надіслати повідомлення"
+
 msgid "Unknown.... Please report this!"
-msgstr "Невідома подія стеження. Сповістіть про це!"
+msgstr "Невідомо... Будь ласка, сповістіть про це!"
 
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "типовий переглядач Gnome"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
 
 #, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Список контактів"
+msgstr "Тема переліку контактів"
 
 msgid "The default Pidgin status icon theme"
 msgstr ""
 
+#, fuzzy
 msgid "Theme failed to unpack."
-msgstr ""
+msgstr "Не вдалося розгорнути тему смайлів."
 
 #, fuzzy
 msgid "Theme failed to load."
-msgstr "Не вдається зберегти зображення: %s\n"
-
+msgstr "Не вдалося розгорнути тему смайлів."
+
+#, fuzzy
 msgid "Theme failed to copy."
-msgstr ""
-
-msgid "Install Theme"
-msgstr ""
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Виберіть тему значків емоцій, якими ви баєте використовувати. Нові теми "
-"можна встановити перетягуванням їх у список."
-
-msgid "Icon"
-msgstr "Значок"
-
-#, fuzzy
+msgstr "Не вдалося розгорнути тему смайлів."
+
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Вибір веб-переглядача"
+
+#. Instructions
+#, fuzzy
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"Виберіть тему значків смайлів, які ви маєте використовувати. Нові теми можна "
+"встановити перетягуванням їх у список."
+
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Тема переліку контактів"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Піктограми стану"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Теми смайлів"
+
 msgid "Keyboard Shortcuts"
 msgstr "Комбінації клавіш"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Бесіда з %s"
-
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "Список контактів"
+msgstr "_Закрити вікно бесід клавішою Escape"
 
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Значок системного лотка"
 
-#, fuzzy
 msgid "_Show system tray icon:"
-msgstr "Значок системного лотка"
-
-#, fuzzy
+msgstr "_Показувати значок в системному лотку:"
+
 msgid "On unread messages"
-msgstr "Надіслати пові_домлення"
-
-#, fuzzy
+msgstr "При непрочитаних повідомленнях"
+
 msgid "Conversation Window"
-msgstr "Вікна бесід"
-
-#, fuzzy
+msgstr "Вікно бесіди"
+
 msgid "_Hide new IM conversations:"
-msgstr "Закрити бесіду"
+msgstr "_Сховати нові бесіди IM:"
 
 msgid "When away"
 msgstr "при відсутності"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "Вікна бесід"
+msgstr "_Зменшувати нові вікна розмов"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "Вкладки"
 
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Показувати бесіди та розмови у вікнах з в_кладками"
@@ -13825,9 +13254,8 @@
 msgid "Show close b_utton on tabs"
 msgstr "Показувати _кнопку закривання у вкладках"
 
-#, fuzzy
 msgid "_Placement:"
-msgstr "Екстра-розташування"
+msgstr "_Розташування:"
 
 msgid "Top"
 msgstr "згори"
@@ -13842,92 +13270,80 @@
 msgstr "справа"
 
 msgid "Left Vertical"
-msgstr ""
+msgstr "Ліворуч вертикально"
 
 msgid "Right Vertical"
-msgstr ""
-
-#, fuzzy
+msgstr "Праворуч вертикально"
+
 msgid "N_ew conversations:"
-msgstr "Закрити бесіду"
-
-#, fuzzy
+msgstr "Нові бесіди:"
+
 msgid "Show _formatting on incoming messages"
-msgstr "Показувати панель _форматування"
+msgstr "Показувати _форматування вхідних повідомлень"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr ""
 
-#, fuzzy
 msgid "Show _detailed information"
-msgstr "Інформація про профіль"
+msgstr "Показати _детальнішу інформацію"
 
 msgid "Enable buddy ic_on animation"
 msgstr "Дозволити _анімацію значків користувачів"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Сповіщати користувачів, про те що ви їм пишете"
-
-#, fuzzy
+msgstr "_Сповіщати користувачів, про те що ви їм друкуєте"
+
 msgid "Highlight _misspelled words"
-msgstr "_Підсвічувати слова з орфографічними помилками"
+msgstr "Підсвітити _слова з орфографічними помилками"
 
 msgid "Use smooth-scrolling"
-msgstr ""
-
-#, fuzzy
+msgstr "Використати плавне прокручування"
+
 msgid "F_lash window when IMs are received"
-msgstr "_Блимати вікном, при отриманні повідомлення"
+msgstr "_Блимати вікном, коли отримано повідомлення"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
-
-#, fuzzy
+msgstr "Найменша висота області введення в рядках:"
+
 msgid "Font"
-msgstr "Вид шрифту"
-
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "Шрифт"
 
 msgid "Use font from _theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Використати шрифт _теми"
+
 msgid "Conversation _font:"
-msgstr "Бесіди"
+msgstr "Шрифт _бесіди:"
 
 msgid "Default Formatting"
 msgstr "Типове форматування"
 
-#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "Так виглядатиме текст ваших повідомлень з використанням протоколів, що "
-"підтримують форматування. :)"
+"підтримують форматування."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "Не вдається запустити програму налаштування проксі."
 
 #, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "Не вдається отримати інформацію про користувача"
+msgstr "Не вдається отримати інформацію про користувача."
 
 #, fuzzy
 msgid "Disabled"
-msgstr "Видимий"
+msgstr "_Вимкнути"
 
 #, fuzzy, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматично визначати IP-адресу"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Сервер:"
+msgstr "ST_UN сервер:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
+msgstr "<span style=\"italic\">Приклад: stunserver.org</span>"
 
 msgid "Public _IP:"
 msgstr "Публічна _IP:"
@@ -13936,7 +13352,7 @@
 msgstr "Порти"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "_Увімкнути автоматичне перенаправлення портів маршуртизатора"
 
 #, fuzzy
 msgid "_Manually specify range of ports to listen on:"
@@ -13944,7 +13360,7 @@
 
 #, fuzzy
 msgid "_Start:"
-msgstr "Статус:"
+msgstr "_Стан:"
 
 #, fuzzy
 msgid "_End:"
@@ -13952,67 +13368,22 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Транзитний сервер (TURN)"
 
 #, fuzzy
 msgid "_TURN server:"
-msgstr "_Сервер:"
+msgstr "ST_UN сервер:"
 
 #, fuzzy
 msgid "Use_rname:"
-msgstr "_Ім'я користувача"
+msgstr "Ім'я користувача:"
 
 #, fuzzy
 msgid "Pass_word:"
 msgstr "Пароль:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Проксі-сервер"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Налаштувати кімнату"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Налаштувати кімнату"
-
-msgid "Proxy Server"
-msgstr "Проксі-сервер"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Тип проксі:"
-
-msgid "No proxy"
-msgstr "без проксі"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Порт:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Ім'я користувача"
-
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
 msgstr "Opera"
@@ -14026,13 +13397,11 @@
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "Прийняти типові параметри"
-
-#, fuzzy
+msgstr "Типове стільниці"
+
 msgid "GNOME Default"
-msgstr "типовий переглядач Gnome"
+msgstr "Типове GNOME"
 
 msgid "Galeon"
 msgstr "Galeon"
@@ -14052,6 +13421,15 @@
 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 "_Веб-переглядач:"
 
@@ -14059,7 +13437,7 @@
 msgstr "_Відкривати посилання у:"
 
 msgid "Browser default"
-msgstr "типовому переглядачеві"
+msgstr "Типове переглядача"
 
 msgid "Existing window"
 msgstr "існуючому вікні"
@@ -14075,46 +13453,76 @@
 "_Вручну:\n"
 "(%s для URL)"
 
-#, fuzzy
+msgid "Proxy Server"
+msgstr "Проксі-сервер"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Програма налаштування проксі не знайдена.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Налаштування _проксі"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "_Тип проксі:"
+
+msgid "No proxy"
+msgstr "без проксі"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Порт:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "Ім'я користувача:"
+
 msgid "Log _format:"
 msgstr "_Формат журналу:"
 
-#, fuzzy
 msgid "Log all _instant messages"
-msgstr "З_аписувати усі повідомлення"
+msgstr "З_аписувати у журнал всі повідомлення"
 
 msgid "Log all c_hats"
 msgstr "Записувати усі _розмови"
 
 msgid "Log all _status changes to system log"
-msgstr ""
+msgstr "Записувати всі _зміни статусу до системного журналу"
 
 msgid "Sound Selection"
 msgstr "Вибір звуку"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Quietest"
-msgstr "Вийти"
-
-#, fuzzy, c-format
+msgstr "Найтихше"
+
+#, c-format
 msgid "Quieter"
-msgstr "Вийти"
-
-#, fuzzy, c-format
+msgstr "Тихше"
+
+#, c-format
 msgid "Quiet"
-msgstr "Вийти"
-
-#, fuzzy, c-format
+msgstr "Тихо"
+
+#, c-format
 msgid "Loud"
-msgstr "Завантажити"
-
-#, fuzzy, c-format
+msgstr "Гучно"
+
+#, c-format
 msgid "Louder"
-msgstr "година"
-
-#, fuzzy, c-format
+msgstr "Гучніше"
+
+#, c-format
 msgid "Loudest"
-msgstr "Звуки"
+msgstr "Найгучніше"
 
 msgid "_Method:"
 msgstr "_Метод:"
@@ -14122,9 +13530,8 @@
 msgid "Console beep"
 msgstr "сигнал динаміком"
 
-#, fuzzy
 msgid "No sounds"
-msgstr "Звуки"
+msgstr "Немає звуків"
 
 #, c-format
 msgid ""
@@ -14134,83 +13541,68 @@
 "_Команда відтворення:\n"
 "(%s для назви файлу)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Вимкнути звук"
+msgstr "_Вимкнути звук"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Звуки, коли вікно бесіди має _фокус"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Помилка"
+msgstr "Увімкнути _звуки:"
 
 msgid "V_olume:"
-msgstr ""
+msgstr "_Гучність:"
 
 msgid "Play"
 msgstr "Відтворення"
 
-#, fuzzy
 msgid "_Browse..."
 msgstr "_Огляд..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "Скинути"
-
-#, fuzzy
+msgstr "_Скинути"
+
 msgid "_Report idle time:"
-msgstr "Показувати _час бездіяльності"
+msgstr "Звітувати про час _бездіяльності:"
 
 msgid "Based on keyboard or mouse use"
-msgstr ""
+msgstr "Оснований за використанні миші або клавіатури"
+
+msgid "_Minutes before becoming idle:"
+msgstr "Хвилин до встановлення бездіяльності:"
+
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "Змінювати стан коли _бездіяльний"
 
 msgid "_Auto-reply:"
 msgstr "_Автовідповідь:"
 
-#, fuzzy
 msgid "When both away and idle"
-msgstr "при відсутності або бездіяльності"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Авто-\"Відійшов\""
-
-#, fuzzy
-msgid "_Minutes before becoming idle:"
-msgstr "_Хвилин до встановлення статусу \"Відійшов\""
-
-#, fuzzy
-msgid "Change status when _idle"
-msgstr "Ав_томатично встановлювати статус \"Відійшов\""
-
-#, fuzzy
-msgid "Change _status to:"
-msgstr "Змінити адресу на:"
+msgstr "Коли обидва відсутності або бездіяльності"
 
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr ""
+msgstr "Стан після запуску"
 
 msgid "Use status from last _exit at startup"
-msgstr ""
+msgstr "Використовувати останній статус при запуску"
 
 msgid "Status to a_pply at startup:"
-msgstr ""
+msgstr "Застосувати _стан після запуску:"
 
 msgid "Interface"
 msgstr "Зовнішній вигляд"
 
-msgid "Smiley Themes"
-msgstr "Теми значків емоцій"
-
 msgid "Browser"
 msgstr "Веб-переглядач"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "Відсутність / бездіяльність"
+msgstr "Стан / бездіяльність"
+
+#, fuzzy
+msgid "Themes"
+msgstr "Теми смайлів"
 
 msgid "Allow all users to contact me"
 msgstr "Дозволити доступ усім користувачам"
@@ -14237,9 +13629,8 @@
 msgstr "Налаштувати конфіденційність для:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "Видалити"
+msgstr "Вилучити _всі"
 
 msgid "Permit User"
 msgstr "Допуск користувача"
@@ -14250,9 +13641,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Введіть ім'я користувача, якому ви дозволяєте звертатись до вас."
 
-#, fuzzy
 msgid "_Permit"
-msgstr "Дозволити"
+msgstr "_Дозволити"
 
 #, c-format
 msgid "Allow %s to contact you?"
@@ -14289,103 +13679,88 @@
 msgstr "Бажаєте переписати його?"
 
 msgid "Overwrite"
-msgstr ""
+msgstr "Замінити"
 
 msgid "Choose New Name"
-msgstr ""
-
-#, fuzzy
+msgstr "Виберіть нове ім'я"
+
 msgid "Select Folder..."
-msgstr "Вибрати колір тексту"
+msgstr "Вибрати теку..."
 
 #. list button
 msgid "_Get List"
 msgstr "_Отримати перелік"
 
 #. add button
-#, fuzzy
 msgid "_Add Chat"
-msgstr "Додати розмову"
-
-#, fuzzy
+msgstr "Додати _розмову"
+
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Ви дійсно бажаєте видалити %s?"
+msgstr "Ви впевнені, що хочете видалити вибрані збережені стани?"
 
 #. Use button
 msgid "_Use"
 msgstr "_Застосувати"
 
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#, fuzzy
+msgstr "Назва вже використовується. Ви маєте вибрати унікальну назву."
+
 msgid "Different"
-msgstr "Департамент"
-
-#, fuzzy
+msgstr "Різниця"
+
 msgid "_Title:"
-msgstr "Звання"
-
-#, fuzzy
+msgstr "_Назва:"
+
 msgid "_Status:"
-msgstr "Статус:"
+msgstr "_Стан:"
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "Використовувати _різний стан для деяких облікових записів"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
 msgstr "Зберегти _та застосувати"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Status for %s"
-msgstr "Стан: %s"
+msgstr "Стан для %s"
 
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "Вставити посмішку"
-
-#, fuzzy
+msgstr "Нетиповий смайл"
+
 msgid "Duplicate Shortcut"
-msgstr "Файл публічного ключа"
-
-#, fuzzy
+msgstr "Подвоїти гарячу клавішу"
+
 msgid "Edit Smiley"
-msgstr "Вставити посмішку"
-
-#, fuzzy
+msgstr "Редагувати смайл"
+
 msgid "Add Smiley"
-msgstr "Посмішка!"
-
-#, fuzzy
+msgstr "Додати смайл"
+
 msgid "_Image:"
-msgstr "Збереження зображення"
+msgstr "_Зображення:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Комбінації клавіш"
-
-#, fuzzy
+msgstr ""
+
 msgid "Smiley"
-msgstr "Посмішка!"
-
-#, fuzzy
+msgstr "Смайл"
+
 msgid "Shortcut Text"
-msgstr "Комбінації клавіш"
+msgstr ""
 
 msgid "Custom Smiley Manager"
-msgstr ""
-
-#, fuzzy
+msgstr "Керівник нетиповими смайлами"
+
 msgid "Select Buddy Icon"
-msgstr "Вибрати користувача"
+msgstr "Виберіть значок контакту"
 
 msgid "Click to change your buddyicon for this account."
 msgstr ""
@@ -14393,36 +13768,31 @@
 msgid "Click to change your buddyicon for all accounts."
 msgstr ""
 
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "Очікування початку передачі"
-
-#, fuzzy
+msgstr "Очікую на з'єднання з мережею"
+
 msgid "New status..."
-msgstr "Нове повідомлення.."
-
-#, fuzzy
+msgstr "Новий стан..."
+
 msgid "Saved statuses..."
-msgstr "Статистика сервера"
-
-#, fuzzy
+msgstr "Збережені стани..."
+
 msgid "Status Selector"
-msgstr "Текст статусу"
+msgstr "Вибирач стану"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #, fuzzy, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Невідома помилка підключення: %s"
 
-#, fuzzy
 msgid "Failed to load image"
-msgstr "Не вдається зберегти зображення: %s\n"
-
-#, fuzzy, c-format
+msgstr "Не вдається завантажити зображення"
+
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "Не вдається надіслати файл"
+msgstr "Не можливо надіслати теку %s."
 
 #, c-format
 msgid ""
@@ -14432,24 +13802,21 @@
 
 #, fuzzy
 msgid "You have dragged an image"
-msgstr "Ви ввели неправильне ім'я користувача"
+msgstr "/Бесіда/Вставити зображення..."
 
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 
-#, fuzzy
 msgid "Set as buddy icon"
-msgstr "Показувати з_начки користувачів"
-
-#, fuzzy
+msgstr "Встановити значок контакту"
+
 msgid "Send image file"
-msgstr "Надіслати повідомлення"
-
-#, fuzzy
+msgstr "Надіслати файл з зображенням"
+
 msgid "Insert in message"
-msgstr "Вставити зображення"
+msgstr "Вставити в повідомлення"
 
 #, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
@@ -14473,7 +13840,7 @@
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #, fuzzy
 msgid "Cannot send launcher"
-msgstr "Не вдається надіслати файл"
+msgstr "Не можна відправляти каталог."
 
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
@@ -14494,26 +13861,23 @@
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#, fuzzy
 msgid "Icon Error"
-msgstr "Невідома помилка"
-
-#, fuzzy
+msgstr "Помилка значка"
+
 msgid "Could not set icon"
-msgstr "Не вдається відправити"
-
-#, fuzzy, c-format
+msgstr "Не вдається встановити значок"
+
+#, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Не вдається зберегти зображення: %s\n"
+msgstr "Не вдається відкрити файл '%s': %s"
 
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Відкривати посилання у:"
+msgstr "_Відкривати посилання"
 
 msgid "_Copy Link Location"
 msgstr "_Копіювати посилання"
@@ -14521,104 +13885,86 @@
 msgid "_Copy Email Address"
 msgstr "_Копіювати адресу ел.пошти"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "Відкривання файлу"
+msgstr "_Відкрити файл"
 
 #, fuzzy
 msgid "Open _Containing Directory"
-msgstr "_Шукати:"
-
-#, fuzzy
+msgstr "Тека з журналами"
+
 msgid "Save File"
-msgstr "Збереження файлу..."
-
-#, fuzzy
+msgstr "Зберегти файл"
+
 msgid "_Play Sound"
-msgstr "В_ідтворити звук"
-
-#, fuzzy
+msgstr "_Відтворити звук"
+
 msgid "_Save File"
-msgstr "Збереження файлу..."
-
-#, fuzzy
+msgstr "_Зберегти файл"
+
 msgid "Select color"
-msgstr "Вибрати колір тексту"
+msgstr "Вибрати колір"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "Пейджер"
+msgstr "Pidgin"
 
 msgid "_Alias"
 msgstr "_Псевдонім"
 
-#, fuzzy
 msgid "Close _tabs"
-msgstr "Закрити"
-
-#, fuzzy
+msgstr "Закрити _вкладки"
+
 msgid "_Get Info"
-msgstr "Отримати інформацію"
+msgstr "_Отримати інформацію"
 
 msgid "_Invite"
 msgstr "_Запросити"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "З_мінити"
-
-#, fuzzy
+msgstr "З_мінити..."
+
 msgid "_Add..."
-msgstr "Додати"
+msgstr "_Додати..."
 
 msgid "_Open Mail"
 msgstr "_Відкрити пошту"
 
-#, fuzzy
 msgid "_Edit"
 msgstr "_Правка"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "Пейджер"
+msgstr "Підказки Pidgin"
 
 msgid "Pidgin smileys"
-msgstr ""
-
-msgid "Penguin Pimps"
-msgstr ""
+msgstr "Смайли Pidgin"
 
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
-#, fuzzy
 msgid "none"
-msgstr "Будь-хто"
-
-#, fuzzy
+msgstr "немає"
+
 msgid "Small"
-msgstr "Ел.пошта"
+msgstr "Маленький"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
 
 #, fuzzy
 msgid "Response Probability:"
-msgstr "Відповіді загублені"
-
-#, fuzzy
+msgstr "Час відповіді"
+
 msgid "Statistics Configuration"
-msgstr "Параметри значка лотка"
+msgstr "Налаштування статистики"
 
 #. msg_difference spinner
+#, fuzzy
 msgid "Maximum response timeout:"
-msgstr ""
-
-#, fuzzy
+msgstr "Вийшов час очікування віддаленого сервера"
+
 msgid "minutes"
-msgstr "хвилин."
+msgstr "хвилин"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
@@ -14626,7 +13972,7 @@
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "Поріг:"
 
 #. *< type
 #. *< ui_requirement
@@ -14634,8 +13980,9 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#, fuzzy
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Прочитано %u контакт Kad"
 
 #. *< name
 #. *< version
@@ -14646,26 +13993,22 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#, fuzzy
 msgid "Buddy is idle"
-msgstr "Користувач бездіяльний:"
-
-#, fuzzy
+msgstr "Користувач бездіяльний"
+
 msgid "Buddy is away"
-msgstr "Користувач відійшов:"
+msgstr "Користувач відійшов"
 
 #, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "Користувач відійшов:"
+msgstr "%s повертається."
 
 #. Not used yet.
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "Користувач бездіяльний:"
-
-#, fuzzy
+msgstr "Користувач пересувається"
+
 msgid "Buddy is offline"
-msgstr "Користувач не у мережі:"
+msgstr "Користувач не в мережі"
 
 msgid "Point values to use when..."
 msgstr "Вкажіть значення, які використовувати..."
@@ -14707,114 +14050,94 @@
 "Дозволяє змінювати значення станів користувачів \"бездіяльний/відійшов/не у "
 "мережі\" при обчисленні пріоритетів користувачів."
 
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/Бесіда/_Закрити"
+msgstr "Кольори бесіди"
 
 #, fuzzy
 msgid "Customize colors in the conversation window"
-msgstr "%s закрив вікно бесіди."
-
-#, fuzzy
+msgstr "Видаляти, коли ви починаєте _друкувати у вікні бесіди"
+
 msgid "Error Messages"
-msgstr "Вимкнення повідомлень про помилки"
-
-#, fuzzy
+msgstr "Повідомлення про помилки"
+
 msgid "Highlighted Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "Обрані повідомлення"
+
 msgid "System Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "Системні повідомлення"
+
 msgid "Sent Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr "Надіслані повідомлення"
+
 msgid "Received Messages"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy, c-format
+msgstr "Отримані повідомлення"
+
+#, c-format
 msgid "Select Color for %s"
-msgstr "Вибрати колір тексту"
-
-#, fuzzy
+msgstr "Вибрати колір для %s"
+
 msgid "Ignore incoming format"
-msgstr "Ігнорувати _кольори"
-
-#, fuzzy
+msgstr "Нехтувати вхідним форматом"
+
 msgid "Apply in Chats"
-msgstr "Псевдонім розмови"
+msgstr "Застосувати у розмовах"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "Застовувати у миттєвих повідомленнях"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "Адреса сервера"
-
-#, fuzzy
+msgstr "Запит назви сервера"
+
 msgid "Enter an XMPP Server"
-msgstr "Увійти на сервер конференцій"
-
-#, fuzzy
+msgstr "Введіть сервер XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Виберіть сервер конференцій для опитування"
-
-#, fuzzy
+msgstr "Виберіть сервер XMPP для запиту"
+
 msgid "Find Services"
-msgstr "Мережні служби"
-
-#, fuzzy
+msgstr "Знайти служби"
+
 msgid "Add to Buddy List"
-msgstr "Надсилання списку контактів"
-
-#, fuzzy
+msgstr "Додати до переліку контактів"
+
 msgid "Gateway"
-msgstr "при відсутності"
-
-#, fuzzy
+msgstr "Шлюз"
+
 msgid "Directory"
-msgstr "_Шукати:"
+msgstr "Каталог"
 
 #, fuzzy
 msgid "PubSub Collection"
 msgstr "Вибір звуку"
 
+#, fuzzy
 msgid "PubSub Leaf"
-msgstr ""
-
-#, fuzzy
+msgstr "Служба недоступна"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>Опис:</b> Примарний"
+"<b>Опис:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Встановити інформацію каталогу"
-
-#, fuzzy
+msgstr "Пошук служб"
+
 msgid "_Browse"
-msgstr "_Веб-переглядач:"
-
-#, fuzzy
+msgstr "_Переглянути"
+
 msgid "Server does not exist"
-msgstr "Користувач не існує"
-
-#, fuzzy
+msgstr "Сервер не існує"
+
 msgid "Server does not support service discovery"
-msgstr "Сервер не використовує жодного підтримуваного методу ідентифікації"
-
-#, fuzzy
+msgstr "Сервер не підтримує пошук служб"
+
 msgid "XMPP Service Discovery"
-msgstr "Встановити інформацію каталогу"
+msgstr "Пошук служб XMPP"
 
 msgid "Allows browsing and registering services."
 msgstr ""
@@ -14823,6 +14146,8 @@
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"Цей додаток корисний для реєстрації із застарілими транспортами або іншими "
+"службами XMPP."
 
 msgid "By conversation count"
 msgstr "за кількістю діалогів"
@@ -14938,17 +14263,15 @@
 "створіть нову особу."
 
 #. Add the expander
-#, fuzzy
 msgid "User _details"
-msgstr "Сховати подробиці про користувача"
+msgstr "_Подробиці про користувача"
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
 msgstr "_Асоціювати користувача"
 
-#, fuzzy
 msgid "Unable to send email"
-msgstr "Не вдається відправити повідомлення."
+msgstr "Не вдається відправити лист ел. пошти"
 
 msgid "The evolution executable was not found in the PATH."
 msgstr ""
@@ -14959,9 +14282,8 @@
 msgid "Add to Address Book"
 msgstr "Додати до адресної книги"
 
-#, fuzzy
 msgid "Send Email"
-msgstr "Ел.пошта"
+msgstr "Надіслати листа ел. пошти"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
@@ -14985,16 +14307,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Provides integration with Evolution."
-msgstr "Забезпечує інтеграцію з Ximian Evolution."
+msgstr "Забезпечує інтеграцію з Evolution."
 
 msgid "Please enter the person's information below."
 msgstr "Нижче введіть інформацію про особу."
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "Нижче введіть ідентифікатор користувача та тип облікового запису."
+msgstr "Будь ласка, нижче введіть ім'я користувача та тип облікового запису."
 
 msgid "Account type:"
 msgstr "Тип облікового запису:"
@@ -15028,13 +14348,13 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "Перевірка чи усі сигнали інтерфейсу працюють належним чином."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Бездіяльний:</b>"
+"<b>Примітка користувача</b>: %s"
 
 msgid "History"
 msgstr "Історія"
@@ -15071,14 +14391,15 @@
 msgstr "Підкреслений"
 
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr ""
+msgstr "Малювати лінію, щоб показати нові повідомлення у бесіді."
 
 #, fuzzy
 msgid "Jump to markerline"
-msgstr "Підкреслений"
-
+msgstr "_Перейти до подкасту, що програється"
+
+#, fuzzy
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "Додати до групи"
 
 msgid "_IM windows"
 msgstr "Вікна _бесід"
@@ -15094,28 +14415,25 @@
 msgid "Music messaging session confirmed."
 msgstr ""
 
-#, fuzzy
 msgid "Music Messaging"
-msgstr "Миттєвий обмін повідомленнями"
+msgstr "Музичні повідомлення"
 
 msgid "There was a conflict in running the command:"
 msgstr ""
 
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "Помилка підключення до розмови %s"
-
-#, fuzzy
+msgstr "Помилка запуску редактора"
+
 msgid "The following error has occurred:"
-msgstr "Невідома помилка підключення: %s"
+msgstr "Сталася наступна помилка:"
 
 #. Configuration frame
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "Налаштовування жестів миші"
-
+msgstr "Налаштування музичних повідомлень"
+
+#, fuzzy
 msgid "Score Editor Path"
-msgstr ""
+msgstr "Відкрити в редакторі"
 
 msgid "_Apply"
 msgstr "_Застосувати"
@@ -15141,9 +14459,8 @@
 msgid "Notify For"
 msgstr "Сповіщати про"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "Хтось назвав ваше ім'я у розмові"
+msgstr "\t_Тільки коли хтось говорить ваше ім'я"
 
 msgid "_Focused windows"
 msgstr "Вікна з _фокусом"
@@ -15168,19 +14485,16 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Встановити підказку \"_ТЕРМІНОВО\" менеджера вікон"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Вікна _розмов"
+msgstr "_Блимати вікном"
 
 #. Raise window method button
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "Вікна бесід"
+msgstr "_Розгорнути вікно бесід"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "Вікна бесід"
+msgstr ""
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -15196,7 +14510,7 @@
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "Видаляти, коли ви починаєте _писати у вікні бесіди"
+msgstr "Видаляти, коли ви починаєте _друкувати у вікні бесіди"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
@@ -15228,15 +14542,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "Демонстраційний модуль Pidgin"
+msgstr "Демонстраційний додаток Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "An example plugin that does stuff - see the description."
-msgstr "Демонстраційний модуль, що виконує різні речі - дивіться опис."
+msgstr "Демонстраційний додаток, що виконує різні речі - дивіться опис."
 
 #. *  description
 msgid ""
@@ -15245,97 +14558,85 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Це дійсно визначний модуль, який виконує багато речей:\n"
+"Це дійсно визначний додаток, який виконує багато речей:\n"
 "- повідомляє, хто написав цю програму, коли ви входите\n"
 "- перегортає весь вхідний текст\n"
 "- відправляє повідомлення користувачам з вашого списку коли вони входять"
 
-#, fuzzy
 msgid "Hyperlink Color"
 msgstr "Колір гіперпосилання"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Колір гіперпосилання"
-
-#, fuzzy
+msgstr "Колір відвіданого гіперпосилання"
+
 msgid "Highlighted Message Name Color"
-msgstr "Надсилання повідомлення"
-
-#, fuzzy
+msgstr ""
+
 msgid "Typing Notification Color"
-msgstr "Видалення сповіщень"
+msgstr "Колір сповіщення про друк"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#, fuzzy
 msgid "Conversation Entry"
+msgstr "Елемент бесіди"
+
+msgid "Conversation History"
 msgstr "Бесіди"
 
-#, fuzzy
 msgid "Request Dialog"
-msgstr "Неоднозначний запит"
-
-#, fuzzy
+msgstr "Діалог запиту"
+
 msgid "Notify Dialog"
-msgstr "Сповіщати про"
-
-#, fuzzy
+msgstr "Діалог сповіщень"
+
 msgid "Select Color"
-msgstr "Вибрати колір тексту"
-
-#, fuzzy, c-format
+msgstr "Вибрати колір"
+
+#, c-format
 msgid "Select Interface Font"
-msgstr "Вибір шрифту"
-
-#, fuzzy, c-format
+msgstr "Вибір шрифт інтерфейсу"
+
+#, c-format
 msgid "Select Font for %s"
-msgstr "Вибір шрифту"
-
-#, fuzzy
+msgstr "Вибір шрифт для %s"
+
 msgid "GTK+ Interface Font"
-msgstr "Параметри зовнішнього вигляду"
+msgstr "Шрифт інтерфейсу GTK+"
 
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Сповіщення про нову пошту"
-
-#, fuzzy
+msgstr "Вимкнути текст сповіщення про друк"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Керування Pidgin з файлу"
-
-#, fuzzy
+msgstr "Налаштування теми GTK+"
+
 msgid "Colors"
-msgstr "Закрити"
-
-#, fuzzy
+msgstr "Кольори"
+
 msgid "Fonts"
-msgstr "Облікові записи"
+msgstr "Шрифти"
 
 msgid "Miscellaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Різноманітні"
+
 msgid "Gtkrc File Tools"
-msgstr "Керування Pidgin з файлу"
+msgstr "Інструменти файлу Gtkrc"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
+msgstr "Записати налаштування до %s%sgtkrc-2.0"
 
 msgid "Re-read gtkrc files"
-msgstr ""
-
-#, fuzzy
+msgstr "Перечитати файли gtkrc"
+
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Керування Pidgin з файлу"
+msgstr "Керування темою GTK+ Pidgin"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Надає доступ до спільних налаштувань gtkrc"
 
 msgid "Raw"
 msgstr "Необроблений"
@@ -15345,29 +14646,26 @@
 "Дозволяє надсилати необроблений вивід, використовуючи протоколи, що "
 "побудовані на тексті."
 
-#, fuzzy
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Дозволяє надіслати необроблений ввід, використовуючи протоколи на основі "
 "тексту (Jabber, MSN, IRC, TOC). Для надсилання натисніть Еnter у області "
-"вводу. Слідкуйте за вікном налагодження."
+"вводу. Слідкуйте за вікном зневадження."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Ви можете сьогодні оновитися до %s %s."
 
 msgid "New Version Available"
 msgstr "Доступна нова версія"
 
-#, fuzzy
 msgid "Later"
-msgstr "Дата"
-
-#, fuzzy
+msgstr "Пізніше"
+
 msgid "Download Now"
-msgstr "Користувачі %s: %s"
+msgstr "Звантажити зараз"
 
 #. *< type
 #. *< ui_requirement
@@ -15400,15 +14698,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_Надіслати як"
+msgstr "Кнопка \"Надіслати\""
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "Вікна бесід"
+msgstr "Кнопка \"Надіслати\" вікна бесід."
 
 #. *< summary
 msgid ""
@@ -15417,7 +14713,7 @@
 msgstr ""
 
 msgid "Duplicate Correction"
-msgstr ""
+msgstr "Подвоїти корегування"
 
 msgid "The specified word already exists in the correction list."
 msgstr ""
@@ -15432,10 +14728,10 @@
 msgstr "Надсилається"
 
 msgid "Whole words only"
-msgstr ""
+msgstr "Тільки ціле слово"
 
 msgid "Case sensitive"
-msgstr ""
+msgstr "Чутливий до регістру"
 
 msgid "Add a new text replacement"
 msgstr "Додати нову заміну тексту"
@@ -15451,11 +14747,10 @@
 msgstr ""
 
 msgid "Only replace _whole words"
-msgstr ""
-
-#, fuzzy
+msgstr "Замінити тільки _цілі слова"
+
 msgid "General Text Replacement Options"
-msgstr "Заміна тексту"
+msgstr "Загальні параметри заміни тексту"
 
 msgid "Enable replacement of last word on send"
 msgstr ""
@@ -15468,94 +14763,78 @@
 "Замінює текст у вихідних повідомленнях згідно правилам, що встановлені "
 "користувачем."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Не у мережі"
-
-#, fuzzy
+msgstr "Щойно увійшов"
+
 msgid "Just logged out"
-msgstr "%s не у мережі."
+msgstr "Щойно вийшов"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "Приєднатися до розмови"
-
-#, fuzzy
+msgstr "Піктограма для балачки"
+
 msgid "Ignored"
-msgstr "Ігнорувати"
-
-#, fuzzy
+msgstr "Знехтуваний"
+
 msgid "Founder"
-msgstr "година"
+msgstr "Засновник"
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opera"
+msgstr "Оператор"
 
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
 msgstr ""
 
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "Авторизацію отримано"
-
-#, fuzzy
+msgstr "Діолог авторизації"
+
 msgid "Error dialog"
-msgstr "Помилка"
-
-#, fuzzy
+msgstr "Діалог помилки"
+
 msgid "Information dialog"
-msgstr "Інформація"
+msgstr "Діалог інформації"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Поштовий діалог"
+
 msgid "Question dialog"
-msgstr "Неоднозначний запит"
-
-#, fuzzy
+msgstr "Діалог запитання"
+
 msgid "Warning dialog"
-msgstr "Рівень попередження"
+msgstr "Діалог попередження"
 
 msgid "What kind of dialog is this?"
 msgstr ""
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "Стан: %s"
-
-#, fuzzy
+msgstr "Піктограми стану"
+
 msgid "Chatroom Emblems"
-msgstr "Локаль кімнати розмов"
-
-#, fuzzy
+msgstr "Емблеми кімнат балачок"
+
 msgid "Dialog Icons"
-msgstr "Збереження значка"
-
-#, fuzzy
+msgstr "Значки діалогів"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Керування Pidgin з файлу"
-
-#, fuzzy
+msgstr "Редактор теми значків Pidgin"
+
 msgid "Contact"
-msgstr "Дані про обліковий запис"
+msgstr "Контакт"
 
 #, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Список контактів"
+msgstr "Тема переліку контактів"
 
 #, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "Список контактів"
+msgstr "Тема переліку контактів"
 
 msgid "Edit Icon Theme"
 msgstr ""
@@ -15567,16 +14846,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Керування Pidgin з файлу"
+msgstr "Редактор теми Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Керування Pidgin з файлу"
+msgstr "Редактор теми Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -15594,9 +14871,8 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Горизонтальна прокрутка списку контактів."
 
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "Позначка часу iChat"
+msgstr "Відображати позначки часу кожні"
 
 #. *< type
 #. *< ui_requirement
@@ -15610,40 +14886,34 @@
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "Позначка часу iChat"
+msgstr "Відображати позначки часу у стилі iChat"
 
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "Додає у бесіди позначки часу у стилі iChat кожні N хвилин."
+msgstr "Відображати позначки часу у стилі iChat кожні N хвилин."
 
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "Опції формату дати та часу"
 
 #, c-format
 msgid "_Force 24-hour time format"
-msgstr ""
-
-#, fuzzy
+msgstr "_Примусово 24-годинний формат часу"
+
 msgid "Show dates in..."
-msgstr "Показати більше параметрів"
-
-#, fuzzy
+msgstr "Показувати дати у..."
+
 msgid "Co_nversations:"
-msgstr "Бесіди"
-
-#, fuzzy
+msgstr "_Бесіди:"
+
 msgid "For delayed messages"
-msgstr "Нове повідомлення про відсутність"
+msgstr "Для затриманих повдомлень"
 
 msgid "For delayed messages and in chats"
 msgstr ""
 
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "Журнали повідомлень"
+msgstr "_Журнал повідомлень:"
 
 #. *< type
 #. *< ui_requirement
@@ -15652,49 +14922,45 @@
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "Формат дати та часу повідомлень"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "Налаштовує формат дати та часу повідомлень."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-
-#, fuzzy
+"Додаток дозволяє користувачу налаштовувати формат дати та часу розмов і "
+"повідомлень журналу."
+
 msgid "Audio"
-msgstr "Авторизувати"
-
-#, fuzzy
+msgstr "Аудіо"
+
 msgid "Video"
-msgstr "Живе відео"
+msgstr "Відео"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Виведення"
+
 msgid "_Plugin"
-msgstr "Модулі"
-
-#, fuzzy
+msgstr "_Додаток"
+
 msgid "_Device"
-msgstr "Пристрій"
+msgstr "_Пристрій"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Введення"
+
 msgid "P_lugin"
-msgstr "Модулі"
-
-#, fuzzy
+msgstr "_Додаток"
+
 msgid "D_evice"
-msgstr "Пристрій"
+msgstr "_Пристрій"
 
 #. *< magic
 #. *< major version
@@ -15705,9 +14971,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "використовувати параметри оточення"
+msgstr "Налаштування голосу та відео"
 
 #. *< name
 #. *< version
@@ -15731,13 +14996,11 @@
 msgid "_Show slider bar in IM window"
 msgstr "_Показувати смугу прокрутки у вікнах бесід"
 
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "Прозорість вікна _бесіди"
-
-#, fuzzy
+msgstr "Прибрати прозорість вікна миттєвий повідомлень після отримання фокусу"
+
 msgid "Always on top"
-msgstr "Псевдонім контакту"
+msgstr "Завжди зверху"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
@@ -15746,9 +15009,8 @@
 msgid "_Buddy List window transparency"
 msgstr "Прозорість вікна списку _контактів"
 
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Прозорість вікна списку _контактів"
+msgstr "Прибрати прозорість вікна переліку контактів після отримання фокусу"
 
 #. *< type
 #. *< ui_requirement
@@ -15766,56 +15028,54 @@
 msgstr "Змінна прозорість для списку контактів та бесід."
 
 #. *  description
-#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Даний модуль вмикає змінну альфа-прозорість вікон бесід та списку "
+"Даний додаток вмикає змінну альфа-прозорість вікон бесід та списку "
 "контактів.\n"
 "\n"
-"Примітка: Даний модуль потребує Win2000 або WinXP."
+"Примітка: Даний додаток потребує Win2000 або WinXP."
 
 #. Autostart
 msgid "Startup"
 msgstr "Завантаження"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Запускати Pidgin при завантаженні Windows"
-
+msgstr "_Запускати %s після завантаження Windows"
+
+#, fuzzy
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "Дозволити декілька одночасних входів"
 
 msgid "_Dockable Buddy List"
-msgstr "_Закріплений список контактів"
+msgstr "_Закріплений перелік контактів"
 
 #. Blist On Top
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
-msgstr "_Тримати вікно списку контактів згори"
+msgstr "_Тримати вікно переліку контактів згори:"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr ""
-
-#, fuzzy
+msgstr "Тільки коли пришвартований"
+
 msgid "Windows Pidgin Options"
-msgstr "Параметри входу"
-
-#, fuzzy
+msgstr "Параметри Pidgin для Windows"
+
 msgid "Options specific to Pidgin for Windows."
 msgstr "Специфічні для Windows параметри Pidgin."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "Специфічні для Windows параметри Pidgin."
+msgstr ""
+"Забезпечує опції, що є особливими для Pidgin для Windows, такі як "
+"пришвартовування переліку контактів."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Вийшов.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15824,72 +15084,89 @@
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
-
-#, fuzzy
+msgstr "Консоль XMPP"
+
 msgid "Account: "
-msgstr "Обліковий запис:"
+msgstr "Обліковий запис: "
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>Не з'єднаний з XMPP</font>"
 
 msgid "Insert an <iq/> stanza."
-msgstr ""
+msgstr "Вставити рядок <iq/>."
 
 msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#, fuzzy
+msgstr "Вставити строфу <presence/>."
+
 msgid "Insert a <message/> stanza."
-msgstr "Вставити зображення"
+msgstr "Вставити строфу <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Надіслати та отримати сирі рядки XMPP"
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#, fuzzy
+msgstr "Додаток корисний для зневадження сервера або клієнта XMPP"
+
+#~ msgid "Send instant messages over multiple protocols"
+#~ msgstr "Надіслати миттєві повідомлення через декілька повідомлень"
+
+#~ msgid "Install Theme"
+#~ msgstr "Встановити тему"
+
+#~ msgid "Icon"
+#~ msgstr "Значок"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Використати шрифт документу з теми"
+
 #~ msgid "_Start port:"
 #~ msgstr "П_очатковий порт:"
 
-#, fuzzy
 #~ msgid "_End port:"
 #~ msgstr "К_інцевий порт:"
 
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Сервер проксі &amp; Переглядач"
+
 #~ msgid "_User:"
 #~ msgstr "_Користувач:"
 
+#~ msgid "Auto-away"
+#~ msgstr "Авто-\"Відійшов\""
+
+#~ msgid "Change _status to:"
+#~ msgstr "Змінити _стан на:"
+
 #~ msgid "GTK+ Runtime Version"
 #~ msgstr "Версія GTK+"
 
-#, fuzzy
+#~ msgid "Invalid certificate chain"
+#~ msgstr "Помилка імпортування сертифікату"
+
+#~ msgid "Failed to validate expiration time for %s"
+#~ msgstr "Не вдається встановити режими каналу для %s"
+
 #~ msgid "Calling ... "
-#~ msgstr "Підрахунок..."
-
-#, fuzzy
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Неправильний механізм авторизації"
-
-#, fuzzy
+#~ msgstr "Телефоную..."
+
 #~ msgid "Join/Part Hiding Configuration"
 #~ msgstr "Налаштовування інтеграції з Evolution"
 
-#, fuzzy
+#~ msgid "Minimum Room Size"
+#~ msgstr "Найменший розмір кімнати"
+
 #~ msgid "Malformed BOSH Connect Server"
 #~ msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy
 #~ msgid "Failed to open the file"
-#~ msgstr "Не вдається зберегти зображення: %s\n"
-
-#, fuzzy
+#~ msgstr "Не вдалося відкрити файл"
+
 #~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Не вдається завантажити публічний ключ"
+#~ msgstr "Не вдається завантажити пару ключів SILC"
 
 #~ msgid "Your account is locked, please log in to the Yahoo! website."
 #~ msgstr "Ваш обліковий запис заблокований, увійдіть з веб-сторінки Yahoo!"
@@ -15901,25 +15178,28 @@
 #~ msgid "Invitation Rejected"
 #~ msgstr "У запрошенні відмовлено"
 
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "без проксі"
+#~ msgid "Euskera(Basque)"
+#~ msgstr "Баскська"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Допомога через e-mail:</FONT> <A HREF=\"mailto:"
+#~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
 
 #~ msgid "_Resume"
 #~ msgstr "Від_новити"
 
-#, fuzzy
 #~ msgid "Cannot open socket"
 #~ msgstr "Не вдається відкрити сокет"
 
-#, fuzzy
 #~ msgid "Could not listen on socket"
-#~ msgstr "Не вдається створити сокет"
+#~ msgstr "Не вдається слухати на сокеті"
 
 #~ msgid "Unable to read socket"
 #~ msgstr "Не вдається прочитати сокет"
 
-#, fuzzy
 #~ msgid "Connection failed."
 #~ msgstr "Не вдається встановити з'єднання"
 
@@ -15935,112 +15215,144 @@
 #~ msgid "Read error"
 #~ msgstr "Помилка читання"
 
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалося встановити з'єднання з сервером:\n"
+#~ "%s"
+
 #~ msgid "Write error"
 #~ msgstr "Помилка запису"
 
-#, fuzzy
-#~ msgid "Service Discovery Info"
-#~ msgstr "Встановити інформацію каталогу"
-
-#, fuzzy
+#~ msgid "Last Activity"
+#~ msgstr "Остання діяльність"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Служба не визначена"
+
 #~ msgid "Extended Stanza Addressing"
-#~ msgstr "Додаткова адреса"
-
-#, fuzzy
+#~ msgstr "Непідтримуваний тип строфи"
+
 #~ msgid "Multi-User Chat"
-#~ msgstr "Псевдонім розмови"
-
-#, fuzzy
+#~ msgstr "Користувач входить у розмову"
+
 #~ msgid "Multi-User Chat Extended Presence Information"
 #~ msgstr "Користувач не має довідникових даних."
 
-#, fuzzy
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Дані поза смугою"
+
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "команда"
 
-#, fuzzy
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Потік даних SOCKS"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Дані поза смугою"
+
 #~ msgid "XHTML-IM"
-#~ msgstr "HTML"
-
-#, fuzzy
+#~ msgstr "XHTML-IM"
+
 #~ msgid "In-Band Registration"
-#~ msgstr "Помилка реєстрації"
-
-#, fuzzy
+#~ msgstr "Реєстрація до %s завершена успішно"
+
 #~ msgid "User Location"
-#~ msgstr "Розташування"
-
-#, fuzzy
+#~ msgstr "Місцезнаходження користувача"
+
+#~ msgid "User Avatar"
+#~ msgstr "Аватар користувача"
+
 #~ msgid "Chat State Notifications"
-#~ msgstr "Повідомлення про стан користувача"
-
-#, fuzzy
+#~ msgstr "Сповіщення про нову пошту"
+
 #~ msgid "Software Version"
 #~ msgstr "Непідтримувана версія"
 
-#, fuzzy
 #~ msgid "Stream Initiation"
-#~ msgstr "Орієнтація"
-
-#, fuzzy
+#~ msgstr "Ініціалізація потоку"
+
 #~ msgid "User Activity"
-#~ msgstr "Межа кількості користувачів"
-
-#, fuzzy
+#~ msgstr "Активність користувача"
+
 #~ msgid "Entity Capabilities"
-#~ msgstr "Можливості"
-
-#, fuzzy
+#~ msgstr "Можливості контакту"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "detach:  Перервати цей сеанс"
+
 #~ msgid "User Tune"
-#~ msgstr "Ім'я користувача"
-
-#, fuzzy
+#~ msgstr "Перелік %d користувача:\n"
+
 #~ msgid "Roster Item Exchange"
-#~ msgstr "IM з обміном ключами"
-
-#, fuzzy
+#~ msgstr "Не вдається виконати обмін ключами"
+
 #~ msgid "Reachability Address"
-#~ msgstr "Адреса ел.пошти"
-
-#, fuzzy
+#~ msgstr "Адреса"
+
 #~ msgid "Jingle"
-#~ msgstr "Ping"
-
-#, fuzzy
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Аудіо-дзвінок Jingle"
+
 #~ msgid "User Nickname"
-#~ msgstr "Прізвисько"
-
-#, fuzzy
+#~ msgstr "Прізвисько користувача"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
 #~ msgid "Jingle Video"
-#~ msgstr "Живе відео"
-
-#, fuzzy
+#~ msgstr "Відео Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
 #~ msgid "Message Receipts"
-#~ msgstr "Отримано повідомлення"
-
-#, fuzzy
+#~ msgstr "Отримувачі повідомлення"
+
 #~ msgid "Public Key Publishing"
-#~ msgstr "Babbleprint публічного ключа"
-
-#, fuzzy
+#~ msgstr "Отримати публічний ключ"
+
 #~ msgid "User Chatting"
-#~ msgstr "Меню користувача"
-
-#, fuzzy
+#~ msgstr "Перелік %d користувача:\n"
+
 #~ msgid "User Browsing"
-#~ msgstr "Режими користувача"
-
-#, fuzzy
+#~ msgstr "Перелік %d користувача:\n"
+
 #~ msgid "User Gaming"
-#~ msgstr "Межа кількості користувачів"
-
-#, fuzzy
+#~ msgstr "Перелік %d користувача:\n"
+
 #~ msgid "User Viewing"
-#~ msgstr "Межа кількості користувачів"
-
-#, fuzzy
+#~ msgstr "Перелік %d користувача:\n"
+
 #~ msgid "Stanza Encryption"
-#~ msgstr "Кодування Trillian"
+#~ msgstr "Кодування рядків"
+
+#~ msgid "Entity Time"
+#~ msgstr "Час відповіді"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Не вдається доставити повідомлення для %s: %s"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Необхідно більше даних"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "_Оновити назви файлу і теки"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery для Jingle"
+
+#~ msgid "Hop Check"
+#~ msgstr "Файл перевірки версії зіпсований"
 
 #~ msgid "Read Error"
 #~ msgstr "Помилка читання"
@@ -16048,15 +15360,12 @@
 #~ msgid "Failed to connect to server."
 #~ msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy
 #~ msgid "Read buffer full (2)"
-#~ msgstr "Черга повна"
-
-#, fuzzy
+#~ msgstr "Буфер читання переповнений (2)"
+
 #~ msgid "Unparseable message"
-#~ msgstr "Не вдається розібрати повідомлення"
-
-#, fuzzy
+#~ msgstr "Повідомлення запрошення"
+
 #~ msgid "Couldn't connect to host: %s (%d)"
 #~ msgstr "Не вдається з'єднатись з вузлом"
 
@@ -16073,121 +15382,112 @@
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "Помилка. Підтримку SSL не встановлено."
 
-#~ msgid "Incorrect password."
-#~ msgstr "Неправильний пароль."
-
-#, fuzzy
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy
+#~ msgstr "Не вдається додати користувача у список на сервері"
+
+#~ msgid "Invalid username."
+#~ msgstr "Невірне ім'я користувача."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неправильний пароль."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не вдається з'єднатися"
+
 #~ msgid "You may be disconnected shortly.  Check %s for updates."
 #~ msgstr ""
 #~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
 #~ "TOC, доки це не буде виправлено. Перевірте оновлення на %s."
 
-#~ msgid "Could Not Connect"
-#~ msgstr "Не вдається з'єднатися"
-
-#, fuzzy
-#~ msgid "Invalid username."
-#~ msgstr "Неправильне ім'я користувача"
-
-#, fuzzy
 #~ msgid "Could not decrypt server reply"
-#~ msgstr "Не вдається отримати інформацію про сервер"
-
-#, fuzzy
+#~ msgstr "Сервер не зміг отримати доступ до каталогу"
+
 #~ msgid "Connection lost"
-#~ msgstr "З'єднання розірвано"
-
-#, fuzzy
+#~ msgstr "Втрата з'єднання"
+
 #~ msgid "Couldn't resolve host"
 #~ msgstr "Не вдається з'єднатись з вузлом"
 
-#, fuzzy
 #~ msgid "Connection closed (writing)"
-#~ msgstr "З'єднання розірвано"
-
-#, fuzzy
+#~ msgstr "Зовнішнє з'єднання розірвано."
+
 #~ msgid "Connection reset"
-#~ msgstr "З'єднання розірвано"
-
-#, fuzzy
+#~ msgstr "З'єднання скинуте"
+
 #~ msgid "Error reading from socket: %s"
-#~ msgstr "Помилка при зчитуванні з сокету."
-
-#, fuzzy
+#~ msgstr ""
+#~ "Помилка з'єднання з сервером %s:\n"
+#~ "%s"
+
 #~ msgid "Unable to connect to host"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
 #~ msgid "Could not write"
-#~ msgstr "Не вдається відправити"
-
-#, fuzzy
+#~ msgstr "Не вдалося записати "
+
 #~ msgid "Could not create listen socket"
-#~ msgstr "Не вдається створити сокет"
-
-#, fuzzy
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Не вдається розв'язати назву вузла."
-
-#, fuzzy
+#~ msgstr "Не вдається слухати на сокеті"
+
 #~ msgid "Incorrect Password"
-#~ msgstr "Неправильний пароль."
+#~ msgstr "Неправильний пароль"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "Який ID активувати?"
 
 #~ msgid "Yahoo Japan"
 #~ msgstr "Yahoo Japan"
 
-#, fuzzy
 #~ msgid "Japan Pager server"
-#~ msgstr "Japan вузол пейджера"
-
-#, fuzzy
+#~ msgstr "Перевірочний сервер IPC"
+
 #~ msgid "Japan file transfer server"
-#~ msgstr "Japan вузол передавання файлів"
-
-#, fuzzy
+#~ msgstr "Японський сервер передавання файлів"
+
 #~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
-#~ msgstr "Вас було роз'єднано з сервером."
-
-#, fuzzy
+#~ msgstr ""
+#~ "Втрата з'єднання з сервером\n"
+#~ "%s"
+
 #~ msgid "Could not resolve host name"
-#~ msgstr "Не вдається розв'язати назву вузла."
-
-#, fuzzy
+#~ msgstr "Не вдається отримати назву вузла"
+
 #~ msgid ""
 #~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
 #~ "was found."
 #~ msgstr ""
 #~ "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
 
-#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "_Проксі"
+
 #~ msgid "Conversation Window Hiding"
-#~ msgstr "Вікна бесід"
-
-#, fuzzy
+#~ msgstr "Приховування вікна бесід"
+
+#~ msgid "More Data needed"
+#~ msgstr "Необхідно більше даних"
+
 #~ msgid "Please select an image for the smiley."
-#~ msgstr "Введіть нову назву для обраної групи."
-
-#, fuzzy
-#~ msgid "Activate which ID?"
-#~ msgstr "Активувати який ID?"
-
-#, fuzzy
+#~ msgstr "Будь ласка, виберіть зображення для смайлу."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Колір курсора"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Колір другого курсора"
+
 #~ msgid "Interface colors"
-#~ msgstr "Ігнорувати _кольори"
-
-#, fuzzy
+#~ msgstr "Кольори інтерфейсу"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Розміри віджетів"
+
 #~ msgid "Invite message"
-#~ msgstr "Повідомлення про вихід"
-
-#, fuzzy
+#~ msgstr "Повідомлення запрошення"
+
 #~ msgid ""
 #~ "Please enter the name of the user you wish to invite,\n"
 #~ "along with an optional invite message."
@@ -16195,7 +15495,6 @@
 #~ "Введіть ім'я користувача, якого ви бажаєте запросити, та введіть "
 #~ "необов'язковий текст запрошення."
 
-#, fuzzy
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Не вдається завантажити список контактів"
 
@@ -16206,29 +15505,23 @@
 #~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
 #~ "TOC, доки це не буде виправлено. Перевірте оновлення на %s."
 
-#, fuzzy
 #~ msgid "Add buddy Q&A"
 #~ msgstr "Додати користувача"
 
-#, fuzzy
 #~ msgid "Can not decrypt get server reply"
 #~ msgstr "Не вдається отримати інформацію про сервер"
 
-#, fuzzy
 #~ msgid "Keep alive error"
 #~ msgstr "Помилка читання"
 
-#, fuzzy
 #~ msgid ""
 #~ "Lost connection with server:\n"
 #~ "%d, %s"
 #~ msgstr "Вас було роз'єднано з сервером."
 
-#, fuzzy
 #~ msgid "Connecting server ..."
 #~ msgstr "З'єднатися з сервером"
 
-#, fuzzy
 #~ msgid "Failed to send IM."
 #~ msgstr "Не вдається приєднатися до розмови"
 
@@ -16304,7 +15597,6 @@
 #~ msgid "Failure unknown: %s."
 #~ msgstr "Невідомий збій: %s."
 
-#, fuzzy
 #~ msgid "Incorrect username or password."
 #~ msgstr "Неправильне прізвисько або пароль."
 
@@ -16326,7 +15618,6 @@
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Невідома помилка %d. Інформація: %s"
 
-#, fuzzy
 #~ msgid "Invalid Groupname"
 #~ msgstr "Неправильна група"
 
@@ -16361,7 +15652,6 @@
 #~ msgid "Could not write file header.  The file will not be transferred."
 #~ msgstr "Не вдається записати заголовок файлу. Файл не буде передаватись."
 
-#, fuzzy
 #~ msgid "Save As..."
 #~ msgstr "Зберегти значок як..."
 
@@ -16392,211 +15682,162 @@
 #~ msgid "_Open Link in Browser"
 #~ msgstr "_Відкрити посилання у веб-переглядачі"
 
-#, fuzzy
 #~ msgid "Smiley _Image"
 #~ msgstr "Збереження зображення"
 
-#, fuzzy
 #~ msgid "Smiley S_hortcut"
 #~ msgstr "Комбінації клавіш"
 
-#, fuzzy
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_Блимати вікном, при отриманні повідомлення"
 
-#, fuzzy
 #~ msgid "A group with the name already exists."
 #~ msgstr "Тека з такою назвою вже існує"
 
-#, fuzzy
 #~ msgid "Primary Information"
 #~ msgstr "Інформація про профіль"
 
-#, fuzzy
 #~ msgid "Update information"
 #~ msgstr "Інформація про користувача"
 
-#, fuzzy
 #~ msgid "Successed:"
 #~ msgstr "Швидкість:"
 
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Неправильна назва кімнати"
 
-#, fuzzy
 #~ msgid "You rejected %d's request"
 #~ msgstr "Непередбачений запит"
 
-#, fuzzy
 #~ msgid "Reject request"
 #~ msgstr "Непередбачений запит"
 
-#, fuzzy
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "У додаванні користувача відмовлено"
 
-#, fuzzy
 #~ msgid "Add into %d's buddy list"
 #~ msgstr "Додати розмову у список контактів"
 
-#, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "Помилка читання"
 
-#, fuzzy
 #~ msgid "Group Description"
 #~ msgstr "Опис"
 
-#, fuzzy
 #~ msgid "Auth"
 #~ msgstr "Авторизувати"
 
-#, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "Неправильний запит"
 
-#, fuzzy
 #~ msgid "Unknown status"
 #~ msgstr "Невідоме повідомлення"
 
-#, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "Видалити групу"
 
-#, fuzzy
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "Ви дійсно бажаєте видалити %s?"
 
-#, fuzzy
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
 
-#, fuzzy
 #~ msgid "System Message"
 #~ msgstr "Надсилання повідомлення"
 
-#, fuzzy
 #~ msgid "<b>Last Login IP</b>: %s<br>\n"
 #~ msgstr "<b>Псевдонім:</b> %s<br>"
 
-#, fuzzy
 #~ msgid "<b>Last Login Time</b>: %s\n"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>%s:</b> %s"
 
-#, fuzzy
 #~ msgid "Set My Information"
 #~ msgstr "Інформація про сервер"
 
-#, fuzzy
 #~ msgid "Block this buddy"
 #~ msgstr "Блокувати користувача"
 
-#, fuzzy
 #~ msgid "Error password: %s"
 #~ msgstr "Помилка зміни паролю"
 
-#, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr ""
 #~ "Невідома помилка від сервера %s (%s):\n"
 #~ "%s"
 
-#, fuzzy
 #~ msgid "Do you approve the requestion?"
 #~ msgstr "Чи дійсно бажаєте видалити повідомлення про відсутність \"%s\"?"
 
-#, fuzzy
 #~ msgid "Do you add the buddy?"
 #~ msgstr "Бажаєте додати цей контакт у список контактів?"
 
-#, fuzzy
 #~ msgid "%s added you [%s] to buddy list"
 #~ msgstr "Користувач %s бажає додати %s до власного списку контактів."
 
-#, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "Додати користувача"
 
-#, fuzzy
 #~ msgid "%s wants to add you [%s] as a friend"
 #~ msgstr "%s бажає надіслати вам файл"
 
-#, fuzzy
 #~ msgid "%s is not in buddy list"
 #~ msgstr "Додати користувача у список контактів"
 
-#, fuzzy
 #~ msgid "Would you add?"
 #~ msgstr "Бажаєте переписати його?"
 
-#, fuzzy
 #~ msgid "QQ Server Notice"
 #~ msgstr "Порт сервера"
 
-#, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "З'єднання розірвано."
 
 #~ msgid "developer"
 #~ msgstr "розробник"
 
-#, fuzzy
 #~ msgid "XMPP developer"
 #~ msgstr "розробник"
 
-#, fuzzy
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
 #~ msgstr ""
 #~ "Ви використовуєте Pidgin версії %s.  Остання доступна версія - %s.<hr>"
 
-#, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr ""
 #~ "<b>Список змін:</b>\n"
 #~ "%s<br><br>"
 
-#, fuzzy
 #~ msgid "Screen name:"
 #~ msgstr "Ідентифікатор:"
 
-#, fuzzy
 #~ msgid "Show offline buddies"
 #~ msgstr "/Контакти/Показувати відсутніх користувачів"
 
-#, fuzzy
 #~ msgid "Sort by status"
 #~ msgstr "Статус"
 
-#, fuzzy
 #~ msgid "Sort alphabetically"
 #~ msgstr "за алфавітом"
 
-#, fuzzy
 #~ msgid "Sort by log size"
 #~ msgstr "за розміром журналу"
 
-#, fuzzy
 #~ msgid "EOF while reading from resolver process"
 #~ msgstr "Помилка при зчитуванні з сокету."
 
-#, fuzzy
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Забезпечує підтримку завантаження модулів perl."
 
-#, fuzzy
 #~ msgid "Error setting socket options"
 #~ msgstr "Помилка при створенні з'єднання"
 
-#, fuzzy
 #~ msgid "Couldn't open file"
 #~ msgstr "Не вдається надіслати файл"
 
@@ -16610,10 +15851,12 @@
 #~ msgid "Error initializing session"
 #~ msgstr "Помилка ініціалізації сеансу"
 
-#, fuzzy
 #~ msgid "Invalid screen name"
 #~ msgstr "Неправильне ім'я користувача"
 
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "Не вдається встановити SSL-з'єднання з сервером."
+
 #~ msgid "Too evil (sender)"
 #~ msgstr "Занадто докучливий (відправник)"
 
@@ -16623,15 +15866,12 @@
 #~ msgid "Screen name sent"
 #~ msgstr "Надіслано ідентифікатор користувача"
 
-#, fuzzy
 #~ msgid "Invalid screen name."
 #~ msgstr "Неправильне ім'я користувача."
 
-#, fuzzy
 #~ msgid "Available Message"
 #~ msgstr "Статусне повідомлення:"
 
-#, fuzzy
 #~ msgid "Screen name"
 #~ msgstr "_Ідентифікатор користувача"
 
@@ -16641,102 +15881,78 @@
 #~ msgid "Away Message"
 #~ msgstr "Повідомлення про відсутність"
 
-#, fuzzy
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(ідентифікований)</i>"
 
-#, fuzzy
 #~ msgid "Use recent buddies group"
 #~ msgstr "Користувач не у групі"
 
-#, fuzzy
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Дозволяє вручну налаштовувати час бездіяльності"
 
-#, fuzzy
 #~ msgid "Your information has been updated"
 #~ msgstr "Пароль було змінено."
 
-#, fuzzy
 #~ msgid "You have added %d to buddy list"
 #~ msgstr "Додати користувача у список контактів"
 
-#, fuzzy
 #~ msgid "Invalid QQid"
 #~ msgstr "Неправильний ідентифікатор авторизації"
 
-#, fuzzy
 #~ msgid "Please enter external group ID"
 #~ msgstr "Введіть назву групи, що додаватиметься."
 
-#, fuzzy
 #~ msgid "Reason: %s"
 #~ msgstr "Користувачі %s: %s"
 
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Помилка при роботі з файлом"
 
-#, fuzzy
 #~ msgid "Enter your reason:"
 #~ msgstr "%s наразі не у мережі."
 
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Не вдається ввійти у мережу AIM"
 
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "IP Адреса"
 
-#, fuzzy
 #~ msgid "UDP Address"
 #~ msgstr "IP Адреса"
 
-#, fuzzy
 #~ msgid "Show Login Information"
 #~ msgstr "Інформація про користувача"
 
-#, fuzzy
 #~ msgid "Login failed, no reply"
 #~ msgstr "Не вдається увійти у мережу (%s)."
 
-#, fuzzy
 #~ msgid "Cannot find/access ~/.silc directory"
 #~ msgstr "Не можна відправляти каталог."
 
-#, fuzzy
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s змінив тему на: %s"
 
-#, fuzzy
 #~ msgid "%s is now %s"
 #~ msgstr "%s тепер відомий як %s"
 
-#, fuzzy
 #~ msgid "%s is no longer %s"
 #~ msgstr "%s повертається."
 
-#, fuzzy
 #~ msgid "Screen _name:"
 #~ msgstr "Ідентифікатор:"
 
-#, fuzzy
 #~ msgid "_Send File"
 #~ msgstr "Надіслати файл"
 
-#, fuzzy
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Додати _правило"
 
 #~ msgid "Add a C_hat"
 #~ msgstr "Додати _розмову"
 
-#, fuzzy
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "Облікові записи"
 
-#, fuzzy
 #~ msgid "<span color=\"red\">%s disconnected: %s</span>"
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Зв'язок з %s розірвано.</span>\n"
@@ -16755,19 +15971,15 @@
 #~ "користувача. Псевдонім буде відображатись замість ідентифікатора "
 #~ "користувача, коли це можливо.\n"
 
-#, fuzzy
 #~ msgid "_Screen name:"
 #~ msgstr "_Ідентифікатор користувача"
 
-#, fuzzy
 #~ msgid "User has typed something and stopped"
 #~ msgstr "Користувач щось написав та зупинився"
 
-#, fuzzy
 #~ msgid "_Send To"
 #~ msgstr "_Надіслати як"
 
-#, fuzzy
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -16779,34 +15991,24 @@
 #~ "<span weight=\"bold\">Веб-сторінка:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">Назва файлу:</span>\t%s"
 
-#, fuzzy
 #~ msgid "Display Statistics"
 #~ msgstr "Показувати сповіщення про закінчення часу очікування"
 
-#, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Бесіди"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Сервер входу"
 
-#, fuzzy
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy
 #~ msgid "Current media"
 #~ msgstr "Наразі на"
 
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Повідомлення:"
 
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Ховати помилки розриву з'єднання"
 
-#, fuzzy
 #~ msgid "Hide Reconnecting Dialog"
 #~ msgstr "Ховати помилки розриву з'єднання"
 
@@ -16816,7 +16018,6 @@
 #~ msgid "Use last matching buddy"
 #~ msgstr "Використовувати останнього відповідного користувача"
 
-#, fuzzy
 #~ msgid ""
 #~ "The buddy with the lowest score is the buddy who will have priority in "
 #~ "the contact.\n"
@@ -16851,7 +16052,6 @@
 #~ "зберігати повідомлення у черзі, до їх викликання клацанням на зображенні, "
 #~ "подібно до ICQ."
 
-#, fuzzy
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "Розмір розширювача"
 
@@ -16923,7 +16123,6 @@
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/Сервіс/_Облікові записи"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Contact Alias:</b> %s"
@@ -16931,7 +16130,6 @@
 #~ "\n"
 #~ "<b>Псевдонім контакту:</b>"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Alias:</b> %s"
@@ -16939,7 +16137,6 @@
 #~ "\n"
 #~ "<b>Псевдонім:</b>"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
@@ -16947,7 +16144,6 @@
 #~ "\n"
 #~ "<b>Прізвисько:</b>"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b> %s"
@@ -16962,7 +16158,6 @@
 #~ "\n"
 #~ "<b>Статус:</b> Не у мережі"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Awesome"
@@ -16970,7 +16165,6 @@
 #~ "\n"
 #~ "<b>Статус</b>: Переляканий"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Rockin'"
@@ -16987,11 +16181,9 @@
 #~ msgid "me is using Pidgin v%s."
 #~ msgstr "я використовую Pidgin версії %s."
 
-#, fuzzy
 #~ msgid "/Options/Show Buddy _Icon"
 #~ msgstr "Показувати з_начки користувачів"
 
-#, fuzzy
 #~ msgid "/Options/Show Buddy Icon"
 #~ msgstr "Показувати з_начки користувачів"
 
@@ -17004,11 +16196,9 @@
 #~ msgid "Get the user's information"
 #~ msgstr "Отримати інформацію про користувача"
 
-#, fuzzy
 #~ msgid "Jabber developer"
 #~ msgstr "попередній розробник Jabber"
 
-#, fuzzy
 #~ msgid ""
 #~ "Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 #~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
@@ -17089,7 +16279,6 @@
 #~ msgid "_Queue new messages when away"
 #~ msgstr "_Вставляти нові повідомлення у чергу при відсутності"
 
-#, fuzzy
 #~ msgid "Custom status"
 #~ msgstr "за статусом"
 
@@ -17110,7 +16299,6 @@
 #~ msgid "_Warn"
 #~ msgstr "_Попередити"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
@@ -17118,7 +16306,6 @@
 #~ "\n"
 #~ "<b>%s:</b> %s"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "<b>Message:</b> %s"
@@ -17126,11 +16313,9 @@
 #~ "\n"
 #~ "<b>%s:</b> %s"
 
-#, fuzzy
 #~ msgid "Could't open file"
 #~ msgstr "Не вдається надіслати файл"
 
-#, fuzzy
 #~ msgid "Change password"
 #~ msgstr "Зміна паролю"
 
@@ -17150,7 +16335,6 @@
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
 
-#, fuzzy
 #~ msgid "Search for Jabber users"
 #~ msgstr "Шукати користувача за адресою ел.пошти"
 
@@ -17214,11 +16398,9 @@
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "Не вдається відкрити пряме з'єднання"
 
-#, fuzzy
 #~ msgid "Unable to log into file transfer proxy."
 #~ msgstr "Не вдається записати файл %s."
 
-#, fuzzy
 #~ msgid ""
 #~ "Unable to establish listener socket or no AOL proxy connection present."
 #~ msgstr "Не вдається встановити сокет прослуховування."
@@ -17230,7 +16412,6 @@
 #~ "Користувач %s вимагає авторизацію перед додаванням його у список "
 #~ "контактів. Чи бажаєте відправити запит авторизації?"
 
-#, fuzzy
 #~ msgid ""
 #~ "The user %u wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -17286,7 +16467,6 @@
 #~ "ймовірна причина - у вашому списку контактів вже максимальна кількість "
 #~ "контактів."
 
-#, fuzzy
 #~ msgid ""
 #~ "The user %s wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -17296,11 +16476,9 @@
 #~ "причини:\n"
 #~ "%s"
 
-#, fuzzy
 #~ msgid "Hide IP address"
 #~ msgstr "IP Адреса"
 
-#, fuzzy
 #~ msgid "Web aware"
 #~ msgstr "Підтримується Web"
 
@@ -17382,7 +16560,6 @@
 #~ msgid "Unable to read"
 #~ msgstr "Не вдається прочитати"
 
-#, fuzzy
 #~ msgid "Stealth"
 #~ msgstr "Область"
 
@@ -17401,7 +16578,6 @@
 #~ msgstr[1] "(%d повідомлення)"
 #~ msgstr[2] "(%d повідомлень)"
 
-#, fuzzy
 #~ msgid "Default auto-away"
 #~ msgstr "Авто-\"Відійшов\""
 
@@ -17936,6 +17112,9 @@
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Критична помилка у бібліотеці GG\n"
 
+#~ msgid "Unable to ping server"
+#~ msgstr "Не вдається перевірити доступність сервера"
+
 #~ msgid "Send as message"
 #~ msgstr "Надіслати як повідомлення"
 
--- a/po/zh_CN.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/zh_CN.po	Sat Jan 09 02:00:18 2010 +0000
@@ -2,17 +2,17 @@
 # Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# fujianwzh <fujianwzh@gmail.com>, 2009.
 # liyuekui <liyuekui@gmail.com>, 2009.
-# Aron Xu <aronmalache@163.com>, 2009.
-# fujianwzh <fujianwzh@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-08-23 22:12+0800\n"
-"Last-Translator: Aron Xu <aronmalache@163.com>\n"
+"POT-Creation-Date: 2009-11-23 09:57-0800\n"
+"PO-Revision-Date: 2009-11-05 18:56+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,11 +42,11 @@
 "%s\n"
 "用法: %s [选项]...\n"
 "\n"
-"  -c, --config=目录   使用指定目录存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登录\n"
-"  -v, --version       显示当前版本并退出\n"
+"  -c, --config=目录\t使用指定目录存储配置文件\n"
+"  -d, --debug\t\t将调试信息打印到标准输出\n"
+"  -h, --help\t\t显示帮助并退出\n"
+"  -n, --nologin\t不自动登录\n"
+"  -v, --version\t显示当前版本并退出\n"
 
 #, c-format
 msgid ""
@@ -54,7 +54,7 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s 在将您的设置从 %s 迁移到 %s 时遇到错误。您可能必须手动完成迁移操作。请将错"
+"%s 在将您的设置从 %s 迁移到 %s 时遇到错误。您可能需要手动完成迁移操作。请将错"
 "误报告给 http://developer.pidgin.im"
 
 #. the user did not fill in the captcha
@@ -62,10 +62,10 @@
 msgstr "出错"
 
 msgid "Account was not added"
-msgstr "账户未添加"
+msgstr "帐号未添加"
 
 msgid "Username of an account must be non-empty."
-msgstr "账户的用户名必须非空。"
+msgstr "帐号的用户名必须非空。"
 
 msgid "New mail notifications"
 msgstr "新邮件通知"
@@ -80,10 +80,10 @@
 msgstr "(您可能忘记运行“make install”了。)"
 
 msgid "Modify Account"
-msgstr "修改账户"
+msgstr "修改帐号"
 
 msgid "New Account"
-msgstr "新建账户"
+msgstr "新建帐号"
 
 msgid "Protocol:"
 msgstr "协议:"
@@ -99,7 +99,7 @@
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "在服务器上创建新帐户"
+msgstr "在服务器上创建新帐号"
 
 #. Cancel button
 #. Cancel
@@ -116,17 +116,17 @@
 msgstr "您真的想要删除 %s 吗?"
 
 msgid "Delete Account"
-msgstr "删除账户"
+msgstr "删除帐号"
 
 #. Delete button
 msgid "Delete"
 msgstr "删除"
 
 msgid "Accounts"
-msgstr "账户"
+msgstr "帐号"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "您可以启用/禁用以下列表中的账户。"
+msgstr "您可以启用/禁用以下列表中的帐号。"
 
 #. Add button
 msgid "Add"
@@ -166,7 +166,7 @@
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "账户:%s (%s)"
+msgstr "帐号:%s (%s)"
 
 #, c-format
 msgid ""
@@ -186,10 +186,10 @@
 msgstr "您必须提供组。"
 
 msgid "You must select an account."
-msgstr "您必须选择账户。"
+msgstr "您必须选择帐号。"
 
 msgid "The selected account is not online."
-msgstr "选中帐户不在线。"
+msgstr "选中帐号不在线。"
 
 msgid "Error adding buddy"
 msgstr "添加好友出错"
@@ -204,7 +204,7 @@
 msgstr "添加到组"
 
 msgid "Account"
-msgstr "账户"
+msgstr "帐号"
 
 msgid "Add Buddy"
 msgstr "添加好友"
@@ -355,7 +355,7 @@
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "清输入您想要屏蔽/解除屏蔽的用户名或别名。"
+msgstr "请输入您想要屏蔽/解除屏蔽的用户名或别名。"
 
 #. Not multiline
 #. Not masked?
@@ -421,7 +421,7 @@
 msgstr "按状态"
 
 msgid "Alphabetically"
-msgstr "按字母序"
+msgstr "按字母顺序"
 
 msgid "By Log Size"
 msgstr "按聊天记录大小"
@@ -535,10 +535,10 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch 不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
+"Finch 不会尝试重新连接帐号,除非您纠正了错误然后重新启用帐号。"
 
 msgid "Re-enable Account"
-msgstr "重新启用账户"
+msgstr "重新启用帐号"
 
 msgid "No such command."
 msgstr "无此命令。"
@@ -616,9 +616,8 @@
 msgid "Enable Sounds"
 msgstr "启用声音"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "无法连接"
+msgstr "已连接。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "
@@ -628,12 +627,11 @@
 msgid_plural "List of %d users:\n"
 msgstr[0] "%d 个用户的列表:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "支持的调试选项有:version"
+msgstr "支持的调试选项有:plugins version"
 
 msgid "No such command (in this context)."
-msgstr "在此环境中无此命令。"
+msgstr "在当前环境中无此命令。"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
@@ -681,7 +679,7 @@
 msgstr "buddylist:显示好友列表。"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts:显示账户窗口。"
+msgstr "accounts:显示帐号窗口。"
 
 msgid "debugwin: Show the debug window."
 msgstr "debug窗口:显示调试窗口。"
@@ -999,7 +997,7 @@
 
 #. Account:
 msgid "Account:"
-msgstr "账户:"
+msgstr "帐号:"
 
 msgid "Buddy name:"
 msgstr "好友名称:"
@@ -1061,16 +1059,16 @@
 msgstr "仅当我的状态不可用时才提示"
 
 msgid "Recurring"
-msgstr "返回"
+msgstr "重复"
 
 msgid "Cannot create pounce"
 msgstr "无法创建千里眼"
 
 msgid "You do not have any accounts."
-msgstr "您没有帐户。"
+msgstr "您没有帐号。"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr "在创建好友千里眼前您必须创建一个帐户。"
+msgstr "在创建好友千里眼前您必须创建一个帐号。"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
@@ -1368,7 +1366,7 @@
 msgstr "编辑状态"
 
 msgid "Use different status for following accounts"
-msgstr "为下列账户使用不同的状态"
+msgstr "为下列帐号使用不同的状态"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1496,7 +1494,6 @@
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr ""
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "只为等于或超过此长度的 URL 创建 TinyURL"
 
@@ -1509,7 +1506,6 @@
 msgid "TinyURL plugin"
 msgstr "TinyURL 插件"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr "当接收到带有 URL 的消息时将其转换到 TinyURL 以方便复制"
 
@@ -1557,7 +1553,7 @@
 msgstr "Lastlog 插件。"
 
 msgid "accounts"
-msgstr "账户"
+msgstr "帐号"
 
 msgid "Password is required to sign on."
 msgstr "需要密码才能登录。"
@@ -1625,9 +1621,8 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
 msgid "The certificate is not valid yet."
-msgstr "选中的文件不是可用的插件。"
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -1645,13 +1640,11 @@
 msgid "The certificate chain presented is invalid."
 msgstr "指定的用户名无效。"
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "呼叫被终止。"
-
-#, fuzzy
+msgstr "此证书已被吊销。"
+
 msgid "An unknown certificate error occurred."
-msgstr "发生了未知登录错误: %s。"
+msgstr "发生了未知证书错误。"
 
 msgid "(DOES NOT MATCH)"
 msgstr "(不匹配)"
@@ -1684,7 +1677,7 @@
 #. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受 %s 的聊天邀请吗?"
+msgstr "接受 %s 的证书吗?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
@@ -1701,9 +1694,8 @@
 msgid "SSL Certificate Error"
 msgstr "SSL 证书错误"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "无法通过身份验证: %s"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -1721,6 +1713,12 @@
 "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"
@@ -1747,7 +1745,7 @@
 msgstr "未知错误"
 
 msgid "Unable to send message: The message is too large."
-msgstr "无法发送消息: 消息太大。"
+msgstr "无法发送消息:消息太大。"
 
 #, c-format
 msgid "Unable to send message to %s."
@@ -1800,11 +1798,11 @@
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "建立连接失败: %s"
+msgstr "建立连接失败:%s"
 
 #, c-format
 msgid "Failed to get name: %s"
-msgstr "获得名称失败: %s"
+msgstr "获得名称失败:%s"
 
 #, c-format
 msgid "Failed to get serv name: %s"
@@ -1832,7 +1830,7 @@
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "解析 %s 时出错: %d"
+msgstr "解析 %s 时出错:%d"
 
 #, c-format
 msgid ""
@@ -1848,11 +1846,11 @@
 
 #, fuzzy, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "解析 %s 时出错: %d"
+msgstr "解析 %s 时出错:%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "线程创建失败: %s"
+msgstr "线程创建失败:%s"
 
 #. Data is assumed to be the destination bn
 msgid "Unknown reason"
@@ -1935,7 +1933,7 @@
 
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "文件 %s 传送完成"
+msgstr "文件 <A HREF=\"file://%s\">%s</A> 传送完成"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -1944,18 +1942,18 @@
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
 msgid "File transfer cancelled"
 msgstr "已取消文件传送"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s 取消了文件传送"
 
@@ -2126,7 +2124,7 @@
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
+msgstr "<font color=\"red\"><b>无法读取文件:%s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2141,13 +2139,11 @@
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "发生了未知登录错误: %s。"
-
-#, fuzzy
+msgstr ""
+
 msgid "Conference error"
-msgstr "会议已关闭"
+msgstr "会议出错"
 
 msgid "Error with your microphone"
 msgstr ""
@@ -2155,9 +2151,9 @@
 msgid "Error with your webcam"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session: %s"
-msgstr "创建连接出错"
+msgstr "创建会话出错:%s"
 
 msgid "Error creating conference."
 msgstr "创建会议出错"
@@ -2344,25 +2340,25 @@
 msgstr "发呆器"
 
 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 "允许您手动配置您发了多长时间呆"
@@ -2863,10 +2859,10 @@
 msgstr "电子邮件"
 
 msgid "AIM Account"
-msgstr "AIM 账户"
+msgstr "AIM 帐号"
 
 msgid "XMPP Account"
-msgstr "XMPP 账户"
+msgstr "XMPP 帐号"
 
 #. *< type
 #. *< ui_requirement
@@ -2906,16 +2902,14 @@
 
 #, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "无法将套接字绑定到端口"
+msgstr "无法将套接字绑定到端口:%s"
 
 #, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"无法创建套接字:\n"
-"%s"
+msgstr "无法监听套接字:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "与本地 mDNSResponder 服务通讯出错"
+msgstr "与本地 mDNSResponder 服务通讯出错。"
 
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2966,10 +2960,10 @@
 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 "注册成功!"
@@ -2984,10 +2978,10 @@
 msgstr ""
 
 msgid "Captcha"
-msgstr "保存图像"
+msgstr "验证码图像"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "注册新的 Gadu-Gadu 账户"
+msgstr "注册新的 Gadu-Gadu 帐号"
 
 msgid "Please, fill in the following fields"
 msgstr "请填入下列字段"
@@ -3031,7 +3025,7 @@
 msgstr "无法更改密码。发生了错误。\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "更改 Gadu-Gadu 帐户的密码"
+msgstr "更改 Gadu-Gadu 帐号的密码"
 
 msgid "Password was changed successfully!"
 msgstr "密码成功更改!"
@@ -3128,7 +3122,7 @@
 
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "无法解析服务器"
+msgstr "无法解析主机名“%s”:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3225,9 +3219,7 @@
 #. TODO: do we really want to disconnect on a failure to write?
 #, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"与服务器失去连接:\n"
-"%s"
+msgstr "与服务器失去连接:%s"
 
 msgid "View MOTD"
 msgstr "查看 MOTD"
@@ -3310,7 +3302,7 @@
 
 #, c-format
 msgid "Ban on %s"
-msgstr "屏蔽: %s"
+msgstr "屏蔽: %s"
 
 msgid "End of ban list"
 msgstr "屏蔽列表结尾"
@@ -3374,7 +3366,7 @@
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "%s 上的用户数: %s"
+msgstr "%s 上的用户数:%s"
 
 msgid "Time Response"
 msgstr "时间响应"
@@ -3407,7 +3399,7 @@
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "您被已 %s 踢出 (%s)"
+msgstr "您已被 %s 踢出了:(%s)"
 
 #. Remove user from channel
 #, c-format
@@ -3429,7 +3421,7 @@
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
+msgstr "您所选的帐号名称被服务器拒绝。其中可能包含无效的字符。"
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
@@ -3452,7 +3444,7 @@
 msgstr "您已经参与了频道%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "错误: 服务器的 PONG 无效"
+msgstr "错误:服务器的 PONG 无效"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3478,7 +3470,7 @@
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
+msgstr "away [消息]:设置离开消息,不尾随消息则代表离开。"
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>:向指定昵称发送 CTCP 消息。"
@@ -3503,26 +3495,27 @@
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;昵称&gt; [聊天室]: 邀请某人加入您指定的频道,或者当前频道。"
+msgstr ""
+"invite &lt;昵称&gt; [聊天室]: 邀请某人加入您指定的频道,或者当前频道。"
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如"
+"j &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如"
 "需要的话可选提供频道密钥。"
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,"
-"如需要的话可选提供频道密钥。"
+"join &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频"
+"道,如需要的话可选提供频道密钥。"
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
+msgstr "kick &lt;昵称&gt; [消息]:将某人踢出频道。您必须是频道管理员。"
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
@@ -3531,10 +3524,10 @@
 "list:显示网络上的聊天室列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;要执行的动作&gt;: 执行动作。"
+msgstr "me &lt;要执行的动作&gt;:执行动作。"
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: 向 memoserv 发送命令"
+msgstr "memoserv:向 memoserv 发送命令"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3545,19 +3538,19 @@
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
+msgstr "msg &lt;昵称&gt; &lt;消息&gt;:给用户发送私下消息(与频道相对)。"
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "name [频道]: 列出频道中目前的用户。"
+msgstr "name [频道]:列出频道中目前的用户。"
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
+msgstr "nick &lt;新昵称&gt;:更改您的昵称。"
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: 向 nickserv 发送命令"
+msgstr "nickserv:向 nickserv 发送命令"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "notice &lt;目标&gt;: 向好友或频道发送提示。"
+msgstr "notice &lt;目标&gt;: 向好友或频道发送提示。"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3568,48 +3561,48 @@
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
+msgstr "operwall &lt;消息&gt;:如果您不知道这是什么功能,请不要使用。"
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: 向 operserv 发送命令"
+msgstr "operserv:向 operserv 发送命令"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [聊天室] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
+msgstr "part [聊天室] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
+msgstr "ping [昵称]:询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私人消息(与频道相对)。"
+msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私人消息(与频道相对)。"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
+msgstr "quit [消息]:断开与服务器的连接,并留下可选的消息。"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [……]: 向服务器发送原始命令。"
+msgstr "quot [……]:向服务器发送原始命令。"
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;昵称&gt; [消息]: 从聊天室删除某人。您必须是频道管理员。"
+msgstr "remove &lt;昵称&gt; [消息]: 从聊天室删除某人。您必须是频道管理员。"
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: 显示 IRC 服务器上当前的本地时间。"
+msgstr "time:显示 IRC 服务器上当前的本地时间。"
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [新话题]: 查看或更改频道话题。"
+msgstr "topic [新话题]:查看或更改频道话题。"
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:设置或取消用户模式。"
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [昵称]: 向用户发送 CTCP VERSION 请求"
+msgstr "version [昵称]:向用户发送 CTCP VERSION 请求"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
@@ -3619,17 +3612,17 @@
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
+msgstr "wallops &lt;消息&gt;:如果您不知道这是什么功能,请不要使用。"
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [服务器] &lt;昵称&gt;:获得用户信息。"
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [服务器] &lt;昵称&gt;:获得用户信息。"
+msgstr "whowas &lt;昵称&gt;:获得已退出用户的信息。"
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%s 的回复时间: %lu 秒"
+msgstr "%s 的回复时间:%lu 秒"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3644,7 +3637,7 @@
 msgstr "未知错误"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "命令已禁用"
+msgstr "Ad-Hoc 命令失败"
 
 msgid "execute"
 msgstr "执行"
@@ -3684,7 +3677,7 @@
 
 #, c-format
 msgid "SASL error: %s"
-msgstr "SASL 错误"
+msgstr "SASL 错误:%s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3700,7 +3693,7 @@
 
 #, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "无法与服务器建立连接"
+msgstr "无法与服务器建立连接:%s"
 
 msgid "Unable to establish SSL connection"
 msgstr "无法建立 SSL 连接"
@@ -3806,11 +3799,11 @@
 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 "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
+msgstr "%s 将无法查看您的状态更新。您真的要这么做吗?"
 
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
@@ -3838,14 +3831,18 @@
 msgid "Log Out"
 msgstr "退出"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
-msgstr "找我聊聊吧"
+msgstr "和我聊聊吧"
 
 msgid "Extended Away"
 msgstr "离开"
 
 msgid "Do Not Disturb"
-msgstr "请勿打扰"
+msgstr "忙碌 - 请勿打扰"
 
 msgid "JID"
 msgstr "JID"
@@ -4035,13 +4032,13 @@
 
 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 "注册"
@@ -4052,16 +4049,16 @@
 
 #, c-format
 msgid "Register New Account at %s"
-msgstr "在 %s 注册新账户"
+msgstr "在 %s 注册新帐号"
 
 msgid "Change Registration"
-msgstr "更改帐户"
+msgstr "更改帐号"
 
 msgid "Error unregistering account"
-msgstr "更改账户信息出错"
+msgstr "更改帐号信息出错"
 
 msgid "Account successfully unregistered"
-msgstr "取消帐户注册成功"
+msgstr "取消帐号注册成功"
 
 msgid "Initializing Stream"
 msgstr "初始化流"
@@ -4103,6 +4100,7 @@
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
+#. 0
 msgid "None"
 msgstr "无"
 
@@ -4111,37 +4109,37 @@
 msgstr "订阅"
 
 msgid "Mood Text"
-msgstr "血型"
+msgstr "心情文字"
 
 msgid "Allow Buzz"
-msgstr "允许"
+msgstr "允许闪屏振动"
 
 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 ""
+msgstr "歌曲 URL"
 
 msgid "Password Changed"
 msgstr "密码已更改"
@@ -4203,7 +4201,7 @@
 msgstr "需要付费"
 
 msgid "Recipient Unavailable"
-msgstr "收件人不可用"
+msgstr "收件人不存在"
 
 msgid "Registration Required"
 msgstr "需要注册"
@@ -4346,17 +4344,17 @@
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
+msgstr ""
 
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
+msgstr ""
 
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
+msgstr ""
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4365,15 +4363,15 @@
 #. 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 ""
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "无法同 %s 创建多媒体会话:无效的 JID。"
+msgstr "无法同 %s 创建多媒体会话:无效的 JID"
 
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
@@ -4390,7 +4388,7 @@
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
+msgstr ""
 
 msgid "Select a Resource"
 msgstr "选择资源"
@@ -4404,50 +4402,48 @@
 msgid "configure:  Configure a chat room."
 msgstr "配置:配置聊天室。"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [聊天室]: 离聊天天室。"
+msgstr "part [聊天室]:离聊天天室。"
 
 msgid "register:  Register with a chat room."
 msgstr "注册:注册聊天室。"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [新话题]: 查看或更改话题。"
+msgstr "topic [新话题]: 查看或更改话题。"
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;用户&gt; [原因]: 在聊天室中屏蔽一个用户。"
+msgstr "ban &lt;用户&gt; [原因]: 在聊天室中屏蔽一个用户。"
 
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在聊天"
-"室中的职务。"
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;[昵称1] [昵称"
+"2]: 设置用户在聊天室中的职务。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入聊天室。"
+msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入聊天室。"
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;聊天室&gt; [密码]: 加入此服务器上的聊天聊天室。"
+msgstr "join: &lt;聊天室&gt; [密码]: 加入此服务器上的聊天聊天室。"
 
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;用户&gt; [原因]: 从聊天室中踢出一个用户。"
+msgstr "kick &lt;用户&gt; [原因]: 从聊天室中踢出一个用户。"
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
+msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPing 用户/组件/服务器"
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
+msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
 
 #. *< type
 #. *< ui_requirement
@@ -4505,15 +4501,15 @@
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s 将话题改为: %s"
+msgstr "%s 将话题改为:%s"
 
 #, c-format
 msgid "The topic is: %s"
-msgstr "话题为: %s"
+msgstr "话题为:%s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "投递到 %s 的消息失败: %s"
+msgstr "投递到 %s 的消息失败:%s"
 
 msgid "XMPP Message Error"
 msgstr "XMPP 消息错误"
@@ -4553,13 +4549,13 @@
 msgid "No reason"
 msgstr "没有给出理由。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "您被已 %s 踢出 (%s)"
-
-#, fuzzy, c-format
+msgstr "您已被踢出 (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s 踢出 (%s) "
+msgstr "您亦将 %s 踢出"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "打开文件时发生了错误。\n"
@@ -4591,7 +4587,7 @@
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
+msgstr ""
 
 msgid "Edit User Mood"
 msgstr "编辑用户心情"
@@ -4835,13 +4831,12 @@
 msgid "Not expected"
 msgstr "未期待"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "友好的名称更改太频繁"
+msgstr "友好名称更改太频繁"
 
 #, c-format
 msgid "Server too busy"
-msgstr "服务器太忙"
+msgstr "服务器忙"
 
 #, c-format
 msgid "Authentication failed"
@@ -4861,10 +4856,10 @@
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "通行证账户未验证"
+msgstr "通行证帐号未验证"
 
 msgid "Passport account suspended"
-msgstr "通行证账户已被取代"
+msgstr "通行证帐号已被取代"
 
 #, c-format
 msgid "Bad ticket"
@@ -4876,7 +4871,7 @@
 
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN 错误: %s\n"
+msgstr "MSN 错误:%s\n"
 
 msgid "Other Contacts"
 msgstr "其他联系人"
@@ -4905,15 +4900,15 @@
 msgstr "%s 向您发送了语音聊天邀请,但尚不支持。"
 
 msgid "Nudge"
-msgstr "引起注意"
+msgstr "闪屏振动"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s 轻轻地推了您一下,希望您注意他!"
+msgstr "%s 刚给您发送了一个闪屏振动!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "正在轻轻地推 %s ,以引起他对您的注意..."
+msgstr "给 %s 发送一个闪屏振动..."
 
 msgid "Email Address..."
 msgstr "电子邮件地址..."
@@ -4954,10 +4949,10 @@
 
 #, c-format
 msgid "Blocked Text for %s"
-msgstr "%s 的好友注释"
+msgstr "%s 的屏蔽文字"
 
 msgid "No text is blocked for this account."
-msgstr "此账户使用此好友图标(_I):"
+msgstr "此帐号没有被屏蔽的文字。"
 
 #, c-format
 msgid ""
@@ -4965,7 +4960,7 @@
 msgstr ""
 
 msgid "This account does not have email enabled."
-msgstr "此账户没有启用电子邮件。"
+msgstr "此帐号没有启用电子邮件。"
 
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
@@ -4980,7 +4975,7 @@
 msgstr "正在工作"
 
 msgid "Has you"
-msgstr ""
+msgstr "双向好友"
 
 msgid "Home Phone Number"
 msgstr "家庭电话号码"
@@ -5051,13 +5046,11 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
-msgstr ""
-"无法添加好友 %s,原因是用户名无效。用户名必须是有效的电子邮件地址,或者以字母"
-"开头,且只能包含字母、数字和空格,或者只包含数字。"
+msgstr "无法添加好友 %s,用户名无效。用户名必须是有效的电子邮件地址。"
 
 msgid "Unable to Add"
 msgstr "无法添加"
@@ -5251,7 +5244,7 @@
 msgstr "显示自定义如下:"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
+msgstr "nudge:向用户发送闪屏振动,以便引起他的注意"
 
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID 验证:无法连接"
@@ -5261,14 +5254,14 @@
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s 刚刚给您发送了闪屏振动!"
+msgstr "%s 刚刚给您发送了一个闪屏振动!"
 
 msgid "The following users are missing from your addressbook"
 msgstr "以下用户不在您的通讯录中"
 
 #, c-format
 msgid "Unknown error (%d): %s"
-msgstr "未知错误 (%d): %s"
+msgstr "未知错误 (%d): %s"
 
 msgid "Unable to add user"
 msgstr "无法添加用户"
@@ -5278,9 +5271,8 @@
 msgid "Unknown error (%d)"
 msgstr "未知错误 (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "无法添加用户"
+msgstr "无法删除用户"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "消息未发出,因为消息太长。"
@@ -5300,7 +5292,11 @@
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] "消息未发出,因为消息太长。"
+msgstr[0] ""
+"MSN 服务器即将于 %d 分钟后关闭进行维护。届时您将会被自动退出。请尽快关闭现在"
+"进行中的对话。\n"
+"\n"
+"维护完成后,您将能够成功登录。"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -5347,7 +5343,7 @@
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "无法通过身份验证: %s"
+msgstr "无法通过身份验证:%s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
@@ -5375,7 +5371,7 @@
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s 向您发送了视频聊天邀请,但尚不支持。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr "%s 向您发送了视频聊天邀请,但尚不支持。"
 
@@ -5429,7 +5425,7 @@
 msgstr "友好的名称更改太频繁"
 
 msgid "This Hotmail account may not be active."
-msgstr "此 Hotmail 账户可能未激活。"
+msgstr "此 Hotmail 帐号可能未激活。"
 
 msgid "Profile URL"
 msgstr "配置文件 URL"
@@ -5476,7 +5472,7 @@
 
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的通行证账户。"
+msgstr "%s 不是有效的通行证帐号。"
 
 msgid "Service Temporarily Unavailable."
 msgstr "服务暂时不可用。"
@@ -5495,6 +5491,49 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 已经将您从好友名单中删除。"
 
+#. 1
+msgid "Angry"
+msgstr "生气"
+
+#. 2
+msgid "Excited"
+msgstr "激动"
+
+#. 3
+#, fuzzy
+msgid "Grumpy"
+msgstr "组"
+
+#. 4
+msgid "Happy"
+msgstr "高兴"
+
+#. 5
+msgid "In Love"
+msgstr "热恋"
+
+#. 6
+msgid "Invincible"
+msgstr "无敌"
+
+#. 7
+msgid "Sad"
+msgstr "郁闷"
+
+#. 8
+#, fuzzy
+msgid "Hot"
+msgstr "主机(_H):"
+
+#. 9
+#, fuzzy
+msgid "Sick"
+msgstr "昵称"
+
+#. 10
+msgid "Sleepy"
+msgstr "打盹"
+
 #. show current mood
 #, fuzzy
 msgid "Current Mood"
@@ -5513,6 +5552,29 @@
 msgid "How do you feel right now?"
 msgstr "我目前不在"
 
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "输入的 SecurID 密钥无效。"
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "输入的 SecurID 密钥无效。"
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+#, fuzzy
+msgid "The two PINs you entered do not match."
+msgstr "新密码不相同。"
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "输入的 SecurID 密钥无效。"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
 #. show error to user
 #, fuzzy
 msgid "Profile Update Error"
@@ -5591,8 +5653,7 @@
 msgstr "消息太长。"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 
 #, fuzzy
@@ -5601,14 +5662,21 @@
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接"
 
+#, fuzzy
+msgid "The nick name you entered is invalid."
+msgstr "输入的 SecurID 密钥无效。"
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "输入的 SecurID 密钥无效。"
+
 #. mxit login name
 msgid "MXit Login Name"
 msgstr ""
@@ -5621,7 +5689,7 @@
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
-msgstr "注册新的 XMPP 账户"
+msgstr "注册新的 XMPP 帐号"
 
 #, fuzzy
 msgid "Please fill in the following fields:"
@@ -5666,7 +5734,7 @@
 #. ask for input
 #, fuzzy
 msgid "Enter Security Code"
-msgstr "输入代码"
+msgstr "输入验证码"
 
 #, fuzzy
 msgid "Your Country"
@@ -5688,6 +5756,9 @@
 msgid "Retrieving User Information..."
 msgstr "服务器信息"
 
+msgid "Loading menu..."
+msgstr ""
+
 #, fuzzy
 msgid "Status Message"
 msgstr "已发消息"
@@ -5733,6 +5804,11 @@
 msgid "Successfully Logged In..."
 msgstr "成功加入群"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s 向您发送了语音聊天邀请,但尚不支持。"
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP 消息错误"
@@ -5741,6 +5817,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "发生了未知证书错误。"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL 错误:%s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL 错误:%s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "连接错误"
 
@@ -5815,39 +5903,6 @@
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "生气"
-
-msgid "Excited"
-msgstr "激动"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "组"
-
-msgid "Happy"
-msgstr "高兴"
-
-msgid "In Love"
-msgstr "热恋"
-
-msgid "Invincible"
-msgstr "无敌"
-
-msgid "Sad"
-msgstr "郁闷"
-
-#, fuzzy
-msgid "Hot"
-msgstr "主机(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "昵称"
-
-msgid "Sleepy"
-msgstr "打盹"
-
 #, fuzzy
 msgid "Pending"
 msgstr "正在发送"
@@ -5873,7 +5928,7 @@
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "无此用户:%s"
 
 msgid "User lookup"
 msgstr "用户查找"
@@ -5930,14 +5985,14 @@
 msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr[0] "即时消息朋友"
+msgstr[0] ""
 
 msgid "Add contacts from server"
 msgstr "从服务器添加联系人"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "协议错误,代码 %d: %s"
+msgstr "协议错误,代码 %d: %s"
 
 #, c-format
 msgid ""
@@ -5945,6 +6000,8 @@
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
+"%s 您的密码有 %zu 个字符,超过了最大长度 %d。请在 http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword 缩短您的密码并重试。"
 
 msgid "Incorrect username or password"
 msgstr "用户名或密码错误"
@@ -6019,13 +6076,13 @@
 msgstr "屏幕分辨率(每英寸点数)"
 
 msgid "Base font size (points)"
-msgstr "较大字体"
+msgstr "基本字号(点)"
 
 msgid "User"
 msgstr "用户"
 
 msgid "Headline"
-msgstr "昵称(_H):"
+msgstr "标头"
 
 msgid "Song"
 msgstr "声音"
@@ -6076,9 +6133,9 @@
 msgid "Zap"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr ""
 
 #, c-format
 msgid "Zapping %s..."
@@ -6088,9 +6145,9 @@
 msgid "Whack"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr ""
 
 #, c-format
 msgid "Whacking %s..."
@@ -6100,11 +6157,11 @@
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 msgid "Torch"
-msgstr "话题"
+msgstr ""
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "用户已经屏蔽了您"
+msgstr ""
 
 #, c-format
 msgid "Torching %s..."
@@ -6112,35 +6169,35 @@
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "热吻"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已登录。"
+msgstr "%s 给了你一个热吻!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "热吻 %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "拥抱"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已登录。"
+msgstr "%s 拥抱了你!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "拥抱 %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "打盹"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr ""
 
 #, c-format
 msgid "Slapping %s..."
@@ -6148,15 +6205,15 @@
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "已走"
+msgstr ""
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s 走了。"
+msgstr ""
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "查阅 %s"
+msgstr ""
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
@@ -6166,7 +6223,7 @@
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "High-fiving %s..."
@@ -6180,7 +6237,7 @@
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "Punking %s..."
@@ -6198,7 +6255,7 @@
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -6238,7 +6295,7 @@
 msgstr "用户未找到"
 
 msgid "Account has been disabled"
-msgstr "账户已经被禁用"
+msgstr "帐号已经被禁用"
 
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
@@ -6264,7 +6321,7 @@
 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 "您无法将同一个人两次添加到对话"
@@ -6294,11 +6351,11 @@
 
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr "未知错误: 0x%X"
+msgstr "未知错误:0x%X"
 
 #, c-format
 msgid "Unable to login: %s"
-msgstr "无法 ping 用户 %s"
+msgstr "无法登录: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6452,9 +6509,9 @@
 msgstr "服务器端口"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "从服务器收到了意外的 HTTP 响应。"
+msgstr "从服务器收到了意外的 HTTP 响应 %s。"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6465,9 +6522,9 @@
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "请求时出错"
+msgstr "请求 %s 时出错:%s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
@@ -6620,18 +6677,16 @@
 msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "无法发送文件"
+msgstr "无法发送短信息"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "无法发送目录。"
+msgstr "无法向此国家发送短信息"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "无法向未知国家发送短信息"
 
 msgid "Bot accounts cannot initiate IMs"
 msgstr ""
@@ -6648,9 +6703,8 @@
 msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "无法发送消息。"
+msgstr "无法接收离线消息"
 
 #, fuzzy
 msgid "Offline message store full"
@@ -6667,7 +6721,9 @@
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
-msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
+msgstr ""
+"(接收此信息出错。可能是您与 %s 设置了不同的编码,或者 %s 的客户端有程序错"
+"误。)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6734,7 +6790,7 @@
 msgstr "相机"
 
 msgid "Screen Sharing"
-msgstr "用户名"
+msgstr "屏幕共享"
 
 msgid "Free For Chat"
 msgstr "无事闲聊"
@@ -6768,10 +6824,10 @@
 
 #, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "无法连接到服务器。"
+msgstr "无法连接到 BOS 服务器:%s"
 
 msgid "Username sent"
-msgstr "无名称"
+msgstr "用户名已发送"
 
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
@@ -6810,7 +6866,7 @@
 
 #. Suspended account
 msgid "Your account is currently suspended"
-msgstr "您的账户被停用。"
+msgstr "您的帐号被停用。"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -6934,53 +6990,53 @@
 #, 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] "拒绝(_D)"
+msgstr[0] ""
 
 #, 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] "拒绝(_D)"
+msgstr[0] ""
 
 #, 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] "拒绝(_D)"
+msgstr[0] ""
 
 #, 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] "拒绝(_D)"
+msgstr[0] ""
 
 #, 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] "拒绝(_D)"
+msgstr[0] ""
 
 #, 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] "拒绝(_D)"
-
-#, fuzzy, c-format
+msgstr[0] ""
+
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "无法发送消息(%s)。"
+msgstr "无法发送消息:%s (%s)。"
 
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "无法发送消息: %s"
-
-#, fuzzy, c-format
+msgstr "无法发送消息:%s"
+
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "无法给 %s 发送消息:"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送消息:%s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "无法给 %s 发送消息:"
+msgstr "无法给 %s 发送消息:%s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7007,13 +7063,11 @@
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
-"一次。"
+"您的最后一次操作未执行,原因是您已经达到了速度限制。请等候 10 秒再试一次。\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7051,7 +7105,7 @@
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "弹出消息"
+msgstr[0] "以下用户名已与 %s 关联"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7062,7 +7116,7 @@
 msgstr "您应当收到询问确认 %s 的邮件。"
 
 msgid "Account Confirmation Requested"
-msgstr "请求了账户确认"
+msgstr "请求了帐号确认"
 
 #, c-format
 msgid ""
@@ -7103,14 +7157,14 @@
 msgstr "错误 0x%04x:未知错误。"
 
 msgid "Error Changing Account Info"
-msgstr "更改账户信息出错"
+msgstr "更改帐号信息出错"
 
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
 msgid "Account Info"
-msgstr "账户信息"
+msgstr "帐号信息"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
@@ -7135,8 +7189,6 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
-"再试一次。"
 
 msgid "Profile too long."
 msgstr "配置文件太长。"
@@ -7148,7 +7200,7 @@
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "配置文件太长。"
+msgstr[0] "已达到消息长度限制的 %d 字节,消息已被截断。"
 
 msgid "Away message too long."
 msgstr "离开消息太长。"
@@ -7187,7 +7239,7 @@
 
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "您的命令失败,原因未知。"
+msgstr "无法添加 %s,原因未知。"
 
 #, c-format
 msgid ""
@@ -7248,9 +7300,8 @@
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "服务器关闭了连接。"
+msgstr "您关闭了连接。"
 
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
@@ -7262,9 +7313,8 @@
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "二人世界直连聊天已建立"
+msgstr "结束二人世界直连聊天"
 
 msgid "Direct IM"
 msgstr "二人世界"
@@ -7331,7 +7381,7 @@
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "确认账户"
+msgstr "确认帐号"
 
 msgid "Display Currently Registered Email Address"
 msgstr "显示当前注册的电子邮件地址"
@@ -7356,8 +7406,9 @@
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"总是使用 ICQ 代理服务器\n"
-"(较慢,但不会暴露您的 IP 地址)"
+"文件传输和即时聊天总是使用 AIM/ICQ \n"
+"代理服务器(较慢,但不会暴露您的 IP \n"
+"地址)"
 
 msgid "Allow multiple simultaneous logins"
 msgstr ""
@@ -7467,7 +7518,7 @@
 msgstr "仅好友可见"
 
 msgid "Private"
-msgstr "私有"
+msgstr "保密"
 
 msgid "QQ Number"
 msgstr "QQ 号码"
@@ -7476,7 +7527,7 @@
 msgstr "国家/地区"
 
 msgid "Province/State"
-msgstr "省/州"
+msgstr "省/区"
 
 msgid "Zipcode"
 msgstr "邮政编码"
@@ -7485,7 +7536,7 @@
 msgstr "电话号码"
 
 msgid "Authorize adding"
-msgstr "同意吗添加吗?"
+msgstr "加好友须认证"
 
 msgid "Cellphone Number"
 msgstr "手机号码"
@@ -7503,7 +7554,7 @@
 msgstr "公开联系方式"
 
 msgid "College"
-msgstr "大学"
+msgstr "学历"
 
 msgid "Horoscope"
 msgstr "星座"
@@ -7521,7 +7572,7 @@
 msgstr "假"
 
 msgid "Modify Contact"
-msgstr "修改联系人"
+msgstr "修改联系方式"
 
 msgid "Modify Address"
 msgstr "修改地址"
@@ -7539,7 +7590,7 @@
 msgstr "无法更改好友信息。"
 
 msgid "Mobile"
-msgstr "移动"
+msgstr "手机"
 
 msgid "Note"
 msgstr "备注"
@@ -7619,10 +7670,10 @@
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%d 已经将您从好友名单中删除。"
+msgstr "从 %d 的好友列表中删除失败"
 
 msgid "No reason given"
-msgstr "没有给出理由。"
+msgstr "没有给出理由"
 
 #. only need to get value
 #, c-format
@@ -7671,7 +7722,7 @@
 msgstr "管理员"
 
 msgid "Notice"
-msgstr "备注"
+msgstr "公告"
 
 msgid "Detail"
 msgstr "详细信息"
@@ -7780,22 +7831,22 @@
 msgstr " TCP"
 
 msgid " FromMobile"
-msgstr "移动"
+msgstr " 手机用户"
 
 msgid " BindMobile"
-msgstr "移动"
+msgstr " 手机绑定"
 
 msgid " Video"
 msgstr "视频"
 
 msgid " Zone"
-msgstr "无"
+msgstr " 空间"
 
 msgid "Flag"
 msgstr ""
 
 msgid "Ver"
-msgstr ""
+msgstr "版本"
 
 msgid "Invalid name"
 msgstr "名称无效"
@@ -7805,86 +7856,86 @@
 
 #, 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"
+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"
+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"
+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"
+msgstr "<b>服务器</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登录时间</b>: %s<br>\n"
+msgstr "<b>客户端标签</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>连接方式</b>: %s<br>\n"
+msgstr "<b>连接方式</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>我的 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"
+msgstr "<b>已发送</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>上次刷新</b>: %lu<br>\n"
+msgstr "<b>重发</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>上次刷新</b>: %lu<br>\n"
+msgstr "<b>丢失</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>上次刷新</b>: %lu<br>\n"
+msgstr "<b>接收</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>我的公网 IP</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"
+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"
+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"
+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 "<b>上次刷新</b>: %s<br>\n"
+msgstr "<p><b>可爱的补丁编写者</b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>目前在线人数</b>: %d<br>\n"
+msgstr "<p><b>感谢</b>:<br>\n"
 
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>上次刷新</b>: %s<br>\n"
+msgstr "<p><b>细心的测试者</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "还有未被提及的,请告诉我……谢谢!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>以及,所有默默无闻的人……</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>随时欢迎加入我们!</i> :)"
 
 #, c-format
 msgid "About OpenQ %s"
@@ -7897,7 +7948,7 @@
 msgstr "更改密码"
 
 msgid "Account Information"
-msgstr "帐户信息"
+msgstr "帐号信息"
 
 msgid "Update all QQ Quns"
 msgstr "更新全部 QQ 群"
@@ -7949,10 +8000,10 @@
 msgstr "当消息到来时显示聊天室"
 
 msgid "Keep alive interval (seconds)"
-msgstr "保持在线错误"
+msgstr "保持在线间隔(秒)"
 
 msgid "Update interval (seconds)"
-msgstr "保持在线错误"
+msgstr "更新间隔(秒)"
 
 msgid "Unable to decrypt server reply"
 msgstr "无法解密服务器回复"
@@ -7963,7 +8014,7 @@
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "无效的标题"
+msgstr ""
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -7977,32 +8028,32 @@
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "登入时出现未知响应代码 (0x%02X)"
 
 msgid "Requesting captcha"
-msgstr "正在请求 %s 的注意..."
+msgstr "正在请求验证码"
 
 msgid "Checking captcha"
-msgstr "正在请求 %s 的注意..."
+msgstr "正在检测验证码"
 
 msgid "Failed captcha verification"
-msgstr "Yahoo! 认证失败"
+msgstr "验证码验证失败"
 
 msgid "Captcha Image"
-msgstr "保存图像"
+msgstr "验证码图像"
 
 msgid "Enter code"
-msgstr "输入代码"
+msgstr "输入验证码"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ 验证码验证"
 
 msgid "Enter the text from the image"
-msgstr "输入图像显示的文本"
+msgstr "输入图像中的字符"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "验证密码时出现未知响应(0x%02X)"
 
 #, c-format
 msgid ""
@@ -8014,7 +8065,7 @@
 msgstr "套接字错误"
 
 msgid "Getting server"
-msgstr "设置用户信息..."
+msgstr "获取服务器"
 
 msgid "Requesting token"
 msgstr "请求被禁止"
@@ -8037,11 +8088,15 @@
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ 服务器转发"
+msgstr ""
+"服务器消息\n"
+"%s\n"
+"%s\n"
+"%s"
 
 #, c-format
 msgid "%s:%s"
-msgstr "%s:%s"
+msgstr "%s:%s"
 
 #, c-format
 msgid "From %s:"
@@ -8051,7 +8106,9 @@
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "服务器指令:%s"
+msgstr ""
+"来自 %s 的服务器提示:\n"
+"%s"
 
 msgid "Unknown SERVER CMD"
 msgstr "未知服务器命令"
@@ -8081,7 +8138,7 @@
 msgid "File Send"
 msgstr "发送文件"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
@@ -8146,7 +8203,7 @@
 msgstr "会议已关闭"
 
 msgid "Unable to send message: "
-msgstr "无法发送消息: "
+msgstr "无法发送消息:"
 
 #, c-format
 msgid "Unable to send message to %s:"
@@ -8238,6 +8295,7 @@
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"
 
+#, fuzzy
 msgid "Last Known Client"
 msgstr "客户等级"
 
@@ -8255,13 +8313,12 @@
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
 msgid "Select User"
 msgstr "选择用户"
 
 msgid "Unable to add user: user not found"
-msgstr "无法添加用户: 用户未找到"
+msgstr "无法添加用户:用户未找到"
 
 #, c-format
 msgid ""
@@ -8297,11 +8354,11 @@
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "为账户 %s 导入 Sametime 列表"
+msgstr "为帐号 %s 导入 Sametime 列表"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "为账户 %s 导出 Sametime 列表"
+msgstr "为帐号 %s 导出 Sametime 列表"
 
 msgid "Unable to add group: group exists"
 msgstr "无法添加组:组已经存在"
@@ -8597,40 +8654,40 @@
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>频道名称:</b> %s"
+msgstr "<b>频道名称:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>用户数:</b> %d"
+msgstr "<br><b>用户数:</b> %d"
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>频道创建人:</b> %s"
+msgstr "<br><b>频道创建人:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>频道密码:</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"
+msgstr "<br><b>频道 HMAC:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>频道话题:</b><br>%s"
+msgstr "<br><b>频道话题:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>频道模式:</b> "
+msgstr "<br><b>频道模式:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>创建者密钥指纹:</b><br%s"
+msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>创建者密钥漏印:</b><br>%s"
+msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
@@ -9065,7 +9122,7 @@
 msgstr "让其它人看到您正在使用哪台计算机"
 
 msgid "Your VCard File"
-msgstr "您的 vCard 文件"
+msgstr "您的 VCard 文件"
 
 msgid "Timezone (UTC)"
 msgstr "时区(UTC)"
@@ -9160,48 +9217,48 @@
 msgstr "leave [频道]: 离聊天天"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
+msgstr "topic [&lt;新话题&gt;]:查看或更改话题"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;聊天室&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
+msgstr "join: &lt;聊天室&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
 msgid "list:  List channels on this network"
-msgstr "list: 列出此网络上的频道"
+msgstr "list:列出此网络上的频道"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;昵称&gt;: 查看昵称信息"
+msgstr "whois &lt;昵称&gt;:查看昵称信息"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
+msgstr "msg &lt;昵称&gt; &lt;消息&gt;:向用户发送私人消息"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
+msgstr "query &lt;昵称&gt; [&lt;消息&gt;]:向另外的好友发送私人消息"
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd: 查看服务器的每日消息"
+msgstr "motd:查看服务器的每日消息"
 
 msgid "detach:  Detach this session"
-msgstr "detach: 脱离此会话"
+msgstr "detach:脱离此会话"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
+msgstr "quit [消息]:断开与服务器的连接,并留下可选的消息"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
+msgstr "call &lt;命令&gt;:调用任何 silc 客户端命令"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
+msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]:杀死昵称"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
+msgstr "nick &lt;新昵称&gt;:更改您的昵称"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
+msgstr "whowas &lt;昵称&gt;:查看昵称信息"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
+msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]:更改或显示频道模式"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -9210,7 +9267,7 @@
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
+msgstr "umode &lt;用户模式&gt;:设置您在网络中的模式"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]:获得服务器管理员权限"
@@ -9219,34 +9276,34 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
+"invite &lt;频道&gt; [-|+]&lt;昵称&gt;:邀请昵称或从频道邀请列表中添加/删除"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
+msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]:从频道踢出客户"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [服务器]: 查看服务器管理细节"
+msgstr "info [服务器]:查看服务器管理细节"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
+msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]:在频道上屏蔽客户"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;:获取客户或服务器的公钥"
 
 msgid "stats:  View server and network statistics"
-msgstr "stat: 查看服务器和网络统计"
+msgstr "stat:查看服务器和网络统计"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping: 向连接的服务器发送 PING"
+msgstr "ping:向连接的服务器发送 PING"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
+msgstr "users &lt;频道&gt;:列出频道中目前的用户"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;:列出频道中的指定用"
 "户"
 
 #. *< type
@@ -9309,35 +9366,35 @@
 #. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "真名:\t%s\n"
+msgstr "真名:\t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "用户名:\t%s\n"
+msgstr "用户名:\t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "电子邮件:\t\t%s\n"
+msgstr "电子邮件:\t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "主机名:\t%s\n"
+msgstr "主机名:\t%s\n"
 
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "组织:\t%s\n"
+msgstr "组织:\t%s\n"
 
 #, c-format
 msgid "Country: \t%s\n"
-msgstr "国家:\t%s\n"
+msgstr "国家:\t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "算法:\t%s\n"
+msgstr "算法:\t%s\n"
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "密钥长度:\t%d 位\n"
+msgstr "密钥长度:\t%d 位\n"
 
 #, c-format
 msgid "Version: \t%s\n"
@@ -9349,7 +9406,7 @@
 "%s\n"
 "\n"
 msgstr ""
-"公钥指纹:\n"
+"公钥指纹:\n"
 "%s\n"
 "\n"
 
@@ -9358,7 +9415,7 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"公钥漏印:\n"
+"公钥漏印:\n"
 "%s"
 
 msgid "Public Key Information"
@@ -9400,43 +9457,43 @@
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失败: 版本不匹配,请升级您的客户端"
+msgstr "失败:版本不匹配,请升级您的客户端"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "失败: 远程不信任或不支持您的公钥"
+msgstr "失败:远程不信任或不支持您的公钥"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "失败: 远程不支持提议的 KE 组"
+msgstr "失败:远程不支持提议的 KE 组"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "失败: 远程不支持提议的密码算法"
+msgstr "失败:远程不支持提议的密码算法"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失败: 远程不支持提议的 PKCS"
+msgstr "失败:远程不支持提议的 PKCS"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "失败: 远程不支持提议的散列函数"
+msgstr "失败:远程不支持提议的散列函数"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失败: 远程不支持 HMAC"
+msgstr "失败:远程不支持 HMAC"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "失败: 签名不正确"
+msgstr "失败:签名不正确"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "失败: 无效的 cookie"
+msgstr "失败:无效的 cookie"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "失败: 身份验证失败"
+msgstr "失败:身份验证失败"
 
 msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
@@ -9461,7 +9518,7 @@
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
 msgid "SIP connect server not specified"
-msgstr "服务器端口"
+msgstr "没有指定 SIP 连接服务器"
 
 #. *< type
 #. *< ui_requirement
@@ -9497,10 +9554,10 @@
 msgstr "认证域"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;聊天室&gt;: 加入 Yahoo 网络上的聊天室"
+msgstr "join: &lt;聊天室&gt;: 加入 Yahoo 网络上的聊天室"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的聊天室"
+msgstr "list: 列出 Yahoo 网络上的聊天室"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
@@ -9612,7 +9669,7 @@
 
 #. username or password missing
 msgid "Username or password missing"
-msgstr "昵称或密码不对"
+msgstr "用户名或密码不全"
 
 #, c-format
 msgid ""
@@ -9636,15 +9693,13 @@
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "用户名或密码错误"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+msgstr "由于失败的尝试次数过多,您的帐号已被锁定,请尝试到 Yahoo! 网站登录。"
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
@@ -9661,7 +9716,7 @@
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
+msgstr "无法将好友 %s 添加到帐号 %s 位于服务器列表上的组 %s。"
 
 msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
@@ -9681,7 +9736,7 @@
 
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "无法与服务器建立连接"
+msgstr "无法与 %s 建立连接:%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9766,7 +9821,7 @@
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s 正在发送文件 %d\n"
+msgstr "%s 正要给你发送 %d 个文件。\n"
 
 msgid "Write Error"
 msgstr "写错误"
@@ -9889,7 +9944,7 @@
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
+msgstr "(转换此信息出错。\t请检查帐号编辑器中的“编码”选项)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -9919,32 +9974,32 @@
 msgstr "试图订阅 %s,%s,%s 失败。"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;昵称&gt;: 定位用户"
+msgstr "zlocate &lt;昵称&gt;:定位用户"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;昵称&gt;: 定位用户"
+msgstr "zl &lt;昵称&gt;:定位用户"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
+msgstr "instance &lt;实例&gt;:设置在此类上使用的实例"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
+msgstr "inst &lt;实例&gt;:设置在此类上使用的实例"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
+msgstr "topic &lt;实例&gt;:设置在此类上使用的实例"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
+msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;:加入新聊天"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
+msgstr "zi &lt;实例&gt;:向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
 
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
+"zci &lt;类&gt; &lt;实例&gt;:向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
@@ -9961,7 +10016,7 @@
 "送消息"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
+msgstr "zc &lt;类&gt;:向 &lt;<i>类</i>,个人,*&gt; 发送消息"
 
 msgid "Resubscribe"
 msgstr "重订"
@@ -10016,7 +10071,7 @@
 
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
+msgstr "访问被禁止:HTTP 代理服务器禁止端口 %d 流过。"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10158,32 +10213,32 @@
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "未知。"
+msgstr[0] "%d 秒"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "未知。"
+msgstr[0] "%d 天"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "未知。"
+msgstr[0] "%s,%d 小时"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "未知。"
+msgstr[0] "%d 小时"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "未知。"
+msgstr[0] "%s,%d 分钟"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "未知。"
+msgstr[0] "%d 分钟"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10195,7 +10250,7 @@
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "从套接字读取时出错。"
+msgstr "从 %s 读取出错:回复太长(限制为 %d 字节)"
 
 #, c-format
 msgid ""
@@ -10213,11 +10268,11 @@
 
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "无法连接到 %s: %s"
+msgstr "无法连接到 %s:%s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
 #, c-format
 msgid " (%s)"
@@ -10299,7 +10354,7 @@
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "用作当前账户头像(_I):"
+msgstr "用作当前帐号头像(_I):"
 
 msgid "Ad_vanced"
 msgstr "高级(_A)"
@@ -10350,19 +10405,19 @@
 msgstr "密码(_S):"
 
 msgid "Unable to save new account"
-msgstr "无法保存新帐户"
+msgstr "无法保存新帐号"
 
 msgid "An account already exists with the specified criteria."
-msgstr "已经存在指定条件的帐户。"
+msgstr "已经存在指定条件的帐号。"
 
 msgid "Add Account"
-msgstr "添加账户"
+msgstr "添加帐号"
 
 msgid "_Basic"
 msgstr "基本(_B)"
 
 msgid "Create _this new account on the server"
-msgstr "在服务器上创建此新帐户(_T)"
+msgstr "在服务器上创建此新帐号(_T)"
 
 msgid "P_roxy"
 msgstr "代理"
@@ -10385,14 +10440,14 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>欢迎使用 %s!</span>\n"
-"\n"
-"您尚未配置即时通讯帐户。要用 %s 开始连接,请单击下方的<b>添加</b>按钮,以便配"
-"置您的第一个帐户。如果您想要让 %s 连接到多个即时通讯帐户,请再次单击<b>添加</"
+"<span size='larger' weight='bold'>欢迎使用 %s!</span>\n"
+"\n"
+"您尚未配置即时通讯帐号。要用 %s 开始连接,请单击下方的<b>添加</b>按钮,以便配"
+"置您的第一个帐号。如果您想要让 %s 连接到多个即时通讯帐号,请再次单击<b>添加</"
 "b>按钮进行配置。\n"
 "\n"
-"如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
-"户->添加/编辑</b>"
+"如果您想要回到此窗口以便添加、编辑或删除帐号,可以从好友列表中窗口中选择<b>帐"
+"号->管理帐号</b>"
 
 #. Buddy List
 msgid "Background Color"
@@ -10459,12 +10514,11 @@
 
 #. 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 "在线文字"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "当一位好友上线时显示的文字信息"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -10476,7 +10530,6 @@
 
 #. 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 "离线文字"
 
@@ -10531,7 +10584,7 @@
 msgstr "请更新必要的字段。"
 
 msgid "A_ccount"
-msgstr "账户(_C):"
+msgstr "帐号(_C):"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10687,10 +10740,10 @@
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/账户(_A)"
+msgstr "/帐号(_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/账户/管理帐户"
+msgstr "/帐号/管理帐号"
 
 #. Tools
 msgid "/_Tools"
@@ -10741,7 +10794,7 @@
 
 #, c-format
 msgid "<b>Account:</b> %s"
-msgstr "<b>账户:</b>%s"
+msgstr "<b>帐号:</b>%s"
 
 #, c-format
 msgid ""
@@ -10769,13 +10822,13 @@
 msgstr "已登录"
 
 msgid "Last Seen"
-msgstr "上次见面"
+msgstr "上次发现"
 
 msgid "Spooky"
 msgstr "健谈"
 
 msgid "Awesome"
-msgstr ""
+msgstr "惊人"
 
 msgid "Rockin'"
 msgstr ""
@@ -10822,7 +10875,7 @@
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "/工具/聊天室列表\n"
+msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
 
 msgid "Manually"
 msgstr "手动"
@@ -10857,7 +10910,7 @@
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "欢迎回来!"
+msgstr[0] "%d 个帐号已禁用,因为它们在其他地点登录:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>用户名:</b>"
@@ -10869,7 +10922,7 @@
 msgstr "登录(_L)"
 
 msgid "/Accounts"
-msgstr "/账户(A)"
+msgstr "/帐号"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -10880,10 +10933,10 @@
 "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 size='larger' weight='bold'>欢迎使用 %s!</span>\n"
-"\n"
-"您没有启用帐户。请通过<b>帐户->管理</b>打开<b>帐户</b>窗口,从中启用您的即时"
-"通讯帐户。当您启用帐户之后,才可以登录、设定状态、和朋友交谈。"
+"<span weight='bold' size='larger'>欢迎使用 %s!</span>\n"
+"\n"
+"您没有启用帐号。请通过<b>帐号->管理</b>打开<b>帐号</b>窗口,从中启用您的即时"
+"通讯帐号。当您启用帐号之后,才可以登录、设定状态、和朋友交谈。"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10910,10 +10963,10 @@
 msgstr "好友名称(_U):"
 
 msgid "(Optional) A_lias:"
-msgstr "别名(可选):"
+msgstr "(可选)别名(_L):"
 
 msgid "Add buddy to _group:"
-msgstr "将用户添加到组:"
+msgstr "将好友添加到组(_G):"
 
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
@@ -10934,27 +10987,26 @@
 msgid "_Group:"
 msgstr "组(_G):"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "帐户在线时自动加入。"
+msgstr "帐号上线时自动加入(_J)。"
 
 msgid "_Remain in chat after window is closed."
-msgstr "窗口关闭时隐藏聊天。"
+msgstr "窗口关闭后继续保持聊天状态(_R)。"
 
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
 msgid "Enable Account"
-msgstr "启用账户"
+msgstr "启用帐号"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帐户/启用帐户"
+msgstr "<PurpleMain>/帐号/启用帐号"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/账户/"
+msgstr "<PurpleMain>/帐号/"
 
 msgid "_Edit Account"
-msgstr "编辑账户(_E)"
+msgstr "编辑帐号(_E)"
 
 msgid "No actions available"
 msgstr "没有可用的操作"
@@ -11048,41 +11100,40 @@
 msgstr "/对话(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/对话/新即时消息(_M)..."
-
-#, fuzzy
+msgstr "/对话(C)/新即时消息(_M)..."
+
 msgid "/Conversation/Join a _Chat..."
-msgstr "/对话/邀请(_V)..."
+msgstr "/对话(C)/邀请(_C)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/对话/查找(_F)..."
+msgstr "/对话(C)/查找(_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/对话/查看聊天记录(_L)"
+msgstr "/对话(C)/查看聊天记录(_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/对话/另存为(_S)..."
+msgstr "/对话(C)/另存为(_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/对话/清除回滚(_R)"
+msgstr "/对话(C)/清除回滚(_R)"
 
 msgid "/Conversation/M_edia"
-msgstr "/对话/媒体(_E)"
+msgstr "/对话(C)/媒体(_E)"
 
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/对话/媒体/语音聊天(_A)"
+msgstr "/对话(C)/媒体(E)/语音聊天(_A)"
 
 msgid "/Conversation/Media/_Video Call"
-msgstr "/对话/媒体/视频聊天(_V)"
+msgstr "/对话(C)/媒体(E)/视频聊天(_V)"
 
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/对话/媒体/音频\\/视频聊天(_C)"
+msgstr "/对话(C)/媒体(E)/音频\\/视频聊天(_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/对话/发送文件(_N)..."
+msgstr "/对话(C)/发送文件(_N)..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话/添加好友千里眼(_P)..."
+msgstr "/对话(C)/添加好友千里眼(_P)..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/对话/获取信息(_G)"
@@ -11207,13 +11258,13 @@
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
 msgstr ""
 "\n"
-"%s 停止了打字(%s)"
+"%s 停止了打字"
 
 #. Build the Send To menu
 msgid "S_end To"
@@ -11229,7 +11280,7 @@
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "聊天室里没有人"
+msgstr[0] "聊天室里有 %d 人"
 
 msgid "Typing"
 msgstr "正在打字"
@@ -11247,7 +11298,7 @@
 msgstr "新事件"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: 清除全部对话回滚。"
+msgstr "clear:清除全部对话回滚。"
 
 msgid "Confirm close"
 msgstr "确认关闭"
@@ -11283,7 +11334,7 @@
 msgstr "按组"
 
 msgid "By account"
-msgstr "按账户"
+msgstr "按帐号"
 
 msgid "Save Debug Log"
 msgstr "保存调试聊天记录"
@@ -11591,7 +11642,7 @@
 msgstr "T.M.Thanh 及Gnome 越南语小组"
 
 msgid "Simplified Chinese"
-msgstr "中文(中国)"
+msgstr "中文(中国大陆)"
 
 msgid "Hong Kong Chinese"
 msgstr "中文(香港)"
@@ -11630,8 +11681,8 @@
 "<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/>"
+"<FONT SIZE=\"4\">常见问题:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -11678,7 +11729,7 @@
 msgstr "名称(_N)"
 
 msgid "_Account"
-msgstr "账户(_A)"
+msgstr "帐号(_A)"
 
 msgid "Get User Info"
 msgstr "获取用户信息"
@@ -11717,7 +11768,7 @@
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] "请输入此聊天的别名。"
+msgstr[0] ""
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11788,7 +11839,7 @@
 msgstr "新消息(_M)..."
 
 msgid "_Accounts"
-msgstr "账户(_A)"
+msgstr "帐号(_A)"
 
 msgid "Plu_gins"
 msgstr "插件(_G)"
@@ -12193,8 +12244,9 @@
 msgid "display this help and exit"
 msgstr ""
 
+#, fuzzy
 msgid "allow multiple instances"
-msgstr ""
+msgstr "允许打开多个主程序"
 
 msgid "don't automatically login"
 msgstr ""
@@ -12257,12 +12309,12 @@
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "暂停(_P)"
+msgstr[0] "%s 有 %d 封新邮件。"
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "暂停(_P)"
+msgstr[0] "<b>%d 封新邮件。</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12289,13 +12341,13 @@
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
 msgid "New Pounces"
-msgstr "新建好友千里眼"
+msgstr "好友千里眼提示"
 
 msgid "Dismiss"
-msgstr "解散"
+msgstr "忽略"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新提示了!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
@@ -12319,7 +12371,7 @@
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"<span foreground=\"#ff0000\" weight=\"bold\">错误:%s\n"
+"<span foreground=\"red\" weight=\"bold\">错误:%s\n"
 "请检查插件网站中的更新。</span>"
 
 msgid "Author"
@@ -12351,7 +12403,7 @@
 msgstr "监视对象"
 
 msgid "_Account:"
-msgstr "账户(_A):"
+msgstr "帐号(_A):"
 
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
@@ -12414,7 +12466,7 @@
 msgstr "仅当我的状态不可用时才监视(_O)"
 
 msgid "_Recurring"
-msgstr "再现(_R)"
+msgstr "重复(_R)"
 
 msgid "Pounce Target"
 msgstr "监视目标"
@@ -12450,24 +12502,22 @@
 msgstr "发送消息"
 
 msgid "Unknown.... Please report this!"
-msgstr "未知的千里眼。请报告此错误!"
+msgstr "未知……请报告此错误!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(默认)"
+msgstr "(自定义)"
+
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Pidgin 默认声音主题"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "好友列表"
+msgstr "Pidgin 好友列表默认主题"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidgin 状态图标默认主题"
 
 msgid "Theme failed to unpack."
 msgstr "主题解包失败。"
@@ -12478,16 +12528,32 @@
 msgid "Theme failed to copy."
 msgstr "主题复制失败。"
 
-msgid "Install Theme"
-msgstr "安装主题"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+#, fuzzy
+msgid "Theme Selections"
+msgstr "浏览器选择"
+
+#. Instructions
+#, fuzzy
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr "请从下面选择您要使用的表情主题。将主题拖曳到主题列表即可安装新主题。"
 
-msgid "Icon"
-msgstr "图标"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "好友列表主题"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "状态图标"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "表情主题"
 
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
@@ -12495,16 +12561,12 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "使用 ESC 键关闭会话(_O)"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "好友列表主题"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 msgid "_Show system tray icon:"
-msgstr "显示系统托盘图标(_S):"
+msgstr "显示系统托盘图标(_S):"
 
 msgid "On unread messages"
 msgstr "有未读消息时"
@@ -12513,7 +12575,7 @@
 msgstr "即时消息对话窗口"
 
 msgid "_Hide new IM conversations:"
-msgstr "隐藏新的 IM 对话(_H):"
+msgstr "隐藏新的 IM 对话(_H):"
 
 msgid "When away"
 msgstr "离开时"
@@ -12585,9 +12647,6 @@
 msgid "Font"
 msgstr "字体"
 
-msgid "Use document font from _theme"
-msgstr "使用主题中的文档字体(_T)"
-
 msgid "Use font from _theme"
 msgstr "使用主题中的字体(_T)"
 
@@ -12608,20 +12667,18 @@
 msgid "Cannot start browser configuration program."
 msgstr "无法启动浏览器配置程序。"
 
-#, fuzzy
 msgid "Disabled"
-msgstr "禁用(_D)"
+msgstr "禁用"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自动检测 IP 地址(_A):%s"
-
-#, fuzzy
+msgstr "使用自动检测到的 IP 地址(_A):%s"
+
 msgid "ST_UN server:"
-msgstr "STUN 服务器(_U):"
+msgstr "ST_UN 服务器:"
 
 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:"
@@ -12632,76 +12689,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "启用自动路由器端口转发(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "手动指定要监听的端口范围(_M)"
-
-#, fuzzy
+msgstr "手动指定要监听的端口范围(_M):"
+
 msgid "_Start:"
-msgstr "状态(_S):"
-
-#, fuzzy
+msgstr "起始(_S):"
+
 msgid "_End:"
-msgstr "展开(_E)"
+msgstr "终止(_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "中继服务器(转)"
-
-#, fuzzy
+msgstr "中继服务器(TURN)"
+
 msgid "_TURN server:"
-msgstr "STUN 服务器(_U):"
-
-#, fuzzy
+msgstr "_TURN 服务器:"
+
 msgid "Use_rname:"
-msgstr "用户名:"
-
-#, fuzzy
+msgstr "用户名(_R):"
+
 msgid "Pass_word:"
-msgstr "密码:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "代理服务器 &amp; 浏览器"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>未发现代理设定程序。</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>未发现浏览器配置程序。</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-
-msgid "Configure _Proxy"
-msgstr "配置代理服务器(_P)"
-
-msgid "Configure _Browser"
-msgstr "配置浏览器(_B)"
-
-msgid "Proxy Server"
-msgstr "代理服务器"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "通过 SOCKS4 代理使用远程 DNS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "代理类型(_T):"
-
-msgid "No proxy"
-msgstr "无代理"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "端口(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "用户名:"
+msgstr "密码(_W):"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -12742,6 +12750,16 @@
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
+#, fuzzy
+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):"
 
@@ -12765,6 +12783,39 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
+msgid "Proxy Server"
+msgstr "代理服务器"
+
+#, fuzzy
+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"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "代理类型(_T):"
+
+msgid "No proxy"
+msgstr "无代理"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "端口(_P):"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "用户名:"
+
 msgid "Log _format:"
 msgstr "聊天记录格式(_F):"
 
@@ -12828,10 +12879,10 @@
 msgstr "对话获得焦点后发声(_F)"
 
 msgid "_Enable sounds:"
-msgstr "开启声音(_E):"
+msgstr "开启声音(_E):"
 
 msgid "V_olume:"
-msgstr "音量(_O):"
+msgstr "音量(_O):"
 
 msgid "Play"
 msgstr "播放"
@@ -12848,25 +12899,19 @@
 msgid "Based on keyboard or mouse use"
 msgstr "根据键盘或鼠标使用"
 
+msgid "_Minutes before becoming idle:"
+msgstr "更改状态前等几分钟(_M):"
+
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "发呆时更改状态(_I)"
+
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
 msgid "When both away and idle"
 msgstr "离开和发呆时"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "自动离开"
-
-msgid "_Minutes before becoming idle:"
-msgstr "更改状态前等几分钟(_M):"
-
-msgid "Change status when _idle"
-msgstr "发呆时更改状态(_I)"
-
-msgid "Change _status to:"
-msgstr "将状态更改为(_S):"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "启动时的状态"
@@ -12880,14 +12925,15 @@
 msgid "Interface"
 msgstr "界面"
 
-msgid "Smiley Themes"
-msgstr "表情主题"
-
 msgid "Browser"
 msgstr "浏览器"
 
 msgid "Status / Idle"
-msgstr "状态/发呆"
+msgstr "状态和发呆"
+
+#, fuzzy
+msgid "Themes"
+msgstr "表情主题"
 
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
@@ -12911,7 +12957,7 @@
 msgstr "对隐私设置的更改将会立即生效。"
 
 msgid "Set privacy for:"
-msgstr "设置隐私的账户:"
+msgstr "设置隐私的帐号:"
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -13001,7 +13047,7 @@
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "为某些账户使用不同的状态(_D)"
+msgstr "为某些帐号使用不同的状态(_D)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
@@ -13029,11 +13075,11 @@
 msgstr "添加表情"
 
 msgid "_Image:"
-msgstr "图像(_I):"
+msgstr "图像(_I):"
 
 #. Shortcut text
 msgid "S_hortcut text:"
-msgstr "快捷方式文本:"
+msgstr "快捷方式文本(_H):"
 
 msgid "Smiley"
 msgstr "表情"
@@ -13048,10 +13094,10 @@
 msgstr "选择好友图标"
 
 msgid "Click to change your buddyicon for this account."
-msgstr "点此修改当前账户所用图标。"
+msgstr "点此修改当前帐号所用图标。"
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr "点此修改所有账户所用图标。"
+msgstr "点此修改所有帐号所用图标。"
 
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
@@ -13070,7 +13116,7 @@
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "载入 %s 时发生了下列错误: %s。"
+msgstr "载入 %s 时发生了下列错误: %s。"
 
 msgid "Failed to load image"
 msgstr "载入图像失败"
@@ -13222,9 +13268,6 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "选择此选项将禁用图形化表情。"
 
@@ -13235,7 +13278,7 @@
 msgstr "小"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "默认表情的小图像版本"
 
 msgid "Response Probability:"
 msgstr "响应可能性:"
@@ -13245,7 +13288,7 @@
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "最大响应超时:"
+msgstr "最大响应超时:"
 
 msgid "minutes"
 msgstr "分钟"
@@ -13304,7 +13347,7 @@
 msgstr "得分相等时使用上个好友"
 
 msgid "Point values to use for account..."
-msgstr "账户的权值..."
+msgstr "帐号的权值..."
 
 #. *< type
 #. *< ui_requirement
@@ -13397,14 +13440,14 @@
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"描述"
+"<b>描述:</b>"
 
 #. Create the window.
 msgid "Service Discovery"
 msgstr "服务目录信息"
 
 msgid "_Browse"
-msgstr "浏览器(_B):"
+msgstr "浏览(_B)"
 
 msgid "Server does not exist"
 msgstr "用户不存在"
@@ -13433,7 +13476,7 @@
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "请注意:“新建对话”的\"首选项必须设定为“按对话次数”。"
+msgstr "请注意:“新建对话”的首选项必须设定为“按对话次数”。"
 
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
@@ -13500,7 +13543,7 @@
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "允许在对话窗口中支持鼠标手势。\n"
-"拖曳鼠标中键可执行特定操作:\n"
+"拖曳鼠标中键可执行特定操作:\n"
 "\n"
 "·向下再向右可关闭对话。\n"
 "·向上再向左可切换到上个对话。\n"
@@ -13559,7 +13602,7 @@
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "选择要将好友自动添加到哪些账户。"
+msgstr "选择要将好友自动添加到哪些帐号。"
 
 #. *< type
 #. *< ui_requirement
@@ -13581,10 +13624,10 @@
 msgstr "请在下面输入联系人的信息。"
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "请在下面输入好友的用户名和账户类型。"
+msgstr "请在下面输入好友的用户名和帐号类型。"
 
 msgid "Account type:"
-msgstr "账户类型:"
+msgstr "帐号类型:"
 
 #. Optional Information section
 msgid "Optional information:"
@@ -13621,7 +13664,7 @@
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>好友备注</b>: %s"
+"<b>好友备注</b>:%s"
 
 msgid "History"
 msgstr "历史"
@@ -13841,6 +13884,10 @@
 msgid "Conversation Entry"
 msgstr "对话项"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "对话项"
+
 msgid "Request Dialog"
 msgstr "请求对话框"
 
@@ -14095,13 +14142,13 @@
 #. *< id
 #. *  description
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 主题控制"
+msgstr "Pidgin GTK+ 主题编辑器"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 主题控制"
+msgstr "Pidgin GTK+ 主题编辑器"
 
 #. *< type
 #. *< ui_requirement
@@ -14184,9 +14231,8 @@
 "timestamp formats."
 msgstr "此插件允许用户自定义会话和聊天记录消息的时间戳格式。"
 
-#, fuzzy
 msgid "Audio"
-msgstr "自动"
+msgstr "音频"
 
 #, fuzzy
 msgid "Video"
@@ -14195,24 +14241,20 @@
 msgid "Output"
 msgstr ""
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_P)"
+
 msgid "_Device"
-msgstr "设备"
+msgstr "设备(_D)"
 
 msgid "Input"
 msgstr ""
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_L)"
+
 msgid "D_evice"
-msgstr "设备"
+msgstr "设备(_E)"
 
 #. *< magic
 #. *< major version
@@ -14223,9 +14265,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "编辑设置"
+msgstr "音频/视频 设置"
 
 #. *< name
 #. *< version
@@ -14299,8 +14340,9 @@
 msgid "_Start %s on Windows startup"
 msgstr "Windows 启动时运行 %s(_S)"
 
+#, fuzzy
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "允许打开多个主程序"
 
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
@@ -14336,7 +14378,7 @@
 msgstr "XMPP 控制台"
 
 msgid "Account: "
-msgstr "账户:"
+msgstr "帐号:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未连接到 XMPP</font>"
@@ -14363,6 +14405,27 @@
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "通过多种协议发送即时消息"
 
+#~ msgid "(Default)"
+#~ msgstr "(默认)"
+
+#~ msgid "Install Theme"
+#~ msgstr "安装主题"
+
+#~ msgid "Icon"
+#~ msgstr "图标"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "使用主题中的文档字体(_T)"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "代理和浏览器"
+
+#~ msgid "Auto-away"
+#~ msgstr "自动离开"
+
+#~ msgid "Change _status to:"
+#~ msgstr "将状态更改为(_S):"
+
 #~ msgid "_Start port:"
 #~ msgstr "起始端口(_S):"
 
@@ -14388,7 +14451,7 @@
 #~ msgstr "用户非活跃超时(以分钟计)"
 
 #~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
+#~ msgstr "您的帐号已锁定,请登录到 Yahoo! 网站。"
 
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
@@ -14424,7 +14487,7 @@
 #~ "  -h, --help\t\t显示帮助并退出\n"
 #~ "  -m, --multiple\t不确认单个事例\n"
 #~ "  -n, --nologin\t不自动登录\n"
-#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户,用逗号分隔)\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的帐号,用逗号分隔)\n"
 #~ "  --display=DISPLAY\t要使用的 X 显示\n"
 #~ "  -v, --version\t显示当前版本并退出\n"
 
@@ -14454,7 +14517,7 @@
 #~ "  -h, --help\t\t显示帮助并退出\n"
 #~ "  -m, --multiple\t不确认单个事例\n"
 #~ "  -n, --nologin\t不自动登录\n"
-#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户,用逗号分隔)\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的帐号,用逗号分隔)\n"
 #~ "  --display=DISPLAY\t要使用的 X 显示\n"
 #~ "  -v, --version\t显示当前版本并退出\n"
 
@@ -15324,7 +15387,7 @@
 #~ msgstr ""
 #~ "%s\n"
 #~ "\n"
-#~ "%s 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
+#~ "%s 将不会尝试重新连接帐号,除非您纠正了错误然后重新启用帐号。"
 
 #~ msgid "User has typed something and stopped"
 #~ msgstr "用户打了几个字,停了一下"
--- a/po/zh_HK.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/zh_HK.po	Sat Jan 09 02:00:18 2010 +0000
@@ -1,4 +1,4 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2009, 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.600 2009/09/03 13:49:05 acli Exp $
+# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -24,6 +24,14 @@
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
 # (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
+# Jabber術語 (20091127) presence、subscription 等參閱
+# - http://www.2cm.com.tw/coverstory_content.asp?sn=0701010062
+# - http://nctur.lib.nctu.edu.tw/handle/987654321/3479
+# - http://voiplab.niu.edu.tw/Course98.html (尤其是 http://voiplab.niu.edu.tw/ppt/SIP/05.IMPS.pdf)
+# - presence service 如出現譯「現狀資訊服務」
+# - subscribe to presence 譯「訂閱XXX的狀態資訊」
+# - identifier 譯「辨識碼」
+# - message body 譯「訊息內容」
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
@@ -52,9 +60,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.2\n"
+"Project-Id-Version: Pidgin 2.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
 "PO-Revision-Date: 2009-09-03 06:04-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -693,9 +701,8 @@
 msgid "Enable Sounds"
 msgstr "啟動音效"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "無法連結"
+msgstr "連線成功。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -707,9 +714,8 @@
 msgstr[0] "使用者列表(%d個使用者):\n"
 msgstr[1] "使用者列表(%d個使用者):\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "支援的除錯選項有:version"
+msgstr "支援的除錯選項有:plugins version"
 
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
@@ -1600,10 +1606,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "上列網址的 TinyURL:%s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "TinyURL 正在取得縮短的網址中,請稍候..."
 
 # XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for URLs of this length or greater"
@@ -1627,6 +1633,7 @@
 msgid "Online"
 msgstr "上線"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1745,7 +1752,7 @@
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "無法信賴這張證書,因為目前沒有可信賴的證書可以驗證這張證書。"
 
 msgid "The certificate is not valid yet."
 msgstr "這張證書尚未生效。"
@@ -1981,9 +1988,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "解析程序已結束,但未有回覆我方發出的請求"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "解析 %s 途中發生了錯誤:%d"
+msgstr "將 %s 轉換成 punycode 途中發生了錯誤:%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2286,17 +2293,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "發生了一個嚴重的 Farsight2 錯誤。"
 
-#, fuzzy
 msgid "Conference error"
-msgstr "會議室錯誤。"
-
-#, fuzzy
+msgstr "會議室錯誤"
+
 msgid "Error with your microphone"
-msgstr "你的麥克風出現錯誤。"
-
-#, fuzzy
+msgstr "你的麥克風出現錯誤"
+
 msgid "Error with your webcam"
-msgstr "你的 webcam 出現錯誤。"
+msgstr "你的 webcam 出現錯誤"
 
 # FIXME 譯文有待改進 - acli 20090902
 #, c-format
@@ -2835,12 +2839,15 @@
 msgid "Enforce that passwords are used only once."
 msgstr "強制密碼只用一次"
 
+# XXX 譯文不太通順 - acli 20091128
 #. *  description
 msgid ""
 "Allows you to enforce on a per-account basis that passwords not being saved "
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"針對個別不記住密碼的帳號,讓你強制成功登入後不會再使用同一個密碼。注意:使用"
+"這個功能,帳號必須停用「記住密碼」選項"
 
 #. *< type
 #. *< ui_requirement
@@ -3256,10 +3263,12 @@
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
+#. 0
 #. Global
 msgid "Available"
 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
@@ -4060,13 +4069,13 @@
 msgstr "%s 將不再可以檢視你的狀態更新。你要繼續這個動作嗎?"
 
 msgid "Cancel Presence Notification"
-msgstr "取消上線狀態通知"
+msgstr "取消發出狀態資訊通知(移除自己)"
 
 msgid "Un-hide From"
-msgstr "現身給"
+msgstr "現身給此好友"
 
 msgid "Temporarily Hide From"
-msgstr "暫時隱身於"
+msgstr "暫時隱身於此好友"
 
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
@@ -4076,7 +4085,7 @@
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "從好友名單中移除"
+msgstr "取消訂閱狀態資訊(移除好友)"
 
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
@@ -4087,12 +4096,14 @@
 msgid "Log Out"
 msgstr "登出"
 
+#. 2
 msgid "Chatty"
 msgstr "想聊天"
 
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -4354,33 +4365,32 @@
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
 msgid "Both"
-msgstr "已互相認證"
+msgstr "訂閱及發出狀態資訊通知(已互相認證)"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "From (To pending)"
-msgstr "已認證對方(但仍等待對方認證你)"
-
-# FIXME 原文一詞兩義,根本無法翻譯
-#  NOTE gntnotify 字義為「發信人」
+msgstr "訂閱對方狀態資訊,未認證發出狀態資訊通知"
+
 #  NOTE Jabber 術語字義見「Both」條
 msgid "From"
-msgstr "已認證對方"
+msgstr "訂閱對方狀態資訊"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "To"
-msgstr "已獲對方認證"
+msgstr "發出狀態資訊通知"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "None (To pending)"
-msgstr "無(但正等待對方認證你)"
-
+msgstr "無,等待認證發出狀態資訊通知"
+
+#. 0
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語,見「Both」條
 #. subscription type
 msgid "Subscription"
-msgstr "認證狀態"
+msgstr "狀態資訊訂閱"
 
 # XXX 要覆查 - acli 20070914
 msgid "Mood Text"
@@ -4520,7 +4530,7 @@
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 msgid "Subscription Required"
-msgstr "必須認證"
+msgstr "必須訂閱狀態資訊"
 
 msgid "Unexpected Request"
 msgstr "未預期的要求"
@@ -4723,11 +4733,9 @@
 msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
-#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+msgstr "無法與 %s 進行媒體通話,因為未有訂閱對方的狀態資訊"
 
 msgid "Media Initiation Failed"
 msgstr "媒體通話啟動失敗"
@@ -4752,9 +4760,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [聊天室]:離開聊天室。"
+msgstr "part [訊息]:離開聊天室。"
 
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
@@ -4878,7 +4885,7 @@
 msgstr "XML 分析錯誤"
 
 msgid "Unknown Error in presence"
-msgstr "不明的上線狀態錯誤"
+msgstr "不明的狀態資訊錯誤"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4939,11 +4946,9 @@
 msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
-#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
+msgstr "無法傳送檔案至 %s,因為未有訂閱對方的狀態資訊"
 
 #  FIXME 這不通順 - acli 20070614
 #, c-format
@@ -5435,7 +5440,7 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5664,9 +5669,8 @@
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "無法新增使用者"
+msgstr "無法移除使用者"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "因為行動訊息過長,所以無法送出:"
@@ -5909,28 +5913,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將你從他(她)的好友清單中移除。"
 
+#. 1
+msgid "Angry"
+msgstr "憤怒"
+
+#. 2
+msgid "Excited"
+msgstr "興奮"
+
+# XXX 譯文有待改進 - 20091126 acli
+#. 3
+msgid "Grumpy"
+msgstr "暴躁"
+
+#. 4
+msgid "Happy"
+msgstr "開心"
+
+#. 5
+msgid "In Love"
+msgstr "戀愛中"
+
+#. 6
+msgid "Invincible"
+msgstr "無敵"
+
+#. 7
+msgid "Sad"
+msgstr "憂愁"
+
+# XXX 原文瞹眛,譯文可能有錯 =P  - acli 20091127
+#. 8
+msgid "Hot"
+msgstr "火熱"
+
+#. 9
+msgid "Sick"
+msgstr "生病"
+
+#. 10
+msgid "Sleepy"
+msgstr "想睡"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "你目前的心情"
+msgstr "目前的心情"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "使用者情緒"
-
-#, fuzzy
+msgstr "新心情"
+
 msgid "Change your Mood"
-msgstr "修改密碼"
-
-#, fuzzy
+msgstr "修改心情"
+
 msgid "How do you feel right now?"
-msgstr "我現在不在位子上"
+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
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "寫入錯誤"
+msgstr "更新個人資料途中發生錯誤"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5938,359 +5998,307 @@
 msgstr "個人資料"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "未能讀取你的個人資料,請稍後重試。"
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "帳號"
+msgstr "密碼"
 
 msgid "Verify PIN"
-msgstr ""
-
+msgstr "確認密碼"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "姓"
+msgstr "網名"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "隱藏電話號碼"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "流動電話號碼"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "使用者資料"
+msgstr "更新個人資料"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "你可以在這裏更新你在 MXit 的個人資料"
 
 msgid "View Splash"
-msgstr ""
+msgstr "檢視啟動畫面"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "目前沒有可用的啟動畫面"
+
 msgid "About"
-msgstr "關於我"
+msgstr "關於此模組"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "修改密碼..."
+msgstr "修改心情..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "修改密碼..."
+msgstr "修改個人資料..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "觀看日誌..."
-
+msgstr "檢視啟動畫面..."
+
+# XXX 這隨時會變成不對... - acli 20091127
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "關於我"
+msgstr "關於此模組..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "這個訊息太大了。"
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "你要傳送的檔案太大了!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "無法連線至 MXit 的 HTTP 伺服器,請檢查伺服器設定。"
+
 msgid "Logging In..."
-msgstr "登入中"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位址。"
-
-#, fuzzy
+msgstr "登入中..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "無法連線至 MXit 伺服器,請檢查伺服器設定。"
+
 msgid "Connecting..."
-msgstr "連線中"
+msgstr "連線中..."
+
+msgid "The nick name you entered is invalid."
+msgstr "你所輸入的網名無效。"
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "你所輸入的密碼過短或過長(長度應為 7 至 10 個數字)。"
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
-
+msgstr "MXit 帳號"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "網名"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "註冊新的 XMPP 帳戶"
-
-#, fuzzy
+msgstr "註冊新的 MXit 帳戶"
+
 msgid "Please fill in the following fields:"
-msgstr "請輸入以下的欄位"
+msgstr "請輸入以下的欄位:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "無法連線 MXit 的 WAP 網站,請稍後重試。"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit 目前無法處理這個要求,請稍後重試。"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "輸入了錯誤的保安碼,請稍後重試。"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "你的工作階段已逾時,請稍後重試。"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "指定的國家是無效的,請重試。"
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "帳號未有註冊,請先註冊。"
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "帳號已註冊,請選擇另一個帳號。"
+
 msgid "Internal error. Please try again later."
-msgstr "暫時無法使用伺服器;請稍後重試"
+msgstr "內部錯誤,請稍後重試"
 
 msgid "You did not enter the security code"
-msgstr ""
-
-# FIXME flagged "有保安功能?" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-#, fuzzy
+msgstr "未有輸入保安碼"
+
 msgid "Security Code"
-msgstr "有保安功能"
-
-# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
+msgstr "保安碼"
+
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "輸入驗證文字"
-
-#, fuzzy
+msgstr "輸入保安碼"
+
 msgid "Your Country"
 msgstr "國家"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "選用語文"
-
-# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
+msgstr "語文"
+
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "必須驗證"
+msgstr "MXit 授權"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit 帳號驗核"
+
 msgid "Retrieving User Information..."
-msgstr "伺服器資訊"
-
-#, fuzzy
+msgstr "讀取使用者資訊中..."
+
+msgid "Loading menu..."
+msgstr "載入清單中..."
+
 msgid "Status Message"
-msgstr "送出訊息"
-
-# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#, fuzzy
+msgstr "狀態訊息"
+
+# NOTE 這是「是否隱藏電話號碼?」之意 - acli 20091127
 msgid "Hidden Number"
-msgstr "英文別名"
-
-#, fuzzy
+msgstr "隱藏電話號碼"
+
 msgid "Your Mobile Number..."
-msgstr "設定流動電話號碼..."
+msgstr "流動電話號碼..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "伺服器"
-
-#, fuzzy
+msgstr "WAP 伺服器"
+
 msgid "Connect via HTTP"
-msgstr "使用 TCP 連線"
+msgstr "使用 HTTP 連線"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "啟用啟動畫面彈出視窗"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "與 MXit 的連線已中斷,請重新連線。"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP 訊息錯誤"
-
-#, fuzzy
+msgstr "送出訊息錯誤"
+
 msgid "Unable to process your request at this time"
-msgstr "無法解析主機名稱"
+msgstr "目前無法處理送出的要求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "等候 MXit 伺服器送出回應已逾時。"
+
 msgid "Successfully Logged In..."
-msgstr "成功加入羣組"
-
-#, fuzzy
+msgstr "成功登入..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s 送來了一個加密的訊息,但這個用戶端目前還沒有解密的支援。"
+
 msgid "Message Error"
-msgstr "XMPP 訊息錯誤"
+msgstr "訊息錯誤"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+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)"
+
+# NOTE 指收到 CP_CMD_CONTACT (received contact update packet),但出現錯誤 (???) - acli 20091128
+# NOTE 似乎是指更新好友狀態/好友清單,但出現錯誤 - acli 20091128
 msgid "Contact Error"
-msgstr "連線錯誤"
-
-#, fuzzy
+msgstr "好友資訊錯誤"
+
 msgid "Message Sending Error"
-msgstr "XMPP 訊息錯誤"
-
-#, fuzzy
+msgstr "送出訊息途中發生錯誤"
+
+# NOTE 似乎是指發出狀態資訊通知,以更新自己的狀態,但出現錯誤 - acli 20091128
 msgid "Status Error"
-msgstr "串流錯誤"
-
-#, fuzzy
+msgstr "更新狀態資訊途中發生錯誤"
+
+# NOTE 似乎是指更新自己的心情,但出現錯誤 - acli 20091128
 msgid "Mood Error"
-msgstr "圖像錯誤"
-
-#, fuzzy
+msgstr "更新心情途中發生錯誤"
+
+# NOTE 似乎是指發出邀請(?),但出現錯誤 - acli 20091128
+# NOTE http://devzone.mxit.com/trac/libpurple/
 msgid "Invitation Error"
-msgstr "移除註冊錯誤"
-
-#, fuzzy
+msgstr "邀請好友途中發生錯誤"
+
 msgid "Contact Removal Error"
-msgstr "連線錯誤"
+msgstr "移除好友途中發生錯誤"
 
 #  NOTE Jabber 術語,見「Both」條
-#, fuzzy
 msgid "Subscription Error"
-msgstr "認證狀態"
-
-#, fuzzy
+msgstr "訂閱狀態資訊途中發生錯誤"
+
+# NOTE 指發出 CP_CMD_UPDATE (Send an update contact packet to the MXit server) 指令後收到錯誤回覆 - acli 20091128
 msgid "Contact Update Error"
-msgstr "連線錯誤"
-
-#, fuzzy
+msgstr "更新好友資訊途中發生錯誤"
+
 msgid "File Transfer Error"
-msgstr "檔案傳輸"
-
-#, fuzzy
+msgstr "檔案傳輸錯誤"
+
 msgid "Cannot create MultiMx room"
-msgstr "無法新增好友狀態捕捉"
-
-#, fuzzy
+msgstr "無法建立 MultiMx 聊天室"
+
+# XXX 好像很怪 - acli 20091127
 msgid "MultiMx Invitation Error"
-msgstr "移除註冊錯誤"
-
-#, fuzzy
+msgstr "MultiMx 邀請錯誤"
+
+# NOTE 指讀取或修改個人資料期間發生錯誤 - acli 20091128
 msgid "Profile Error"
-msgstr "寫入錯誤"
+msgstr "存取個人資料途中發生錯誤"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "從 MXit 收到了無效的封包。"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "(在讀取階段 0x01 時)MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "(在讀取階段 0x02 時)MXit 發生連線錯誤"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "(在讀取階段 0x03 時)MXit 發生連線錯誤"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "(在讀取階段 0x04 時)MXit 發生連線錯誤"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "(在讀取階段 0x05 時)MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "憤怒"
-
-msgid "Excited"
-msgstr "興奮"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "羣組"
-
-msgid "Happy"
-msgstr "開心"
-
-msgid "In Love"
-msgstr "戀愛中"
-
-msgid "Invincible"
-msgstr "無敵"
-
-msgid "Sad"
-msgstr "憂愁"
-
-#, fuzzy
-msgid "Hot"
-msgstr "主機位址(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "網名"
-
-msgid "Sleepy"
-msgstr "想睡"
-
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
+msgstr "(在讀取階段 0x06 時)MXit 發生連線錯誤"
+
 msgid "Pending"
-msgstr "傳送中"
-
-#, fuzzy
+msgstr "等候中"
+
 msgid "Invited"
-msgstr "邀請"
-
-#, fuzzy
+msgstr "已邀請"
+
 msgid "Rejected"
-msgstr "拒絕"
-
-#, fuzzy
+msgstr "已拒絕"
+
 msgid "Deleted"
-msgstr "刪除"
+msgstr "已刪除"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit 廣告"
+
 msgid "More Information"
-msgstr "工作資訊"
+msgstr "更多資訊"
 
 #, c-format
 msgid "No such user: %s"
@@ -6320,7 +6328,7 @@
 msgstr "你現在就要設定嗎?(注意:設定後是無法修改的!)"
 
 msgid "Lost connection with server"
-msgstr "與伺服器之間的連線中斷"
+msgstr "與伺服器之間的連線突然中斷"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -7078,46 +7086,42 @@
 msgstr "在 AOL 時不允許"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "被家長監控限制,無法接收即時訊息"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "未同意使用條款前無法送出短訊"
+
 msgid "Cannot send SMS"
-msgstr "無法傳送檔案"
+msgstr "無法送出短訊"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "無法傳送目錄。"
+msgstr "無法送出短訊至指定的國家"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "無法送出短訊至不明的國家"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "機械人帳號無法啟動即時通訊"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "機械人帳號無法向這個使用者送出即時通訊"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "機械人帳號進行即時通訊的次數已達到了上限"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "機械人帳號進行即時通訊的次數已達到了每日的上限"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "機械人帳號進行即時通訊的次數已達到了每月的上限"
+
 msgid "Unable to receive offline messages"
-msgstr "無法送出訊息。"
-
-#, fuzzy
+msgstr "無法接收離線訊息"
+
 msgid "Offline message store full"
-msgstr "離線訊息"
+msgstr "離線訊息庫已滿"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7303,29 +7307,27 @@
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
-"那麼你的等待時間將會更加的延長。"
+"你的帳號的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試"
+"連線,那麼你的等待時間將會更加的延長。"
 
 #. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
+msgstr "你所使用的用戶端程式太舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"你的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗試連線,"
-"那麼你的等待時間將會更加的延長。"
+"你的IP位址的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗"
+"試連線,那麼你的等待時間將會更加的延長。"
 
 msgid "The SecurID key entered is invalid"
 msgstr "你所輸入的 SecurID 碼無效"
@@ -7459,21 +7461,21 @@
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息 (%s)。"
+msgstr "無法送出訊息:%s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s:"
-
-#, fuzzy, c-format
+msgstr "無法送出訊息至 %s:%s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s:"
+msgstr "無法送出訊息至 %s:%s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7495,20 +7497,18 @@
 msgid "Your AIM connection may be lost."
 msgstr "你的 AIM 可能斷線了。"
 
-#  The conversion failed!
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "(無法顯示來自這個使用者的訊息,因為它包含了無效字符。)"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"你最近做的一個動作無法完成,因為你已經達到發送訊息速率的上限。請等待十秒後再"
-"試一次。"
+"你最近做的一個動作無法完成,因為你已經達到這個動作的速率的上限。請等待十秒後"
+"再試一次。\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10360,7 +10360,7 @@
 msgstr "長期報稱離線"
 
 msgid "Presence"
-msgstr "上線狀態"
+msgstr "現狀"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
 msgid "Appear Offline"
@@ -10380,7 +10380,7 @@
 msgstr "開啟會議室"
 
 msgid "Presence Settings"
-msgstr "上線狀態設定"
+msgstr "現狀設定"
 
 msgid "Start Doodling"
 msgstr "開始 Doodle"
@@ -10402,14 +10402,15 @@
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
+# XXX「obtain」譯文可能有問題 - acli 20091127
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "無法取得電訊網絡,所以無法送出短訊。"
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "未知的電訊網絡,所以無法送出短訊。"
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "正在要求電訊網絡送出短訊。"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10977,6 +10978,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"讓你可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、"
+"Yahoo 等等"
 
 msgid "Internet Messenger"
 msgstr "網絡即時通"
@@ -12300,6 +12303,9 @@
 msgid "Mongolian"
 msgstr "蒙古文"
 
+msgid "Malay"
+msgstr "馬來文"
+
 #  NOTE 譯文不統一,一般似乎偏向音譯,但譯音也不統一
 #  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
@@ -12388,6 +12394,9 @@
 msgid "Turkish"
 msgstr "土耳其文"
 
+msgid "Ukranian"
+msgstr "烏克蘭文"
+
 msgid "Urdu"
 msgstr "烏爾都文"
 
@@ -12451,6 +12460,11 @@
 "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\">其他 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 ""
@@ -13035,7 +13049,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "目錄"
 
 msgid "use DIR for config files"
 msgstr "設定檔所在目錄"
@@ -13056,16 +13070,16 @@
 msgstr "不自動登入"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+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"
+"                      啟動多個帳號時請使用逗號分隔,\n"
+"                      不指定帳號名稱時只會啟動頭一個帳號)"
 
 msgid "X display to use"
 msgstr "使用指定的 X display"
@@ -13321,21 +13335,20 @@
 msgstr "未知的捕捉事件……請匯報這個問題!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(預設)"
+msgstr "(使用者自定)"
+
+# NOTE 這是「none」表情主題的標題(太奇怪了,這是沒有圖示的主題喎)
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "預設的 Pidgin 音效主題"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin 好友清單主題編輯器"
+msgstr "預設的 Pidgin 好友清單主題"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "預設的 Pidgin 狀態圖示主題"
 
 # XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
@@ -13347,19 +13360,29 @@
 msgid "Theme failed to copy."
 msgstr "無法複製表情主題。"
 
-#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
-msgid "Install Theme"
-msgstr "安裝主題檔"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+msgid "Theme Selections"
+msgstr "主題選擇"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "在下面的清單中選取一個你所想喜歡的表情主題。你可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-msgid "Icon"
-msgstr "圖示"
+msgid "Buddy List Theme:"
+msgstr "好友清單主題:"
+
+msgid "Status Icon Theme:"
+msgstr "狀態圖示主題:"
+
+msgid "Sound Theme:"
+msgstr "音效主題:"
+
+msgid "Smiley Theme:"
+msgstr "表情主題:"
 
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑"
@@ -13367,10 +13390,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "好友清單主題"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
@@ -13459,10 +13478,6 @@
 msgid "Font"
 msgstr "字型"
 
-#  XXX 要覆查 - acli 20070614
-msgid "Use document font from _theme"
-msgstr "使用主題指定的文件字型(_T)"
-
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
@@ -13485,16 +13500,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-# #NOTE 和下一個「Enable Account」對應。
-#, fuzzy
 msgid "Disabled"
-msgstr "停用帳號(_D)"
+msgstr "停用"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
@@ -13510,78 +13522,28 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "啟用路由器的自動連接埠轉送(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "自定通訊埠監聽範圍(_M)"
-
-#, fuzzy
+msgstr "自定通訊埠監聽範圍(_M):"
+
 msgid "_Start:"
-msgstr "狀態(_S):"
-
-#, fuzzy
+msgstr "起始(_S):"
+
 msgid "_End:"
-msgstr "展開(_E)"
+msgstr "結束(_E):"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "中繼伺服器 (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "STUN 伺服器(_U):"
-
-#, fuzzy
+msgstr "TURN 伺服器(_U):"
+
 msgid "Use_rname:"
-msgstr "帳號:"
-
-#, fuzzy
+msgstr "帳號(_R):"
+
 msgid "Pass_word:"
-msgstr "密碼:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "代理伺服器及瀏覽器"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>找不到代理伺服器設定程式。</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>找不到瀏覽器設定程式。</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
-
-msgid "Configure _Proxy"
-msgstr "設定代理伺服器(_P)"
-
-msgid "Configure _Browser"
-msgstr "設定瀏覽器(_B)"
-
-msgid "Proxy Server"
-msgstr "代理伺服器"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "代理伺服器型態(_T):"
-
-# NOTE 理由同前,不用「毋須」,改為「不使用」
-msgid "No proxy"
-msgstr "不使用代理伺服器"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "通訊埠(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "帳號:"
+msgstr "密碼(_W):"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13622,6 +13584,15 @@
 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):"
 
@@ -13645,6 +13616,36 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
+msgid "Proxy Server"
+msgstr "代理伺服器"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器設定"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>找不到代理伺服器設定程式。</b>"
+
+msgid "Configure _Proxy"
+msgstr "設定代理伺服器(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "代理伺服器型態(_T):"
+
+# NOTE 理由同前,不用「毋須」,改為「不使用」
+msgid "No proxy"
+msgstr "不使用代理伺服器"
+
+msgid "P_ort:"
+msgstr "通訊埠(_O):"
+
+msgid "User_name:"
+msgstr "帳號(_N):"
+
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
@@ -13728,26 +13729,19 @@
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
+# NOTE 譯文更動 by Ambrose
+msgid "_Minutes before becoming idle:"
+msgstr "閒置多少分鐘更改狀態(_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "閒置時更改狀態為(_I):"
+
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "自動離開"
-
-# NOTE 譯文更動 by Ambrose
-msgid "_Minutes before becoming idle:"
-msgstr "閒置多少分鐘更改狀態(_M):"
-
-msgid "Change status when _idle"
-msgstr "閒置時更改狀態(_I)"
-
-msgid "Change _status to:"
-msgstr "更改狀態為(_S):"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "啟動時狀態"
@@ -13761,15 +13755,15 @@
 msgid "Interface"
 msgstr "介面"
 
-msgid "Smiley Themes"
-msgstr "表情主題"
-
 msgid "Browser"
 msgstr "瀏覽器"
 
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
+msgid "Themes"
+msgstr "主題"
+
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
@@ -14115,10 +14109,6 @@
 msgid "Pidgin smileys"
 msgstr "為 Pidgin 特別設計的表情圖示"
 
-# NOTE 這是「none」表情主題的標題(太奇怪了,這是沒有圖示的主題喎)
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "不使用表情圖示,選擇這個主題即可。"
 
@@ -14789,6 +14779,10 @@
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
+# NOTE 這是指「Conversation History」類文字的字型(?!)設定 - acli 20091127
+msgid "Conversation History"
+msgstr "交談歷史"
+
 #  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
@@ -15260,7 +15254,6 @@
 msgid "_Start %s on Windows startup"
 msgstr "當 Windows 啟動時同時執行 %s (_S)"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "允許同時執行多個進程"
 
@@ -15325,28 +15318,48 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "這張證書聲稱由一所 Pidgin 不認識的根證書機構簽發。"
+#~ 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 "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號,將只會啟動第一個帳號)"
-
 #~ msgid "Calling ... "
 #~ msgstr "撥打中..."
 
--- a/po/zh_TW.po	Fri Nov 20 00:33:23 2009 +0000
+++ b/po/zh_TW.po	Sat Jan 09 02:00:18 2010 +0000
@@ -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.600 2009/09/03 13:49:05 acli Exp $
+# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -22,6 +22,14 @@
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
 # (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
+# Jabber術語 (20091127) presence、subscription 等參閱
+# - http://www.2cm.com.tw/coverstory_content.asp?sn=0701010062
+# - http://nctur.lib.nctu.edu.tw/handle/987654321/3479
+# - http://voiplab.niu.edu.tw/Course98.html (尤其是 http://voiplab.niu.edu.tw/ppt/SIP/05.IMPS.pdf)
+# - presence service 如出現譯「現狀資訊服務」
+# - subscribe to presence 譯「訂閱XXX的狀態資訊」
+# - identifier 譯「辨識碼」
+# - message body 譯「訊息內容」
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
@@ -50,9 +58,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.2\n"
+"Project-Id-Version: Pidgin 2.6.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
+"POT-Creation-Date: 2009-11-29 20:30-0500\n"
 "PO-Revision-Date: 2009-09-03 06:04-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -691,9 +699,8 @@
 msgid "Enable Sounds"
 msgstr "啟動音效"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "無法連結"
+msgstr "連線成功。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
@@ -705,9 +712,8 @@
 msgstr[0] "使用者列表(%d個使用者):\n"
 msgstr[1] "使用者列表(%d個使用者):\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "支援的除錯選項有:version"
+msgstr "支援的除錯選項有:plugins version"
 
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
@@ -1598,10 +1604,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "上列網址的 TinyURL:%s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "TinyURL 正在取得縮短的網址中,請稍候..."
 
 # XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for URLs of this length or greater"
@@ -1625,6 +1631,7 @@
 msgid "Online"
 msgstr "上線"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1743,7 +1750,7 @@
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "無法信賴這張憑證,因為目前沒有可信賴的憑證可以驗證這張憑證。"
 
 msgid "The certificate is not valid yet."
 msgstr "這張憑證尚未生效。"
@@ -1979,9 +1986,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "解析程序已結束,但未有回覆我方發出的請求"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "解析 %s 途中發生了錯誤:%d"
+msgstr "將 %s 轉換成 punycode 途中發生了錯誤:%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2284,17 +2291,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "發生了一個嚴重的 Farsight2 錯誤。"
 
-#, fuzzy
 msgid "Conference error"
-msgstr "會議室錯誤。"
-
-#, fuzzy
+msgstr "會議室錯誤"
+
 msgid "Error with your microphone"
-msgstr "您的麥克風出現錯誤。"
-
-#, fuzzy
+msgstr "您的麥克風出現錯誤"
+
 msgid "Error with your webcam"
-msgstr "您的 webcam 出現錯誤。"
+msgstr "您的 webcam 出現錯誤"
 
 # FIXME 譯文有待改進 - acli 20090902
 #, c-format
@@ -2833,12 +2837,15 @@
 msgid "Enforce that passwords are used only once."
 msgstr "強制密碼只用一次"
 
+# XXX 譯文不太通順 - acli 20091128
 #. *  description
 msgid ""
 "Allows you to enforce on a per-account basis that passwords not being saved "
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"針對個別不記住密碼的帳號,讓您強制成功登入後不會再使用同一個密碼。注意:使用"
+"這個功能,帳號必須停用「記住密碼」選項"
 
 #. *< type
 #. *< ui_requirement
@@ -3254,10 +3261,12 @@
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
+#. 0
 #. Global
 msgid "Available"
 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
@@ -4058,13 +4067,13 @@
 msgstr "%s 將不再可以檢視您的狀態更新。您要繼續這個動作嗎?"
 
 msgid "Cancel Presence Notification"
-msgstr "取消上線狀態通知"
+msgstr "取消發出狀態資訊通知(移除自己)"
 
 msgid "Un-hide From"
-msgstr "現身給"
+msgstr "現身給此好友"
 
 msgid "Temporarily Hide From"
-msgstr "暫時隱身於"
+msgstr "暫時隱身於此好友"
 
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
@@ -4074,7 +4083,7 @@
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
-msgstr "從好友名單中移除"
+msgstr "取消訂閱狀態資訊(移除好友)"
 
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
@@ -4085,12 +4094,14 @@
 msgid "Log Out"
 msgstr "登出"
 
+#. 2
 msgid "Chatty"
 msgstr "想聊天"
 
 msgid "Extended Away"
 msgstr "長時間離開"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -4352,33 +4363,32 @@
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
 msgid "Both"
-msgstr "已互相認證"
+msgstr "訂閱及發出狀態資訊通知(已互相認證)"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "From (To pending)"
-msgstr "已認證對方(但仍等待對方認證您)"
-
-# FIXME 原文一詞兩義,根本無法翻譯
-#  NOTE gntnotify 字義為「發信人」
+msgstr "訂閱對方狀態資訊,未認證發出狀態資訊通知"
+
 #  NOTE Jabber 術語字義見「Both」條
 msgid "From"
-msgstr "已認證對方"
+msgstr "訂閱對方狀態資訊"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "To"
-msgstr "已獲對方認證"
+msgstr "發出狀態資訊通知"
 
 #  NOTE Jabber 術語,見「Both」條
 msgid "None (To pending)"
-msgstr "無(但正等待對方認證您)"
-
+msgstr "無,等待認證發出狀態資訊通知"
+
+#. 0
 msgid "None"
 msgstr "無"
 
 #  NOTE Jabber 術語,見「Both」條
 #. subscription type
 msgid "Subscription"
-msgstr "認證狀態"
+msgstr "狀態資訊訂閱"
 
 # XXX 要覆查 - acli 20070914
 msgid "Mood Text"
@@ -4518,7 +4528,7 @@
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 msgid "Subscription Required"
-msgstr "必須認證"
+msgstr "必須訂閱狀態資訊"
 
 msgid "Unexpected Request"
 msgstr "未預期的要求"
@@ -4721,11 +4731,9 @@
 msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
-#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+msgstr "無法與 %s 進行媒體通話,因為未有訂閱對方的狀態資訊"
 
 msgid "Media Initiation Failed"
 msgstr "媒體通話啟動失敗"
@@ -4750,9 +4758,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [聊天室]:離開聊天室。"
+msgstr "part [訊息]:離開聊天室。"
 
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
@@ -4876,7 +4883,7 @@
 msgstr "XML 分析錯誤"
 
 msgid "Unknown Error in presence"
-msgstr "不明的上線狀態錯誤"
+msgstr "不明的狀態資訊錯誤"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4937,11 +4944,9 @@
 msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
-#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
-#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
+msgstr "無法傳送檔案至 %s,因為未有訂閱對方的狀態資訊"
 
 #  FIXME 這不通順 - acli 20070614
 #, c-format
@@ -5433,7 +5438,7 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5662,9 +5667,8 @@
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "無法新增使用者"
+msgstr "無法移除使用者"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "因為行動訊息過長,所以無法送出:"
@@ -5907,28 +5911,84 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將您從他(她)的好友清單中移除。"
 
+#. 1
+msgid "Angry"
+msgstr "憤怒"
+
+#. 2
+msgid "Excited"
+msgstr "興奮"
+
+# XXX 譯文有待改進 - 20091126 acli
+#. 3
+msgid "Grumpy"
+msgstr "暴躁"
+
+#. 4
+msgid "Happy"
+msgstr "開心"
+
+#. 5
+msgid "In Love"
+msgstr "戀愛中"
+
+#. 6
+msgid "Invincible"
+msgstr "無敵"
+
+#. 7
+msgid "Sad"
+msgstr "憂愁"
+
+# XXX 原文瞹眛,譯文可能有錯 =P  - acli 20091127
+#. 8
+msgid "Hot"
+msgstr "火熱"
+
+#. 9
+msgid "Sick"
+msgstr "生病"
+
+#. 10
+msgid "Sleepy"
+msgstr "想睡"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "您目前的心情"
+msgstr "目前的心情"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "使用者情緒"
-
-#, fuzzy
+msgstr "新心情"
+
 msgid "Change your Mood"
-msgstr "修改密碼"
-
-#, fuzzy
+msgstr "修改心情"
+
 msgid "How do you feel right now?"
-msgstr "我現在不在位子上"
+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
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "寫入錯誤"
+msgstr "更新個人資料途中發生錯誤"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5936,359 +5996,307 @@
 msgstr "個人資料"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "未能讀取您的個人資料,請稍後重試。"
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "帳號"
+msgstr "密碼"
 
 msgid "Verify PIN"
-msgstr ""
-
+msgstr "確認密碼"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "姓"
+msgstr "暱稱"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "隱藏電話號碼"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "行動電話號碼"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "使用者資料"
+msgstr "更新個人資料"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "您可以在這裏更新您在 MXit 的個人資料"
 
 msgid "View Splash"
-msgstr ""
+msgstr "檢視啟動畫面"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "目前沒有可用的啟動畫面"
+
 msgid "About"
-msgstr "關於我"
+msgstr "關於此模組"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "修改密碼..."
+msgstr "修改心情..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "修改密碼..."
+msgstr "修改個人資料..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "觀看日誌..."
-
+msgstr "檢視啟動畫面..."
+
+# XXX 這隨時會變成不對... - acli 20091127
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "關於我"
+msgstr "關於此模組..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "這個訊息太大了。"
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "您要傳送的檔案太大了!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "無法連線至 MXit 的 HTTP 伺服器,請檢查伺服器設定。"
+
 msgid "Logging In..."
-msgstr "登入中"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
-
-#, fuzzy
+msgstr "登入中..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "無法連線至 MXit 伺服器,請檢查伺服器設定。"
+
 msgid "Connecting..."
-msgstr "連線中"
+msgstr "連線中..."
+
+msgid "The nick name you entered is invalid."
+msgstr "您所輸入的暱稱無效。"
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "您所輸入的密碼過短或過長(長度應為 7 至 10 個數字)。"
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
-
+msgstr "MXit 帳號"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "暱稱"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "註冊新的 XMPP 帳戶"
-
-#, fuzzy
+msgstr "註冊新的 MXit 帳戶"
+
 msgid "Please fill in the following fields:"
-msgstr "請輸入以下的欄位"
+msgstr "請輸入以下的欄位:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "無法連線 MXit 的 WAP 網站,請稍後重試。"
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit 目前無法處理這個要求,請稍後重試。"
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "輸入了錯誤的保安碼,請稍後重試。"
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "您的工作階段已逾時,請稍後重試。"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "指定的國家是無效的,請重試。"
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "帳號未有註冊,請先註冊。"
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "帳號已註冊,請選擇另一個帳號。"
+
 msgid "Internal error. Please try again later."
-msgstr "暫時無法使用伺服器;請稍後重試"
+msgstr "內部錯誤,請稍後重試"
 
 msgid "You did not enter the security code"
-msgstr ""
-
-# FIXME flagged "有保安功能?" by c9s (http://developer.pidgin.im/ticket/7917), need to verify - 20090226 acli
-#, fuzzy
+msgstr "未有輸入保安碼"
+
 msgid "Security Code"
-msgstr "有保安功能"
-
-# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
+msgstr "保安碼"
+
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "輸入驗證文字"
-
-#, fuzzy
+msgstr "輸入保安碼"
+
 msgid "Your Country"
 msgstr "國家"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "選用語文"
-
-# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
+msgstr "語文"
+
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "必須驗證"
+msgstr "MXit 授權"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit 帳號驗核"
+
 msgid "Retrieving User Information..."
-msgstr "伺服器資訊"
-
-#, fuzzy
+msgstr "讀取使用者資訊中..."
+
+msgid "Loading menu..."
+msgstr "載入清單中..."
+
 msgid "Status Message"
-msgstr "送出訊息"
-
-# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#, fuzzy
+msgstr "狀態訊息"
+
+# NOTE 這是「是否隱藏電話號碼?」之意 - acli 20091127
 msgid "Hidden Number"
-msgstr "英文別名"
-
-#, fuzzy
+msgstr "隱藏電話號碼"
+
 msgid "Your Mobile Number..."
-msgstr "設定行動電話號碼..."
+msgstr "行動電話號碼..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "伺服器"
-
-#, fuzzy
+msgstr "WAP 伺服器"
+
 msgid "Connect via HTTP"
-msgstr "使用 TCP 連線"
+msgstr "使用 HTTP 連線"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "啟用啟動畫面彈出視窗"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "與 MXit 的連線已中斷,請重新連線。"
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP 訊息錯誤"
-
-#, fuzzy
+msgstr "送出訊息錯誤"
+
 msgid "Unable to process your request at this time"
-msgstr "無法解析主機名稱"
+msgstr "目前無法處理送出的要求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "等候 MXit 伺服器送出回應已逾時。"
+
 msgid "Successfully Logged In..."
-msgstr "成功加入群組"
-
-#, fuzzy
+msgstr "成功登入..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s 送來了一個加密的訊息,但這個用戶端目前還沒有解密的支援。"
+
 msgid "Message Error"
-msgstr "XMPP 訊息錯誤"
+msgstr "訊息錯誤"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+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)"
+
+# NOTE 指收到 CP_CMD_CONTACT (received contact update packet),但出現錯誤 (???) - acli 20091128
+# NOTE 似乎是指更新好友狀態/好友清單,但出現錯誤 - acli 20091128
 msgid "Contact Error"
-msgstr "連線錯誤"
-
-#, fuzzy
+msgstr "好友資訊錯誤"
+
 msgid "Message Sending Error"
-msgstr "XMPP 訊息錯誤"
-
-#, fuzzy
+msgstr "送出訊息途中發生錯誤"
+
+# NOTE 似乎是指發出狀態資訊通知,以更新自己的狀態,但出現錯誤 - acli 20091128
 msgid "Status Error"
-msgstr "串流錯誤"
-
-#, fuzzy
+msgstr "更新狀態資訊途中發生錯誤"
+
+# NOTE 似乎是指更新自己的心情,但出現錯誤 - acli 20091128
 msgid "Mood Error"
-msgstr "圖像錯誤"
-
-#, fuzzy
+msgstr "更新心情途中發生錯誤"
+
+# NOTE 似乎是指發出邀請(?),但出現錯誤 - acli 20091128
+# NOTE http://devzone.mxit.com/trac/libpurple/
 msgid "Invitation Error"
-msgstr "移除註冊錯誤"
-
-#, fuzzy
+msgstr "邀請好友途中發生錯誤"
+
 msgid "Contact Removal Error"
-msgstr "連線錯誤"
+msgstr "移除好友途中發生錯誤"
 
 #  NOTE Jabber 術語,見「Both」條
-#, fuzzy
 msgid "Subscription Error"
-msgstr "認證狀態"
-
-#, fuzzy
+msgstr "訂閱狀態資訊途中發生錯誤"
+
+# NOTE 指發出 CP_CMD_UPDATE (Send an update contact packet to the MXit server) 指令後收到錯誤回覆 - acli 20091128
 msgid "Contact Update Error"
-msgstr "連線錯誤"
-
-#, fuzzy
+msgstr "更新好友資訊途中發生錯誤"
+
 msgid "File Transfer Error"
-msgstr "檔案傳輸"
-
-#, fuzzy
+msgstr "檔案傳輸錯誤"
+
 msgid "Cannot create MultiMx room"
-msgstr "無法新增好友狀態捕捉"
-
-#, fuzzy
+msgstr "無法建立 MultiMx 聊天室"
+
+# XXX 好像很怪 - acli 20091127
 msgid "MultiMx Invitation Error"
-msgstr "移除註冊錯誤"
-
-#, fuzzy
+msgstr "MultiMx 邀請錯誤"
+
+# NOTE 指讀取或修改個人資料期間發生錯誤 - acli 20091128
 msgid "Profile Error"
-msgstr "寫入錯誤"
+msgstr "存取個人資料途中發生錯誤"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "從 MXit 收到了無效的封包。"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "(在讀取階段 0x01 時)MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "(在讀取階段 0x02 時)MXit 發生連線錯誤"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "(在讀取階段 0x03 時)MXit 發生連線錯誤"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "(在讀取階段 0x04 時)MXit 發生連線錯誤"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "(在讀取階段 0x05 時)MXit 發生連線錯誤"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "憤怒"
-
-msgid "Excited"
-msgstr "興奮"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "群組"
-
-msgid "Happy"
-msgstr "開心"
-
-msgid "In Love"
-msgstr "戀愛中"
-
-msgid "Invincible"
-msgstr "無敵"
-
-msgid "Sad"
-msgstr "憂愁"
-
-#, fuzzy
-msgid "Hot"
-msgstr "主機位址(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "暱稱"
-
-msgid "Sleepy"
-msgstr "想睡"
-
-# NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
-#, fuzzy
+msgstr "(在讀取階段 0x06 時)MXit 發生連線錯誤"
+
 msgid "Pending"
-msgstr "傳送中"
-
-#, fuzzy
+msgstr "等候中"
+
 msgid "Invited"
-msgstr "邀請"
-
-#, fuzzy
+msgstr "已邀請"
+
 msgid "Rejected"
-msgstr "拒絕"
-
-#, fuzzy
+msgstr "已拒絕"
+
 msgid "Deleted"
-msgstr "刪除"
+msgstr "已刪除"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit 廣告"
+
 msgid "More Information"
-msgstr "工作資訊"
+msgstr "更多資訊"
 
 #, c-format
 msgid "No such user: %s"
@@ -6318,7 +6326,7 @@
 msgstr "您現在就要設定嗎?(注意:設定後是無法修改的!)"
 
 msgid "Lost connection with server"
-msgstr "與伺服器之間的連線中斷"
+msgstr "與伺服器之間的連線突然中斷"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -7076,46 +7084,42 @@
 msgstr "在 AOL 時不允許"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "被家長監控限制,無法接收即時訊息"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "未同意使用條款前無法送出短訊"
+
 msgid "Cannot send SMS"
-msgstr "無法傳送檔案"
+msgstr "無法送出短訊"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "無法傳送目錄。"
+msgstr "無法送出短訊至指定的國家"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "無法送出短訊至不明的國家"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "機器人帳號無法啟動即時通訊"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "機器人帳號無法向這個使用者送出即時通訊"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "機器人帳號進行即時通訊的次數已達到了上限"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "機器人帳號進行即時通訊的次數已達到了每日的上限"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "機器人帳號進行即時通訊的次數已達到了每月的上限"
+
 msgid "Unable to receive offline messages"
-msgstr "無法送出訊息。"
-
-#, fuzzy
+msgstr "無法接收離線訊息"
+
 msgid "Offline message store full"
-msgstr "離線訊息"
+msgstr "離線訊息庫已滿"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7301,14 +7305,13 @@
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線,那麼您的等待時間將會更加的延長。"
+"您的帳號的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試"
+"著連線,那麼您的等待時間將會更加的延長。"
 
 #. client too old
 #, c-format
@@ -7316,14 +7319,13 @@
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果您依然繼續嘗試著連"
-"線,那麼您的等待時間將會更加的延長。"
+"您的IP位址的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果您依然繼續嘗"
+"試著連線,那麼您的等待時間將會更加的延長。"
 
 msgid "The SecurID key entered is invalid"
 msgstr "您所輸入的 SecurID 碼無效"
@@ -7457,21 +7459,21 @@
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息 (%s)。"
+msgstr "無法送出訊息:%s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s:"
-
-#, fuzzy, c-format
+msgstr "無法送出訊息至 %s:%s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s:"
+msgstr "無法送出訊息至 %s:%s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7493,20 +7495,18 @@
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#  The conversion failed!
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "(無法顯示來自這個使用者的訊息,因為它包含了無效字元。)"
 
-#, fuzzy
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again.\n"
 msgstr ""
-"您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
-"試一次。"
+"您最近做的一個動作無法完成,因為您已經達到這個動作的速率的上限。請等待十秒後"
+"再試一次。\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -10354,7 +10354,7 @@
 msgstr "長期報稱離線"
 
 msgid "Presence"
-msgstr "上線狀態"
+msgstr "現狀"
 
 # NOTE 下次登入時不報稱離線,所以加「暫時」字眼
 msgid "Appear Offline"
@@ -10374,7 +10374,7 @@
 msgstr "開啟會議室"
 
 msgid "Presence Settings"
-msgstr "上線狀態設定"
+msgstr "現狀設定"
 
 msgid "Start Doodling"
 msgstr "開始 Doodle"
@@ -10396,14 +10396,15 @@
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
+# XXX「obtain」譯文可能有問題 - acli 20091127
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "無法取得電訊網絡,所以無法送出短訊。"
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "未知的電訊網絡,所以無法送出短訊。"
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "正在要求電訊網絡送出短訊。"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10971,6 +10972,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"讓您可以透過即時通訊與好友聊天,支援 AIM、Google Talk、Jabber/XMPP、MSN、"
+"Yahoo 等等"
 
 msgid "Internet Messenger"
 msgstr "網路即時通"
@@ -12294,6 +12297,9 @@
 msgid "Mongolian"
 msgstr "蒙古文"
 
+msgid "Malay"
+msgstr "馬來文"
+
 #  NOTE 譯文不統一,一般似乎偏向音譯,但譯音也不統一
 #  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
@@ -12382,6 +12388,9 @@
 msgid "Turkish"
 msgstr "土耳其文"
 
+msgid "Ukranian"
+msgstr "烏克蘭文"
+
 msgid "Urdu"
 msgstr "烏爾都文"
 
@@ -12445,6 +12454,11 @@
 "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\">其他 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 ""
@@ -13029,7 +13043,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "目錄"
 
 msgid "use DIR for config files"
 msgstr "設定檔所在目錄"
@@ -13050,16 +13064,16 @@
 msgstr "不自動登入"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+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"
+"                      啟動多個帳號時請使用逗號分隔,\n"
+"                      不指定帳號名稱時只會啟動頭一個帳號)"
 
 msgid "X display to use"
 msgstr "使用指定的 X display"
@@ -13315,21 +13329,20 @@
 msgstr "未知的捕捉事件……請回報這個問題!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(預設)"
+msgstr "(使用者自定)"
+
+# NOTE 這是「none」表情主題的標題(太奇怪了,這是沒有圖示的主題喎)
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "預設的 Pidgin 音效主題"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin 好友清單主題編輯器"
+msgstr "預設的 Pidgin 好友清單主題"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "預設的 Pidgin 狀態圖示主題"
 
 # XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
@@ -13341,19 +13354,29 @@
 msgid "Theme failed to copy."
 msgstr "無法複製表情主題。"
 
-#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
-msgid "Install Theme"
-msgstr "安裝主題檔"
-
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+msgid "Theme Selections"
+msgstr "主題選擇"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-msgid "Icon"
-msgstr "圖示"
+msgid "Buddy List Theme:"
+msgstr "好友清單主題:"
+
+msgid "Status Icon Theme:"
+msgstr "狀態圖示主題:"
+
+msgid "Sound Theme:"
+msgstr "音效主題:"
+
+msgid "Smiley Theme:"
+msgstr "表情主題:"
 
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑"
@@ -13361,10 +13384,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "好友清單主題"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
@@ -13453,10 +13472,6 @@
 msgid "Font"
 msgstr "字型"
 
-#  XXX 要覆查 - acli 20070614
-msgid "Use document font from _theme"
-msgstr "使用主題指定的文件字型(_T)"
-
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
@@ -13479,16 +13494,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-# #NOTE 和下一個「Enable Account」對應。
-#, fuzzy
 msgid "Disabled"
-msgstr "停用帳號(_D)"
+msgstr "停用"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
@@ -13504,78 +13516,28 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "啟用路由器的自動連接埠轉送(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "自定通訊埠監聽範圍(_M)"
-
-#, fuzzy
+msgstr "自定通訊埠監聽範圍(_M):"
+
 msgid "_Start:"
-msgstr "狀態(_S):"
-
-#, fuzzy
+msgstr "起始(_S):"
+
 msgid "_End:"
-msgstr "展開(_E)"
+msgstr "結束(_E):"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "中繼伺服器 (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "STUN 伺服器(_U):"
-
-#, fuzzy
+msgstr "TURN 伺服器(_U):"
+
 msgid "Use_rname:"
-msgstr "帳號:"
-
-#, fuzzy
+msgstr "帳號(_R):"
+
 msgid "Pass_word:"
-msgstr "密碼:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "代理伺服器及瀏覽器"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>找不到代理伺服器設定程式。</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>找不到瀏覽器設定程式。</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
-
-msgid "Configure _Proxy"
-msgstr "設定代理伺服器(_P)"
-
-msgid "Configure _Browser"
-msgstr "設定瀏覽器(_B)"
-
-msgid "Proxy Server"
-msgstr "代理伺服器"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "代理伺服器型態(_T):"
-
-# NOTE 理由同前,不用「毋須」,改為「不使用」
-msgid "No proxy"
-msgstr "不使用代理伺服器"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "通訊埠(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "帳號:"
+msgstr "密碼(_W):"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13616,6 +13578,15 @@
 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):"
 
@@ -13639,6 +13610,36 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
+msgid "Proxy Server"
+msgstr "代理伺服器"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器設定"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>找不到代理伺服器設定程式。</b>"
+
+msgid "Configure _Proxy"
+msgstr "設定代理伺服器(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "使用 SOCKS4 代理伺服器時使用遠端 DNS (_D)"
+
+msgid "Proxy t_ype:"
+msgstr "代理伺服器型態(_T):"
+
+# NOTE 理由同前,不用「毋須」,改為「不使用」
+msgid "No proxy"
+msgstr "不使用代理伺服器"
+
+msgid "P_ort:"
+msgstr "通訊埠(_O):"
+
+msgid "User_name:"
+msgstr "帳號(_N):"
+
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
@@ -13722,26 +13723,19 @@
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
+# NOTE 譯文更動 by Ambrose
+msgid "_Minutes before becoming idle:"
+msgstr "閒置多少分鐘更改狀態(_M):"
+
+msgid "Change to this status when _idle:"
+msgstr "閒置時更改狀態為(_I):"
+
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "自動離開"
-
-# NOTE 譯文更動 by Ambrose
-msgid "_Minutes before becoming idle:"
-msgstr "閒置多少分鐘更改狀態(_M):"
-
-msgid "Change status when _idle"
-msgstr "閒置時更改狀態(_I)"
-
-msgid "Change _status to:"
-msgstr "更改狀態為(_S):"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "啟動時狀態"
@@ -13755,15 +13749,15 @@
 msgid "Interface"
 msgstr "介面"
 
-msgid "Smiley Themes"
-msgstr "表情主題"
-
 msgid "Browser"
 msgstr "瀏覽器"
 
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
+msgid "Themes"
+msgstr "主題"
+
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
@@ -14109,10 +14103,6 @@
 msgid "Pidgin smileys"
 msgstr "為 Pidgin 特別設計的表情圖示"
 
-# NOTE 這是「none」表情主題的標題(太奇怪了,這是沒有圖示的主題喎)
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "不使用表情圖示,選擇這個主題即可。"
 
@@ -14783,6 +14773,10 @@
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
+# NOTE 這是指「Conversation History」類文字的字型(?!)設定 - acli 20091127
+msgid "Conversation History"
+msgstr "交談歷史"
+
 #  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
@@ -15254,7 +15248,6 @@
 msgid "_Start %s on Windows startup"
 msgstr "當 Windows 啟動時同時執行 %s (_S)"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "允許同時執行多個進程"
 
@@ -15319,28 +15312,48 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
+#~ 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 "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號,將只會啟動第一個帳號)"
-
 #~ msgid "Calling ... "
 #~ msgstr "撥打中..."