changeset 28307:dfd8d82313be 2.6.0_jp

merged with im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Wed, 19 Aug 2009 03:57:54 +0900
parents 63d8b9b93cba (current diff) d4036e0f58d6 (diff)
children f419bf1e5851
files configure.ac pidgin/gtkblist.c pidgin/gtkutils.c
diffstat 20 files changed, 1042 insertions(+), 1266 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Aug 18 16:04:22 2009 +0900
+++ b/ChangeLog	Wed Aug 19 03:57:54 2009 +0900
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 	* Theme support in libpurple thanks to Justin Rodriguez's summer of code
 	  project, with some minor additions and cleanups from Paul Aurich.
@@ -13,10 +13,32 @@
 	* Various memory cleanups when unloading libpurple. (Nick Hebner and
 	  Stefan Becker)
 	* Report idle time 'From last message sent' should work properly.
+	* Better handling of corrupt certificates in the TLS Peers cache.
+	* More efficient buddy list and conversation search functions.
+	  (Jan Kaluza and Aman Gupta)
+	* Install scalable versions of the main Pidgin icon, the protocol icons,
+	  the dialog icons, and the Buddy List emblems.
+	* Build properly on Hurd.  (Marc Dequènes)
+	* Various memory leaks fixed as reported by Josh Mueller.
+	* Properly handle an IRC buddy appearing in multiple groups.
+	* Escape HTML entities in usernames when written with the HTML logger.
+	* Do not display MySpace status changes as incoming IMs.  (Mark Doliner and
+	  Justin Williams)
+
+	DNS:
 	* DNS servers are re-read when DNS queries fail in case the system has
 	  moved to a new network and the old servers are not accessible.
 	* DNS SRV records with equal priority are sorted with respect to their
 	  weight as specified in RFC 2782.  (Vijay Raghunathan)
+	* Don't do IPv6 address lookups if the computer does not have an IPv6
+	  address configured.
+	* Fix a leak when the UI provides its own DNS resolving UI op.
+	  (Aman Gupta)
+	* Don't fork a DNS resolver process to resolve IP addresses.  (Aman Gupta)
+	* Internationalized Domain Names are supported when libpurple is compiled
+	  against the GNU IDN library.
+
+	Environment Variables:
 	* GnuTLS logging (disabled by default) can be controlled through the
 	  PURPLE_GNUTLS_DEBUG environment variable, which is an integer between
 	  0 and 9 (higher is more verbose). Higher values may reveal sensitive
@@ -31,24 +53,6 @@
 	  useful when running libpurple inside of Valgrind or similar programs.
 	  Currently, it keeps plugins in memory, allowing Valgrind to perform
 	  symbol resolution of leak traces at shutdown.
-	* Don't do IPv6 address lookups if the computer does not have an IPv6
-	  address configured.
-	* Fix a leak when the UI provides its own DNS resolving UI op.
-	  (Aman Gupta)
-	* Don't fork a DNS resolver process to resolve IP addresses.  (Aman Gupta)
-	* Better handling of corrupt certificates in the TLS Peers cache.
-	* More efficient buddy list and conversation search functions.
-	  (Jan Kaluza and Aman Gupta)
-	* Internationalized Domain Names are supported when libpurple is compiled
-	  against the GNU IDN library.
-	* Install scalable versions of the main Pidgin icon, the protocol icons,
-	  the dialog icons, and the Buddy List emblems.
-	* Build properly on Hurd.  (Marc Dequènes)
-	* Various memory leaks fixed as reported by Josh Mueller.
-	* Properly handle an IRC buddy appearing in multiple groups.
-	* Escape HTML entities in usernames when written with the HTML logger.
-	* Do not display MySpace status changes as incoming IMs.  (Mark Doliner and
-	  Justin Williams)
 
 	AIM and ICQ:
 	* Preliminary support for a new authentication scheme called
@@ -67,6 +71,17 @@
 	* Support connection progress steps in Gadu-Gadu.  (Krzysztof "kkszysiu"
 	  Klinikowski)
 
+	MSN:
+	* Add support for receiving handwritten (ink) messages on MSN.  (Chris
+	  Stafford, Gal Topper, and Elliott Sales de Andrade)
+	* Add support for receiving audio clips on MSN.  (Chris Stafford, Gal
+	  Topper, and Elliott Sales de Andrade)
+	* Show the invite message for buddies that requested authorization
+	  from you on MSN.
+	* Support sending an invite message to buddies when requesting authorization
+	  from them on MSN.
+	* Timeout switchboard connections aggressively (60 seconds).
+
 	XMPP:
 	* Voice & Video support with Jingle (XEP-0166, 0167, 0176, & 0177), voice
 	  support with GTalk and voice and video support with the GMail web
@@ -136,17 +151,6 @@
 	* Ability to set personal details for an account and for buddies in the
 	  buddylist.
 
-	MSN:
-	* Add support for receiving handwritten (ink) messages on MSN.  (Chris
-	  Stafford, Gal Topper, and Elliott Sales de Andrade)
-	* Add support for receiving audio clips on MSN.  (Chris Stafford, Gal
-	  Topper, and Elliott Sales de Andrade)
-	* Show the invite message for buddies that requested authorization
-	  from you on MSN.
-	* Support sending an invite message to buddies when requesting authorization
-	  from them on MSN.
-	* Timeout switchboard connections aggressively.
-
 	Pidgin:
 	* Added -f command line option to tell Pidgin to ignore NetworkManager
 	  and assume it has a valid network connection.
@@ -204,6 +208,11 @@
 	* Preferences have been reorganized into three tabs for Colors, Fonts, and
 	  Miscellaneous categories.
 
+version 2.5.9 (08/18/2009):
+	* Fix a crash via a specially crafted MSN message (CVE-2009-2694).
+	* Fix a crash in Bonjour, MSN, and XMPP when trying to transfer files with
+	  NULL names.
+
 version 2.5.8 (06/27/2009):
 	ICQ:
 	* Fix misparsing a web message as an SMS message. (Yuriy Kaminskiy)
--- a/ChangeLog.API	Tue Aug 18 16:04:22 2009 +0900
+++ b/ChangeLog.API	Wed Aug 19 03:57:54 2009 +0900
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	libpurple:
 		Added:
 		* PurpleMedia and PurpleMediaManager API
@@ -154,6 +154,9 @@
 		* GntProgressBar and functions (Saleem Abdulrasool)
 
 	perl:
+		Added:
+		* Purple::XMLNode::get_name()
+
 		Changed:
 		* Made a bunch of functions act more perl-like. Call the new()
 		  functions as Class->new(...) instead of Class::new(...):
@@ -167,6 +170,14 @@
 			* Purple::Request::Field::list_new
 			* Purple::Request::Field::string_new
 			* Purple::Request::Field::group_new
+		* Make the XMLNode API more perl-like. Don't pass len
+		  parameters and call them like:
+			* $xmlnode->copy()
+			* $xmlnode->to_str()
+			* $xmlnode->to_formatted_str()
+			* Purple::XMLNode::from_str(...)
+version 2.5.9 (08/18/2009):
+	No changes
 
 version 2.5.8 (06/27/2009):
 	No changes
--- a/ChangeLog.win32	Tue Aug 18 16:04:22 2009 +0900
+++ b/ChangeLog.win32	Wed Aug 19 03:57:54 2009 +0900
@@ -1,6 +1,9 @@
-version 2.6.0 (??/??/2009):
+version 2.6.0 (08/18/2009):
 	* Added XMPP URI support.
 
+version 2.5.9 (08/18/2009):
+	* No changes and no win32 packages built.
+
 version 2.5.8 (06/27/2009):
 	* No changes
 
--- a/NEWS	Tue Aug 18 16:04:22 2009 +0900
+++ b/NEWS	Wed Aug 19 03:57:54 2009 +0900
@@ -2,13 +2,24 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
-2.6.0 (08/??/2009):
-	Marcus: This is my first news!  It's been quite a few microreleases this
-	time, but now we're finally at 2.6.0.  I suppose the most anticipated
+2.6.0 (08/18/2009):
+	John:  Wow, four straight releases that I'm the first to NEWS on.  This
+	is getting kinda scary!  I'm beginning to wonder who else actually does
+	anything around here!  (Just kidding, of course.)  LOTS of new features
+	and a crapton of bugfixes this release.  There should pretty much be
+	something for everybody.  A great example of this is the ton of Yahoo
+	changes that have happened thanks to our SoC student from 2008, Sulabh
+	Mahajan.  Among his massive improvements are the ability to add MSN
+	buddies by adding them as "msn/user@domain.tld" and peer-to-peer file
+	transfers.  Of course, history shows we can't please everyine, so I'm
+	sure I'll see a complaint or five thousand in trac.  Enjoy, though!
+
+	Marcus: This is my first news! It's been quite a few microreleases this
+	time, but now we're finally at 2.6.0. I suppose the most anticipated
 	new feature in this release is the voice and video support, thanks to
-	Mike's heroic work.  I've managed to slip in a few features too, like
+	Mike's heroic work. I've managed to slip in a few features too, like
 	in-band bytestream file transfers as a fallback on XMPP and idle time
-	reporting on XMPP.  Enjoy!
+	reporting on XMPP. Enjoy!
 
 	Paul: This is my first news, too!  This release has definitely been a
 	long time coming; hopefully it won't disappoint since we've closed over
@@ -18,9 +29,9 @@
 	Browser.  Also, thanks to Bernmeister for poking (at least) several
 	hundred old tickets!
 
-	Mike: Ditto.  This is my first news as well.  I have a feeling this is
+	Mike: Ditto. This is my first news as well. I have a feeling this is
 	getting repetitive at this point, but voice and video support is
-	finally here!  Thanks to the rest of the Pidgin team, Farsight 2, and
+	finally here! Thanks to the rest of the Pidgin team, Farsight 2, and
 	GStreamer developers for making this possible! (I finally finished my
 	Summer of Code project :D)
 
@@ -32,6 +43,10 @@
 	who wrote the original patch.  And finally, MSN no longer has over a
 	100 tickets open!
 
+2.5.9 (08/18/2009):
+	John:  This release is just a crash fix release to address a security
+	issue reported to us by CORE and a couple crashes Elliott found.
+
 2.5.8 (06/27/2009):
 	John:  This release is another somewhat rushed bugfix release to fix
 	a number of bugs that have come up since we released Pidgin 2.5.7.
@@ -45,12 +60,12 @@
 	people have been having.
 
 2.5.6 (05/19/2009):
-	Ka-Hing: Many much bugfixes.  Hooray.  (Paul told me to say that)
-	Oh, no one has met Paul yet?  He's awesome, he backported my fixes
+	Ka-Hing: Many much bugfixes. Hooray. (Paul told me to say that)
+	Oh, no one has met Paul yet? He's awesome, he backported my fixes
 	to the release branch so I didn't have to checkout a
 	workspace... except I just did to NEWS to tell you all about
-	that.  Oh and I actually did do something for this release, none of
-	which is user visible though.  This basically applies to the rest
+	that. Oh and I actually did do something for this release, none of
+	which is user visible though. This basically applies to the rest
 	of the release as well, nothing exciting, but you definitely want
 	it.
 
--- a/configure.ac	Tue Aug 18 16:04:22 2009 +0900
+++ b/configure.ac	Wed Aug 19 03:57:54 2009 +0900
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [6])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [6])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/libpurple/idle.h	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/idle.h	Wed Aug 19 03:57:54 2009 +0900
@@ -26,6 +26,8 @@
 #ifndef _PURPLE_IDLE_H_
 #define _PURPLE_IDLE_H_
 
+#include <time.h>
+
 /**
  * Idle UI operations.
  */
--- a/libpurple/plugins/perl/common/XMLNode.xs	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/plugins/perl/common/XMLNode.xs	Wed Aug 19 03:57:54 2009 +0900
@@ -4,21 +4,24 @@
 PROTOTYPES: ENABLE
 
 Purple::XMLNode
-xmlnode_copy(class, src)
+xmlnode_copy(src)
 	Purple::XMLNode src
-    C_ARGS:
-	src
 
 void
 xmlnode_free(node)
 	Purple::XMLNode node
 
 Purple::XMLNode
-xmlnode_from_str(class, str, size)
-	const char *str
-	gssize size
-    C_ARGS:
-	str, size
+xmlnode_from_str(const char *str, gssize length(str))
+    PROTOTYPE: $
+
+const char *
+xmlnode_get_name(node)
+	Purple::XMLNode node
+	CODE:
+	RETVAL = node->name;
+	OUTPUT:
+	RETVAL
 
 const char *
 xmlnode_get_attrib(node, attr)
@@ -78,11 +81,17 @@
 	const char *value
 
 gchar_own *
-xmlnode_to_formatted_str(node, len)
+xmlnode_to_formatted_str(node)
 	Purple::XMLNode node
-	int *len
+    CODE:
+	RETVAL = xmlnode_to_formatted_str(node, NULL);
+    OUTPUT:
+	RETVAL
 
 gchar_own *
-xmlnode_to_str(node, len)
+xmlnode_to_str(node)
 	Purple::XMLNode node
-	int *len
+    CODE:
+	RETVAL = xmlnode_to_str(node, NULL);
+    OUTPUT:
+	RETVAL
--- a/libpurple/protocols/bonjour/bonjour_ft.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Wed Aug 19 03:57:54 2009 +0900
@@ -450,9 +450,11 @@
 
 				/* TODO: Make sure that it is advertising a bytestreams transfer */
 
-				bonjour_xfer_receive(pc, id, sid, name, filesize, filename, XEP_BYTESTREAMS);
+				if (filename) {
+					bonjour_xfer_receive(pc, id, sid, name, filesize, filename, XEP_BYTESTREAMS);
 
-				parsed_receive = TRUE;
+					parsed_receive = TRUE;
+				}
 			}
 
 			if (!parsed_receive) {
--- a/libpurple/protocols/jabber/oob.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/jabber/oob.c	Wed Aug 19 03:57:54 2009 +0900
@@ -207,7 +207,10 @@
 	url = xmlnode_get_data(urlnode);
 
 	jox = g_new0(JabberOOBXfer, 1);
-	purple_url_parse(url, &jox->address, &jox->port, &jox->page, NULL, NULL);
+	if (!purple_url_parse(url, &jox->address, &jox->port, &jox->page, NULL, NULL)) {
+		g_free(url);
+		return;
+	}
 	g_free(url);
 	jox->js = js;
 	jox->headers = g_string_new("");
--- a/libpurple/protocols/msn/slp.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/msn/slp.c	Wed Aug 19 03:57:54 2009 +0900
@@ -351,7 +351,7 @@
 
 			g_free(bin);
 
-			purple_xfer_set_filename(xfer, file_name);
+			purple_xfer_set_filename(xfer, file_name ? file_name : "");
 			g_free(file_name);
 			purple_xfer_set_size(xfer, file_size);
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
--- a/libpurple/protocols/msn/slplink.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/msn/slplink.c	Wed Aug 19 03:57:54 2009 +0900
@@ -441,6 +441,7 @@
 	slpmsg->info = "SLP ACK";
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -578,7 +579,7 @@
 		/* fseek(slpmsg->fp, offset, SEEK_SET); */
 		len = fwrite(data, 1, len, slpmsg->fp);
 	}
-	else if (slpmsg->size)
+	else if (slpmsg->size && slpmsg->buffer)
 	{
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
--- a/libpurple/protocols/msnp9/slp.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/msnp9/slp.c	Wed Aug 19 03:57:54 2009 +0900
@@ -338,7 +338,7 @@
 		char *bin;
 		gsize bin_len;
 		guint32 file_size;
-		char *file_name;
+		gchar *file_name;
 		gunichar2 *uni_name;
 
 		account = slpcall->slplink->session->account;
@@ -368,7 +368,8 @@
 
 			g_free(bin);
 
-			purple_xfer_set_filename(xfer, file_name);
+			purple_xfer_set_filename(xfer, file_name ? file_name : "");
+			g_free(file_name);
 			purple_xfer_set_size(xfer, file_size);
 			purple_xfer_set_init_fnc(xfer, msn_xfer_init);
 			purple_xfer_set_request_denied_fnc(xfer, msn_xfer_cancel);
--- a/libpurple/protocols/msnp9/slplink.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/libpurple/protocols/msnp9/slplink.c	Wed Aug 19 03:57:54 2009 +0900
@@ -477,6 +477,7 @@
 #endif
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -603,7 +604,7 @@
 		/* fseek(slpmsg->fp, offset, SEEK_SET); */
 		len = fwrite(data, 1, len, slpmsg->fp);
 	}
-	else if (slpmsg->size)
+	else if (slpmsg->size && slpmsg->buffer)
 	{
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
--- a/pidgin/gtkblist.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/pidgin/gtkblist.c	Wed Aug 19 03:57:54 2009 +0900
@@ -4103,7 +4103,7 @@
 				else
 					g_snprintf(buf, sizeof(buf), "%%s ");
 
-				statustext = g_strdup_printf(buf, tmp);purple_presence_is_idle(presence)
+				statustext = g_strdup_printf(buf, tmp);
 
 				g_free(tmp);
 			}
--- a/pidgin/gtkutils.c	Tue Aug 18 16:04:22 2009 +0900
+++ b/pidgin/gtkutils.c	Wed Aug 19 03:57:54 2009 +0900
@@ -3699,9 +3699,13 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	/* Open Containing Directory */
+#if GTK_CHECK_VERSION(2,6,0)
 	img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
 	item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
+#endif
 	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
@@ -3767,9 +3771,13 @@
 	url = gtk_imhtml_link_get_url(link);
 
 	/* Play Sound */
+#if GTK_CHECK_VERSION(2,6,0)
 	img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
 	item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("_Play Sound"));
+#endif
 	g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Tue Aug 18 16:04:22 2009 +0900
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Wed Aug 19 03:57:54 2009 +0900
@@ -364,6 +364,98 @@
 female-fighter.png  o-+     O-+
 yin-yang.png        (%)
 
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+smile.png           :)      :-)
+question.png        :-/     :-\\
+shock.png           :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+yawn.png            (:|
+hypnotized.png      @-)
+on-the-phone.png    :)]
+sad.png             :(      :-(
+in-love.png         :x      :-x     :X      :-X
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+glasses-nerdy.png   :-B     :-b
+quiet.png           :-$
+drool.png           =P~     =p~
+lying.png           :^O     :^o
+call-me.png         :-c
+wink.png            ;)      ;-)
+embarrassed.png     :">
+mean.png            :->     :>
+laugh.png           :))     :-))
+bye.png             =;
+arrogant.png        [-(
+thinking.png        :-?
+waiting.png         :-w     :-W
+at-wits-end.png     ~x(     ~X(
+smile-big.png       :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+glasses-cool.png    B-)     b-)
+neutral.png         :|      :-|
+sleepy.png          I-)     i-)     |-)
+clown.png           :o)     :O)
+doh.png             #-o     #-O
+weep.png            :-<
+go-away.png         :-h
+lashes.png          ;;)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+sarcastic.png       /:)
+eyeroll.png         8-|
+silly.png           8-}
+clap.png            =D>     =d>
+mad-tongue.png      >:P     >:p
+time-out.png        :-t     :-T
+hug-left.png        >:D<    >:d<
+love-over.png       =((
+sweat.png           #:-S    #:-s
+rotfl.png           =)) :-j :-J 
+loser.png           L-)     l-)
+party.png           <:-P    <:-p
+nailbiting.png      :-SS	:-Ss	:-sS	:-ss
+cowboy.png          <):)
+desire.png          8->
+! skywalker.png     C:-)    c:-)    C:)     c:)
+! monkey.png        :-(|)  :(|)
+
+# Hidden Yahoo emotes
+alien.png           =:)     >-)
+beat-up.png         b-(     B-(
+chicken.png         ~:>
+coffee.png          ~o)     ~O)
+cow.png             3:-O    3:-o
+dance.png           \\:D/   \\:d/
+rose.png            @};-
+dont-know.png       :-L     :-l
+skeleton.png        8-X     8-x
+lamp.png            *-:)
+monkey.png          :(|)
+coins.png           $-)
+peace.png           :)>-
+pig.png             :@)
+pray.png            [-o<    [-O<
+pumpkin.png         (~~)
+shame.png           [-X     [-x
+flag.png            **==
+clover.png          %%-
+musical-note.png    :-"
+giggle.png          ;))
+worship.png         ^:)^
+star.png            (*)
+waving.png          >:/
+talktohand.png      :-@
+
+# Only available after activating the Yahoo! Fighter IMVironment
+male-fighter1.png   o->     O->
+male-fighter2.png   o=>     O=>
+female-fighter.png  o-+     O-+
+yin-yang.png        (%)
+
 
 # Following MySpaceIM Beta 1.0.697.0
 [MySpaceIM]
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in	Tue Aug 18 16:04:22 2009 +0900
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in	Wed Aug 19 03:57:54 2009 +0900
@@ -139,7 +139,34 @@
 shame.png           [-X     [-x
 musical-note.png    :-"
 
-# Only available after activating the Yahoo! Fighter IMVironment
+# Following Yahoo! Messenger 8.1
+[Yahoo JAPAN]
+smile.png           :)      :-)
+question.png        :-/     :-\\
+shock.png           :-O     :O      :-o     :o 
+devil.png           >:)
+angel.png           O:-)    o:-)    0:-)
+sick.png            :-&
+yawn.png            (:|
+sad.png             :(      :-(
+angry.png           X-(     x-(     X(      x(
+crying.png          :((
+wink.png            ;)      ;-)
+thinking.png        :-?
+smile-big.png       :D      :-D     :d      :-d
+tongue.png          :-P     :P      :-p     :p
+neutral.png         :|      :-|
+sleepy.png          I-)     i-)     |-)
+kiss.png            :-*     :*
+confused.png        :-S     :-s
+hug-left.png        >:D<    >:d<
+party.png           <:-P    <:-p
+
+# Hidden Yahoo emotes
+coffee.png          ~o)     ~O)
+dont-know.png       :-L     :-l
+shame.png           [-X     [-x
+musical-note.png    :-"
 
 
 # Following MySpaceIM Beta 1.0.697.0
--- a/pidgin/plugins/disco/Makefile.am	Tue Aug 18 16:04:22 2009 +0900
+++ b/pidgin/plugins/disco/Makefile.am	Wed Aug 19 03:57:54 2009 +0900
@@ -2,6 +2,9 @@
 
 xmppdisco_la_LDFLAGS = -module -avoid-version
 
+EXTRA_DIST = \
+        Makefile.mingw
+
 if PLUGINS
 
 plugin_LTLIBRARIES = xmppdisco.la
--- a/po/ChangeLog	Tue Aug 18 16:04:22 2009 +0900
+++ b/po/ChangeLog	Wed Aug 19 03:57:54 2009 +0900
@@ -14,6 +14,7 @@
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Daniël Heres)
 	* English (British) translation updated (Luke Ross)
+	* Esperanto translation updated (Stéphane Fillod)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Frco. Javier Rial Rodríguez)
@@ -36,6 +37,9 @@
 	* Swahili translation added (Paul Msegeya)
 	* Swedish translation updated (Peter Hjalmarsson)
 
+version 2.5.9
+	* No changes
+
 version 2.5.8
 	* No changes
 
--- a/po/eo.po	Tue Aug 18 16:04:22 2009 +0900
+++ b/po/eo.po	Wed Aug 19 03:57:54 2009 +0900
@@ -2,21 +2,21 @@
 #
 # Copyright (C) 2006, Stéphane Fillod <fillods@users.sourceforge.net>
 #
-# Stéphane Fillod <f8cfe@free.fr>, 2006, 2007, 2008.
+# Stéphane Fillod <fillods@users.sourceforge.net>, 2006, 2007, 2008, 2009.
 # This file is distributed under the same license as the Pidgin package.
 msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-03-02 13:39+0100\n"
-"Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
+"POT-Creation-Date: 2009-08-16 09:57-0400\n"
+"PO-Revision-Date: 2009-08-16 20:26+0200\n"
+"Last-Translator: Stéphane Fillod <fillods@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: gtranslator 1.9.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -27,7 +27,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Provu `%s -h' por plia informo.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -42,7 +42,7 @@
 "Uzo: %s [OPCIOJ]...\n"
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
-"  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -d, --debug         montru sencimigajn mesaĝojn al stderr\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
@@ -60,9 +60,8 @@
 msgid "Account was not added"
 msgstr "Konto ne estis aldonita"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
-msgstr "Ekrannomo de konto ne devas esti malplena."
+msgstr "Uzantonomo de konto ne devas esti malplena."
 
 msgid "New mail notifications"
 msgstr "Nova retpoŝt-avizoj"
@@ -85,9 +84,8 @@
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Uzantonomo:"
+msgstr "Uzantnomo:"
 
 msgid "Password:"
 msgstr "Pasvorto:"
@@ -96,9 +94,8 @@
 msgstr "Alinomo:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Ne konektita al servilo."
+msgstr "Krei tiun konton ĉe la servilo"
 
 #. Cancel button
 #. Cancel
@@ -178,9 +175,8 @@
 msgid "Default"
 msgstr "Apriora"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
-msgstr "Vi devas enigi ekrannomon por la kunul."
+msgstr "Vi devas enigi uzantnomon por la kunul."
 
 msgid "You must provide a group."
 msgstr "Vi devas enigi grupon."
@@ -256,7 +252,7 @@
 msgstr "Redaktu"
 
 msgid "Edit Settings"
-msgstr "Agordu"
+msgstr "Agordi"
 
 msgid "Information"
 msgstr "Informo"
@@ -352,12 +348,11 @@
 msgid "Unblock"
 msgstr "Malbloku"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias Bloki/"
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiun vi deziras Bloki/"
 "Malbloki."
 
 #. Not multiline
@@ -369,10 +364,9 @@
 msgid "New Instant Message"
 msgstr "Nova Tujmesaĝo"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias tujmesaĝi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiun vi deziras tujmesaĝi."
 
 msgid "Channel"
 msgstr "Kanalo"
@@ -386,13 +380,12 @@
 msgid "Join"
 msgstr "Aliĝu"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi "
-"dezrias rigardi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiesn protokolon vi "
+"deziras rigardi."
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -410,9 +403,8 @@
 msgid "View Log..."
 msgstr "Montru Protokolon..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "Montru Protokolon"
+msgstr "Montri Ĉiujn Protokolojn"
 
 msgid "Show"
 msgstr "Montru"
@@ -605,9 +597,8 @@
 msgid "Add Buddy Pounce..."
 msgstr "Aldonu Kunul Atentigon..."
 
-#, fuzzy
 msgid "Invite..."
-msgstr "Invitu"
+msgstr "Invitu..."
 
 msgid "Enable Logging"
 msgstr "Ŝaltu Protokoladon"
@@ -618,11 +609,11 @@
 msgid "<AUTO-REPLY> "
 msgstr "<AŬTO-RESPONDO> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "Uzantoj Listo:\n"
-msgstr[1] "Uzantoj Listo:\n"
+msgstr[0] "Listo de %d uzanto:\n"
+msgstr[1] "Listo de %d uzantoj:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "Subtenitaj sencimigopcioj estas:  versio"
@@ -714,10 +705,10 @@
 msgid "Pause"
 msgstr "Paŭzu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Dosiero alŝuto - %d%% je %d dosieroj"
+msgstr[0] "Dosiero alŝuto - %d%% je %d dosiero"
 msgstr[1] "Dosiero alŝuto - %d%% je %d dosieroj"
 
 #. Create the window.
@@ -765,13 +756,11 @@
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "Difinu"
-
-#, fuzzy
+msgstr "Sendita"
+
 msgid "Received"
-msgstr "Ricevitaj Mesaĝoj"
+msgstr "Ricevita"
 
 msgid "Finished"
 msgstr "Finita"
@@ -780,13 +769,11 @@
 msgid "The file was saved as %s."
 msgstr "La dosiero estas konservita kial %s."
 
-#, fuzzy
 msgid "Sending"
-msgstr "Sendu"
-
-#, fuzzy
+msgstr "Sendante"
+
 msgid "Receiving"
-msgstr "Restanta"
+msgstr "Ricevante"
 
 #, c-format
 msgid "Conversation in %s on %s"
@@ -833,16 +820,14 @@
 msgid "Conversations with %s"
 msgstr "Konversacioj kun %s"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Konversacioj"
+msgstr "Ĉiuj Konversacioj"
 
 msgid "System Log"
 msgstr "Sistemo Protokolo"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Kalkulante..."
+msgstr "Alvokante..."
 
 msgid "Hangup"
 msgstr ""
@@ -868,9 +853,8 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "Vi forlasis tiun babilejon."
+msgstr "Vi rifuzis la alvokon."
 
 msgid "call: Make an audio call."
 msgstr ""
@@ -915,9 +899,8 @@
 msgid "(none)"
 msgstr "(neniu)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
 msgstr "ERARO"
@@ -1220,9 +1203,8 @@
 msgid "Others talk in chat"
 msgstr "Aliaj parolas en babilejo"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "Iun diras vian nomon en babilejo"
+msgstr "Iun diras vian uzantnomon en babilejo"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer Malsukceso"
@@ -1529,9 +1511,8 @@
 msgid "TinyURL (or other) address prefix"
 msgstr ""
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
 msgstr ""
@@ -1640,6 +1621,40 @@
 msgid "_View Certificate..."
 msgstr "_Montru Atestilon..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr ""
+
+msgid "Invalid certificate chain"
+msgstr ""
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1648,27 +1663,11 @@
 "automatically checked."
 msgstr ""
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr ""
-
-msgid "Invalid certificate chain"
-msgstr ""
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1684,16 +1683,6 @@
 msgid "Invalid certificate authority signature"
 msgstr ""
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1724,7 +1713,7 @@
 msgstr "+++ %s malsalutis"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
@@ -1771,9 +1760,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s forlasis la ĉambron (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Iniciatu _Babilon"
+msgstr "Inviti por babili"
 
 #. Put our happy label in it.
 msgid ""
@@ -1901,6 +1889,10 @@
 msgstr ""
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr ""
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
@@ -2113,9 +2105,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTO-RESPONDO>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Eraro kreante konekto"
+msgstr "Eraro kreante konferencon."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2208,9 +2199,8 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Elektu uzantan adreslibron serĉendan"
+msgstr ""
 
 msgid "Notes"
 msgstr "Notoj"
@@ -2578,9 +2568,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Enigu Pasvorton"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2799,9 +2788,8 @@
 "im/BonjourWindows for more information."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Ne povas eki konekton"
+msgstr ""
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2839,9 +2827,8 @@
 msgstr "Purpura Persono"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Loko"
+msgstr ""
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2853,17 +2840,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr "Ne konekteblas al %s"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Ne konekteblas al %s: %s"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr "Ne eblas sendi mesaĝon: %s"
+msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2913,9 +2900,8 @@
 msgid "You must fill in all registration fields"
 msgstr ""
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "Pasvortoj ne kongruas."
+msgstr "Pasvortoj ne akordas"
 
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
@@ -2935,9 +2921,8 @@
 msgid "Enter captcha text"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha"
-msgstr "Konservu Bildon"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registru Novan Gadu-Gadu-an Konton"
@@ -3076,9 +3061,9 @@
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Ne eblas alinomigi grupon"
+msgstr ""
 
 #. 1. connect to server
 #. connect to the server
@@ -3091,9 +3076,8 @@
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Ne konektita al servilo."
+msgstr "Ne konektita al servilo"
 
 msgid "Find buddies..."
 msgstr "Trovu kunulojn..."
@@ -3134,9 +3118,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Difinu Uzanto-Informon..."
+msgstr "GG servilo"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3152,9 +3135,8 @@
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Dosiero malfermeblas."
+msgstr ""
 
 msgid "Error displaying MOTD"
 msgstr "Eraro montrante MOTD-n"
@@ -3176,11 +3158,9 @@
 #.
 #. 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 ""
-"Perdis konekton kun servilo:\n"
-"%s"
+msgstr "Perdis konekton kun servilo: %s"
 
 msgid "View MOTD"
 msgstr "Rigardu MOTD-n"
@@ -3191,9 +3171,8 @@
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
+msgstr "IRC karesnomo kaj servilo ne enhaveblas blankan spacon"
 
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
@@ -3202,13 +3181,13 @@
 msgstr "Malkonekteblas"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Ne konekteblas al %s"
-
-#, fuzzy, c-format
+msgstr "Ne konekteblas: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Servilo fermis la konekton."
+msgstr "Servilo fermis la konekton"
 
 msgid "Users"
 msgstr "Uzantoj"
@@ -3262,13 +3241,12 @@
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "Kialo: %s"
-
-#, fuzzy
+msgstr ""
+
 msgid "End of ban list"
-msgstr "Ne en listo"
+msgstr ""
 
 #, c-format
 msgid "You are banned from %s."
@@ -3393,13 +3371,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 "Tiu babil nomo jam estas uzata"
-
-#, fuzzy
+msgstr "Tiu karesnomo \"%s\" jam estas uzata."
+
 msgid "Nickname in use"
-msgstr "Karesnomo"
+msgstr "Karesnomo uzata"
 
 msgid "Cannot change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
@@ -3619,13 +3596,11 @@
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Aŭtentokontrolo malsukcesis"
-
-#, fuzzy
+msgstr "SASL aŭtentokontrolo malsukcesis"
+
 msgid "Invalid response from server"
-msgstr "Malvalida respondo el servilo."
+msgstr "Malvalida respondo el servilo"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3636,35 +3611,28 @@
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL eraro"
+msgstr "SASL eraro: %s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "Nenia kialo donita."
+msgstr ""
 
 msgid "Unsupported version of BOSH protocol"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
 msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
-
-#, fuzzy, c-format
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
-
-#, fuzzy
+
 msgid "Unable to establish SSL connection"
-msgstr "Ne povas eki konekton"
+msgstr ""
 
 msgid "Full Name"
 msgstr "Plena Nomo"
@@ -3681,6 +3649,11 @@
 msgid "Street Address"
 msgstr "Strato Adreso"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Plia Adreso"
 
@@ -3730,9 +3703,8 @@
 msgid "Operating System"
 msgstr ""
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Loka Doerisero:"
+msgstr "Loka Tempo"
 
 msgid "Priority"
 msgstr "Prioriteco"
@@ -3744,9 +3716,8 @@
 msgid "%s ago"
 msgstr ""
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "Ensalutita"
+msgstr "Elsalutinta"
 
 msgid "Middle Name"
 msgstr "Meza Nomo"
@@ -3769,14 +3740,12 @@
 msgid "Temporarily Hide From"
 msgstr "Provizore Kaŝu De"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Ĉesigu Prezentavizon"
 
 msgid "(Re-)Request authorization"
 msgstr "(Re-)demandu permeson"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3912,17 +3881,14 @@
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alinomo:"
-
-#, fuzzy
+msgstr ""
+
 msgid "No users found"
-msgstr "Neniu protokolo trovita"
-
-#, fuzzy
+msgstr "Neniu uzanto trovita"
+
 msgid "Roles:"
-msgstr "Rolo"
+msgstr "Roloj:"
 
 msgid "Ping timed out"
 msgstr ""
@@ -3938,9 +3904,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Malsukcesis konekti servilon."
+msgstr ""
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4009,10 +3974,6 @@
 msgid "Change Registration"
 msgstr "Ŝanĝu Registradon"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Malsukcesis konekti servilon."
-
 msgid "Error unregistering account"
 msgstr "Eraro forregistrante konton"
 
@@ -4325,21 +4286,20 @@
 msgid "%s has buzzed you!"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Ne eblas sendi dosieron al %s, malvalida JID"
-
-#, fuzzy, c-format
+msgstr "Ne eblas eki medion kun %s, malvalida JID"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Ne eblis sendi dosieron al %s, uzanto ne estas konektita"
+msgstr "Ne eblas eki medion kun %s, uzanto ne estas konektita"
 
 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Registrado Malsukcesis"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -4350,9 +4310,8 @@
 msgid "Select a Resource"
 msgstr ""
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Iniciatu _Babilon"
+msgstr ""
 
 msgid "config:  Configure a chat room."
 msgstr ""
@@ -4444,9 +4403,8 @@
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Montru personajn ridmienojn"
+msgstr "Montru Proprajn Sidmienojn"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4471,9 +4429,9 @@
 msgid "XMPP Message Error"
 msgstr "XMPP Mesaĝo Eraro"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
-msgstr " (Kodo %s)"
+msgstr "(Kodo %s)"
 
 msgid "XML Parse error"
 msgstr ""
@@ -4505,29 +4463,22 @@
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Nenia kialo donita."
-
-#, fuzzy, c-format
+msgstr "Sen kialo"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Vi estas forigita de %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Vi estas forigita: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Forigita de %s (%s)"
-
-#, fuzzy
+msgstr "Forigita (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Eraro okazis malfermante la dosiero."
-
-#, fuzzy
+msgstr ""
+
 msgid "Transfer was closed."
-msgstr "Dosiero Transmeto Malsukcesis"
-
-#, fuzzy
-msgid "Failed to open the file"
-msgstr "Malsukcesis malfermi dosieron '%s': %s"
+msgstr "Transmeto estis fermita."
 
 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -4597,9 +4548,8 @@
 msgid "Buddy Add error"
 msgstr ""
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "La nova formatumo malvalidas."
+msgstr ""
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4641,9 +4591,9 @@
 msgid "Already logged in"
 msgstr "Jam ensalutita"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid username"
-msgstr "Malvalida Uzantonomo"
+msgstr "Malvalida uzantnomo"
 
 #, c-format
 msgid "Invalid friendly name"
@@ -4825,9 +4775,8 @@
 msgid "Passport account not yet verified"
 msgstr "Pasporta konto ne jam kontrolita"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "Pasporta konto ne jam kontrolita"
+msgstr "Pasporta konto suspendita"
 
 #, c-format
 msgid "Bad ticket"
@@ -4841,13 +4790,27 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Eraro: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Preferata Kontakto"
-
-#, fuzzy
+msgstr "Aliaj Kontaktoj"
+
 msgid "Non-IM Contacts"
-msgstr "Forigu Kontakton"
+msgstr "Ne-TM Kontaktoj"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
@@ -4864,9 +4827,8 @@
 msgid "Nudging %s..."
 msgstr ""
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Retadreso"
+msgstr "Retadreso..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Via nova MSN amika nomo estas tro longa."
@@ -4900,22 +4862,20 @@
 msgid "Disallow"
 msgstr "Malpermesu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Kunul Komento por %s"
-
-#, fuzzy
+msgstr ""
+
 msgid "No text is blocked for this account."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
+msgstr ""
 
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "Tiu Hotmail konto eble ne estas aktiva."
+msgstr ""
 
 msgid "Send a mobile message."
 msgstr ""
@@ -4926,9 +4886,8 @@
 msgid "Playing a game"
 msgstr ""
 
-#, fuzzy
 msgid "Working"
-msgstr "Laboro"
+msgstr "Laborante"
 
 msgid "Has you"
 msgstr "Havas vin"
@@ -4966,9 +4925,8 @@
 msgid "Album"
 msgstr "Albumo"
 
-#, fuzzy
 msgid "Game Title"
-msgstr "Titolon"
+msgstr "Ludo Titolo"
 
 msgid "Office Title"
 msgstr ""
@@ -5006,6 +4964,27 @@
 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 a valid email address."
+msgstr ""
+
+msgid "Unable to Add"
+msgstr "Ne eblas Aldoni"
+
+msgid "Authorization Request Message:"
+msgstr "Permeso Demando Mesaĝo:"
+
+msgid "Please authorize me!"
+msgstr "Bonvolu permesu min!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Daŭrigu"
+
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
@@ -5156,9 +5135,8 @@
 "does not exist."
 msgstr ""
 
-#, fuzzy
 msgid "View web profile"
-msgstr "Kaŝu kiam senkonekta"
+msgstr "Rigardi ttt profilon"
 
 #. *< type
 #. *< ui_requirement
@@ -5194,20 +5172,20 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s ĵus sendis al vi Zumon!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Nekonata eraro (%d)"
+msgstr "Nekonata eraro (%d): %s"
 
 msgid "Unable to add user"
-msgstr ""
-
+msgstr "Ne eblas aldoni uzanton"
+
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Nekonata eraro (%d)"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "La jenaj estas la rezultoj de via serĉo"
+msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
@@ -5259,13 +5237,11 @@
 msgid "Our protocol is not supported by the server"
 msgstr ""
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "Eraro lanĉante %s"
-
-#, fuzzy
+msgstr ""
+
 msgid "You have signed on from another location"
-msgstr "Vi ensalutis el alia loko."
+msgstr "Vi ensalutis el alia loko"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
@@ -5343,17 +5319,14 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Aldonu al adresaro"
-
-#, fuzzy
+msgstr ""
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
-
-#, fuzzy
+msgstr "Ĉu vi volas forigi tiun kunul el via adresaro ankaŭ?"
+
 msgid "The username specified is invalid."
-msgstr "La nova formatumo malvalidas."
+msgstr "La enigita uzantnomo malvalidas."
 
 msgid "This Hotmail account may not be active."
 msgstr "Tiu Hotmail konto eble ne estas aktiva."
@@ -5447,11 +5420,8 @@
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
+msgstr "Perdis konekton kun servilo"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -5501,9 +5471,8 @@
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "Misa ekrannomo aŭ pasvorto"
+msgstr "Misa uzantnomo aŭ pasvorto"
 
 msgid "MySpaceIM Error"
 msgstr ""
@@ -5828,9 +5797,8 @@
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "Vi trenis bildon"
+msgstr ""
 
 msgid "An error occurred while updating the directory"
 msgstr ""
@@ -5853,9 +5821,9 @@
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Ne konekteblas al %s"
+msgstr "Ne eblas ensaluti: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5981,11 +5949,10 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
-msgstr "Bonvolu enmetu la nomon de uzanto kiun vi deziras bloki."
+msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
@@ -6009,9 +5976,8 @@
 msgid "Server port"
 msgstr "Servilo pordo"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Ricevis neatendita HTTP respondo de servilo."
+msgstr "Ricevis neatenditan respondon de"
 
 #. username connecting too frequently
 msgid ""
@@ -6019,9 +5985,9 @@
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Eraro lanĉante %s"
+msgstr ""
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
@@ -6032,11 +5998,8 @@
 msgid "Invalid chat room name"
 msgstr "Malvalida babilejo nomo"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
 msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
 
 #. *< type
 #. *< ui_requirement
@@ -6083,11 +6046,8 @@
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
 
 msgid "Direct IM established"
 msgstr "Rekta TM establiĝis"
@@ -6251,9 +6211,8 @@
 msgid "Camera"
 msgstr "Kamerao"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Ekrannomo"
+msgstr ""
 
 msgid "Free For Chat"
 msgstr ""
@@ -6279,19 +6238,15 @@
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#, fuzzy, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Ne povis konekti al aŭtentokontrolo servilo:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Ne povis konekti al aŭtentokontrolo servilo: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Ne konekteblas al %s: %s"
-
-#, fuzzy
+msgstr "Ne konekteblas al BOS servilo: %s"
+
 msgid "Username sent"
-msgstr "Neniu uzantonomo difinita"
+msgstr "Uzantonomo sendita"
 
 msgid "Connection established, cookie sent"
 msgstr "Konekto estabilta, kuketo sendita"
@@ -6323,19 +6278,18 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Uzanto ne ekzistas"
+msgstr "Uzantonomo ne ekzistas"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Pasporta konto ne jam kontrolita"
+msgstr "Via konto estas nun tempe suspendita"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tujmesaĝilo servo estas provizore nedisponebla."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6346,9 +6300,8 @@
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "La nova formatumo malvalidas."
+msgstr "La enigita SecurID malvalidas."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6356,12 +6309,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Daŭrigu"
-
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
@@ -6371,12 +6318,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Bonvolu permesi min do mi povas aldoni vin al mia kunullisto."
 
-msgid "Authorization Request Message:"
-msgstr "Permeso Demando Mesaĝo:"
-
-msgid "Please authorize me!"
-msgstr "Bonvolu permesu min!"
-
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
@@ -6551,11 +6492,11 @@
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "La jena ekrannomo estas kunligita kun %s"
-msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
+msgstr[0] "La jena uzantnomo estas kunligita kun %s"
+msgstr[1] "La jenaj uzantnomoj estas kunligitaj kun %s"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -6662,11 +6603,6 @@
 "numbers and spaces, or contain only numbers."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Ne eblas Aldoni"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Ne eblas Ricevi Kunulliston"
 
@@ -6687,18 +6623,17 @@
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Ne povis aldoni kunulon %s pro nekonata kialo."
-
-#, fuzzy, c-format
+msgstr "Ne povis aldoni la kunulon %s pro nekonata kialo."
+
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
-"La uzanto %s ne koncedis vian demandon aldoni sin al via kunullisto pro la "
-"jena kialo:\n"
-"%s"
+"La uzanto %s koncedis al vi permeson aldoni ŝlin al via kunullisto.  Ĉu vi "
+"volas aldoni tiun uzanton?"
 
 msgid "Authorization Given"
 msgstr "Permeso Donita"
@@ -6726,7 +6661,7 @@
 msgstr "Permeso Rifuzita"
 
 msgid "_Exchange:"
-msgstr "_Interŝanĝo"
+msgstr "_Interŝanĝo:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
@@ -6814,18 +6749,15 @@
 msgid "_Search"
 msgstr "_Serĉu"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "Difinu Uzanto-Informon (URL)..."
+msgstr "Difinu Uzanto-Informon (ttt)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "Ŝanĝu Pasvorton (URL)"
-
-#, fuzzy
+msgstr "Ŝanĝu Pasvorton (ttt)"
+
 msgid "Configure IM Forwarding (web)"
-msgstr "Agordu TM Plusendado (URL)"
+msgstr "Agordi TM Plusendado (ttt)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
@@ -6850,9 +6782,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Uzanto ne estas ensalutita"
+msgstr ""
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -6962,16 +6893,14 @@
 msgid "Other"
 msgstr "Alia"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Nevidebla"
+msgstr "Videbla"
 
 msgid "Friend Only"
 msgstr ""
 
-#, fuzzy
 msgid "Private"
-msgstr "Privataj aferoj"
+msgstr "Privata"
 
 msgid "QQ Number"
 msgstr "QQ Nombro"
@@ -6988,9 +6917,8 @@
 msgid "Phone Number"
 msgstr "Telefonnumero"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Permesi kunulon?"
+msgstr "Permesi aldoni"
 
 msgid "Cellphone Number"
 msgstr "Poŝtelefona Numero"
@@ -6998,64 +6926,50 @@
 msgid "Personal Introduction"
 msgstr "Persono Enkonduko"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Urbo"
-
-#, fuzzy
+msgstr "Urbo/Loko"
+
 msgid "Publish Mobile"
-msgstr "Persona Poŝtelefono"
-
-#, fuzzy
+msgstr "Montri Poŝtelefonon"
+
 msgid "Publish Contact"
-msgstr "Alinomo Kontakto"
+msgstr "Alinomo Kontakton"
 
 msgid "College"
 msgstr "Kolegio"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Horoskopa Simbolo"
-
-#, fuzzy
+msgstr "Horoskopo"
+
 msgid "Zodiac"
-msgstr "Zodiaka Signo"
-
-#, fuzzy
+msgstr "Zodiako"
+
 msgid "Blood"
-msgstr "Blokita"
-
-#, fuzzy
+msgstr "Sango"
+
 msgid "True"
-msgstr "Bovo"
-
-#, fuzzy
+msgstr "Prave"
+
 msgid "False"
-msgstr "Malsukcesita"
-
-#, fuzzy
+msgstr "Malprave"
+
 msgid "Modify Contact"
-msgstr "Ŝanĝu Konton"
-
-#, fuzzy
+msgstr "Ŝanĝi Kontakton"
+
 msgid "Modify Address"
-msgstr "Hejmo Adreso"
-
-#, fuzzy
+msgstr "Ŝanĝi Adreson"
+
 msgid "Modify Extended Information"
-msgstr "Ŝanĝu mian informon"
-
-#, fuzzy
+msgstr "Ŝanĝi Detalan Informon"
+
 msgid "Modify Information"
-msgstr "Ŝanĝu mian informon"
-
-#, fuzzy
+msgstr "Ŝanĝu Informon"
+
 msgid "Update"
-msgstr "Lasta Aktualigo"
-
-#, fuzzy
+msgstr "Aktualigi"
+
 msgid "Could not change buddy information."
-msgstr "Bonvolu enigi kunul informon."
+msgstr ""
 
 msgid "Mobile"
 msgstr "Movante"
@@ -7064,24 +6978,20 @@
 msgstr ""
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Kunul Piktogramo"
+msgstr ""
 
 msgid "Change his/her memo as you like"
 msgstr ""
 
-#, fuzzy
 msgid "_Modify"
-msgstr "Ŝanĝu"
-
-#, fuzzy
+msgstr "Ŝ_anĝu"
+
 msgid "Memo Modify"
-msgstr "Ŝanĝu"
-
-#, fuzzy
+msgstr ""
+
 msgid "Server says:"
-msgstr "Servilo okupita"
+msgstr "Servilo diras:"
 
 msgid "Your request was accepted."
 msgstr ""
@@ -7089,24 +6999,21 @@
 msgid "Your request was rejected."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requires verification"
-msgstr "Petu aŭtentigon"
-
-#, fuzzy
+msgstr ""
+
 msgid "Add buddy question"
 msgstr "Aldonu kunulon al via listo?"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "Enigu Uzanto Adreslibro"
+msgstr "Enigu respondon ĉi-tie"
 
 msgid "Send"
 msgstr "Sendu"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Malvalida Uzantonomo"
+msgstr "Malvalida respondo."
 
 msgid "Authorization denied message:"
 msgstr "Rifuzita permeso mesaĝo:"
@@ -7114,48 +7021,41 @@
 msgid "Sorry, you're not my style."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "Uzanto %d bezonas aŭtentokontrolon"
-
-#, fuzzy
+msgstr "%u bezonas aŭtentokontrolon"
+
 msgid "Add buddy authorize"
-msgstr "Aldonu kunulon al via listo?"
-
-#, fuzzy
+msgstr ""
+
 msgid "Enter request here"
-msgstr "Enigu Konferencan Servilon"
+msgstr ""
 
 msgid "Would you be my friend?"
 msgstr "Ĉu vi estus mia amiko?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Kunul"
-
-#, fuzzy
+msgstr "QQ Kunul"
+
 msgid "Add buddy"
-msgstr "Aldonu Kunulon"
-
-#, fuzzy
+msgstr "Aldoni kunulon"
+
 msgid "Invalid QQ Number"
-msgstr "Malvalida QQ Aspekto"
-
-#, fuzzy
+msgstr "Malvalida QQ Numero"
+
 msgid "Failed sending authorize"
-msgstr "Bonvolu permesu min!"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Malsukcesis forigi kunulon"
-
-#, fuzzy, c-format
+msgstr "Malsukcesis forigi kunulon %u"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s forigis vin el sia kunul listo."
-
-#, fuzzy
+msgstr ""
+
 msgid "No reason given"
-msgstr "Nenia kialo donita."
+msgstr "Nenia kialo donita"
 
 #. only need to get value
 #, c-format
@@ -7165,9 +7065,9 @@
 msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Malakceptu"
+msgstr ""
 
 #, c-format
 msgid "Message: %s"
@@ -7182,9 +7082,8 @@
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Bonvolu enigi la novan nomon por %s"
+msgstr "Bonvolu enigi Qun numeron"
 
 msgid "You can only search for permanent Qun\n"
 msgstr ""
@@ -7192,58 +7091,48 @@
 msgid "(Invalid UTF-8 string)"
 msgstr ""
 
-#, fuzzy
 msgid "Not member"
-msgstr "Mi ne estas membro"
-
-#, fuzzy
+msgstr "Ne membro"
+
 msgid "Member"
-msgstr "Membro Ek De"
-
-#, fuzzy
+msgstr "Membro"
+
 msgid "Requesting"
-msgstr "Peto Dialogujo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr ""
+
 msgid "Notice"
-msgstr "Notoj"
-
-#, fuzzy
+msgstr ""
+
 msgid "Detail"
-msgstr "Apriora"
+msgstr "Detalo"
 
 msgid "Creator"
 msgstr "Kreanto"
 
-#, fuzzy
 msgid "About me"
-msgstr "Pri %s"
-
-#, fuzzy
+msgstr "Pri mi"
+
 msgid "Category"
-msgstr "Babileraro"
+msgstr "Kategorio"
 
 msgid "The Qun does not allow others to join"
 msgstr ""
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "QQ Qun"
+msgstr "Aliĝu QQ Qun"
 
 msgid "Input request here"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Vi sukcese ŝanĝis Qun numeron"
-
-#, fuzzy
+msgstr "Sukcese aliĝis Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Vi sukcese ŝanĝis Qun numeron"
+msgstr "Sukcese aliĝis Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
@@ -7252,16 +7141,14 @@
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operacio"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Malsukcesita"
+msgstr "Malsukcesita:"
 
 msgid "Join Qun, Unknown Reply"
 msgstr ""
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr ""
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7271,47 +7158,44 @@
 msgid "Sorry, you are not our style"
 msgstr ""
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "Vi sukcese ŝanĝis Qun numeron"
-
-#, fuzzy
+msgstr "Sukcese ŝanĝis Qun membrojn"
+
 msgid "Successfully changed Qun information"
-msgstr "Vi sukcese ŝanĝis Qun informon"
+msgstr "Sukcese ŝanĝis Qun informon"
 
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
+msgstr ""
 
 msgid "Setup"
 msgstr "Agordo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Uzanto %d petis aliĝon al grupo %d"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Uzanto %d petis aliĝon al grupo %d"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Malsukcesis kuniĝi kunulon en babilejo"
+msgstr ""
 
 #, 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 "Forigu Kunulon"
-
-#, fuzzy, c-format
+msgstr "<b>Forigu Kunulon %u.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Forigu Kunulon"
+msgstr ""
 
 #, c-format
 msgid "Unknown-%d"
@@ -7321,26 +7205,22 @@
 msgstr "Nivelo"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
-msgstr "Movante"
-
-#, fuzzy
+msgstr ""
+
 msgid " BindMobile"
-msgstr "Movante"
-
-#, fuzzy
+msgstr ""
+
 msgid " Video"
-msgstr "Viva Video"
-
-#, fuzzy
+msgstr ""
+
 msgid " Zone"
-msgstr "Nenio"
+msgstr ""
 
 msgid "Flag"
 msgstr ""
@@ -7351,9 +7231,8 @@
 msgid "Invalid name"
 msgstr "Malvalida Uzantonomo"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Elektu Dosierujon..."
+msgstr "Elektu piktogramon..."
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -7367,21 +7246,21 @@
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Servilo</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
@@ -7391,9 +7270,9 @@
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
@@ -7407,9 +7286,9 @@
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 msgid "Login Information"
 msgstr "Ensaluta Informo"
@@ -7426,9 +7305,8 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr ""
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Grupo Titolo:</b> %s<br>"
+msgstr ""
 
 msgid "and more, please let me know... thank you!))"
 msgstr ""
@@ -7439,31 +7317,27 @@
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Pri %s"
-
-#, fuzzy
+msgstr "Pri OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Konservu Piktogramon"
+msgstr "Ŝanĝi Piktogramon"
 
 msgid "Change Password"
 msgstr ""
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Ensaluta Informo"
+msgstr "Konto Informo"
 
 msgid "Update all QQ Quns"
 msgstr ""
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "Pri %s"
-
-#, fuzzy
+msgstr "Pri OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Hejmo Adreso"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -7475,38 +7349,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "QQ Protokolo\tKromaĵo"
-
-#, fuzzy
+msgstr "QQ Protokolo tKromaĵo"
+
 msgid "Auto"
-msgstr "Permesi"
-
-#, fuzzy
+msgstr "Aŭtomate"
+
 msgid "Select Server"
-msgstr "Konekto servilo"
+msgstr "Elekti Servilon"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "Konektu per TCP"
-
-#, fuzzy
+msgstr "Konekti per TCP"
+
 msgid "Show server notice"
-msgstr "Servilo pordo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Show server news"
-msgstr "Servilo adreso"
+msgstr ""
 
 msgid "Show chat room when msg comes"
 msgstr ""
@@ -7514,21 +7382,19 @@
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Aktualigi mian informon"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unable to decrypt server reply"
-msgstr "Konekto servilo"
+msgstr ""
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Malvalida titolo"
+msgstr ""
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -7537,39 +7403,33 @@
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Registrado Postulita"
+msgstr "Registrado postulita"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
 msgid "Requesting captcha"
-msgstr "Peto Dialogujo"
+msgstr ""
 
 msgid "Checking captcha"
 msgstr ""
 
-#, fuzzy
 msgid "Failed captcha verification"
-msgstr "Malsukcesis Yahoo! Aŭtentokontrolo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Captcha Image"
-msgstr "Konservu Bildon"
-
-#, fuzzy
+msgstr ""
+
 msgid "Enter code"
-msgstr "Enigu Pasvorton"
+msgstr "Enigu kodon"
 
 msgid "QQ Captcha Verification"
 msgstr ""
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "Bonvolu enigi la nomon de la grupo"
+msgstr ""
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
@@ -7584,55 +7444,48 @@
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Difinu Uzanto-Informon..."
-
-#, fuzzy
+msgstr ""
+
 msgid "Requesting token"
-msgstr "Peto Dialogujo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unable to resolve hostname"
-msgstr "Ne eblas alinomigi grupon"
-
-#, fuzzy
+msgstr ""
+
 msgid "Invalid server or port"
-msgstr "Malvalida eraro"
-
-#, fuzzy
+msgstr ""
+
 msgid "Connecting to server"
-msgstr "Konekto servilo"
-
-#, fuzzy
+msgstr "Konekto al servilo"
+
 msgid "QQ Error"
-msgstr "QQid Eraro"
-
-#, fuzzy, c-format
+msgstr "QQ Eraro"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ Servilo Reludo"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "De"
-
-#, fuzzy, c-format
+msgstr "De %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Servilo instrukcioj: %s"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unknown SERVER CMD"
-msgstr "Nekonata kialo"
+msgstr "Nekonata SERVILO CMD"
 
 #, c-format
 msgid ""
@@ -7640,21 +7493,17 @@
 "Room %u, reply 0x%02X"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Komando"
-
-#, fuzzy
+msgstr "QQ Qun Komando"
+
 msgid "Unable to decrypt login reply"
-msgstr "Konekto servilo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unknown LOGIN CMD"
-msgstr "Nekonata kialo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unknown CLIENT CMD"
-msgstr "Nekonata kialo"
+msgstr "Nekonata KLIENTO CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7838,7 +7687,7 @@
 msgstr ""
 
 msgid "Unable to add user: user not found"
-msgstr ""
+msgstr "Ne eblas aldoni uzanton: uzanto ne trovita"
 
 #, c-format
 msgid ""
@@ -8440,7 +8289,7 @@
 msgstr ""
 
 msgid "_More..."
-msgstr ""
+msgstr "_Plia..."
 
 msgid "Detach From Server"
 msgstr ""
@@ -8560,9 +8409,8 @@
 msgid "Disconnected by server"
 msgstr ""
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Konekto servilo"
+msgstr ""
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8574,31 +8422,25 @@
 msgid "Performing key exchange"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "Ne eblas ŝargi kromaĵon"
+msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Ne eblas ŝargi kromaĵon"
-
 msgid "Out of memory"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Ne povas eki konekton"
+msgstr ""
 
 msgid "Error loading SILC key pair"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "Uzantoj ĉe %s: %s"
+msgstr ""
 
 msgid "Your Current Mood"
 msgstr ""
@@ -8867,9 +8709,8 @@
 msgid "Creating SILC key pair..."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Ne eblas alinomigi grupon"
+msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9000,35 +8841,30 @@
 msgid "Failure: Authentication failed"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Ne povas eki konekton"
+msgstr ""
 
 msgid "John Noname"
 msgstr "Sennomulo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Ne eblas ŝargi kromaĵon"
+msgstr ""
 
 msgid "Unable to create connection"
 msgstr ""
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Nekonata kialo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unable to create listen socket"
-msgstr "Malsukcesis skribi reten"
-
-#, fuzzy
+msgstr ""
+
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP ekrannomoj ne enhaveblas blankan spacon aŭ @ simbolon"
-
-#, fuzzy
+msgstr "SIP uzantnomoj ne enhaveblas blankan spacon aŭ @ simbolojn"
+
 msgid "SIP connect server not specified"
-msgstr "Servilo pordo"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -9072,9 +8908,8 @@
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9086,9 +8921,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo Protokol-Kromaĵo"
+msgstr "Yahoo! Protokol-Kromaĵo"
 
 msgid "Pager server"
 msgstr "Paĝila servilo"
@@ -9117,9 +8951,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo Babilo pordo"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo JAPANA ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9131,9 +8964,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo Protokol-Kromaĵo"
+msgstr "Yahoo! JAPANA Protokol-Kromaĵo"
 
 msgid "Your SMS was not delivered"
 msgstr ""
@@ -9175,9 +9007,8 @@
 msgstr ""
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Misa ekrannomo aŭ pasvorto"
+msgstr "Misa uzantnomo aŭ pasvorto"
 
 #, c-format
 msgid ""
@@ -9209,29 +9040,22 @@
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Alŝutu kunulliston al Servilo"
+msgstr "Ne eblas aldoni kunulon al servilolisto"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Ricevis neatendita HTTP respondo de servilo."
-
-#, fuzzy, c-format
+msgstr "Ricevis neatenditan HTTP respondon de servilo"
+
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Perdis konekton kun %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Perdis konekton kun %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
+msgstr "Ne eblas konekti kun %s: %s"
 
 msgid "Not at Home"
 msgstr "Malhejme"
@@ -9371,11 +9195,8 @@
 msgstr "La uzanto profilo malplenas."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-msgid "Invitation Rejected"
-msgstr "Invito malakceptita"
+msgid "%s has declined to join."
+msgstr ""
 
 msgid "Failed to join chat"
 msgstr "Malsukcesis aliĝi babilejon"
@@ -9425,9 +9246,8 @@
 msgid "User Rooms"
 msgstr "Uzanto Babilejoj"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Konektproblemo kun la YCHT servilo."
+msgstr "Konektproblemo kun la YCHT servilo"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9544,18 +9364,18 @@
 msgid "Exposure"
 msgstr "Montreco"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Ne eblas sendi mesaĝon al %s:"
+msgstr ""
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP prokura konekteraro %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
+"Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon"
 
 #, c-format
 msgid "Error resolving %s"
@@ -9613,17 +9433,15 @@
 msgstr "Ĉu akceptu babilinviton ?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ordigi"
+msgstr "Ligilo"
 
 msgid "The text-shortcut for the smiley"
 msgstr ""
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Konservu Bildon"
+msgstr "Konservita Bildo"
 
 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -9740,9 +9558,9 @@
 msgid "Unable to connect to %s"
 msgstr "Ne konekteblas al %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Eraro legante de %s: %s"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -9791,9 +9609,9 @@
 msgstr "Konekto malakceptita."
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Tiu babil nomo jam estas uzata"
+msgstr "Adreso jam uzata."
 
 #, c-format
 msgid "Error Reading %s"
@@ -9847,8 +9665,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
 
-msgid "_Advanced"
-msgstr "_Kroma"
+msgid "Ad_vanced"
+msgstr "Pro_gresinta"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
@@ -9910,9 +9728,8 @@
 msgid "Create _this new account on the server"
 msgstr ""
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Prokurilo"
+msgid "P_roxy"
+msgstr "P_rokurilo"
 
 msgid "Enabled"
 msgstr "Enŝaltita"
@@ -9946,13 +9763,11 @@
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#, fuzzy
 msgid "Please update the necessary fields."
-msgstr "Bonvolu Aktualigi la necesajn kampojn."
-
-#, fuzzy
+msgstr "Bonvolu aktualigi la necesajn kampojn."
+
 msgid "A_ccount"
-msgstr "_Konto:"
+msgstr "_Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -9978,16 +9793,14 @@
 msgid "I_M"
 msgstr "T_M"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Aldonu Babilejon"
+msgstr "_Sona Alvoko"
 
 msgid "Audio/_Video Call"
 msgstr ""
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "Video Babilado"
+msgstr ""
 
 msgid "_Send File..."
 msgstr "_Sendu Dosieron..."
@@ -9998,13 +9811,11 @@
 msgid "View _Log"
 msgstr "Montru Protoko_lon"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Kaŝu kiam senkonekta"
-
-#, fuzzy
+msgstr "Kaŝi Kiam Senkonekta"
+
 msgid "Show When Offline"
-msgstr "Montru kiam senkonekta"
+msgstr "Montri Kiam Senkonekta"
 
 msgid "_Alias..."
 msgstr "_Alinomo..."
@@ -10012,9 +9823,8 @@
 msgid "_Remove"
 msgstr "Fo_rigu"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Difinu Propran Piktogramon..."
+msgstr "Difinu Propran Piktogramon"
 
 msgid "Remove Custom Icon"
 msgstr "Forigu Propran Piktogramon"
@@ -10041,9 +9851,8 @@
 msgid "Persistent"
 msgstr "Daŭra"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "Agordu"
+msgstr "_Redakti Agordojn..."
 
 msgid "_Collapse"
 msgstr "_Maletendu"
@@ -10117,9 +9926,8 @@
 msgid "/_Accounts"
 msgstr "/_Kontoj"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/Kontoj/Mastrumu"
+msgstr "/Kontoj/Mastrumi Kontoj"
 
 #. Tools
 msgid "/_Tools"
@@ -10131,9 +9939,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Iloj/_Atestiloj"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Iloj/Privateco"
+msgstr "/Iloj/Propaj Pi_ktogramoj"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Iloj/Kromaĵo_j"
@@ -10173,11 +9980,13 @@
 msgid "<b>Account:</b> %s"
 msgstr "<b>Konto:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
-msgstr "<b>Konto:</b> %s"
+msgstr ""
+"\n"
+"<b>Okupantoj:</b> %d"
 
 #, c-format
 msgid ""
@@ -10302,7 +10111,7 @@
 msgstr "/Kontoj"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10313,8 +10122,8 @@
 "<span weight='bold' size='larger'>Bonvenon en %s!</span>\n"
 "\n"
 "Vi havas neniun konton ŝaltitan. Ŝaltu viajn TM kontojn per la <b>Kontoj</b> "
-"fenestro ĉe <b>Kontoj->Mastrumi</b>. Post la ŝalto de kontoj, vi povos "
-"ensaluti, difini vian staton, kaj babiladi kun viaj amikoj."
+"fenestro ĉe <b>Kontoj->Mastrumi Kontojn</b>. Post la ŝalto de kontoj, vi "
+"povos ensaluti, difini vian staton, kaj babiladi kun viaj amikoj."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10334,21 +10143,17 @@
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Kunuloj/Montru/Malplenajn Grupojn"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "Aldonu Kunulon"
-
-#, fuzzy
+msgstr "Aldoni Kunulon.\n"
+
 msgid "Buddy's _username:"
-msgstr "Kunul nomo:"
-
-#, fuzzy
+msgstr "Kunul _uzantnomo:"
+
 msgid "(Optional) A_lias:"
-msgstr "Opcia informo:"
-
-#, fuzzy
+msgstr "(Opcia) A_linomo:"
+
 msgid "Add buddy to _group:"
-msgstr "Aldonu kunulon al via listo?"
+msgstr "Aldoni kunulon al _grupo:"
 
 msgid "This protocol does not support chat rooms."
 msgstr ""
@@ -10390,7 +10195,7 @@
 msgstr "<PurpleMain>/Kontoj/"
 
 msgid "_Edit Account"
-msgstr "_Redaktu Konton"
+msgstr "_Redakti Konton"
 
 msgid "No actions available"
 msgstr "Neniu ago disponebla"
@@ -10411,88 +10216,76 @@
 msgid "The background color for the buddy list"
 msgstr ""
 
-#, fuzzy
 msgid "Layout"
-msgstr "Laŭa"
+msgstr ""
 
 msgid "The layout of icons, name, and status of the blist"
 msgstr ""
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Malantaŭa Koloro"
+msgstr ""
 
 msgid "The background color of an expanded group"
 msgstr ""
 
-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Etendu"
+msgstr ""
 
 msgid "The text information for when a group is expanded"
 msgstr ""
 
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Elektu Malantaŭan Koloron"
+msgstr ""
 
 msgid "The background color of a collapsed group"
 msgstr ""
 
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_Maletendu"
+msgstr ""
 
 msgid "The text information for when a group is collapsed"
 msgstr ""
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Elektu Malantaŭan Koloron"
+msgstr "Kontakt/Babilan Malantaŭan Koloron"
 
 msgid "The background color of a contact or chat"
 msgstr ""
 
-#, fuzzy
 msgid "Contact Text"
-msgstr "Ordigi"
+msgstr "Kontakt-Teksto"
 
 msgid "The text information for when a contact is expanded"
 msgstr ""
 
-#, fuzzy
 msgid "On-line Text"
-msgstr "Enrete"
+msgstr "Konektita Teksto"
 
 msgid "The text information for when a buddy is online"
 msgstr ""
 
-#, fuzzy
 msgid "Away Text"
-msgstr "Fora"
+msgstr "Fora Teksto"
 
 msgid "The text information for when a buddy is away"
 msgstr ""
 
-#, fuzzy
 msgid "Off-line Text"
-msgstr "Senkonekta"
+msgstr "Senkonekta Teksto"
 
 msgid "The text information for when a buddy is off-line"
 msgstr ""
 
-#, fuzzy
 msgid "Idle Text"
-msgstr "Agorda Teksto"
+msgstr "Senfara Teksto"
 
 msgid "The text information for when a buddy is idle"
 msgstr ""
 
-#, fuzzy
 msgid "Message Text"
-msgstr "Mesaĝo sendita"
+msgstr "Mesaĝo Teksto"
 
 msgid "The text information for when a buddy has an unread message"
 msgstr ""
@@ -10505,9 +10298,8 @@
 "your nick"
 msgstr ""
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "Ŝanĝu uzanto-informon de %s"
+msgstr ""
 
 msgid "Type the host name for this certificate."
 msgstr ""
@@ -10557,9 +10349,8 @@
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "Laste diris"
+msgstr "Laste Diris"
 
 msgid "Unable to save icon file to disk."
 msgstr "Ne eblas konservi piktogramodosieron al disko."
@@ -10579,9 +10370,8 @@
 msgid "Set Custom Icon..."
 msgstr "Difinu Propran Piktogramon..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "Ŝanĝu staton"
+msgstr "Ŝanĝu Grandecon"
 
 msgid "Show All"
 msgstr "Montru Ĉiujn"
@@ -10605,21 +10395,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversacio/Fo_rviŝu Dialogon"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Konversacio/_Pli"
-
-#, fuzzy
+msgstr "/Konversacio/M_edio"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Konversacio/_Pli"
-
-#, fuzzy
+msgstr "/Konversacio/Medio/_Aŭda Alvoko"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Konversacio/_Pli"
-
-#, fuzzy
+msgstr "/Konversacio/Medio/_Vida Alvoko"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Konversacio/Montru _Protokolon"
+msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvo_ko"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversacio/Se_ndu Dosieron..."
@@ -10693,17 +10479,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Konversacio/Montru Protokoladon"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Konversacio/Pli"
-
-#, fuzzy
+msgstr "/Konversacio/Medio/Aŭda Alvoko"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Konversacio/Montru Protokoladon"
-
-#, fuzzy
+msgstr "/Konversacio/Medio/Vida Alvoko"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Konversacio/Pli"
+msgstr "/Konversacio/Medio/Aŭda\\/Vida Alvoko"
 
 msgid "/Conversation/Send File..."
 msgstr "/Konversacio/Sendu Dosieron..."
@@ -10881,9 +10664,8 @@
 msgid "bug master"
 msgstr ""
 
-#, fuzzy
 msgid "artist"
-msgstr "Artisto"
+msgstr "artisto"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
@@ -10895,9 +10677,8 @@
 msgid "support"
 msgstr "subteno"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "programisto kaj retestro"
+msgstr "retestro"
 
 msgid "Senior Contributor/QA"
 msgstr ""
@@ -10919,7 +10700,7 @@
 msgstr "subteno/Kvalitkontrolo"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "originala aŭtoro"
@@ -10996,9 +10777,8 @@
 msgid "French"
 msgstr "Franca"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Kurda"
+msgstr "Irlanda"
 
 msgid "Galician"
 msgstr "Galega"
@@ -11018,9 +10798,8 @@
 msgid "Hungarian"
 msgstr "Hungara"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Rumana"
+msgstr "Armena"
 
 msgid "Indonesian"
 msgstr "Indonezia"
@@ -11037,9 +10816,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntaj Kartvelaj Tradukantoj"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Alia"
+msgstr "Ĥmera"
 
 msgid "Kannada"
 msgstr "Kanara"
@@ -11062,9 +10840,8 @@
 msgid "Macedonian"
 msgstr "Makedona"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Makedona"
+msgstr "Mongola"
 
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norvega"
@@ -11079,7 +10856,7 @@
 msgstr "Norvega Ninorska"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Okcitana"
 
 msgid "Punjabi"
 msgstr "Panĝaba"
@@ -11115,13 +10892,13 @@
 msgstr "Serba"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "Sinhala"
 
 msgid "Swedish"
 msgstr "Sveda"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Svahila"
 
 msgid "Tamil"
 msgstr "Tamila"
@@ -11136,7 +10913,7 @@
 msgstr "Turka"
 
 msgid "Urdu"
-msgstr ""
+msgstr "Urdua"
 
 msgid "Vietnamese"
 msgstr "Vjetnama"
@@ -11194,14 +10971,15 @@
 "\">support@pidgin.im</A><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=\"4\">IRC:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">IRC kanalo:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Aktualaj Programistoj"
@@ -11233,13 +11011,12 @@
 msgid "Get User Info"
 msgstr "Ricevu Uzanto-Informon"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Bonvolu enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
-"rigardi."
+"Bonvolu enigi la uzantnomon aŭ alinomon de persono kiesan informon vi "
+"deziras rigardi."
 
 msgid "View User Log"
 msgstr "Rigardu Uzanto-Protokolon"
@@ -11337,45 +11114,35 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Ŝanĝu staton"
-
-#, fuzzy
+msgstr "Ŝ_anĝu staton"
+
 msgid "Show Buddy _List"
-msgstr "Montru kunulliston"
-
-#, fuzzy
+msgstr "Montru Kunul_liston"
+
 msgid "_Unread Messages"
-msgstr "Nelegitaj mesaĝoj"
-
-#, fuzzy
+msgstr "_Nelegitaj Mesaĝoj"
+
 msgid "New _Message..."
-msgstr "Nova mesaĝo..."
-
-#, fuzzy
+msgstr "Nova _Mesaĝo..."
+
 msgid "_Accounts"
-msgstr "/_Kontoj"
-
-#, fuzzy
+msgstr "_Kontoj"
+
 msgid "Plu_gins"
-msgstr "Kromaĵoj"
-
-#, fuzzy
+msgstr "K_romaĵoj"
+
 msgid "Pr_eferences"
-msgstr "Agordo"
-
-#, fuzzy
+msgstr "Ag_ordoj"
+
 msgid "Mute _Sounds"
-msgstr "Malsonorigu"
-
-#, fuzzy
+msgstr "Mal_sonorigu"
+
 msgid "_Blink on New Message"
-msgstr "Flagri je Nova Mesaĝo"
-
-#, fuzzy
+msgstr "_Flagri je Nova Mesaĝo"
+
 msgid "_Quit"
-msgstr "Finu"
+msgstr "_Finu"
 
 msgid "Not started"
 msgstr "Malkomencita"
@@ -11435,14 +11202,6 @@
 msgid "File transfer _details"
 msgstr "Dosiero-transmeto _detaloj"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Paŭzo"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Rekomenci"
-
 msgid "Paste as Plain _Text"
 msgstr "Enmetu keil Plena _Teksto"
 
@@ -11458,9 +11217,8 @@
 msgid "Color to draw hyperlinks."
 msgstr "Koloro ligila."
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Ligila koloro"
+msgstr "Vizitita ligilo koloro"
 
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
@@ -11501,31 +11259,26 @@
 msgid "Color to draw the name of a whispered action message."
 msgstr ""
 
-#, fuzzy
 msgid "Whisper Message Name Color"
-msgstr "Senditaj Mesaĝoj Nomoj Koloro"
+msgstr ""
 
 msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "Avizo Forigo"
-
-#, fuzzy
+msgstr ""
+
 msgid "The color to use for the typing notification"
-msgstr "Nova retpoŝt-avizoj"
-
-#, fuzzy
+msgstr ""
+
 msgid "Typing notification font"
-msgstr "Ŝprucigu avizon"
+msgstr ""
 
 msgid "The font to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "Nova retpoŝt-avizoj"
+msgstr ""
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11571,9 +11324,8 @@
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "Montru personajn ridmienojn"
+msgstr "_Aldoni Propajn Ridmienojn..."
 
 msgid "Select Font"
 msgstr "Elektu Tiparon"
@@ -11622,9 +11374,8 @@
 msgid "Smile!"
 msgstr "Ridetu!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "Montru personajn ridmienojn"
+msgstr "_Mastumi proprajn ridmienojn"
 
 msgid "This theme has no available smileys."
 msgstr "Tiu temo havas neniujn disponeblajn ridmienojn"
@@ -11758,13 +11509,13 @@
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "_Foliumi protokolujon"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Provu `%s -h' por pli da informo.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -11786,15 +11537,18 @@
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
 "  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -f, --force-online  devigu konektita, sendistinge je reta stato\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
-"  -m, --multiple       ne devigu unuopa ruliĝo\n"
+"  -m, --multiple      ne devigu unuopa ruliĝo\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
 "specifas\n"
-"                      konto(j)n uzendajn, disigitajn per komoj)\n"
+"                      konto(j)n uzendajn, disigitajn per komoj.\n"
+"                      Sen tio, nur la unua konto estos ensalutita).\n"
+"  --display=DISPLAY   X vidilo uzenda\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -11815,12 +11569,15 @@
 "\n"
 "  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
 "  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -f, --force-online  devigu konektita, sendistinge je reta stato\n"
 "  -h, --help          vidigu tiun helpon kaj finu\n"
 "  -m, --multiple       ne devigu unuopa ruliĝo\n"
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
 "specifas\n"
-"                      konto(j)n uzendajn, disigitajn per komoj)\n"
+"                      konto(j)n uzendajn, disigitajn per komoj.\n"
+"                      Sen tio, nur la unua konto estos ensalutita).\n"
+"  --display=DISPLAY   X vidilo uzenda\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
 #, c-format
@@ -11849,14 +11606,13 @@
 msgstr ""
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Medio"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Medio/_Rekroĉi"
+
 msgid "Calling..."
-msgstr "Kalkulante..."
+msgstr "Alvokante..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -11866,6 +11622,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "_Paŭzo"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -11894,9 +11656,8 @@
 msgstr ""
 "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
 
-#, fuzzy
 msgid "No message"
-msgstr "Nekonata mesaĝo"
+msgstr "Neniu mesaĝo"
 
 msgid "Open All Messages"
 msgstr "Malfermu Ĉiujn Mesaĝojn"
@@ -11904,16 +11665,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Nova Kunul Atentigo"
+msgstr ""
 
 msgid "Dismiss"
 msgstr ""
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
+msgstr ""
 
 msgid "The following plugins will be unloaded."
 msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
@@ -11932,30 +11691,25 @@
 "startup."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
-"Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
-
-#, fuzzy
+"<span foreground=\"red\" weight=\"bold\">Eraro: %s\n"
+"Kontrolu kromaĵan retsituon por ĝisdatigo.</span>"
+
 msgid "Author"
-msgstr "Permesu"
-
-#, fuzzy
+msgstr "Aŭtoro"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>Sendante Al:</b>"
-
-#, fuzzy
+msgstr "<b>Verkita de::</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>Sendante Kiel:</b>"
-
-#, fuzzy
+msgstr "<b>Retejo:</b>"
+
 msgid "<b>Filename:</b>"
-msgstr "<b>Uzantonomo:</b>"
+msgstr "<b>Dosiernomo:</b>"
 
 msgid "Configure Pl_ugin"
 msgstr "Agrod_u Kromaĵon"
@@ -11966,9 +11720,8 @@
 msgid "Select a file"
 msgstr "Elektu dosieron"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Redaktu Kunul Atentigo"
+msgstr ""
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12043,57 +11796,55 @@
 msgid "Pounce Target"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "Ektajpas"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "Paŭzas tajpante"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "Ensalutas"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s revenis el senfarado (%s)"
-
-#, fuzzy, c-format
+msgstr "Revenis el senfarado"
+
+#, c-format
 msgid "Returned from being away"
 msgstr "Ekmalforiĝas"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "Ekmaltajpas"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "Audiaŭas"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "Eksenfaras"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
 msgstr "Kiam fora"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Sent a message"
-msgstr "Sendu mesaĝon"
+msgstr "Sendis mesaĝon"
 
 #, c-format
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "GStreamer malsukcesis ekon."
-
-#, fuzzy
+msgstr ""
+
 msgid "Theme failed to load."
-msgstr "Malsukcesis ŝargi bildon"
+msgstr ""
 
 msgid "Theme failed to copy."
 msgstr ""
@@ -12114,14 +11865,12 @@
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Konversacioj kun %s"
+msgstr ""
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Kunullisto"
+msgstr ""
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12133,9 +11882,8 @@
 msgid "On unread messages"
 msgstr "Je nelegitaj mesaĝoj"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "TM Konversacio Fenestroj"
+msgstr "Konversacio Fenestroj"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
@@ -12238,9 +11986,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Aŭtodetekti IP adreson"
+msgstr "Uzi _aŭtodetektitan IP adreson: %s"
 
 msgid "Public _IP:"
 msgstr "Publika _IP:"
@@ -12279,10 +12027,10 @@
 msgstr ""
 
 msgid "Configure _Proxy"
-msgstr "Agordu _Prokurilon"
+msgstr "Agordi _Prokurilon"
 
 msgid "Configure _Browser"
-msgstr "Agordu _Retumilon"
+msgstr "Agordi _Retumilon"
 
 msgid "Proxy Server"
 msgstr "Prokura Servilo"
@@ -12415,31 +12163,26 @@
 "Sono k_omando:\n"
 "(%s por dosiernomo)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Malsonorigu"
+msgstr "_Malsonorigu"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Sonu kiam konversacio _fokusas"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Ŝaltu Sonojn:"
-
-#, fuzzy
+msgstr "Ŝ_altu sonojn:"
+
 msgid "V_olume:"
-msgstr "Laŭteco:"
+msgstr "Laŭtec_o:"
 
 msgid "Play"
 msgstr "Ludu"
 
-#, fuzzy
 msgid "_Browse..."
 msgstr "Fol_iumi..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "Restarigu"
+msgstr "_Restarigu"
 
 msgid "_Report idle time:"
 msgstr "_Raportu senfaran tempon:"
@@ -12615,53 +12358,42 @@
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-#, fuzzy
 msgid "Custom Smiley"
-msgstr "Enmetu Ridmienon"
-
-#, fuzzy
+msgstr "Propra Ridmieno"
+
 msgid "Duplicate Shortcut"
-msgstr "Duobligo Korekto"
-
-#, fuzzy
+msgstr "Duobliga Ligilo"
+
 msgid "Edit Smiley"
-msgstr "Enmetu Ridmienon"
-
-#, fuzzy
+msgstr "Redakti Ridmienon"
+
 msgid "Add Smiley"
-msgstr "Ridetu!"
-
-#, fuzzy
+msgstr "Aldoni Ridmienon"
+
 msgid "_Image:"
-msgstr "B_ildon"
+msgstr "B_ildon:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Ordigi"
-
-#, fuzzy
+msgstr "L_igilo teksto:"
+
 msgid "Smiley"
-msgstr "Ridetu!"
-
-#, fuzzy
+msgstr "Ridmieno"
+
 msgid "Shortcut Text"
-msgstr "Ordigi"
+msgstr "Ligilo teksto"
 
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Elektu Kunulon"
-
-#, fuzzy
+msgstr "Elektu Kunulan Piktogramon"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
-
-#, fuzzy
+msgstr "Klaku por ŝanĝi vian kunul-piktogramon por tiu konto."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
+msgstr "Klaku por ŝanĝi vian kunul-piktogramon por ĉiuj kontoj."
 
 msgid "Waiting for network connection"
 msgstr "Atendante retkonekto"
@@ -12672,9 +12404,8 @@
 msgid "Saved statuses..."
 msgstr "Konservitaj statoj..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "Sono Elekto"
+msgstr "Stato Elektilo"
 
 msgid "Google Talk"
 msgstr "Gogla Babilado"
@@ -12770,9 +12501,8 @@
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Malfermu ligilon per:"
+msgstr "_Malfermu ligilon"
 
 msgid "_Copy Link Location"
 msgstr "_Kopiu Ligilo-Lokon"
@@ -12780,9 +12510,21 @@
 msgid "_Copy Email Address"
 msgstr "_Kopiu Retadreson"
 
+msgid "_Open File"
+msgstr "Malfermu _Dosieron"
+
+msgid "Open _Containing Directory"
+msgstr ""
+
 msgid "Save File"
 msgstr "Konservu Dosieron"
 
+msgid "_Play Sound"
+msgstr "_Ludu sonon"
+
+msgid "_Save File"
+msgstr "_Konservu Dosieron"
+
 msgid "Select color"
 msgstr "Elektu koloron"
 
@@ -12798,20 +12540,17 @@
 msgid "_Invite"
 msgstr "_Ivitu"
 
-#, fuzzy
 msgid "_Modify..."
 msgstr "Ŝ_anĝu..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "_Aldonu"
+msgstr "_Aldonu.."
 
 msgid "_Open Mail"
 msgstr "_Malfermu retmesaĝon"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "Redaktu"
+msgstr "_Redaktu"
 
 msgid "Pidgin Tooltip"
 msgstr ""
@@ -12828,9 +12567,8 @@
 msgid "none"
 msgstr "neniu"
 
-#, fuzzy
 msgid "Small"
-msgstr "Retadreso"
+msgstr "Malgranda"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -12874,66 +12612,55 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Servilo adreso"
-
-#, fuzzy
+msgstr ""
+
 msgid "Enter an XMPP Server"
-msgstr "Enigu Konferencan Servilon"
-
-#, fuzzy
+msgstr "Enigu XMPP Servilon"
+
 msgid "Select an XMPP server to query"
-msgstr "Elektu konferencan servilon petendan"
-
-#, fuzzy
+msgstr "Elektu XMPP servilon petendan"
+
 msgid "Find Services"
-msgstr "Trovu kunulojn"
-
-#, fuzzy
+msgstr "Trovu Servojn"
+
 msgid "Add to Buddy List"
-msgstr "Sendu Kunulliston"
-
-#, fuzzy
+msgstr "Aldoni al Kunulliston"
+
 msgid "Gateway"
-msgstr "Foriĝas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Directory"
-msgstr "Protokolo Dosierujo"
-
-#, fuzzy
+msgstr "Dosierujo"
+
 msgid "PubSub Collection"
-msgstr "Sono Elekto"
+msgstr ""
 
 msgid "PubSub Leaf"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Priskibo"
+msgstr ""
+"\n"
+"<b>Priskibo:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Servico Malkovrado Informo"
-
-#, fuzzy
+msgstr "Servo Malkovrado"
+
 msgid "_Browse"
-msgstr "_Retumilo:"
-
-#, fuzzy
+msgstr "_Retumilo"
+
 msgid "Server does not exist"
-msgstr "Uzanto ne ekzistas"
+msgstr "Servilo ne ekzistas"
 
 msgid "Server does not support service discovery"
 msgstr ""
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "Servico Malkovrado Informo"
+msgstr "XMPP Servo Malkovrado"
 
 msgid "Allows browsing and registering services."
 msgstr ""
@@ -13184,9 +12911,8 @@
 msgid "Please enter the person's information below."
 msgstr ""
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
-msgstr "Bonvolu enigi la kunul ekrannomo kaj kontotipo sube."
+msgstr "Bonvolu enigi la kunul uzantnomon kaj kontotipon sube."
 
 msgid "Account type:"
 msgstr "Konto tipo:"
@@ -13316,7 +13042,6 @@
 msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
 
 #. *  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."
@@ -13328,9 +13053,8 @@
 msgid "Notify For"
 msgstr "Avizu Por"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t_Nur kiam iun diras vian ekran nomon"
+msgstr "\t_Nur kiam iun diras vian uzantnomon"
 
 msgid "_Focused windows"
 msgstr "_Fokusitaj fenestoj"
@@ -13354,18 +13078,16 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "B_abilfenestroj"
+msgstr ""
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "Startigu konversacio-fenestron"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "Startigu konversacio-fenestron"
+msgstr "_Nuna konversacio-fenestro"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13437,16 +13159,14 @@
 msgid "Hyperlink Color"
 msgstr "Ligilo Koloro"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Ligilo Koloro"
+msgstr "Vizitita Ligilo Koloro"
 
 msgid "Highlighted Message Name Color"
 msgstr "Emfazitaj Mesaĝoj Nomo Koloro"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Avizo Forigo"
+msgstr ""
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
@@ -13477,17 +13197,14 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Nova retpoŝt-avizoj"
-
-#, fuzzy
+msgstr ""
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Piĝin GTK+ Etoso Kontrolo"
-
-#, fuzzy
+msgstr "GTK+ Etoso Kontrolo Agordoj"
+
 msgid "Colors"
-msgstr "Fermu"
+msgstr "Koloroj"
 
 msgid "Fonts"
 msgstr "Tiparoj"
@@ -13529,13 +13246,11 @@
 msgid "New Version Available"
 msgstr "Nova Versio Disponebla"
 
-#, fuzzy
 msgid "Later"
-msgstr "Dato"
-
-#, fuzzy
+msgstr "Poste"
+
 msgid "Download Now"
-msgstr "Uzantoj ĉe %s: %s"
+msgstr "Elŝuti Nun"
 
 #. *< type
 #. *< ui_requirement
@@ -13567,15 +13282,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "Sendu Al"
+msgstr "Send-Butono"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "Konversacio Fenestroj Kaŝeco"
+msgstr "Konversacio Fenestro Sendo Butono."
 
 #. *< summary
 msgid ""
@@ -13632,91 +13345,76 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Ne ensalutita"
-
-#, fuzzy
+msgstr "Ĵus ensalutita"
+
 msgid "Just logged out"
-msgstr "Ne ensalutita"
+msgstr "Ĵus elsalutita"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
 
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "Aliĝu Babilejon"
-
-#, fuzzy
+msgstr "Piktogramo por Babilejo"
+
 msgid "Ignored"
-msgstr "Ignoru"
-
-#, fuzzy
+msgstr "Ignorita"
+
 msgid "Founder"
-msgstr "Pli Laŭte"
-
-#, fuzzy
+msgstr ""
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opero"
-
+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 "Permeso Donita"
-
-#, fuzzy
+msgstr ""
+
 msgid "Error dialog"
-msgstr "Eraro "
-
-#, fuzzy
+msgstr ""
+
 msgid "Information dialog"
-msgstr "Informo"
+msgstr ""
 
 msgid "Mail dialog"
 msgstr ""
 
-#, fuzzy
 msgid "Question dialog"
-msgstr "Peto Dialogujo"
-
-#, fuzzy
+msgstr ""
+
 msgid "Warning dialog"
-msgstr "Averto"
+msgstr ""
 
 msgid "What kind of dialog is this?"
 msgstr ""
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "Stato por %s"
-
-#, fuzzy
+msgstr ""
+
 msgid "Chatroom Emblems"
-msgstr "Babilejo lokaĵaro"
-
-#, fuzzy
+msgstr ""
+
 msgid "Dialog Icons"
-msgstr "Konservu Piktogramon"
-
-#, fuzzy
+msgstr ""
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Piĝin GTK+ Etoso Kontrolo"
-
-#, fuzzy
+msgstr "Piĝin Piktogramo Etoso Redaktilo"
+
 msgid "Contact"
-msgstr "Kontakto Informo"
-
-#, fuzzy
+msgstr "Kontakto"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Kunullisto"
-
-#, fuzzy
+msgstr ""
+
 msgid "Edit Buddylist Theme"
-msgstr "Kunullisto"
+msgstr ""
 
 msgid "Edit Icon Theme"
 msgstr ""
@@ -13728,16 +13426,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Piĝin GTK+ Etoso Kontrolo"
+msgstr "Piĝin Etoso Redaktilo"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Piĝin GTK+ Etoso Kontrolo"
+msgstr "Piĝin Etoso Redaktilo."
 
 #. *< type
 #. *< ui_requirement
@@ -13902,10 +13598,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcioj apartaj al Piĝin Vindoza."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "Opcioj apartaj al Piĝin Vindoza."
+msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -13944,6 +13639,12 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invito malakceptita"
+
+#~ msgid "_Resume"
+#~ msgstr "_Rekomenci"
+
 #~ msgid "Connection failed."
 #~ msgstr "Konekto malsukcesis."
 
@@ -14038,24 +13739,12 @@
 #~ msgid "Could Not Connect"
 #~ msgstr "Ne Povas Konekti"
 
-#, fuzzy
-#~ msgid "Invalid username."
-#~ msgstr "Malvalida Uzantonomo"
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Konekto servilo"
-
 #~ msgid "Connection lost"
 #~ msgstr "Konekto perdita"
 
 #~ msgid "Connection closed (writing)"
 #~ msgstr "Koneto fermita (skribante)"
 
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Misa pasvorto"
-
 #~ msgid "Yahoo Japan"
 #~ msgstr "Yahoo Japanio"
 
@@ -14075,10 +13764,6 @@
 #~ msgid "Conversation Window Hiding"
 #~ msgstr "Konversacio Fenestroj Kaŝeco"
 
-#, fuzzy
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Bonvolu enigi novan nomon por vi."
-
 #~ msgid "Activate which ID?"
 #~ msgstr "Ŝaltu kiun ID?"
 
@@ -14094,33 +13779,9 @@
 #~ msgid "Widget Sizes"
 #~ msgstr "Fenestraĵo Grandecoj"
 
-#, fuzzy
-#~ msgid "Invite message"
-#~ msgstr "Enmetu en mesaĝon"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Bonvolu enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
-#~ "invitmesaĝon."
-
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "Ne eblas ricevi MSN Adresaron"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Aldonu Kunulon"
-
-#, fuzzy
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Perdis konekton kun servilo:\n"
-#~ "%s"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "Malsukcesis sendi tujmesaĝon."
 
@@ -14130,10 +13791,6 @@
 #~ msgid "Country not supported."
 #~ msgstr "Lando ne subtenita."
 
-#, fuzzy
-#~ msgid "Incorrect username or password."
-#~ msgstr "Misa ekrannomo aŭ pasvorto."
-
 #~ msgid "An unknown signon error has occurred: %s."
 #~ msgstr "Nekonata ensaluteraro okazis: %s."
 
@@ -14185,10 +13842,6 @@
 #~ msgid "ST_UN server:"
 #~ msgstr "ST_UN servilo:"
 
-#, fuzzy
-#~ msgid "Smiley _Image"
-#~ msgstr "Konservu Bildon"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "Samnomita grupo jam ekzistas."
 
@@ -14198,17 +13851,9 @@
 #~ msgid "Blood Type"
 #~ msgstr "Sanga Tipo"
 
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Rapideco:"
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Malvalida QQ Aspekto"
 
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ Nombro"
-
 #~ msgid "Group Description"
 #~ msgstr "Grupo Priskribo"
 
@@ -14221,31 +13866,15 @@
 #~ msgid "I am a member"
 #~ msgstr "Mi estas membro"
 
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Malbona Demando"
-
 #~ msgid "Unknown status"
 #~ msgstr "Nekonata stato"
 
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Forigu Grupon"
-
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "Ĉu vi certas vi volas forigi tiun Qun?"
 
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "Ĉu vi volas jesi tiun demandon?"
 
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefonnumero"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Ŝanĝu uzanto-informon de %s"
-
 #~ msgid "System Message"
 #~ msgstr "Sistema Mesaĝo"
 
@@ -14255,50 +13884,6 @@
 #~ msgid "Block this buddy"
 #~ msgstr "Bloku tiun kunulon"
 
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Erara ŝanĝante pasvorton"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Malsukcesis konekti servilon."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Konekto servilo"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Ĉu vi volas jesi tiun demandon?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Ĉu vi volas aldoni tiun kunul?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s aldonis vin [%s] en sia kunul listo"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Kunul"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s aldonis vin en sia kunul listo."
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Ĉu vi deziras aldoni ŝlin?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Servilo pordo"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "%s malkontaktita"
-
 #~ msgid "developer"
 #~ msgstr "programisto"