changeset 28349:901476dc70b9

propagate from branch 'im.pidgin.pidgin' (head dd712fa84e46b2d78adf28e914d3e1a5c18a5154) to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head bbfae195c9c51fc001abbf89a084b54d4ec4b549)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 19 Aug 2009 00:37:01 +0000
parents 2253903841a6 (current diff) 617e7a90b69c (diff)
children 0a587ffcab9b 268f58ce1289
files ChangeLog finch/gntmedia.c libpurple/ft.c libpurple/protocols/jabber/buddy.c libpurple/protocols/oscar/oscar.c libpurple/protocols/yahoo/libymsg.c pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmedia.c
diffstat 96 files changed, 6696 insertions(+), 9683 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 17 15:56:16 2009 +0000
+++ b/ChangeLog	Wed Aug 19 00:37:01 2009 +0000
@@ -4,7 +4,7 @@
 	XMPP:
 	* Prompt the user before cancelling a presence subscription.
 
-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.
@@ -17,10 +17,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
@@ -35,20 +57,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.
 
 	AIM and ICQ:
 	* Preliminary support for a new authentication scheme called
@@ -67,6 +75,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
@@ -119,6 +138,8 @@
 	* When the GNU IDN library (libidn) is available, it is used for
 	  normalization of Jabber IDs.  When unavailable, internal routines are
 	  used (as in previous versions).
+	* Topics that contain '<' followed by a non-whitespace character can now
+	  be set properly.
 
 	Yahoo!/Yahoo! JAPAN:
 	* P2P file transfers.  (Sulabh Mahajan)
@@ -134,15 +155,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.
-	* Add support for receiving audio clips on MSN.
-	* 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.
@@ -182,11 +194,16 @@
 	* Fix a crash when closing the New Mail dialog if an account with new
 	  mail was previously disconnected while the dialog was open.
 	* Fix incorrect unread message counts for the new mail notifications.
+	* Do not lose unread messages with a hidden conversation window when
+	  new IM conversations are hidden and "Close IMs immediately when the tab
+	  is closed" is unset.
 
 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
 	  especially for users of braille terminals, screen readers etc.
 	* Added a TinyURL plugin, which aids copying longer URLs.
+	* Fixed UTF-8 compatibility problems which could cause exits or other
+	  unrequested behaviour.
 
 	Pidgin GTK+ Theme Control Plugin:
 	* Removed mouse cursor color preferences.
@@ -195,6 +212,13 @@
 	* Preferences have been reorganized into three tabs for Colors, Fonts, and
 	  Miscellaneous categories.
 
+version 2.5.9 (08/18/2009):
+	* Fix a crash via a specially crafted MSN message (CVE-2009-2694,
+	  thanks to Core Security Technologies for discovering this and
+	  notifying us privately before announcing it).
+	* Fix a crash in Bonjour, MSN, and XMPP when trying to transfer files with
+	  NULL names.
+
 version 2.5.8 (06/27/2009):
 	ICQ:
 	* Fix misparsing a web message as an SMS message. (Yuriy Kaminskiy)
--- a/ChangeLog.API	Mon Aug 17 15:56:16 2009 +0000
+++ b/ChangeLog.API	Wed Aug 19 00:37:01 2009 +0000
@@ -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
@@ -18,6 +18,9 @@
 		* Three Blist UI ops used to overload libpurple's built-in saving
 		  of the buddy list to blist.xml. If a UI implements these, it probably
 		  wants to add the buddies itself and not call purple_blist_load.
+		* Three File Transfer UI ops used to overload libpurple's use of fread
+		  and fwrite for saving a file locally. These allow a UI to stream a
+		  file through a socket without buffering the file on the local disk.
 		* Jabber plugin signals (see jabber-signals.dox)
 		* purple_account_remove_setting
 		* purple_buddy_destroy
@@ -65,6 +68,8 @@
 		* purple_strequal
 		* purple_utf8_strip_unprintables
 		* purple_util_fetch_url_request_len_with_account
+		* purple_xfer_prpl_ready
+		* purple_xfer_ui_ready
 		* xmlnode_from_file
 		* xmlnode_get_parent
 		* xmlnode_set_attrib_full
@@ -95,6 +100,10 @@
 		* status is set before emitting signals in purple_xfer_set_status.
 		* Creating multiple distinct chats with the same name (i.e. "MSN Chat")
 		  is deprecated and will be removed in libpurple 3.0.0.
+		* purple_xfer_start now accepts -1 as the fd parameter if the protocol
+		  plugin will administer the transfer itself. 0 is still accepted for
+		  backward compatibility since older versions of libpurple will not
+		  accept -1.
 
 		Deprecated:
 		* buddy-added and buddy-removed blist signals
@@ -145,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(...):
@@ -158,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	Mon Aug 17 15:56:16 2009 +0000
+++ b/ChangeLog.win32	Wed Aug 19 00:37:01 2009 +0000
@@ -1,4 +1,8 @@
-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/INSTALL	Mon Aug 17 15:56:16 2009 +0000
+++ b/INSTALL	Wed Aug 19 00:37:01 2009 +0000
@@ -158,7 +158,7 @@
 
 	`--with-dynamic-prpls' takes a list of comma separated protocols also.  If used only those listed will be built.  If no protocols are listed with either `--with-static-prpls' or with `--with-dynamic-prpls' then Pidgin and Finch will be effectively useless.
 
-	If configure does not find python, it will build without DBUS support.  Thiswill disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
+	If configure does not find python, it will build without DBUS support.  This will disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
 
 Specifying the System Type
 ==========================
--- a/NEWS	Mon Aug 17 15:56:16 2009 +0000
+++ b/NEWS	Wed Aug 19 00:37:01 2009 +0000
@@ -2,6 +2,51 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.6.0 (08/18/2009):
+	John:  Wow, four straight releases that I'm the first to NEWS on.  This
+	is getting kinda scary!  I'm beginning to wonder who else actually does
+	anything around here!  (Just kidding, of course.)  LOTS of new features
+	and a crapton of bugfixes this release.  There should pretty much be
+	something for everybody.  A great example of this is the ton of Yahoo
+	changes that have happened thanks to our SoC student from 2008, Sulabh
+	Mahajan.  Among his massive improvements are the ability to add MSN
+	buddies by adding them as "msn/user@domain.tld" and peer-to-peer file
+	transfers.  Of course, history shows we can't please everyine, so I'm
+	sure I'll see a complaint or five thousand in trac.  Enjoy, though!
+
+	Marcus: This is my first news! It's been quite a few microreleases this
+	time, but now we're finally at 2.6.0. I suppose the most anticipated
+	new feature in this release is the voice and video support, thanks to
+	Mike's heroic work. I've managed to slip in a few features too, like
+	in-band bytestream file transfers as a fallback on XMPP and idle time
+	reporting on XMPP. Enjoy!
+
+	Paul: This is my first news, too!  This release has definitely been a
+	long time coming; hopefully it won't disappoint since we've closed over
+	200 tickets.  Among other things, Tobias Markmann's GSoC project from
+	last year was merged, which means we now support BOSH (XMPP connections
+	over HTTP), and Andrei Mozzhuhin contributed an XMPP Service Discovery
+	Browser.  Also, thanks to Bernmeister for poking (at least) several
+	hundred old tickets!
+
+	Mike: Ditto. This is my first news as well. I have a feeling this is
+	getting repetitive at this point, but voice and video support is
+	finally here! Thanks to the rest of the Pidgin team, Farsight 2, and
+	GStreamer developers for making this possible! (I finally finished my
+	Summer of Code project :D)
+
+	Elliott: Hey, this is my firs... Wait, no it isn't.  Now I feel left
+	out.  So have you heard about this voice and video thing?
+	Unfortunately, not quite ready for all protocols, but it's getting
+	there.  MSN gained support for receiving voice clips at least, and
+	finally we have Ink receiving capabilities too.  Thanks to the guys
+	who wrote the original patch.  And finally, MSN no longer has over a
+	100 tickets open!
+
+2.5.9 (08/18/2009):
+	John:  This release is just a crash fix release to address a security
+	issue reported to us by CORE and a couple crashes Elliott found.
+
 2.5.8 (06/27/2009):
 	John:  This release is another somewhat rushed bugfix release to fix
 	a number of bugs that have come up since we released Pidgin 2.5.7.
@@ -51,10 +96,10 @@
 	a few patches, and we've dealt with what feels like a TON of tickets
 	about two very common issues.  Feels like time for a release to me.
 
-	Etan: My first NEWS in quite a while and I don't have much to say. I
+	Etan: My first NEWS in quite a while and I don't have much to say.  I
 	haven't been too active lately and I'm hoping that won't be the case
-	going forward. I managed to get in a few perl fixes and some UI
-	language tweaks this release. My plan is to work on some of the
+	going forward.  I managed to get in a few perl fixes and some UI
+	language tweaks this release.  My plan is to work on some of the
 	issues pointed out by mpt (during his expert review of pidgin a little
 	while back) in the near future.
 
@@ -92,14 +137,14 @@
 	messaging pleasure.
 
 	Sadrul: Despite our best efforts, this release got delayed by a
-	couple of weeks. But here it is! It is mostly a bug fix release, with
+	couple of weeks.  But here it is! It is mostly a bug fix release, with
 	a couple of important fixes, e.g. fix for the Yahoo! disconnect
-	problem. Also, welcome our newest Crazy Patch Writer, Marcus Lundblad,
+	problem.  Also, welcome our newest Crazy Patch Writer, Marcus Lundblad,
 	who, among various other fixes, has implemented custom smileys for the
-	XMPP protocol, included in this release. Enjoy!
+	XMPP protocol, included in this release.  Enjoy!
 
 	Stu: I guess this is the time of year for server migrations, and
-	I've just about had enough of them. Fortunately Pidgin is still fun,
+	I've just about had enough of them.  Fortunately Pidgin is still fun,
 	and this release should be superb.
 
 	John: Although our services were down for quite some time, we didn't
@@ -109,8 +154,8 @@
 	happy!
 
 	Elliott: This release took a while, but that was due to an unfortunate
-	server snafu. I didn't have much to do with it, but hopefully the new
-	servers will help us out a bit. Anyway, mostly bug-fixes this time.
+	server snafu.  I didn't have much to do with it, but hopefully the new
+	servers will help us out a bit.  Anyway, mostly bug-fixes this time.
 	Nothing spectacular, unless you happen to suffer from one of those bugs.
 	Oh, and don't forget, the "Has you" tooltip is back!
 
@@ -123,9 +168,9 @@
 	coming months.
 
 	Elliott: I'm just commenting so Kevin wouldn't be the only one in NEWS
-	and no-one else seems to want to. Anyway, there's a couple MSN login
-	fixes, so try it out. The contact list problems might still be around,
-	but you can probably find a workaround in trac. And there's a tooltip
+	and no-one else seems to want to.  Anyway, there's a couple MSN login
+	fixes, so try it out.  The contact list problems might still be around,
+	but you can probably find a workaround in trac.  And there's a tooltip
 	fix for our AIM friends, not that I had anything to do with it (except
 	closing many many duplicate tickets).
 
@@ -135,16 +180,16 @@
 	it to the world!  There are myriad bugfixes, including some important
 	ones so you should be sure to update.
 
-	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of
+	Hylke: Finally MSNP15 support.  To celebrate this I refreshed a lot of
 	the smilies used in the protocol and added the long awaited indispensable
-	bunny icon. I think this is one of those releases that will make a lot
+	bunny icon.  I think this is one of those releases that will make a lot
 	of users happy, especially MSN users.
 
-	Elliott: Oh look, my first NEWS! Well anyway, with that new MSNP15
+	Elliott: Oh look, my first NEWS!  Well anyway, with that new MSNP15
 	support, this release is set up to be a huge success and a total flop
-	all at the same time. Here's hoping it's the "huge success" one for you.
+	all at the same time.  Here's hoping it's the "huge success" one for you.
 	Those icon changes that Hylke made, while minor, really make things look
-	a little cleaner, I think. Oh yea, did I mention that MSNP15 stuff?
+	a little cleaner, I think.  Oh yea, did I mention that MSNP15 stuff?
 
 	Mark: Speaking of MSNP15, we'd like to welcome Elliott Sales de Andrade
 	as a full fledged developer!  He took the last few strides mushing the
@@ -152,7 +197,7 @@
 	doing other great stuff.
 
 	Ka-Hing: "Reject"ing a certificate after your account is signed off is
-	not recommended. Deleting the file after you start sending it is also
+	not recommended.  Deleting the file after you start sending it is also
 	discouraged.
 
 2.4.3 (07/01/2008):
@@ -162,12 +207,12 @@
 2.4.2 (5/17/2008):
 	Sadrul: We added some usability changes in this release, including the
 	typing notification, buddyicon and input area size in the conversation
-	windows, escape to close conversation windows etc. These changes should
+	windows, escape to close conversation windows etc.  These changes should
 	make pidgin more usable and more fun for Everyone! *wink*
 
 	Stu: I fixed some memory leaks, but nothing like as many as Daniel did.
 	MSN buddy list synchronization should be significantly less painful now,
-	and opening MSN inboxes might work better too. SILC passphrase changes
+	and opening MSN inboxes might work better too.  SILC passphrase changes
 	and support for passphrase-less keys has been improved also.
 
 2.4.1 (3/31/2008):
@@ -184,27 +229,27 @@
 	John: While this release took what seems like forever to get out the
 	door, I think it's well worth the wait, especially for Yahoo! users.
 	This release serves up some fixes for long standing bugs and adds
-	file transfer for transfers with newer Yahoo! clients (finally!). As
+	file transfer for transfers with newer Yahoo! clients (finally!).  As
 	is standard with code I committed, where it works great thank the
-	patch writer, and where it's broken, feel free to yell at me. Enjoy!
-
-	Sadrul: Finch is more colourful and blinky in this release! There's
+	patch writer, and where it's broken, feel free to yell at me.  Enjoy!
+
+	Sadrul: Finch is more colourful and blinky in this release!  There's
 	now a log viewer, which is very useful, and also the ability to
-	block/unblock buddies. It's now also possible to find chat rooms on
-	many services, e.g. XMPP, IRC, Yahoo! etc. Happy Leap Day!
+	block/unblock buddies.  It's now also possible to find chat rooms on
+	many services, e.g. XMPP, IRC, Yahoo! etc.  Happy Leap Day!
 
 	Ka-Hing: I think all I've done for this release is committing some
 	patches written by other people.
 
-	Stu: Finally, 2.4.0 lands. I didn't do all that much except complain
-	about things I didn't like or just revert Sean's changes. I'm quite
+	Stu: Finally, 2.4.0 lands.  I didn't do all that much except complain
+	about things I didn't like or just revert Sean's changes.  I'm quite
 	pleased with how well it's turned out in the end.
 	Happy Birthday Fred, you must be nearly 10 now ;-)
 
 2.3.1 (12/7/2007):
 	Stu: I'm sorry for the MSN problems and the plugin crashes in 2.3.0.
-	Hopefully this will redeem us. This fixes a number of bugs. I'm a
-	bit late but I'd like to welcome John to the team. Enjoy!
+	Hopefully this will redeem us.  This fixes a number of bugs.  I'm a
+	bit late but I'd like to welcome John to the team.  Enjoy!
 
 	Luke: I've done absolutely nothing in the last 2 weeks, except watch
 	others commit bug and, more, leak fixes.  People should be noticing
@@ -246,23 +291,23 @@
 	last release looking at the tickets that have been submitted
 	and many of them have been closed.
 
-	Stu: I haven't NEWS'd in a while. I haven't actually done much for
-	too long also, maybe I'll find some time soon. This release is
+	Stu: I haven't NEWS'd in a while.  I haven't actually done much for
+	too long also, maybe I'll find some time soon.  This release is
 	basically what 2.2.0 should have been - it actually compiles this
 	time.
 
 2.2.0 (9/13/2007):
 	Sean: 2.2.0 contains the results of several major Google Summer
-	of Code branches bringing some new, extraordinary features. We
+	of Code branches bringing some new, extraordinary features.  We
 	have a new protocol, MySpaceIM, a bunch of new features for an
 	existing protocol, XMPP, and nifty new certificate management
 	to make sure your IM server is who it says it is.
 
 	Ka-Hing: A number of you noticed crashes when dragging windows
-	around when certain options are enabled. Well, that was my fault,
-	and Sadrul fixed it. So Props to him and poos to me. I haven't
+	around when certain options are enabled.  Well, that was my fault,
+	and Sadrul fixed it.  So Props to him and poos to me.  I haven't
 	done much for this release, but the next one should contain
-	something that I helped work on. Hint: students are cheap slave
+	something that I helped work on.  Hint: students are cheap slave
 	coders!
 
 	Kevin: I haven't really been coding much in Pidgin, and this
@@ -272,9 +317,9 @@
 
 2.1.1 (8/20/2007):
 	Sean: Continuing our schedule of frequent releases, Pidgin 2.1.1
-	is out. In it, we've addressed a lot of UI issues from our
+	is out.  In it, we've addressed a lot of UI issues from our
 	experimental new changes introduced in 2.1.0, and gave a lot of 
-	attention to Yahoo! and Bonjour. Thanks to everyone who 
+	attention to Yahoo! and Bonjour.  Thanks to everyone who 
 	contributed.
 
 	Luke: We have reworked some parts of the conversation windows in
@@ -285,14 +330,14 @@
 	various issues, testing fixes, and getting patches in.
 
 	Tim: Sean finally got me to fix some of the buddy list bugs with
-	Yahoo! when in version 15 mode. So now we have some Yahoo! to
-	MSN support, which is kind of nice. Looks like some others have
+	Yahoo! when in version 15 mode.  So now we have some Yahoo! to
+	MSN support, which is kind of nice.  Looks like some others have
 	been contributing to Yahoo! while I've been AWOL, so many thanks
 	to them.
 
 2.1.0 (7/28/2007):
 	Sean: This release took a bit longer than 3 weeks, but boy is it 
-	worth it! We're beginning to experiment with new UI concepts and
+	worth it!  We're beginning to experiment with new UI concepts and
 	this release features a largely re-designed conversation window.
 	We've closed 150 tickets for this release; much thanks go to all
 	the developers, translators, and testers who made this possible.
@@ -300,28 +345,28 @@
 	Ka-Hing: Sean said no one else NEWS'ed, so I figure I should.
 
 2.0.2 (6/14/2007):
-	Sean: Another big maintenance release. Again, about 100 tickets were
-	resolved in this release, and they keep coming in. Lots of bug fixes,
+	Sean: Another big maintenance release.  Again, about 100 tickets were
+	resolved in this release, and they keep coming in.  Lots of bug fixes,
 	some minor icon adjustements, hopefully we addressed some ICQ
 	internationalization issues, and support for Bonjour on Windows!
 	Our next release will be 2.1.0, and will come with some great new
 	features.
 
 	Stu: I think we're gradually getting the hang of this 3 week thing
-	again. This release includes yet more bug fixes. I'd also like to
+	again.  This release includes yet more bug fixes.  I'd also like to
 	specifically thank Pekka Riikonen for the patch to enable using SILC
 	Toolkit 1.1 with Pidgin/libpurple that is included in this release.
 
 2.0.1 (5/24/2007):
-	Sean: 2.0.1! Three weeks later, as scheduled! It is so nice to have
-	regular, frequent, releases again! This is a bugfix release; We have
+	Sean: 2.0.1!  Three weeks later, as scheduled!  It is so nice to have
+	regular, frequent, releases again!  This is a bugfix release; We have
 	fixed over 100 issues reported to us at http://developer.pidgin.im.
 	Thanks to everyone for their great work, and look for the next release
 	in another three weeks!
 
-	Stu: Lots'o'fixes in this. I don't know how you users find so many
-	things for us to fix. 24 hours in a day (sadly). 24 is divisible by the
-	sum of its digits and by their product. It is the smallest composite
+	Stu: Lots'o'fixes in this.  I don't know how you users find so many
+	things for us to fix.  24 hours in a day (sadly).  24 is divisible by the
+	sum of its digits and by their product.  It is the smallest composite
 	number, the product of whose divisors is a cube.
 
 	Luke: I requested that we have a bug fix release, and so we have!
@@ -343,18 +388,18 @@
 	definition of 'cool' to get it.
 
 	Etan: Perl plugins now have access to almost all of the savedstatus
-	API functions. I also removed a couple of the preferences from the
+	API functions.  I also removed a couple of the preferences from the
 	Pidgin GTK+ Theme Control plugin which should help many of the people
-	for whom the configuration dialog size was a problem. The removed
+	for whom the configuration dialog size was a problem.  The removed
 	preferences no longer had the effects they were added to have anyway.
 
 2.0.0 (5/3/2007):
 	Sean: 2.0.0! It's real exciting to finally release Pidgin 2.0.0! I'm
-	really proud of all the work we've all done. I'm pumped. And, while
+	really proud of all the work we've all done.  I'm pumped.  And, while
 	I could go on about all the amazing thing that have been added since
 	1.5.0, what I'm really excited about is getting back to a regular,
 	rapid, release cycle of active, open development, unhindered by legal
-	quandries. Huge thanks to everyone involved.
+	quandries.  Huge thanks to everyone involved.
 
 	Luke: We have finally managed to get 2.0.0 out the door, after nearly
 	but not quite 2 years of effort and fustration.  No one regrets more
@@ -371,24 +416,24 @@
 	attempt to avoid knee-jerk reactions.
 
 	Evan: One small step for bird, one giant leap for birdkind... except
-	this is hardly one small step. A lot more has changed from Gaim 1.5.0
+	this is hardly one small step.  A lot more has changed from Gaim 1.5.0
 	than just the name. Pidgin has a *very* attractive new look, a whole
 	new member of the family (Finch, formerly gaim-console) has been born,
 	and libpurple has come into its own as a solid, full-featured library
-	powering the greatest IM clients around. Bugs were fixed and
+	powering the greatest IM clients around.  Bugs were fixed and
 	features were added by the hundreds (thousands?) since the last
 	major release, all while improving performance and resisting feature
-	creep. As Luke said, a ton of thought and effort has gone into
+	creep.  As Luke said, a ton of thought and effort has gone into
 	Pidgin 2.0.0; I'm proud to have played a part.
 
-	Stu: We did it! finally, we have 2.0.0. It's been a long time coming,
-	but there's a great deal of goodness here. When I say a long time, I'm
+	Stu: We did it! finally, we have 2.0.0.  It's been a long time coming,
+	but there's a great deal of goodness here.  When I say a long time, I'm
 	not kidding - it's been 972 days since we branched off "oldstatus"
-	(aka 1.x). The early Greeks were uncertain as to whether 2 was a
+	(aka 1.x).  The early Greeks were uncertain as to whether 2 was a
 	number at all (or if we'd ever make this release) - it has a beginning
 	and an end but no middle (much like our unfortunately quiet development
-	period). 2 is the first prime number and the only even prime. 2 is also
-	the first deficient number (oh well). There are only 10 types of people
+	period).  2 is the first prime number and the only even prime. 2 is also
+	the first deficient number (oh well).  There are only 10 types of people
 	in the world - those who like our new names and those who do not.
 	Enjoy!
 
@@ -398,7 +443,7 @@
 	where they are today.  Congratulations everyone!
 
 	Sadrul: My first NEWS, and on what an occasion! Pidgin 2.0.0 is finally
-	released!! And it's *really* very good!!! Give your soul a break ...
+	released!!  And it's *really* very good!!!  Give your soul a break ...
 	Use Pidgin!
 
 	Daniel: There has been a fair amount of weeping and gnashing of teeth
--- a/configure.ac	Mon Aug 17 15:56:16 2009 +0000
+++ b/configure.ac	Wed Aug 19 00:37:01 2009 +0000
@@ -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/doc/core-signals.dox	Mon Aug 17 15:56:16 2009 +0000
+++ b/doc/core-signals.dox	Wed Aug 19 00:37:01 2009 +0000
@@ -2,6 +2,7 @@
 
  @signals
   @signal quitting
+  @signal uri-handler
  @endsignals
 
  @see core.h
@@ -16,5 +17,16 @@
    Emitted when libpurple is quitting.
  @endsignaldef
 
+ @signaldef uri-handler
+  @signalproto
+gboolean (*uri_handler)(const gchar *proto, const gchar *cmd, GHashTable *params);
+  @endsignalproto
+  @signaldesc
+   Emitted when handling a registered URI.
+  @param proto The protocol of the URI.
+  @param cmd The 'command' of the URI.
+  @param params Any key/value parameters from the URI.
+ @endsignaldef
+
  */
 // vim: syntax=c.doxygen tw=75 et
--- a/doc/funniest_home_convos.txt	Mon Aug 17 15:56:16 2009 +0000
+++ b/doc/funniest_home_convos.txt	Wed Aug 19 00:37:01 2009 +0000
@@ -572,3 +572,42 @@
 15:46 <khc> well, there was a Grand Smiley Theme Database
 15:47 <SimGuy> the GSTD sounds like a bad acronym
 15:47 <khc> I realized after typing that
+
+--
+
+(01:51:38 AM) user entered the room.
+(01:52:46 AM) user: .addKeyActionListener(new KeyActionListener() onKeyPress() {if (event.geyKeyPresss().equals(Key.UP_ARROW) { inputbox.text = history.pop() }}}}}}});
+(01:52:51 AM) user: THERE, FOR **** SAKE
+(01:52:53 AM) user: its 2009
+(01:53:06 AM) user: oh wait. ctrl up works
+(01:53:07 AM) user: lol
+(01:53:11 AM) user: yey me
+(01:53:16 AM) user left the room.
+(01:55:31 AM) darkrain42: Wow.
+(01:58:15 AM) QuLogic: I think he failed to realize we'd have to re-write pidgin in java to do that
+(01:59:44 AM) khc: history.pop() is clearly wrong too
+
+--
+
+Some time later:
+(02:41:55 AM) user entered the room.
+(02:42:24 AM) user: didn't I read some idiot post, about 2 years ago, before pidgin was renamed / forked, over one dev refusing to make minimize on close?
+(02:43:12 AM) QuLogic: I see you've learned to at least ask a question before jumping to random conclusions
+(02:44:01 AM) user: QuLogic: :-))))))))))))))))))))))
+(02:44:12 AM) user: hey, I submitted a code patch!
+(02:44:36 AM) user: now, anyway, what happened? why did I get the buddy list (empty) stealing focus, and why did it exit on close?
+(02:44:40 AM) QuLogic: it's not really a patch if it's in the wrong language
+(02:44:42 AM) user: I've had this argument before, in 2006
+(02:44:55 AM) user: QuLogic: simple, rewrite the rest ;-)
+(02:44:58 AM) khc: pidgin never steals focus
+(02:45:10 AM) khc: if it exit on close, it's because you didn't turn on the systray icon
+(02:47:17 AM) user: khc - and that isn't default... why? anyway. I recall something on the matter, and I think this was the project (pre-fork?) or is this the unforked, renamed? I forget.
+(02:47:42 AM) user: Whoever it was arguing about it (and font sizes I believe) was an idiot... not one of you I suppose, just making idle chit chat.
+(02:47:43 AM) user: thanks
+(02:47:48 AM) darkrain42: It is on by default. Some distros change that.
+(02:48:00 AM) darkrain42: And I don't even know what you're arguing about at this point.
+(02:48:11 AM) user: ... /leave - That command doesn't work on this protocol... /leave #pidgin ...That comm..... :-(((
+(02:48:18 AM) user: darkrain42: now arguing, just remembering something
+(02:48:27 AM) user left the room.
+(02:49:04 AM) darkrain42: Wow. (again)
+
--- a/doc/jabber-signals.dox	Mon Aug 17 15:56:16 2009 +0000
+++ b/doc/jabber-signals.dox	Wed Aug 19 00:37:01 2009 +0000
@@ -8,6 +8,7 @@
   @signal jabber-register-namespace-watcher
   @signal jabber-unregister-namespace-watcher
   @signal jabber-sending-xmlnode
+  @signal jabber-receiving-xmlnode
  @endsignals
 
  <hr>
@@ -71,7 +72,7 @@
 
  @signaldef jabber-watched-iq
   @signalproto
-gboolean (*watched_iq)(PurpleConnection *pc, const char *type, const char *id,
+gboolean (*watched_iq)(PurpleConnection *gc, const char *type, const char *id,
                        const char *from, xmlnode *child);
   @endsignalproto
   @signaldesc
@@ -87,18 +88,6 @@
           process it. FALSE otherwise.
  @endsignaldef
 
- @signaldef jabber-sending-xmlnode
-  @signalproto
-void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
-  @endsignalproto
-  @signaldesc
-   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
-   to use this instead of prpl_info->send_raw.
-   @param gc      The connectoin on which to send the stanza.
-   @param stanza  The stanza to send. If stanza is not NULL after being sent,
-                  the emitter should free it.
- @endsignaldef
-
  @signaldef jabber-register-namespace-watcher
   @signalproto
 void (register_namespace_watcher)(const char *node, const char *namespace);
@@ -121,5 +110,29 @@
   @param namespace The IQ child namespace to no longer watch.
  @endsignaldef
 
+ @signaldef jabber-sending-xmlnode
+  @signalproto
+void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
+   to use this instead of prpl_info->send_raw.
+   @param gc      The connection on which to send the stanza.
+   @param stanza  The stanza to send. If stanza is not NULL after being sent,
+                  the emitter should free it.
+ @endsignaldef
+
+ @signaldef jabber-receiving-xmlnode
+  @signalproto
+void (receiving_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP stanza is received. Allows a plugin to process any
+   stanza.
+   @param gc     The connection on which the stanza was received.
+   @param stanza The received stanza. Set stanza to NULL (and free it) to
+                 stop processing the stanza.
+ @endsignaldef
+
 */
 // vim: syntax=c.doxygen tw=75 et
--- a/finch/gntaccount.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/finch/gntaccount.c	Wed Aug 19 00:37:01 2009 +0000
@@ -489,6 +489,7 @@
 	GntWidget *combo, *button, *entry;
 	GList *list, *iter;
 	AccountEditDialog *dialog;
+	PurplePlugin *plugin;
 
 	if (account)
 	{
@@ -532,9 +533,10 @@
 				((PurplePlugin*)iter->data)->info->name);
 	}
 
-	if (account)
-		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
-				purple_plugins_find_with_id(purple_account_get_protocol_id(account)));
+	plugin = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
+
+	if (account && plugin)
+		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), plugin);
 	else
 		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
 
--- a/finch/gntmedia.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/finch/gntmedia.c	Wed Aug 19 00:37:01 2009 +0000
@@ -417,11 +417,7 @@
 create_default_audio_src(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *src, *volume;
-	GstPad *pad, *ghost;
-	double input_volume = purple_prefs_get_int(
-			"/finch/media/audio/volume/input")/10.0;
-
+	GstElement *src;
 	src = gst_element_factory_make("gconfaudiosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autoaudiosrc", NULL);
@@ -436,28 +432,15 @@
 				"element for the default audio source.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("finchdefaultaudiosrc");
-	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
-	g_object_set(volume, "volume", input_volume, NULL);
-	gst_bin_add_many(GST_BIN(bin), src, volume, NULL);
-	gst_element_link(src, volume);
-	pad = gst_element_get_pad(volume, "src");
-	ghost = gst_ghost_pad_new("ghostsrc", pad);
-	gst_element_add_pad(bin, ghost);
-
-	return bin;
+	gst_element_set_name(src, "finchdefaultaudiosrc");
+	return src;
 }
 
 static GstElement *
 create_default_audio_sink(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *sink, *volume, *queue;
-	GstPad *pad, *ghost;
-	double output_volume = purple_prefs_get_int(
-			"/finch/media/audio/volume/output")/10.0;
-
+	GstElement *sink;
 	sink = gst_element_factory_make("gconfaudiosink", NULL);
 	if (sink == NULL)
 		sink = gst_element_factory_make("autoaudiosink",NULL);
@@ -466,19 +449,7 @@
 				"element for the default audio sink.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("finchdefaultaudiosink");
-	volume = gst_element_factory_make("volume", "purpleaudiooutputvolume");
-	g_object_set(volume, "volume", output_volume, NULL);
-	queue = gst_element_factory_make("queue", NULL);
-	gst_bin_add_many(GST_BIN(bin), sink, volume, queue, NULL);
-	gst_element_link(volume, sink);
-	gst_element_link(queue, volume);
-	pad = gst_element_get_pad(queue, "sink");
-	ghost = gst_ghost_pad_new("ghostsink", pad);
-	gst_element_add_pad(bin, ghost);
-
-	return bin;
+	return sink;
 }
 #endif  /* USE_VV */
 
@@ -516,12 +487,6 @@
 	purple_debug_info("gntmedia", "Registering media element types\n");
 	purple_media_manager_set_active_element(manager, default_audio_src);
 	purple_media_manager_set_active_element(manager, default_audio_sink);
-
-	purple_prefs_add_none("/finch/media");
-	purple_prefs_add_none("/finch/media/audio");
-	purple_prefs_add_none("/finch/media/audio/volume");
-	purple_prefs_add_int("/finch/media/audio/volume/input", 10);
-	purple_prefs_add_int("/finch/media/audio/volume/output", 10);
 #endif
 }
 
--- a/finch/libgnt/gntkeys.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/finch/libgnt/gntkeys.c	Wed Aug 19 00:37:01 2009 +0000
@@ -166,7 +166,7 @@
 				strstr(term, "xterm") == term ||
 				strstr(term, "vt100") == term)
 			*(text + 1) = 'O';
-	} else if (*(unsigned char*)text == 195) {
+	} else if (g_utf8_get_char(text) == 195) {
 		if (*(text + 2) == 0 && strstr(term, "xterm") == term) {
 			*(text) = 27;
 			*(text + 1) -= 64;  /* Say wha? */
--- a/libpurple/ft.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/ft.c	Wed Aug 19 00:37:01 2009 +0000
@@ -40,8 +40,35 @@
 static PurpleXferUiOps *xfer_ui_ops = NULL;
 static GList *xfers;
 
+/*
+ * A hack to store more data since we can't extend the size of PurpleXfer
+ * easily.
+ */
+static GHashTable *xfers_data = NULL;
+
+typedef struct _PurpleXferPrivData {
+	/*
+	 * Used to moderate the file transfer when either the read/write ui_ops are
+	 * set or fd is not set. In those cases, the UI/prpl call the respective
+	 * function, which is somewhat akin to a fd watch being triggered.
+	 */
+	enum {
+		PURPLE_XFER_READY_NONE = 0x0,
+		PURPLE_XFER_READY_UI   = 0x1,
+		PURPLE_XFER_READY_PRPL = 0x2,
+	} ready;
+} PurpleXferPrivData;
+
 static int purple_xfer_choose_file(PurpleXfer *xfer);
 
+static void
+purple_xfer_priv_data_destroy(gpointer data)
+{
+	PurpleXferPrivData *priv = data;
+
+	g_free(priv);
+}
+
 GList *
 purple_xfers_get_all()
 {
@@ -53,6 +80,7 @@
 {
 	PurpleXfer *xfer;
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;
 
 	g_return_val_if_fail(type    != PURPLE_XFER_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL,              NULL);
@@ -70,6 +98,11 @@
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
 
+	priv = g_new0(PurpleXferPrivData, 1);
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	g_hash_table_insert(xfers_data, xfer, priv);
+
 	ui_ops = purple_xfer_get_ui_ops(xfer);
 
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
@@ -102,9 +135,11 @@
 	g_free(xfer->remote_ip);
 	g_free(xfer->local_filename);
 
+	g_hash_table_remove(xfers_data, xfer);
+
 	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
+	xfers = g_list_remove(xfers, xfer);
 	g_free(xfer);
-	xfers = g_list_remove(xfers, xfer);
 }
 
 void
@@ -482,13 +517,16 @@
 	if (type == PURPLE_XFER_SEND) {
 		/* Sending a file */
 		/* Check the filename. */
+		PurpleXferUiOps *ui_ops;
+		ui_ops = purple_xfer_get_ui_ops(xfer);
+
 #ifdef _WIN32
 		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\"))
 #else
 		if (g_strrstr(filename, "../"))
 #endif
 		{
-			char *utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+			utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
 
 			msg = g_strdup_printf(_("%s is not a valid filename.\n"), utf8);
 			purple_xfer_error(type, account, xfer->who, msg);
@@ -499,15 +537,20 @@
 			return;
 		}
 
-		if (g_stat(filename, &st) == -1) {
-			purple_xfer_show_file_error(xfer, filename);
-			purple_xfer_unref(xfer);
-			return;
+		if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+			if (g_stat(filename, &st) == -1) {
+				purple_xfer_show_file_error(xfer, filename);
+				purple_xfer_unref(xfer);
+				return;
+			}
+
+			purple_xfer_set_local_filename(xfer, filename);
+			purple_xfer_set_size(xfer, st.st_size);
+		} else {
+			utf8 = g_strdup(filename);
+			purple_xfer_set_local_filename(xfer, filename);
 		}
 
-		purple_xfer_set_local_filename(xfer, filename);
-		purple_xfer_set_size(xfer, st.st_size);
-
 		base = g_path_get_basename(filename);
 		utf8 = g_filename_to_utf8(base, -1, NULL, NULL, NULL);
 		g_free(base);
@@ -516,7 +559,6 @@
 		msg = g_strdup_printf(_("Offering to send %s to %s"),
 				utf8, buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 		g_free(utf8);
-
 		purple_xfer_conversation_write(xfer, msg, FALSE);
 		g_free(msg);
 	}
@@ -884,9 +926,6 @@
 
 	if (xfer->ops.read != NULL)	{
 		r = (xfer->ops.read)(buffer, xfer);
-		if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 	}
 	else {
 		*buffer = g_malloc0(s);
@@ -896,9 +935,6 @@
 			r = 0;
 		else if (r < 0)
 			r = -1;
-		else if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 		else if (r == 0)
 			r = -1;
 	}
@@ -939,29 +975,39 @@
 }
 
 static void
-transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+do_transfer(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
-	PurpleXfer *xfer = (PurpleXfer *)data;
 	guchar *buffer = NULL;
 	gssize r = 0;
 
-	if (condition & PURPLE_INPUT_READ) {
+	ui_ops = purple_xfer_get_ui_ops(xfer);
+
+	if (xfer->type == PURPLE_XFER_RECEIVE) {
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
-			const size_t wc = fwrite(buffer, 1, r, xfer->dest_fp);
+			size_t wc;
+			if (ui_ops && ui_ops->ui_write)
+				wc = ui_ops->ui_write(xfer, buffer, r);
+			else
+				wc = fwrite(buffer, 1, r, xfer->dest_fp);
+
 			if (wc != r) {
 				purple_debug_error("filetransfer", "Unable to write whole buffer.\n");
 				purple_xfer_cancel_local(xfer);
 				g_free(buffer);
 				return;
 			}
+
+			if ((purple_xfer_get_size(xfer) > 0) &&
+				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
+				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
 		}
-	} else if (condition & PURPLE_INPUT_WRITE) {
+	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
 
@@ -975,26 +1021,53 @@
 			return;
 		}
 
-		buffer = g_malloc0(s);
+		if (ui_ops && ui_ops->ui_read) {
+			gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
+			if (tmp == 0) {
+				/*
+				 * UI isn't ready to send data. It will call
+				 * purple_xfer_ui_ready when ready, which sets back up this
+				 * watcher.
+				 */
+				if (xfer->watcher != 0) {
+					purple_timeout_remove(xfer->watcher);
+					xfer->watcher = 0;
+				}
 
-		result = fread(buffer, 1, s, xfer->dest_fp);
-		if (result != s) {
-			purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
-			purple_xfer_cancel_remote(xfer);
-			g_free(buffer);
-			return;
+				return;
+			} else if (tmp < 0) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				return;
+			}
+
+			result = tmp;
+		} else {
+			buffer = g_malloc0(s);
+			result = fread(buffer, 1, s, xfer->dest_fp);
+			if (result != s) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
+				return;
+			}
 		}
 
 		/* Write as much as we're allowed to. */
-		r = purple_xfer_write(xfer, buffer, s);
+		r = purple_xfer_write(xfer, buffer, result);
 
 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
-		} else if (r < s) {
-			/* We have to seek back in the file now. */
-			fseek(xfer->dest_fp, r - s, SEEK_CUR);
+		} else if (r < result) {
+			if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+				/* We have to seek back in the file now. */
+				fseek(xfer->dest_fp, r - s, SEEK_CUR);
+			}
+			else {
+				ui_ops->data_not_sent(xfer, buffer + r, result - r);
+			}
 		} else {
 			/*
 			 * We managed to write the entire buffer.  This means our
@@ -1016,8 +1089,6 @@
 
 		g_free(buffer);
 
-		ui_ops = purple_xfer_get_ui_ops(xfer);
-
 		if (ui_ops != NULL && ui_ops->update_progress != NULL)
 			ui_ops->update_progress(xfer,
 				purple_xfer_get_progress(xfer));
@@ -1028,22 +1099,45 @@
 }
 
 static void
+transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+{
+	PurpleXfer *xfer = data;
+
+	if (xfer->dest_fp == NULL) {
+		/* The UI is moderating its side manually */
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		if (0 == (priv->ready & PURPLE_XFER_READY_UI)) {
+			priv->ready |= PURPLE_XFER_READY_PRPL;
+
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			return;
+		}
+	}
+
+	do_transfer(xfer);
+}
+
+static void
 begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 {
 	PurpleXferType type = purple_xfer_get_type(xfer);
+	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 
-	xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
-						  type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
+	if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+		xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
+		                        type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
 
-	if (xfer->dest_fp == NULL) {
-		purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
-		purple_xfer_cancel_local(xfer);
-		return;
+		if (xfer->dest_fp == NULL) {
+			purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
+			purple_xfer_cancel_local(xfer);
+			return;
+		}
+
+		fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
 	}
 
-	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
-
-	if (xfer->fd)
+	if (xfer->fd != -1)
 		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
 
 	xfer->start_time = time(NULL);
@@ -1068,6 +1162,54 @@
 }
 
 void
+purple_xfer_ui_ready(PurpleXfer *xfer)
+{
+	PurpleInputCondition cond;
+	PurpleXferType type;
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_UI;
+
+	if (0 == (priv->ready & PURPLE_XFER_READY_PRPL))
+		return;
+
+	type = purple_xfer_get_type(xfer);
+	if (type == PURPLE_XFER_SEND)
+		cond = PURPLE_INPUT_WRITE;
+	else /* if (type == PURPLE_XFER_RECEIVE) */
+		cond = PURPLE_INPUT_READ;
+
+	if (xfer->watcher == 0 && xfer->fd != -1)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
+purple_xfer_prpl_ready(PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_PRPL;
+
+	/* I don't think fwrite/fread are ever *not* ready */
+	if (xfer->dest_fp == NULL && 0 == (priv->ready & PURPLE_XFER_READY_UI))
+		return;
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
 purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 				unsigned int port)
 {
@@ -1081,6 +1223,13 @@
 
 	purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_STARTED);
 
+	/*
+	 * FIXME 3.0.0 -- there's too much broken code depending on fd == 0
+	 * meaning "don't use a real fd"
+	 */
+	if (fd == 0)
+		fd = -1;
+
 	if (type == PURPLE_XFER_RECEIVE) {
 		cond = PURPLE_INPUT_READ;
 
@@ -1127,7 +1276,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1190,7 +1339,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1255,7 +1404,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1325,6 +1474,9 @@
 purple_xfers_init(void) {
 	void *handle = purple_xfers_get_handle();
 
+	xfers_data = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+	                                   NULL, purple_xfer_priv_data_destroy);
+
 	/* register signals */
 	purple_signal_register(handle, "file-recv-accept",
 	                     purple_marshal_VOID__POINTER, NULL, 1,
@@ -1371,6 +1523,9 @@
 
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+
+	g_hash_table_destroy(xfers_data);
+	xfers_data = NULL;
 }
 
 void
--- a/libpurple/ft.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/ft.h	Wed Aug 19 00:37:01 2009 +0000
@@ -77,10 +77,50 @@
 	void (*cancel_local)(PurpleXfer *xfer);
 	void (*cancel_remote)(PurpleXfer *xfer);
 
+	/**
+	 * UI op to write data received from the prpl. The UI must deal with the
+	 * entire buffer and return size, or it is treated as an error.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  The buffer to write
+	 * @param size    The size of the buffer
+	 *
+	 * @return size if the write was successful, or a value between 0 and
+	 *         size on error.
+	 * @since 2.6.0
+	 */
+	gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size);
+
+	/**
+	 * UI op to read data to send to the prpl for a file transfer.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to a buffer. The UI must allocate this buffer.
+	 *                libpurple will free the data.
+	 * @param size    The maximum amount of data to put in the buffer.
+	 *
+	 * @returns The amount of data in the buffer, 0 if nothing is available,
+	 *          and a negative value if an error occurred and the transfer
+	 *          should be cancelled (libpurple will cancel).
+	 * @since 2.6.0
+	 */
+	gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size);
+
+	/**
+	 * Op to notify the UI that not all the data read in was written. The UI
+	 * should re-enqueue this data and return it the next time read is called.
+	 *
+	 * This MUST be implemented if read and write are implemented.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to the beginning of the unwritten data.
+	 * @param size    The amount of unwritten data.
+	 *
+	 * @since 2.6.0
+	 */
+	void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size);
+
 	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 } PurpleXferUiOps;
 
 /**
@@ -132,7 +172,6 @@
 		gssize (*read)(guchar **buffer, PurpleXfer *xfer);
 		gssize (*write)(const guchar *buffer, size_t size, PurpleXfer *xfer);
 		void (*ack)(PurpleXfer *xfer, const guchar *buffer, size_t size);
-
 	} ops;
 
 	PurpleXferUiOps *ui_ops;            /**< UI-specific operations. */
@@ -548,6 +587,12 @@
  * file receive transfer. On send, @a fd must be specified, and
  * @a ip and @a port are ignored.
  *
+ * Prior to libpurple 2.6.0, passing '0' to @a fd was special-cased to
+ * allow the protocol plugin to facilitate the file transfer itself. As of
+ * 2.6.0, this is supported (for backward compatibility), but will be
+ * removed in libpurple 3.0.0. If a prpl detects that the running libpurple
+ * is running 2.6.0 or higher, it should use the invalid fd '-1'.
+ *
  * @param xfer The file transfer.
  * @param fd   The file descriptor for the socket.
  * @param ip   The IP address to connect to.
@@ -617,6 +662,28 @@
  */
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error);
 
+/**
+ * Allows the UI to signal it's ready to send/receive data (depending on
+ * the direction of the file transfer. Used when the UI is providing
+ * read/write/data_not_sent UI ops.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_ui_ready(PurpleXfer *xfer);
+
+/**
+ * Allows the prpl to signal it's readh to send/receive data (depending on
+ * the direction of the file transfer. Used when the prpl provides read/write
+ * ops and cannot/does not provide a raw fd to the core.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_prpl_ready(PurpleXfer *xfer);
+
 /*@}*/
 
 /**************************************************************************/
--- a/libpurple/idle.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/idle.h	Wed Aug 19 00:37:01 2009 +0000
@@ -26,6 +26,8 @@
 #ifndef _PURPLE_IDLE_H_
 #define _PURPLE_IDLE_H_
 
+#include <time.h>
+
 /**
  * Idle UI operations.
  */
--- a/libpurple/log.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/log.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1375,6 +1375,7 @@
 	char *image_corrected_msg;
 	char *date;
 	char *header;
+	char *escaped_from;
 	PurplePlugin *plugin = purple_find_prpl(purple_account_get_protocol_id(log->account));
 	PurpleLogCommonLoggerData *data = log->logger_data;
 	gsize written = 0;
@@ -1413,6 +1414,8 @@
 	if(!data->file)
 		return 0;
 
+	escaped_from = g_markup_escape_text(from, -1);
+
 	image_corrected_msg = convert_image_tags(log, message);
 	purple_markup_html_to_xhtml(image_corrected_msg, &msg_fixed, NULL);
 
@@ -1434,34 +1437,35 @@
 			written += fprintf(data->file, "<font color=\"#FF0000\"><font size=\"2\">(%s)</font><b> %s</b></font><br/>\n", date, msg_fixed);
 		else if (type & PURPLE_MESSAGE_WHISPER)
 			written += fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-					date, from, msg_fixed);
+					date, escaped_from, msg_fixed);
 		else if (type & PURPLE_MESSAGE_AUTO_RESP) {
 			if (type & PURPLE_MESSAGE_SEND)
-				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 			else if (type & PURPLE_MESSAGE_RECV)
-				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_RECV) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_SEND) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else {
 			purple_debug_error("log", "Unhandled message type.\n");
 			written += fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		}
 	}
 	g_free(date);
 	g_free(msg_fixed);
+	g_free(escaped_from);
 	fflush(data->file);
 
 	return written;
--- a/libpurple/marshallers.list	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/marshallers.list	Wed Aug 19 00:37:01 2009 +0000
@@ -1,5 +1,6 @@
 VOID:POINTER,POINTER,OBJECT
 BOOLEAN:OBJECT,POINTER,STRING
 VOID:STRING,STRING
+VOID:STRING,STRING,DOUBLE
 VOID:ENUM,STRING,STRING
 VOID:ENUM,STRING,STRING,BOOLEAN
--- a/libpurple/media.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/media.c	Wed Aug 19 00:37:01 2009 +0000
@@ -94,6 +94,8 @@
 	FsStream *stream;
 	GstElement *src;
 	GstElement *tee;
+	GstElement *volume;
+	GstElement *level;
 
 	GList *local_candidates;
 	GList *remote_candidates;
@@ -157,9 +159,9 @@
 
 enum {
 	S_ERROR,
-	ACCEPTED,
 	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
+	LEVEL,
 	NEW_CANDIDATE,
 	STATE_CHANGED,
 	STREAM_INFO,
@@ -272,6 +274,10 @@
 					"PURPLE_MEDIA_INFO_MUTE", "mute" },
 			{ PURPLE_MEDIA_INFO_UNMUTE,
 					"PURPLE_MEDIA_INFO_UNMUTE", "unmute" },
+			{ PURPLE_MEDIA_INFO_PAUSE,
+					"PURPLE_MEDIA_INFO_PAUSE", "pause" },
+			{ PURPLE_MEDIA_INFO_UNPAUSE,
+					"PURPLE_MEDIA_INFO_UNPAUSE", "unpause" },
 			{ PURPLE_MEDIA_INFO_HOLD,
 					"PURPLE_MEDIA_INFO_HOLD", "hold" },
 			{ PURPLE_MEDIA_INFO_UNHOLD,
@@ -332,10 +338,6 @@
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
-	purple_media_signals[ACCEPTED] = g_signal_new("accepted", G_TYPE_FROM_CLASS(klass),
-					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-					 purple_smarshal_VOID__STRING_STRING,
-					 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 	purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__STRING_STRING,
@@ -345,6 +347,11 @@
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_signals[LEVEL] = g_signal_new("level", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__STRING_STRING_DOUBLE,
+					 G_TYPE_NONE, 3, G_TYPE_STRING,
+					 G_TYPE_STRING, G_TYPE_DOUBLE);
 	purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__POINTER_POINTER_OBJECT,
@@ -1899,11 +1906,31 @@
 		gst_element_add_pad(session->media->priv->confbin, ghost);
 	}
 
+	gst_element_set_state(session->tee, GST_STATE_PLAYING);
 	gst_element_link(session->src, session->media->priv->confbin);
-	gst_element_set_state(session->tee, GST_STATE_PLAYING);
 
 	g_object_get(session->session, "sink-pad", &sinkpad, NULL);
-	srcpad = gst_element_get_request_pad(session->tee, "src%d");
+	if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+		gchar *name = g_strdup_printf("volume_%s", session->id);
+		GstElement *level;
+		GstElement *volume = gst_element_factory_make("volume", name);
+		double input_volume = purple_prefs_get_int(
+				"/purple/media/audio/volume/input")/10.0;
+		g_free(name);
+		name = g_strdup_printf("sendlevel_%s", session->id);
+		level = gst_element_factory_make("level", name);
+		g_free(name);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), volume);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), level);
+		gst_element_set_state(level, GST_STATE_PLAYING);
+		gst_element_set_state(volume, GST_STATE_PLAYING);
+		gst_element_link(volume, level);
+		gst_element_link(session->tee, volume);
+		srcpad = gst_element_get_static_pad(level, "src");
+		g_object_set(volume, "volume", input_volume, NULL);
+	} else {
+		srcpad = gst_element_get_request_pad(session->tee, "src%d");
+	}
 	purple_debug_info("media", "connecting pad: %s\n", 
 			  gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK
 			  ? "success" : "failure");
@@ -1960,6 +1987,55 @@
 {
 	switch(GST_MESSAGE_TYPE(msg)) {
 		case GST_MESSAGE_ELEMENT: {
+			if (g_signal_has_handler_pending(media,
+					purple_media_signals[LEVEL], 0, FALSE)
+					&& gst_structure_has_name(
+					gst_message_get_structure(msg), "level")) {
+				GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+				gchar *name;
+				gchar *participant = NULL;
+				PurpleMediaSession *session = NULL;
+				gdouble rms_db;
+				gdouble percent;
+				const GValue *list;
+				const GValue *value;
+
+				if (!PURPLE_IS_MEDIA(media) ||
+						GST_ELEMENT_PARENT(src) !=
+						media->priv->confbin)
+					break;
+
+				name = gst_element_get_name(src);
+				if (!strncmp(name, "sendlevel_", 10)) {
+					session = purple_media_get_session(
+							media, name+10);
+				} else {
+					GList *iter = media->priv->streams;
+					for (; iter; iter = g_list_next(iter)) {
+						PurpleMediaStream *stream = iter->data;
+						if (stream->level == src) {
+							session = stream->session;
+							participant = stream->participant;
+							break;
+						}
+					}
+				}
+				g_free(name);
+				if (!session)
+					break;
+
+				list = gst_structure_get_value(
+						gst_message_get_structure(msg), "rms");
+				value = gst_value_list_get_value(list, 0);
+				rms_db = g_value_get_double(value);
+				percent = pow(10, rms_db / 20) * 5;
+				if(percent > 1.0)
+					percent = 1.0;
+
+				g_signal_emit(media, purple_media_signals[LEVEL],
+						0, session->id, participant, percent);
+				break;
+			}
 			if (!FS_IS_CONFERENCE(GST_MESSAGE_SRC(msg)) ||
 					!PURPLE_IS_MEDIA(media) ||
 					media->priv->conference !=
@@ -2155,9 +2231,6 @@
 					stream->session->type), NULL);
 			stream->accepted = TRUE;
 		}
-
-		g_signal_emit(media, purple_media_signals[ACCEPTED],
-				0, NULL, NULL);
 	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
 			type == PURPLE_MEDIA_INFO_UNMUTE)) {
 		GList *sessions;
@@ -2180,12 +2253,30 @@
 				sessions, sessions)) {
 			PurpleMediaSession *session = sessions->data;
 			if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+				gchar *name = g_strdup_printf("volume_%s",
+						session->id);
 				GstElement *volume = gst_bin_get_by_name(
-						GST_BIN(session->src),
-						"purpleaudioinputvolume");
+						GST_BIN(session->media->
+						priv->confbin), name);
+				g_free(name);
 				g_object_set(volume, "mute", active, NULL);
 			}
 		}
+	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_PAUSE ||
+			type == PURPLE_MEDIA_INFO_UNPAUSE)) {
+		gboolean active = (type == PURPLE_MEDIA_INFO_PAUSE);
+		GList *streams = purple_media_get_streams(media,
+				session_id, participant);
+		for (; streams; streams = g_list_delete_link(streams, streams)) {
+			PurpleMediaStream *stream = streams->data;
+			if (stream->session->type & PURPLE_MEDIA_SEND_VIDEO) {
+				g_object_set(stream->stream, "direction",
+						purple_media_to_fs_stream_direction(
+						stream->session->type & ((active) ?
+						~PURPLE_MEDIA_SEND_VIDEO :
+						PURPLE_MEDIA_VIDEO)), NULL);
+			}
+		}
 	}
 
 	g_signal_emit(media, purple_media_signals[STREAM_INFO],
@@ -2346,11 +2437,21 @@
 		GstElement *sink = NULL;
 
 		if (codec->media_type == FS_MEDIA_TYPE_AUDIO) {
+			GstElement *queue = NULL;
+			double output_volume = purple_prefs_get_int(
+					"/purple/media/audio/volume/output")/10.0;
 			/*
 			 * Should this instead be:
 			 *  audioconvert ! audioresample ! liveadder !
 			 *   audioresample ! audioconvert ! realsink
 			 */
+			queue = gst_element_factory_make("queue", NULL);
+			stream->volume = gst_element_factory_make(
+					"volume", NULL);
+			g_object_set(stream->volume, "volume",
+					output_volume, NULL);
+			stream->level = gst_element_factory_make(
+					"level", NULL);
 			stream->src = gst_element_factory_make(
 					"liveadder", NULL);
 			sink = purple_media_manager_get_element(priv->manager,
@@ -2358,19 +2459,32 @@
 					stream->session->media,
 					stream->session->id,
 					stream->participant);
+			gst_bin_add(GST_BIN(priv->confbin), queue);
+			gst_bin_add(GST_BIN(priv->confbin), stream->volume);
+			gst_bin_add(GST_BIN(priv->confbin), stream->level);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+			gst_element_set_state(stream->level, GST_STATE_PLAYING);
+			gst_element_set_state(stream->volume, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(stream->level, sink);
+			gst_element_link(stream->volume, stream->level);
+			gst_element_link(queue, stream->volume);
+			sink = queue;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
 			stream->src = gst_element_factory_make(
 					"fsfunnel", NULL);
 			sink = gst_element_factory_make(
 					"fakesink", NULL);
 			g_object_set(G_OBJECT(sink), "async", FALSE, NULL);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
 		}
 		stream->tee = gst_element_factory_make("tee", NULL);
 		gst_bin_add_many(GST_BIN(priv->confbin),
-				stream->src, stream->tee, sink, NULL);
-		gst_element_sync_state_with_parent(sink);
-		gst_element_sync_state_with_parent(stream->tee);
-		gst_element_sync_state_with_parent(stream->src);
+				stream->src, stream->tee, NULL);
+		gst_element_set_state(stream->tee, GST_STATE_PLAYING);
+		gst_element_set_state(stream->src, GST_STATE_PLAYING);
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}
 
@@ -2504,26 +2618,27 @@
 				0, PURPLE_MEDIA_STATE_NEW,
 				session->id, NULL);
 
-		session_type = purple_media_from_fs(media_type,
-				FS_DIRECTION_SEND);
-		src = purple_media_manager_get_element(
-				media->priv->manager, session_type,
-				media, session->id, who);
-		if (!GST_IS_ELEMENT(src)) {
-			purple_debug_error("media",
-					"Error creating src for session %s\n",
-					session->id);
-			purple_media_end(media, session->id, NULL);
-			return FALSE;
+		if (type_direction & FS_DIRECTION_SEND) {
+			session_type = purple_media_from_fs(media_type,
+					FS_DIRECTION_SEND);
+			src = purple_media_manager_get_element(
+					media->priv->manager, session_type,
+					media, session->id, who);
+			if (!GST_IS_ELEMENT(src)) {
+				purple_debug_error("media",
+						"Error creating src for session %s\n",
+						session->id);
+				purple_media_end(media, session->id, NULL);
+				return FALSE;
+			}
+
+			purple_media_set_src(media, session->id, src);
+			gst_element_set_state(session->src, GST_STATE_PLAYING);
+			purple_media_manager_create_output_window(
+					media->priv->manager,
+					session->media,
+					session->id, NULL);
 		}
-
-		purple_media_set_src(media, session->id, src);
-		gst_element_set_state(session->src, GST_STATE_PLAYING);
-
-		purple_media_manager_create_output_window(
-				media->priv->manager,
-				session->media,
-				session->id, NULL);
 	}
 
 	if (!(participant = purple_media_add_participant(media, who))) {
@@ -2889,14 +3004,23 @@
 
 		if (session == NULL)
 			return FALSE;
-
-		g_object_get(session->session, "codecs-ready", &ret, NULL);
+		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+				PURPLE_MEDIA_SEND_VIDEO))
+			g_object_get(session->session,
+					"codecs-ready", &ret, NULL);
+		else
+			ret = TRUE;
 	} else {
 		GList *values = g_hash_table_get_values(media->priv->sessions);
 		for (; values; values = g_list_delete_link(values, values)) {
 			PurpleMediaSession *session = values->data;
-			g_object_get(session->session,
-					"codecs-ready", &ret, NULL);
+			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+					PURPLE_MEDIA_SEND_VIDEO))
+				g_object_get(session->session,
+						"codecs-ready", &ret, NULL);
+			else
+				ret = TRUE;
+
 			if (ret == FALSE)
 				break;
 		}
@@ -2983,6 +3107,8 @@
 
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
+	purple_prefs_set_int("/purple/media/audio/volume/input", level);
+
 	if (session_id == NULL)
 		sessions = g_hash_table_get_values(media->priv->sessions);
 	else
@@ -2993,10 +3119,13 @@
 		PurpleMediaSession *session = sessions->data;
 
 		if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+			gchar *name = g_strdup_printf("volume_%s",
+					session->id);
 			GstElement *volume = gst_bin_get_by_name(
-					GST_BIN(session->src),
-					"purpleaudioinputvolume");
-			g_object_set(volume, "volume", level, NULL);
+					GST_BIN(session->media->priv->confbin),
+					name);
+			g_free(name);
+			g_object_set(volume, "volume", level/10.0, NULL);
 		}
 	}
 #endif
@@ -3011,34 +3140,17 @@
 
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
+	purple_prefs_set_int("/purple/media/audio/volume/output", level);
+
 	streams = purple_media_get_streams(media,
 			session_id, participant);
 
 	for (; streams; streams = g_list_delete_link(streams, streams)) {
 		PurpleMediaStream *stream = streams->data;
 
-		if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO) {
-			GstElement *tee = stream->tee;
-			GstIterator *iter = gst_element_iterate_src_pads(tee);
-			GstPad *sinkpad;
-			while (gst_iterator_next(iter, (gpointer)&sinkpad)
-					 == GST_ITERATOR_OK) {
-				GstPad *peer = gst_pad_get_peer(sinkpad);
-				GstElement *volume;
-
-				if (peer == NULL) {
-					gst_object_unref(sinkpad);
-					continue;
-				}
-					
-				volume = gst_bin_get_by_name(GST_BIN(
-						GST_OBJECT_PARENT(peer)),
-						"purpleaudiooutputvolume");
-				g_object_set(volume, "volume", level, NULL);
-				gst_object_unref(peer);
-				gst_object_unref(sinkpad);
-			}
-			gst_iterator_free(iter);
+		if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO
+				&& GST_IS_ELEMENT(stream->volume)) {
+			g_object_set(stream->volume, "volume", level/10.0, NULL);
 		}
 	}
 #endif
--- a/libpurple/media.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/media.h	Wed Aug 19 00:37:01 2009 +0000
@@ -103,6 +103,8 @@
 	PURPLE_MEDIA_INFO_REJECT,
 	PURPLE_MEDIA_INFO_MUTE,
 	PURPLE_MEDIA_INFO_UNMUTE,
+	PURPLE_MEDIA_INFO_PAUSE,
+	PURPLE_MEDIA_INFO_UNPAUSE,
 	PURPLE_MEDIA_INFO_HOLD,
 	PURPLE_MEDIA_INFO_UNHOLD,
 } PurpleMediaInfoType;
--- a/libpurple/mediamanager.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/mediamanager.c	Wed Aug 19 00:37:01 2009 +0000
@@ -39,6 +39,7 @@
 #ifdef USE_VV
 
 #include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-element-added-notifier.h>
 #include <gst/interfaces/xoverlay.h>
 
 /** @copydoc _PurpleMediaManagerPrivate */
@@ -156,6 +157,12 @@
 	media->priv = PURPLE_MEDIA_MANAGER_GET_PRIVATE(media);
 	media->priv->medias = NULL;
 	media->priv->next_output_window_id = 1;
+
+	purple_prefs_add_none("/purple/media");
+	purple_prefs_add_none("/purple/media/audio");
+	purple_prefs_add_none("/purple/media/audio/volume");
+	purple_prefs_add_int("/purple/media/audio/volume/input", 10);
+	purple_prefs_add_int("/purple/media/audio/volume/output", 10);
 }
 
 static void
@@ -229,6 +236,10 @@
 	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
 
 	if (manager->priv->pipeline == NULL) {
+		FsElementAddedNotifier *notifier;
+		gchar *filename;
+		GError *err = NULL;
+		GKeyFile *keyfile;
 		GstBus *bus;
 		manager->priv->pipeline = gst_pipeline_new(NULL);
 
@@ -241,6 +252,38 @@
 				gst_bus_sync_signal_handler, NULL);
 		gst_object_unref(bus);
 
+		filename = g_build_filename(purple_user_dir(),
+				"fs-element.conf", NULL);
+		keyfile = g_key_file_new();
+		if (!g_key_file_load_from_file(keyfile, filename,
+				G_KEY_FILE_NONE, &err)) {
+			if (err->code == 4)
+				purple_debug_info("mediamanager",
+						"Couldn't read "
+						"fs-element.conf: %s\n",
+						err->message);
+			else
+				purple_debug_error("mediamanager",
+						"Error reading "
+						"fs-element.conf: %s\n",
+						err->message);
+			g_error_free(err);
+		}
+		g_free(filename);
+
+		/* Hack to make alsasrc stop messing up audio timestamps */
+		if (!g_key_file_has_key(keyfile,
+				"alsasrc", "slave-method", NULL)) {
+			g_key_file_set_integer(keyfile,
+					"alsasrc", "slave-method", 2);
+		}
+
+		notifier = fs_element_added_notifier_new();
+		fs_element_added_notifier_add(notifier,
+				GST_BIN(manager->priv->pipeline));
+		fs_element_added_notifier_set_properties_from_keyfile(
+				notifier, keyfile);
+
 		gst_element_set_state(manager->priv->pipeline,
 				GST_STATE_PLAYING);
 	}
@@ -356,15 +399,19 @@
 	GstElement *parent = GST_ELEMENT_PARENT(pad);
 	GstIterator *iter;
 	GstPad *remaining_pad;
+	GstIteratorResult result;
 
 	gst_element_release_request_pad(GST_ELEMENT_PARENT(pad), pad);
-	iter = gst_element_iterate_pads(parent);
+	iter = gst_element_iterate_src_pads(parent);
 
-	if (gst_iterator_next(iter, (gpointer)&remaining_pad)
-			== GST_ITERATOR_DONE) {
+	result = gst_iterator_next(iter, (gpointer)&remaining_pad);
+
+	if (result == GST_ITERATOR_DONE) {
 		gst_element_set_locked_state(parent, TRUE);
 		gst_element_set_state(parent, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
+	} else if (result == GST_ITERATOR_OK) {
+		gst_object_unref(remaining_pad);
 	}
 
 	gst_iterator_free(iter);
@@ -426,7 +473,6 @@
 			gst_element_link(tee, fakesink);
 
 			ret = bin;
-			gst_element_set_locked_state(ret, TRUE);
 			gst_object_ref(ret);
 			gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(
 					manager)), ret);
@@ -667,7 +713,7 @@
 				(participant == ow->participant)) &&
 				!strcmp(session_id, ow->session_id)) {
 			GstBus *bus;
-			GstElement *queue;
+			GstElement *queue, *colorspace;
 			GstElement *tee = purple_media_get_tee(media,
 					session_id, participant);
 
@@ -676,6 +722,8 @@
 
 			queue = gst_element_factory_make(
 					"queue", NULL);
+			colorspace = gst_element_factory_make(
+					"ffmpegcolorspace", NULL);
 			ow->sink = purple_media_manager_get_element(
 					manager, PURPLE_MEDIA_RECV_VIDEO,
 					ow->media, ow->session_id,
@@ -696,7 +744,7 @@
 			}
 
 			gst_bin_add_many(GST_BIN(GST_ELEMENT_PARENT(tee)),
-					queue, ow->sink, NULL);
+					queue, colorspace, ow->sink, NULL);
 
 			bus = gst_pipeline_get_bus(GST_PIPELINE(
 					manager->priv->pipeline));
@@ -704,9 +752,11 @@
 					G_CALLBACK(window_id_cb), ow);
 			gst_object_unref(bus);
 
-			gst_element_sync_state_with_parent(ow->sink);
-			gst_element_link(queue, ow->sink);
-			gst_element_sync_state_with_parent(queue);
+			gst_element_set_state(ow->sink, GST_STATE_PLAYING);
+			gst_element_set_state(colorspace, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(colorspace, ow->sink);
+			gst_element_link(queue, colorspace);
 			gst_element_link(tee, queue);
 		}
 	}
@@ -775,8 +825,14 @@
 		GstPad *pad = gst_element_get_static_pad(
 				output_window->sink, "sink");
 		GstPad *peer = gst_pad_get_peer(pad);
-		GstElement *queue = GST_ELEMENT_PARENT(peer);
+		GstElement *colorspace = GST_ELEMENT_PARENT(peer), *queue;
 		gst_object_unref(pad);
+		gst_object_unref(peer);
+		pad = gst_element_get_static_pad(colorspace, "sink");
+		peer = gst_pad_get_peer(pad);
+		queue = GST_ELEMENT_PARENT(peer);
+		gst_object_unref(pad);
+		gst_object_unref(peer);
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
@@ -785,6 +841,9 @@
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
+		gst_element_set_locked_state(colorspace, TRUE);
+		gst_element_set_state(colorspace, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(colorspace)), colorspace);
 		gst_element_set_locked_state(output_window->sink, TRUE);
 		gst_element_set_state(output_window->sink, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(output_window->sink)),
--- a/libpurple/plugins/perl/common/XMLNode.xs	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/plugins/perl/common/XMLNode.xs	Wed Aug 19 00:37:01 2009 +0000
@@ -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/pounce.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/pounce.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1157,4 +1157,7 @@
 	}
 
 	purple_signals_disconnect_by_handle(purple_pounces_get_handle());
+
+	g_hash_table_destroy(pounce_handlers);
+	pounce_handlers = NULL;
 }
--- a/libpurple/prefs.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/prefs.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1450,6 +1450,8 @@
 		sync_prefs();
 	}
 
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);
--- a/libpurple/protocols/bonjour/bonjour_ft.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Wed Aug 19 00:37:01 2009 +0000
@@ -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/irc/irc.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/irc/irc.c	Wed Aug 19 00:37:01 2009 +0000
@@ -569,9 +569,20 @@
 static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-	ib->name = g_strdup(purple_buddy_get_name(buddy));
-	g_hash_table_replace(irc->buddies, ib->name, ib);
+	struct irc_buddy *ib;
+	const char *bname = purple_buddy_get_name(buddy);
+
+	ib = g_hash_table_lookup(irc->buddies, bname);
+	if (ib != NULL) {
+		ib->ref++;
+		purple_prpl_got_user_status(irc->account, bname,
+				ib->online ? "available" : "offline", NULL);
+	} else {
+		ib = g_new0(struct irc_buddy, 1);
+		ib->name = g_strdup(bname);
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
+	}
 
 	/* if the timer isn't set, this is during signon, so we don't want to flood
 	 * ourself off with ISON's, so we don't, but after that we want to know when
@@ -583,7 +594,12 @@
 static void irc_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	struct irc_buddy *ib;
+
+	ib = g_hash_table_lookup(irc->buddies, purple_buddy_get_name(buddy));
+	if (ib && --ib->ref == 0) {
+		g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	}
 }
 
 static void read_input(struct irc_conn *irc, int len)
--- a/libpurple/protocols/irc/irc.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/irc/irc.h	Wed Aug 19 00:37:01 2009 +0000
@@ -97,6 +97,7 @@
 	char *name;
 	gboolean online;
 	gboolean flag;
+	int ref;
 };
 
 typedef int (*IRCCmdCallback) (struct irc_conn *irc, const char *cmd, const char *target, const char **args);
--- a/libpurple/protocols/irc/msgs.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/irc/msgs.c	Wed Aug 19 00:37:01 2009 +0000
@@ -103,7 +103,8 @@
 		PurpleBuddy *b = buddies->data;
 		struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
 		ib->name = g_strdup(purple_buddy_get_name(b));
-		g_hash_table_insert(irc->buddies, ib->name, ib);
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
 	}
 
 	irc_blist_timeout(irc);
--- a/libpurple/protocols/jabber/buddy.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Wed Aug 19 00:37:01 2009 +0000
@@ -513,6 +513,7 @@
 
 		xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
+		purple_imgstore_unref(img);
 	} else if (vc_node) {
 		xmlnode *photo;
 		/* TODO: Remove all PHOTO children? (see above note) */
@@ -1193,6 +1194,22 @@
 	g_free(jbri);
 }
 
+static guint jbir_hash(gconstpointer v)
+{
+	if (v)
+		return g_str_hash(v);
+	else
+		return 0;
+}
+
+static gboolean jbir_equal(gconstpointer v1, gconstpointer v2)
+{
+	const gchar *resource_1 = v1;
+	const gchar *resource_2 = v2;
+
+	return purple_strequal(resource_1, resource_2);
+}
+
 static void jabber_version_parse(JabberStream *js, const char *from,
                                  JabberIqType type, const char *id,
                                  xmlnode *packet, gpointer data)
@@ -1464,9 +1481,7 @@
 	char *full_jid = NULL;
 	const char *to;
 
-	g_return_if_fail(jbr->name != NULL);
-
-	if (is_bare_jid) {
+	if (is_bare_jid && jbr->name) {
 		full_jid = g_strdup_printf("%s/%s", jid, jbr->name);
 		to = full_jid;
 	} else
@@ -1535,7 +1550,7 @@
 	jbi->jid = g_strdup(jid);
 	jbi->js = js;
 	jbi->jb = jb;
-	jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free);
+	jbi->resources = g_hash_table_new_full(jbir_hash, jbir_equal, g_free, jabber_buddy_info_resource_free);
 	jbi->user_info = purple_notify_user_info_new();
 
 	iq = jabber_iq_new(js, JABBER_IQ_GET);
--- a/libpurple/protocols/jabber/caps.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/caps.c	Wed Aug 19 00:37:01 2009 +0000
@@ -456,6 +456,11 @@
 	/* Only validate if these are v1.5 capabilities */
 	if (userdata->hash) {
 		gchar *hash = NULL;
+		/*
+		 * TODO: If you add *any* hash here, make sure the checksum buffer
+		 * size in jabber_caps_calculate_hash is large enough. The cipher API
+		 * doesn't seem to offer a "Get the hash size" function(?).
+		 */
 		if (!strcmp(userdata->hash, "sha-1")) {
 			hash = jabber_caps_calculate_hash(info, "sha1");
 		} else if (!strcmp(userdata->hash, "md5")) {
--- a/libpurple/protocols/jabber/chat.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Wed Aug 19 00:37:01 2009 +0000
@@ -605,7 +605,7 @@
 	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 
 	if (topic && *topic)
-		jm->subject = purple_markup_strip_html(topic);
+		jm->subject = g_strdup(topic);
 	else
 		jm->subject = g_strdup("");
 
@@ -750,6 +750,7 @@
 
 	if(!server || !*server) {
 		purple_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
+		purple_roomlist_set_in_progress(js->roomlist, FALSE);
 		return;
 	}
 
--- a/libpurple/protocols/jabber/disco.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Wed Aug 19 00:37:01 2009 +0000
@@ -302,6 +302,8 @@
 			}
 		}
 
+		js->chat_servers = g_list_reverse(js->chat_servers);
+
 		capabilities |= JABBER_CAP_RETRIEVED;
 
 		if(jbr)
--- a/libpurple/protocols/jabber/iq.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Wed Aug 19 00:37:01 2009 +0000
@@ -282,11 +282,6 @@
 	id = xmlnode_get_attrib(packet, "id");
 	iq_type = xmlnode_get_attrib(packet, "type");
 
-	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
-			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
-	if (signal_return)
-		return;
-
 	/*
 	 * child will be either the first tag child or NULL if there is no child.
 	 * Historically, we used just the 'query' subchild, but newer XEPs use
@@ -345,6 +340,11 @@
 		return;
 	}
 
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
+	if (signal_return)
+		return;
+
 	/* First, lets see if a special callback got registered */
 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
 		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
--- a/libpurple/protocols/jabber/jingle/rtp.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Wed Aug 19 00:37:01 2009 +0000
@@ -355,14 +355,6 @@
 static void jingle_rtp_ready(JingleSession *session);
 
 static void
-jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name,
-		JingleSession *session)
-{
-	purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n");
-	jingle_rtp_ready(session);
-}
-
-static void
 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
 		gchar *sid, gchar *name, JingleSession *session)
 {
@@ -480,6 +472,9 @@
 		jabber_iq_send(jingle_session_terminate_packet(
 				session, "decline"));
 		g_object_unref(session);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT &&
+			jingle_session_is_initiator(session) == FALSE) {
+		jingle_rtp_ready(session);
 	}
 }
 
@@ -504,8 +499,6 @@
 		}
 
 		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
-				G_CALLBACK(jingle_rtp_accepted_cb), session);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
 				G_CALLBACK(jingle_rtp_candidates_prepared_cb),
 				session);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
@@ -539,9 +532,6 @@
 	purple_media_set_prpl_data(media, session);
 
 	/* connect callbacks */
-	if (jingle_session_is_initiator(session) == FALSE)
-		g_signal_connect(G_OBJECT(media), "accepted",
-				G_CALLBACK(jingle_rtp_accepted_cb), session);
 	g_signal_connect(G_OBJECT(media), "candidates-prepared",
 				 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
 	g_signal_connect(G_OBJECT(media), "codecs-changed",
@@ -599,8 +589,8 @@
 	if (!strcmp(senders, "both"))
 		type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
 				: PURPLE_MEDIA_VIDEO;
-	else if (!strcmp(senders, "initiator")
-			&& jingle_session_is_initiator(session))
+	else if ((strcmp(senders, "initiator") == 0) ==
+			jingle_session_is_initiator(session))
 		type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
 				: PURPLE_MEDIA_SEND_VIDEO;
 	else
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Wed Aug 19 00:37:01 2009 +0000
@@ -28,6 +28,7 @@
 #include "internal.h"
 
 #include "accountopt.h"
+#include "core.h"
 #include "debug.h"
 #include "version.h"
 
@@ -47,6 +48,8 @@
 #include "data.h"
 #include "ibb.h"
 
+static PurplePlugin *my_protocol = NULL;
+
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
@@ -266,6 +269,70 @@
 	NULL
 };
 
+static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
+{
+	PurpleAccount *acct = NULL;
+
+	/* If we have a specific acct, use it */
+	if (acct_id) {
+		acct = purple_accounts_find(acct_id, prpl);
+		if (acct && !purple_account_is_connected(acct))
+			acct = NULL;
+	} else { /* Otherwise find an active account for the protocol */
+		GList *l = purple_accounts_get_all();
+		while (l) {
+			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+					&& purple_account_is_connected(l->data)) {
+				acct = l->data;
+				break;
+			}
+			l = l->next;
+		}
+	}
+
+	return acct;
+}
+
+static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable *params)
+{
+	char *acct_id = g_hash_table_lookup(params, "account");
+	PurpleAccount *acct;
+
+	if (g_ascii_strcasecmp(proto, "xmpp"))
+		return FALSE;
+
+	acct = find_acct(purple_plugin_get_id(my_protocol), acct_id);
+
+	if (!acct)
+		return FALSE;
+
+	/* xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message */
+	if (g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
+		char *body = g_hash_table_lookup(params, "body");
+		if (user && *user) {
+			PurpleConversation *conv =
+					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+			purple_conversation_present(conv);
+			if (body && *body)
+				purple_conv_send_confirm(conv, body);
+		}
+	} else if (g_hash_table_lookup_extended(params, "roster", NULL, NULL)) {
+		char *name = g_hash_table_lookup(params, "name");
+		if (user && *user)
+			purple_blist_request_add_buddy(acct, user, NULL, name);
+	} else if (g_hash_table_lookup_extended(params, "join", NULL, NULL)) {
+		PurpleConnection *gc = purple_account_get_connection(acct);
+		if (user && *user) {
+			GHashTable *params = jabber_chat_info_defaults(gc, user);
+			jabber_chat_join(gc, params);
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
 static void
 init_plugin(PurplePlugin *plugin)
 {
@@ -331,6 +398,7 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 		option);
 
+	my_protocol = plugin;
 	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
@@ -366,6 +434,9 @@
 
 	jabber_ibb_init();
 	jabber_si_init();
+
+	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
+		PURPLE_CALLBACK(xmpp_uri_handler), NULL);
 }
 
 
--- a/libpurple/protocols/jabber/oob.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/oob.c	Wed Aug 19 00:37:01 2009 +0000
@@ -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/jabber/presence.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Wed Aug 19 00:37:01 2009 +0000
@@ -698,6 +698,7 @@
 			const char *real_jid = NULL;
 			const char *affiliation = NULL;
 			const char *role = NULL;
+			gboolean is_our_resource = FALSE; /* Is the presence about us? */
 
 			/*
 			 * XEP-0045 mandates the presence to include a resource (which is
@@ -718,10 +719,15 @@
 				xmlnode *status_node;
 				xmlnode *item_node;
 
-				status_node = xmlnode_get_child(x, "status");
-				if (status_node) {
+				for (status_node = xmlnode_get_child(x, "status"); status_node;
+						status_node = xmlnode_get_next_twin(status_node)) {
 					const char *code = xmlnode_get_attrib(status_node, "code");
-					if (purple_strequal(code, "201")) {
+					if (!code)
+						continue;
+
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if (g_str_equal(code, "201")) {
 						if ((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
 							chat->config_dialog_handle =
@@ -737,7 +743,7 @@
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}
-					} else if (purple_strequal(code, "210")) {
+					} else if (g_str_equal(code, "210")) {
 						/* server rewrote room-nick */
 						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							g_free(chat->handle);
@@ -814,7 +820,6 @@
 					"http://jabber.org/protocol/muc#user");
 			if (chat->muc && x) {
 				const char *nick;
-				const char *code = NULL;
 				const char *item_jid = NULL;
 				const char *to;
 				xmlnode *stat;
@@ -824,13 +829,16 @@
 				if (item)
 					item_jid = xmlnode_get_attrib(item, "jid");
 
-				stat = xmlnode_get_child(x, "status");
+				for (stat = xmlnode_get_child(x, "status"); stat;
+						stat = xmlnode_get_next_twin(stat)) {
+					const char *code = xmlnode_get_attrib(stat, "code");
 
-				if (stat)
-					code = xmlnode_get_attrib(stat, "code");
+					if (!code)
+						continue;
 
-				if (code) {
-					if(!strcmp(code, "301")) {
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if(!strcmp(code, "301")) {
 						/* XXX: we got banned */
 					} else if(!strcmp(code, "303") && item &&
 							(nick = xmlnode_get_attrib(item, "nick"))) {
@@ -839,10 +847,11 @@
 							g_free(chat->handle);
 							chat->handle = g_strdup(nick);
 						}
+
+						/* TODO: This should probably be moved out of the loop */
 						purple_conv_chat_rename_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, nick);
 						jabber_chat_remove_handle(chat, jid->resource);
-						/* TODO: Enable this when this is in a for-loop...
-						break; */
+						continue;
 					} else if(!strcmp(code, "307")) {
 						/* Someone was kicked from the room */
 						xmlnode *reason = NULL, *actor = NULL;
--- a/libpurple/protocols/jabber/si.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Wed Aug 19 00:37:01 2009 +0000
@@ -67,7 +67,7 @@
 
 	JabberIBBSession *ibb_session;
 	guint ibb_timeout_handle;
-	FILE *fp;
+	PurpleCircBuffer *ibb_buffer;
 } JabberSIXfer;
 
 /* some forward declarations */
@@ -1012,18 +1012,8 @@
 	if (size <= purple_xfer_get_bytes_remaining(xfer)) {
 		purple_debug_info("jabber", "about to write %" G_GSIZE_FORMAT " bytes from IBB stream\n",
 			size);
-		if(!fwrite(data, size, 1, jsx->fp)) {
-			purple_debug_error("jabber", "error writing to file\n");
-			purple_xfer_cancel_remote(xfer);
-			return;
-		}
-		purple_xfer_set_bytes_sent(xfer, purple_xfer_get_bytes_sent(xfer) + size);
-		purple_xfer_update_progress(xfer);
-
-		if (purple_xfer_get_bytes_remaining(xfer) == 0) {
-			purple_xfer_set_completed(xfer, TRUE);
-			purple_xfer_end(xfer);
-		}
+		purple_circ_buffer_append(jsx->ibb_buffer, data, size);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* trying to write past size of file transfers negotiated size,
 		  reject transfer to protect against malicious behaviour */
@@ -1034,6 +1024,25 @@
 
 }
 
+static gssize
+jabber_si_xfer_ibb_read(guchar **out_buffer, PurpleXfer *xfer)
+{
+	JabberSIXfer *jsx = xfer->data;
+	guchar *buffer;
+	gsize size;
+	gsize tmp;
+
+	size = jsx->ibb_buffer->bufused;
+	*out_buffer = buffer = g_malloc(size);
+	while ((tmp = purple_circ_buffer_get_max_read(jsx->ibb_buffer))) {
+		memcpy(buffer, jsx->ibb_buffer->outptr, tmp);
+		buffer += tmp;
+		purple_circ_buffer_mark_read(jsx->ibb_buffer, tmp);
+	}
+
+	return size;
+}
+
 static gboolean
 jabber_si_xfer_ibb_open_cb(JabberStream *js, const char *who, const char *id,
                            xmlnode *open)
@@ -1044,21 +1053,10 @@
 		JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 		JabberIBBSession *sess =
 			jabber_ibb_session_create_from_xmlnode(js, who, id, open, xfer);
-		const char *filename;
 
 		jabber_si_bytestreams_ibb_timeout_remove(jsx);
 
 		if (sess) {
-			/* open the file to write to */
-			filename = purple_xfer_get_local_filename(xfer);
-			jsx->fp = g_fopen(filename, "wb");
-			if (jsx->fp == NULL) {
-				purple_debug_error("jabber", "failed to open file %s for writing: %s\n",
-					filename, g_strerror(errno));
-				purple_xfer_cancel_remote(xfer);
-				return FALSE;
-			}
-
 			/* setup callbacks here...*/
 			jabber_ibb_session_set_data_received_callback(sess,
 				jabber_si_xfer_ibb_recv_data_cb);
@@ -1068,9 +1066,14 @@
 				jabber_si_xfer_ibb_error_cb);
 
 			jsx->ibb_session = sess;
+			jsx->ibb_buffer =
+				purple_circ_buffer_new(jabber_ibb_session_get_block_size(sess));
+
+			/* set up read function */
+			purple_xfer_set_read_fnc(xfer, jabber_si_xfer_ibb_read);
 
 			/* start the transfer */
-			purple_xfer_start(xfer, 0, NULL, 0);
+			purple_xfer_start(xfer, -1, NULL, 0);
 			return TRUE;
 		} else {
 			/* failed to create IBB session */
@@ -1086,32 +1089,17 @@
 	}
 }
 
-static void
-jabber_si_xfer_ibb_send_data(JabberIBBSession *sess)
+static gssize
+jabber_si_xfer_ibb_write(const guchar *buffer, size_t len, PurpleXfer *xfer)
 {
-	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
-	gsize remaining = purple_xfer_get_bytes_remaining(xfer);
-	gsize packet_size = remaining < jabber_ibb_session_get_block_size(sess) ?
-		remaining : jabber_ibb_session_get_block_size(sess);
-	gpointer data = g_malloc(packet_size);
-	int res;
+	JabberIBBSession *sess = jsx->ibb_session;
+	gsize packet_size = len < jabber_ibb_session_get_block_size(sess) ?
+		len : jabber_ibb_session_get_block_size(sess);
 
-	purple_debug_info("jabber", "IBB: about to read %" G_GSIZE_FORMAT " bytes from file %p\n",
-		packet_size, jsx->fp);
-	res = fread(data, packet_size, 1, jsx->fp);
+	jabber_ibb_session_send_data(sess, buffer, packet_size);
 
-	if (res == 1) {
-		jabber_ibb_session_send_data(sess, data, packet_size);
-		purple_xfer_set_bytes_sent(xfer,
-			purple_xfer_get_bytes_sent(xfer) + packet_size);
-		purple_xfer_update_progress(xfer);
-	} else {
-		purple_debug_error("jabber",
-			"jabber_si_xfer_ibb_send_data: error reading from file\n");
-		purple_xfer_cancel_local(xfer);
-	}
-	g_free(data);
+	return packet_size;
 }
 
 static void
@@ -1127,7 +1115,7 @@
 		purple_xfer_end(xfer);
 	} else {
 		/* send more... */
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_prpl_ready(xfer);
 	}
 }
 
@@ -1135,28 +1123,13 @@
 jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 	JabberStream *js = jabber_ibb_session_get_js(sess);
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
 	if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
-		const char *filename = purple_xfer_get_local_filename(xfer);
-		jsx->fp = g_fopen(filename, "rb");
-		if (jsx->fp == NULL) {
-			purple_debug_error("jabber", "Failed to open file %s for reading: %s\n",
-				filename, g_strerror(errno));
-			purple_xfer_error(purple_xfer_get_type(xfer), account,
-				jabber_ibb_session_get_who(sess),
-				_("Failed to open the file"));
-			purple_xfer_cancel_local(xfer);
-			return;
-		}
-
-		purple_xfer_start(xfer, 0, NULL, 0);
-		purple_xfer_set_bytes_sent(xfer, 0);
-		purple_xfer_update_progress(xfer);
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_start(xfer, -1, NULL, 0);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* error */
 		purple_xfer_error(purple_xfer_get_type(xfer), account,
@@ -1171,8 +1144,6 @@
 {
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 
-	purple_xfer_ref(xfer);
-
 	jsx->ibb_session = jabber_ibb_session_create(js, jsx->stream_id,
 		purple_xfer_get_remote_user(xfer), xfer);
 
@@ -1187,6 +1158,11 @@
 		jabber_ibb_session_set_error_callback(jsx->ibb_session,
 			jabber_si_xfer_ibb_error_cb);
 
+		purple_xfer_set_write_fnc(xfer, jabber_si_xfer_ibb_write);
+
+		jsx->ibb_buffer =
+			purple_circ_buffer_new(jabber_ibb_session_get_block_size(jsx->ibb_session));
+
 		/* open the IBB session */
 		jabber_ibb_session_open(jsx->ibb_session);
 
@@ -1342,10 +1318,8 @@
 			jabber_ibb_session_destroy(jsx->ibb_session);
 		}
 
-		if (jsx->fp) {
-			purple_debug_info("jabber",
-				"jabber_si_xfer_free: closing file for IBB transfer\n");
-			fclose(jsx->fp);
+		if (jsx->ibb_buffer) {
+			purple_circ_buffer_destroy(jsx->ibb_buffer);
 		}
 
 		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
@@ -1356,7 +1330,6 @@
 		g_free(jsx->rxqueue);
 		g_free(jsx);
 		xfer->data = NULL;
-
 	}
 }
 
@@ -1632,7 +1605,6 @@
 		jsx->local_streamhost_fd = -1;
 
 		jsx->ibb_session = NULL;
-		jsx->fp = NULL;
 
 		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
 		purple_xfer_set_cancel_send_fnc(xfer, jabber_si_xfer_cancel_send);
--- a/libpurple/protocols/msn/Makefile.mingw	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Wed Aug 19 00:37:01 2009 +0000
@@ -41,7 +41,6 @@
 			command.c \
 			contact.c\
 			dialog.c \
-			directconn.c \
 			error.c \
 			group.c \
 			history.c \
--- a/libpurple/protocols/msn/cmdproc.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Wed Aug 19 00:37:01 2009 +0000
@@ -333,60 +333,38 @@
 			trans->timer = 0;
 		}
 
-	if (g_ascii_isdigit(cmd->command[0]))
+	if (g_ascii_isdigit(cmd->command[0]) && trans != NULL)
 	{
-		if (trans != NULL)
-		{
-			MsnErrorCb error_cb = NULL;
-			int error;
+		MsnErrorCb error_cb;
+		int error;
 
-			error = atoi(cmd->command);
-
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
-
-			if (error_cb == NULL && cmdproc->cbs_table->errors != NULL)
-				error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
+		error = atoi(cmd->command);
 
-			if (error_cb != NULL)
-			{
-				error_cb(cmdproc, trans, error);
-			}
-			else
-			{
-#if 1
-				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
+		error_cb = trans->error_cb;
+		if (error_cb == NULL)
+			error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
 
-			return;
-		}
+		if (error_cb != NULL)
+			error_cb(cmdproc, trans, error);
+		else
+			msn_error_handle(cmdproc->session, error);
+
+		return;
 	}
 
-	if (cmdproc->cbs_table->async != NULL)
-		cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
+	cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
 
-	if (cb == NULL && trans != NULL)
-	{
-		if (trans->callbacks != NULL)
-			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
-	}
+	if (cb == NULL && trans != NULL && trans->callbacks != NULL)
+		cb = g_hash_table_lookup(trans->callbacks, cmd->command);
 
-	if (cb == NULL && cmdproc->cbs_table->fallback != NULL)
+	if (cb == NULL)
 		cb = g_hash_table_lookup(cmdproc->cbs_table->fallback, cmd->command);
 
 	if (cb != NULL)
-	{
 		cb(cmdproc, cmd);
-	}
 	else
-	{
 		purple_debug_warning("msn", "Unhandled command '%s'\n",
 						   cmd->command);
-	}
 
 	if (trans != NULL && trans->pendent_cmd != NULL)
 		msn_transaction_unqueue_cmd(trans, cmdproc);
--- a/libpurple/protocols/msn/contact.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Wed Aug 19 00:37:01 2009 +0000
@@ -351,14 +351,24 @@
 msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node,
 	MsnListId list)
 {
-	char *passport = xmlnode_get_data(xmlnode_get_child(member, node));
-	char *type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
-	char *member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
-	MsnUser *user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+	char *passport;
+	char *type;
+	char *member_id;
+	MsnUser *user;
 	xmlnode *annotation;
 	guint nid = MSN_NETWORK_UNKNOWN;
 	char *invite = NULL;
 
+	passport = xmlnode_get_data(xmlnode_get_child(member, node));
+	if (!purple_email_is_valid(passport)) {
+		g_free(passport);
+		return;
+	}
+
+	type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
+	member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
+	user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+
 	for (annotation = xmlnode_get_child(member, "Annotations/Annotation");
 	     annotation;
 	     annotation = xmlnode_get_next_twin(annotation)) {
@@ -746,6 +756,9 @@
 		if (passport == NULL)
 			continue;
 
+		if (!purple_email_is_valid(passport))
+			continue;
+
 		if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
 			Name = xmlnode_get_data(displayName);
 		else
--- a/libpurple/protocols/msn/directconn.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/directconn.c	Wed Aug 19 00:37:01 2009 +0000
@@ -247,14 +247,6 @@
 }
 
 static void
-msn_directconn_process_msg(MsnDirectConn *directconn, MsnMessage *msg)
-{
-	purple_debug_info("msn", "directconn: process_msg\n");
-
-	msn_slplink_process_msg(directconn->slplink, msg);
-}
-
-static void
 read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
@@ -267,6 +259,19 @@
 	directconn = data;
 
 	/* Let's read the length of the data. */
+#error This code is broken.  See the note below.
+	/*
+	 * TODO: This has problems!  First of all, sizeof(body_len) will be
+	 *       different on 32bit systems and on 64bit systems (4 bytes
+	 *       vs. 8 bytes).
+	 *       Secondly, we're reading from a TCP stream.  There is no
+	 *       guarantee that we have received the number of bytes we're
+	 *       trying to read.  We need to read into a buffer.  If read
+	 *       returns <0 then we need to check errno.  If errno is EAGAIN
+	 *       then don't destroy anything, just exit and wait for more
+	 *       data.  See every other function in libpurple that does this
+	 *       correctly for an example.
+	 */
 	len = read(directconn->fd, &body_len, sizeof(body_len));
 
 	if (len <= 0)
@@ -337,7 +342,8 @@
 		msg = msn_message_new_msnslp();
 		msn_message_parse_slp_body(msg, body, body_len);
 
-		msn_directconn_process_msg(directconn, msg);
+		purple_debug_info("msn", "directconn: process_msg\n");
+		msn_slplink_process_msg(directconn->slplink, msg);
 	}
 	else
 	{
--- a/libpurple/protocols/msn/msg.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1102,6 +1102,7 @@
 {
 	GHashTable *body;
 	const gchar *guid;
+	gboolean accepted = FALSE;
 
 	g_return_if_fail(cmdproc != NULL);
 	g_return_if_fail(msg != NULL);
@@ -1129,6 +1130,9 @@
 		} else
 			purple_debug_warning("msn", "Invite msg missing "
 					"Application-GUID.\n");
+
+		accepted = TRUE;
+
 	} else if (!strcmp(guid, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) {
 		purple_debug_info("msn", "Computer call\n");
 
@@ -1154,9 +1158,35 @@
 				g_free(buf);
 			}
 		}
-	} else
-		purple_debug_warning("msn",
-				"Unhandled invite msg with GUID %s.\n", guid);
+	} else {
+		const gchar *application = g_hash_table_lookup(body, "Application-Name");
+		purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n",
+		                     guid, application ? application : "(null)");
+	}
+
+	if (!accepted) {
+		const gchar *cookie = g_hash_table_lookup(body, "Invitation-Cookie");
+		if (cookie) {
+			MsnSwitchBoard *swboard = cmdproc->data;
+			char *text;
+			MsnMessage *cancel;
+
+			cancel = msn_message_new(MSN_MSG_TEXT);
+			msn_message_set_content_type(cancel, "text/x-msmsgsinvite");
+			msn_message_set_charset(cancel, "UTF-8");
+			msn_message_set_flag(cancel, 'U');
+
+			text = g_strdup_printf("Invitation-Command: CANCEL\r\n"
+			                       "Invitation-Cookie: %s\r\n"
+			                       "Cancel-Code: REJECT_NOT_INSTALLED\r\n",
+			                       cookie);
+			msn_message_set_bin_data(cancel, text, strlen(text));
+			g_free(text);
+
+			msn_switchboard_send_msg(swboard, cancel, TRUE);
+			msn_message_destroy(cancel);
+		}
+	}
 
 	g_hash_table_destroy(body);
 }
--- a/libpurple/protocols/msn/msn.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/msn.h	Wed Aug 19 00:37:01 2009 +0000
@@ -127,7 +127,7 @@
 } MsnClientVerId;
 
 #define MSN_CLIENT_ID_VERSION      MSN_CLIENT_VER_7_0
-#define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM|MSN_CLIENT_CAP_WINKS)
+#define MSN_CLIENT_ID_CAPABILITIES (MSN_CLIENT_CAP_PACKET|MSN_CLIENT_CAP_INK_GIF|MSN_CLIENT_CAP_VOICEIM)
 
 #define MSN_CLIENT_ID \
 	((MSN_CLIENT_ID_VERSION    << 24) | \
--- a/libpurple/protocols/msn/session.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/session.h	Wed Aug 19 00:37:01 2009 +0000
@@ -35,7 +35,6 @@
 #include "switchboard.h"
 #include "group.h"
 
-#include "cmdproc.h"
 #include "nexus.h"
 #include "httpconn.h"
 #include "oim.h"
--- a/libpurple/protocols/msn/slp.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Wed Aug 19 00:37:01 2009 +0000
@@ -244,6 +244,8 @@
 got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 			   const char *euf_guid, const char *context)
 {
+	gboolean accepted = FALSE;
+
 	if (!strcmp(euf_guid, MSN_OBJ_GUID))
 	{
 		/* Emoticon or UserDisplay */
@@ -314,7 +316,10 @@
 		msn_slpmsg_set_image(slpmsg, img);
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 		purple_imgstore_unref(img);
+
+		accepted = TRUE;
 	}
+
 	else if (!strcmp(euf_guid, MSN_FT_GUID))
 	{
 		/* File Transfer */
@@ -346,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);
@@ -360,6 +365,9 @@
 
 			purple_xfer_request(xfer);
 		}
+
+		accepted = TRUE;
+
 	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
 		purple_debug_info("msn", "Cam request.\n");
 		if (slpcall && slpcall->slplink &&
@@ -382,6 +390,7 @@
 				g_free(buf);
 			}
 		}
+
 	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
 		purple_debug_info("msn", "Cam invite.\n");
 		if (slpcall && slpcall->slplink &&
@@ -404,8 +413,16 @@
 				g_free(buf);
 			}
 		}
+
 	} else
 		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
+
+	if (!accepted) {
+		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+		                                slpcall->session_id);
+		send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
 }
 
 void
--- a/libpurple/protocols/msn/slplink.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Wed Aug 19 00:37:01 2009 +0000
@@ -441,6 +441,7 @@
 	slpmsg->info = "SLP ACK";
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -456,7 +457,7 @@
 	slpmsg->info = "SLP FILE";
 
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -502,14 +503,8 @@
 		g_return_if_reached();
 	}
 
-	slpmsg = NULL;
 	data = msn_message_get_bin_data(msg, &len);
 
-	/*
-		OVERHEAD!
-		if (msg->msnslp_header.length < msg->msnslp_header.total_size)
-	 */
-
 	offset = msg->msnslp_header.offset;
 
 	if (offset == 0)
@@ -537,7 +532,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
@@ -566,13 +561,12 @@
 	else
 	{
 		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
-	}
-
-	if (slpmsg == NULL)
-	{
-		/* Probably the transfer was canceled */
-		purple_debug_error("msn", "Couldn't find slpmsg\n");
-		return;
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was canceled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
 	}
 
 	if (slpmsg->fp)
@@ -580,7 +574,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/msn/slpmsg.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Wed Aug 19 00:37:01 2009 +0000
@@ -50,10 +50,8 @@
 	long ack_id;
 	long ack_sub_id;
 	long long ack_size;
-	long app_id;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	int ref_count; /**< The reference count. */
 	long flags;
 
 	FILE *fp;
--- a/libpurple/protocols/msn/sync.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/sync.h	Wed Aug 19 00:37:01 2009 +0000
@@ -34,6 +34,11 @@
 {
 	MsnSession *session;
 	MsnTable *cbs_table;
+
+	/*
+	 * TODO: What is the intended purpose of old_cbs_table?  Nothing
+	 *       sets it and it is only read in two places.
+	 */
 	MsnTable *old_cbs_table;
 
 	int num_users;
--- a/libpurple/protocols/msn/userlist.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msn/userlist.h	Wed Aug 19 00:37:01 2009 +0000
@@ -26,7 +26,6 @@
 
 typedef struct _MsnUserList MsnUserList;
 
-#include "cmdproc.h"
 #include "user.h"
 #include "group.h"
 
--- a/libpurple/protocols/msnp9/slp.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msnp9/slp.c	Wed Aug 19 00:37:01 2009 +0000
@@ -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	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/msnp9/slplink.c	Wed Aug 19 00:37:01 2009 +0000
@@ -477,6 +477,7 @@
 #endif
 
 	msn_slplink_send_slpmsg(slplink, slpmsg);
+	msn_slpmsg_destroy(slpmsg);
 }
 
 static void
@@ -496,7 +497,7 @@
 	slpmsg->info = "SLP FILE";
 #endif
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -561,7 +562,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
@@ -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/libpurple/protocols/myspace/myspace.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1341,6 +1341,27 @@
 	return ret;
 }
 #endif
+/**
+ * Process incoming status mood messages.
+ *
+ * @param session
+ * @param msg Status mood update message. Caller frees.
+ *
+ * @return TRUE if successful.
+ */
+static gboolean
+msim_incoming_status_mood(MsimSession *session, MsimMessage *msg) {
+	/* TODO: I dont know too much about this yet,
+	 * so until I see how the official client handles
+	 * this and decide if libpurple should as well,
+	 * well just say we used it
+	 */
+	gchar *ss;
+	ss = msim_msg_get_string(msg, "msg");
+	purple_debug_info("msim", "Incoming Status Message: %s", ss ? ss : "(NULL)");
+	g_free(ss);
+	return TRUE;
+}
 
 /**
  * Process incoming status messages.
@@ -1692,11 +1713,19 @@
 			return msim_incoming_media(session, msg);
 		case MSIM_BM_UNOFFICIAL_CLIENT:
 			return msim_incoming_unofficial_client(session, msg);
+		case MSIM_BM_STATUS_MOOD:
+			return msim_incoming_status_mood(session, msg);
 		default:
-			/* Not really an IM, but show it for informational
-			 * purposes during development. */
-			/* TODO: This is probably wrong */
-			return msim_incoming_action_or_im(session, msg);
+			/*
+			 * Unknown message type!  We used to call
+			 *   msim_incoming_action_or_im(session, msg);
+			 * for these, but that doesn't help anything, and it means
+			 * we'll show broken gibberish if MySpace starts sending us
+			 * other message types.
+			 */
+			purple_debug_warning("myspace", "Received unknown imcoming "
+					"message, bm=%u\n", bm);
+			return TRUE;
 	}
 }
 
--- a/libpurple/protocols/myspace/myspace.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Wed Aug 19 00:37:01 2009 +0000
@@ -132,6 +132,7 @@
 #define MSIM_BM_ACTION_OR_IM_INSTANT    121
 #define MSIM_BM_MEDIA                   122
 #define MSIM_BM_PROFILE                 124
+#define MSIM_BM_STATUS_MOOD             126
 #define MSIM_BM_UNOFFICIAL_CLIENT       200
 
 /* Authentication algorithm for login2 */
--- a/libpurple/protocols/oscar/family_buddy.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/oscar/family_buddy.c	Wed Aug 19 00:37:01 2009 +0000
@@ -221,9 +221,6 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, &userinfo);
 
-	if (snac->subtype == SNAC_SUBTYPE_BUDDY_ONCOMING && userinfo.flags & AIM_FLAG_AWAY)
-		aim_locate_autofetch_away_message(od, userinfo.bn);
-
 	aim_info_free(&userinfo);
 
 	return ret;
--- a/libpurple/protocols/oscar/family_locate.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Wed Aug 19 00:37:01 2009 +0000
@@ -250,8 +250,6 @@
 aim_locate_adduserinfo(OscarData *od, aim_userinfo_t *userinfo)
 {
 	aim_userinfo_t *cur;
-	FlapConnection *conn;
-	aim_rxcallback_t userfunc;
 
 	cur = aim_locate_finduserinfo(od, userinfo->bn);
 
@@ -353,73 +351,6 @@
 		}
 		cur->away_len = 0;
 	}
-
-	/*
-	 * This callback can be used by a client if they want to know whenever
-	 * info for a buddy is updated.  For example, if a client shows away
-	 * messages in its buddy list, then it would need to know if a user's
-	 * away message changes.
-	 */
-	conn = flap_connection_findbygroup(od, SNAC_FAMILY_LOCATE);
-	if ((userfunc = aim_callhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK)))
-		userfunc(od, conn, NULL, cur);
-}
-
-/**
- * Remove this buddy name from our queue.  If this info was requested
- * by our info request queue, then pop the next element off of the queue.
- *
- * @param od The aim session.
- * @param bn Buddy name of the info we just received.
- * @return True if the request was explicit (client requested the info),
- *         false if the request was implicit (libfaim request the info).
- */
-static int
-aim_locate_gotuserinfo(OscarData *od, FlapConnection *conn, const char *bn)
-{
-	struct userinfo_node *cur, *del;
-	int was_explicit = TRUE;
-
-	while ((od->locate.requested != NULL) && (oscar_util_name_compare(bn, od->locate.requested->bn) == 0)) {
-		del = od->locate.requested;
-		od->locate.requested = del->next;
-		was_explicit = FALSE;
-		g_free(del->bn);
-		g_free(del);
-	}
-
-	cur = od->locate.requested;
-	while ((cur != NULL) && (cur->next != NULL)) {
-		if (oscar_util_name_compare(bn, cur->next->bn) == 0) {
-			del = cur->next;
-			cur->next = del->next;
-			was_explicit = FALSE;
-			g_free(del->bn);
-			g_free(del);
-		} else
-			cur = cur->next;
-	}
-
-	return was_explicit;
-}
-
-void
-aim_locate_autofetch_away_message(OscarData *od, const char *bn)
-{
-	struct userinfo_node *cur;
-
-	/* Make sure we haven't already made an info request for this buddy */
-	for (cur = od->locate.requested; cur != NULL; cur = cur->next)
-		if (oscar_util_name_compare(bn, cur->bn) == 0)
-			return;
-
-	/* Add a new node to our request queue */
-	cur = (struct userinfo_node *)g_malloc(sizeof(struct userinfo_node));
-	cur->bn = g_strdup(bn);
-	cur->next = od->locate.requested;
-	od->locate.requested = cur;
-
-	aim_locate_getinfoshort(od, cur->bn, 0x00000002);
 }
 
 aim_userinfo_t *aim_locate_finduserinfo(OscarData *od, const char *bn) {
@@ -956,7 +887,6 @@
 	aim_snac_t *snac2;
 	guint16 reason;
 	char *bn;
-	int was_explicit;
 
 	if (!(snac2 = aim_remsnac(od, snac->id))) {
 		purple_debug_misc("oscar", "locate error: received response from unknown request!\n");
@@ -978,15 +908,9 @@
 
 	reason = byte_stream_get16(bs);
 
-	/*
-	 * Remove this buddy name from our queue.  If the client requested
-	 * this buddy's info explicitly, then notify them that we do not have
-	 * info for this buddy.
-	 */
-	was_explicit = aim_locate_gotuserinfo(od, conn, bn);
-	if (was_explicit == TRUE)
-		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-			ret = userfunc(od, conn, frame, reason, bn);
+	/* Notify the user that we do not have info for this buddy */
+	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+		ret = userfunc(od, conn, frame, reason, bn);
 
 	if (snac2)
 		g_free(snac2->data);
@@ -1202,7 +1126,6 @@
 	aim_userinfo_t *userinfo, *userinfo2;
 	GSList *tlvlist;
 	aim_tlv_t *tlv = NULL;
-	int was_explicit;
 
 	userinfo = (aim_userinfo_t *)g_malloc(sizeof(aim_userinfo_t));
 	aim_info_extract(od, bs, userinfo);
@@ -1238,18 +1161,9 @@
 	aim_info_free(userinfo);
 	g_free(userinfo);
 
-	/*
-	 * Remove this buddy name from our queue.  If the client requested
-	 * this buddy's info explicitly, then notify them that we have info
-	 * for this buddy.
-	 */
-	if (userinfo2 != NULL)
-	{
-		was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->bn);
-		if (was_explicit == TRUE)
-			if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-				ret = userfunc(od, conn, frame, userinfo2);
-	}
+	/* Show the info to the user */
+	if (userinfo2 != NULL && ((userfunc = aim_callhandler(od, snac->family, snac->subtype))))
+		ret = userfunc(od, conn, frame, userinfo2);
 
 	return ret;
 }
--- a/libpurple/protocols/oscar/oscar.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Aug 19 00:37:01 2009 +0000
@@ -160,7 +160,6 @@
 static int purple_parse_misses     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_clientauto (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_userinfo   (OscarData *, FlapConnection *, FlapFrame *, ...);
-static int purple_got_infoblock    (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_parse_motd       (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_chatnav_info     (OscarData *, FlapConnection *, FlapFrame *, ...);
 static int purple_conv_chat_join        (OscarData *, FlapConnection *, FlapFrame *, ...);
@@ -812,24 +811,24 @@
 
 	od = purple_connection_get_protocol_data(gc);
 
-	if (userinfo == NULL)
-		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
-
-	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
+	if (b == NULL && userinfo == NULL)
 		return;
 
 	if (b == NULL)
 		b = purple_find_buddy(purple_connection_get_account(gc), userinfo->bn);
+	else
+		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
 	if (b) {
 		presence = purple_buddy_get_presence(b);
 		status = purple_presence_get_active_status(presence);
-
-		message = g_strdup(purple_status_get_attr_string(status, "message"));
-		itmsurl = g_strdup(purple_status_get_attr_string(status, "itmsurl"));
-
-	} else {
-		/* This is an OSCAR contact for whom we don't have a PurpleBuddy but do have information. */
+	}
+
+	/* If we have both b and userinfo we favor userinfo, because if we're
+	   viewing someone's profile then we want the HTML away message, and
+	   the "message" attribute of the status contains only the plaintext
+	   message. */
+	if (userinfo) {
 		if ((userinfo->flags & AIM_FLAG_AWAY)) {
 			/* Away message? */
 			if ((userinfo->flags & AIM_FLAG_AWAY) && (userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
@@ -850,6 +849,9 @@
 												 userinfo->itmsurl, userinfo->itmsurl_len);
 #endif
 		}
+	} else {
+		message = g_strdup(purple_status_get_attr_string(status, "message"));
+		itmsurl = g_strdup(purple_status_get_attr_string(status, "itmsurl"));
 	}
 
 	is_away = ((status && !purple_status_is_available(status)) ||
@@ -916,7 +918,6 @@
 			g_free(message);
 			message = g_strdup(_("Offline"));
 		}
-
 	}
 
 	purple_notify_user_info_add_pair(user_info, _("Status"), message);
@@ -1478,7 +1479,6 @@
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_RIGHTSINFO, purple_parse_locaterights, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_USERINFO, purple_parse_userinfo, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_ERROR, purple_parse_locerr, 0);
-	oscar_data_addhandler(od, SNAC_FAMILY_LOCATE, SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK, purple_got_infoblock, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x0001, purple_parse_genericerr, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x000f, purple_selfinfo, 0);
 	oscar_data_addhandler(od, SNAC_FAMILY_OSERVICE, 0x001f, purple_memrequest, 0);
@@ -2139,6 +2139,23 @@
 	g_return_val_if_fail(info != NULL, 1);
 	g_return_val_if_fail(info->bn != NULL, 1);
 
+	/*
+	 * If this is an AIM buddy and their name has formatting, set their
+	 * server alias.
+	 */
+	if (!oscar_util_valid_name_icq(info->bn)) {
+		gboolean bn_has_formatting = FALSE;
+		char *c;
+		for (c = info->bn; *c != '\0'; c++) {
+			if (!islower(*c)) {
+				bn_has_formatting = TRUE;
+				break;
+			}
+		}
+		serv_got_alias(gc, info->bn,
+				bn_has_formatting ? info->bn : NULL);
+	}
+
 	if (info->present & AIM_USERINFO_PRESENT_FLAGS) {
 		if (info->flags & AIM_FLAG_AWAY)
 			buddy_is_away = TRUE;
@@ -3287,7 +3304,7 @@
 	oscar_user_info_append_extra_info(gc, user_info, NULL, userinfo);
 
 	if ((userinfo->present & AIM_USERINFO_PRESENT_ONLINESINCE) && !oscar_util_valid_name_sms(userinfo->bn)) {
-		/* An SMS contact is always online; its Online Since valid is not useful */
+		/* An SMS contact is always online; its Online Since value is not useful */
 		time_t t = userinfo->onlinesince;
 		oscar_user_info_add_pair(user_info, _("Online Since"), purple_date_format_full(localtime(&t)));
 	}
@@ -3330,55 +3347,6 @@
 	return 1;
 }
 
-static int purple_got_infoblock(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
-{
-	PurpleConnection *gc = od->gc;
-	PurpleAccount *account = purple_connection_get_account(gc);
-	PurpleBuddy *b;
-	PurplePresence *presence;
-	PurpleStatus *status;
-	gchar *message = NULL;
-
-	va_list ap;
-	aim_userinfo_t *userinfo;
-
-	va_start(ap, fr);
-	userinfo = va_arg(ap, aim_userinfo_t *);
-	va_end(ap);
-
-	b = purple_find_buddy(account, userinfo->bn);
-	if (b == NULL)
-		return 1;
-
-	if (!oscar_util_valid_name_icq(userinfo->bn))
-	{
-		if (strcmp(purple_buddy_get_name(b), userinfo->bn) != 0)
-			serv_got_alias(gc, purple_buddy_get_name(b), userinfo->bn);
-		else
-			serv_got_alias(gc, purple_buddy_get_name(b), NULL);
-	}
-
-	presence = purple_buddy_get_presence(b);
-	status = purple_presence_get_active_status(presence);
-
-	if (purple_status_is_online(status) && !purple_status_is_available(status) &&
-			userinfo->flags & AIM_FLAG_AWAY && userinfo->away_len > 0 &&
-			userinfo->away != NULL && userinfo->away_encoding != NULL)
-	{
-		gchar *charset = oscar_encoding_extract(userinfo->away_encoding);
-		message = oscar_encoding_to_utf8(account, charset,
-		                                 userinfo->away,
-		                                 userinfo->away_len);
-		g_free(charset);
-		purple_prpl_got_user_status(account, userinfo->bn,
-				purple_status_get_id(status),
-				"message", message, NULL);
-		g_free(message);
-	}
-
-	return 1;
-}
-
 static int purple_parse_motd(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 {
 	char *msg;
--- a/libpurple/protocols/oscar/oscar.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Wed Aug 19 00:37:01 2009 +0000
@@ -533,7 +533,6 @@
 
 	struct {
 		struct aim_userinfo_s *userinfo;
-		struct userinfo_node *requested;
 	} locate;
 
 	/* Server-stored information (ssi) */
@@ -1133,7 +1132,6 @@
 /* 0x000f */ int aim_locate_setinterests(OscarData *od, const char *interest1, const char *interest2, const char *interest3, const char *interest4, const char *interest5, guint16 privacy);
 /* 0x0015 */ int aim_locate_getinfoshort(OscarData *od, const char *bn, guint32 flags);
 
-void aim_locate_autofetch_away_message(OscarData *od, const char *bn);
 guint32 aim_locate_getcaps(OscarData *od, ByteStream *bs, int len);
 guint32 aim_locate_getcaps_short(OscarData *od, ByteStream *bs, int len);
 void aim_info_free(aim_userinfo_t *);
--- a/libpurple/protocols/oscar/snactypes.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/oscar/snactypes.h	Wed Aug 19 00:37:01 2009 +0000
@@ -96,7 +96,6 @@
 #define SNAC_SUBTYPE_LOCATE_USERINFO 0x0006
 #define SNAC_SUBTYPE_LOCATE_WATCHERSUBREQ 0x0007
 #define SNAC_SUBTYPE_LOCATE_WATCHERNOT 0x0008
-#define SNAC_SUBTYPE_LOCATE_GOTINFOBLOCK 0xfffd
 #define SNAC_SUBTYPE_LOCATE_DEFAULT 0xffff
 
 /*
--- a/libpurple/protocols/yahoo/libyahoo.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Wed Aug 19 00:37:01 2009 +0000
@@ -278,7 +278,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoo",                                     /**< id             */
-	"Yahoo!",	                                      /**< name           */
+	"Yahoo",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! Protocol Plugin"),
--- a/libpurple/protocols/yahoo/libyahoojp.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Wed Aug 19 00:37:01 2009 +0000
@@ -174,7 +174,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoojp",                                     /**< id             */
-	"Yahoo! JAPAN",	                                      /**< name           */
+	"Yahoo JAPAN",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! JAPAN Protocol Plugin"),
--- a/libpurple/protocols/yahoo/libymsg.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Wed Aug 19 00:37:01 2009 +0000
@@ -971,7 +971,7 @@
 
 	/* disconnect the peer if connected through p2p and sends wrong value for session id */
 	if( (pkt_type == YAHOO_PKT_TYPE_P2P) && (val_11 != yd->session_id) ) {
-		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im->from);
+		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im ? im->from : "(im was null)");
 		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
 		g_hash_table_remove(yd->peers, im->from);
 		return;
@@ -4274,7 +4274,7 @@
 		}
 	}
 
-	msn = !g_strncasecmp(who, "msn/", 4);
+	msn = !g_ascii_strncasecmp(who, "msn/", 4);
 
 	if( strncmp(who, "+", 1) == 0 ) {
 		/* we have an sms to be sent */
@@ -4398,7 +4398,7 @@
 {
 	YahooData *yd = gc->proto_data;
 	struct yahoo_p2p_data *p2p_data;
-	gboolean msn = !g_strncasecmp(who, "msn/", 4);
+	gboolean msn = !g_ascii_strncasecmp(who, "msn/", 4);
 	struct yahoo_packet *pkt = NULL;
 
 	/* Don't do anything if sms is being typed */
@@ -4671,7 +4671,7 @@
 		return;
 
 	f = yahoo_friend_find(gc, bname);
-	msn = !g_strncasecmp(bname, "msn/", 4);
+	msn = !g_ascii_strncasecmp(bname, "msn/", 4);
 
 	g = purple_buddy_get_group(buddy);
 	if (g)
--- a/libpurple/protocols/yahoo/util.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Wed Aug 19 00:37:01 2009 +0000
@@ -553,12 +553,15 @@
 #endif /* !USE_CSS_FORMATTING */
 
 				} else if ((match = g_hash_table_lookup(esc_codes_ht, code))) {
-					gboolean is_closing_tag;
-					gchar *tag_name;
-
-					tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag);
-					yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
-					g_free(tag_name);
+					/* Some tags are in the hash table only because we
+					 * want to ignore them */
+					if (match[0] != '\0') {
+						gboolean is_closing_tag;
+						gchar *tag_name;
+						tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag);
+						yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
+						g_free(tag_name);
+					}
 
 				} else {
 					purple_debug_error("yahoo",
--- a/libpurple/proxy.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/proxy.c	Wed Aug 19 00:37:01 2009 +0000
@@ -2531,4 +2531,9 @@
 		purple_proxy_connect_data_disconnect(handles->data, NULL);
 		purple_proxy_connect_data_destroy(handles->data);
 	}
+
+	purple_prefs_disconnect_by_handle(purple_proxy_get_handle());
+
+	purple_proxy_info_destroy(global_proxy_info);
+	global_proxy_info = NULL;
 }
--- a/libpurple/purple-send	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/purple-send	Wed Aug 19 00:37:01 2009 +0000
@@ -29,4 +29,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --print-reply --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo 
--- a/libpurple/purple-send-async	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/purple-send-async	Wed Aug 19 00:37:01 2009 +0000
@@ -27,4 +27,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"
 
-echo
--- a/libpurple/purple.h.in	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/purple.h.in	Wed Aug 19 00:37:01 2009 +0000
@@ -65,11 +65,13 @@
 #include <idle.h>
 #include <imgstore.h>
 #include <log.h>
+#include <media.h>
+#include <mediamanager.h>
 #include <mime.h>
 #include <nat-pmp.h>
 #include <network.h>
+#include <notify.h>
 #include <ntlm.h>
-#include <notify.h>
 #include <plugin.h>
 #include <pluginpref.h>
 #include <pounce.h>
@@ -82,16 +84,22 @@
 #include <savedstatuses.h>
 #include <server.h>
 #include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
 #include <status.h>
 #include <stringref.h>
 #include <stun.h>
-#include <sound.h>
-#include <sslconn.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
 #include <upnp.h>
 #include <util.h>
 #include <value.h>
 #include <version.h>
+#include <whiteboard.h>
 #include <xmlnode.h>
-#include <whiteboard.h>
 
 #endif
--- a/libpurple/savedstatuses.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/savedstatuses.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1235,6 +1235,8 @@
 void
 purple_savedstatuses_uninit(void)
 {
+	gpointer handle = purple_savedstatuses_get_handle();
+
 	remove_old_transient_statuses();
 
 	if (save_timer != 0)
@@ -1253,6 +1255,7 @@
 	g_hash_table_destroy(creation_times);
 	creation_times = NULL;
 
-	purple_signals_unregister_by_instance(purple_savedstatuses_get_handle());
+	purple_signals_unregister_by_instance(handle);
+	purple_signals_disconnect_by_handle(handle);
 }
 
--- a/libpurple/server.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/server.c	Wed Aug 19 00:37:01 2009 +0000
@@ -592,13 +592,10 @@
 	 */
 	flags |= PURPLE_MESSAGE_RECV;
 
-	if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->set_permit_deny == NULL) {
-		/* protocol does not support privacy, handle it ourselves */
-		if (!purple_privacy_check(account, who)) {
-			purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
-					account, who, msg, flags, (unsigned int)mtime);
-			return;
-		}
+	if (!purple_privacy_check(account, who)) {
+		purple_signal_emit(purple_conversations_get_handle(), "blocked-im-msg",
+				account, who, msg, flags, (unsigned int)mtime);
+		return;
 	}
 
 	/*
--- a/libpurple/status.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/status.c	Wed Aug 19 00:37:01 2009 +0000
@@ -1660,7 +1660,7 @@
 void
 purple_status_init(void)
 {
-	void *handle = purple_status_get_handle;
+	void *handle = purple_status_get_handle();
 
 	purple_prefs_add_none("/purple/status");
 	purple_prefs_add_none("/purple/status/scores");
@@ -1714,4 +1714,5 @@
 void
 purple_status_uninit(void)
 {
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
 }
--- a/libpurple/status.h	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/status.h	Wed Aug 19 00:37:01 2009 +0000
@@ -50,25 +50,25 @@
  * your accounts are saved so that the next time you start Purple,
  * your accounts will be set to their last known statuses.  There
  * is also a list of saved statuses that are written to the
- * status.xml file.  Also, each PurpleStatus has a "savable" boolean.
- * If "savable" is set to FALSE then the status is NEVER saved.
+ * status.xml file.  Also, each PurpleStatus has a "saveable" boolean.
+ * If "saveable" is set to FALSE then the status is NEVER saved.
  * All PurpleStatuses should be inside a PurplePresence.
  *
  *
- * A PurpleStatus is either "indepedent" or "exclusive."
- * Independent statuses can be active or inactive and it doesn't
+ * A PurpleStatus is either "independent" or "exclusive."
+ * Independent statuses can be active or inactive and they don't
  * affect anything else.  However, you can only have one exclusive
- * status per PurplePresence.  If you activate one exlusive status,
+ * status per PurplePresence.  If you activate one exclusive status,
  * then the previous exclusive status is automatically deactivated.
  *
  * A PurplePresence is like a collection of PurpleStatuses (plus some
  * other random info).  For any buddy, or for any one of your accounts,
- * or for any person you're chatting with, you may know various
+ * or for any person with which you're chatting, you may know various
  * amounts of information.  This information is all contained in
  * one PurplePresence.  If one of your buddies is away and idle,
  * then the presence contains the PurpleStatus for their awayness,
  * and it contains their current idle time.  PurplePresences are
- * never saved to disk.  The information they contain is only relevent
+ * never saved to disk.  The information they contain is only relevant
  * for the current PurpleSession.
  */
 
@@ -80,7 +80,7 @@
 /**
  * A context for a presence.
  *
- * The context indicates what the presence applies to.
+ * The context indicates to what the presence applies.
  */
 typedef enum
 {
@@ -134,7 +134,7 @@
 #endif
 
 /**************************************************************************/
-/** @name PurpleStatusPrimitive API                                         */
+/** @name PurpleStatusPrimitive API                                       */
 /**************************************************************************/
 /*@{*/
 
@@ -172,7 +172,7 @@
 /*@}*/
 
 /**************************************************************************/
-/** @name PurpleStatusType API                                              */
+/** @name PurpleStatusType API                                            */
 /**************************************************************************/
 /*@{*/
 
--- a/libpurple/tests/test_yahoo_util.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Wed Aug 19 00:37:01 2009 +0000
@@ -25,6 +25,10 @@
 			yahoo_codes_to_html("plain <peanut"));
 	assert_string_equal_free("plain&gt; peanut",
 			yahoo_codes_to_html("plain> peanut"));
+	assert_string_equal_free("<font face='inva&gt;lid'>test</font>",
+			yahoo_codes_to_html("<font face='inva>lid'>test"));
+	assert_string_equal_free("&lt;font face=&apos;inva&gt;lid",
+			yahoo_codes_to_html("<font face='inva>lid"));
 
 	/* bold/italic/underline */
 	assert_string_equal_free("<b>bold</b>",
@@ -46,6 +50,10 @@
 	assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i></b><i><u> italicunderline</u></i>",
 			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x1m italicunderline"));
 
+	/* link */
+	assert_string_equal_free("http://pidgin.im/",
+			yahoo_codes_to_html("\x1B[lmhttp://pidgin.im/\x1B[xlm"));
+
 #ifdef USE_CSS_FORMATTING
 	/* font color */
 	assert_string_equal_free("<span style='color: #0000FF'>blue</span>",
@@ -96,15 +104,68 @@
 }
 END_TEST
 
+#if 0
+START_TEST(test_html_to_codes)
+{
+	assert_string_equal_free("plain",
+			yahoo_html_to_codes("plain"));
+	assert_string_equal_free("plain <peanut>",
+			yahoo_html_to_codes("plain &lt;peanut&gt;"));
+	assert_string_equal_free("plain <peanut",
+			yahoo_html_to_codes("plain &lt;peanut"));
+	assert_string_equal_free("plain> peanut",
+			yahoo_html_to_codes("plain&gt; peanut"));
+	assert_string_equal_free("plain >",
+			yahoo_html_to_codes("plain &gt;"));
+	assert_string_equal_free("plain > ",
+			yahoo_html_to_codes("plain &gt; "));
+	assert_string_equal_free("plain <",
+			yahoo_html_to_codes("plain &lt;"));
+	assert_string_equal_free("plain < ",
+			yahoo_html_to_codes("plain &lt; "));
+	assert_string_equal_free("plain &lt",
+			yahoo_html_to_codes("plain &lt"));
+	assert_string_equal_free("plain &",
+			yahoo_html_to_codes("plain &amp;"));
+
+	/* bold/italic/underline */
+	// MARK: This isn't correct.  Should not have the closing bold escape code
+	assert_string_equal_free("\x1B[1mbold\x1B[x1m",
+			yahoo_html_to_codes("<b>bold</b>"));
+	assert_string_equal_free("\x1B[2mitalic\x1B[x2m",
+			yahoo_html_to_codes("<i>italic</i>"));
+	assert_string_equal_free("\x1B[4munderline\x1B[x4m",
+			yahoo_html_to_codes("<u>underline</u>"));
+	assert_string_equal_free("no markup",
+			yahoo_html_to_codes("no</u> markup"));
+	assert_string_equal_free("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline\x1B[x4m",
+			yahoo_html_to_codes("<b>bold</b> <i>italic</i> <u>underline</u>"));
+	assert_string_equal_free("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m italic\x1B[x1m",
+			yahoo_html_to_codes("<b>bold <i>bolditalic</i></b><i> italic</i>"));
+	assert_string_equal_free("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m \x1B[4mitalicunderline",
+			yahoo_html_to_codes("<b>bold <i>bolditalic</i></b><i> <u>italicunderline</u></i>"));
+}
+END_TEST
+#endif
+
 Suite *
 yahoo_util_suite(void)
 {
-	Suite *s = suite_create("Yahoo Utility Functions");
+	Suite *s;
+	TCase *tc;
 
-	TCase *tc = tcase_create("Convert to Numeric");
+	s = suite_create("Yahoo Utility Functions");
+
+	tc = tcase_create("Convert IM from network format to HTML");
 	tcase_add_unchecked_fixture(tc, setup_codes_to_html, teardown_codes_to_html);
 	tcase_add_test(tc, test_codes_to_html);
 	suite_add_tcase(s, tc);
 
+#if 0
+	tc = tcase_create("Convert IM from HTML to network format");
+	tcase_add_test(tc, test_html_to_codes);
+	suite_add_tcase(s, tc);
+#endif
+
 	return s;
 }
--- a/libpurple/util.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/libpurple/util.c	Wed Aug 19 00:37:01 2009 +0000
@@ -405,7 +405,7 @@
 	encoded_word_state_t state = state_start;
 	const char *cur, *mark;
 	const char *charset0 = NULL, *encoding0 = NULL, *encoded_text0 = NULL;
-	char *n, *new;
+	GString *new;
 
 	/* token can be any CHAR (supposedly ISO8859-1/ISO2022), not just ASCII */
 	#define token_char_p(c) \
@@ -415,16 +415,9 @@
 	#define encoded_text_char_p(c) \
 		((c & 0x80) == 0 && c != '?' && c != ' ' && isgraph(c))
 
-	#define RECOVER_MARKED_TEXT strncpy(n, mark, cur - mark + 1); \
-		n += cur - mark + 1
-
 	g_return_val_if_fail(str != NULL, NULL);
 
-	/* NOTE: Assuming that we need just strlen(str)+1 *may* be wrong.
-	 * It would be wrong if one byte (in some unknown encoding) could
-	 * expand to >=4 bytes of UTF-8; I don't know if there are such things.
-	 */
-	n = new = g_malloc(strlen(str) + 1);
+	new = g_string_new(NULL);
 
 	/* Here we will be looking for encoded words and if they seem to be
 	 * valid then decode them.
@@ -437,7 +430,7 @@
 			if (*cur == '?') {
 				state = state_question1;
 			} else {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -446,7 +439,7 @@
 				charset0 = cur;
 				state = state_charset;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -454,7 +447,7 @@
 			if (*cur == '?') {
 				state = state_question2;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -463,7 +456,7 @@
 				encoding0 = cur;
 				state = state_encoding;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -471,7 +464,7 @@
 			if (*cur == '?') {
 				state = state_question3;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -483,7 +476,7 @@
 				encoded_text0 = cur;
 				state = state_question4;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -491,7 +484,7 @@
 			if (*cur == '?') {
 				state = state_question4;
 			} else if (!encoded_text_char_p(*cur)) {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -513,7 +506,7 @@
 					char *converted = g_convert((const gchar *)decoded, dec_len, "utf-8", charset, NULL, &len, NULL);
 
 					if (converted) {
-						n = strncpy(n, converted, len) + len;
+						g_string_append_len(new, converted, len);
 						g_free(converted);
 					}
 					g_free(decoded);
@@ -523,7 +516,7 @@
 				g_free(encoded_text);
 				state = state_equal2; /* Restart the FSM */
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -533,19 +526,16 @@
 				state = state_equal1;
 			} else {
 				/* Some unencoded text. */
-				*n = *cur;
-				n += 1;
+				g_string_append_c(new, *cur);
 			}
 			break;
 		} /* switch */
 	} /* for */
 
-	if (state != state_start) {
-		RECOVER_MARKED_TEXT;
-	}
-	*n = '\0';
-
-	return new;
+	if (state != state_start)
+		g_string_append_len(new, mark, cur - mark + 1);
+
+	return g_string_free(new, FALSE);;
 }
 
 
@@ -3519,6 +3509,7 @@
 void purple_got_protocol_handler_uri(const char *uri)
 {
 	char proto[11];
+	char delimiter;
 	const char *tmp, *param_string;
 	char *cmd;
 	GHashTable *params = NULL;
@@ -3534,7 +3525,13 @@
 	proto[len] = '\0';
 
 	tmp++;
-	purple_debug_info("util", "Processing message '%s' for protocol '%s'.\n", tmp, proto);
+
+	if (g_str_equal(proto, "xmpp"))
+		delimiter = ';';
+	else
+		delimiter = '&';
+
+	purple_debug_info("util", "Processing message '%s' for protocol '%s' using delimiter '%c'.\n", tmp, proto, delimiter);
 
 	if ((param_string = strchr(tmp, '?'))) {
 		const char *keyend = NULL, *pairstart;
@@ -3547,7 +3544,7 @@
 		pairstart = tmp = param_string;
 
 		while (*tmp || *pairstart) {
-			if (*tmp == '&' || !(*tmp)) {
+			if (*tmp == delimiter || !(*tmp)) {
 				/* If there is no explicit value */
 				if (keyend == NULL)
 					keyend = tmp;
@@ -3823,7 +3820,7 @@
 	/* Note: data is _not_ nul-terminated.  */
 	if (data_len > header_len) {
 		if (header[0] == '\n')
-			p = (g_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL;
+			p = (g_ascii_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL;
 		if (!p)
 			p = purple_strcasestr(data, header);
 		if (p)
@@ -3860,7 +3857,7 @@
 content_is_chunked(const char *data, size_t data_len)
 {
 	const char *p = find_header_content(data, data_len, "\nTransfer-Encoding: ", sizeof("\nTransfer-Encoding: ") - 1);
-	if (p && g_strncasecmp(p, "chunked", 7) == 0)
+	if (p && g_ascii_strncasecmp(p, "chunked", 7) == 0)
 		return TRUE;
 
 	return FALSE;
--- a/pidgin.spec.in	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin.spec.in	Wed Aug 19 00:37:01 2009 +0000
@@ -251,6 +251,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
--- a/pidgin/gtkblist.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkblist.c	Wed Aug 19 00:37:01 2009 +0000
@@ -622,7 +622,14 @@
 				struct _pidgin_blist_node *gtknode =
 					(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
 
-				if (purple_contact_get_alias(contact) || gtknode->contact_expanded) {
+				/*
+				 * XXX Using purple_contact_get_alias here breaks because we
+				 * specifically want to check the contact alias only (i.e. not
+				 * the priority buddy, which purple_contact_get_alias does).
+				 * Adding yet another get_alias is evil, so figure this out
+				 * later :-P
+				 */
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
 					gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
 				} else {
@@ -4090,7 +4097,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/gtkcertmgr.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Wed Aug 19 00:37:01 2009 +0000
@@ -144,12 +144,12 @@
 tls_peers_mgmt_import_ok2_cb(gpointer data, const char *result)
 {
 	PurpleCertificate *crt = (PurpleCertificate *) data;
-	const char *id = result;
 
 	/* TODO: Perhaps prompt if you're overwriting a cert? */
 
 	/* Drop the certificate into the pool */
-	purple_certificate_pool_store(tpm_dat->tls_peers, id, crt);
+	if (result && *result)
+		purple_certificate_pool_store(tpm_dat->tls_peers, result, crt);
 
 	/* And this certificate is not needed any more */
 	purple_certificate_destroy(crt);
--- a/pidgin/gtkconv.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 19 00:37:01 2009 +0000
@@ -3334,6 +3334,62 @@
 }
 
 static void
+regenerate_media_items(PidginWindow *win)
+{
+#ifdef USE_VV
+	PurpleAccount *account;
+	PurpleConversation *conv;
+
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	if (conv == NULL) {
+		purple_debug_error("gtkconv", "couldn't get active conversation"
+				" when regenerating media items\n");
+		return;
+	}
+
+	account = purple_conversation_get_account(conv);
+
+	if (account == NULL) {
+		purple_debug_error("gtkconv", "couldn't get account when"
+				" regenerating media items\n");
+		return;
+	}
+
+	/*
+	 * Check if account support voice and/or calls, and
+	 * if the current buddy	supports it.
+	 */
+	if (account != NULL && purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_IM) {
+		PurpleMediaCaps caps =
+				purple_prpl_get_media_caps(account,
+				purple_conversation_get_name(conv));
+
+		gtk_widget_set_sensitive(win->audio_call,
+				caps & PURPLE_MEDIA_CAPS_AUDIO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->video_call,
+				caps & PURPLE_MEDIA_CAPS_VIDEO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, 
+				caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
+				? TRUE : FALSE);
+	} else if (purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_CHAT) {
+		/* for now, don't care about chats... */
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	} else {
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	}							
+#endif
+}
+
+static void
 regenerate_options_items(PidginWindow *win)
 {
 	GtkWidget *menu;
@@ -3418,6 +3474,7 @@
 static void menubar_activated(GtkWidget *item, gpointer data)
 {
 	PidginWindow *win = data;
+	regenerate_media_items(win);
 	regenerate_options_items(win);
 	regenerate_plugins_items(win);
 
@@ -4316,7 +4373,11 @@
 		return;
 	}
 
-	gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	if (current_topic)
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	else
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), "");
+
 	prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 			new_topic);
 
@@ -5384,6 +5445,7 @@
 {
 	PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
 	gboolean hide = FALSE;
+	guint timer;
 
 	/* create hidden conv if hide_new pref is always */
 	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
@@ -5407,6 +5469,13 @@
 		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
 		ui_ops->create_conversation = pidgin_conv_new;
 	}
+
+	/* Somebody wants to keep this conversation around, so don't time it out */
+	timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+	if (timer) {
+		purple_timeout_remove(timer);
+		purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0));
+	}
 }
 
 static void
@@ -6492,36 +6561,6 @@
 			buttons |= GTK_IMHTML_CUSTOM_SMILEY;
 		else
 			buttons &= ~GTK_IMHTML_CUSTOM_SMILEY;
-
-#ifdef USE_VV
-		/* check if account support voice calls, and if the current buddy
-			supports it */
-		if (account != NULL && purple_conversation_get_type(conv)
-					== PURPLE_CONV_TYPE_IM) {
-			PurpleMediaCaps caps =
-					purple_prpl_get_media_caps(account,
-					purple_conversation_get_name(conv));
-
-			gtk_widget_set_sensitive(win->audio_call,
-					caps & PURPLE_MEDIA_CAPS_AUDIO
-					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->video_call,
-					caps & PURPLE_MEDIA_CAPS_VIDEO
-					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, 
-					caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
-					? TRUE : FALSE);
-		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
-			/* for now, don't care about chats... */
-			gtk_widget_set_sensitive(win->audio_call, FALSE);
-			gtk_widget_set_sensitive(win->video_call, FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
-		} else {
-			gtk_widget_set_sensitive(win->audio_call, FALSE);
-			gtk_widget_set_sensitive(win->video_call, FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
-		}							
-#endif
 		
 		gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons);
 		if (account != NULL)
--- a/pidgin/gtkdialogs.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkdialogs.c	Wed Aug 19 00:37:01 2009 +0000
@@ -212,6 +212,7 @@
 	{N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
 	{N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
+	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
 	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
--- a/pidgin/gtkimhtml.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkimhtml.c	Wed Aug 19 00:37:01 2009 +0000
@@ -2953,7 +2953,7 @@
 							font->size = oldfont->size;
 						else
 							font->size = 3;
-						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)))
+						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)) && (font->size != 3 || (oldfont && oldfont->size == 3)))
 							gtk_imhtml_font_set_size(imhtml, font->size);
 						g_free(size);
 						fonts = g_slist_prepend (fonts, font);
--- a/pidgin/gtkmedia.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkmedia.c	Wed Aug 19 00:37:01 2009 +0000
@@ -82,14 +82,14 @@
 {
 	PurpleMedia *media;
 	gchar *screenname;
-	GstElement *send_level;
-	GstElement *recv_level;
+	gulong level_handler_id;
 
 	GtkItemFactory *item_factory;
 	GtkWidget *menubar;
 	GtkWidget *statusbar;
 
 	GtkWidget *mute;
+	GtkWidget *pause;
 
 	GtkWidget *send_progress;
 	GtkWidget *recv_progress;
@@ -99,6 +99,7 @@
 	GtkWidget *display;
 	GtkWidget *send_widget;
 	GtkWidget *recv_widget;
+	GtkWidget *button_widget;
 	GtkWidget *local_video;
 	GtkWidget *remote_video;
 
@@ -129,9 +130,7 @@
 enum {
 	PROP_0,
 	PROP_MEDIA,
-	PROP_SCREENNAME,
-	PROP_SEND_LEVEL,
-	PROP_RECV_LEVEL
+	PROP_SCREENNAME
 };
 
 static GType
@@ -182,18 +181,6 @@
 			"The screenname of the user this session is with.",
 			NULL,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_SEND_LEVEL,
-			g_param_spec_object("send-level",
-			"Send level",
-			"The GstElement of this media's send 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_RECV_LEVEL,
-			g_param_spec_object("recv-level",
-			"Receive level",
-			"The GstElement of this media's recv 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
 
 	g_type_class_add_private(klass, sizeof(PidginMediaPrivate));
 }
@@ -207,6 +194,15 @@
 			NULL, NULL, TRUE);
 }
 
+static void
+pidgin_media_pause_toggled(GtkToggleButton *toggle, PidginMedia *media)
+{
+	purple_media_stream_info(media->priv->media,
+			gtk_toggle_button_get_active(toggle) ?
+			PURPLE_MEDIA_INFO_PAUSE : PURPLE_MEDIA_INFO_UNPAUSE,
+			NULL, NULL, TRUE);
+}
+
 static gboolean
 pidgin_media_delete_event_cb(GtkWidget *widget,
 		GdkEvent *event, PidginMedia *media)
@@ -338,45 +334,16 @@
 			G_CALLBACK(pidgin_media_delete_event_cb), media);
 }
 
-static gboolean
-level_message_cb(GstBus *bus, GstMessage *message, PidginMedia *gtkmedia)
+static void
+level_message_cb(PurpleMedia *media, gchar *session_id, gchar *participant,
+		double level, PidginMedia *gtkmedia)
 {
-	gdouble rms_db;
-	gdouble percent;
-	const GValue *list;
-	const GValue *value;
-
-	GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(message));
 	GtkWidget *progress;
-
-	if (message->type != GST_MESSAGE_ELEMENT)
-		return TRUE;
-
-	if (!gst_structure_has_name(
-			gst_message_get_structure(message), "level"))
-		return TRUE;
-
-	if (src == gtkmedia->priv->send_level)
+	if (participant == NULL)
 		progress = gtkmedia->priv->send_progress;
-	else if (src == gtkmedia->priv->recv_level)
+	else
 		progress = gtkmedia->priv->recv_progress;
-	else
-		return TRUE;
-
-	list = gst_structure_get_value(
-			gst_message_get_structure(message), "rms");
-
-	/* Only bother with the first channel. */
-	value = gst_value_list_get_value(list, 0);
-	rms_db = g_value_get_double(value);
-
-	percent = pow(10, rms_db / 20) * 5;
-
-	if(percent > 1.0)
-		percent = 1.0;
-
-	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), percent);
-	return TRUE;
+	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), level);
 }
 
 
@@ -412,16 +379,6 @@
 		gtkmedia->priv->item_factory = NULL;
 	}
 
-	if (gtkmedia->priv->send_level) {
-		gst_object_unref(gtkmedia->priv->send_level);
-		gtkmedia->priv->send_level = NULL;
-	}
-
-	if (gtkmedia->priv->recv_level) {
-		gst_object_unref(gtkmedia->priv->recv_level);
-		gtkmedia->priv->recv_level = NULL;
-	}
-
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }
 
@@ -501,17 +458,6 @@
 }
 
 static void
-pidgin_media_accepted_cb(PurpleMedia *media, const gchar *session_id,
-		const gchar *participant, PidginMedia *gtkmedia)
-{
-	pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
-	pidgin_media_emit_message(gtkmedia, _("Call in progress."));
-	gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
-			0, _("Call in progress."));
-	gtk_widget_show(GTK_WIDGET(gtkmedia));
-}
-
-static void
 pidgin_media_accept_cb(PurpleMedia *media, int index)
 {
 	purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
@@ -554,7 +500,7 @@
 
 	gtkmedia->priv->request_type = PURPLE_MEDIA_NONE;
 
-	purple_request_accept_cancel(gtkmedia, _("Media invitation"),
+	purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
 			message, NULL, PURPLE_DEFAULT_ACTION_NONE,
 			(void*)account, gtkmedia->priv->screenname, NULL,
 			gtkmedia->priv->media,
@@ -576,8 +522,7 @@
 {
 	double val = (double)gtk_range_get_value(GTK_RANGE(range));
 #endif
-	purple_prefs_set_int("/pidgin/media/audio/volume/input", val);
-	purple_media_set_input_volume(media, NULL, val / 10.0);
+	purple_media_set_input_volume(media, NULL, val);
 }
 
 static void
@@ -591,8 +536,7 @@
 {
 	double val = (double)gtk_range_get_value(GTK_RANGE(range));
 #endif
-	purple_prefs_set_int("/pidgin/media/audio/volume/output", val);
-	purple_media_set_output_volume(media, NULL, NULL, val / 10.0);
+	purple_media_set_output_volume(media, NULL, NULL, val);
 }
 
 static GtkWidget *
@@ -604,10 +548,10 @@
 
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
 		value = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/input");
+			"/purple/media/audio/volume/input");
 	} else if (type & PURPLE_MEDIA_RECV_AUDIO) {
 		value = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/output");
+			"/purple/media/audio/volume/output");
 	} else
 		g_return_val_if_reached(NULL);
 
@@ -662,9 +606,7 @@
 static void
 pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *sid)
 {
-	PurpleMediaManager *manager = purple_media_get_manager(media);
-	GstElement *pipeline = purple_media_manager_get_pipeline(manager);
-	GtkWidget *send_widget = NULL, *recv_widget = NULL;
+	GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
 	PurpleMediaSessionType type =
 			purple_media_get_session_type(media, sid);
 
@@ -683,9 +625,15 @@
 		send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
 				send_widget, TRUE, TRUE, 0);
+		button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+		gtk_box_pack_end(GTK_BOX(send_widget), button_widget,
+				FALSE, FALSE, 0);
+		gtk_widget_show(GTK_WIDGET(button_widget));
 		gtk_widget_show(send_widget);
-	} else
+	} else {
 		send_widget = gtkmedia->priv->send_widget;
+		button_widget = gtkmedia->priv->button_widget;
+	}
 
 	if (type & PURPLE_MEDIA_RECV_VIDEO) {
 		PidginMediaRealizeData *data;
@@ -738,6 +686,15 @@
 		gtk_widget_show(local_video);
 		gtk_widget_show(aspect);
 
+		gtkmedia->priv->pause =
+				gtk_toggle_button_new_with_mnemonic(_("_Pause"));
+		g_signal_connect(gtkmedia->priv->pause, "toggled",
+				G_CALLBACK(pidgin_media_pause_toggled),
+				gtkmedia);
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->pause);
+
 		gtkmedia->priv->local_video = local_video;
 	}
 
@@ -747,44 +704,34 @@
 				PURPLE_MEDIA_RECV_AUDIO), FALSE, FALSE, 0);
 	}
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
-		GstElement *media_src;
-		GtkWidget *hbox;
-
-		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-		gtk_box_pack_end(GTK_BOX(send_widget), hbox, FALSE, FALSE, 0);
 		gtkmedia->priv->mute =
 				gtk_toggle_button_new_with_mnemonic("_Mute");
 		g_signal_connect(gtkmedia->priv->mute, "toggled",
 				G_CALLBACK(pidgin_media_mute_toggled),
 				gtkmedia);
-		gtk_box_pack_end(GTK_BOX(hbox), gtkmedia->priv->mute,
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
 				FALSE, FALSE, 0);
 		gtk_widget_show(gtkmedia->priv->mute);
-		gtk_widget_show(GTK_WIDGET(hbox));
-
-		media_src = purple_media_get_src(media, sid);
-		gtkmedia->priv->send_level = gst_bin_get_by_name(
-				GST_BIN(media_src), "sendlevel");
 
 		gtk_box_pack_end(GTK_BOX(send_widget),
 				pidgin_media_add_audio_widget(gtkmedia,
 				PURPLE_MEDIA_SEND_AUDIO), FALSE, FALSE, 0);
-
-		gtk_widget_show(gtkmedia->priv->mute);
 	}
 
 
-	if (type & PURPLE_MEDIA_AUDIO) {
-		GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
-		g_signal_connect(G_OBJECT(bus), "message::element",
-				G_CALLBACK(level_message_cb), gtkmedia);
-		gst_object_unref(bus);
+	if (type & PURPLE_MEDIA_AUDIO &&
+			gtkmedia->priv->level_handler_id == 0) {
+		gtkmedia->priv->level_handler_id = g_signal_connect(
+				media, "level", G_CALLBACK(level_message_cb),
+				gtkmedia);
 	}
 
 	if (send_widget != NULL)
 		gtkmedia->priv->send_widget = send_widget;
 	if (recv_widget != NULL)
 		gtkmedia->priv->recv_widget = recv_widget;
+	if (button_widget != NULL)
+		gtkmedia->priv->button_widget = button_widget;
 
 	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
 		if (gtkmedia->priv->timeout_id != 0)
@@ -813,25 +760,6 @@
 	} else if (state == PURPLE_MEDIA_STATE_NEW &&
 			sid != NULL && name != NULL) {
 		pidgin_media_ready_cb(media, gtkmedia, sid);
-	} else if (state == PURPLE_MEDIA_STATE_CONNECTED &&
-			purple_media_get_session_type(media, sid) &
-			PURPLE_MEDIA_RECV_AUDIO) {
-		GstElement *tee = purple_media_get_tee(media, sid, name);
-		GstIterator *iter = gst_element_iterate_src_pads(tee);
-		GstPad *sinkpad;
-		if (gst_iterator_next(iter, (gpointer)&sinkpad)
-				 == GST_ITERATOR_OK) {
-			GstPad *peer = gst_pad_get_peer(sinkpad);
-			if (peer != NULL) {
-				gtkmedia->priv->recv_level =
-						gst_bin_get_by_name(
-						GST_BIN(GST_OBJECT_PARENT(
-						peer)), "recvlevel");
-				gst_object_unref(peer);
-			}
-			gst_object_unref(sinkpad);
-		}
-		gst_iterator_free(iter);
 	}
 }
 
@@ -843,6 +771,12 @@
 	if (type == PURPLE_MEDIA_INFO_REJECT) {
 		pidgin_media_emit_message(gtkmedia,
 				_("You have rejected the call."));
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT) {
+		pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
+		pidgin_media_emit_message(gtkmedia, _("Call in progress."));
+		gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+				0, _("Call in progress."));
+		gtk_widget_show(GTK_WIDGET(gtkmedia));
 	}
 }
 
@@ -869,8 +803,6 @@
 
 			g_signal_connect(G_OBJECT(media->priv->media), "error",
 				G_CALLBACK(pidgin_media_error_cb), media);
-			g_signal_connect(G_OBJECT(media->priv->media), "accepted",
-				G_CALLBACK(pidgin_media_accepted_cb), media);
 			g_signal_connect(G_OBJECT(media->priv->media), "state-changed",
 				G_CALLBACK(pidgin_media_state_changed_cb), media);
 			g_signal_connect(G_OBJECT(media->priv->media), "stream-info",
@@ -882,18 +814,6 @@
 				g_free(media->priv->screenname);
 			media->priv->screenname = g_value_dup_string(value);
 			break;
-		case PROP_SEND_LEVEL:
-			if (media->priv->send_level)
-				gst_object_unref(media->priv->send_level);
-			media->priv->send_level = g_value_get_object(value);
-			g_object_ref(media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			if (media->priv->recv_level)
-				gst_object_unref(media->priv->recv_level);
-			media->priv->recv_level = g_value_get_object(value);
-			g_object_ref(media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -915,12 +835,6 @@
 		case PROP_SCREENNAME:
 			g_value_set_string(value, media->priv->screenname);
 			break;
-		case PROP_SEND_LEVEL:
-			g_value_set_object(value, media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			g_value_set_object(value, media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -968,6 +882,14 @@
 	GstPad *ghost;
 	GstCaps *caps;
 
+#ifdef _WIN32
+	/* autovideosrc doesn't pick ksvideosrc for some reason */
+	src = gst_element_factory_make("ksvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autovideosrc", NULL);
+#else
 	src = gst_element_factory_make("gconfvideosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autovideosrc", NULL);
@@ -975,10 +897,7 @@
 		src = gst_element_factory_make("v4l2src", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("v4lsrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("ksvideosrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("dshowvideosrc", NULL);
+#endif
 	if (src == NULL) {
 		purple_debug_error("gtkmedia", "Unable to find a suitable "
 				"element for the default video source.\n");
@@ -1023,11 +942,7 @@
 create_default_audio_src(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *src, *volume, *level;
-	GstPad *pad, *ghost;
-	double input_volume = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/input")/10.0;
-
+	GstElement *src;
 	src = gst_element_factory_make("gconfaudiosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autoaudiosrc", NULL);
@@ -1042,31 +957,15 @@
 				"element for the default audio source.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("pidgindefaultaudiosrc");
-	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
-	g_object_set(volume, "volume", input_volume, NULL);
-	level = gst_element_factory_make("level", "sendlevel");
-	gst_bin_add_many(GST_BIN(bin), src, volume, level, NULL);
-	gst_element_link(src, volume);
-	gst_element_link(volume, level);
-	pad = gst_element_get_pad(level, "src");
-	ghost = gst_ghost_pad_new("ghostsrc", pad);
-	gst_element_add_pad(bin, ghost);
-	g_object_set(G_OBJECT(level), "message", TRUE, NULL);
-
-	return bin;
+	gst_element_set_name(src, "pidgindefaultaudiosrc");
+	return src;
 }
 
 static GstElement *
 create_default_audio_sink(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *sink, *volume, *level, *queue;
-	GstPad *pad, *ghost;
-	double output_volume = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/output")/10.0;
-
+	GstElement *sink;
 	sink = gst_element_factory_make("gconfaudiosink", NULL);
 	if (sink == NULL)
 		sink = gst_element_factory_make("autoaudiosink",NULL);
@@ -1075,22 +974,7 @@
 				"element for the default audio sink.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("pidginrecvaudiobin");
-	volume = gst_element_factory_make("volume", "purpleaudiooutputvolume");
-	g_object_set(volume, "volume", output_volume, NULL);
-	level = gst_element_factory_make("level", "recvlevel");
-	queue = gst_element_factory_make("queue", NULL);
-	gst_bin_add_many(GST_BIN(bin), sink, volume, level, queue, NULL);
-	gst_element_link(level, sink);
-	gst_element_link(volume, level);
-	gst_element_link(queue, volume);
-	pad = gst_element_get_pad(queue, "sink");
-	ghost = gst_ghost_pad_new("ghostsink", pad);
-	gst_element_add_pad(bin, ghost);
-	g_object_set(G_OBJECT(level), "message", TRUE, NULL);
-
-	return bin;
+	return sink;
 }
 #endif  /* USE_VV */
 
@@ -1149,12 +1033,6 @@
 	purple_media_manager_set_active_element(manager, default_video_sink);
 	purple_media_manager_set_active_element(manager, default_audio_src);
 	purple_media_manager_set_active_element(manager, default_audio_sink);
-
-	purple_prefs_add_none("/pidgin/media");
-	purple_prefs_add_none("/pidgin/media/audio");
-	purple_prefs_add_none("/pidgin/media/audio/volume");
-	purple_prefs_add_int("/pidgin/media/audio/volume/input", 10);
-	purple_prefs_add_int("/pidgin/media/audio/volume/output", 10);
 #endif
 }
 
--- a/pidgin/gtkutils.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkutils.c	Wed Aug 19 00:37:01 2009 +0000
@@ -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/gtkwhiteboard.c	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/gtkwhiteboard.c	Wed Aug 19 00:37:01 2009 +0000
@@ -273,6 +273,7 @@
 static void pidgin_whiteboard_destroy(PurpleWhiteboard *wb)
 {
 	PidginWhiteboard *gtkwb;
+	GtkWidget *colour_dialog;
 
 	g_return_if_fail(wb != NULL);
 	gtkwb = wb->ui_data;
@@ -287,6 +288,12 @@
 		gtkwb->pixmap = NULL;
 	}
 
+	colour_dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	if (colour_dialog) {
+		gtk_widget_destroy(colour_dialog);
+		g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
+	}
+
 	if(gtkwb->window)
 	{
 		gtk_widget_destroy(gtkwb->window);
@@ -804,7 +811,7 @@
 	{
 		gtk_widget_destroy(dialog);
 
-		purple_debug_info("gtkwhiteboard", "File not Saved... Canceled\n");
+		purple_debug_info("gtkwhiteboard", "File not Saved... Cancelled\n");
 	}
 }
 
@@ -848,9 +855,11 @@
 	purple_whiteboard_send_brush(wb, old_size, new_color);
 }
 
-static void color_selection_dialog_destroy(GtkWidget *w, GtkWidget *destroy)
+static void color_selection_dialog_destroy(GtkWidget *w, PidginWhiteboard *gtkwb)
 {
-	gtk_widget_destroy(destroy);
+	GtkWidget *dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	gtk_widget_destroy(dialog);
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
 }
 
 static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
@@ -859,6 +868,7 @@
 	GtkColorSelectionDialog *dialog;
 
 	dialog = (GtkColorSelectionDialog *)gtk_color_selection_dialog_new(_("Select color"));
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", dialog);
 
 	g_signal_connect(G_OBJECT(dialog->colorsel), "color-changed",
 					G_CALLBACK(change_color_cb), gtkwb);
@@ -867,7 +877,7 @@
 	gtk_widget_destroy(dialog->help_button);
 
 	g_signal_connect(G_OBJECT(dialog->ok_button), "clicked",
-					G_CALLBACK(color_selection_dialog_destroy), dialog);
+					G_CALLBACK(color_selection_dialog_destroy), gtkwb);
 
 	gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(dialog->colorsel), TRUE);
 
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Wed Aug 19 00:37:01 2009 +0000
@@ -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	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in	Wed Aug 19 00:37:01 2009 +0000
@@ -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	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/plugins/disco/Makefile.am	Wed Aug 19 00:37:01 2009 +0000
@@ -2,6 +2,9 @@
 
 xmppdisco_la_LDFLAGS = -module -avoid-version
 
+EXTRA_DIST = \
+        Makefile.mingw
+
 if PLUGINS
 
 plugin_LTLIBRARIES = xmppdisco.la
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 19 00:37:01 2009 +0000
@@ -567,6 +567,7 @@
   !insertmacro URI_SECTION "msnim"
   !insertmacro URI_SECTION "myim"
   !insertmacro URI_SECTION "ymsgr"
+  !insertmacro URI_SECTION "xmpp"
 SectionGroupEnd
 
 ;--------------------------------
@@ -708,6 +709,8 @@
     Call un.UnregisterURIHandler
     Push "ymsgr"
     Call un.UnregisterURIHandler
+    Push "xmpp"
+    Call un.UnregisterURIHandler
 
     Delete "$INSTDIR\ca-certs\America_Online_Root_Certification_Authority_1.pem"
     Delete "$INSTDIR\ca-certs\AOL_Member_CA.pem"
--- a/pidgin/win32/nsis/translations/italian.nsh	Mon Aug 17 15:56:16 2009 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Wed Aug 19 00:37:01 2009 +0000
@@ -4,33 +4,79 @@
 ;;  Italian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003.
-;;  Version 2
+;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003-2009.
+;;  Version 3
 ;;
 
-; Startup GTK+ check
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Il programma di installazione  gi in esecuzione"
+!define PIDGIN_IS_RUNNING			" attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova."
 !define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non  presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"Avanti >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name)  distribuito sotto licenza GPL. La licenza  mostrata qui solamente a scopo informativo. $_CLICK" 
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name)  distribuito sotto la GNU General Public License (GPL). La licenza  mostrata qui solamente a scopo informativo. $_CLICK"
 
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - Client per Messaggi Immediati (richiesto)"
-!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
+!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto se non presente)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Collegamenti"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Avvio"
 !define PIDGIN_SECTION_DESCRIPTION		"File principali di Pidgin e dll"
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Collegamenti per avviare Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Crea un collegamento a Pidgin sul desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Crea una voce per Pidgin nel Menu Avvio"
+
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			" stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
+!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me non  incompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sar installato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo gi installato sul tuo computer, questa installazione sar interrotta."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossibile rimuovere la versione di Pidgin attualmente presente sul tuo computer. La nuova versione sar installata senza rimuovere la versione precedente."
 
 ; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
+!define GTK_INSTALL_ERROR			"Error nell'installazione del runtime GTK+."
 !define GTK_BAD_INSTALL_PATH			"Il percorso scelto non pu essere raggiunto o creato."
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"Gestori degli URI"
+
 ; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Il programma di rimozione non  in grado di trovare le voci di registro per Pidgin.$\rProbabilmente un altro utente ha installato questa applicazione."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Il programma di rimozione non  in grado di trovare le voci di registro per Pidgin.$\rProbabilmente questa applicazione  stata installata da un altro utente."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Non hai il permesso per rimuovere questa applicazione."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Supporto per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_ERROR		"Errore nell'installazione del correttore ortografico"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Errore nell'installazione del dizionario per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Supporto per il correttore ortografico.  ( richiesta una connessione a internet per l'installazione)"
+!define ASPELL_INSTALL_FAILED			"Installazione fallita"
+!define PIDGIN_SPELLCHECK_BRETON		"Bretone"
+!define PIDGIN_SPELLCHECK_CATALAN		"Catalano"
+!define PIDGIN_SPELLCHECK_CZECH		"Ceco"
+!define PIDGIN_SPELLCHECK_WELSH		"Gallese"
+!define PIDGIN_SPELLCHECK_DANISH		"Danese"
+!define PIDGIN_SPELLCHECK_GERMAN		"Tedesco"
+!define PIDGIN_SPELLCHECK_GREEK		"Greco"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Inglese"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH		"Spagnolo"
+!define PIDGIN_SPELLCHECK_FAROESE		"Faroese"
+!define PIDGIN_SPELLCHECK_FRENCH		"Francese"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italiano"
+!define PIDGIN_SPELLCHECK_DUTCH		"Olandese"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norvegese"
+!define PIDGIN_SPELLCHECK_POLISH		"Polacco"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portoghese"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumeno"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Russo"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Slovacco"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Svedese"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucraino"
+
--- a/po/ChangeLog	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/ChangeLog	Wed Aug 19 00:37:01 2009 +0000
@@ -7,23 +7,29 @@
 	  Aldabaldetreku)
 	* Bengali translation updated (Samia Niamatullah)
 	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
 	* Chinese (Simplified) translation updated under new
 	  translator (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Daniël Heres)
 	* English (British) translation updated (Luke Ross)
+	* Esperanto translation updated (Stéphane Fillod)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Frco. Javier Rial Rodríguez)
 	* German translation updated (Jochen Kemnade and Björn Voigt)
 	* Greek translation updated (Bouklis Panos)
 	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
 	* Khmer translation added (Khoem Sokhem)
 	* Lao translation updated (Anousak Souphavah)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
 	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Romanian translation updated (Mişu Moldovan and new translator Andrei
+	  Popescu)
 	* Russian translation updated (Антон Самохвалов)
 	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
@@ -31,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/de.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/de.po	Wed Aug 19 00:37:01 2009 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 09:47+0200\n"
-"PO-Revision-Date: 2009-07-29 09:51+0200\n"
+"POT-Creation-Date: 2009-08-14 16:32+0200\n"
+"PO-Revision-Date: 2009-08-14 16:31+0200\n"
 "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1690,6 +1690,45 @@
 msgid "_View Certificate..."
 msgstr "Ze_rtifikat ansehen..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
+"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
+"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL-Zertifikatfehler"
+
+msgid "Invalid certificate chain"
+msgstr "Ungültige Zertifikationskette"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
+"überprüft werden."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1705,26 +1744,6 @@
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#. TODO: Probably wrong.
-msgid "SSL Certificate Error"
-msgstr "SSL-Zertifikatfehler"
-
-msgid "Invalid certificate chain"
-msgstr "Ungültige Zertifikationskette"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
-"überprüft werden."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1742,19 +1761,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Unbekannte Zertifizierungsstellensignatur"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
-"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
-"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -3836,6 +3842,11 @@
 msgid "Street Address"
 msgstr "Straße"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
@@ -3924,14 +3935,12 @@
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4538,7 +4547,10 @@
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
-msgstr "affiliate &lt;owner|admin|member|outcast|none&gt; [Benutzer1] [Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen oder setzen."
+msgstr ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [Benutzer1] "
+"[Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen "
+"oder setzen."
 
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
@@ -4690,9 +4702,6 @@
 msgid "Transfer was closed."
 msgstr "Übertragung wurde geschlossen."
 
-msgid "Failed to open the file"
-msgstr "Öffnen der Datei fehlgeschlagen"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Öffnen des In-Band-Bytestroms fehlgeschlagen"
 
@@ -12239,6 +12248,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s möchte eine Video-Sitzung mit Ihnen starten."
 
+msgid "Incoming Call"
+msgstr "Eingehender Anruf"
+
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13168,9 +13183,6 @@
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"
 
-msgid "_Pause"
-msgstr "_Pause"
-
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -14028,9 +14040,12 @@
 msgid "Founder"
 msgstr "Gründer"
 
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Operator"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Half-Operator"
 
@@ -14303,3 +14318,6 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Öffnen der Datei fehlgeschlagen"
--- a/po/eo.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/eo.po	Wed Aug 19 00:37:01 2009 +0000
@@ -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"
 
--- a/po/he.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/he.po	Wed Aug 19 00:37:01 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 19:57-0700\n"
-"PO-Revision-Date: 2009-07-27 16:21+0200\n"
+"POT-Creation-Date: 2009-08-15 09:57-0400\n"
+"PO-Revision-Date: 2009-08-16 08:51+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,13 +47,8 @@
 "  -v, --version       הצג את הגירסא של התוכנה וצא\n"
 
 #, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את "
-"ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
 
 msgid "Error"
 msgstr "שגיאה"
@@ -349,11 +344,8 @@
 msgid "Unblock"
 msgstr "הסר חסימה"
 
-msgid ""
-"Please enter the username or alias of the person you would like to Block/"
-"Unblock."
-msgstr ""
-"יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."
+msgid "Please enter the username or alias of the person you would like to Block/Unblock."
+msgstr "יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."
 
 #. Not multiline
 #. Not masked?
@@ -379,11 +371,8 @@
 msgid "Join"
 msgstr "הצטרף"
 
-msgid ""
-"Please enter the username or alias of the person whose log you would like to "
-"view."
-msgstr ""
-"יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."
+msgid "Please enter the username or alias of the person whose log you would like to view."
+msgstr "יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -529,8 +518,7 @@
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
@@ -539,12 +527,8 @@
 msgid "Re-enable Account"
 msgstr "הפעל מחדש חשבון"
 
-msgid ""
-"The account has disconnected and you are no longer in this chat. You will be "
-"automatically rejoined in the chat when the account reconnects."
-msgstr ""
-"החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון "
-"יתחבר מחדש."
+msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
+msgstr "החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון יתחבר מחדש."
 
 msgid "No such command."
 msgstr "אין פקודה כזו."
@@ -589,8 +573,7 @@
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
 
 msgid "Send To"
@@ -640,28 +623,20 @@
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
 #, c-format
-msgid ""
-"%s is not a valid message class. See '/help msgcolor' for valid message "
-"classes."
-msgstr ""
-"%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של "
-"מחלקות-מסרים תקפות."
+msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
+msgstr "%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של מחלקות-מסרים תקפות."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr "%s אינו צבע תקף. יש לראות את '/help msgcolor' לצבעים תקפים."
 
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
 msgid "clear: Clears the conversation scrollback."
@@ -691,18 +666,8 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
-msgid ""
-"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
-"for different classes of messages in the conversation window.<br>    &lt;"
-"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
-"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
-"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
-msgstr ""
-"msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות "
-"שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, "
-"action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, "
-"white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor "
-"send cyan default"
+msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr "msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
@@ -804,18 +769,13 @@
 msgid "%B %Y"
 msgstr "%B %Y"
 
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."
 
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."
 
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."
 
 msgid "No logs were found"
@@ -955,11 +915,8 @@
 msgid "The selected file is not a valid plugin."
 msgstr "הקובץ שנבחר אינו תוסף."
 
-msgid ""
-"Please open the debug window and try again to see the exact error message."
-msgstr ""
-"יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה "
-"המדוייקת."
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה המדוייקת."
 
 msgid "Select plugin to install"
 msgstr "יש לבחור תוסף להתקין"
@@ -1395,9 +1352,7 @@
 msgid "Clipboard plugin"
 msgstr "תוסף לוח ההעתקה"
 
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
 
 #, c-format
@@ -1457,8 +1412,7 @@
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "ניתן לאפשר רישום מתוך כלים -> העדפות -> רישום.\n"
 "\n"
@@ -1470,9 +1424,7 @@
 msgid "Shows recently logged conversations in new conversations."
 msgstr "מציג שיחות אחרונות בחלונות שיחה חדשות."
 
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "כאשר חלון שיחה חדש נפתח, תוסף זה יכניס את השיחה האחרונה לראש החלון."
 
 msgid "Online"
@@ -1644,20 +1596,16 @@
 msgid "_View Certificate..."
 msgstr "הצג תעודה..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה."
-
+#, c-format
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "תעודה שהוצגה על ידי \"%s\" טוענת שהיא באה בעצם מתוך \"%s\". ייתכן וזה אומר שהשירות אליו התחברת אינו השירות שחשבת."
+
+#. 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.
@@ -1670,41 +1618,36 @@
 msgid "Invalid certificate chain"
 msgstr "שרשרת תעודות לא-תקפה"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
+msgid "You have no database of root certificates, so this certificate cannot be validated."
 msgstr "אין לך מסד-נתונים של תעודות שורש, אז לא ניתן לאשרר תעודה זו."
 
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית."
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה."
+
 #. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
 
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם היא "
-"טוענת שיש לה חתימה."
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם היא טוענת שיש לה חתימה."
 
 msgid "Invalid certificate authority signature"
 msgstr "חתימת רשות הנפקות לא תקפה"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"תעודה שהוצגה על ידי \"%s\" טוענת שהיא באה בעצם מתוך \"%s\". ייתכן וזה אומר "
-"שהשירות אליו התחברת אינו השירות שחשבת."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1741,6 +1684,7 @@
 msgstr "+++ %s התנתק"
 
 #. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"
 
@@ -1791,9 +1735,7 @@
 msgstr "הזמן לצ'אט"
 
 #. Put our happy label in it.
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."
 
 #, c-format
@@ -2011,49 +1953,31 @@
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "המטפל בכתובות \"ymsgr\""
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"gg\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"icq\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"irc\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"msnim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"xmpp\"."
 
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"ymsgr\"."
 
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
 msgstr "אמת אם הפקודה לטיפול בסוג זה של כתובת צריכה לרוץ בטרמינל."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2099,20 +2023,12 @@
 msgstr "XML"
 
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
-"אוטומטי&gt;:</b></font> %s<br/>\n"
-
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
-"אוטומטי&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
+
+#, c-format
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>לא ניתן למצוא את נתיב הרישום!</b></font>"
@@ -2143,14 +2059,11 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "אי-התאמה בגירסת ABI %d.%d.x (צריך %d.%d.x)"
 
-msgid ""
-"Plugin does not implement all required functions (list_icon, login and close)"
+msgid "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "התוסף לא מיישם את כל הפונקציות הדרושות (list_icon, login וכן close)"
 
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "חסר תוסף %s. מומלץ להתקין את התוסף מחדש ולנסות שנית."
 
 msgid "Unable to load the plugin"
@@ -2351,12 +2264,8 @@
 msgstr "בודק תמיכה ב-IPC, כלקוח."
 
 #. *  description
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות "
-"הרשומות."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות הרשומות."
 
 #. *< type
 #. *< ui_requirement
@@ -2405,12 +2314,8 @@
 msgstr "מסתיר הודעות הצטרפות/עזיבה לא נחוצות."
 
 #. *  description
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים "
-"שלוקחים חלק פעיל בשיחה."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים שלוקחים חלק פעיל בשיחה."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2435,9 +2340,7 @@
 msgid "You were disconnected from the server."
 msgstr "נותקת מהשרת."
 
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "את/ה כרגע מנותק/ת. הודעות לא יתקבלו אלא רק בזמן שאת/ה מחובר/ת."
 
 msgid "Message could not be sent because the maximum length was exceeded."
@@ -2519,17 +2422,13 @@
 
 #. * description
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה "
-"כולל Adium, MSN Messenger, aMSN, Trillian.\n"
+"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה כולל Adium, MSN Messenger, aMSN, Trillian.\n"
 "\n"
-"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש "
-"להשתמש בו על חשבון סיכונך האישי בלבד!"
+"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש להשתמש בו על חשבון סיכונך האישי בלבד!"
 
 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
@@ -2561,12 +2460,8 @@
 msgstr "מוסיף שורה חדשה לפני הודעה מוצגת."
 
 #. *< summary
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the username in the conversation window."
-msgstr ""
-"מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון "
-"השיחה."
+msgid "Prepends a newline to messages so that the rest of the message appears below the username in the conversation window."
+msgstr "מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון השיחה."
 
 msgid "Offline Message Emulation"
 msgstr "אמולציה של הודעות לא-מקוונות"
@@ -2574,20 +2469,12 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "שמור הודעות שנשלחו למשתמש לא-מחובר בתור תגובת-פעילות."
 
-msgid ""
-"The rest of the messages will be saved as pounces. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"שאר ההודעת יישמרו בתור תגובת-פעילות. ניתן לערוך/למחוק את התגובה מתוך חלון "
-"תגובות-הפעילות."
-
-#, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת "
-"שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"
+msgid "The rest of the messages will be saved as pounces. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "שאר ההודעת יישמרו בתור תגובת-פעילות. ניתן לערוך/למחוק את התגובה מתוך חלון תגובות-הפעילות."
+
+#, c-format
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"
 
 msgid "Offline Message"
 msgstr "הודעות לא-מקוונות"
@@ -2627,12 +2514,10 @@
 
 #. *  description
 msgid ""
-"Allows you to enforce on a per-account basis that passwords not being saved "
-"are only used in a single successful connection.\n"
+"Allows you to enforce on a per-account basis that passwords not being saved are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
-"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד "
-"שמצליח.\n"
+"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד שמצליח.\n"
 "הערה: על מנת שזה יעבוד אין לשמור את סיסמת החשבון."
 
 #. *< type
@@ -2656,12 +2541,8 @@
 msgid "Psychic mode for incoming conversation"
 msgstr "מצב מנבא-עתידות לשיחות נכנסות"
 
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
-"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr "אתה מרגיש הפרעה בכוח..."
@@ -2807,12 +2688,8 @@
 #. *< version
 #. *  summary
 #. *  description
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או "
-"חוזר."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או חוזר."
 
 msgid "Tcl Plugin Loader"
 msgstr "מטעין לתוספי Tcl"
@@ -2820,25 +2697,16 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "מספק תמיכה לטעינת תוספי Tcl"
 
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין "
-"ActiveTCL מתוך http://www.activestate.com\n"
-
-msgid ""
-"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
-"im/BonjourWindows for more information."
-msgstr ""
-"חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d."
-"pidgin.im/BonjourWindows למידע נוסף."
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין ActiveTCL מתוך http://www.activestate.com\n"
+
+msgid "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin.im/BonjourWindows for more information."
+msgstr "חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d.pidgin.im/BonjourWindows למידע נוסף."
 
 msgid "Unable to listen for incoming IM connections"
 msgstr "לא ניתן להקשיב לחיבורי הודעות נכנסת"
 
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "לא מצליח לתקשר עם שרת ה-mDNS המקומי. האם הוא כבר רץ?"
 
 msgid "First name"
@@ -2904,9 +2772,7 @@
 msgid "Invalid proxy settings"
 msgstr "הגדרות לא תקפות של מתווכים"
 
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+msgid "Either the host name or port number specified for your given proxy type is invalid."
 msgstr "או כתובת השרת או יציאת השרת שניתנה עבור סוג המתווך שהוגדרלא תקפים."
 
 msgid "Token Error"
@@ -3400,14 +3266,10 @@
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"
 
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
 #. We only want to do the following dance if the connection
@@ -3454,11 +3316,8 @@
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;פעולה לביצוע&gt;: פעל פעולה ."
 
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <שם> <הודעה>: שלך הודעת ctcp לאותו כינוי."
@@ -3466,56 +3325,26 @@
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"
 
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות "
-"מפעיל ערוץ כדי לבצע פעולה זו."
-
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע "
-"מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה "
-"זו."
-
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ "
-"הנוכחי."
-
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם "
-"אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
-
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, "
-"עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
-
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי "
-"לעשות זאת."
-
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע "
-"פעולה זו.</i>"
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
+
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
+
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ הנוכחי."
+
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי לעשות זאת."
+
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע פעולה זו.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
@@ -3523,18 +3352,11 @@
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: שלח פקודה אל memoserv"
 
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ "
-"או משתמש."
-
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ או משתמש."
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
@@ -3548,41 +3370,23 @@
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט התראה."
 
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך "
-"להיות מפעיל ערוץ לבצע פעולה זו."
-
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה "
-"להשתמש בזה."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך להיות מפעיל ערוץ לבצע פעולה זו."
+
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה להשתמש בזה."
 
 msgid "operserv: Send a command to operserv"
 msgstr " operserv: שלח פקודה אל operserv"
 
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
-
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין "
-"משתמש."
-
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
+
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין משתמש."
+
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
@@ -3590,12 +3394,8 @@
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  שלח פקודה ישירות לשרת."
 
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ "
-"לבצע פעולה זו."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ לבצע פעולה זו."
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: מציג את השעה המקומית בשרת ה-IRC."
@@ -3609,18 +3409,11 @@
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [שם כינוי]: שלח בקשה CTCP VERSION למשתמש"
 
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות "
-"מפעיל הערוץ לבצע פעולה זו."
-
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות מפעיל הערוץ לבצע פעולה זו."
+
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [שרת] &lt;שם כינוי&gt;:  השג מידע על משתמש."
@@ -3660,9 +3453,7 @@
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"
 
 msgid "Plaintext Authentication"
@@ -3721,6 +3512,11 @@
 msgid "Street Address"
 msgstr "כתובת"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
@@ -3759,9 +3555,7 @@
 msgid "Edit XMPP vCard"
 msgstr "ערוך את ה- XMPP vCard"
 
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "כל הפריטים להלן הם בחירה. יש להזין רק את המידע שאת/ה מרגיש/ה נוח לתת."
 
 msgid "Client"
@@ -3807,14 +3601,12 @@
 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "בטל התרעת נוכחות"
 
 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3845,12 +3637,8 @@
 msgstr "להלן תוצאות החיפוש שלך"
 
 #. current comment from Jabber User Directory users.jabber.org
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך "
-"בחיפושים עם אותיות חלופיות (%)"
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך בחיפושים עם אותיות חלופיות (%)"
 
 msgid "Directory Query Failed"
 msgstr "שגיאה בשאילתת הספרייה"
@@ -3964,9 +3752,7 @@
 msgid "Ping timed out"
 msgstr "פינג לא חזר בזמן"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
+msgid "Unable to find alternative XMPP connection methods after failing to connect directly."
 msgstr "לא יכול למצוא צורות חיבור XMPP חלופיות אחרי כישלון בחיבור ישירות."
 
 msgid "Invalid XMPP ID"
@@ -4020,8 +3806,7 @@
 msgid "Unregister"
 msgstr "הסר רישום"
 
-msgid ""
-"Please fill out the information below to change your account registration."
+msgid "Please fill out the information below to change your account registration."
 msgstr ".יש להזין את המידע להלן כדי לשנות את רישום החשבון שלך"
 
 msgid "Please fill out the information below to register your new account."
@@ -4338,9 +4123,7 @@
 msgstr "לא ניתן לזמזם, מכיוון שייתכן כי%s לא מחובר."
 
 #, c-format
-msgid ""
-"Unable to buzz, because %s does not support it or does not wish to receive "
-"buzzes now."
+msgid "Unable to buzz, because %s does not support it or does not wish to receive buzzes now."
 msgstr "לא ניתן לזמזם, כי %s  לא תומך בזה או לא רוצה לקבל זימזומים כרגע."
 
 #, c-format
@@ -4372,9 +4155,7 @@
 msgstr "ייזום מדיה נכשל"
 
 #, c-format
-msgid ""
-"Please select the resource of %s with which you would like to start a media "
-"session."
+msgid "Please select the resource of %s with which you would like to start a media session."
 msgstr "יש לבחור את המשאב של %s איתו ברצונך להתחיל תקשורת מדיה."
 
 msgid "Select a Resource"
@@ -4401,19 +4182,11 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;משתמש&gt; [סיבה]:  חסום משתמש מן החדר."
 
-msgid ""
-"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
-"the users with an affiliation or set users' affiliation with the room."
-msgstr ""
-"affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: "
-"שלוף או קבע את ייחוסם של משתמשים עם החדר."
-
-msgid ""
-"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
-msgstr ""
-"role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או "
-"קבע את ייחוסם של משתמשים עם החדר."
+msgid "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get the users with an affiliation or set users' affiliation with the room."
+msgstr "affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
+
+msgid "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the users with an role or set users' role with the room."
+msgstr "role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
@@ -4424,8 +4197,7 @@
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;משתמש&gt; [סיבה]:  בעט משתמש מהחדר."
 
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש אחר."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
@@ -4524,11 +4296,8 @@
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
 
 msgid "_Configure Room"
 msgstr "הגדרות החדר"
@@ -4553,9 +4322,6 @@
 msgid "Transfer was closed."
 msgstr "העברת הקובץ נסגרה."
 
-msgid "Failed to open the file"
-msgstr "כישלון בעת פתיחת הקובץ"
-
 msgid "Failed to open in-band bytestream"
 msgstr "כישלון בפתיחת תזרים מידע בתווך"
 
@@ -4600,11 +4366,8 @@
 msgid "Please specify a new nickname for you."
 msgstr "אנא הזן כינוי חדש עבורך."
 
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-"המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
 
 msgid "Set Nickname..."
 msgstr "קבע כינוי..."
@@ -4633,17 +4396,11 @@
 msgstr "אירוע סינכרון רשימת אנשי הקשר ב-%s (%s)"
 
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך "
-"להוסיף איש קשר זה?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
+
+#, c-format
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr "%s הרשימה המקומית אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
 
 #, c-format
@@ -4930,12 +4687,8 @@
 msgid "Allow MSN Mobile pages?"
 msgstr "אפשר הודעות לנייד מ-MSN?"
 
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות "
-"לטלפון הנייד או שאר מכשירים ניידים?"
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות לטלפון הנייד או שאר מכשירים ניידים?"
 
 msgid "Allow"
 msgstr "אפשר"
@@ -4951,8 +4704,7 @@
 msgstr "אין טקסט חסום עבור חשבון זה."
 
 #, c-format
-msgid ""
-"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "שרתי MSN כרגע חוסמים את הביטוי הרגוליים הבאים:<br/>%s"
 
 msgid "This account does not have email enabled."
@@ -5046,12 +4798,8 @@
 msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
 
 #, c-format
-msgid ""
-"Unable to add the buddy %s because the username is invalid.  Usernames must "
-"be a valid email address."
-msgstr ""
-"לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים "
-"להיות כתובות אימייל תקפות."
+msgid "Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address."
+msgstr "לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים להיות כתובות אימייל תקפות."
 
 msgid "Unable to Add"
 msgstr "לא ניתן להוסיף"
@@ -5207,17 +4955,10 @@
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."
 
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
-"שהמשתמש קיים אך לא יצר פרופיל ציבורי."
-
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או שהמשתמש קיים אך לא יצר פרופיל ציבורי."
+
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."
 
 msgid "View web profile"
@@ -5277,36 +5018,24 @@
 
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
-"השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 msgstr[1] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
-"השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 
-msgid ""
-"Message was not sent because the system is unavailable. This normally "
-"happens when the user is blocked or does not exist."
-msgstr ""
-"ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא "
-"קיים."
+msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
+msgstr "ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא קיים."
 
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "ההודעה לא נשלחה מכיוון שההודעות נשלחות מהר מדי."
@@ -5350,8 +5079,7 @@
 msgid "Unable to authenticate: %s"
 msgstr "לא ניתן לאמת: %s"
 
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "רשימת אנשי הקשר שלך ב-MSN אינה זמינה כרגע. יש לנסות שנית מאוחר יותר."
 
 msgid "Handshaking"
@@ -5374,8 +5102,7 @@
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
+msgstr "נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5405,15 +5132,10 @@
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאני שולחים מהר מדי:"
 
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל "
-"הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
-
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
+
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שגיאה עם המרכזייה:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
@@ -5548,16 +5270,10 @@
 msgstr "חברי בהודעות מידיות"
 
 #, c-format
-msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
-msgstr[1] ""
-"%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
+msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr[0] "%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgstr[1] "%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
 
 msgid "Add contacts from server"
 msgstr "הוסף אנשי-קשר מהשרת"
@@ -5567,14 +5283,8 @@
 msgstr "שגיאת פרוטוקול, קוד %d: %s"
 
 #, c-format
-msgid ""
-"%s Your password is %zu characters, which is longer than the maximum length "
-"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
-"cfm?fuseaction=accountSettings.changePassword and try again."
-msgstr ""
-"%s סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא "
-"באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword ולנסות שנית."
+msgid "%s Your password is %zu characters, which is longer than the maximum length of %d.  Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr "%s סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword ולנסות שנית."
 
 msgid "Incorrect username or password"
 msgstr "שם משתמש או סיסמה שגויים"
@@ -5609,11 +5319,8 @@
 msgid "The RC4 cipher could not be found"
 msgstr "צופן ה- RC4 לא נמצא"
 
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."
 
 msgid "Add friends from MySpace.com"
 msgstr "הוסף חברים מתוך MySpace.com"
@@ -5667,14 +5374,8 @@
 msgid "Client Version"
 msgstr "גירסת לקוח"
 
-msgid ""
-"An error occurred while trying to set the username.  Please try again, or "
-"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
-"to set your username."
-msgstr ""
-"קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile."
-"myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש "
-"שלך."
+msgid "An error occurred while trying to set the username.  Please try again, or visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username to set your username."
+msgstr "קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile.myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש שלך."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - שם המשתמש זמין"
@@ -5895,9 +5596,7 @@
 msgid "Could not recognize the host of the username you entered"
 msgstr "לא ניתן לזהות את השרת אותו הזנת"
 
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "חשבונך הושעה  עקב ריבוי הזנת סיסמאות שגויות"
 
 msgid "You cannot add the same person twice to a conversation"
@@ -5918,9 +5617,7 @@
 msgid "The user has blocked you"
 msgstr "משתמש זה חסם אותך"
 
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "גירסת הניסוי הזו אינה מאפשרת ליותר מ-10 משתמשים להתחבר בו זמנית"
 
 msgid "The user is either offline or you are blocked"
@@ -5960,20 +5657,12 @@
 msgstr "לא ניתן לשלוח הודעה. לא יכול ליצור את הועידה (%s)."
 
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת "
-"התיקייה (%s)."
-
-#, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת "
-"(%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת התיקייה (%s)."
+
+#, c-format
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -6058,13 +5747,10 @@
 msgstr "האם ברצונך להצטרף לשיחה?"
 
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "ככל הנראה, %s אינו מחובר ולא קיבל את ההודעה ששלחת הרגע."
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server to which "
-"you wish to connect."
+msgid "Unable to connect to server. Please enter the address of the server to which you wish to connect."
 msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר."
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6093,12 +5779,8 @@
 msgstr "התקבלה תגובה לא-צפויה מאת"
 
 #. username connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
-"תיאלץ להמתין אפילו יותר."
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, תיאלץ להמתין אפילו יותר."
 
 #, c-format
 msgid "Error requesting "
@@ -6168,12 +5850,8 @@
 msgstr "בוצע חיבור ישיר"
 
 #, c-format
-msgid ""
-"%s tried to send you a %s file, but we only allow files up to %s over Direct "
-"IM.  Try using file transfer instead.\n"
-msgstr ""
-"%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  "
-"במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -6251,23 +5929,12 @@
 msgid "Not while on AOL"
 msgstr "לא בזמן שהות ב-AOL"
 
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה "
-"מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
-"המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
-
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s "
-"יש תוכנה עם באגים.)"
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
+
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s יש תוכנה עם באגים.)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6379,14 +6046,8 @@
 msgstr "מבצע גימור לחיבור"
 
 #, c-format
-msgid ""
-"Unable to sign on as %s because the username is invalid.  Usernames must be "
-"a valid email address, or start with a letter and contain only letters, "
-"numbers and spaces, or contain only numbers."
-msgstr ""
-"לא ניתן להתחבר בתור %s כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים "
-"להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים "
-"ורווחים, או לחילופין להכיל אך ורק מספרים."
+msgid "Unable to sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "לא ניתן להתחבר בתור %s כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים ורווחים, או לחילופין להכיל אך ורק מספרים."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6421,12 +6082,8 @@
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
 
 #. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait a minute and "
-"try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י "
-"לנסות, תיאלצ/י להמתין אפילו יותר."
+msgid "You have been connecting and disconnecting too frequently. Wait a minute and try again. If you continue to try, you will need to wait even longer."
+msgstr "התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י לנסות, תיאלצ/י להמתין אפילו יותר."
 
 msgid "The SecurID key entered is invalid"
 msgstr "המפתח SecurID שהוזן אינו תקף."
@@ -6454,8 +6111,7 @@
 
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %u דחה את בקשתך להוסיף אותם לרשימת אנשי הקשר שלהם מהסיבה להלן:\n"
@@ -6531,25 +6187,20 @@
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו גדולות מדי."
 
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות השליחה מופרזת."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."
 
 #, c-format
-msgid ""
-"You missed %hu message from %s because his/her warning level is too high."
-msgid_plural ""
-"You missed %hu messages from %s because his/her warning level is too high."
+msgid "You missed %hu message from %s because his/her warning level is too high."
+msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural ""
-"You missed %hu messages from %s because your warning level is too high."
+msgid_plural "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 
@@ -6591,17 +6242,11 @@
 msgstr "החיבור AIM שלך אולי יתנתק."
 
 #. The conversion failed!
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
-"יש לחכות 10 שניות ולנסות שנית."
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת יש לחכות 10 שניות ולנסות שנית."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -6654,44 +6299,28 @@
 msgstr "התקבלה בקשה לאישור החשבון"
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name differs "
-"from the original."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
+msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
+msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
 
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש לא תקני."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format username because the requested name is too "
-"long."
+msgid "Error 0x%04x: Unable to format username because the requested name is too long."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש ארוך מדי."
 
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this username."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
-"משתמש זה."
-
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many usernames associated with it."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
-"ליותר מדי שמות משתמשים."
-
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
-msgstr ""
-"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור משתמש זה."
+
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת ליותר מדי שמות משתמשים."
+
+#, c-format
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
+msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6707,28 +6336,18 @@
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."
 
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."
 
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
-"לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
-
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
+
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
 msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
 
@@ -6736,12 +6355,8 @@
 msgstr "הפרופיל ארוך מדי."
 
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
 msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
 
@@ -6749,35 +6364,21 @@
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
 #, c-format
-msgid ""
-"Unable to add the buddy %s because the username is invalid.  Usernames must "
-"be a valid email address, or start with a letter and contain only letters, "
-"numbers and spaces, or contain only numbers."
-msgstr ""
-"לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש שלו לא חוקי. שמות-משתמשים "
-"מוכרחים להיות כתובות אימייל תקפות, או לחילופין להתחיל באות ולהכיל רק אותיות, "
-"מספרים ורווחים, או לחילופין להכיל רק מספרים."
+msgid "Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש שלו לא חוקי. שמות-משתמשים מוכרחים להיות כתובות אימייל תקפות, או לחילופין להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או לחילופין להכיל רק מספרים."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "לא ניתן לשלוף את רשימת החברים"
 
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few minutes."
-msgstr ""
-"שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל "
-"הנראה תהייה זמינה בדקות הקרובות."
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
+msgstr "שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל הנראה תהייה זמינה בדקות הקרובות."
 
 msgid "Orphans"
 msgstr "יתומים"
 
 #, c-format
-msgid ""
-"Unable to add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"לא ניתן להוסיף את %s לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש "
-"להסיר אחד ולנסות שנית."
+msgid "Unable to add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "לא ניתן להוסיף את %s לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש להסיר אחד ולנסות שנית."
 
 msgid "(no name)"
 msgstr "(ללא שם)"
@@ -6787,11 +6388,8 @@
 msgstr "לא ניתן להוסיף את החבר%s מסיבה לא ידועה."
 
 #, c-format
-msgid ""
-"The user %s has given you permission to add him or her to your buddy list.  "
-"Do you want to add this user?"
-msgstr ""
-"המשתמש %s התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"
+msgid "The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"
+msgstr "המשתמש %s התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"
 
 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
@@ -6807,8 +6405,7 @@
 #. Denied
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
@@ -6837,12 +6434,8 @@
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."
 
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
-"להמשיך בכל זאת?"
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  להמשיך בכל זאת?"
 
 msgid "C_onnect"
 msgstr "התחבר"
@@ -6887,12 +6480,8 @@
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
-"ולבחור \"בקש הרשאה שוב\"."
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם ולבחור \"בקש הרשאה שוב\"."
 
 msgid "Find Buddy by Email"
 msgstr "מצא איש קשר לפי דוא\"ל"
@@ -6970,13 +6559,8 @@
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ביקש כעת להתחבר ישירות אל %s"
 
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
-"ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
 msgid "Aquarius"
 msgstr "דלי"
@@ -7734,8 +7318,7 @@
 msgstr "מפעיל שירותים"
 
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "אדמיניסטרטור Sametime שם את ההודעה להלן על השרת %s"
 
 msgid "Sametime Administrator Announcement"
@@ -7776,9 +7359,7 @@
 msgstr "צור שיחת ועידה עם המשתמש"
 
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "יש להזין נושא עבוד שיחת הועידה, והודעת הזמנה שתישלח אל %s"
 
 msgid "New Conference"
@@ -7797,13 +7378,8 @@
 msgstr "הזמן משתמש אל ועידה"
 
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם "
-"ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."
 
 msgid "Invite to Conference"
 msgstr "הזמן לועידה"
@@ -7821,12 +7397,8 @@
 msgstr "לא ניתן שרת קהילה של Sametime"
 
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי "
-"להמשיך בכניסה למערכת."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי להמשיך בכניסה למערכת."
 
 msgid "Meanwhile Connection Setup"
 msgstr "הגדרות תקשורת Meanwhile"
@@ -7854,12 +7426,8 @@
 msgstr "שם משתמש דו-משמעי הוזן"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון "
-"מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
 
 msgid "Select User"
 msgstr "בחר משתמש"
@@ -7868,12 +7436,8 @@
 msgstr "אין אפשרות להוסיף משתמש: המשתמש לא נמצא"
 
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי "
-"הקשר שלך."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי הקשר שלך."
 
 #, c-format
 msgid ""
@@ -7926,13 +7490,8 @@
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר "
-"י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
 
 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
@@ -7941,33 +7500,22 @@
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"
 
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."
 
 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"
 
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
-"וחבריה לרשימת אנשי הקשר שלך."
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה וחבריה לרשימת אנשי הקשר שלך."
 
 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"
 
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
-"אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
 
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
@@ -7985,12 +7533,8 @@
 msgid "Search for a user"
 msgstr "חיפוש משתמש"
 
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime "
-"שלך."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime שלך."
 
 msgid "User Search"
 msgstr "חיפוש משתמש"
@@ -8046,11 +7590,8 @@
 msgstr "המשתמש המרוחק כבר לא נוכח ברשת"
 
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
 
 #, c-format
 msgid ""
@@ -8096,12 +7637,8 @@
 msgid "The %s buddy is not trusted"
 msgstr "איש הקשר %s אינו נבטח"
 
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  "
-"ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8111,12 +7648,8 @@
 msgid "The %s buddy is not present in the network"
 msgstr "המשתמש %s לא נוכח ברשת"
 
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" "
-"לייבא מפתח ציבורי."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" לייבא מפתח ציבורי."
 
 msgid "_Import..."
 msgstr "ייבא..."
@@ -8124,19 +7657,11 @@
 msgid "Select correct user"
 msgstr "בחר/י משתמש נכון"
 
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון "
-"להוסיף לרשימת אנשי הקשר."
-
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף "
-"לרשימת אנשי הקשר."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
+
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
 
 msgid "Detached"
 msgstr "מנותק"
@@ -8286,17 +7811,8 @@
 msgstr "רשימת המפתחות הציבוריים של הערוץ"
 
 #, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על "
-"בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם "
-"נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו "
-"להצטרף."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו להצטרף."
 
 msgid "Channel Authentication"
 msgstr "אימות בערוץ"
@@ -8360,8 +7876,7 @@
 msgstr "קביעת סודיות ערוץ"
 
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "חובה להצטרף לערוץ %s לפני הצטרפות לקבוצה הפרטית"
 
 msgid "Join Private Group"
@@ -8601,12 +8116,8 @@
 msgstr "נדרשת סיסמא"
 
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך "
-"להמשיך ולקבל את המפתח הציבורי?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך להמשיך ולקבל את המפתח הציבורי?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
@@ -8642,8 +8153,7 @@
 msgid "Key Exchange failed"
 msgstr "החלפת המפתחות נכשלה"
 
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "המשך תהליך פעולה שנותק, נכשל. לחצ/י על חיבור מחדש ליצור חיבור חדש."
 
 msgid "Performing key exchange"
@@ -8716,13 +8226,8 @@
 msgid "User Online Status Attributes"
 msgstr "מאפייני מצב משתמש זמין ומחובר"
 
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
-"המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
 
 msgid "Message of the Day"
 msgstr "ההודעה להיום"
@@ -8841,17 +8346,11 @@
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"
 
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
-
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
+
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
@@ -8859,12 +8358,8 @@
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"
 
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
-"ההזמנות של הערוץ"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת ההזמנות של הערוץ"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
@@ -8887,12 +8382,8 @@
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"
 
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;ערוצ(ים)&gt;:  הצג רשימת "
-"אנשים מסוג מסויים בערוצ(ים)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;ערוצ(ים)&gt;:  הצג רשימת אנשים מסוג מסויים בערוצ(ים)"
 
 #. *< type
 #. *< ui_requirement
@@ -9029,9 +8520,7 @@
 msgstr "%s שלח הודעה אל הלוח הלבן. האם ברצונך לפתוח את הלוח הלבן?"
 
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s שלח הודעה אל הלוח הלבן בערוץ %s.האם ברצונך לפתוח את הלוח הלבן?"
 
 msgid "Whiteboard"
@@ -9220,12 +8709,8 @@
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"
 
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
-"%s."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -9239,17 +8724,11 @@
 msgstr "התקבל מידע שגוי"
 
 #. security lock from too many failed login attempts
-msgid ""
-"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
-"website may fix this."
-msgstr ""
-"החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן "
-"את זה."
+msgid "Account locked: Too many failed login attempts.  Logging into the Yahoo! website may fix this."
+msgstr "החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן את זה."
 
 #. indicates a lock of some description
-msgid ""
-"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
-"this."
+msgid "Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."
 msgstr "החשבון נעול: סיבה לא ידועה. התחברות באתר Yahoo! אולי תתקן את זה."
 
 #. username or password missing
@@ -9257,24 +8736,15 @@
 msgstr "שם משתמש או סיסמה חסרים"
 
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. "
-"בדוק ב-%s לעידכונים."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. בדוק ב-%s לעידכונים."
 
 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"
 
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
-"תסיר ותתעלם מן המשתמש."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" תסיר ותתעלם מן המשתמש."
 
 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"
@@ -9393,14 +8863,10 @@
 msgid "Yahoo! Profile"
 msgstr "פרופיל Yahoo!"
 
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "סליחה, אך פרופילים המסומנים כמכילים מידע למבוגרים בלבד לא נתמכים כרגע."
 
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
 msgstr "אם ברצונך לראות פרופיל זה, יש להשתמש בקישור הזה בדפדפן האינטרנט שלך:"
 
 msgid "Yahoo! ID"
@@ -9427,32 +8893,21 @@
 msgid "Last Update"
 msgstr "עודכן לאחרונה"
 
-msgid ""
-"This profile is in a language or format that is not supported at this time."
+msgid "This profile is in a language or format that is not supported at this time."
 msgstr "פרופיל זה אינו בשפה או פורמט אשר אינם נתמכים כרגע."
 
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות "
-"שנית מאוחר יותר."
-
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, "
-"לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י "
-"שנית מאוחר יותר."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות שנית מאוחר יותר."
+
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י שנית מאוחר יותר."
 
 msgid "The user's profile is empty."
 msgstr "פרופיל המשתמש ריק."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s התחבר."
+msgstr "%s לא רוצה להצטרף."
 
 msgid "Failed to join chat"
 msgstr "לא ניתן להצטרף לשיחה"
@@ -9469,12 +8924,8 @@
 msgid "Not available"
 msgstr "לא זמין"
 
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר "
-"צ'אט"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר צ'אט"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9507,9 +8958,7 @@
 msgid "Connection problem with the YCHT server"
 msgstr "שגיאה עם החיבור אל שרת ה-YCHT."
 
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "(הייתה שגיאה בהמרת ההודעה.\t בדוק את הגדרות ה'קידוד' בעורך החשבונות)"
 
 #, c-format
@@ -9557,29 +9006,17 @@
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: הצטרף לצ'אט חדש"
 
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ישות&gt;: שלח הודעה ל-&lt;הודעה, <i>ישות</i>,*&gt;"
 
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</i>*&gt;"
-
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
-"<i>ישות</i>,<i>נמען</i>&gt;"
-
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
-"i>&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</i>*&gt;"
+
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,<i>ישות</i>,<i>נמען</i>&gt;"
+
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;מחלקה&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,אישי,*&gt;"
@@ -9825,12 +9262,8 @@
 msgstr "שגיאה בקריאה מתוך %s: אורך המשוב ארוך מדי (מוגבל עד %d בייט)"
 
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
-"משהו מזיק."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות משהו מזיק."
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -9882,11 +9315,8 @@
 msgstr "שגיאה בקריאת %s"
 
 #, c-format
-msgid ""
-"An error was encountered reading your %s.  The file has not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~."
+msgid "An error was encountered reading your %s.  The file has not been loaded, and the old file has been renamed to %s~."
+msgstr "חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~."
 
 msgid "Internet Messenger"
 msgstr "למסרים באינטרנט"
@@ -10006,38 +9436,24 @@
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add...</b> button below and configure your first account. If you want %s "
-"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
-"them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add...</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add...</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>ברוכים הבאים אל%s!</span>\n"
 "\n"
-"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור "
-"<b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה "
-"חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
+"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור <b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
 "\n"
-"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
-"<b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
+"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי <b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural ""
-"You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "יש לך %d איש-קשר בשם %s. האם ברצונך למזג אותך?"
 msgstr[1] "יש לך כעת %d אנשי-קשר בשם %s. האם ברצונך למזג אותך?"
 
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-"מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש "
-"בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש "
-"הקשר"
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש הקשר"
 
 msgid "Please update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
@@ -10045,9 +9461,7 @@
 msgid "A_ccount"
 msgstr "ח_שבון"
 
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"
 
 msgid "Room _List"
@@ -10138,8 +9552,7 @@
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."
 
 #. I don't believe this can happen currently, I think
@@ -10368,8 +9781,7 @@
 
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural ""
-"%d accounts were disabled because you signed on from another location:"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
 msgstr[0] "חשבון %d סומן כלא-פעיל כי התחברת ממיקום נוסף:"
 msgstr[1] "%d חשבונות סומנו כלא-פעילים כי התחברת ממיקום נוסף:"
 
@@ -10390,15 +9802,11 @@
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
-"you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>ברוכים הבאים ל-%s!</span>\n"
 "\n"
-"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון "
-"<b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך "
-"אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
+"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון <b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10433,16 +9841,11 @@
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
 
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."
 
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
 
 msgid "A_lias:"
 msgstr "שם:"
@@ -10567,9 +9970,7 @@
 msgid "Message (Nick Said) Text"
 msgstr "טקסט הודעות (מישהו אמר)"
 
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
+msgid "The text information for when a chat has an unread message that mentions your nick"
 msgstr "טקסט להציג כשצ'אט מכיל הודעה שלא-נקראה שמזכירה את הכינוי שלך"
 
 msgid "The text information for a buddy's status"
@@ -10588,8 +9989,7 @@
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "איש קשר זה אינו באותו פרוטוקול של צ'אט זה"
 
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "אינך מחובר/ת בחשבון שיכול להזמין את איש הקשר הזה."
 
 msgid "Invite Buddy Into Chat Room"
@@ -11211,45 +10611,19 @@
 msgstr "אודות %s"
 
 #, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע "
-"חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם "
-"בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את "
-"התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך "
-"הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה "
-"את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה "
-"זו.<BR><BR>"
-
-#, c-format
-msgid ""
-"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">שו\"ת:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
-
-#, c-format
-msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">עזרה דרך האימייל:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-
-#, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">שו\"ת:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+msgstr "<FONT SIZE=\"4\">עזרה דרך האימייל:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
+msgid "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">ערוץ IRC:</FONT> #pidgin על irc.freenode.net<BR><BR>"
 
 #, c-format
@@ -11286,9 +10660,7 @@
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-msgid ""
-"Please enter the username or alias of the person whose info you would like "
-"to view."
+msgid "Please enter the username or alias of the person whose info you would like to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם עליו תרצו לקרוא מידע."
 
 msgid "View User Log"
@@ -11314,18 +10686,10 @@
 msgstr "הזן שם נוסף לשיחה זו."
 
 #, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו "
-"מתוך רשימת אנשי הקשר שלך?"
-msgstr[1] ""
-"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
-"בתוכו מתוך רשימת אנשי הקשר שלך?"
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו מתוך רשימת אנשי הקשר שלך?"
+msgstr[1] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים בתוכו מתוך רשימת אנשי הקשר שלך?"
 
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
@@ -11334,9 +10698,7 @@
 msgstr "ה_סר איש קשר"
 
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "האם הנך בטוח/ה שברצונך לאחד את הקבוצה %s לתוך הקבוצה %s?"
 
 msgid "Merge Groups"
@@ -11346,9 +10708,7 @@
 msgstr "מזג קבוצות"
 
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הקבוצה %s וכל חבריה מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Group"
@@ -11358,8 +10718,7 @@
 msgstr "הסר _קבוצה"
 
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Buddy"
@@ -11369,9 +10728,7 @@
 msgstr "הסר איש קשר"
 
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"
 
 msgid "Remove Chat"
@@ -11471,14 +10828,6 @@
 msgid "File transfer _details"
 msgstr "פרטי העברות קבצים"
 
-#. Pause button
-msgid "_Pause"
-msgstr "השהייה"
-
-#. Resume button
-msgid "_Resume"
-msgstr "ה_משך"
-
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"
 
@@ -11619,9 +10968,7 @@
 msgid "_Description"
 msgstr "_תיאור"
 
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "יש להזין כתובת ותיאור עבור הקישור ברצונך להכניס. לא חובה להזין תיאור."
 
 msgid "Please enter the URL of the link that you want to insert."
@@ -11751,21 +11098,15 @@
 msgstr "יש לבדוק הרשאות ולנסות בשנית."
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהתחלת ב- %s?"
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה ב- %s שהתחיל ב- %s?"
 
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"
 
 msgid "Delete Log?"
@@ -11873,8 +11214,7 @@
 "על ידי דיווח באג באתר:\n"
 "%ssimpleticket/\n"
 "\n"
-"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
-"core.\n"
+"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
 "%swiki/GetABacktrace\n"
 
@@ -11904,6 +11244,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות וידאו איתך."
 
+msgid "Incoming Call"
+msgstr "שיחה נכנסת"
+
+msgid "_Pause"
+msgstr "השהייה"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -11927,8 +11273,7 @@
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת הפקודה \"%s\": %s"
 
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
 
 msgid "No message"
@@ -11961,9 +11306,7 @@
 msgid "Could not unload plugin"
 msgstr "לא ניתן להפסיק את פעולת התוסף"
 
-msgid ""
-"The plugin could not be unloaded now, but will be disabled at the next "
-"startup."
+msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
 msgstr "לא ניתן לכבות את התוסף כרגע, אבל הוא יכובה בהפעלה הבאה של התוכנה."
 
 #, c-format
@@ -12127,12 +11470,8 @@
 msgid "Install Theme"
 msgstr "התקן עיצוב"
 
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
-"הערכות."
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת הערכות."
 
 msgid "Icon"
 msgstr "סמל"
@@ -12245,12 +11584,8 @@
 msgid "Default Formatting"
 msgstr "פורמט ברירת המחדל"
 
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט "
-"טקסט."
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט טקסט."
 
 msgid "Cannot start proxy configuration program."
 msgstr "לא יכול להפעיל את תוכנת הגדרת שרת התיווך."
@@ -12631,8 +11966,7 @@
 msgstr "מצב עבור %s"
 
 #, c-format
-msgid ""
-"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgid "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "כבר קיים חייכן משלך עבור '%s'. יש לנסות קיצור-דרך אחר."
 
 msgid "Custom Smiley"
@@ -12699,20 +12033,14 @@
 msgstr "לא ניתן לשלוח את הספריה %s."
 
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד."
 
 msgid "You have dragged an image"
 msgstr "גררת תמונה"
 
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
-"עבור איש הקשר הזה."
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל עבור איש הקשר הזה."
 
 msgid "Set as buddy icon"
 msgstr "קבע להיות סמל איש הקשר"
@@ -12726,14 +12054,10 @@
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "האם ברצונך לקבוע את זה להיות הסמל של איש קשר זה?"
 
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "ניתן לשלוח תמונה זו כקובץ מועבר, או להשתמש בה בתור סמל עבור משתמש זה."
 
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "ניתן להכניס תמונה זו לתוך ההודעה, או להשתמש בה כסמל איש הקשר הזה."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -12744,12 +12068,8 @@
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"
 
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send the target of "
-"this launcher instead of this launcher itself."
-msgstr ""
-"גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע "
-"עליו, ולא את המפעיל עצמו."
+msgid "You dragged a desktop launcher. Most likely you wanted to send the target of this launcher instead of this launcher itself."
+msgstr "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע עליו, ולא את המפעיל עצמו."
 
 #, c-format
 msgid ""
@@ -12776,8 +12096,7 @@
 msgstr "כישלון בעת פתיחת הקובץ '%s': %s"
 
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"
 
 msgid "_Open Link"
@@ -12944,11 +12263,8 @@
 msgid "Allows browsing and registering services."
 msgstr "מאפשר רישום ועיון ברשימת השירותים"
 
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."
+msgid "This plugin is useful for registering with legacy transports or other XMPP services."
+msgstr "תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."
 
 msgid "Buddy is idle"
 msgstr "איש הקשר במנוחה"
@@ -12969,9 +12285,7 @@
 msgid "Point values to use when..."
 msgstr "ערכי ניקוד שיש להשתמש בהם כאשר..."
 
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr "איש הקשר עם הניקוד <i>הגבוה</i> יהיה איש הקשר עם העדיפות.\n"
 
 msgid "Use last buddy when scores are equal"
@@ -12992,17 +12306,12 @@
 #. *< name
 #. *< version
 #. *< summary
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
 
 #. *< description
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש "
-"בחישובי הדירוג של אנשי הקשר."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש בחישובי הדירוג של אנשי הקשר."
 
 msgid "Conversation Colors"
 msgstr "צבעי שיחה"
@@ -13046,11 +12355,8 @@
 msgstr "מיקום חלון שיחה"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
 
 msgid "Number of conversations per window"
 msgstr "מספר שיחות בכל חלון"
@@ -13074,9 +12380,7 @@
 
 #. *< summary
 #. *  description
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "הגבל את מספר השיחות בכל חלון-שיחה, עם אפשרות להפריד בין הודעות לצ'אטים"
 
 #. Configuration frame
@@ -13110,14 +12414,12 @@
 
 #. *  description
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle "
-"mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע "
-"פעולות מסוימות:\n"
+"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע פעולות מסוימות:\n"
 " • גרור/י מטה ואז לימין לסגור חלון.\n"
 " • גרור/י מעלה ואז שמאלה לעבור לשיחה הקודמת.\n"
 " • גרור/י מעלה ואז ימינה לעבור לשיחה הבאה."
@@ -13141,12 +12443,8 @@
 msgstr "בחר איש קשר"
 
 #. Add the label.
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור "
-"חדש"
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור חדש"
 
 #. Add the expander
 msgid "User _details"
@@ -13287,9 +12585,7 @@
 msgid "C_hat windows"
 msgstr "חלונות _שיחה"
 
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
 msgstr "התקבלה בקשה לשיחת מוזיקה. נא ללחוץ על כפתור ה-MM להסכים."
 
 msgid "Music messaging session confirmed."
@@ -13329,12 +12625,8 @@
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."
 
 #. *  summary
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editing a common score in real-time."
-msgstr ""
-"התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי "
-"עריכה של לחן משותף בזמן אמת."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editing a common score in real-time."
+msgstr "התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי עריכה של לחן משותף בזמן אמת."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -13521,12 +12813,8 @@
 msgid "Lets you send raw input to text-based protocols."
 msgstr "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט."
 
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ "
-"'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
@@ -13557,11 +12845,8 @@
 msgstr "בודק מדי-פעם אם יצאו גרסאות חדשות."
 
 #. *  description
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."
 
 #. *< major version
 #. *< minor version
@@ -13580,12 +12865,8 @@
 msgstr "כפתור שליחה בחלון שיחה."
 
 #. *< summary
-msgid ""
-"Adds a Send button to the entry area of the conversation window. Intended "
-"for use when no physical keyboard is present."
-msgstr ""
-"מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת "
-"פיזית."
+msgid "Adds a Send button to the entry area of the conversation window. Intended for use when no physical keyboard is present."
+msgstr "מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת פיזית."
 
 msgid "Duplicate Correction"
 msgstr "כפילות בתיקונים"
@@ -13658,9 +12939,12 @@
 msgid "Founder"
 msgstr "מייסד"
 
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "מפעיל"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "חצי-מפעיל"
 
@@ -13801,9 +13085,7 @@
 msgstr "מגדיר את פורמט חותמות-הזמן בהודעות."
 
 #. *  description
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "תוסף זה מאפשר למשתמש לקבוע אפשרויות שיחה וחותמות-זמן ליומני שיחה."
 
 msgid "Opacity:"
@@ -13852,8 +13134,7 @@
 
 #. *  description
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -13889,11 +13170,8 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."
 
-msgid ""
-"Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr ""
-"מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי "
-"הקשר."
+msgid "Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי הקשר."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>התנתק.</font>"
@@ -13932,306 +13210,220 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
+#~ msgid "Failed to open the file"
+#~ msgstr "כישלון בעת פתיחת הקובץ"
+#~ msgid "_Resume"
+#~ msgstr "ה_משך"
 #~ msgid "Malformed BOSH Connect Server"
 #~ msgstr "שרת חיבור BOSH משובש"
-
 #~ msgid "Unable to not load SILC key pair"
 #~ msgstr "לא ניתן שלא לטעון את זוג מפתחות ה-SILC"
-
 #~ msgid ""
 #~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
 #~ msgstr "%s סרב את ההזמנה שלך לועידה בחדר \"%s\" כיוון ש-\"%s\"."
-
 #~ msgid "Invitation Rejected"
 #~ msgstr "ההזמנה נדחתה"
 
 #, fuzzy
 #~ msgid "_Proxy"
 #~ msgstr "מתווך"
-
 #~ msgid "Cannot open socket"
 #~ msgstr "אין אפשרות לפתוח שקע"
-
 #~ msgid "Could not listen on socket"
 #~ msgstr "אין אפשרות להקשיב בשקע זה"
-
 #~ msgid "Unable to read socket"
 #~ msgstr "אין אפשרות לקרוא את השקע"
-
 #~ msgid "Connection failed."
 #~ msgstr "ההתחברות נכשלה."
-
 #~ msgid "Server has disconnected"
 #~ msgstr "השרת התנתק"
-
 #~ msgid "Couldn't create socket"
 #~ msgstr "אין אפשרות ליצור שקע"
-
 #~ msgid "Couldn't connect to host"
 #~ msgstr "לא ניתן להתחבר לשרת"
-
 #~ msgid "Read error"
 #~ msgstr "שגיאה בקריאה"
-
 #~ msgid ""
 #~ "Could not establish a connection with the server:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "לא ניתן ליצור חיבור עם השרת:\n"
 #~ "%s"
-
 #~ msgid "Write error"
 #~ msgstr "שגיאה בכתיבה"
-
 #~ msgid "Last Activity"
 #~ msgstr "פעילות אחרונה"
-
 #~ msgid "Service Discovery Info"
 #~ msgstr "מידע של שירות תגלית"
-
 #~ msgid "Service Discovery Items"
 #~ msgstr "פריטי שירות תגלית"
-
 #~ msgid "Extended Stanza Addressing"
 #~ msgstr "כתובות מורחבות לסטאנזות"
-
 #~ msgid "Multi-User Chat"
 #~ msgstr "צ'אט מרובה משתמשים"
-
 #~ msgid "Multi-User Chat Extended Presence Information"
 #~ msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
-
 #~ msgid "In-Band Bytestreams"
 #~ msgstr "זרמי-נתונים לפי הסדר"
-
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "פקודות זמניות"
-
 #~ msgid "PubSub Service"
 #~ msgstr "שירות PubSub"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "זרמי-נתונים של SOCKS5"
-
 #~ msgid "Out of Band Data"
 #~ msgstr "מידע שלא לפי סדר"
-
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
-
 #~ msgid "In-Band Registration"
 #~ msgstr "רישום דרך התור"
-
 #~ msgid "User Location"
 #~ msgstr "מיקום משתמש"
-
 #~ msgid "User Avatar"
 #~ msgstr "תמונת משתמש"
-
 #~ msgid "Chat State Notifications"
 #~ msgstr "התרעות על מצבי צ'אט"
-
 #~ msgid "Software Version"
 #~ msgstr "גירסת תוכנה"
-
 #~ msgid "Stream Initiation"
 #~ msgstr "איתחול זרם"
-
 #~ msgid "User Mood"
 #~ msgstr "מצב-רוח המשתמש"
-
 #~ msgid "User Activity"
 #~ msgstr "פעילות משתמש"
-
 #~ msgid "Entity Capabilities"
 #~ msgstr "יכולות ישות"
-
 #~ msgid "Encrypted Session Negotiations"
 #~ msgstr "מיקוחים לחיבור מוצפן"
-
 #~ msgid "User Tune"
 #~ msgstr "שיר משתמש"
-
 #~ msgid "Roster Item Exchange"
 #~ msgstr "החלפת פריטי רשימה"
-
 #~ msgid "Reachability Address"
 #~ msgstr "כתובת זמינות"
-
 #~ msgid "User Profile"
 #~ msgstr "פרופיל משתמש"
-
 #~ msgid "Jingle"
 #~ msgstr "ג'ינגל"
-
 #~ msgid "Jingle Audio"
 #~ msgstr "צליל ג'ינגל"
-
 #~ msgid "User Nickname"
 #~ msgstr "כינוי משתמש"
-
 #~ msgid "Jingle ICE UDP"
 #~ msgstr "ג'ינגל ICE UDP"
-
 #~ msgid "Jingle ICE TCP"
 #~ msgstr "ג'ינגל ICE TCP"
-
 #~ msgid "Jingle Raw UDP"
 #~ msgstr "ג'ינגל UDP לא-מעובד"
-
 #~ msgid "Jingle Video"
 #~ msgstr "ג'ינגל וידאו"
-
 #~ msgid "Jingle DTMF"
 #~ msgstr "ג'ינגל DTMF"
-
 #~ msgid "Message Receipts"
 #~ msgstr "קבלות הודעות"
-
 #~ msgid "Public Key Publishing"
 #~ msgstr "פירסום מפתח ציבורי"
-
 #~ msgid "User Chatting"
 #~ msgstr "משתמש מצ'וטט"
-
 #~ msgid "User Browsing"
 #~ msgstr "משתמש גולש"
-
 #~ msgid "User Gaming"
 #~ msgstr "משתמש משחק"
-
 #~ msgid "User Viewing"
 #~ msgstr "משתמש צופה"
-
 #~ msgid "Stanza Encryption"
 #~ msgstr "הצפנת סטנזה"
-
 #~ msgid "Entity Time"
 #~ msgstr "זמן ישות"
-
 #~ msgid "Delayed Delivery"
 #~ msgstr "משלוח מעוכב"
-
 #~ msgid "Collaborative Data Objects"
 #~ msgstr "אובייקטי מידע שיתופיים"
-
 #~ msgid "File Repository and Sharing"
 #~ msgstr "ספריית קבצים ושיתוף"
-
 #~ msgid "STUN Service Discovery for Jingle"
 #~ msgstr "שירות תגלית STUN עבור ג'ינגל"
-
 #~ msgid "Simplified Encrypted Session Negotiation"
 #~ msgstr "מיקוח פשוט לחיבור המוצפן"
-
 #~ msgid "Hop Check"
 #~ msgstr "בדיקת קפיצות"
-
 #~ msgid "Read Error"
 #~ msgstr "שגיאה בקריאה"
-
 #~ msgid "Failed to connect to server."
 #~ msgstr "כשל בהתחברות לשרת"
-
 #~ msgid "Read buffer full (2)"
 #~ msgstr "תור-הקריאה מלא (2)"
-
 #~ msgid "Unparseable message"
 #~ msgstr "הודעת שלא ניתנת לפיענוח"
-
 #~ msgid "Couldn't connect to host: %s (%d)"
 #~ msgstr "לא ניתן להתחבר לשרת: %s (%d)"
-
 #~ msgid "Login failed (%s)."
 #~ msgstr "לא ניתן להתחבר (%s)."
-
 #~ msgid ""
 #~ "You have been logged out because you logged in at another workstation."
 #~ msgstr "נותקת כיוון שהתחברת ממחשב אחר."
-
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
-
 #~ msgid "Incorrect password."
 #~ msgstr "סיסמה לא נכונה."
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "לא ניתן להתחבר לשרת ה-BOS:\n"
 #~ "%s"
-
 #~ msgid "You may be disconnected shortly.  Check %s for updates."
 #~ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
-
 #~ msgid "Could Not Connect"
 #~ msgstr "לא ניתן להתחבר"
-
 #~ msgid "Invalid username."
 #~ msgstr "שם משתמש לא תקף."
 
 #, fuzzy
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
 #~ msgid "Connection lost"
 #~ msgstr "החיבור אבד"
-
 #~ msgid "Couldn't resolve host"
 #~ msgstr "לא ניתן למצוא כתובת שרת"
-
 #~ msgid "Connection closed (writing)"
 #~ msgstr "החיבור נסגר (כתיבה)"
-
 #~ msgid "Connection reset"
 #~ msgstr "החיבור אותחל"
-
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "שגיאה בקריאת נתונים מהשקע: %s"
-
 #~ msgid "Unable to connect to host"
 #~ msgstr "לא ניתן להתחבר לשרת"
-
 #~ msgid "Could not write"
 #~ msgstr "לא ניתן לכתוב"
-
 #~ msgid "Could not connect"
 #~ msgstr "לא ניתן להתחבר"
-
 #~ msgid "Could not create listen socket"
 #~ msgstr "אין אפשרות ליצור שקע-קשב"
-
 #~ msgid "Could not resolve hostname"
 #~ msgstr "לא ניתן למצוא כתובת שרת"
 
 #, fuzzy
 #~ msgid "Incorrect Password"
 #~ msgstr "סיסמה לא נכונה"
-
 #~ msgid ""
 #~ "Could not establish a connection with %s:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "לא היה ניתן ליצור חיבור עם %s:\n"
 #~ "%s"
-
 #~ msgid "Yahoo Japan"
 #~ msgstr "Yahoo יפן"
-
 #~ msgid "Japan Pager server"
 #~ msgstr "שרת ה-Pager ביפן"
-
 #~ msgid "Japan file transfer server"
 #~ msgstr "שרת יפני להעברת קבצים"
-
 #~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
 #~ msgstr ""
 #~ "אבד החיבור עם השרת\n"
 #~ "%s"
-
 #~ msgid "Could not resolve host name"
 #~ msgstr "לא ניתן למצוא כתובת שרת"
 
@@ -14240,53 +13432,39 @@
 #~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
 #~ "was found."
 #~ msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
-
 #~ msgid "Conversation Window Hiding"
 #~ msgstr "הסתרת חלונות שיחה"
-
 #~ msgid "More Data needed"
 #~ msgstr "נחוץ מידע נוסף"
-
 #~ msgid "Please provide a shortcut to associate with the smiley."
 #~ msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
-
 #~ msgid "Please select an image for the smiley."
 #~ msgstr "יש לבחור תמונה עבור החייכן."
-
 #~ msgid "Activate which ID?"
 #~ msgstr "איזה ID להפעיל?"
-
 #~ msgid "Cursor Color"
 #~ msgstr "צבע הסמן"
-
 #~ msgid "Secondary Cursor Color"
 #~ msgstr "צבע משני של הסמן"
-
 #~ msgid "Interface colors"
 #~ msgstr "צבעי ממשק"
-
 #~ msgid "Widget Sizes"
 #~ msgstr "גדלי פריטי ממשק"
-
 #~ msgid "Invite message"
 #~ msgstr "הודעת הזמנה"
-
 #~ msgid ""
 #~ "Please enter the name of the user you wish to invite,\n"
 #~ "along with an optional invite message."
 #~ msgstr ""
 #~ "יש להזין את שם המשתמש שברצונך להזמין,\n"
 #~ "יחד עם הודעת הזמנה אופציונלית."
-
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "לא יכול לאחזר את רשימת הכתובות של MSN"
-
 #~ msgid "Connection to server lost (no data received within %d second)"
 #~ msgid_plural ""
 #~ "Connection to server lost (no data received within %d seconds)"
 #~ msgstr[0] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניה)"
 #~ msgstr[1] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניות)"
-
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
@@ -14301,10 +13479,8 @@
 #, fuzzy
 #~ msgid "Can not decrypt get server reply"
 #~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
 #~ msgid "Keep alive error"
 #~ msgstr "שגיאה בהשאר-חי"
-
 #~ msgid ""
 #~ "Lost connection with server:\n"
 #~ "%d, %s"
@@ -14315,93 +13491,65 @@
 #, fuzzy
 #~ msgid "Connecting server ..."
 #~ msgstr "שרת ההתחברות"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "כישלון בשליחת הודעה."
 
 #, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "אינך חבר/ה בקבוצה \"%s\"\n"
-
 #~ msgid "Looking up %s"
 #~ msgstr "מחפש את %s..."
-
 #~ msgid "Connect to %s failed"
 #~ msgstr "ההתחברות אל %s לא הצליחה."
-
 #~ msgid "Signon: %s"
 #~ msgstr "מתחבר: %s"
-
 #~ msgid "Unable to write file %s."
 #~ msgstr "אין אפשרות לכתוב אל הקובץ %s"
-
 #~ msgid "Unable to read file %s."
 #~ msgstr "אין אפשרות לקרוא את הקובץ %s."
-
 #~ msgid "Message too long, last %s bytes truncated."
 #~ msgstr "הודעה ארוכה מדי, %s הבייטים האחרונים נקטמו."
-
 #~ msgid "%s not currently logged in."
 #~ msgstr "%s אינו מחובר כרגע."
-
 #~ msgid "Warning of %s not allowed."
 #~ msgstr "אזהרה של %s  אינה מותרת."
-
 #~ msgid ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
 #~ msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
-
 #~ msgid "Chat in %s is not available."
 #~ msgstr "צ'אט ב-%s אינו זמין."
-
 #~ msgid "You are sending messages too fast to %s."
 #~ msgstr "אתה שולח הודעות אל %s מהר מדיי."
-
 #~ msgid "You missed an IM from %s because it was too big."
 #~ msgstr "פספסת הודעה מ-%s כיוון שהיא הייתה ארוכה מדי."
-
 #~ msgid "You missed an IM from %s because it was sent too fast."
 #~ msgstr "פספסת הודעה מ-%s כיוון שהיא נשלחה מהר מדי."
-
 #~ msgid "Failure."
 #~ msgstr "כישלון."
-
 #~ msgid "Too many matches."
 #~ msgstr "יותר מידי תוצאות"
-
 #~ msgid "Need more qualifiers."
 #~ msgstr "החיפוש זקוק ליותר מגדירים."
-
 #~ msgid "Dir service temporarily unavailable."
 #~ msgstr "שירות המדריך אינו זמין זמנית."
-
 #~ msgid "Email lookup restricted."
 #~ msgstr "חיפוש הדוא\"ל מוגבל."
-
 #~ msgid "Keyword ignored."
 #~ msgstr "יתעלם ממילת המפתח."
-
 #~ msgid "No keywords."
 #~ msgstr "אין מילות מפתח."
-
 #~ msgid "User has no directory information."
 #~ msgstr "אין מידע עבור משתמש זה"
-
 #~ msgid "Country not supported."
 #~ msgstr "המדינה אינה נתמכת."
-
 #~ msgid "Failure unknown: %s."
 #~ msgstr "כשל מוכר: %s"
-
 #~ msgid "Incorrect username or password."
 #~ msgstr "שם משתמש או סיסמא שגויים."
-
 #~ msgid "The service is temporarily unavailable."
 #~ msgstr "השירות אינו זמין זמנית."
-
 #~ msgid "Your warning level is currently too high to log in."
 #~ msgstr "רמת האזהרה שלך גבוהה מדיי כרגע מכדי להיכנס למערכת."
-
 #~ msgid ""
 #~ "You have been connecting and disconnecting too frequently.  Wait ten "
 #~ "minutes and try again.  If you continue to try, you will need to wait "
@@ -14409,93 +13557,64 @@
 #~ msgstr ""
 #~ "התחברת והתנתקת בתדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך "
 #~ "לנסות, תיאלץ להמתין אפילו יותר."
-
 #~ msgid "An unknown signon error has occurred: %s."
 #~ msgstr "ארעה שגיאה לא ידועה בזמן ניסיון לפתיחת %s"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "ארעה שגיאה לא מוכרת, %d, מידע: %s"
-
 #~ msgid "Invalid Groupname"
 #~ msgstr "שם הקבוצה שגוי"
-
 #~ msgid "Connection Closed"
 #~ msgstr "החיבור נסגר."
-
 #~ msgid "Waiting for reply..."
 #~ msgstr "ממתין לתשובה..."
-
 #~ msgid "TOC has come back from its pause. You may now send messages again."
 #~ msgstr "TOC חזר מן ה-pause שלו. ניתן לשלוח הודעות שוב."
-
 #~ msgid "Password Change Successful"
 #~ msgstr "הסיסמה שלך שונתה בהצלחה."
-
 #~ msgid "Get Dir Info"
 #~ msgstr "השג מידע על המשתמש"
-
 #~ msgid "Set Dir Info"
 #~ msgstr "קבע מידע על המשתמש"
-
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "לא ניתן לפתוח %s לכתיבה"
-
 #~ msgid "File transfer failed; other side probably canceled."
 #~ msgstr "כשל בהעברת הקובץ, כנראה צד שני ביטל"
-
 #~ msgid "Could not connect for transfer."
 #~ msgstr "לא ניתן לחבר את ההעברה."
-
 #~ msgid "Could not write file header.  The file will not be transferred."
 #~ msgstr "לא ניתן לכתוב את רישת הקובץ. הקובץ לא יועבר."
-
 #~ msgid "Save As..."
 #~ msgstr "שמור בשם..."
-
 #~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 #~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 #~ msgstr[0] "%s מבקש מ-%s לקבל %d קובץ: %s (%.2f %s)%s%s"
 #~ msgstr[1] "%s מבקש מ-%s לקבל %d קבצים: %s (%.2f %s)%s%s"
-
 #~ msgid "%s requests you to send them a file"
 #~ msgstr "%s מבקש/ת ממך לשלוח לו/לה קובץ"
-
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "תוסף פרוטוקול TOC"
-
 #~ msgid "User information for %s unavailable"
 #~ msgstr "פרטי המשתמש %s אינם זמינים"
-
 #~ msgid "%s Options"
 #~ msgstr "%s אפשרויות"
-
 #~ msgid "Proxy Options"
 #~ msgstr "אפשרויות פרוקסי"
-
 #~ msgid "By log size"
 #~ msgstr "לפי גודל יומן השיחות"
-
 #~ msgid "_Open Link in Browser"
 #~ msgstr "_פתח את הקישור בדפדפן"
-
 #~ msgid "ST_UN server:"
 #~ msgstr "שרת STUN:"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "_תמונת חייכן"
-
 #~ msgid "Smiley S_hortcut"
 #~ msgstr "קיצורים ל_חייכנים"
-
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
-
 #~ msgid "A group with the name already exists."
 #~ msgstr "קבוצה בשם זה כבר קיימת."
-
 #~ msgid "Primary Information"
 #~ msgstr "מידע ראשי"
-
 #~ msgid "Blood Type"
 #~ msgstr "סוג דם"
 
@@ -14506,21 +13625,16 @@
 #, fuzzy
 #~ msgid "Successed:"
 #~ msgstr "מהירות:"
-
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr "אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך %s."
-
 #~ msgid "Invalid QQ Face"
 #~ msgstr "פרצוף QQ לא תקף"
-
 #~ msgid "You rejected %d's request"
 #~ msgstr "דחית את בקשת %d"
-
 #~ msgid "Reject request"
 #~ msgstr "דחה בקשה"
-
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "כישלון בהוספת איש-קשר עם בקשת אימות"
 
@@ -14531,13 +13645,10 @@
 #, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "מספר QQ"
-
 #~ msgid "Group Description"
 #~ msgstr "תיאור הקבוצה"
-
 #~ msgid "Auth"
 #~ msgstr "אימות"
-
 #~ msgid "Approve"
 #~ msgstr "אשר"
 
@@ -14552,30 +13663,24 @@
 #, fuzzy
 #~ msgid "[%d] added to Qun \"%d\""
 #~ msgstr "את/ה [%d] נוספת אל הקבוצה \"%d\""
-
 #~ msgid "I am a member"
 #~ msgstr "אני הנני חבר/ה"
 
 #, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "בקשה שגויה"
-
 #~ msgid "I am the admin"
 #~ msgstr "אני המנהל/ת"
-
 #~ msgid "Unknown status"
 #~ msgstr "מצב לא ידוע"
 
 #, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "הסר קבוצה"
-
 #~ msgid "You entered a group ID outside the acceptable range"
 #~ msgstr "הזנת מזהה-קבוצה מחוץ לטווח התקף"
-
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "האם ברצונך לעזוב את Qun זה?"
-
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "האם ברצונך לאשר את הבקשה?"
 
@@ -14586,26 +13691,20 @@
 #, fuzzy
 #~ msgid "Change Qun information"
 #~ msgstr "מידע על הערוץ"
-
 #~ msgid "System Message"
 #~ msgstr "הודעת מערכת"
-
 #~ msgid "<b>Last Login IP</b>: %s<br>\n"
 #~ msgstr "<b>כתובת חיבור אחרונה</b>: %s<br>\n"
-
 #~ msgid "<b>Last Login Time</b>: %s\n"
 #~ msgstr "<b>זמן חיבור אחרון</b>: %s\n"
-
 #~ msgid "Set My Information"
 #~ msgstr "קבע את המידע שלי"
 
 #, fuzzy
 #~ msgid "Leave the QQ Qun"
 #~ msgstr "עזוב QQ Qun זה"
-
 #~ msgid "Block this buddy"
 #~ msgstr "חסום משתמש זה"
-
 #~ msgid "Invalid token reply code, 0x%02X"
 #~ msgstr "קוד-תגובה שגוי, 0x%02X"
 
@@ -14616,7 +13715,6 @@
 #, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "כישלון בהתחברות לשרת"
-
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "מתחבר עם שרת %s, ניסיונות %d"
 
@@ -14635,7 +13733,6 @@
 #, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "איש הקשר"
-
 #~ msgid "%s wants to add you [%s] as a friend"
 #~ msgstr "%s רוצה להוסיף אותך [%s] כחבר"
 
@@ -14646,7 +13743,6 @@
 #, fuzzy
 #~ msgid "Would you add?"
 #~ msgstr "האם ברצונך להוסיף אותו?"
-
 #~ msgid "%s"
 #~ msgstr "%s"
 
@@ -14657,166 +13753,116 @@
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "הצד המרוחק מנותק"
-
 #~ msgid "developer"
 #~ msgstr "מפתח"
-
 #~ msgid "XMPP developer"
 #~ msgstr "מפתח XMPP"
-
 #~ msgid "Artists"
 #~ msgstr "אמנים"
-
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
 #~ msgstr ""
 #~ "%s שבשימוש הוא גירסא %s. הגירסא הנוכחית היא %s.  ניתן להשיג אותה מ-<a "
 #~ "href=\"%s\">%s</a><hr>"
-
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "<b>רשימת שינויים:</b><br>%s"
-
 #~ msgid "EOF while reading from resolver process"
 #~ msgstr "קבלת סיום-קובץ בעת קריאה מתהליך ה-resolver"
-
 #~ msgid "Your information has been updated"
 #~ msgstr "המידע שלך עודכן"
-
 #~ msgid "Input your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
-
 #~ msgid "You have successfully removed a buddy"
 #~ msgstr "הסרת איש-קשר בהצלחה"
-
 #~ msgid "You have successfully removed yourself from your friend's buddy list"
 #~ msgstr "הסרת את עצמך בהצלחה מרשימת אנשי הקשר של חברך"
-
 #~ msgid "You have added %d to buddy list"
 #~ msgstr "הוספת את %d לרשימת אנשי-קשר"
-
 #~ msgid "Invalid QQid"
 #~ msgstr "QQid לא תקף"
-
 #~ msgid "Please enter external group ID"
 #~ msgstr "יש להזין ID של הקבוצה החיצונית"
-
 #~ msgid "Reason: %s"
 #~ msgstr "סיבה: %s"
-
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "בקשתך להצטרף לקבוצה %d אושרה על ידי המנהל %d"
-
 #~ msgid "I am applying to join"
 #~ msgstr "אני מבקש/ת להצטרף"
-
 #~ msgid "You have successfully left the group"
 #~ msgstr "עבת את הקבוצה בהצלחה "
-
 #~ msgid "QQ Group Auth"
 #~ msgstr "אימות לקבוצת QQ"
-
 #~ msgid "Your authorization request has been accepted by the QQ server"
 #~ msgstr "בקשת האימות שלך התקבלה בחיוב על ידי שרת ה-QQ"
-
 #~ msgid "Enter your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
-
 #~ msgid " Space"
 #~ msgstr " ספייס"
-
 #~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
 #~ msgstr "<b>שם מחשב אמיתי</b>: %s: %d<br>\n"
-
 #~ msgid "Show Login Information"
 #~ msgstr "הצג מידע על החיבור"
-
 #~ msgid "resend interval(s)"
 #~ msgstr "פרק זמן בין שליחות חוזרות"
-
 #~ msgid "hostname is NULL or port is 0"
 #~ msgstr "שם המחשב ריק, או מספר השקע 0"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
-
 #~ msgid "Failed room reply"
 #~ msgstr "כשל במשוב מהחדר"
-
 #~ msgid "User %s rejected your request"
 #~ msgstr "המשתמש %s סרב לבקשתך"
-
 #~ msgid "User %s approved your request"
 #~ msgstr "המשתמש %s אישר את בקשתך"
-
 #~ msgid "Notice from: %s"
 #~ msgstr "הודעה מאת: %s"
-
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "קוד [0x%02X]: %s"
-
 #~ msgid "Group Operation Error"
 #~ msgstr "שגיאה בפעולת-קבוצה"
-
 #~ msgid "Error setting socket options"
 #~ msgstr "שגיאה בקביעת הגדרות השקע"
-
 #~ msgid ""
 #~ "Windows Live ID authentication: cannot find authenticate token in server "
 #~ "response"
 #~ msgstr "אימות מזהה Windows Live: לא ניתן למצוא סמל אימות בתגובת השרת"
-
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "אימות מזהה Windows Live נכשלה"
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "השולח מרושע מדי"
-
 #~ msgid "Too evil (receiver)"
 #~ msgstr "המקבל מרושע מדי"
-
 #~ msgid "Available Message"
 #~ msgstr "הודעת זמינות"
-
 #~ msgid "Away Message"
 #~ msgstr "הודעת ריחוק מהמחשב"
-
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(שולף)</i>"
-
 #~ msgid "TCP Address"
 #~ msgstr "כתובת TCP"
-
 #~ msgid "UDP Address"
 #~ msgstr "כתובת UDP"
 
 #, fuzzy
 #~ msgid "Display Statistics"
 #~ msgstr "סטטיסטיקות של השרת"
-
 #~ msgid "Screen name:"
 #~ msgstr "שם לתצוגה:"
-
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "מישהו מזכיר את שמך בצ'אט"
-
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
 #~ msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת.להמשיך בכל זאת?"
-
 #~ msgid "Use GSSAPI (Kerberos v5) for authentication"
 #~ msgstr "השתמש בGSSAPI (קרברוס גירסה 5) לצורך אימות"
-
 #~ msgid "Invalid screen name"
 #~ msgstr "שם לתצוגה לא תקין"
-
 #~ msgid "Invalid screen name."
 #~ msgstr "שם-תצוגה לא תקין."
-
 #~ msgid "Screen _name:"
 #~ msgstr "שם לתצוגה:"
-
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -14825,10 +13871,10 @@
 #~ "%s%s<span weight=\"bold\">נכתב ע\"י:</span>\t%s\n"
 #~ "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
-
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
 #~ msgstr ""
 #~ "התוסף לניבוי זמינות אנשי-קשר מציג מידע סטטיסטי על החברים ברשימת אנשי הקשר "
 #~ "של המשתמש."
+
--- a/po/hu.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/hu.po	Wed Aug 19 00:37:01 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-31 12:01+0200\n"
-"PO-Revision-Date: 2009-07-31 11:58+0200\n"
+"POT-Creation-Date: 2009-08-14 20:04+0200\n"
+"PO-Revision-Date: 2009-08-14 19:58+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -1787,6 +1787,7 @@
 msgstr "+++ %s kilépett"
 
 #. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -3922,14 +3923,12 @@
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4685,9 +4684,6 @@
 msgid "Transfer was closed."
 msgstr "Az átvitel lezárva."
 
-msgid "Failed to open the file"
-msgstr "Nem sikerült megnyitni a fájlt"
-
 msgid "Failed to open in-band bytestream"
 msgstr "A bejövő adatfolyam megnyitása meghiúsult"
 
@@ -12201,7 +12197,7 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 "A %s %s összeomlott és megpróbált kiírni egy magfájlt.\n"
-"Ez a szoftver és nem az Ön hibája miatt történt.\n"
+"Ez a szoftver, és nem az Ön hibája miatt történt.\n"
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
@@ -12239,6 +12235,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s videókapcsolatot szeretne indítani."
 
+msgid "Incoming Call"
+msgstr "Bejövő hívás"
+
+msgid "_Pause"
+msgstr "_Szünet"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13178,9 +13180,6 @@
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"
 
-msgid "_Pause"
-msgstr "_Szünet"
-
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
@@ -14316,6 +14315,3 @@
 msgstr ""
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
-
-#~ msgid "_Resume"
-#~ msgstr "_Folytatás"
--- a/po/it.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/it.po	Wed Aug 19 00:37:01 2009 +0000
@@ -1,6 +1,6 @@
 # Pidgin Italian translation
 # Copyright (C) 2002, Salvatore di Maggio <titanicus@libero.it>
-# Copyright (C) 2003-2008, Claudio Satriano <satriano@na.infn.it>
+# Copyright (C) 2003-2009, Claudio Satriano <satriano@na.infn.it>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-08-26 14:12+0100\n"
+"POT-Creation-Date: 2009-08-05 09:08-0700\n"
+"PO-Revision-Date: 2009-08-05 14:56+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -71,7 +71,6 @@
 msgid "Remember password"
 msgstr "Ricorda la password"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "Non c'è nessun plugin per i protocolli installato."
 
@@ -277,7 +276,7 @@
 msgstr "Bloccato"
 
 msgid "Show when offline"
-msgstr "Mostra quando non sei in linea"
+msgstr "Mostra quando non è in linea"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -829,7 +828,7 @@
 msgstr "Conversazioni con %s su %s"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
@@ -875,12 +874,11 @@
 msgid "System Log"
 msgstr "Log di sistema"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Calcolo in corso..."
+msgstr "Chiamata in corso..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Riaggancia"
 
 #. Number of actions
 msgid "Accept"
@@ -890,25 +888,25 @@
 msgstr "Rifiuta"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Chiamata in corso."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "La chiamata è stata terminata."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s desidera avviare una sessione audio con te."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-
-#, fuzzy
+"%s sta cercando di avviare una sessione multimediale non supportata con te."
+
 msgid "You have rejected the call."
-msgstr "Hai abbandonato il canale%s%s"
+msgstr "Hai rifiutato la chiamata."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: Fai una chiamata audio."
 
 msgid "Emails"
 msgstr "Email"
@@ -1427,16 +1425,17 @@
 "supporto X11."
 
 msgid "GntClipboard"
-msgstr ""
-
-#, fuzzy
+msgstr "Appunti gnt"
+
 msgid "Clipboard plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin appunti"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Quando il contenuto degli appunti gnt cambia, queso è reso disponibile a X, "
+"se possibile."
 
 #, c-format
 msgid "%s just signed on"
@@ -1470,9 +1469,8 @@
 msgid "Someone says your name in a chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
-#, fuzzy
 msgid "Notify with a toaster when"
-msgstr "Segnala ai contatti che stai scrivendo"
+msgstr "Notifica con un popup quando"
 
 msgid "Beep too!"
 msgstr "Emetti anche un bip!"
@@ -1483,9 +1481,8 @@
 msgid "GntGf"
 msgstr "GntGf"
 
-#, fuzzy
 msgid "Toaster plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin popup"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
@@ -1506,9 +1503,8 @@
 "L'abilitazione del log per i messaggi immediati e/o per le chat attiverà lo "
 "storico per il corrispondente tipo di conversazione."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "Storico"
+msgstr "Storico gnt"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
@@ -1544,10 +1540,10 @@
 msgstr "Nessun raggruppamento"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Sottogruppo annidato"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Raggruppamento annidato (sperimentale)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr ""
@@ -1560,9 +1556,8 @@
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: cerca una sottostringa nel registro della conversazione."
 
-#, fuzzy
 msgid "GntLastlog"
-msgstr "Storico"
+msgstr "Lastlog gnt"
 
 msgid "Lastlog plugin."
 msgstr "Plugin Lastlog"
@@ -1572,22 +1567,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Recupero del TinyURL in corso..."
 
 msgid "Only create TinyURL for urls of this length or greater"
 msgstr ""
+"Crea un TinyURL solamente per indirizzi di lunghezza maggiore o uguale alla "
+"seguente"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefisso per gli indirizzi TinyURL (o altri)"
+
 msgid "TinyURL"
-msgstr "URL del brano"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Plugin TinyURL"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"Quando ricevi un messaggio con degli URL, trasformali in TinyURL per poterli "
+"copiare più facilmente"
 
 msgid "accounts"
 msgstr "account"
@@ -1693,6 +1693,45 @@
 msgid "_View Certificate..."
 msgstr "_Visualizza certificato..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
+"Questo può significare che non ti stai connettendo al servizio al quale "
+"credi."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "Errore certificato SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Catena di certificati non valida"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Non hai alcun database di certificati root. Pertanto, questo certificato non "
+"può essere validato."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1703,29 +1742,11 @@
 "Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
 "verificato automaticamente."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La catena di certificati presentata per %s non è valida."
 
-#. 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 "Errore certificato SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Catena di certificati non valida"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Non hai alcun database di certificati root. Pertanto, questo certificato non "
-"può essere validato."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1745,19 +1766,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Firma dell'autorità per i certificati non valida"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
-"Questo può significare che non ti stai connettendo al servizio al quale "
-"credi."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1794,7 +1802,7 @@
 msgstr "+++ %s si è disconnesso"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -1841,9 +1849,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s ha abbandonato la stanza (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invita in conferenza"
+msgstr "Invita in chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -1866,9 +1873,7 @@
 msgstr "Impossibile ottenere il nome del server: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-"Il server D-BUS di Purple non è in esecuzione per il motivo indicato di "
-"seguito"
+msgstr "Il server D-BUS di Purple non è in esecuzione per il seguente motivo"
 
 msgid "No name"
 msgstr "Nessun nome"
@@ -1902,6 +1907,8 @@
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
+"Il processo del resolver DNS è terminato senza fornire una risposta alla "
+"nostra richiesta"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1987,6 +1994,10 @@
 msgstr "Inizio del trasferimento di %s da %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Trasferimento del file <A HREF=\"file://%s\">%s</A> completato"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Trasferimento del file %s completato"
 
@@ -2203,9 +2214,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Errore nella creazione della connessione"
+msgstr "Errore nella creazione della conferenza."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2358,7 +2368,7 @@
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Verifica le cifre fornite con libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2478,7 +2488,7 @@
 msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Applica le regole per nascondere i contatti"
 
 #. *< type
 #. *< ui_requirement
@@ -2614,7 +2624,6 @@
 msgstr "Consente di visualizzare i log di altri client MI."
 
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2622,8 +2631,8 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Quando si visualizzano i log, questo plugin include i log da altri client "
-"MI. Al momento sono supportati Adium, MSN Messenger e Trillian.\n"
+"Quando si visualizzano i log, questo plugin includerà i log da altri client "
+"di MI. Al momento sono supportati Adium, MSN Messenger, aMSN e Trillian.\n"
 "\n"
 "ATTENZIONE: questo plugin è ancora in versione alfa e potrebbe andare in "
 "crash frequentemente. Utilizzalo a tuo rischio e pericolo!"
@@ -2672,12 +2681,11 @@
 msgstr ""
 "Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/"
+"Il resto del messaggio sarà salvato sotto forma di allarmi. Puoi modificare/"
 "cancellare l'allarme dalla finestra 'Allarmi'."
 
 #, c-format
@@ -2707,9 +2715,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Non chiedere. Salva sempre come allarme."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Inserisci la password"
+msgstr "Password non riutilizzabile"
 
 #. *< type
 #. *< ui_requirement
@@ -2718,13 +2725,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Supporto per password non riutilizzabile"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Obbliga ad utilizzare le password una sola volta."
 
 #. *  description
 msgid ""
@@ -2732,6 +2739,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Consente di richiedere in maniera obbligatoria, per uno o più account, che "
+"le password non salvate siano usate soltanto per una sola connessione.\n"
+"Nota: è necessario che la password dell'account non sia salvata."
 
 #. *< type
 #. *< ui_requirement
@@ -2925,17 +2935,15 @@
 "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin "
 "TCL, installa ActiveTCL da http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: "
-"http://d.pidgin.im/BonjourWindows per maggiori informazioni."
-
-#, fuzzy
+"Il toolkit di Apple \"Bonjour per Windows\" non è stato trovato. Leggi le "
+"FAQ su: http://d.pidgin.im/BonjourWindows per maggiori informazioni."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
+msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2975,9 +2983,8 @@
 msgstr "Persona Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Località"
+msgstr "Porta locale"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2990,21 +2997,17 @@
 msgstr ""
 "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile creare il socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Impossibile associare il socket alla porta"
-
-#, fuzzy, c-format
+msgstr "Impossibile associare il socket alla porta: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
+msgstr "Impossibile mettersi in ascolto sul socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Errore di comunicazione con il responder mDNS locale."
@@ -3051,17 +3054,14 @@
 msgid "Load buddylist from file..."
 msgstr "Importa la lista contatti da file..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Riempi i campi per la registrazione."
-
-#, fuzzy
+msgstr "Devi riempire tutti i campi per la registrazione"
+
 msgid "Passwords do not match"
-msgstr "Le password non coincidono."
-
-#, fuzzy
+msgstr "Le password non coincidono"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Impossibile registrare il nuovo account. Si è verificato un errore.\n"
+msgstr "Impossibile registrare il nuovo account. Si è verificato un errore."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuovo account Gadu-Gadu registrato"
@@ -3076,11 +3076,10 @@
 msgstr "Password (di nuovo)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Inserire il testo captcha"
+
 msgid "Captcha"
-msgstr "Salva l'immagine"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
@@ -3219,9 +3218,9 @@
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Impossibile connettersi al server."
+msgstr "Impossibile risolvere il nome host '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3234,9 +3233,8 @@
 msgid "This chat name is already in use"
 msgstr "Questo nome chat è già in uso"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Non connesso al server."
+msgstr "Non connesso al server"
 
 msgid "Find buddies..."
 msgstr "Cerca contatti..."
@@ -3277,9 +3275,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utente Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Imposta le informazioni utente..."
+msgstr "Server GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3295,7 +3292,6 @@
 msgid "File Transfer Failed"
 msgstr "Trasferimento file fallito"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
@@ -3319,11 +3315,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 ""
-"Connessione persa col server:\n"
-"%s"
+msgstr "Connessione persa col server: %s"
 
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
@@ -3334,9 +3328,8 @@
 msgid "_Password:"
 msgstr "_Password:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "I nick IRC non devono contenere spazi bianchi"
+msgstr "Il nick IRC e il nome del server non devono contenere spazi bianchi"
 
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
@@ -3345,13 +3338,13 @@
 msgstr "Impossibile connettersi"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Impossibile connettersi a %s"
-
-#, fuzzy, c-format
+msgstr "Impossibile connettersi: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Il server ha chiuso la connessione."
+msgstr "Il server ha chiuso la connessione"
 
 msgid "Users"
 msgstr "Utenti"
@@ -3536,13 +3529,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 "Questo nome chat è già in uso"
-
-#, fuzzy
+msgstr "Il nickname \"%s\" è già in uso."
+
 msgid "Nickname in use"
-msgstr "Nickname"
+msgstr "Nickname già in uso"
 
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
@@ -3639,8 +3631,9 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. "
-"Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
+"list: Mostra la lista delle stanze di discussione presenti sulla rete. "
+"<i>Attenzione. Alcuni server potrebbero disconnetterti dopo questo comando.</"
+"i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
@@ -3783,12 +3776,9 @@
 msgid "execute"
 msgstr "esegui"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
-
-#, fuzzy
+msgstr "Il server richiede TLS/SSL. Nessun supporto TLS/SSL trovato."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
@@ -3809,13 +3799,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autenticazione fallita"
-
-#, fuzzy
+msgstr "Autenticazione SASL fallita"
+
 msgid "Invalid response from server"
-msgstr "Risposta non valida da parte del server."
+msgstr "Risposta non valida da parte del server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Il server non usa nessun metodo di autenticazione supportato"
@@ -3826,36 +3814,28 @@
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Errore SASL"
+msgstr "Errore SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Il gestore di connessione BOSH ha terminato la tua sessione."
+
 msgid "No session ID given"
-msgstr "Nessun motivo fornito."
-
-#, fuzzy
+msgstr "Nessun ID di sessione fornito"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versione non supportata"
-
-#, fuzzy
+msgstr "Versione del protocollo BOSH non supportata"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile stabilire una connessione con il server"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
-
-#, fuzzy
+msgstr "Impossibile stabilire una connessione con il server: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Impossibile inizializzare la connessione"
+msgstr "Impossibile stabilire una connessione SSL"
 
 msgid "Full Name"
 msgstr "Nome"
@@ -3872,6 +3852,11 @@
 msgid "Street Address"
 msgstr "Indirizzo"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
@@ -3923,9 +3908,8 @@
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "File locale:"
+msgstr "Ora locale"
 
 msgid "Priority"
 msgstr "Priorità"
@@ -3935,11 +3919,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s fa"
+
 msgid "Logged Off"
-msgstr "Connesso"
+msgstr "Si è disconnesso"
 
 msgid "Middle Name"
 msgstr "Secondo nome"
@@ -3962,14 +3945,12 @@
 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Elimina la notifica di presenza"
 
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3982,10 +3963,10 @@
 msgstr "Disconnetti"
 
 msgid "Chatty"
-msgstr "È in chat"
+msgstr "In chat"
 
 msgid "Extended Away"
-msgstr "Ancora assente"
+msgstr "Assente per molto"
 
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
@@ -4051,11 +4032,11 @@
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "_Handle:"
+msgstr "_Identificativo:"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s non è un nome della stanza valido"
+msgstr "%s non è un nome di stanza valido"
 
 msgid "Invalid Room Name"
 msgstr "Nome della stanza non valido"
@@ -4069,10 +4050,10 @@
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s non è un gestore della stanza valido"
+msgstr "%s non è un identificativo di stanza valido"
 
 msgid "Invalid Room Handle"
-msgstr "Handle della stanza non valido"
+msgstr "Identificativo di stanza non valido"
 
 msgid "Configuration error"
 msgstr "Errore di configurazione"
@@ -4090,7 +4071,8 @@
 msgstr "Errore di registrazione"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "La modifica del nick non è supportata nelle chat room non MUC"
+msgstr ""
+"La modifica del nick non è supportata nelle stanze di discussione non MUC"
 
 msgid "Error retrieving room list"
 msgstr "Errore nella ricezione della lista delle stanze"
@@ -4107,26 +4089,24 @@
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Affiliazioni:"
+
 msgid "No users found"
-msgstr "Non è stato trovato nessun utente corrispondente"
-
-#, fuzzy
+msgstr "Nessun utente trovato"
+
 msgid "Roles:"
-msgstr "Ruolo"
-
-#, fuzzy
+msgstr "Ruoli:"
+
 msgid "Ping timed out"
-msgstr "Timeout per il ping"
+msgstr "Ping scaduto"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Impossibile trovare metodi alternativi per la connessione XMPP, dal momento "
+"che la connessione diretta è fallita."
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMMP non valido"
@@ -4134,9 +4114,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Impossibile connettersi al server."
+msgstr "Formato URL BOSH non valido"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4204,10 +4183,6 @@
 msgid "Change Registration"
 msgstr "Modifica la registrazione"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Impossibile connettersi al server."
-
 msgid "Error unregistering account"
 msgstr "Errore nella rimozione dell'account"
 
@@ -4227,7 +4202,7 @@
 msgstr "Reinizializzazione dello stream"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Il server non supporta il blocco"
 
 msgid "Not Authorized"
 msgstr "Non autorizzato"
@@ -4242,16 +4217,16 @@
 msgstr "Entrambi"
 
 msgid "From (To pending)"
-msgstr "Da (In attesa di \"Per\")"
+msgstr "Da (In attesa di \"Verso\")"
 
 msgid "From"
 msgstr "Da"
 
 msgid "To"
-msgstr "Per"
+msgstr "Verso"
 
 msgid "None (To pending)"
-msgstr "Nessuna (In attesa di \"Per\")"
+msgstr "Nessuna (In attesa di \"Verso\")"
 
 msgid "None"
 msgstr "Nessuno"
@@ -4259,9 +4234,8 @@
 msgid "Subscription"
 msgstr "Sottoscrizione"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "Testo identificato"
+msgstr "Messaggio di umore"
 
 msgid "Allow Buzz"
 msgstr "Permetti i buzz"
@@ -4400,9 +4374,8 @@
 msgid "Bad Format"
 msgstr "Formato non valido"
 
-#, fuzzy
 msgid "Bad Namespace Prefix"
-msgstr "<Inode numero 1>"
+msgstr "Prefisso del namespace non corretto"
 
 msgid "Resource Conflict"
 msgstr "Conflitto di risorsa"
@@ -4495,21 +4468,23 @@
 msgid "Unable to ping user %s"
 msgstr "Impossibile fare ping sull'utente %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Impossibile richiamare %s con un buzz: non conosco nulla dell'utente."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Impossibile richiamare %s con un buzz: l'utente potrebbe non essere in "
 "linea. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Impossibile richiamare %s con un buzz: l'utente non lo supporta."
+msgstr ""
+"Impossibile richiamare %s con un buzz: l'utente non supporta questa "
+"caratteristica oppure non desidera ricevere buzz al momento."
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4524,46 +4499,48 @@
 msgid "%s has buzzed you!"
 msgstr "%s ti ha richiamato con un buzz!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Impossibile inviare il file a %s. JID non valido"
-
-#, fuzzy, c-format
+msgstr "Impossibile avviare una sessione multimediale con %s: JID non valido"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
-
-#, fuzzy, c-format
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: l'utente non è in linea"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
-
-#, fuzzy
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: non sei iscritto alla "
+"presenza dell'utente"
+
 msgid "Media Initiation Failed"
-msgstr "Registrazione fallita"
-
-#, fuzzy, c-format
+msgstr "Avvio sessione multimediale fallito"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Scegli a quale risorsa di %s vuoi inviare un file"
+msgstr ""
+"Scegli la risorsa per %s con la quale vuoi avviare una sessione multimediale"
 
 msgid "Select a Resource"
 msgstr "Scegli una risorsa"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Inizia una _chat"
+msgstr "Avvia sessione multimediale"
 
 msgid "config:  Configure a chat room."
-msgstr "config: Configura una chat room."
+msgstr "config: Configura una stanza di discussione."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: Configura una chat room."
+msgstr "configure: Configura una stanza di discussione."
 
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
 msgid "register:  Register with a chat room."
-msgstr "register: Iscrizione ad una chat room."
+msgstr "register: Iscriviti ad una stanza di discussione."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
@@ -4571,21 +4548,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [motivo]: Allontana un utente dalla stanza."
 
-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;utente&gt; &lt;owner|admin|member|outcast|none&gt;: Imposta "
-"un'affiliazione per l'utente nella stanza."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"Ottieni il nome degli utenti con una certa affiliazione oppure imposta "
+"l'affiliazione degli utenti con la stanza."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;utente&gt; &lt;moderator|participant|visitor|none&gt;: Imposta un "
-"ruolo per l'utente nella stanza."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...:  "
+"Ottieni il nome degli utenti con un certo ruolo oppure imposta il ruolo "
+"degli utenti con la stanza."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
@@ -4649,11 +4626,10 @@
 msgstr "Server proxy per il trasferimento file"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
 msgstr "Mostra gli smiley personalizzati"
 
@@ -4714,32 +4690,29 @@
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Nessun motivo fornito."
-
-#, fuzzy, c-format
+msgstr "Nessun motivo"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Sei stato cacciato da %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Sei stato cacciato: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Cacciato da %s: (%s)"
-
-#, fuzzy
+msgstr "Cacciato (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "C'è stato un errore nell'apertura del file."
-
-#, fuzzy
+msgstr ""
+"Si è verificato un errore nel trasferimento del flusso di dati in-band\n"
+
 msgid "Transfer was closed."
-msgstr "Trasferimento file fallito"
-
-#, fuzzy
+msgstr "Il trasferimento è stato chiuso."
+
 msgid "Failed to open the file"
-msgstr "Impossibile aprire il file '%s': %s"
+msgstr "Impossibile aprire il file"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Impossibile aprire il flusso di byte in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4757,9 +4730,10 @@
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
+msgstr ""
+"Impossibile inviare il file a %s. Non iscritto alla presenza dell'utente"
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
@@ -4807,11 +4781,10 @@
 msgstr "Impossibile aggiungere \"%s\"."
 
 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "Errore nell'aggiungere il contatto"
+
 msgid "The username specified does not exist."
-msgstr "Il nome utente specificato non è valido."
+msgstr "Il nome utente specificato non esiste."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4927,7 +4900,7 @@
 
 #, c-format
 msgid "Too many hits to a FND"
-msgstr ""
+msgstr "Troppe risposte ad un FND"
 
 #, c-format
 msgid "Not logged in"
@@ -5005,9 +4978,9 @@
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Bad friend file"
-msgstr "Invia un file a %s"
+msgstr ""
 
 #, c-format
 msgid "Not expected"
@@ -5041,9 +5014,8 @@
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "Profilo Passport non ancora verificato"
+msgstr "Account Passport sospeso"
 
 #, c-format
 msgid "Bad ticket"
@@ -5057,18 +5029,35 @@
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Contatti preferiti"
-
-#, fuzzy
+msgstr "Altri contatti"
+
 msgid "Non-IM Contacts"
-msgstr "Rimuovi lista"
-
-#, fuzzy, c-format
+msgstr "Contatti non-MI"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un wink. <a href='msn-wink://%s'>Fai clic per riprodurlo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ha inviato un wink, ma non può essere salvato"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un clip vocale. <a href='audio://%s'>Fai clic per riprodurlo</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ha inviato un clip vocale, ma non può essere salvato"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+"%s ti ha inviato un invito alla chat vocale. Questa caratteristica non è "
 "ancora supportata."
 
 msgid "Nudge"
@@ -5143,11 +5132,10 @@
 msgstr "Page"
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "Giocando"
+
 msgid "Working"
-msgstr "Lavoro"
+msgstr "Al lavoro"
 
 msgid "Has you"
 msgstr "Sei nella sua lista"
@@ -5185,13 +5173,11 @@
 msgid "Album"
 msgstr "Album"
 
-#, fuzzy
 msgid "Game Title"
-msgstr "Titolo del brano"
-
-#, fuzzy
+msgstr "Nome del gioco"
+
 msgid "Office Title"
-msgstr "Titolo del brano"
+msgstr "Nome del lavoro"
 
 msgid "Set Friendly Name..."
 msgstr "Imposta un alias..."
@@ -5227,6 +5213,29 @@
 msgstr ""
 "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I "
+"nomi utente devono essere indirizzi email validi."
+
+msgid "Unable to Add"
+msgstr "Impossibile aggiungere"
+
+msgid "Authorization Request Message:"
+msgstr "Messaggio di richiesta di autorizzazione:"
+
+msgid "Please authorize me!"
+msgstr "Mi autorizzi, per favore?"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
@@ -5382,9 +5391,8 @@
 "Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente "
 "l'utente non esiste."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "Nascondi quando non sei in linea"
+msgstr "Mostra il profilo web"
 
 #. *< type
 #. *< ui_requirement
@@ -5420,20 +5428,20 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s ti ha appena inviato un trillo!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Errore sconosciuto (%d)"
+msgstr "Errore sconosciuto (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Impossibile aggiungere l'utente"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Errore sconosciuto (%d)"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "Ecco i risultati della tua ricerca"
+msgstr "I seguenti utenti non sono presenti nella tua rubrica"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Il messaggio mobile non è stato inviato perché è troppo lungo."
@@ -5500,24 +5508,20 @@
 "Errore di connessione dal server %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Il nostro protocollo non è supportato dal server."
-
-#, fuzzy
+msgstr "Il nostro protocollo non è supportato dal server"
+
 msgid "Error parsing HTTP"
-msgstr "Errore di parsing HTTP."
-
-#, fuzzy
+msgstr "Errore di parsing HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Sei connesso da un'altra postazione."
+msgstr "Sei connesso da un'altra postazione"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova più tardi."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "I server MSN sono temporaneamente disattivi."
+msgstr "I server MSN sono temporaneamente disattivi"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5547,11 +5551,11 @@
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
-"ancora supportata."
+"%s chiede di vedere il tuo video, ma questa caratteristica non è ancora "
+"supportata."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5604,13 +5608,11 @@
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Aggiungi alla rubrica"
-
-#, fuzzy
+msgstr "Rimuovere il contatto dalla Rubrica?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Vuoi aggiungere questo contatto alla tua lista?"
+msgstr "Vuoi cancellare questo contatto anche dalla tua rubrica?"
 
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."
@@ -5689,15 +5691,11 @@
 msgid "User lookup"
 msgstr "Ricerca utente"
 
-#, fuzzy
 msgid "Reading challenge"
 msgstr ""
-"Errore di lettura di %s: \n"
-"%s.\n"
-
-#, fuzzy
+
 msgid "Unexpected challenge length from server"
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
+msgstr ""
 
 msgid "Logging in"
 msgstr "Login in corso"
@@ -5711,11 +5709,8 @@
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Vuoi impostarne uno adesso? (Nota: NON PUO' ESSERE PIU' CAMBIATO!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr ""
-"Connessione persa con il server\n"
-"%s"
+msgstr "Connessione persa con il server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -5762,16 +5757,15 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Errore di protocollo. Codice %d: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s La tua password è di %d caratteri, più grande della lunghezza massima "
-"attesa di %d per MySpaceIM. Accorcia la tua password, collegandoti su http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"e riprova."
+"%s La tua password è di %zu caratteri, più grande della lunghezza massima "
+"attesa di %d. Accorcia la tua password, collegandoti su http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e riprova."
 
 msgid "Incorrect username or password"
 msgstr "Password o nome utente non corretti"
@@ -5788,9 +5782,8 @@
 msgid "'addbuddy' command failed."
 msgstr "Comando 'addbuddy' fallito."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Comando 'addbuddy' fallito."
+msgstr "Comando 'persist' fallito"
 
 msgid "Failed to remove buddy"
 msgstr "Impossibile rimuovere il contatto"
@@ -5840,9 +5833,8 @@
 msgid "Show display name in status text"
 msgstr "Mostra il nome utente nel messaggio di stato"
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "Mostra il nome utente nel messaggio di stato"
+msgstr "Mostra l'intestazione nel messaggio di stato"
 
 msgid "Send emoticons"
 msgstr "Invia emoticon"
@@ -5856,9 +5848,8 @@
 msgid "User"
 msgstr "Utente"
 
-#, fuzzy
 msgid "Headline"
-msgstr "_Handle:"
+msgstr "Intestazione"
 
 msgid "Song"
 msgstr "Canzone"
@@ -5874,6 +5865,9 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Si è verificato un errore nell'impostare il nome utente.  Riprova, o visita "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username per "
+"impostare il tuo nome utente."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome utente disponibile"
@@ -5907,55 +5901,53 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Fulmina"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha fulminato!"
+
+#, c-format
 msgid "Zapping %s..."
-msgstr "Numero del pager"
+msgstr "Stai fulminando %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "Avviso"
-
-#, fuzzy, c-format
+msgstr "Picchia"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha picchiato!"
+
+#, c-format
 msgid "Whacking %s..."
-msgstr "Avviso"
+msgstr "Stai picchiando %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Distaccato"
-
-#, fuzzy, c-format
+msgstr "Brucia"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha bruciato!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Stai bruciando %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bacia"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha baciato!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Stai baciando %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -5970,60 +5962,56 @@
 msgstr "Stai abbracciando %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Assonnato"
-
-#, fuzzy, c-format
+msgstr "Da' uno schiaffo"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha dato uno schiaffo!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Stai dando uno schiaffo a %s..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Gallo"
-
-#, fuzzy, c-format
+msgstr "Da' un pizzicotto"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha dato un pizzicotto!"
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Ricerca di %s in corso"
+msgstr "Stai dando un pizzicotto a %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#, fuzzy
 msgid "High-five"
-msgstr "Priorità alta"
-
-#, fuzzy, c-format
+msgstr "Da' il cinque"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ti ha inviato un messaggio. (%s)"
-
-#, fuzzy, c-format
+msgstr "%s ti ha dato il cinque!"
+
+#, c-format
 msgid "High-fiving %s..."
-msgstr "Priorità alta"
+msgstr "Stai dando il cinque a %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#, fuzzy
 msgid "Punk"
-msgstr "Punk"
-
-#, fuzzy, c-format
+msgstr "Prendi in giro"
+
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha preso in giro!"
+
+#, c-format
 msgid "Punking %s..."
-msgstr "Ping"
+msgstr "Stai prendendo in giro %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6032,17 +6020,16 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#, fuzzy
 msgid "Raspberry"
-msgstr "Trasferimento in corso"
-
-#, fuzzy, c-format
+msgstr "Fai un pernacchio"
+
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha fatto un pernacchio!"
+
+#, c-format
 msgid "Raspberrying %s..."
-msgstr "Trasferimento in corso"
+msgstr "Stai facendo un pernacchio a %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Dei parametri richiesti non sono stati passati"
@@ -6141,9 +6128,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Impossibile effettuare il login"
+msgstr "Impossibile effettuare il login: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6280,13 +6267,12 @@
 "%s sembra essere non in linea e non ha ricevuto il messaggio che hai appena "
 "inviato."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
 "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
-"connettersi."
+"desideri collegarti."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -6312,9 +6298,8 @@
 msgid "Server port"
 msgstr "Porta del server"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
+msgstr "È stata ricevuta una risposta inattesa da parte di"
 
 #. username connecting too frequently
 msgid ""
@@ -6324,22 +6309,21 @@
 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Errore nella risoluzione di %s"
+msgstr "Errore nella richiesta"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
 
 msgid "Could not join chat room"
-msgstr "Impossibile entrare nella chat room"
+msgstr "Impossibile entrare nella stanza di discussione"
 
 msgid "Invalid chat room name"
-msgstr "Nome della chat room non valido"
-
-#, fuzzy
+msgstr "Nome della stanza di discussione non valido"
+
 msgid "Received invalid data on connection with server"
-msgstr "Ricevuti dati non validi durante la connessione con il server."
+msgstr "Ricevuti dati non validi durante la connessione con il server"
 
 #. *< type
 #. *< ui_requirement
@@ -6355,7 +6339,7 @@
 msgstr "Plugin per il protocollo AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "UIN ICQ..."
 
 #. *< type
 #. *< ui_requirement
@@ -6386,7 +6370,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Ricevuti dati non validi durante la connessione con l'utente remoto."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Impossibile stabilire una connessione con l'utente remoto."
 
@@ -6445,16 +6428,14 @@
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#, fuzzy
 msgid "Busted SNAC payload"
-msgstr "carico di %d byte sovradimensionato"
+msgstr "Carico SNAC non corretto"
 
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#, fuzzy
 msgid "In local permit/deny"
-msgstr "Imposta bitrate massimo locale (in kbit/s)."
+msgstr "Nell'autorizzazione/divieto locale"
 
 msgid "Warning level too high (sender)"
 msgstr "Livello di allerta troppo alto (mittente)"
@@ -6591,15 +6572,13 @@
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Impossibile connettersi al server di autenticazione:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile connettersi al server di autenticazione: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Impossibile connettersi al server."
+msgstr "Impossibile connettersi al server BOS: %s"
 
 msgid "Username sent"
 msgstr "Nome utente inviato"
@@ -6611,20 +6590,22 @@
 msgid "Finalizing connection"
 msgstr "Finalizzazione della connessione"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Impossibile connettersi. Impossibile effettuare il login come %s poiché il "
-"nome utente non è valido. I nomi utente devono essere indirizzi email "
-"validi. In alternativa devono iniziare con una lettera e contenere solo "
-"lettere, numeri e spazi; oppure devono contenere solo numeri."
-
-#, fuzzy, c-format
+"Impossibile effettuare il login come %s poiché il nome utente non è valido. "
+"I nomi utente devono essere indirizzi email validi. In alternativa devono "
+"iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure "
+"devono contenere solo numeri."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
+msgstr ""
+"Potresti essere disconnesso a breve. In tal caso, controlla %s per "
+"aggiornamenti."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossibile ottenere un hash di login valido per AIM."
@@ -6638,36 +6619,33 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "L'utente non esiste"
+msgstr "Il nome utente non esiste"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Il tuo account è attualmente sospeso."
+msgstr "Il tuo account è attualmente sospeso"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta un minuto e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "La chiave SecurID immessa non è valida."
+msgstr "La chiave SecurID immessa non è valida"
 
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
@@ -6675,12 +6653,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Password inviata"
 
@@ -6690,12 +6662,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-msgid "Authorization Request Message:"
-msgstr "Messaggio di richiesta di autorizzazione:"
-
-msgid "Please authorize me!"
-msgstr "Mi autorizzi, per favore?"
-
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
@@ -6872,7 +6838,7 @@
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Sei stato disconnesso dalla chat room %s."
+msgstr "Sei stato disconnesso dalla stanza di discussione %s."
 
 msgid "Mobile Phone"
 msgstr "Cellulare"
@@ -7031,7 +6997,7 @@
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
@@ -7042,11 +7008,6 @@
 "lettera e contenere solo lettere, numeri e spazi; oppure devono contenere "
 "solo numeri."
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Impossibile aggiungere"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
@@ -7061,7 +7022,7 @@
 msgid "Orphans"
 msgstr "Orfani"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7072,7 +7033,7 @@
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
@@ -7238,9 +7199,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "L'utente non è connesso"
+msgstr "Usa clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7319,9 +7279,8 @@
 msgid "Rat"
 msgstr "Topo"
 
-#, fuzzy
 msgid "Ox"
-msgstr "OK"
+msgstr "Bue"
 
 msgid "Tiger"
 msgstr "Tigre"
@@ -7356,16 +7315,14 @@
 msgid "Other"
 msgstr "Altro"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisibile"
+msgstr "Visibile"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Solo amici"
+
 msgid "Private"
-msgstr "Privacy"
+msgstr "Privato"
 
 msgid "QQ Number"
 msgstr "Numero QQ"
@@ -7382,9 +7339,8 @@
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Autorizzare l'utente?"
+msgstr "Autorizzare l'aggiunta"
 
 msgid "Cellphone Number"
 msgstr "Numero di cellulare"
@@ -7392,64 +7348,50 @@
 msgid "Personal Introduction"
 msgstr "Presentazione personale"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Città"
-
-#, fuzzy
+msgstr "Città/Area"
+
 msgid "Publish Mobile"
-msgstr "Cellulare personale"
-
-#, fuzzy
+msgstr "Pubblica il numero di cellulare"
+
 msgid "Publish Contact"
-msgstr "Imposta un alias per la lista"
+msgstr "Pubblica le informazioni sul contatto"
 
 msgid "College"
 msgstr "Scuola superiore"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Simbolo zodiacale"
-
-#, fuzzy
+msgstr "Oroscopo"
+
 msgid "Zodiac"
-msgstr "Segno zodiacale"
-
-#, fuzzy
+msgstr "Zodiaco"
+
 msgid "Blood"
-msgstr "Bloccato"
-
-#, fuzzy
+msgstr "Gruppo sanguigno"
+
 msgid "True"
-msgstr "Toro"
-
-#, fuzzy
+msgstr "Vero"
+
 msgid "False"
-msgstr "Fallito"
-
-#, fuzzy
+msgstr "Falso"
+
 msgid "Modify Contact"
-msgstr "Modifica l'account"
-
-#, fuzzy
+msgstr "Modifica il contatto"
+
 msgid "Modify Address"
-msgstr "Indirizzo di casa"
-
-#, fuzzy
+msgstr "Modifica l'indirizzo"
+
 msgid "Modify Extended Information"
-msgstr "Modifica le mie informazioni"
-
-#, fuzzy
+msgstr "Modifica le informazioni estese"
+
 msgid "Modify Information"
-msgstr "Modifica le mie informazioni"
-
-#, fuzzy
+msgstr "Modifica le informazioni"
+
 msgid "Update"
-msgstr "Ultimo aggiornamento"
-
-#, fuzzy
+msgstr "Aggiorna"
+
 msgid "Could not change buddy information."
-msgstr "Inserisci le informazioni sul contatto."
+msgstr "Impossibile modificare le informazioni sul contatto."
 
 msgid "Mobile"
 msgstr "Cellulare"
@@ -7458,99 +7400,84 @@
 msgstr "Note"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Icona per il contatto"
+msgstr "Promemoria per il contatto"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Modifica a piacimento il promemoria per il contatto"
+
 msgid "_Modify"
-msgstr "Modifica"
-
-#, fuzzy
+msgstr "_Modifica"
+
 msgid "Memo Modify"
-msgstr "Modifica"
-
-#, fuzzy
+msgstr "Modifica promemoria"
+
 msgid "Server says:"
-msgstr "Server occupato"
+msgstr "Il server dice:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "La tua richiesta è stata accettata."
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "La tua richiesta è stata rifiutata."
+
+#, c-format
 msgid "%u requires verification"
-msgstr "Richiedi autorizzazione"
-
-#, fuzzy
+msgstr "%u necessita di verifica"
+
 msgid "Add buddy question"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
-
-#, fuzzy
+msgstr "Domanda per l'aggiunta del contatto"
+
 msgid "Enter answer here"
-msgstr "Inserisci la tua richiesta qui"
+msgstr "Inserisci qui la risposta"
 
 msgid "Send"
 msgstr "Invia"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nome utente non valido."
+msgstr "Risposta non valida."
 
 msgid "Authorization denied message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "Mi dispiace ma non sei il mio tipo..."
-
-#, fuzzy, c-format
+msgstr "Mi dispiace ma non sei il mio tipo."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "L'utente %d necessita di autenticazione"
-
-#, fuzzy
+msgstr "%u necessita di autorizzazione"
+
 msgid "Add buddy authorize"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
-
-#, fuzzy
+msgstr "Autorizzazione per l'aggiunta del contatto"
+
 msgid "Enter request here"
-msgstr "Inserisci la tua richiesta qui"
+msgstr "Inserisci la richiesta qui"
 
 msgid "Would you be my friend?"
 msgstr "Vuoi essere mio amico?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contatto"
-
-#, fuzzy
+msgstr "Contatto QQ"
+
 msgid "Add buddy"
-msgstr "Aggiungi un contatto"
-
-#, fuzzy
+msgstr "Aggiungi contatto"
+
 msgid "Invalid QQ Number"
-msgstr "Volto QQ non valido"
-
-#, fuzzy
+msgstr "Numero QQ non valido"
+
 msgid "Failed sending authorize"
-msgstr "Mi autorizzi, per favore?"
-
-#, fuzzy, c-format
+msgstr "Invio dell'autorizzazione non riuscito"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Impossibile rimuovere il contatto"
-
-#, fuzzy, c-format
+msgstr "Rimozione del contatto %u non riuscita"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ti ha rimosso dalla sua lista contatti."
-
-#, fuzzy
+msgstr "Impossibile rimuovere me stesso dalla lista contatti di %d"
+
 msgid "No reason given"
-msgstr "Nessun motivo fornito."
+msgstr "Nessun motivo fornito"
 
 #. only need to get value
 #, c-format
@@ -7560,9 +7487,9 @@
 msgid "Would you like to add him?"
 msgstr "Vuoi aggiungerlo?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Rifiuta"
+msgstr "Rifiutato da %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7577,88 +7504,73 @@
 msgid "QQ Qun"
 msgstr "Qun QQ"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Inserire un nuovo nome per %s"
-
-#, fuzzy
+msgstr "Inserisci un numero Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Puoi solamente cercare i gruppi QQ permanenti\n"
-
-#, fuzzy
+msgstr "Puoi solamente cercare Qun permanenti\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Impostazioni del proxy non valide"
-
-#, fuzzy
+msgstr "(Stringa UTF-8 non valida)"
+
 msgid "Not member"
-msgstr "Non sono un membro"
+msgstr "Non è membro"
 
 msgid "Member"
 msgstr "Membro"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Finestra di richiesta"
-
-#, fuzzy
+msgstr "Richiesta in corso"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Amministratore"
+
 msgid "Notice"
-msgstr "Note"
-
-#, fuzzy
+msgstr "Avviso"
+
 msgid "Detail"
-msgstr "Predefinito"
+msgstr "Dettaglio"
 
 msgid "Creator"
 msgstr "Creatore"
 
-#, fuzzy
 msgid "About me"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su di me"
+
 msgid "Category"
-msgstr "Errore nella chat"
-
-#, fuzzy
+msgstr "Categoria"
+
 msgid "The Qun does not allow others to join"
-msgstr "Questo gruppo non consente ad altri di entrare"
-
-#, fuzzy
+msgstr "Il Qun non consente ad altri di entrare"
+
 msgid "Join QQ Qun"
-msgstr "Entra in chat"
+msgstr "Entra in un Qun QQ"
 
 msgid "Input request here"
 msgstr "Inserisci la tua richiesta qui"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Membro Qun modificato con successo"
-
-#, fuzzy
+msgstr "Ingresso nel Qun %s (%u) riuscito"
+
 msgid "Successfully joined Qun"
-msgstr "Membro Qun modificato con successo"
+msgstr "Ingresso nel Qun riuscito"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "L'ingresso nel Qun %u è stato rifiutato"
 
 msgid "QQ Qun Operation"
 msgstr "Operatore Qun QQ"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Fallito"
+msgstr "Fallito:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Ingresso nel Qun, risposta sconosciuta"
+
 msgid "Quit Qun"
-msgstr "Qun QQ"
+msgstr "Abbandona il Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7667,51 +7579,47 @@
 "Nota, se sei il creatore, \n"
 "questa operazione rimuoverà questo Qun."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Mi dispiace ma non sei il mio tipo..."
-
-#, fuzzy
+msgstr "Mi dispiace, ma non sei il nostro tipo"
+
 msgid "Successfully changed Qun members"
-msgstr "Membro Qun modificato con successo"
-
-#, fuzzy
+msgstr "Membri del Qun modificati con successo"
+
 msgid "Successfully changed Qun information"
-msgstr "Informazione Qun modificata con successo"
+msgstr "Informazione sul Qun modificata con successo"
 
 msgid "You have successfully created a Qun"
 msgstr "Qun creato con successo"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Vuoi impostare i dettagli Qun adesso?"
+msgstr "Vuoi impostare le informazioni dettagliate adesso?"
 
 msgid "Setup"
 msgstr "Impostazione"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
-
-#, fuzzy, c-format
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u per %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
-
-#, fuzzy, c-format
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Impossibile unirsi al contatto in chat"
+msgstr "Impossibile entrare nel Qun %u, gestito dall'admin %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>L'ingresso nel Qun %u è approvato dall'amministratore %u per %s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Rimuovi il contatto"
-
-#, fuzzy, c-format
+msgstr "<b>Il contatto %u è stato rimosso.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Rimuovi il contatto"
+msgstr "<b>Il nuovo contatto %u è entrato.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7721,151 +7629,139 @@
 msgstr "Livello"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
-msgstr "Cellulare"
-
-#, fuzzy
+msgstr " FromMobile"
+
 msgid " BindMobile"
-msgstr "Cellulare"
-
-#, fuzzy
+msgstr " BindMobile"
+
 msgid " Video"
-msgstr "Video live"
-
-#, fuzzy
+msgstr "Video"
+
 msgid " Zone"
-msgstr "Nessuno"
+msgstr "Zona"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 msgid "Ver"
-msgstr ""
+msgstr "Versione"
 
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Scegli cartella..."
-
-#, fuzzy, c-format
+msgstr "Scegli un'icona..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Orario di login</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Attualmente online</b>: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Numero di contatti online</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ultimo aggiornamento</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Server</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
+msgstr "<b>Etichetta del client</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modalità di connessione</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Modalità di connessione</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Il mio indirizzo IP</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Inviato</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Invia nuovamente</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Perso</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ricevuto</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Il mio IP pubblico</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ricevuto duplicato</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Data e ora</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "Informazioni sul login"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Autore originale</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Hanno contribuito al codice</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Gli Amabili Scrittori Patch</b>:<br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Ringraziamento</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<p><b>Tester scrupolosi</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "ed altri ancora, fatemi sapere... grazie!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>E tutti i ragazzi del retrobottega...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<i>Unisciti a noi!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Salva l'icona"
+msgstr "Cambia icona"
 
 msgid "Change Password"
 msgstr "Cambia password"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informazioni sul login"
+msgstr "Informazioni sull'account"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Aggiorna tutti i Qun di QQ"
+
 msgid "About OpenQ"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Indirizzo di casa"
+msgstr "Modifica il promemoria per il contatto"
 
 #. *< type
 #. *< ui_requirement
@@ -7877,57 +7773,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Plugin per il protocollo QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autore"
-
-#, fuzzy
+msgstr "Automatico"
+
 msgid "Select Server"
-msgstr "Scegli l'utente"
+msgstr "Scegli un server"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
 msgstr "Connetti utilizzando TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Porta del server"
-
-#, fuzzy
+msgstr "Mostra gli avvisi dal server"
+
 msgid "Show server news"
-msgstr "Indirizzo del server"
+msgstr "Mostra le news del server"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostra la stanza di discussione all'arrivo di un messaggio"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Errore nell'aggiunta del contatto"
-
-#, fuzzy
+msgstr "Intervallo di \"Keep alive\" (secondi)"
+
 msgid "Update interval (seconds)"
-msgstr "Intervallo(i) per l'aggiornamento"
-
-#, fuzzy
+msgstr "Intervallo di aggiornamento (secondi)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Impossibile decrittare la risposta al login"
+msgstr "Impossibile decrittare la risposta del server"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Impossibile richiedere il token, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7935,135 +7822,122 @@
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Il Redirect_EX non è attualmente supportato"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Richiesta registrazione"
-
-#, fuzzy, c-format
+msgstr "Richiesta attivazione"
+
+#, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy
+msgstr "Codice di risposta sconosciuto durante il login (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Richiedi l'attenzione di %s..."
-
-#, fuzzy
+msgstr "Richiesta del codice captcha in corso"
+
 msgid "Checking captcha"
-msgstr "Richiedi l'attenzione di %s..."
-
-#, fuzzy
+msgstr "Verifica del codice captcha in corso"
+
 msgid "Failed captcha verification"
-msgstr "Autenticazione Yahoo! fallita"
-
-#, fuzzy
+msgstr "Verifica del codice captcha fallita"
+
 msgid "Captcha Image"
-msgstr "Salva l'immagine"
-
-#, fuzzy
+msgstr "Immagine Captcha"
+
 msgid "Enter code"
-msgstr "Inserisci la password"
-
-#, fuzzy
+msgstr "Inserisci il codice"
+
 msgid "QQ Captcha Verification"
-msgstr "Verifica certificato SSL"
-
-#, fuzzy
+msgstr "Verifica captcha di QQ"
+
 msgid "Enter the text from the image"
-msgstr "Inserisci il nome del gruppo"
-
-#, fuzzy, c-format
+msgstr "Inserisci il testo che appare nell'immagine"
+
+#, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy, c-format
+msgstr "Risposta sconosciuta durante la verifica della password (0x%02X)"
+
+#, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
+msgstr ""
+"Codice di risposta sconosciuto durante il login (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Errore socket"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Imposta le informazioni utente..."
-
-#, fuzzy
+msgstr "Ricezione server in corso"
+
 msgid "Requesting token"
-msgstr "Richiesta rifiutata"
-
-#, fuzzy
+msgstr "Richiesta del token in corso"
+
 msgid "Unable to resolve hostname"
-msgstr "Impossibile connettersi al server."
-
-#, fuzzy
+msgstr "Impossibile risolvere il nome dell'host"
+
 msgid "Invalid server or port"
-msgstr "Errore non valido"
-
-#, fuzzy
+msgstr "Server o porta non validi"
+
 msgid "Connecting to server"
-msgstr "Connessione al server SILC in corso"
-
-#, fuzzy
+msgstr "Connessione al server in corso"
+
 msgid "QQ Error"
-msgstr "Errore QQid"
-
-#, fuzzy, c-format
+msgstr "Errore di QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Server relay ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"News dal server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s: %s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Da"
-
-#, fuzzy, c-format
+msgstr "Da %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Istruzioni per il server: %s"
-
-#, fuzzy
+msgstr ""
+"Avviso del server da %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Motivo sconosciuto"
-
-#, fuzzy, c-format
+msgstr "Comando SERVER sconosciuto"
+
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-"Risposta %s(0x%02X )\n"
-"Inviato %s(0x%02X )\n"
-"Id della stanza %d, risposta [0x%02X]: \n"
-"%s"
-
-#, fuzzy
+"Risposta di errore di %s(0x%02X)\n"
+"Stanza %u, risposta 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Comando"
-
-#, fuzzy
+msgstr "Comando Qun QQ"
+
 msgid "Unable to decrypt login reply"
 msgstr "Impossibile decrittare la risposta al login"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Motivo sconosciuto"
-
-#, fuzzy
+msgstr "Comando LOGIN sconosciuto"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Motivo sconosciuto"
+msgstr "Comando CLIENT sconosciuto"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8775,9 +8649,8 @@
 msgid "Cannot join private group"
 msgstr "Impossibile entrare nel gruppo privato"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "Impossibile richiamare il comando"
+msgstr "Comando per la chiamata"
 
 msgid "Cannot call command"
 msgstr "Impossibile richiamare il comando"
@@ -8989,11 +8862,10 @@
 msgstr "Impossibile uccidere (kill) l'utente"
 
 msgid "WATCH"
-msgstr ""
-
-#, fuzzy
+msgstr "GUARDA"
+
 msgid "Cannot watch user"
-msgstr "Impossibile ottenere le informazioni sull'utente"
+msgstr "Impossibile osservare l'utente"
 
 msgid "Resuming session"
 msgstr "Ripristino della sessione in corso"
@@ -9043,7 +8915,6 @@
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
@@ -9059,7 +8930,6 @@
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Impossibile caricare la coppia di chiavi SILC"
 
@@ -9067,14 +8937,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Connessione al server SILC in corso"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Impossibile caricare la coppia di chiavi SILC"
-
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Impossibile inizializzare il protocollo SILC"
 
@@ -9355,7 +9220,7 @@
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Usa PFS (Perfect Forward Secrecy)"
 
 msgid "Public key authentication"
 msgstr "Autenticazione con chiave pubblica"
@@ -9375,9 +9240,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Impossibile creare la coppia di chiavi SILC\n"
+msgstr "Impossibile creare la coppia di chiavi SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9517,35 +9381,30 @@
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Nessun nome"
-
-#, fuzzy, c-format
+msgstr "Giovanni Senzanome"
+
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Impossibile creare la connessione"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Risposta sconosciuta dal server."
-
-#, fuzzy
+msgstr "Risposta sconosciuta da parte del server"
+
 msgid "Unable to create listen socket"
-msgstr "Impossibile creare il socket"
+msgstr "Impossibile creare il socket in ascolto"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Porta del server"
+msgstr "Server di connessione SIP non specificato"
 
 #. *< type
 #. *< ui_requirement
@@ -9583,17 +9442,17 @@
 msgstr "Dominio Auth"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
+msgstr ""
+"join &lt;stanza&gt;: Entra in una stanza di discussione sul network Yahoo"
 
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Elenca le stanze presenti sul network Yahoo"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
+msgstr "doodle: Richiedi all'utente di avviare una sessione di scarabocchi"
+
 msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
+msgstr "ID Yahoo..."
 
 #. *< type
 #. *< ui_requirement
@@ -9605,9 +9464,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
+msgstr "Plugin per il protocollo Yahoo!"
 
 msgid "Pager server"
 msgstr "Sever pager"
@@ -9622,13 +9480,13 @@
 msgstr "Porta trasferimento file"
 
 msgid "Chat room locale"
-msgstr "Lingua della chat room"
+msgstr "Lingua della stanza di discussione"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr "Ignora gli inviti a conferenze e a chat room"
+msgstr "Ignora gli inviti a conferenze e a stanze di discussione"
 
 msgid "Chat room list URL"
-msgstr "URL della lista delle chat room"
+msgstr "URL della lista delle stanze di discussione"
 
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
@@ -9636,9 +9494,8 @@
 msgid "Yahoo Chat port"
 msgstr "Porta Yahoo Chat"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ID Yahoo!"
+msgstr "ID Yahoo Giappone..."
 
 #. *< type
 #. *< ui_requirement
@@ -9650,12 +9507,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
+msgstr "Plugin per il protocollo Yahoo! Giappone"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Il tuo SMS non è stato consegnato"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non è stato inviato."
@@ -9682,32 +9538,28 @@
 msgstr "Aggiungi un contatto rifiutato"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Ricevuti dati non validi durante la connessione con il server."
+msgstr "Ricevuti dati non validi"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
-"effettuando il login sul sito web di Yahoo!."
+"Account bloccato: troppi tentativi di accesso falliti. Il problema potrebbe "
+"essere risolto effettuando l'accesso dal sito web di Yahoo!."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
-"effettuando il login sul sito web di Yahoo!."
+"Account bloccato: motivo sconosciuto. Il problema potrebbe essere risolto "
+"effettuando l'accesso dal sito web di Yahoo!."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Password o nome utente non corretti"
+msgstr "Non è stata specificata la password o il nome utente"
 
 #, c-format
 msgid ""
@@ -9744,35 +9596,29 @@
 "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
 "effettuando il login sul sito web di Yahoo!."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
 "l'account %s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#, fuzzy
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
 msgid "Received unexpected HTTP response from server"
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
-
-#, fuzzy, c-format
+msgstr "È stata ricevuta una risposta HTTP inattesa da parte del server"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Connessione persa con %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Connessione persa con %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
+msgstr "Impossibile stabilire una connessione con %s: %s"
 
 msgid "Not at Home"
 msgstr "Non a casa"
@@ -9816,12 +9662,11 @@
 msgid "Presence Settings"
 msgstr "Impostazioni di presenza"
 
-#, fuzzy
 msgid "Start Doodling"
-msgstr "_Prima porta:"
+msgstr "Inizia a scarabocchiare"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Scegli l'ID che vuoi attivare"
 
 msgid "Join whom in chat?"
 msgstr "A chi vuoi unirti nella chat?"
@@ -9838,9 +9683,8 @@
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#, fuzzy
 msgid "Sent Doodle request."
-msgstr "Richiedi nuovamente l'autorizzazione"
+msgstr "Invia una richiesta per una sessione di scarabocchi"
 
 msgid "Unable to connect."
 msgstr "Impossibile connettersi."
@@ -9898,12 +9742,10 @@
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Spiacente, questo profilo sembra essere in un linguaggio non supportato al "
-"momento."
+"Questo profilo è in un linguaggio o in un formato non supportato al momento."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9926,13 +9768,8 @@
 msgstr "Il profilo dell'utente è vuoto."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
-"seguente motivo \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invito rifiutato"
+msgid "%s has declined to join."
+msgstr "%s ha rifiutato l'ingresso."
 
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
@@ -9954,7 +9791,7 @@
 "able to rejoin a chatroom"
 msgstr ""
 "Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare "
-"cinque minuti prima di poter entrare nuovamente nella chat room"
+"cinque minuti prima di poter entrare nuovamente in una stanza di discussione"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9984,9 +9821,8 @@
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Problema di connessione con il server YCHT."
+msgstr "Problema di connessione con il server YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10109,26 +9945,25 @@
 msgid "Import from .zephyr.subs"
 msgstr "Importa da .zephyr.subs"
 
-#, fuzzy
 msgid "Realm"
-msgstr "Vero nome"
+msgstr "Dominio"
 
 msgid "Exposure"
 msgstr "Esposizione"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s\n"
+msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Errore di connessione al proxy HTTP: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
-"d."
+"d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10175,12 +10010,12 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s ha invitato %s nella chat room: %s\n"
+"%s ha invitato %s nella stanza di discussione: %s\n"
 "%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ha invitato %s nella chat room: %s\n"
+msgstr "%s ha invitato %s nella stanza di discussione: %s\n"
 
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
@@ -10197,7 +10032,7 @@
 msgstr "Immagine salvata"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Immagine archiviata. (questo è sufficiente per ora)"
 
 msgid "SSL Connection Failed"
 msgstr "Connessione SSL fallita"
@@ -10218,7 +10053,7 @@
 msgstr "Non disturbare"
 
 msgid "Extended away"
-msgstr "Ancora assente"
+msgstr "Assente per molto"
 
 msgid "Listening to music"
 msgstr "Sta ascoltando musica"
@@ -10311,9 +10146,10 @@
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Errore di lettura da %s: %s"
+msgstr ""
+"Errore di lettura da %s: risposta troppo lunga (il limite è di %d byte)"
 
 #, c-format
 msgid ""
@@ -10337,7 +10173,7 @@
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr "- %s"
 
 #, c-format
 msgid " (%s)"
@@ -10372,13 +10208,13 @@
 msgid "Error Reading %s"
 msgstr "Errore nella lettura di %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati "
-"e il vecchio file è stato rinominato in %s~."
+"Si è verificato un errore nella lettura del tuo %s. Il file non è stato "
+"caricato e il vecchio file è stato rinominato in %s~."
 
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
@@ -10422,8 +10258,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizza per questo account la seguente _icona:"
 
-msgid "_Advanced"
-msgstr "_Avanzate"
+msgid "Ad_vanced"
+msgstr "A_vanzate"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizza le opzioni del proxy di GNOME"
@@ -10485,9 +10321,8 @@
 msgid "Create _this new account on the server"
 msgstr "Crea _questo nuovo account sul server"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Abilitato"
@@ -10495,7 +10330,7 @@
 msgid "Protocol"
 msgstr "Protocollo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10510,9 +10345,9 @@
 "<span size='larger' weight='bold'>Benvenuto in %s!</span>\n"
 "\n"
 "Non hai nessun account configurato. Per iniziare a connetterti con %s, premi "
-"il pulsante <b>Aggiungi</b> qui sotto e configura il tuo primo account. Se "
-"vuoi che %s si connetta a diversi account di messaggistica, premi nuovamente "
-"<b>Aggiungi</b> per configurarli tutti.\n"
+"il pulsante <b>Aggiungi...</b> qui sotto e configura il tuo primo account. "
+"Se vuoi che %s si connetta a diversi account di messaggistica, premi "
+"nuovamente <b>Aggiungi...</b> per configurarli tutti.\n"
 "\n"
 "Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un "
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
@@ -10537,9 +10372,8 @@
 msgid "Please update the necessary fields."
 msgstr "Aggiorna i campi necessari."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "Account"
+msgstr "A_ccount"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10565,16 +10399,14 @@
 msgid "I_M"
 msgstr "_MI"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Aggiungi una chat"
+msgstr "Chiamata _audio"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Chiamata audio/_video"
+
 msgid "_Video Call"
-msgstr "Video chat"
+msgstr "Chiamata _video"
 
 msgid "_Send File..."
 msgstr "_Invia file..."
@@ -10585,13 +10417,11 @@
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Nascondi quando non sei in linea"
-
-#, fuzzy
+msgstr "Nascondi quando non è in linea"
+
 msgid "Show When Offline"
-msgstr "Mostra quando non sei in linea"
+msgstr "Mostra quando non è in linea"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10648,9 +10478,8 @@
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "tipo di compressione sconosciuto `%s'!"
+msgstr "Tipo di nodo sconosciuto"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -10718,9 +10547,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Strumenti/_Certificati"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Strumenti/Smile_y"
+msgstr "/Strumenti/Smile_y personalizzati"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Strumenti/Plu_gin"
@@ -10849,7 +10677,7 @@
 msgstr "Per stato"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Per discussioni recenti"
 
 #, c-format
 msgid "%s disconnected"
@@ -10866,7 +10694,7 @@
 msgstr "Riabilita"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "FAQ su SSL"
 
 msgid "Welcome back!"
 msgstr "Bentornato!"
@@ -10939,7 +10767,7 @@
 msgstr "Aggiungi un contatto al _gruppo:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Questo protocollo non supporta le chat room."
+msgstr "Questo protocollo non supporta le stanze di discussione."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -10963,9 +10791,8 @@
 msgid "Auto_join when account becomes online."
 msgstr "Entra _automaticamente quando l'account si connette."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Nascondi la chat quando la finestra è chiusa."
+msgstr "_Resta in chat alla chiusura della finestra."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
@@ -10998,109 +10825,96 @@
 msgid "Background Color"
 msgstr "Colore dello sfondo"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Questo gruppo è stato aggiunto alla tua lista dei contatti."
-
-#, fuzzy
+msgstr "Il colore di sfondo per la lista contatti"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Layout"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Il layout di icone, nome e stato della lista contatti"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Colore dello sfondo"
+msgstr "Colore di sfondo per i gruppi massimizzati"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un gruppo massimizzato"
+
 msgid "Expanded Text"
-msgstr "M_assimizza"
+msgstr "Testo per i gruppi massimizzati"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale per un gruppo massimizzato"
+
 msgid "Collapsed Background Color"
-msgstr "Scegli il colore dello sfondo"
+msgstr "Colore di sfondo per i gruppi minimizzati"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un gruppo minimizzato"
+
 msgid "Collapsed Text"
-msgstr "_Minimizza"
+msgstr "Testo per i gruppi minimizzati"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "L'informazione testuale per un gruppo minimizzato"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Scegli il colore dello sfondo"
+msgstr "Colore di sfondo per contatti/chat"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un contatto o una chat"
+
 msgid "Contact Text"
-msgstr "Scorciatoia"
+msgstr "Testo per i contatti"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è massimizzato"
+
 msgid "On-line Text"
-msgstr "Online"
+msgstr "Testo per i contatti in linea"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è in linea"
+
 msgid "Away Text"
-msgstr "Assente"
+msgstr "Testo per i contatti assenti"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è assente"
+
 msgid "Off-line Text"
-msgstr "Non connesso"
+msgstr "Testo per i contatti non in linea"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto non è in linea"
+
 msgid "Idle Text"
-msgstr "Testo identificato"
+msgstr "Testo per i contatti inattivi"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è inattivo"
+
 msgid "Message Text"
-msgstr "Messaggio inviato"
+msgstr "Testo per i messaggi non letti"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "L'informazione testuale quando un contatto ha un messaggio non letto"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Testo per i messaggi con nick"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"L'informazione testuale quando una chat ha un messaggio non letto dove è "
+"citato il tuo nickname"
+
 msgid "The text information for a buddy's status"
-msgstr "Modifica le informazioni utente per %s"
-
-#, fuzzy
+msgstr "L'informazione testuale sullo stato di un contatto"
+
 msgid "Type the host name for this certificate."
 msgstr "Immetti il nome dell'host al quale è associato questo certificato."
 
@@ -11122,7 +10936,7 @@
 "contatto."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Invita un contatto nella chat room"
+msgstr "Invita un contatto nella stanza di discussione"
 
 msgid "_Buddy:"
 msgstr "_Contatto:"
@@ -11152,9 +10966,8 @@
 msgid "Get Away Message"
 msgstr "Ottieni messaggio di assenza"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "Ultimo messaggio"
+msgstr "Ultime parole"
 
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
@@ -11199,21 +11012,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Rimuovi lo _storico"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/M_edia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata _video"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Conversazione/Mostra il _log"
+msgstr "/Conversazione/Media/_Chiamata audio\\/video"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
@@ -11287,17 +11096,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Conversazione/Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Conversazione/Mostra il log"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata video"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Conversazione/Altro"
+msgstr "/Conversazione/Media/Chiamata audio\\/video"
 
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
@@ -11378,9 +11184,8 @@
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
-#, fuzzy
 msgid "Nick Said"
-msgstr "%s ha pronunciato il tuo nick in %s"
+msgstr "È stato pronunciato il tuo nickname"
 
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
@@ -11473,25 +11278,23 @@
 msgstr "Errore fatale"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "signore dei bug"
+
 msgid "artist"
-msgstr "Artista"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "voce e video"
 
 msgid "support"
 msgstr "supporto"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "sviluppatore e webmaster"
+msgstr "webmaster"
 
 msgid "Senior Contributor/QA"
 msgstr "Collaboratore senior/QA"
@@ -11513,7 +11316,7 @@
 msgstr "supporto/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "autore originale"
@@ -11590,9 +11393,8 @@
 msgid "French"
 msgstr "Francese"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Curdo"
+msgstr "Irlandese"
 
 msgid "Galician"
 msgstr "Galiziano"
@@ -11612,9 +11414,8 @@
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Rumeno"
+msgstr "Armeno"
 
 msgid "Indonesian"
 msgstr "Indonesiano"
@@ -11631,9 +11432,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traduttori georgiani di Ubuntu"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Altro"
+msgstr "Khmer"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -11656,9 +11456,8 @@
 msgid "Macedonian"
 msgstr "Macedone"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedone"
+msgstr "Mongolo"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
@@ -11715,7 +11514,7 @@
 msgstr "Svedese"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -11781,21 +11580,26 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Help via email:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">Canale IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">MUC XMPP:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
@@ -11827,13 +11631,12 @@
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Inserisci il nome utente o l'alias della persona della quale vuoi "
-"informazioni."
+"Inserisci il nome utente o l'alias della persona della quale desideri "
+"ricevere informazioni."
 
 msgid "View User Log"
 msgstr "Mostra il log dell'utente"
@@ -12022,14 +11825,6 @@
 msgid "File transfer _details"
 msgstr "_Dettagli trasferimento file"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausa"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Riprendi"
-
 msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo semplice"
 
@@ -12040,43 +11835,37 @@
 msgstr "Disabilita gli _smileys nel testo selezionato"
 
 msgid "Hyperlink color"
-msgstr "Colore dei collegamenti"
+msgstr "Colore per i collegamenti"
 
 msgid "Color to draw hyperlinks."
-msgstr "Colore per disegnare i collegamenti."
-
-#, fuzzy
+msgstr "Colore per indicare i collegamenti."
+
 msgid "Hyperlink visited color"
-msgstr "Colore dei collegamenti"
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Colore per i collegamenti al passaggio del mouse."
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati (o attivi)."
+
 msgid "Hyperlink prelight color"
-msgstr "Inserire un codice colore"
+msgstr "Colore per i collegamenti al passaggio del mouse"
 
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
+msgstr "Colore per il nome dei messaggi inviati"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "Colore per il nome in un messaggio che hai inviato."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "Il messaggio ricevuto inizia la conversazione"
+msgstr "Colore per il nome dei messaggi ricevuti"
 
 msgid "Color to draw the name of a message you received."
 msgstr "Colore per il nome in un messaggio che hai ricevuto."
 
-#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr "Inserire un codice colore"
+msgstr ""
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -12092,24 +11881,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Colore per il nome di un messaggio di azione."
-
-#, fuzzy
+msgstr ""
+
 msgid "Whisper Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
-
-#, fuzzy
+msgstr ""
+
 msgid "Color to draw the name of a whispered message."
-msgstr "Colore per il nome di un messaggio di azione."
+msgstr ""
 
 msgid "Typing notification color"
 msgstr "Colore per la notifica di scrittura"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Il colore da usare per il carattere della notifica di scrittura"
+msgstr "Il colore da usare per la notifica di scrittura"
 
 msgid "Typing notification font"
 msgstr "Carattere per la notifica di scrittura"
@@ -12361,7 +12146,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12383,6 +12168,8 @@
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12392,7 +12179,7 @@
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12413,6 +12200,8 @@
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12422,7 +12211,7 @@
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12448,11 +12237,6 @@
 "al momento del crash ed allega il backtrace del file core.\n"
 "Se non sai come ottenere il backtrace, puoi trovare le istruzioni su\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"Se hai bisogno di ulteriore assistenza, invia un messaggio\n"
-"a SeanEgn o a LSchiere (via AIM). Informazioni su come contattare\n"
-"Sean o Luke su altri protocolli sono disponibili su\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -12461,25 +12245,24 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Uscita in corso, poiché è in esecuzione un altro client libpurple.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/_Riaggancia"
+
 msgid "Calling..."
-msgstr "Calcolo in corso..."
+msgstr "Chiamata in corso..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s vuole avviare una sessione audio/video con te."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s vuole avviare una sessione video con te."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12510,9 +12293,8 @@
 "È stato scelto di impostare il browser manualmente, ma non è stato immesso "
 "nessun comando."
 
-#, fuzzy
 msgid "No message"
-msgstr "Messaggio sconosciuto"
+msgstr "Nessun messaggio"
 
 msgid "Open All Messages"
 msgstr "Apri tutti i messaggi"
@@ -12520,16 +12302,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Nuovo allarme"
+msgstr "Nuovi allarmi"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Chiudi"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Hai degli avvisi!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "I seguenti plugin saranno rimossi."
@@ -12579,7 +12359,6 @@
 msgid "Select a file"
 msgstr "Scegli un file"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Modifica l'allarme"
 
@@ -12656,61 +12435,58 @@
 msgid "Pounce Target"
 msgstr "Contatto da controllare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Inizia a scrivere"
-
-#, fuzzy, c-format
+msgstr "Ha iniziato a scrivere"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Interrompe la scrittura"
-
-#, fuzzy, c-format
+msgstr "Si è fermato mentre scriveva"
+
+#, c-format
 msgid "Signed on"
-msgstr "Si connette"
-
-#, fuzzy, c-format
+msgstr "Si è connesso"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s è tornato attivo (%s)"
-
-#, fuzzy, c-format
+msgstr "È tornato attivo"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Ritorna dall'assenza"
-
-#, fuzzy, c-format
+msgstr "È tornato dall'assenza"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "Ha smesso di scrivere"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "Si disconnette"
-
-#, fuzzy, c-format
+msgstr "Si è disconnesso"
+
+#, c-format
 msgid "Became idle"
-msgstr "Diventa inattivo"
-
-#, fuzzy, c-format
+msgstr "È diventato inattivo"
+
+#, c-format
 msgid "Went away"
-msgstr "Se assente"
-
-#, fuzzy, c-format
+msgstr "È andato via"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Invia un messaggio"
-
-#, fuzzy, c-format
+msgstr "Ha inviato un messaggio"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
-
-#, fuzzy
+msgstr "Sconosciuto... Per piacere riporta questo errore!"
+
 msgid "Theme failed to unpack."
-msgstr "Impossibile spacchettare il tema degli smiley."
-
-#, fuzzy
+msgstr "Impossibile spacchettare il tema."
+
 msgid "Theme failed to load."
-msgstr "Impossibile spacchettare il tema degli smiley."
-
-#, fuzzy
+msgstr "Impossibile caricare il tema."
+
 msgid "Theme failed to copy."
-msgstr "Impossibile spacchettare il tema degli smiley."
+msgstr "Impossibile copiare il tema."
 
 msgid "Install Theme"
 msgstr "Installa tema"
@@ -12732,9 +12508,8 @@
 msgstr "Ch_iudi le conversazioni con il tasto Esc"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Lista contatti"
+msgstr "Tema per la lista contatti"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12746,9 +12521,8 @@
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Finestre dei messaggi immediati"
+msgstr "Finestra di conversazione"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nascondi le nuove conversazioni:"
@@ -12797,7 +12571,7 @@
 msgstr "Mostra la _formattazione per i messaggi in entrata"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Chiudi istantaneamente i messaggi immediati alla chiusura della scheda"
+msgstr "Chiudi subito i messaggi immediati alla chiusura della scheda"
 
 msgid "Show _detailed information"
 msgstr "Mostra informazioni _dettagliate"
@@ -12851,9 +12625,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Rileva _automaticamente l'indirizzo IP"
+msgstr "Usa l'indirizzo IP rilevato _automaticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
@@ -12876,7 +12650,7 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Server di relay (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; Browser"
@@ -12910,7 +12684,7 @@
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "Usa un DNS remoto con proxy SOCKS4"
 
 msgid "_User:"
 msgstr "_Utente:"
@@ -13033,7 +12807,6 @@
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#, fuzzy
 msgid "M_ute sounds"
 msgstr "Nessun _suono"
 
@@ -13041,13 +12814,11 @@
 msgstr ""
 "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Abilita i suoni:"
-
-#, fuzzy
+msgstr "_Abilita i suoni:"
+
 msgid "V_olume:"
-msgstr "Volume:"
+msgstr "V_olume:"
 
 msgid "Play"
 msgstr "Riproduci"
@@ -13227,12 +12998,12 @@
 msgid "Status for %s"
 msgstr "Stato per %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
-"selezionata. Specifica una scorciatoia differente."
+"Esiste già uno smiley personalizzato per '%s'. Specifica una scorciatoia "
+"differente."
 
 msgid "Custom Smiley"
 msgstr "Smiley personalizzato"
@@ -13246,36 +13017,30 @@
 msgid "Add Smiley"
 msgstr "Aggiungi uno smiley"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Immagine"
+msgstr "_Immagine:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Scorciatoia"
+msgstr "Testo della scorciatoia:"
 
 msgid "Smiley"
 msgstr "Smiley"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Scorciatoia"
+msgstr "Testo della scorciatoia"
 
 msgid "Custom Smiley Manager"
 msgstr "Gestione degli smiley personalizzati"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Seleziona il contatto"
-
-#, fuzzy
+msgstr "Seleziona l'icona per il contatto"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Utilizza per questo account la seguente _icona:"
-
-#, fuzzy
+msgstr "Fai clic per cambiare la tua icona per questo account."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Utilizza per questo account la seguente _icona:"
+msgstr "Fai clic per cambiare la tua icona per tutti gli account."
 
 msgid "Waiting for network connection"
 msgstr "In attesa della connessione di rete"
@@ -13355,7 +13120,6 @@
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13395,9 +13159,8 @@
 "Impossibile caricare l'immagine '%s' per un motivo sconosciuto. "
 "Probabilmente il file dell'immagine è danneggiato."
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Apertura dei collegamenti:"
+msgstr "_Apri il collegamento"
 
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
@@ -13405,9 +13168,21 @@
 msgid "_Copy Email Address"
 msgstr "_Copia l'indirizzo email"
 
+msgid "_Open File"
+msgstr "_Apri il file"
+
+msgid "Open _Containing Directory"
+msgstr "Apri la _cartella del file"
+
 msgid "Save File"
 msgstr "Salva il file"
 
+msgid "_Play Sound"
+msgstr "_Riproduci il suono"
+
+msgid "_Save File"
+msgstr "_Salva il file"
+
 msgid "Select color"
 msgstr "Scegli il colore"
 
@@ -13423,17 +13198,18 @@
 msgid "_Invite"
 msgstr "_Invita"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Modifica"
-
-#, fuzzy
+msgstr "_Modifica..."
+
 msgid "_Add..."
-msgstr "_Aggiungi"
+msgstr "_Aggiungi..."
 
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
+msgid "_Pause"
+msgstr "_Pausa"
+
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -13452,12 +13228,11 @@
 msgid "none"
 msgstr "nessuno"
 
-#, fuzzy
 msgid "Small"
-msgstr "Email"
+msgstr "Piccolo"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Versione più piccola degli smiley predefiniti"
 
 msgid "Response Probability:"
 msgstr "Probabilità di risposta:"
@@ -13498,78 +13273,65 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Mostra informazioni statistiche sulla disponibilità dei tuoi contatti"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Indirizzo del server"
-
-#, fuzzy
+msgstr "Richiesta nome server"
+
 msgid "Enter an XMPP Server"
-msgstr "Inserisci il nome del server per le conferenze"
-
-#, fuzzy
+msgstr "Specifica un server XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Scegli un server per le conferenze al quale connettersi"
-
-#, fuzzy
+msgstr "Scegli un server XMPP da interrogare"
+
 msgid "Find Services"
-msgstr "Servizi on line"
-
-#, fuzzy
+msgstr "Cerca servizi"
+
 msgid "Add to Buddy List"
-msgstr "Invia la lista contatti"
-
-#, fuzzy
+msgstr "Aggiungi alla lista contatti"
+
 msgid "Gateway"
-msgstr "È assente"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Percorso dei log"
-
-#, fuzzy
+msgstr "Directory"
+
 msgid "PubSub Collection"
-msgstr "Scegli un suono"
-
-#, fuzzy
+msgstr ""
+
 msgid "PubSub Leaf"
-msgstr "Servizio non disponibile"
-
-#, fuzzy
+msgstr ""
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descrizione"
+msgstr ""
+"\n"
+"<b>Descrizione:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "/Conversazione/_Info"
-
-#, fuzzy
+msgstr "Scoperta servizi"
+
 msgid "_Browse"
-msgstr "_Browser:"
-
-#, fuzzy
+msgstr "_Sfoglia"
+
 msgid "Server does not exist"
-msgstr "L'utente non esiste"
-
-#, fuzzy
+msgstr "Il server non esiste"
+
 msgid "Server does not support service discovery"
-msgstr "Il server non usa nessun metodo di autenticazione supportato"
-
-#, fuzzy
+msgstr "Il server non supporta la scoperta dei servizi"
+
 msgid "XMPP Service Discovery"
-msgstr "/Conversazione/_Info"
+msgstr "Scoperta servizi XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permette di sfogliare e registrare i servizi."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
+"Questo plugin è utile per registrarsi a versioni precedenti del protocollo o "
+"ad altri servizi XMPP."
 
 msgid "Buddy is idle"
 msgstr "Il contatto è inattivo"
@@ -13578,7 +13340,7 @@
 msgstr "Il contatto è assente"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Il contatto è ancora assente"
+msgstr "Il contatto è assente per molto"
 
 #. Not used yet.
 msgid "Buddy is mobile"
@@ -13972,7 +13734,6 @@
 msgstr "Messaggi musicali, per la composizione collaborativa."
 
 #. *  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."
@@ -14010,9 +13771,8 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Invia il messaggio \"_URGENTE\" al window manager"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Finestre delle _chat"
+msgstr "Fai _lampeggiare la finestra"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -14020,7 +13780,7 @@
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr "Finestra di conversazione _attuale"
+msgstr "Mostra la _finestra di conversazione"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14092,21 +13852,17 @@
 msgid "Hyperlink Color"
 msgstr "Colore per i collegamenti"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Colore per i collegamenti"
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati"
+
 msgid "Highlighted Message Name Color"
-msgstr "Messaggi evidenziati"
-
-#, fuzzy
+msgstr "Colore per i messaggi evidenziati"
+
 msgid "Typing Notification Color"
 msgstr "Colore per la notifica di scrittura"
 
-#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
-msgstr "Una versione a scorrimento orizzontale della lista contatti."
+msgstr "Separazione orizzontale per GtkTreeView"
 
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
@@ -14131,27 +13887,23 @@
 msgid "GTK+ Interface Font"
 msgstr "Carattere per l'interfaccia GTK+"
 
-#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Controllo del tema GTK+"
-
-#, fuzzy
+msgstr "Scorciatoia per il nome del tema GTK+"
+
 msgid "Disable Typing Notification Text"
-msgstr "Abilita la notifica di scrittura"
-
-#, fuzzy
+msgstr "Disabilita il testo per la notifica di scrittura"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Controllo del tema GTK+ per Pidgin"
-
-#, fuzzy
+msgstr "Impostazioni per il controllo del tema GTK+"
+
 msgid "Colors"
-msgstr "Chiudi"
+msgstr "Colori"
 
 msgid "Fonts"
 msgstr "Caratteri"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscellanea"
 
 msgid "Gtkrc File Tools"
 msgstr "Strumenti per il file gtkrc"
@@ -14185,18 +13937,16 @@
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Puoi aggiornare a %s %s oggi."
 
 msgid "New Version Available"
 msgstr "Nuova versione disponibile"
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
-
-#, fuzzy
+msgstr "Più tardi"
+
 msgid "Download Now"
-msgstr "Scarica %s: %s"
+msgstr "Scarica adesso"
 
 #. *< type
 #. *< ui_requirement
@@ -14238,7 +13988,6 @@
 msgstr "Pulsante 'Invia' per la finestra di conversazione."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14299,94 +14048,81 @@
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
 "dall'utente."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Non connesso"
-
-#, fuzzy
+msgstr "Appena entrato"
+
 msgid "Just logged out"
-msgstr "Non connesso"
+msgstr "Appena uscito"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icona per il contatto/\n"
+"Icona per persone sconosciute"
+
 msgid "Icon for Chat"
-msgstr "Entra in chat"
-
-#, fuzzy
+msgstr "Icona per la chat"
+
 msgid "Ignored"
-msgstr "Ignora"
-
-#, fuzzy
+msgstr "Ignorato"
+
 msgid "Founder"
-msgstr "Più alto"
-
-#, fuzzy
+msgstr "Fondatore"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operatore"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Mezzo operatore"
+
 msgid "Authorization dialog"
-msgstr "Autorizzazione concessa"
-
-#, fuzzy
+msgstr "Finestra di autorizzazione"
+
 msgid "Error dialog"
-msgstr "Errore"
-
-#, fuzzy
+msgstr "Finestra di errore"
+
 msgid "Information dialog"
-msgstr "Informazione"
+msgstr "Finestra di informazione"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Finestra della posta"
+
 msgid "Question dialog"
 msgstr "Finestra di richiesta"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Livello di richiamo"
+msgstr "Finestra di avviso"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Che tipo di finestra è questa?"
+
 msgid "Status Icons"
-msgstr "Stato per %s"
-
-#, fuzzy
+msgstr "Icone di stato"
+
 msgid "Chatroom Emblems"
-msgstr "Lingua della chat room"
-
-#, fuzzy
+msgstr "Emblemi per le stanze di discussione"
+
 msgid "Dialog Icons"
-msgstr "Salva l'icona"
-
-#, fuzzy
+msgstr "Icone delle finestre"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Controllo del tema GTK+ per Pidgin"
-
-#, fuzzy
+msgstr "Editor del tema delle icone di Pidgin"
+
 msgid "Contact"
-msgstr "Informazioni sul contatto"
-
-#, fuzzy
+msgstr "Contatto"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Lista contatti"
-
-#, fuzzy
+msgstr "Editor del tema della lista contatti di Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lista contatti"
+msgstr "Modifica il tema della lista contatti"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Modifica il tema delle icone"
 
 #. *< type
 #. *< ui_requirement
@@ -14395,16 +14131,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Controllo del tema GTK+ per Pidgin"
+msgstr "Editor del tema di Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Controllo del tema GTK+ per Pidgin"
+msgstr "Editor del tema di Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -14574,7 +14308,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
@@ -14612,847 +14345,12 @@
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Invia e riceve blocchi XMPP"
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
-#~ msgid "Cannot open socket"
-#~ msgstr "Impossibile aprire il socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Impossibile ascoltare sul socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Impossibile leggere il socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "Connessione fallita."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Il server ti ha disconnesso"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Impossibile creare il socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Impossibile connettersi all'host"
-
-#~ msgid "Read error"
-#~ msgstr "Errore di lettura"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile stabilire una connessione con il server:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Errore di scrittura"
-
-#~ msgid "Last Activity"
-#~ msgstr "Ultima attività"
-
-#, fuzzy
-#~ msgid "Service Discovery Info"
-#~ msgstr "/Conversazione/_Info"
-
-#, fuzzy
-#~ msgid "Service Discovery Items"
-#~ msgstr "<b>Oggetti da sincronizzare</b>"
-
-#, fuzzy
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Tipo di stanza non supportato"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Chat multi-utente"
-
-#, fuzzy
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#, fuzzy
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Email nella cartella:"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comandi ad-hoc"
-
-#, fuzzy
-#~ msgid "PubSub Service"
-#~ msgstr "Servizio non disponibile"
-
-#, fuzzy
-#~ msgid "Out of Band Data"
-#~ msgstr "Tempo limite esaurito per il socket dati"
-
-#, fuzzy
-#~ msgid "XHTML-IM"
-#~ msgstr "Finestre dei _messaggi immediati"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Riempi i campi per la registrazione."
-
-#~ msgid "User Location"
-#~ msgstr "Posizione dell'utente"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar dell'utente"
-
-#, fuzzy
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notifica i nuovi messaggi di posta"
-
-#~ msgid "Software Version"
-#~ msgstr "Versione del software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inizializzazione dello stream"
-
-#~ msgid "User Mood"
-#~ msgstr "Umore dell'utente"
-
-#~ msgid "User Activity"
-#~ msgstr "Attività dell'utente"
-
-#, fuzzy
-#~ msgid "Entity Capabilities"
-#~ msgstr "Capacità"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negoziazione della sessione crittografata"
-
-#~ msgid "User Tune"
-#~ msgstr "Brano ascoltato dall'utente"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Scambio degli elementi del roster"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Indirizzo notiziario:"
-
-#~ msgid "User Profile"
-#~ msgstr "Profilo dell'utente"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle audio"
-
-#~ msgid "User Nickname"
-#~ msgstr "Nickname dell'utente"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle Raw UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Ricevute per il messaggio"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Pubblicazione della chiave pubblica"
-
-#~ msgid "User Chatting"
-#~ msgstr "Chat con l'utente"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Crittazione di trillian"
-
-#, fuzzy
-#~ msgid "Entity Time"
-#~ msgstr "Tempo di inattività"
-
-#, fuzzy
-#~ msgid "Delayed Delivery"
-#~ msgstr "Per i messaggi ritardati"
-
-#, fuzzy
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Mostra oggetti in database"
-
-#, fuzzy
-#~ msgid "File Repository and Sharing"
-#~ msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negoziazione di una sessione criptata semplificata"
-
-#, fuzzy
-#~ msgid "Hop Check"
-#~ msgstr "controllo annullato.\n"
-
-#~ msgid "Read Error"
-#~ msgstr "Errore di lettura"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Buffer di lettura pieno (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Messaggio indecifrabile"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Impossibile connettersi all'host: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Login non riuscito (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Errore. Il supporto SSL non è installato."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Password non corretta."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile connettersi al server BOS:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Impossibile connettersi"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nome utente non valido."
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Impossibile decrittare la risposta al login"
-
-#~ msgid "Connection lost"
-#~ msgstr "Connessione persa"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Impossibile risolvere l'host"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Connessione chiusa (scrittura in corso)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Connessione reimpostata"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Errore di lettura dal socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Impossibile connettersi all'host"
-
-#~ msgid "Could not write"
-#~ msgstr "Impossibile scrivere"
-
-#~ msgid "Could not connect"
-#~ msgstr "Impossibile connettersi"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Impossibile creare il socket in ascolto"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Impossibile risolvere il nome dell'host"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Password non corretta"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile stabilire una connessione con %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Giappone"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Server pager (Giappone)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Server per il trasferimento file (Giappone)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Connessione persa con il server\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Impossibile risolvere il nome dell'host"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Finestre di conversazione nascoste"
-
-#~ msgid "More Data needed"
-#~ msgstr "C'è bisogno di più dati"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Scegli un'immagine per lo smiley."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Quale ID vuoi attivare?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Colore del cursore"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Colore per il cursore secondario"
-
-#~ msgid "Interface colors"
-#~ msgstr "Colori dell'interfaccia"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Dimensioni dei widget"
-
-#~ msgid "Invite message"
-#~ msgstr "Messaggio di invito"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Inserisci il nome del contatto che vuoi invitare,\n"
-#~ "insieme a un messaggio di invito (opzionale)."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Impossibile ottenere la rubrica MSN"
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] "Connessione al server persa (nessun dato ricevuto in %d secondo)"
-#~ msgstr[1] "Connessione al server persa (nessun dato ricevuto in %d secondi)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è "
-#~ "risolto il problema. Controlla %s per aggiornamenti."
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Aggiungi un contatto"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Impossibile decrittare la risposta al login"
-
-#, fuzzy
-#~ msgid "Keep alive error"
-#~ msgstr "Errore nell'aggiunta del contatto"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Connessione persa col server:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server di connessione"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Impossibile inviare il messaggio immediato"
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Non sei un membro del gruppo \"%s\"\n"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Ricerca di %s in corso"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Connessione a %s fallita"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Connessione a: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Impossibile scrivere il file %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Impossibile leggere il file %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s non è attualmente connesso."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Richiamo a %s non consentito."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Un messaggio è stato rifiutato. Stai superando il limite di velocità del "
-#~ "server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "La chat in %s non è disponibile."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Stai inviando troppo velocemente messaggi a %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Non hai ricevuto un messaggio da %s poiché era troppo grande."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr ""
-#~ "Non hai ricevuto un messaggio da %s poiché è stato spedito troppo "
-#~ "velocemente."
-
-#~ msgid "Failure."
-#~ msgstr "Fallimento."
-
-#~ msgid "Too many matches."
-#~ msgstr "Troppe corrispondenze."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Servono più qualificatori."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Servizio di directory temporaneamente non disponibile."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Ricerca email limitata."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Parola chiave ignorata."
-
-#~ msgid "No keywords."
-#~ msgstr "Nessuna parola chiave."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#~ msgid "Country not supported."
-#~ msgstr "Paese non supportato."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Errore sconosciuto: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Nome utente o password non corretti."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Il servizio è temporaneamente non disponibile."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Il tuo livello di richiamo è attualmente troppo alto per poterti "
-#~ "connettere."
-
-#~ msgid ""
-#~ "You have been connecting and disconnecting too frequently.  Wait ten "
-#~ "minutes and try again.  If you continue to try, you will need to wait "
-#~ "even longer."
-#~ msgstr ""
-#~ "Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
-#~ "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Si è verificato un errore sconosciuto di connessione: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Si è verificato un errore sconosciuto, %d. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Nome gruppo non valido"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Connessione chiusa"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "In attesa di risposta..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC è ritornato dalla pausa. Puoi nuovamente inviare messaggi."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Password modificata con successo"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Ottieni informazioni dalla Directory"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Imposta le informazioni sulla Directory"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Impossibile aprire %s in scrittura!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Trasferimento file fallito: probabilmente è stato annullato dall'altra "
-#~ "parte."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Impossibile connettersi per il trasferimento."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Impossibile scrivere l'header del file. Il file non verrà inviato."
-
-#~ msgid "Save As..."
-#~ msgstr "Salva con nome..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s chiede che tu gli invii un file"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Plugin per il protocollo TOC"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Informazioni sull'utente %s non disponibili"
-
-#~ msgid "%s Options"
-#~ msgstr "Opzioni %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opzioni del proxy"
-
-#~ msgid "By log size"
-#~ msgstr "Per dimensione del log"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Apri il collegamento nel browser"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Server ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Immagine per lo smiley"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "S_corciatoia per lo smiley"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Illumina la finestra quando arriva un messaggio di chat"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Esiste già una gruppo con questo nome."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informazioni primarie"
-
-#~ msgid "Blood Type"
-#~ msgstr "Gruppo sanguigno"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Aggiorna le mie informazioni"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocità:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "I volti personalizzati non sono attualmente supportati. Scegli "
-#~ "un'immagine da %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Volto QQ non valido"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Hai rifiutato la richiesta di %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Rifiuta la richiesta"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr ""
-#~ "Impossibile aggiungere il contatto attraverso la richiesta di "
-#~ "autorizzazione"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Impossibile caricare la lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Numero QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descrizione del gruppo"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizzazione"
-
-#~ msgid "Approve"
-#~ msgstr "Approva"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata rifiutata "
-#~ "dall'amministratore %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Tu [%d] hai lasciato il gruppo \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Sono un membro"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Richiesta non valida"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sono l'amministratore"
-
-#~ msgid "Unknown status"
-#~ msgstr "Stato sconosciuto"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Rimuovi il gruppo"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr ""
-#~ "Hai inserito un ID di gruppo al di fuori dell'intervallo accettabile"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sei sicuro di voler abbandonare questo Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Numero di telefono"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informazioni sul canale"
-
-#~ msgid "System Message"
-#~ msgstr "Messaggio di sistema"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Ultimo IP di login</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultimo orario di login</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Imposta le mie informazioni"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Abbandona questo Qun QQ"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blocca questo utente"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Errore nella modifica della password"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Impossibile connettersi al server"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Connessione in corso al server %s, tentativi %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Vuoi aggiungere questo contatto?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s ti [%s] ha aggiunto alla sua lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contatto"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s vuole aggiungerti [%s] come amico"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s non è nella tua lista contatti"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Vuoi aggiungerlo?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Porta del server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "La controparte si è disconnessa"
-
-#~ msgid "developer"
-#~ msgstr "sviluppatore"
-
-#~ msgid "XMPP developer"
-#~ msgstr "sviluppatore XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Artisti"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi "
-#~ "scaricarla da <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Elenco delle modifiche:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF durante la lettura dal processo del resolver"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Le tue informazioni sono state aggiornate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Contatto rimosso con successo"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Hai rimosso con successo te stesso dalla lista del tuo amico"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Hai aggiunto %d alla lista contatti"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid non valido"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Inserisci un ID per il gruppo esterno"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motivo: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata approvata "
-#~ "dall'amministratore %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Ho richiesto di entrare"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Hai abbandonato il gruppo con successo"
-
-#, fuzzy
-#~ msgid "QQ Group Auth"
-#~ msgstr "IMAP errore di autorizzazione"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "La tua richiesta di autorizzazione è stata accettata dal server QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "MySpace"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Nome host reale</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Mostra le informazioni sul login"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Intervallo(i) per il reinvio"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "il nome host è NULL o la porta è 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Impossibile effettuare il login. Verifica il log di debug."
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Impossibile rimuovere il contatto"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "L'utente %s ha rifiutato la tua richiesta"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "L'utente %s ha accettato la tua richiesta"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Annuncio da: %s"
+#~ msgid ": %s"
+#~ msgstr ": %s"
--- a/po/nn.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/nn.po	Wed Aug 19 00:37:01 2009 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 23:34-0700\n"
-"PO-Revision-Date: 2009-08-01 13:29+0100\n"
+"POT-Creation-Date: 2009-08-09 19:06-0700\n"
+"PO-Revision-Date: 2009-08-09 02:41+0100\n"
 "Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -12132,6 +12132,9 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s ønskjer å starta ei biletøkt med deg."
 
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12673,7 +12676,7 @@
 "(%s for filnamn)"
 
 msgid "M_ute sounds"
-msgstr "&Demp lydar"
+msgstr "_Demp lydar"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
@@ -12688,7 +12691,7 @@
 msgstr "Spel"
 
 msgid "_Browse..."
-msgstr "Bla &gjennom…"
+msgstr "Bla _gjennom…"
 
 msgid "_Reset"
 msgstr "_Nullstill"
@@ -13068,9 +13071,6 @@
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
-msgid "_Pause"
-msgstr "_Pause"
-
 msgid "_Edit"
 msgstr "_Endra"
 
--- a/po/ro.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/ro.po	Wed Aug 19 00:37:01 2009 +0000
@@ -1,14 +1,15 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# Copyright (C) 2002-2008, Mișu Moldovan <dumol@gnome.ro>
+# 2002-2009, Mișu Moldovan <dumol@gnome.ro>
+# 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.5.3\n"
+"Project-Id-Version: pidgin-2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-01-07 00:42+0200\n"
+"POT-Creation-Date: 2009-08-08 09:57-0400\n"
+"PO-Revision-Date: 2009-08-13 01:42+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Încercați „%s -h” pentru mai multe informații.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -871,12 +872,11 @@
 msgid "System Log"
 msgstr "Înregistrări de sistem"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Se calculează..."
+msgstr "Se apelează..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Închide"
 
 #. Number of actions
 msgid "Accept"
@@ -886,25 +886,24 @@
 msgstr "Respingere"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Apel în curs."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Apelul a fost încheiat."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s încearcă să inițieze o sesiune media nesuportată."
+
 msgid "You have rejected the call."
-msgstr "Ați părăsit chat-ul%s%s"
+msgstr "Ați refuzat apelul"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "apelează: inițiază un apel audio"
 
 msgid "Emails"
 msgstr "Mailuri"
@@ -1370,7 +1369,7 @@
 msgstr "Activare"
 
 msgid "Invalid title"
-msgstr "Titlu invalid"
+msgstr "Titlu nevalid"
 
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduceți un titlu de cel puțin un caracter pentru status."
@@ -1474,7 +1473,7 @@
 msgstr "Fă și zgomot!"
 
 msgid "Set URGENT for the terminal window."
-msgstr "Schimbă starea fereastrei terminalului în URGENT"
+msgstr "Schimbă starea ferestrei terminalului în URGENT"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1562,22 +1561,23 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Se creează un TinyURL..."
 
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Creează TinyURL numai pentru URL-uri de această lungime sau mai mari"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefixul adresei TinyURL (sau altceva)"
+
 msgid "TinyURL"
-msgstr "URL piesă curentă"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Modul TinyURL"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "Când primiți un mesaj cu URL-uri, folosiți TinyURL pentru copiere mai ușoară"
 
 msgid "accounts"
 msgstr "conturi"
@@ -1682,6 +1682,45 @@
 msgid "_View Certificate..."
 msgstr "_Vizualizare certificat..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
+"putea însemna că nu vă conectați la serviciul la care credeți că vă "
+"conectați."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "Eroare în certificatul SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Lanț de certificare nevalid"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
+"fi validat."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1692,29 +1731,11 @@
 "Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
 "verificat automat."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Lanțul de certificare prezentat de %s nu este valid."
 
-#. 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 "Eroare în certificatul SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Lanț de certificare invalid"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
-"fi validat."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1732,20 +1753,7 @@
 "la autoritatea de certificare cu care pretinde că a fost creat."
 
 msgid "Invalid certificate authority signature"
-msgstr "Semnătura invalidă de la autoritatea de certificare"
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
-"putea însemna că nu vă conectați la serviciul la care credeți că vă "
-"conectați."
+msgstr "Semnătură nevalidă de la autoritatea de certificare"
 
 #. Make messages
 #, c-format
@@ -1783,7 +1791,7 @@
 msgstr "+++ %s s-a deconectat"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -1830,9 +1838,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s a ieșit din chat (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invită într-o conferință"
+msgstr "Invită într-un chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -1973,6 +1980,10 @@
 msgstr "Se inițiază transferul fișierului %s de la %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferul fișierului <A HREF=\"file://%s\">%s</A> s-a terminat"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fișierului %s s-a terminat"
 
@@ -2195,9 +2206,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Eroare la stabilirea conexiunii"
+msgstr "Eroare la inițierea conferinței"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2518,8 +2528,8 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Sunteți momentan deconectat(ă). Nu veți mai primi mesaje până la următoarea "
-"autentificare."
+"Contul vă este momentan deconectat. Nu veți mai primi mesaje până la "
+"următoarea autentificare."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depășit mărimea maximă."
@@ -2599,7 +2609,6 @@
 msgstr "Importă înregistrările altor clienți IM."
 
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2608,8 +2617,7 @@
 "at your own risk!"
 msgstr ""
 "La consultarea înregistrărilor, acest modul va include înregistrările din "
-"alți clienți IM precum: Adium, Fire, Messenger Plus!, MSN Messenger și "
-"Trillian.\n"
+"alți clienți IM precum: Adium, MSN Messenger, aMSN și Trillian.\n"
 "\n"
 "Atenție! Acest modul este în stadiu alpha și e instabil."
 
@@ -2656,13 +2664,12 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteți apoi edita sau șterge "
-"întâmpinarea din fereastra de editare a întâmpinărilor."
+"întâmpinarea din fereastra „Întâmpinări contacte”."
 
 #, c-format
 msgid ""
@@ -2692,9 +2699,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Introduceți parola"
+msgstr "Parolă de unică folosință"
 
 #. *< type
 #. *< ui_requirement
@@ -2703,13 +2709,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Suport pentru parole de unică folosință"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Impune ca parolele să fie folosite o singură dată"
 
 #. *  description
 msgid ""
@@ -2717,6 +2723,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Vă permite să impuneți pentru fiecare cont ca parolele ce nu sunt salvate "
+"să fie folosite pentru o singură conectare cu succes.\n"
+"Notă: Parola contului trebuie să nu fie salvată pentru a funcționa."
 
 #. *< type
 #. *< ui_requirement
@@ -2909,7 +2918,6 @@
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriți să utilizați module TCL, "
 "instalați ActiveTCL de la http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
@@ -2917,10 +2925,8 @@
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultați: http://"
 "d.pidgin.im/BonjourWindows ."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr ""
-"Utilizarea interfaței de rețea pentru a detecta noi conexiuni IM a eșuat\n"
+msgstr "Nu se poate asculta pentru noi conexiuni IM"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2958,9 +2964,8 @@
 msgstr "Persoană Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Localitate"
+msgstr "Port local"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2972,33 +2977,31 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuția nu a putut fi inițiată."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut crea un socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Nu se poate face bind pentru socket pe port"
-
-#, fuzzy, c-format
+msgstr "Nu s-a putut lega socketul de port: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
+"Nu se poate asculta la socketul: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."
 
 msgid "Invalid proxy settings"
-msgstr "Opțiuni proxy invalide"
+msgstr "Opțiuni proxy greșite"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Numele serverului sau portul precizat pentru tipul proxy-ului sunt invalide."
+"Numele serverului sau portul precizat pentru tipul proxy-ului sunt greșite."
 
 msgid "Token Error"
 msgstr "Eroare verificare"
@@ -3034,17 +3037,14 @@
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fișierul..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Completați câmpurile de înregistrare."
-
-#, fuzzy
+msgstr "Trebuie să completați toate câmpurile de înregistrare."
+
 msgid "Passwords do not match"
 msgstr "Parolele nu se potrivesc."
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
+msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare necunoscută."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Noul cont Gadu-Gadu a fost înregistrat"
@@ -3059,11 +3059,10 @@
 msgstr "Confirmare parolă"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Introduceți textul captcha"
+
 msgid "Captcha"
-msgstr "Salvează imaginea"
+msgstr "Imagine captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
@@ -3202,9 +3201,9 @@
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Nu se poate rezolva numele calculatorului '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3217,7 +3216,6 @@
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-#, fuzzy
 msgid "Not connected to the server"
 msgstr "Neconectat la server."
 
@@ -3260,9 +3258,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Introducere detalii..."
+msgstr "Server GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3278,9 +3275,8 @@
 msgid "File Transfer Failed"
 msgstr "Transferul fișierului a eșuat"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Nu s-a putut deschide un port pentru a asculta."
+msgstr "Nu s-a putut deschide un port pentru ascultare."
 
 msgid "Error displaying MOTD"
 msgstr "Eroare la afișarea MOTD"
@@ -3302,11 +3298,10 @@
 #.
 #. 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 ""
-"S-a pierdut conexiunea cu serverul:\n"
-"%s"
+"S-a pierdut conexiunea cu serverul: %s"
 
 msgid "View MOTD"
 msgstr "Afișare MOTD"
@@ -3317,9 +3312,8 @@
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Pseudonimele IRC nu pot conține spații"
+msgstr "Pseudonimele și serverele IRC nu pot conține spații"
 
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
@@ -3328,11 +3322,11 @@
 msgstr "Conectare eșuată"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Conectarea la %s a eșuat"
-
-#, fuzzy, c-format
+msgstr "Conectarea a eșuat: %s"
+
+#, c-format
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea."
 
@@ -3499,32 +3493,31 @@
 msgstr "mod (%s %s) de către %s"
 
 msgid "Invalid nickname"
-msgstr "Pseudonim invalid"
+msgstr "Pseudonim greșit"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Pseudonimul ales a fost respins de către server. Probabil conține caractere "
-"invalide."
+"nevalide."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Numele de cont ales a fost respins de către server. Probabil conține "
-"caractere invalide."
+"caractere nevalide."
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Există deja un chat cu acest nume"
-
-#, fuzzy
+msgstr "Pseudonimul „%s” este deja utilizat."
+
 msgid "Nickname in use"
-msgstr "Pseudonim"
+msgstr "Pseudonim utilizat deja"
 
 msgid "Cannot change nick"
 msgstr "Nu se reușește schimbarea pseudonimului"
@@ -3537,7 +3530,7 @@
 msgstr "Ați părăsit chat-ul%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "Eroare: PONG invalid de la server"
+msgstr "Eroare: PONG nevalid de la server"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3768,13 +3761,11 @@
 msgid "execute"
 msgstr "execută"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
+"Serverul necesită TLS/SSL, dar nu s-a găsit nici un fel de "
 "suport TLS/SSL."
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ați cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."
 
@@ -3792,13 +3783,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autentificare eșuată"
-
-#, fuzzy
+msgstr "Autentificare SASL eșuată"
+
 msgid "Invalid response from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Răspuns nevalid de la server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
@@ -3807,38 +3796,32 @@
 msgstr "Ați cerut criptare, dar serverul nu suportă criptare"
 
 msgid "Invalid challenge from server"
-msgstr "Cerere invalidă de la server"
-
-#, fuzzy, c-format
+msgstr "Cerere nevalidă de la server"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "Eroare SASL"
+msgstr "Eroare SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Managerul de conexiune BOSH a încheiat sesiunea."
+
 msgid "No session ID given"
-msgstr "Fără motiv."
-
-#, fuzzy
+msgstr "Nu s-a primit un identificator de sesiune"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versiune nesuportată"
-
-#, fuzzy
+msgstr "Versiune nesuportată de protocol BOSH"
+
 msgid "Unable to establish a connection with the server"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut face o conexiune cu serverul"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy
+"Nu s-a putut face o conexiune cu serverul: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Nu se poate inițializa o nouă conexiune"
+msgstr "Nu se poate inițializa conexiunea SSL"
 
 msgid "Full Name"
 msgstr "Nume complet"
@@ -3855,6 +3838,11 @@
 msgid "Street Address"
 msgstr "Adresă locală"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Adresă completă"
 
@@ -3906,9 +3894,8 @@
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Fișier local:"
+msgstr "Ora locală"
 
 msgid "Priority"
 msgstr "Prioritate"
@@ -3918,11 +3905,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "acum %s"
+
 msgid "Logged Off"
-msgstr "Autentificat"
+msgstr "Deconectat"
 
 msgid "Middle Name"
 msgstr "Inițială"
@@ -3945,14 +3931,12 @@
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenței"
 
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4018,7 +4002,7 @@
 msgstr "Caută"
 
 msgid "Invalid Directory"
-msgstr "Director invalid"
+msgstr "Director nevalid"
 
 msgid "Enter a User Directory"
 msgstr "Introduceți un director cu utilizatori"
@@ -4043,21 +4027,21 @@
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Name"
-msgstr "Nume invalid de chat"
+msgstr "Nume incorect de chat"
 
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nu este un nume valid de server"
 
 msgid "Invalid Server Name"
-msgstr "Nume invalid de contact"
+msgstr "Nume incorect de contact"
 
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Handle"
-msgstr "Titlu invalid de chat"
+msgstr "Titlu incorect de chat"
 
 msgid "Configuration error"
 msgstr "Eroare de configurare"
@@ -4081,7 +4065,7 @@
 msgstr "Eroare la obținerea listei camerelor de chat"
 
 msgid "Invalid Server"
-msgstr "Server invalid"
+msgstr "Server nevalid"
 
 msgid "Enter a Conference Server"
 msgstr "Conectare la un server de conferințe"
@@ -4092,36 +4076,32 @@
 msgid "Find Rooms"
 msgstr "Caută camere de chat"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Afilieri:"
+
 msgid "No users found"
-msgstr "Nu s-au găsit utilizatori care să corespundă"
-
-#, fuzzy
+msgstr "Nu s-au găsit utilizatori"
+
 msgid "Roles:"
-msgstr "Funcție"
-
-#, fuzzy
+msgstr "Roluri:"
+
 msgid "Ping timed out"
-msgstr "Expirare ping"
+msgstr "Ping expirat"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Nu s-au găsit metode XMPP alternative de conectare după eșuarea conexiunii directe."
 
 msgid "Invalid XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "ID XMPP invalid. Trebuie precizat domeniul."
-
-#, fuzzy
+msgstr "ID XMPP nevalid. Trebuie precizat domeniul."
+
 msgid "Malformed BOSH URL"
-msgstr "Conectarea la server a eșuat."
+msgstr "URL BOSH nevalid"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4190,10 +4170,6 @@
 msgid "Change Registration"
 msgstr "Modificare înregistrare"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Conectarea la server a eșuat."
-
 msgid "Error unregistering account"
 msgstr "Eroare la ștergerea contului înregistrat"
 
@@ -4305,7 +4281,7 @@
 msgstr "Căutare utilizatori..."
 
 msgid "Bad Request"
-msgstr "Cerere invalidă"
+msgstr "Cerere nevalidă"
 
 msgid "Conflict"
 msgstr "Conflict"
@@ -4326,7 +4302,7 @@
 msgstr "Elementul nu a fost găsit"
 
 msgid "Malformed XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Not Acceptable"
 msgstr "Inacceptabil"
@@ -4368,10 +4344,10 @@
 msgstr "Codare incorectă la autorizare"
 
 msgid "Invalid authzid"
-msgstr "„Authzid” invalid"
+msgstr "„Authzid” nevalid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Mecanism invalid de autorizare"
+msgstr "Mecanism nevalid de autorizare"
 
 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
@@ -4395,25 +4371,25 @@
 msgstr "Conexiunea a expirat"
 
 msgid "Host Gone"
-msgstr "Gazda a dispărut"
+msgstr "Serverul nu mai e prezent"
 
 msgid "Host Unknown"
-msgstr "Gazdă necunoscută"
+msgstr "Server necunoscut"
 
 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"
 
 msgid "Invalid ID"
-msgstr "Identitate invalidă"
+msgstr "Identitate nevalidă"
 
 msgid "Invalid Namespace"
-msgstr "„Namespace” invalid"
+msgstr "„Namespace” nevalid"
 
 msgid "Invalid XML"
-msgstr "XML invalid"
+msgstr "XML nevalid"
 
 msgid "Non-matching Hosts"
-msgstr "Gazdele nu se potrivesc"
+msgstr "Numele de server nu se potrivesc"
 
 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
@@ -4428,7 +4404,7 @@
 msgstr "XML restrictiv"
 
 msgid "See Other Host"
-msgstr "Verificați cealaltă gazdă"
+msgstr "Verificați celălalt nume de server"
 
 msgid "System Shutdown"
 msgstr "Închidere sistem"
@@ -4479,23 +4455,23 @@
 msgid "Unable to ping user %s"
 msgstr "Nu se poate da „ping” către utilizatorul %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
-"Nu se poate da „buzz” pentru că nu se știe nimic despre utilizatorul %s."
-
-#, fuzzy, c-format
+"Nu se poate da „buzz” pentru că nu se știe nimic despre %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
 "Nu se poate da „buzz” pentru că aplicația utilizatorului „%s” nu suportă "
-"acest lucru."
+"acest lucru sau nu dorește să primească „buzz” acum."
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4510,35 +4486,33 @@
 msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, JID nevalid"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Nu se poate trimite fișierul către %s, contactul nu este conectat"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, contactul nu este conectat"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Nu se poate trimite fișierul către %s, nu e subscris pentru prezență"
-
-#, fuzzy
+msgstr "Nu se poate iniția media cu %s, nu e subscris pentru prezență"
+
 msgid "Media Initiation Failed"
-msgstr "Înregistrare eșuată"
-
-#, fuzzy, c-format
+msgstr "Inițializare media eșuată"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Precizați cărei resurse a contactului %s doriți să-i trimiteți fișierul"
+"Precizați cu ce resursă a contactului %s ați dori să porniți o sesiune media."
 
 msgid "Select a Resource"
 msgstr "Selectați o resursă"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Inițiază o _discuție"
+msgstr "Inițiază media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurați o cameră de chat."
@@ -4559,21 +4533,19 @@
 msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Blocați accesul unui utilizator în chat."
 
-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;nume ales&gt; &lt;deținător|administrator|membru|renegat|"
-"niciuna&gt;:  Setați afilierea unui utilizator față de camera de chat."
-
-#, fuzzy
+"affiliate &lt;deținător|administrator|membru|renegat|nimic&gt; [pseudonim1] [pseudonim2] ...:"
+" Aflați utilizatorii cu o afiliere sau setați afilierea utilizatorilor față de camera de chat."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
-"Setați rolul unui utilizator în camera de chat."
+"role &lt;moderator|participant|vizitator|nimic&gt; [pseudonim1] [pseudonim2] ...: "
+"Aflați utilizatorii cu un rol sau setați rolul utilizatorilor în camera de chat."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitați un utilizator într-un chat."
@@ -4635,7 +4607,7 @@
 msgstr "Servere proxy pentru transfer de fișiere"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4699,32 +4671,28 @@
 msgid "_Accept Defaults"
 msgstr "_Opțiuni implicite"
 
-#, fuzzy
 msgid "No reason"
 msgstr "Fără motiv."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Ați fost dat afară din %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Ați fost dat afară: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Respins de %s: (%s)"
-
-#, fuzzy
+msgstr "Dat afară (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "A apărut o eroare la deschiderea fișierului."
-
-#, fuzzy
+msgstr "A apărut o eroare la transferul de octeți în-bandă\n"
+
 msgid "Transfer was closed."
-msgstr "Transferul fișierului a eșuat"
-
-#, fuzzy
+msgstr "Transferul a fost închis"
+
 msgid "Failed to open the file"
-msgstr "Nu s-a putut deschide fișierul „%s”: %s"
+msgstr "Nu s-a putut deschide fișierul"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Nu s-a putut deschide fluxul de octeți în-bandă"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4736,7 +4704,7 @@
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
+msgstr "Nu se poate trimite fișierul către %s, JID nevalid"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4828,7 +4796,7 @@
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Adresă de mail invalidă"
+msgstr "Adresă de mail nevalidă"
 
 #, c-format
 msgid "User does not exist"
@@ -4844,11 +4812,11 @@
 
 #, c-format
 msgid "Invalid username"
-msgstr "Nume invalid de utilizator"
+msgstr "Nume nevalid de utilizator"
 
 #, c-format
 msgid "Invalid friendly name"
-msgstr "Pseudonimul propriu este invalid"
+msgstr "Pseudonimul propriu este nevalid"
 
 #, c-format
 msgid "List full"
@@ -4880,7 +4848,7 @@
 
 #, c-format
 msgid "Invalid group"
-msgstr "Grup invalid"
+msgstr "Grup nevalid"
 
 #, c-format
 msgid "User not in group"
@@ -4992,7 +4960,7 @@
 
 #, c-format
 msgid "Bad friend file"
-msgstr "Fișier invalid"
+msgstr "Fișier „friend” nevalid"
 
 #, c-format
 msgid "Not expected"
@@ -5047,11 +5015,26 @@
 msgid "Non-IM Contacts"
 msgstr "Contacte de alt tip"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s a trimis un wink. <a href='msn-wink://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a trimis un wink, dar nu a putut fi salvat"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s a trimis un clip audio. <a href='audio://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a trimis un clip audio, dar acesta nu a putut fi salvat"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+"%s v-a trimis o invitație de chat audio, pentru care nu există încă suport."
 
 msgid "Nudge"
 msgstr "Buzz"
@@ -5205,6 +5188,29 @@
 msgstr ""
 "Pentru MSN aveți nevoie de suport SSL. Instalați bibliotecile SSL necesare. "
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
+"Un nume valid trebuie să fie o adresă de mail."
+
+msgid "Unable to Add"
+msgstr "Adăugare eșuată"
+
+msgid "Authorization Request Message:"
+msgstr "Mesaj cerere de autorizare:"
+
+msgid "Please authorize me!"
+msgstr "Am nevoie de autorizare..."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
 
@@ -5391,19 +5397,20 @@
 msgstr "Autentificare Windows Live ID: Conectare eșuată"
 
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Autentificare Windows Live ID: Răspuns invalid"
+msgstr "Autentificare Windows Live ID: Răspuns nevalid"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vă sâcâie cu un „nudge”!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Eroare necunoscută (%d)"
+msgstr "Eroare necunoscută (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Eroare necunoscută (%d)"
@@ -5430,18 +5437,20 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"Serverul MSN va fi închis pentru întreținere într-un minut. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere într-un minut. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[1] ""
-"Serverul MSN va fi închis pentru întreținere în %d minute. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere în %d minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[2] ""
-"Serverul MSN va fi închis pentru întreținere în %d de minute. Veți fi "
-"automat deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile "
+"Serverul MSN va fi închis pentru întreținere în %d de minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
 "începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
@@ -5477,22 +5486,18 @@
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
 
@@ -5523,17 +5528,15 @@
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a cerut o permisiune de acces la webcam, dar această cerere nu "
+"este încă suportată"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a trimis o invitație de acces la webcam, invitație ce nu este "
+"încă suportată"
 
 msgid "Away From Computer"
 msgstr "Absent din fața calculatorului"
@@ -5583,7 +5586,7 @@
 msgstr "Doriți să ștergeți acest contact din lista de contacte?"
 
 msgid "The username specified is invalid."
-msgstr "Numele de utilizator specificat este invalid."
+msgstr "Numele de utilizator specificat este nevalid."
 
 msgid "This Hotmail account may not be active."
 msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
@@ -5702,7 +5705,6 @@
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
 msgstr "Prieteni IM"
 
@@ -5714,27 +5716,32 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"Un contact a fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[1] ""
+"%d contacte au fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[2] ""
-
-#, fuzzy
+"%d de contacte au fost adăugat ori actualizat de pe server (incluzând "
+"contacte deja prezente în lista de pe server)"
+
 msgid "Add contacts from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Adăugare contacte de pe server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Eroare de protocol, codul %d: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Aveți o parolă de %d caractere, mai mare decât lungimea maximă de %d în "
-"MySpaceIM. E necesar să introduceți o parolă mai scurtă la http://"
+"%s Aveți o parolă de %zu caractere, mai mare decât lungimea maximă de %d. "
+"Puteți introduce o parolă mai scurtă la http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"și să încercați din onu."
+"și să încercați din nou."
 
 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
@@ -5743,7 +5750,7 @@
 msgstr "Eroare MySpaceIM"
 
 msgid "Invalid input condition"
-msgstr "Condiție de intrare invalidă"
+msgstr "Condiție de intrare nevalidă"
 
 msgid "Failed to add buddy"
 msgstr "Adăugarea contactului a eșuat"
@@ -5777,38 +5784,35 @@
 "MySpaceIM nu va încărcat."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "Adăugați contacte de pe MySpace.com"
+
 msgid "Importing friends failed"
-msgstr "activarea modulului a eșuat"
+msgstr "Importarea contactelor a eșuat"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Căutare contacte..."
-
-#, fuzzy
+msgstr "Căutare persoane..."
+
 msgid "Change IM name..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare nume IM..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "Gestionare URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Nu s-a găsit un cont MySpaceIM pentru a deschide acest URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Activați contul MySpaceIM potrivit și încercați din nou."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Arată numele afișat în textul statusului"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Arată titlul în textul statusului"
 
 msgid "Send emoticons"
-msgstr ""
+msgstr "Trimite iconițe simbolice"
 
 msgid "Screen resolution (dots per inch)"
 msgstr "Rezoluție ecran (dpi)"
@@ -5822,53 +5826,49 @@
 msgid "Headline"
 msgstr "Titlu"
 
-#, fuzzy
 msgid "Song"
-msgstr "Sunete"
+msgstr "Melodie"
 
 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "Prieteni la cataramă"
+
 msgid "Client Version"
-msgstr "Încheie discuția"
+msgstr "Versiune client"
 
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
-
-#, fuzzy
+"A apărut o eroare la inițializarea numelui de utilizator. Încercați din nou "
+"sau vizitați "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"pentru a alege un nume de utilizator."
+
 msgid "MySpaceIM - Username Available"
-msgstr "Serviciu indisponibil"
-
-#, fuzzy
+msgstr "MySpaceIM - nume disponibil"
+
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"%s a trimis un mesaj pentru „whiteboard”. Doriți să deschid un „whiteboard”?"
+msgstr "Acest nume de utilizator este disponibil. Doriți să-l folosiți?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "DUPĂ INIȚIALIZARE ACESTA NU POATE FI SCHIMBAT!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - Alegeți un nume de utilizator"
+
 msgid "This username is unavailable."
-msgstr "Această temă nu are iconițe disponibile."
-
-#, fuzzy
+msgstr "Acest nume de utilizator nu este disponibil."
+
 msgid "Please try another username:"
-msgstr "Introduceți noul nume pentru %s"
+msgstr "Încercați alt nume de utilizator:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Fără nume"
+msgstr "Nu s-a inițializat un nume de utilizator"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Introduceți un nume de utilizator pentru a verifica disponibilitatea:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -5877,106 +5877,103 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Trăsnește"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a trăsnit!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s este trăsnit..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Pocnește"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a pocnit"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s este pocnit..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Topic"
-
-#, fuzzy, c-format
+msgstr "Arde"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Utilizatorul v-a blocat"
+msgstr "%s v-a ars!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s este ars..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Țucă"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a țucat."
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s este țucat"
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Îmbrățișează"
+
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a îmbrățișat."
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s este îmbrățișat..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Adormit"
-
-#, fuzzy, c-format
+msgstr "Plesnește"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a plesnit!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s este plesnit..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Dus"
-
-#, fuzzy, c-format
+msgstr "Pișcă de fund"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s a intrat în absență."
-
-#, fuzzy, c-format
+msgstr "%s v-a pișcat de fund."
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Caut %s"
+msgstr "%s este pișcat de fund..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bate palma"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a bătut palma!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Ați bătut palma cu %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6100,15 +6097,15 @@
 "autentificați în același timp"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Utilizatorul este deconectat sau sunteți blocat(ă)"
+msgstr "Utilizatorul este deconectat sau v-a blocat"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Autentificare eșuată."
+msgstr "Autentificare eșuată: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6241,7 +6238,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat și nu a primit mesajul ce i l-ați trimis."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6271,9 +6267,8 @@
 msgid "Server port"
 msgstr "Port server"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "S-a primit un răspuns HTTP neașteptat de la server."
+msgstr "S-a primit un răspuns neașteptat de la "
 
 #. username connecting too frequently
 msgid ""
@@ -6283,22 +6278,21 @@
 "V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Eroare la cererea unui „token” de autentificare"
+msgstr "Eroare la cererea "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL nu permite autentificarea acestui cont aici"
 
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
 msgid "Invalid chat room name"
-msgstr "Nume invalid de cameră de chat"
-
-#, fuzzy
+msgstr "Nume nevalid de cameră de chat"
+
 msgid "Received invalid data on connection with server"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide la conectarea la server."
 
 #. *< type
 #. *< ui_requirement
@@ -6343,9 +6337,8 @@
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanță:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr "S-au primit date invalide la conectarea la utilizatorul la distanță."
-
-#, fuzzy
+msgstr "S-au primit date nevalide la conectarea la utilizatorul la distanță."
+
 msgid "Unable to establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanță."
 
@@ -6366,10 +6359,10 @@
 msgstr "Fișierul %s are %s, care depășește mărimea maximă de %s."
 
 msgid "Invalid error"
-msgstr "Eroare invalidă"
+msgstr "Eroare nevalidă"
 
 msgid "Invalid SNAC"
-msgstr "SNAC invalid"
+msgstr "SNAC nevalid"
 
 msgid "Rate to host"
 msgstr "Limitare către server"
@@ -6405,7 +6398,7 @@
 msgstr "Cerere respinsă"
 
 msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC invalidă"
+msgstr "Încărcătură SNAC nevalidă"
 
 msgid "Insufficient rights"
 msgstr "Drepturi insuficiente"
@@ -6547,15 +6540,13 @@
 msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Conectarea pentru serverul de autentificare a eșuat:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Conectarea la serverul de autentificare a eșuat: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Conectarea la serverul BOS a eșuat: %s"
 
 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
@@ -6567,16 +6558,16 @@
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Eroare la autentificare: autentificarea pentru %s a eșuat deoarece numele de "
-"utilizator este invalid. Un nume valid trebuie să fie o adresă de mail "
-"validă sau să înceapă cu o literă și să conțină doar litere, numere și "
-"spații sau să conțină doar numere."
+"Autentificarea contului %s a eșuat deoarece numele de utilizator este "
+"greșit. Un nume valid trebuie să fie o adresă de mail corectă ori să "
+"înceapă cu o literă și să conțină doar litere, numere și spații sau să "
+"conțină doar numere."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6596,35 +6587,32 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
 msgstr "Utilizator inexistent"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Contul dumneavoastră este momentan suspendat."
+msgstr "Contul vă este momentan suspendat"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizați-l la %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
+"V-ați conectat și deconectat prea des. Așteptați un minut și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Cheia SecurID introdusă este invalidă."
+msgstr "Cheia SecurID introdusă este nevalidă."
 
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
@@ -6632,12 +6620,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceți numărul de șase cifre afișat digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Parola a fost trimisă"
 
@@ -6649,12 +6631,6 @@
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."
 
-msgid "Authorization Request Message:"
-msgstr "Mesaj cerere de autorizare:"
-
-msgid "Please authorize me!"
-msgstr "Am nevoie de autorizare..."
-
 msgid "No reason given."
 msgstr "Fără motiv."
 
@@ -6732,9 +6708,9 @@
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era invalid."
-msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau invalide."
-msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau invalide."
+msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era nevalid."
+msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau nevalide."
+msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau nevalide."
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
@@ -6826,7 +6802,7 @@
 "characters.]"
 msgstr ""
 "[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"invalide]"
+"nevalide]"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6837,7 +6813,7 @@
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Ați fost deconectat(ă) din camera de chat %s."
+msgstr "Contul v-a fost deconectat din camera de chat %s."
 
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
@@ -6898,7 +6874,7 @@
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că este "
-"invalid."
+"nevalid."
 
 #, c-format
 msgid ""
@@ -6930,7 +6906,7 @@
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
-"este invalidă."
+"este nevalidă."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6961,8 +6937,8 @@
 "fully connected."
 msgstr ""
 "Se pare că ați cerut să setați profilul înainte de a vă autentifica. "
-"Profilul vă va rămâne la fel. Încercați să-l setați din nou când veți fi "
-"conectat(ă) 100%."
+"Profilul vă va rămâne la fel. Încercați să-l setați din nou după o "
+"conectare pe deplin reușită."
 
 #, c-format
 msgid ""
@@ -6993,30 +6969,27 @@
 "truncated for you."
 msgstr[0] ""
 "Mesajul în absență depășește lungimea maximă de un octet. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[1] ""
 "Mesajul în absență depășește lungimea maximă de %d octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[2] ""
 "Mesajul în absență depășește lungimea maximă de %d de octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 
 msgid "Away message too long."
 msgstr "Mesaj în absență prea lung."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Nu se poate adăuga contactul %s deoarece numele de utilizator este invalid. "
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
 "Un nume valid trebuie să fie o adresă de mail validă sau să înceapă cu o "
 "literă și să conțină doar litere, numere și spații sau doar numere."
 
-msgid "Unable to Add"
-msgstr "Adăugare eșuată"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Descărcarea listei de contacte a eșuat"
 
@@ -7030,7 +7003,7 @@
 msgid "Orphans"
 msgstr "Orfani"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7041,7 +7014,7 @@
 msgid "(no name)"
 msgstr "(fără nume)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
@@ -7137,7 +7110,7 @@
 msgstr "Opțiuni de securitate ICQ"
 
 msgid "The new formatting is invalid."
-msgstr "Formatul nou este invalid."
+msgstr "Formatul nou este nevalid."
 
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
@@ -7205,9 +7178,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Utilizator neconectat"
+msgstr "Utilizați clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7405,99 +7377,84 @@
 msgstr "Notă"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Avatar"
+msgstr "Notiță pentru contact"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Modificați notița sa după cum doriți"
+
 msgid "_Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "_Modificare"
+
 msgid "Memo Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "Modificare notiță"
+
 msgid "Server says:"
-msgstr "Server ocupat"
+msgstr "Serverul spune:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Cererea v-a fost aprobată."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Cererea v-a fost respinsă."
 
 #, c-format
 msgid "%u requires verification"
 msgstr "%u solicită autorizare"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Întrebare la adăugarea contactului"
+
 msgid "Enter answer here"
-msgstr "Introduceți aici cererea"
+msgstr "Introduceți răspunsul aici"
 
 msgid "Send"
 msgstr "Trimite"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nume invalid de utilizator"
+msgstr "Răspuns nevalid."
 
 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
 msgstr "Scuze, nu ești genul meu..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "Utilizatorul %d are nevoie de autorizare"
-
-#, fuzzy
+msgstr "Utilizatorul %u necesită autorizare"
+
 msgid "Add buddy authorize"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Autorizare pentru adăugarea unui contact"
+
 msgid "Enter request here"
 msgstr "Introduceți aici cererea"
 
 msgid "Would you be my friend?"
 msgstr "Vrei să fim prieteni?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contact"
-
-#, fuzzy
+msgstr "Contact QQ"
+
 msgid "Add buddy"
 msgstr "Adaugă contact"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Avatar QQ invalid"
-
-#, fuzzy
+msgstr "Număr QQ nevalid"
+
 msgid "Failed sending authorize"
-msgstr "Am nevoie de autorizare..."
-
-#, fuzzy, c-format
+msgstr "Trimiterea autorizației a eșuat"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Ștergerea contactului a eșuat"
-
-#, fuzzy, c-format
+msgstr "Ștergerea contactului %u a eșuat"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s v-a șters din lista sa de contacte."
-
-#, fuzzy
+msgstr "Contactul %d a încercat să vă șteargă din listă, dar a eșuat"
+
 msgid "No reason given"
-msgstr "Fără motiv."
+msgstr "Fără motiv"
 
 #. only need to get value
 #, c-format
@@ -7507,9 +7464,9 @@
 msgid "Would you like to add him?"
 msgstr "Doriți să îl adăugați?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Respingere"
+msgstr "Respins de %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7524,141 +7481,122 @@
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Introduceți noul nume pentru %s"
-
-#, fuzzy
+msgstr "Introduceți numărul Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Puteți căuta doar grupuri QQ permanente\n"
-
-#, fuzzy
+msgstr "Puteți căuta doar după un Qun permanent\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Opțiuni proxy invalide"
-
-#, fuzzy
+msgstr "(șir UTF-8 nevalid)"
+
 msgid "Not member"
 msgstr "Nu sunt un membru"
 
 msgid "Member"
 msgstr "Membru"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Se cere"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Admin"
+
 msgid "Notice"
-msgstr "Notă"
-
-#, fuzzy
+msgstr "Notificare"
+
 msgid "Detail"
-msgstr "Implicită"
+msgstr "Detaliu"
 
 msgid "Creator"
 msgstr "Inițiator"
 
-#, fuzzy
 msgid "About me"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre mine"
+
 msgid "Category"
-msgstr "Eroare de chat"
-
-#, fuzzy
+msgstr "Categorie"
+
 msgid "The Qun does not allow others to join"
-msgstr "Acest grup nu permite înscrierea altor contacte"
-
-#, fuzzy
+msgstr "Acest Qun nu permite intrarea altora"
+
 msgid "Join QQ Qun"
-msgstr "Intră într-un chat"
+msgstr "Intră în Qun QQ"
 
 msgid "Input request here"
 msgstr "Introduceți aici cererea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați intrat cu succes în Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați intrat cu succes în Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u refuzat la intrare"
 
 msgid "QQ Qun Operation"
 msgstr "Operație QQ Qun"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Eșuat"
+msgstr "Eșuat:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Răspuns necunoscut la intrarea în Qun"
+
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Ieșire din Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Notați că, dacă dumneavoastră sunteți inițiatorul, \n"
+"Notați că, dacă sunteți inițiatorul, \n"
 "această acțiune va elimina acest Qun."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Scuze, nu ești genul meu..."
-
-#, fuzzy
+msgstr "Scuze, nu ești genul nostru..."
+
 msgid "Successfully changed Qun members"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați modificat cu succes membrii Qun"
+
 msgid "Successfully changed Qun information"
 msgstr "Ați modificat cu succes detaliile Qun"
 
 msgid "You have successfully created a Qun"
 msgstr "Ați creat cu succes un Qun"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Doriți să setați detaliile Qun acum?"
+msgstr "Doriți să modificați informațiile detaliate acum?"
 
 msgid "Setup"
 msgstr "Opțiuni"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "%u a cerut să intre în Qun %u pentru %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "Utilizatorul %u a cerut intrarea în grupul %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Intrarea în chat alături de acest contact a eșuat"
+msgstr "Intrarea în Qun %u, operat de admin %u a eșuat"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>Intrarea în Qun %u este aprobată de admin %u pentru %s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Ștergere contact"
-
-#, fuzzy, c-format
+msgstr "<b>Contactul %u a fost șters.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Ștergere contact"
+msgstr "<b>Contactul nou %u a intrat.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7673,30 +7611,26 @@
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " DePeMobil"
+
 msgid " BindMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " BindMobile"
+
 msgid " Video"
-msgstr "Video în direct"
-
-#, fuzzy
+msgstr " Video"
+
 msgid " Zone"
-msgstr "Fără"
+msgstr " Zone"
 
 msgid "Flag"
-msgstr ""
+msgstr "Fanion"
 
 msgid "Ver"
 msgstr "Ver"
 
 msgid "Invalid name"
-msgstr "Nume invalid"
+msgstr "Nume nevalid"
 
 msgid "Select icon..."
 msgstr "Alegeți o iconiță..."
@@ -7772,44 +7706,39 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Mulțumiri</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Prim autor</b>:<br>\n"
+msgstr "<p><b>Testeri neobosiți</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "și alții, vă rugăm să ne spuneți... vă mulțumim!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Și pentru toți băieții din ultimele rânduri...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Vă invităm să ni vă alăturați!</i> :)"
-
-#, fuzzy, c-format
+msgstr "<i>Vă invităm să vă alăturați nouă!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Salvare avatar"
+msgstr "Schimbare iconiță"
 
 msgid "Change Password"
 msgstr "Schimbare parolă"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informații de autentificare"
+msgstr "Informații despre cont"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Actualizează toate Qun QQ"
+
 msgid "About OpenQ"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Editare adresă"
+msgstr "Editare notiță contact"
 
 #. *< type
 #. *< ui_requirement
@@ -7821,17 +7750,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Modul pentru protocolul QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autor"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Selectați utilizatorul"
+msgstr "Selectați serverul"
 
 msgid "QQ2005"
 msgstr "QQ2005"
@@ -7842,168 +7768,153 @@
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Conectare folosind TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Port server"
-
-#, fuzzy
+msgstr "Afișare notificări server"
+
 msgid "Show server news"
-msgstr "Adresă server"
+msgstr "Afișare știri server"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Arată camera de chat când vine msg"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval „keep alive” (secunde)"
+
 msgid "Update interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval de actualizare (secunde)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
+msgstr "Nu s-a putut decripta răspunsul serverului"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Eșuarea la cererea jetonului, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Titlu invalid"
+msgstr "Lungime nevalidă de jeton, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX nu este suportat în prezent"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "E nevoie de înregistrare"
+msgstr "Necesită activare"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
-
-#, fuzzy
+msgstr "Cod necunoscut de răspuns la autentificare (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se cere imaginea captcha"
+
 msgid "Checking captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se verifică imaginea captcha"
+
 msgid "Failed captcha verification"
-msgstr "Autentificarea Yahoo! a eșuat"
-
-#, fuzzy
+msgstr "Verificarea imaginii captcha a eșuat"
+
 msgid "Captcha Image"
-msgstr "Salvează imaginea"
-
-#, fuzzy
+msgstr "Imagine captcha"
+
 msgid "Enter code"
-msgstr "Introduceți parola"
-
-#, fuzzy
+msgstr "Introduceți codul"
+
 msgid "QQ Captcha Verification"
-msgstr "Verificare certificat SSL"
-
-#, fuzzy
+msgstr "Verificare captcha QQ"
+
 msgid "Enter the text from the image"
-msgstr "Introduceți numele grupului"
+msgstr "Introduceți textul din imagine"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Răspuns necunoscut la verificarea parolei (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Cod necunoscut de răspuns la autentificare (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Introducere detalii..."
-
-#, fuzzy
+msgstr "Se află serverul"
+
 msgid "Requesting token"
-msgstr "Cerere respinsă"
-
-#, fuzzy
+msgstr "Se cere jeton"
+
 msgid "Unable to resolve hostname"
-msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
+msgstr "Nu se poate rezolva numele serverului"
+
 msgid "Invalid server or port"
-msgstr "Eroare invalidă"
-
-#, fuzzy
+msgstr "Server sau port nevalid"
+
 msgid "Connecting to server"
-msgstr "Conectare în progres la serverul SILC"
-
-#, fuzzy
+msgstr "Conectare la server"
+
 msgid "QQ Error"
-msgstr "Eroare QQid"
-
-#, fuzzy, c-format
+msgstr "Eroare QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Schimb de server ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Știri server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Expeditor"
-
-#, fuzzy, c-format
+msgstr "Expeditor %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instrucțiuni server: %s"
-
-#, fuzzy
+msgstr ""
+"Notificare server Expeditor %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Motiv necunoscut"
+msgstr "SERVER CMD necunoscut"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"Răspuns de eroare %s(0x%02X)\n"
+"Camera %u, răspuns 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Comandă"
-
-#, fuzzy
+msgstr "Comandă QQ Qun"
+
 msgid "Unable to decrypt login reply"
-msgstr "Nu s-au putut obține detalii despre server"
-
-#, fuzzy
+msgstr "Nu s-a putut decripta răspunsul de autentificare"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Motiv necunoscut"
-
-#, fuzzy
+msgstr "LOGIN CMD necunoscut"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Motiv necunoscut"
+msgstr "CLIENT CMD necunoscut"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8979,9 +8890,8 @@
 msgid "Disconnected by server"
 msgstr "Deconectat de server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Eroare la conectarea la serverul SILC"
+msgstr "Eroare de conectare la serverul SILC"
 
 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eșuat"
@@ -8995,7 +8905,6 @@
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
@@ -9003,14 +8912,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Nu s-a putut încărca perechea de chei SILC"
-
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Nu s-a putut inițializa protocolul SILC"
 
@@ -9312,9 +9216,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Nu s-a putut crea perechea de chei SILC\n"
+msgstr "Nu s-a putut crea perechea de chei SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9450,33 +9353,30 @@
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Eroare: Cookie invalid"
+msgstr "Eroare: Cookie nevalid"
 
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eșuată"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Nu s-a putut inițializa conexiunea ca client SILC"
+msgstr "Nu s-a putut inițializa conexiunea client SILC"
 
 msgid "John Noname"
 msgstr "Ion Fărănume"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Nu se poate crea o nouă conexiune"
 
-#, fuzzy
 msgid "Unknown server response"
 msgstr "Răspuns necunoscut de la server."
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Nu se poate crea un socket"
+msgstr "Nu se poate crea un socket de ascultare"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conține spații sau simbolul @"
@@ -9539,9 +9439,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo!"
 
 msgid "Pager server"
 msgstr "Server pager"
@@ -9570,9 +9469,8 @@
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Identitate Yahoo..."
+msgstr "Identitate Yahoo Japonia..."
 
 #. *< type
 #. *< ui_requirement
@@ -9584,15 +9482,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo! Japonia"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Mesajul SMS nu v-a fost trimis"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
+msgstr "Mesajul Yahoo! nu v-a fost trimis."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9616,32 +9513,28 @@
 msgstr "Adăugarea contactului a fost refuzată"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: prea multe tentative eșuate de autentificare. Autentificarea "
+"în paginile web Yahoo! ar putea rezolva această problemă."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: motiv necunoscut. Autentificarea în paginile web Yahoo! ar "
+"putea rezolva această problemă."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Nume de utilizator sau parolă incorecte."
+msgstr "Nume de utilizator sau parolă lipsă."
 
 #, c-format
 msgid ""
@@ -9665,24 +9558,21 @@
 "Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum înainte."
 
 msgid "Ignore buddy?"
-msgstr "Ignor contactul?"
+msgstr "Ignorați contactul?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Contul vă este blocat, autentificați-vă la www.yahoo.com !"
+msgstr "Contul vă este blocat, autentificați-vă în paginile web Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
-
-#, fuzzy, c-format
+msgstr "Eroare necunoscută cu numărul %d. Autentificarea în paginile web "
+"Yahoo! ar putea rezolva această problemă."
+
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
-"contul %s."
-
-#, fuzzy
+msgstr "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server "
+"pentru contul %s."
+
 msgid "Unable to add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
@@ -9690,21 +9580,18 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "S-a primit un răspuns HTTP neașteptat de la server."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
-"S-a pierdut conexiunea cu %s:\n"
-"%s"
-
-#, fuzzy, c-format
+"S-a pierdut conexiunea cu %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
+"Nu s-a putut face o conexiune cu %s: %s"
 
 msgid "Not at Home"
 msgstr "Nu-s acasă"
@@ -9752,7 +9639,7 @@
 msgstr "Mâzgălituri"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Alegeți ID-ul ce doriți să-l activați"
 
 msgid "Join whom in chat?"
 msgstr "Cui doriți să vă alăturați în chat?"
@@ -9855,13 +9742,8 @@
 msgstr "Profilul utilizatorului este gol."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a declinat invitația la conferința din camera de chat „%s” din următorul "
-"motiv: „%s”."
-
-msgid "Invitation Rejected"
-msgstr "Invitație respinsă"
+msgid "%s has declined to join."
+msgstr "%s a refuzat să intre."
 
 msgid "Failed to join chat"
 msgstr "Intrarea în chat a eșuat"
@@ -9913,9 +9795,8 @@
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Probleme de conectare la serverul YCHT."
+msgstr "Probleme de conexiune cu serverul YCHT."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10046,17 +9927,17 @@
 msgid "Exposure"
 msgstr "Expunere"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
+msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
+msgstr "Acces interzis: serverul proxy HTTP interzice tunelarea portului %d."
 
 #, c-format
 msgid "Error resolving %s"
@@ -10134,7 +10015,7 @@
 msgstr "Conexiunea SSL a eșuat"
 
 msgid "SSL peer presented an invalid certificate"
-msgstr "Partenerul SSL a prezentat un certificat invalid"
+msgstr "Partenerul SSL a prezentat un certificat nevalid"
 
 msgid "Unknown SSL error"
 msgstr "Eroare SSL necunoscută"
@@ -10307,13 +10188,13 @@
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"A apărut o eroare la citirea fișierului %s. Încărcarea datelor a eșuat și "
-"vechiul fișier a fost redenumit „%s~”."
+"A apărut o eroare la citirea %s. Fișierul nu a fost încărcat și "
+"vechiul fișier a fost redenumit în „%s~”."
 
 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
@@ -10357,7 +10238,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiță pentru acest cont:"
 
-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Avansat"
 
 msgid "Use GNOME Proxy Settings"
@@ -10420,9 +10301,8 @@
 msgid "Create _this new account on the server"
 msgstr "Creează acest _nou cont pe server"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Activare"
@@ -10473,14 +10353,14 @@
 msgid "Please update the necessary fields."
 msgstr "Trebuie să actualizați câmpurile cerute."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "Cont"
+msgstr "_Cont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduceți detaliile chat-ului în care doriți să intrați.\n"
+msgstr ""
+"Introduceți informațiile despre chat-ul în care doriți să participați.\n"
 
 msgid "Room _List"
 msgstr "_Listă de camere"
@@ -10500,16 +10380,14 @@
 msgid "I_M"
 msgstr "_Mesaj"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Adaugă un chat"
+msgstr "_Apel audio"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Apel audio/_video"
+
 msgid "_Video Call"
-msgstr "Videochat"
+msgstr "Apel _video"
 
 msgid "_Send File..."
 msgstr "_Trimitere fișier..."
@@ -10520,11 +10398,9 @@
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Ascunde la deconectare"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "Arată la deconectare"
 
@@ -10532,7 +10408,7 @@
 msgstr "_Alias..."
 
 msgid "_Remove"
-msgstr "Șter_ge"
+msgstr "Șt_erge"
 
 msgid "Set Custom Icon"
 msgstr "Iconiță personalizată..."
@@ -10547,7 +10423,7 @@
 msgstr "Adaugă un c_hat..."
 
 msgid "_Delete Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 msgid "_Rename"
 msgstr "_Redenumire"
@@ -10577,7 +10453,7 @@
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "adăuga acel contact."
 
 #. I don't believe this can happen currently, I think
@@ -10652,7 +10528,6 @@
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
 msgstr "/Unelte/_Iconițe simbolice"
 
@@ -10784,7 +10659,7 @@
 msgstr "După status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "După înregistrările recente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10801,7 +10676,7 @@
 msgstr "Reactivare"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "Întrebări frecvente SSL"
 
 msgid "Welcome back!"
 msgstr "Bine ați revenit!"
@@ -10882,8 +10757,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Nu sunteți autentificat(ă) cu vreun protocol prin care să puteți iniția un "
-"chat."
+"Nu v-ați autentificat cu vreun protocol prin care să puteți iniția un chat."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10935,112 +10809,97 @@
 msgid "Background Color"
 msgstr "Culoare fundal"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
-
-#, fuzzy
+msgstr "Culoarea de fundal pentru lista de contacte"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Dispunere"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Dispunerea iconițelor, numelui și a statusului în lista de contacte"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Culoare fundal"
+msgstr "Culoare fundal la desfacere"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup desfăcut"
+
 msgid "Expanded Text"
-msgstr "Des_fă"
+msgstr "Text text la desfacere"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un grup desfăcut"
+
 msgid "Collapsed Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal la strângere"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup strâns"
+
 msgid "Collapsed Text"
-msgstr "_Strânge"
+msgstr "Text la strângere"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Informația text pentru un grup strâns"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal contact/chat"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui contact sau chat"
+
 msgid "Contact Text"
-msgstr "Combinație de semne"
+msgstr "Text contact"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact strâns"
+
 msgid "On-line Text"
-msgstr "Conectat"
+msgstr "Text on-line"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact conectat"
+
 msgid "Away Text"
-msgstr "Absent"
+msgstr "Text absent"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact absent"
+
 msgid "Off-line Text"
-msgstr "Deconectat"
+msgstr "Text deconectat"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact deconectat"
+
 msgid "Idle Text"
-msgstr "Text dispoziție"
+msgstr "Text inactiv"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact inactiv"
+
 msgid "Message Text"
-msgstr "Ați trimis un mesaj"
+msgstr "Text mesaj"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Informația text pentru un contact cu un mesaj necitit"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Textul mesajului (utilizatorul a spus)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un chat cu un mesaj necitit care vă "
+"menționează numele"
+
 msgid "The text information for a buddy's status"
-msgstr "Modificare detalii pentru %s"
-
-#, fuzzy
+msgstr "Informația text pentru starea unui contact"
+
 msgid "Type the host name for this certificate."
-msgstr ""
-"Introduceți numele calculatorului pentru care a fost eliberat certificatul"
+msgstr "Introduceți numele calculatorului pentru acest certificat."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11055,7 +10914,7 @@
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "invita acel contact."
 
 msgid "Invite Buddy Into Chat Room"
@@ -11089,7 +10948,6 @@
 msgid "Get Away Message"
 msgstr "Obține mesajul în absență"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Ultima replică"
 
@@ -11136,21 +10994,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuție/G_olește fereastra"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Me_dia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _video"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Discuție/Arată în_registrările"
+msgstr "/Discuție/Media/Ap_el audio\\/video"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
@@ -11159,7 +11013,7 @@
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Discuție/D_etalii"
+msgstr "/Discuție/Detali_i"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Discuție/_Invită..."
@@ -11180,13 +11034,13 @@
 msgstr "/Discuție/A_daugă..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Discuție/Șter_ge..."
+msgstr "/Discuție/Șt_erge..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Discuție/Inserează o a_dresă..."
+msgstr "/Discuție/Inserea_ză o adresă..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Discuție/Inserea_ză o imagine..."
+msgstr "/Discuție/Inserează o ima_gine..."
 
 msgid "/Conversation/_Close"
 msgstr "/Discuție/În_chide"
@@ -11224,17 +11078,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Discuție/Arată înregistrările"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Discuție/Mai mult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Discuție/Arată înregistrările"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel video"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Discuție/Mai mult"
+msgstr "/Discuție/Media/Apel audio\\/video"
 
 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
@@ -11420,7 +11271,7 @@
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "voce și video"
 
 msgid "support"
 msgstr "suport"
@@ -11546,9 +11397,8 @@
 msgid "Hungarian"
 msgstr "Maghiară"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Română"
+msgstr "Armeană"
 
 msgid "Indonesian"
 msgstr "Indoneziană"
@@ -11565,9 +11415,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducătorii Ubuntu din Georgia"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Altceva"
+msgstr "Khmeră"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -11590,9 +11439,8 @@
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedoneană"
+msgstr "Mongoleză"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
@@ -11649,7 +11497,7 @@
 msgstr "Suedeză"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -11715,21 +11563,25 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Ajutor prin mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr "<FONT SIZE=\"4\">Canal IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -11811,7 +11663,7 @@
 msgstr "Ștergere contact"
 
 msgid "_Remove Contact"
-msgstr "Șter_gere contact"
+msgstr "Șt_ergere contact"
 
 #, c-format
 msgid ""
@@ -11839,7 +11691,7 @@
 msgstr "Ștergere grup"
 
 msgid "_Remove Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 #, c-format
 msgid ""
@@ -11852,7 +11704,7 @@
 msgstr "Ștergere contact"
 
 msgid "_Remove Buddy"
-msgstr "Șter_ge contactul"
+msgstr "Șt_erge contactul"
 
 #, c-format
 msgid ""
@@ -11866,7 +11718,7 @@
 msgstr "Ștergere chat"
 
 msgid "_Remove Chat"
-msgstr "Șter_gere chat"
+msgstr "Șt_ergere chat"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
@@ -11953,19 +11805,11 @@
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"
 
 msgid "C_lear finished transfers"
-msgstr "Șter_ge transferurile terminate"
+msgstr "Șt_erge transferurile terminate"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Detaliile transferului de fișiere"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pauză"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reluare"
+msgstr "Detaliile trans_ferului de fișiere"
 
 msgid "Paste as Plain _Text"
 msgstr "Lipește ca text _simplu"
@@ -11985,9 +11829,8 @@
 msgid "Hyperlink visited color"
 msgstr "Culoare adresă web"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Culoare pentru afișarea adreselor web vizitate ori activate."
+msgstr "Culoare pentru afișarea adreselor web vizitate (ori activate)."
 
 msgid "Hyperlink prelight color"
 msgstr "Culoare evidențiere adresă"
@@ -12022,23 +11865,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Culoare pentru mesajele comenzi în mod discret"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete de acțiune."
 
 msgid "Whisper Message Name Color"
 msgstr "Culoare pentru mesajele discrete"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete."
 
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Culoare de utilizat pentru mesajele de notificare"
+msgstr "Culoare de utilizat pentru notificarea tastării"
 
 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
@@ -12291,7 +12131,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Încercați „%s -h” pentru mai multe informații.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12313,6 +12153,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12322,7 +12163,7 @@
 "  --display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12343,6 +12184,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12387,25 +12229,27 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/Înc_hide"
+
 msgid "Calling..."
-msgstr "Se calculează..."
+msgstr "Se apelează..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio/video."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune video."
+
+msgid "_Pause"
+msgstr "_Pauză"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12423,7 +12267,7 @@
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Navigatorul „%s” este invalid."
+msgstr "Navigatorul „%s” este nevalid."
 
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
@@ -12438,9 +12282,8 @@
 "Ați ales să precizați o comandă pentru deschiderea unui navigator, dar nu "
 "ați introdus-o în preferințe."
 
-#, fuzzy
 msgid "No message"
-msgstr "Mesaj necunoscut"
+msgstr "Nici un mesaj"
 
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
@@ -12448,16 +12291,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
 
-#, fuzzy
 msgid "New Pounces"
 msgstr "Întâmpinare nouă"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Închide"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Întâmpinare</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
@@ -12507,7 +12348,6 @@
 msgid "Select a file"
 msgstr "Selectați un fișier"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Editare întâmpinare"
 
@@ -12584,61 +12424,58 @@
 msgid "Pounce Target"
 msgstr "Țintă întâmpinare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Tastarea unui mesaj nou"
-
-#, fuzzy, c-format
+msgstr "A început să tasteze"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Pauză în timpul tastării"
-
-#, fuzzy, c-format
+msgstr "S-a oprit momentan din tastare"
+
+#, c-format
 msgid "Signed on"
-msgstr "Autentificare"
-
-#, fuzzy, c-format
+msgstr "S-a autentificat"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s s-a întors din inactivitate (%s)"
-
-#, fuzzy, c-format
+msgstr "S-a întors din inactivitate"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Întoarcerea din absență"
-
-#, fuzzy, c-format
+msgstr "S-a întors din absență"
+
+#, c-format
 msgid "Stopped typing"
-msgstr "M-am oprit din scris"
-
-#, fuzzy, c-format
+msgstr "S-a oprit din scris"
+
+#, c-format
 msgid "Signed off"
-msgstr "Deconectare"
-
-#, fuzzy, c-format
+msgstr "S-a deconectat"
+
+#, c-format
 msgid "Became idle"
-msgstr "Intrarea în inactivitate"
-
-#, fuzzy, c-format
+msgstr "A intrat în inactivitate"
+
+#, c-format
 msgid "Went away"
-msgstr "În absență"
-
-#, fuzzy, c-format
+msgstr "A devenit absent"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Trimite un mesaj"
-
-#, fuzzy, c-format
+msgstr "A trimis un mesaj"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Eveniment necunoscut în întâmpinare. Raportați această eroare."
-
-#, fuzzy
+msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
+
 msgid "Theme failed to unpack."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi despachetată."
+
 msgid "Theme failed to load."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi încărcată."
+
 msgid "Theme failed to copy."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
+msgstr "Tema nu a putut fi copiată."
 
 msgid "Install Theme"
 msgstr "Instalare temă"
@@ -12661,9 +12498,8 @@
 msgstr "Închide _fereastra de discuții cu tasta Esc"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Listă de contacte"
+msgstr "Tema listei de contacte"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12675,9 +12511,8 @@
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Ferestre de discuții"
+msgstr "Fereastra de discuții"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -12780,9 +12615,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Autodetectare adresă IP"
+msgstr "Utilizează adresa IP _autodetectată: %s"
 
 msgid "Public _IP:"
 msgstr "_IP public:"
@@ -12804,7 +12639,7 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Server releu (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; navigator"
@@ -12836,7 +12671,7 @@
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "Cereri DNS prin proxy-urile SOCKS4"
 
 msgid "_User:"
 msgstr "Utili_zator:"
@@ -13149,12 +12984,11 @@
 msgid "Status for %s"
 msgstr "Status pentru %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"O iconiță simbolică personalizată există deja pentru combinația de semne "
-"selectată. Alegeți o altă combinație de semne."
+"Există deja o iconiță simbolică pentru '%s'. Alegeți altă combinație de semne."
 
 msgid "Custom Smiley"
 msgstr "Iconiță simbolică personalizată"
@@ -13168,28 +13002,24 @@
 msgid "Add Smiley"
 msgstr "Adăugare iconiță simbolică"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Imagine"
+msgstr "_Imagine:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Combinație de semne"
+msgstr "_Textul combinației de semne"
 
 msgid "Smiley"
 msgstr "Iconiță simbolice"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Combinație de semne"
+msgstr "Textul combinației de semne"
 
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Selectare contact"
+msgstr "Selectare iconiță contact"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "Clic aici pentru a vă schimba avatarul pentru acest cont."
@@ -13275,13 +13105,12 @@
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 "Ați tras și plasat un lansator pentru desktop. Probabil doriți sa trimiteți "
-"nu lansatorul în sine, ci fișierul la care face referire."
+"fișierul la care face referire, nu lansatorul în sine."
 
 #, c-format
 msgid ""
@@ -13314,19 +13143,30 @@
 "Dintr-un motiv necunoscut nu s-a putut încărca imaginea „%s”, probabil este "
 "un fișier imagine corupt"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Deschide adresa:"
+msgstr "_Deschide linkul:"
 
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
 
 msgid "_Copy Email Address"
-msgstr "C_opiază adresa de mail"
+msgstr "_Copiază adresa de mail"
+
+msgid "_Open File"
+msgstr "_Deschide fișierul..."
+
+msgid "Open _Containing Directory"
+msgstr "Deschide directorul ce _conține"
 
 msgid "Save File"
 msgstr "Salvare fișier"
 
+msgid "_Play Sound"
+msgstr "_Redare sunet"
+
+msgid "_Save File"
+msgstr "_Salvare fișier"
+
 msgid "Select color"
 msgstr "Selectare culoare"
 
@@ -13414,78 +13254,64 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arată statistici despre disponibilitatea contactelor"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Adresă server"
-
-#, fuzzy
+msgstr "Cerere nume server"
+
 msgid "Enter an XMPP Server"
-msgstr "Conectare la un server de conferințe"
-
-#, fuzzy
+msgstr "Introduceți un server XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Selectați un server de conferințe pentru interogare"
-
-#, fuzzy
+msgstr "Selectați un server XMPP pentru interogare"
+
 msgid "Find Services"
-msgstr "Servicii de conectare"
-
-#, fuzzy
+msgstr "Căutare de servicii"
+
 msgid "Add to Buddy List"
-msgstr "Trimite lista de contacte"
-
-#, fuzzy
+msgstr "Adaugă la lista de contacte"
+
 msgid "Gateway"
-msgstr "Intrarea în absență"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Director înregistrări"
-
-#, fuzzy
+msgstr "Director"
+
 msgid "PubSub Collection"
-msgstr "Selectați un sunet"
-
-#, fuzzy
+msgstr "Colecție PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Serviciu PubSub"
-
-#, fuzzy
+msgstr "Frunză PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descriere"
+msgstr ""
+"\n"
+"<b>Descriere:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Detalii servicii descoperite"
-
-#, fuzzy
+msgstr "Descoperire de servicii"
+
 msgid "_Browse"
-msgstr "_Navigator:"
-
-#, fuzzy
+msgstr "_Navigare:"
+
 msgid "Server does not exist"
-msgstr "Utilizator inexistent"
-
-#, fuzzy
+msgstr "Server inexistent"
+
 msgid "Server does not support service discovery"
-msgstr "Serverul nu permite blocarea"
-
-#, fuzzy
+msgstr "Serverul nu permite descoperirea serviciilor"
+
 msgid "XMPP Service Discovery"
-msgstr "Detalii servicii descoperite"
+msgstr "Descoperire de servicii XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permite navigarea și înregistrarea serviciilor"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
+"Acest modul este util pentru înregistrarea cu transporturi învechite sau alte servicii XMPP."
 
 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
@@ -13877,23 +13703,22 @@
 msgstr "Mesaje muzicale pentru compoziții în colaborare."
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"Modulul de mesaje muzicale permite utilizatorilor să lucreze simultan la o "
+"Modulul de mesaje muzicale permite mai multor utilizatori să lucreze simultan la o "
 "piesă muzicală editând o partitură comună în timp real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "Notifică în:"
+msgstr "Notifică pentru"
 
 msgid "\t_Only when someone says your username"
-msgstr "\tDoar când cineva _vă spune numele de utilizator într-un chat"
+msgstr "\tD_oar când cineva vă spune numele de utilizator"
 
 msgid "_Focused windows"
-msgstr "F_erestrele în prim plan"
+msgstr "_Ferestrele în prim plan"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -14001,9 +13826,8 @@
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidențierea mesajelor"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Culoarea mesajelor de notificare"
+msgstr "Culoarea mesajelor de notificare la tastare"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
@@ -14034,23 +13858,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinații de taste GTK+ Text"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Activează mesajele de notificare"
-
-#, fuzzy
+msgstr "Dezactivează textul notificării la tastare"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Opțiuni de control a temei GTK+"
+
 msgid "Colors"
-msgstr "Închide"
+msgstr "Culori"
 
 msgid "Fonts"
 msgstr "Fonturi"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
 
 msgid "Gtkrc File Tools"
 msgstr "Unelte fișiere Gtkrc"
@@ -14135,11 +13956,10 @@
 msgstr "Buton de trimitere în fereastra de discuții"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
-msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții."
+msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții. A se folosi când nu există o tastatură fizică."
 
 msgid "Duplicate Correction"
 msgstr "Corecție duplicată"
@@ -14190,94 +14010,81 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Neautentificat"
-
-#, fuzzy
+msgstr "Tocmai s-a autentificat"
+
 msgid "Just logged out"
-msgstr "Neautentificat"
+msgstr "Tocmai s-a deconectat"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Iconiță pentru contact/\n"
+"Iconiță pentru persoane necunoscute"
+
 msgid "Icon for Chat"
-msgstr "Intră într-un chat"
-
-#, fuzzy
+msgstr "Iconiță pentru chat"
+
 msgid "Ignored"
-msgstr "Ignoră"
-
-#, fuzzy
+msgstr "Ignorat"
+
 msgid "Founder"
-msgstr "Mai tare"
-
-#, fuzzy
+msgstr "Fondator"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operator"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Sub-operator"
+
 msgid "Authorization dialog"
-msgstr "Autorizare acordată"
-
-#, fuzzy
+msgstr "Dialog de autorizare"
+
 msgid "Error dialog"
-msgstr "Erori "
-
-#, fuzzy
+msgstr "Dialog de eroare"
+
 msgid "Information dialog"
-msgstr "Detalii"
+msgstr "Dialog de informare"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Dialog de mail"
+
 msgid "Question dialog"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Dialog de interogare"
+
 msgid "Warning dialog"
-msgstr "Nivel de avertizare"
+msgstr "Dialog de avertizare"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Ce fel de dialog este acesta?"
+
 msgid "Status Icons"
-msgstr "Status pentru %s"
-
-#, fuzzy
+msgstr "Iconițe de status"
+
 msgid "Chatroom Emblems"
-msgstr "Opțiuni locale chat"
-
-#, fuzzy
+msgstr "Embleme de camere de chat"
+
 msgid "Dialog Icons"
-msgstr "Salvare avatar"
-
-#, fuzzy
+msgstr "Iconițe de dialog"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Editor de teme de iconițe Pidgin"
+
 msgid "Contact"
-msgstr "Detalii contact"
-
-#, fuzzy
+msgstr "Contact"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Listă de contacte"
-
-#, fuzzy
+msgstr "Editor de teme pentru lista de contacte Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Listă de contacte"
+msgstr "Editare temă listă de contacte"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Editare temă de iconițe"
 
 #. *< type
 #. *< ui_requirement
@@ -14286,16 +14093,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -14464,12 +14269,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opțiuni Pidgin specifice Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Permite alegerea unor opțiuni Pidgin pentru Windows, precum atașarea listei "
-"de contacte."
+"Permite alegerea unor opțiuni specifice Pidgin pentru Windows, precum "
+"atașarea listei de contacte."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat.</font>"
@@ -14509,842 +14313,3 @@
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#~ msgid "Cannot open socket"
-#~ msgstr "Nu s-a putut deschide un socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Nu se poate asculta pe socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Nu se poate citi din socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "Conexiunea a eșuat."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Serverul s-a deconectat"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Nu s-a putut crea un socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Read error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu serverul:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Eroare la scriere"
-
-#~ msgid "Last Activity"
-#~ msgstr "Ultima activitate"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Detalii servicii descoperite"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Servicii descoperite"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Adresare „stanza” extinsă"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Chat cu mai mulți utilizatori"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr ""
-#~ "Detalii suplimentare despre prezența într-un chat cu mai mulți "
-#~ "utilizatori."
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comenzi ad-hoc"
-
-#~ msgid "PubSub Service"
-#~ msgstr "Serviciu PubSub"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Fluxuri de date SOCKS5"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Eroare la înregistrare"
-
-#~ msgid "User Location"
-#~ msgstr "Loc utilizator"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar utilizator"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notificări de stări pentru chat"
-
-#~ msgid "Software Version"
-#~ msgstr "Versiune de software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inițializare flux de date"
-
-#~ msgid "User Mood"
-#~ msgstr "Dispoziția utilizatorului"
-
-#~ msgid "User Activity"
-#~ msgstr "Acitivatea utilizatorului"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Facilitățile entității"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negocieri sesiuni criptate"
-
-#~ msgid "User Tune"
-#~ msgstr "Piesă utilizator"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "IM cu schimb de chei"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Adresă de mail"
-
-#~ msgid "User Profile"
-#~ msgstr "Profil utilizator"
-
-#, fuzzy
-#~ msgid "Jingle"
-#~ msgstr "Intră"
-
-#~ msgid "User Nickname"
-#~ msgstr "Pseudonim utilizator"
-
-#, fuzzy
-#~ msgid "Jingle Video"
-#~ msgstr "Video în direct"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Confirmări mesaje"
-
-#, fuzzy
-#~ msgid "Public Key Publishing"
-#~ msgstr "Amprentă silabică cheie publică"
-
-#, fuzzy
-#~ msgid "User Chatting"
-#~ msgstr "Opțiuni personale"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Moduri utilizator"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Nume utilizator"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Limită utilizatori"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Criptare Trillian"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Livrare întârziată"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Repozitorii de fișiere și partajare"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negociere sesiune de criptare simplificată"
-
-#~ msgid "Hop Check"
-#~ msgstr "Verificare hopuri"
-
-#~ msgid "Read Error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Conectarea la server a eșuat."
-
-#~ msgid "Unparseable message"
-#~ msgstr "Nu se poate prelucra mesajul"
-
-#, fuzzy
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Autentificare eșuată (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Eroare: suportul SSL nu este instalat."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Parolă incorectă."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Conectarea la serverul BOS a eșuat:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți în scurt timp deconectat(ă). Vizitați %s pentru "
-#~ "actualizări."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nume invalid de utilizator"
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Connection lost"
-#~ msgstr "Conexiune pierdută"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Conexiune terminată (la scriere)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Conexiune resetată"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Eroare la citirea din socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Could not write"
-#~ msgstr "Nu s-a putut scrie"
-
-#~ msgid "Could not connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Nu s-a putut crea un socket de ascultare"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Parolă greșită"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonia"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Server pager Japonia"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Server transfer de fișiere Japonia"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Nu s-a putut rezolva numele serverului"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel "
-#~ "de suport TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Ascundere ferestre de discuții"
-
-#~ msgid "More Data needed"
-#~ msgstr "E nevoie de mai multe date"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Selectați o imagine pentru această iconiță."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Ce identitate doriți să activați?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Culoare cursor"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Culoare cursor secundar"
-
-#~ msgid "Interface colors"
-#~ msgstr "Culori interfață"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Mărimi widget-uri"
-
-#~ msgid "Invite message"
-#~ msgstr "Mesaj de invitare"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Introduceți numele utilizatorului pe care doriți să-l invitați.\n"
-#~ "Puteți adăuga un mesaj de invitare opțional."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Nu s-a putut descărca cartea de adrese MSN"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Caut %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Conectarea la %s a eșuat"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Autentificare: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Nu se poate scrie fișierul %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Nu se poate citi fișierul %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Mesaj prea lung, ultimii %s octeți au fost trunchiați."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s nu este autentificat momentan."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Atenționarea lui %s nu este permisă."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Un mesaj s-a pierdut, ați depășit limita de viteză fixată de server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Chat-ul în %s nu este disponibil."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Trimiteți mesajele prea rapid pentru %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că era prea mare."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că a fost trimis prea repede."
-
-#~ msgid "Failure."
-#~ msgstr "Eșec."
-
-#~ msgid "Too many matches."
-#~ msgstr "Prea multe potriviri."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "E nevoie de mai multe atribute."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Serviciul „Dir” este temporar indisponibil."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Căutarea după adresa de mail este restricționată."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Cuvântul-cheie a fost ignorat."
-
-#~ msgid "No keywords."
-#~ msgstr "Fără cuvinte-cheie."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Nu există informații detaliate în director."
-
-#~ msgid "Country not supported."
-#~ msgstr "Nu există suport de țară."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Eșec necunoscut: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Nume de utilizator sau parolă incorecte."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Serviciul este temporar indisponibil."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
-#~ "autentifica."
-
-#~ msgid ""
-#~ "You have been connecting and disconnecting too frequently.  Wait ten "
-#~ "minutes and try again.  If you continue to try, you will need to wait "
-#~ "even longer."
-#~ msgstr ""
-#~ "V-ați conectat și deconectat de prea multe ori. Așteptați zece minute și "
-#~ "încercați din nou. Dacă veți continua să încercați, va trebui să "
-#~ "așteptați chiar mai mult."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Eroare necunoscută la autentificare: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Eroare necunoscută: %d. Detalii: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Grup invalid"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Conectare terminată"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Aștept răspunsul..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC a revenit din așteptare. Puteți trimite mesaje din nou."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Parola a fost schimbată cu succes"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Descărcare detalii „Dir”"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Introducere detalii „Dir”"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Nu s-a putut deschide %s pentru scriere!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Transferul fișierului a eșuat, celălalt utilizator probabil l-a anulat."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Conectarea pentru transfer a eșuat."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Nu s-a putut scrie antetul fișierului. Fișierul nu va fi transferat."
-
-#~ msgid "Save As..."
-#~ msgstr "Salvare ca..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s cere lui %s să accepte %d fișier: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s cere lui %s să accepte %d fișiere: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s cere lui %s să accepte %d de fișiere: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vă cere să-i trimiteți un fișier"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Modul de protocol TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "Opțiuni %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opțiuni proxy"
-
-#~ msgid "By log size"
-#~ msgstr "După mărimea înregistrărilor"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Deschide adresa în navigator"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Server ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Imagine iconiță simbolică"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Combinație de _taste asociată"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Evidențiază fereastra la primirea de mesaje noi"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți rapid deconectat(ă). Poate doriți să încercați TOC "
-#~ "până ce se rezolvă această problemă. Vizitați %s pentru actualizări."
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de o secundă)"
-#~ msgstr[1] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d secunde)"
-#~ msgstr[2] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d de secunde)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Adaugă contact"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Eroare „keep alive”"
-
-#, fuzzy
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server de conectare"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Nu s-a putut trimite mesajul."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Există deja un grup cu acest nume."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informații de bază"
-
-#~ msgid "Blood Type"
-#~ msgstr "Grupă sanguină"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Actualizare detalii proprii"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Viteză:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeți o "
-#~ "imagine de la %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Avatar QQ invalid"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Ați respins cererea făcută de %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Respinge cererea"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Adaugă contactul cu cereri eșuate de autorizare"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Nu s-a putut încărca lista de contacte"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Număr QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descriere grup"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizare"
-
-#~ msgid "Approve"
-#~ msgstr "Aprobă"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] a părăsit grupul „%d”"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "I am a member"
-#~ msgstr "Sunt un membru"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Cerere invalidă"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sunt admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Status necunoscut"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Ștergere grup"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Ați introdus un ID de grup prea mic sau prea mare"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sigur doriți să părăsiți acest Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefon"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Detalii chat"
-
-#~ msgid "System Message"
-#~ msgstr "Mesaj de sistem"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultima autentificare</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Introducere detalii proprii"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Ieșire din acest QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blochează acest contact"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Eroare la schimbarea parolei"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Eroare de conectare de la serverul %s:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Doriți să adăugați acest contact?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contact"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s dorește să vă adauge în listă cu identitatea %s"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s nu este în lista dumneavoastră de contacte"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Doriți să îl adăugați?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Port server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Deconectat la distanță"
-
-#~ msgid "developer"
-#~ msgstr "programator"
-
-#~ msgid "XMPP developer"
-#~ msgstr "programator XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Designeri"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Versiunea utilizată este %s versiunea %s. Ultima versiune este %s. O "
-#~ "puteți obține de la <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Noutăți:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF la citirea de la procesul „resolver”"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Detaliile v-au fost actualizate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Precizați motivul:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Ați șters cu succes utilizatorul"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "V-ați șters cu succes din lista contactului"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Ați adăugat contactul %d în lista de contacte"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid invalid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Introduceți ID-ul grupului extern"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motiv: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Solicit înscrierea"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Ați părăsit cu succes grupul"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Autorizare grup QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Operațiunea de autorizare a fost acceptată de serverul QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Precizați motivul:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "Salvează"
-
-#, fuzzy
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>IP server</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Arată informațiile de autentificare"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Autentificare eșuată. Verificați înregistrările de depanare"
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Autentificare eșuată, nici un răspuns"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "%s v-a respins cererea"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "%s v-a aprobat cererea"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Anunț de la: %s"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Eroare la introducerea opțiunilor socket-ului"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare "
-#~ "în răspunsul de la server"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Autentificarea Windows Live ID a eșuat!"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Prea periculos (expeditorul)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Prea periculos (destinatarul)"
-
-#~ msgid "Available Message"
-#~ msgstr "Mesaj ce arată disponibilitatea"
-
-#~ msgid "Away Message"
-#~ msgstr "Mesaj în absență"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(se descarcă)</i>"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Cod [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Eroare de operare asupra grupului"
-
-#~ msgid "TCP Address"
-#~ msgstr "Adresă TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Adresă UDP"
--- a/po/zh_HK.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/zh_HK.po	Wed Aug 19 00:37:01 2009 +0000
@@ -1,11 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.19 2008/08/24 21:23:04 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -19,7 +22,7 @@
 #        screen name 和 user name 在意義上是沒有分別的!
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
@@ -49,10 +52,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -637,11 +640,12 @@
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為你並未登入,所以訊息無法送出:"
 
-# XXX 這是什麼?
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -920,12 +924,12 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "計算中..."
-
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
 msgid "Hangup"
-msgstr ""
+msgstr "掛斷"
 
 #. Number of actions
 msgid "Accept"
@@ -934,26 +938,28 @@
 msgid "Reject"
 msgstr "拒絕"
 
+#  XXX 暫譯 - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "撥打中。"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "通話已中斷。"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
-
+msgstr "%s 希望與你進行語音通話。"
+
+# XXX 媒體? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s 嘗試與你以一種未獲支援的方式進行媒體通話。"
+
 msgid "You have rejected the call."
-msgstr "你離開了頻道%s%s"
-
+msgstr "你拒絕了通話。"
+
+# FIXME 暫譯,譯文有待改進 - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:語音通話。"
 
 msgid "Emails"
 msgstr "電子郵件"
@@ -1207,8 +1213,9 @@
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1232,7 +1239,7 @@
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1303,7 +1310,7 @@
 msgstr "你在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
@@ -1361,8 +1368,9 @@
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound,也在其他地方用到,改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1510,7 +1518,7 @@
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給你。"
+msgstr "%s 在 %s 送出一個訊息給你"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
@@ -1620,22 +1628,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
-
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL(或同類型)網址前綴"
+
 msgid "TinyURL"
-msgstr "樂曲網址"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
-
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫,因為如果是在電腦上複製,無論網址長短,複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "當接收到含有網址的訊息時,使用 TinyURL 縮短網址,好方便抄寫"
 
 msgid "accounts"
 msgstr "帳號清單"
@@ -1692,9 +1705,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1751,6 +1764,44 @@
 msgid "_View Certificate..."
 msgstr "檢視證書(_V)"
 
+# FIXME 譯文不太通順 - acli 20070913
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的證書聲稱它應該屬於「%s」,你目前可能的連線可能不是你心目中希望使"
+"用的服務。"
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL 證書錯誤"
+
+msgid "Invalid certificate chain"
+msgstr "無效的證書鏈"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"無法核實這張證書,因為你沒有根證書機構證書 (root certificate) 的資料庫。"
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1759,28 +1810,11 @@
 "automatically checked."
 msgstr "「%s」出示的證書是自簽的,無法自動進行核實。"
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的證書鍊是無效的。"
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "SSL 證書錯誤"
-
-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 ""
-"無法核實這張證書,因為你沒有根證書機構證書 (root certificate) 的資料庫。"
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1798,19 +1832,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "證書機構的簽署是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的證書聲稱它應該屬於「%s」,你目前可能的連線可能不是你心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1847,7 +1868,7 @@
 msgstr "+++ %s 登出"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1894,10 +1915,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#, fuzzy
 msgid "Invite to chat"
-msgstr "邀請進入會議室"
+msgstr "邀請進入聊天室"
 
 #. Put our happy label in it.
 msgid ""
@@ -2040,6 +2059,10 @@
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2236,9 +2259,9 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
 
-#, fuzzy
+# FIXME 譯文有待改進 - acli 20090731
 msgid "Error creating conference."
-msgstr "連線開啟錯誤"
+msgstr "建立會議失敗。"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2663,7 +2686,6 @@
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2672,7 +2694,7 @@
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
@@ -2717,7 +2739,6 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時,利用「好友狀態捕捉」功能儲存送出的訊息。"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2751,9 +2772,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問,務必使用「好友狀態捕捉」儲存離線訊息。"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "輸入密碼"
+msgstr "一次性密碼"
 
 #. *< type
 #. *< ui_requirement
@@ -2762,13 +2782,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密碼支援"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "強制密碼只用一次"
 
 #. *  description
 msgid ""
@@ -2968,18 +2988,15 @@
 "找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit,詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
-
-#, fuzzy
+"找不到 Apple 的「Bonjour For Windows」工具,詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "無法接收連入的即時訊息連線\n"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3033,24 +3050,20 @@
 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 ""
-"無法建立 Socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法建立 Socket:%s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "無法聯結 Socket 到通訊埠"
-
-#, fuzzy, c-format
+msgstr "無法連結 Socket 到通訊埠:%s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
+msgstr "無法監聽 Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -3059,7 +3072,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱及通訊埠是無效的"
+"對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -3095,17 +3108,14 @@
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "填寫註冊資料欄位。"
-
-#, fuzzy
+msgstr "必需填妥所有註冊資料欄位"
+
 msgid "Passwords do not match"
-msgstr "新密碼並不相符。"
-
-#, fuzzy
+msgstr "兩個密碼並不相符"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgstr "無法註冊新帳號,錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3120,9 +3130,8 @@
 msgstr "舊密碼(再次確認)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "請輸入驗證圖片內的文字"
+
 msgid "Captcha"
 msgstr "驗證圖片"
 
@@ -3265,9 +3274,9 @@
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱「%s」:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3280,9 +3289,8 @@
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "尚未連線到伺服器。"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3323,9 +3331,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
-#, fuzzy
 msgid "GG server"
-msgstr "設定使用者資訊..."
+msgstr "Gadu-Gadu 伺服器"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3341,7 +3348,6 @@
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
@@ -3365,11 +3371,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 ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
+msgstr "與伺服器之間的連線突然中斷:%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3380,9 +3384,8 @@
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 網名不可含有空白字符"
+msgstr "IRC 網名和伺服器名稱均不可含有空白字符"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
@@ -3392,13 +3395,13 @@
 msgstr "無法連線"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "無法連線到「%s」"
-
-#, fuzzy, c-format
+msgstr "無法連線:%s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "伺服器關閉連線。"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3590,13 +3593,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "聊天室名稱正在使用中"
-
-#, fuzzy
+msgstr "網名「%s」已在使用中。"
+
 msgid "Nickname in use"
-msgstr "網名"
+msgstr "網名已在使用中"
 
 msgid "Cannot change nick"
 msgstr "無法更改網名"
@@ -3833,13 +3835,11 @@
 msgid "execute"
 msgstr "執行"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#, fuzzy
+msgstr "伺服器要求使用 TLS/SSL,但找不到 TLS/SSL 支援。"
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "你指定必須加密,但找不到 TLS/SSL 支援。"
+msgstr "你要求加密,但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3853,57 +3853,44 @@
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "認證失敗"
-
-#, fuzzy
+msgstr "SASL 認證失敗"
+
 msgid "Invalid response from server"
-msgstr "伺服器送來了無效的回應。"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "你指定必須加密,但這伺服器沒有加密功能。"
+msgstr "你要求加密,但這伺服器沒有加密功能。"
 
 # XXX 好像有些怪,譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL 錯誤"
+msgstr "SASL 錯誤:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "BOSH 連線管理員中斷了你的工作階段。"
+
 msgid "No session ID given"
-msgstr "沒有給予原因"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
+msgstr "沒有給定工作階段代碼"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支援指定的 XMPP 版本"
-
-#, fuzzy
+msgstr "不支援的 BOSH 協定版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法與伺服器建立連線"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy
+msgstr "無法與伺服器建立連線:%s"
+
 msgid "Unable to establish SSL connection"
-msgstr "無法初始化連結"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3920,6 +3907,11 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3972,9 +3964,8 @@
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "本地端檔案:"
+msgstr "本地端時間:"
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3989,11 +3980,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已登出"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
@@ -4019,7 +4009,6 @@
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4028,7 +4017,6 @@
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4162,9 +4150,8 @@
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+msgstr "無效的伺服器名稱"
+
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4175,26 +4162,23 @@
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-#, fuzzy
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "別名:"
-
-#, fuzzy
+msgstr "從屬關係:"
+
 msgid "No users found"
-msgstr "找不到符合的使用者"
-
-#, fuzzy
+msgstr "找不到任何使用者"
+
 msgid "Roles:"
-msgstr "職責"
-
-#, fuzzy
+msgstr "身份:"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4202,9 +4186,9 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#, fuzzy
+# FIXME 譯文聽來好像有點怪 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "無法連線到伺服器。"
+msgstr "畸型的 BOSH 網址"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4272,10 +4256,6 @@
 msgid "Change Registration"
 msgstr "更改註冊資訊"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "無法連線到伺服器。"
-
 msgid "Error unregistering account"
 msgstr "移除帳號註冊錯誤"
 
@@ -4295,7 +4275,7 @@
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
@@ -4612,16 +4592,16 @@
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級:「%s」"
-
-#  XXX 暫譯 - ambrose 20070415
+msgstr "不明的從屬關係:「%s」"
+
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4642,19 +4622,20 @@
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "無法「嗶」使用者 %s ,因為沒有有關對方的任何資料。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為沒有有關對方的任何資料。"
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "無法「嗶」使用者 %s ,因為對方目前可能離線。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為對方目前可能離線。"
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "無法「嗶」使用者 %s ,因為對方的用戶端不支援這個功能。"
+msgstr ""
+"無法「嗶」%s ,因為對方的用戶端不支援這個功能,或者目前關閉了這個功能。"
 
 # XXX 這是暫譯 - acli 20070913
 #, c-format
@@ -4670,38 +4651,38 @@
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了你一聲"
 
-#, fuzzy, c-format
+# XXX 媒體? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
-
-#, fuzzy, c-format
+msgstr "無法與 %s 進行媒體通話,因為這個 JID 是無效的"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
 #  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
-
-#, fuzzy
+msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+
 msgid "Media Initiation Failed"
-msgstr "註冊失敗"
-
-#  FIXME 這不通順 - acli 20070614
-#, fuzzy, c-format
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
 
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090730
 msgid "Initiate Media"
-msgstr "開啟聊天室(_C)"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
@@ -4721,23 +4702,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]:禁止某使用者進入聊天室"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#, fuzzy
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [網名1] [網"
+"名2] ...: 取得與聊天室有從屬關係的使用者,或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [網名1] [網名"
+"2] ...: 取得在聊天室有身份的使用者,或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
@@ -4798,7 +4777,7 @@
 msgstr "檔案傳輸代理伺服器"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH 網址"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4860,32 +4839,29 @@
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "沒有給予原因"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "你被 %s 踢出:(%s)"
-
-#, fuzzy, c-format
+msgstr "你已被踢出:(%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s 踢出 (%s)"
-
-#, fuzzy
+msgstr "已被踢出 (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "開啟檔案途中發生錯誤。"
-
-#, fuzzy
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」? 20090305 acli
 msgid "Transfer was closed."
-msgstr "檔案傳輸失敗"
-
-#, fuzzy
+msgstr "傳輸已被中止。"
+
 msgid "Failed to open the file"
-msgstr "無法開啟檔案「%s」:%s"
+msgstr "無法開啟檔案"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5228,9 +5204,25 @@
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對你眨眼,<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對你眨眼,但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段,<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段,但無法給語音片段存檔"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個語音聊天的邀請,但目前還沒有語音聊天的支援。"
 
 msgid "Nudge"
 msgstr "呼叫"
@@ -5387,6 +5379,27 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息:"
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
+
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
 
@@ -5579,13 +5592,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫你!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "不明錯誤(代碼 %d)"
+msgstr "不明錯誤(代碼 %d):%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
@@ -5657,25 +5671,21 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "這個伺服器不支援我們使用的通訊協定。"
-
-#, fuzzy
+msgstr "這個伺服器不支援我們使用的通訊協定"
+
 msgid "Error parsing HTTP"
-msgstr "解析 HTTP 途中發生錯誤。"
-
-#, fuzzy
+msgstr "解析 HTTP 途中發生錯誤"
+
 msgid "You have signed on from another location"
-msgstr "你由其他的地方登入。"
+msgstr "你由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
-
-#, fuzzy
+msgstr "暫時無法使用 MSN 伺服器,請過一會後重試。"
+
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN 伺服器將暫時關閉。"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5704,13 +5714,15 @@
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#, fuzzy, c-format
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
-
+msgstr "%s 要求看你的 webcam,但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個 webcam 邀請,但目前還沒有這個功能的支援。"
 
 msgid "Away From Computer"
 msgstr "不在電腦前"
@@ -5908,15 +5920,15 @@
 msgstr "通訊協定錯誤,代碼 %d:%s"
 
 # NOTE 第一個 %s 是錯誤訊息
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 你的密碼的長度為 %d 個字符,超出了估計中 MySpaceIM 所設 %d 字符的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼,然後重試。"
+"%s 你的密碼的長度為 %zu 個字符,超出了 %d 字符的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼,然後重試。"
 
 msgid "Incorrect username or password"
 msgstr "錯誤的帳號或密碼"
@@ -6021,6 +6033,8 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"設定使用者名稱途中發生錯誤。請重試,或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:可取得此使用者名稱"
@@ -6285,9 +6299,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "無法 Ping 使用者 %s"
+msgstr "無法登入:%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6418,7 +6432,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到你剛才送出的訊息。"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6446,10 +6459,9 @@
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-# XXX 暫譯 - 20061025
-#, fuzzy
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
+msgstr "伺服器發出了奇怪的回應,伺服器位址 "
 
 #. username connecting too frequently
 msgid ""
@@ -6459,12 +6471,13 @@
 "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
 "那麼你的等待時間將會更加的延長。"
 
-#, fuzzy, c-format
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "解析 %s 途中發生了錯誤"
+msgstr "要求途中發生了錯誤,伺服器位址 "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL 不允許你的帳號在這裏登入"
 
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
@@ -6472,9 +6485,8 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6521,7 +6533,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
@@ -6581,7 +6592,7 @@
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6740,17 +6751,15 @@
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
-
-#, fuzzy, c-format
+msgstr "好友備註"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"無法連線至認證伺服器:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法連線至認證伺服器:%s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法連線到 BOS 伺服器:%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6762,14 +6771,14 @@
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;"
-"或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+"無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6787,14 +6796,13 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "使用者不存在"
-
+msgstr "使用者名稱不存在"
+
+# XXX「suspend」真是「停用」嗎?
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "你的帳號目前停用中。"
+msgstr "你的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6803,22 +6811,21 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
+"你的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗試連線,"
 "那麼你的等待時間將會更加的延長。"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "你所輸入的 SecurID 碼無效。"
+msgstr "你所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6826,12 +6833,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 "確定(_O)"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6841,12 +6842,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將你加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息:"
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證!"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -7149,17 +7144,14 @@
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以"
-"英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7174,18 +7166,18 @@
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為你的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為你的好友清單中有太多的好友,所以沒有辦法加入好友 %s。請移除其中一個,然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單,原因不明。"
 
@@ -7224,7 +7216,7 @@
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
@@ -7241,10 +7233,10 @@
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明:"
+msgstr "好友備註:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7263,7 +7255,7 @@
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7275,12 +7267,12 @@
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」,不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網絡上查看你目前的狀態(會導致你收到垃圾訊息!)"
+msgstr "允許在網絡上檢視你目前的狀態(會導致你收到垃圾訊息!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 私隱選頊"
@@ -7354,9 +7346,8 @@
 msgid "Search for Buddy by Information"
 msgstr "根據資訊尋找好友"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "使用者沒有登入"
+msgstr "使用 clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7492,9 +7483,8 @@
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證?"
+msgstr "允許新增你為好友"
 
 msgid "Cellphone Number"
 msgstr "流動電話號碼"
@@ -7558,40 +7548,37 @@
 msgid "Note"
 msgstr "備註"
 
+# NOTE 正式的QQ介面寫「备注」(備註)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "修改地址"
+msgstr "好友備註"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "請隨意修改備註"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼? - acli 20090305
 msgid "Server says:"
-msgstr "伺服器忙碌"
+msgstr "伺服器回應:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "請求已獲接受。"
 
 msgid "Your request was rejected."
-msgstr ""
-
-# NOTE Require意為「需要」,不是「要求」
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入你的好友清單?"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7608,14 +7595,16 @@
 msgid "Sorry, you're not my style."
 msgstr "不好意思,你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
-
-#, fuzzy
+msgstr "%u 需要認證"
+
+# NOTE 這是視窗標題,對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入你的好友清單?"
-
+msgstr "新增好友認證"
+
+# NOTE 其他協定譯「認證要求訊息:」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7633,7 +7622,7 @@
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7692,10 +7681,10 @@
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7721,19 +7710,17 @@
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
-
-#  NOTE QQ「member」應是「成員」
+msgstr "成功加入羣組 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入羣組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入羣組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 羣組操作"
@@ -7742,15 +7729,15 @@
 msgstr "失敗:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun,未知的回覆"
+msgstr "加入羣組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開羣組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意,假如你是創立者,這最終會把這個羣 (Qun) 移除。"
+msgstr "請注意,假如你是創立者,這最終會把這個羣組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
 #  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
@@ -7760,14 +7747,14 @@
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的更改了 Qun 成員"
+msgstr "成功的更改了羣組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的更改了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個羣 (Qun)"
+msgstr "成功建立了一個羣組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎?"
@@ -7775,9 +7762,10 @@
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入羣組 %d"
+msgstr "使用者 %u 要求加入羣組 %u,理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7785,11 +7773,12 @@
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
-
+msgstr "加入羣組 %u 失敗,羣組管理員為 %u"
+
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了你加入羣組 %1$u,理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
 #, c-format
@@ -7803,9 +7792,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7868,9 +7857,12 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯:「客戶端旗標」
+#  NOTE 根據原始碼,所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間:</b>%s<br>\n"
+msgstr "<b>兼容性:</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7929,7 +7921,7 @@
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "如有遺漏務請通知……謝謝!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
@@ -7951,14 +7943,13 @@
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 羣"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -8000,7 +7991,7 @@
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進,原文也是
 msgid "Keep alive interval (seconds)"
@@ -8010,7 +8001,6 @@
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
@@ -8030,7 +8020,7 @@
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8048,9 +8038,11 @@
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
-
+msgstr "輸入驗證文字"
+
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -8073,17 +8065,15 @@
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論(但可能會錯)- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8138,15 +8128,14 @@
 msgid "QQ Qun Command"
 msgstr "QQ 羣組指令"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8272,7 +8261,6 @@
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8285,12 +8273,11 @@
 "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果你想開啟一個新的會"
 "議室,並且邀請這個使用者加入,你可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -9131,7 +9118,6 @@
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
@@ -9145,22 +9131,16 @@
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙"
+msgstr "無法載入 SILC 配對密碼匙"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙"
-
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
@@ -9461,9 +9441,8 @@
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 配對密碼匙中..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "無法產生 SILC 配對密碼匙\n"
+msgstr "無法產生 SILC 配對密碼匙"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9601,7 +9580,6 @@
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
@@ -9609,20 +9587,18 @@
 msgid "John Noname"
 msgstr "無名氏"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "無法讀取 SILC 配對密碼匙:%s"
+msgstr "無法載入 SILC 配對密碼匙:%s"
 
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "不明的伺服器回應。"
-
-#, fuzzy
+msgstr "不明的伺服器回應"
+
 msgid "Unable to create listen socket"
-msgstr "無法建立 Socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
@@ -9685,7 +9661,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
@@ -9717,9 +9692,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo 帳號"
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9731,12 +9705,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo 協定模組"
+msgstr "Yahoo JAPAN 協定模組"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "無法發送你的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9763,28 +9736,24 @@
 msgstr "新增好友被拒"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "收到無效的資料"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "錯誤的帳號或密碼"
+msgstr "未有輸入帳號或密碼"
 
 #, c-format
 msgid ""
@@ -9809,18 +9778,18 @@
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
+# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請你登入 Yahoo! 網站。"
+msgstr "你的帳戶目前已被封鎖。請你登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
@@ -9829,21 +9798,16 @@
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-#, fuzzy, c-format
+msgstr "伺服器發出了奇怪的 HTTP 回應"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "與 %s 之間的連線突然中斷:%s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
+msgstr "無法與 %s 建立連線:%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9885,7 +9849,7 @@
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9901,9 +9865,9 @@
 msgstr "開始 Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
-
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+msgstr "請輸入希望啟動的 ID"
+
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室?"
@@ -9926,9 +9890,9 @@
 msgid "Unable to connect."
 msgstr "無法連線。"
 
-# TODO - 覆查譯文 - 20061028
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -10000,11 +9964,8 @@
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10059,7 +10020,6 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
@@ -10183,7 +10143,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10195,7 +10155,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10213,17 +10173,18 @@
 msgid "Exposure"
 msgstr "現身程度"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
+msgstr "無法解析 HTTP 代理伺服應的回應:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, fuzzy, c-format
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgstr "拒絕存取:HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10468,12 +10429,15 @@
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#, fuzzy, c-format
+# NOTE 第一個 %s 是 description,第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10525,8 +10489,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I):"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10590,9 +10554,8 @@
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "代理伺服器"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10639,9 +10602,8 @@
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "帳號"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10666,17 +10628,14 @@
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "新增聊天室(_A)"
+msgstr "語音通話(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-# XXX 暫譯
-#, fuzzy
+msgstr "語音/視像通話"
+
 msgid "_Video Call"
-msgstr "視像聊天"
+msgstr "視像通話(_V)"
 
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
@@ -10687,11 +10646,9 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "離線時顯示"
 
@@ -10823,9 +10780,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/工具/證書(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具/表情(_Y)"
+msgstr "/工具/自定表情(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
@@ -10955,8 +10911,9 @@
 msgid "By status"
 msgstr "根據狀態"
 
+# XXX 暫譯 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "根據日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -10973,7 +10930,7 @@
 msgstr "重新啟動"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常見問題"
 
 msgid "Welcome back!"
 msgstr "歡迎歸來!"
@@ -11105,109 +11062,99 @@
 msgstr "背景顏色"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "好友清單的背景顏色"
+
 msgid "Layout"
-msgstr "寮國文"
+msgstr "佈局"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "好友清單內圖示、名稱和狀態的佈局"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "背景顏色"
+msgstr "展開的羣組的背景顏色"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組展開時的羣組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼,這個「文字」選項應該係指PidginThemeFont(字體名稱、字體顏色兩項),下同
 msgid "Expanded Text"
-msgstr "展開(_E)"
+msgstr "展開的羣組的名稱"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組展開時羣組名稱的字體及文字顏色"
+
 msgid "Collapsed Background Color"
-msgstr "設定背景顏色"
+msgstr "收起的羣組的背景顏色"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組收起時羣組名稱的背景顏色"
+
 msgid "Collapsed Text"
-msgstr "收起(_C)"
+msgstr "收起的羣組的名稱"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "羣組收起時羣組名稱的字體及文字顏色"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "設定背景顏色"
+msgstr "好友/聊天室的背景顏色"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "好友或聊天室名稱的背景顏色"
+
 msgid "Contact Text"
-msgstr "捷徑"
-
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋,當contact收起時,我們見到的是priority buddy
+# NOTE 但當contact展開時,我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理,所謂「text information for when a contact is expanded」應該是指contact的名稱
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
 msgid "On-line Text"
-msgstr "上線"
+msgstr "上線好友的名稱"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
 msgid "Away Text"
-msgstr "離開"
+msgstr "離開好友的名稱"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
 msgid "Off-line Text"
-msgstr "離線"
+msgstr "離線好友的名稱"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-# XXX 要覆查 - acli 20070914
-#, fuzzy
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
 msgid "Idle Text"
-msgstr "情緒描述"
+msgstr "閒置好友的名稱"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
 msgid "Message Text"
-msgstr "訊息送出"
+msgstr "有未讀訊息的好友名稱"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "提到你的網名的聊天室名稱"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "聊天室中提到你的網名時聊天室名稱的字體及文字顏色"
+
 msgid "The text information for a buddy's status"
-msgstr "更改 %s 的個人資料"
+msgstr "好友狀態的字體及文字顏色"
 
 # XXX 譯文有待改進 - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "請輸入這張證書所屬的主機名稱。"
 
@@ -11259,7 +11206,6 @@
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "上次提到"
 
@@ -11308,21 +11254,18 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#, fuzzy
+# XXX 媒體?  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/交談/觀看歷史記錄(_L)"
+msgstr "/交談/媒體/語音/視像通話(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
@@ -11396,17 +11339,15 @@
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#, fuzzy
+# XXX 媒體? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/交談/更多"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/交談/觀看歷史記錄"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/交談/更多"
+msgstr "/交談/媒體/語音/視像通話"
 
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
@@ -11606,7 +11547,7 @@
 msgstr "張家興"
 
 msgid "voice and video"
-msgstr ""
+msgstr "語音及視像功能"
 
 msgid "support"
 msgstr "支援"
@@ -11744,9 +11685,8 @@
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "羅馬尼亞文"
+msgstr "亞美尼亞文"
 
 msgid "Indonesian"
 msgstr "印尼文"
@@ -11769,9 +11709,9 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有格魯吉亞文翻譯人員"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "其他"
+msgstr "高棉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註:KDE 譯「坎納達」
@@ -11871,8 +11811,9 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦希里文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
@@ -11955,7 +11896,7 @@
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11965,8 +11906,8 @@
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12199,14 +12140,6 @@
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12226,7 +12159,6 @@
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過(或已啟動)的連結時的連結顏色。"
 
@@ -12264,21 +12196,18 @@
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時,用來顯示對方帳號的顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是代表對方「輕聲的說」時,用來顯示對帳號的顏色。"
 
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是輕聲訊息時,用來顯示對帳號的顏色。"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
@@ -12292,7 +12221,7 @@
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12302,7 +12231,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12539,7 +12468,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12561,6 +12490,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12571,7 +12501,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12592,6 +12522,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12626,23 +12557,25 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX 媒體? - acli 20090730
 msgid "/_Media"
-msgstr ""
-
+msgstr "/媒體(_M)"
+
+# XXX 暫譯 - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
 msgid "Calling..."
-msgstr "計算中..."
+msgstr "撥打中..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s 希望跟你進行語音/視像通話。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s 希望跟你進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12671,9 +12604,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "你選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#, fuzzy
 msgid "No message"
-msgstr "不明的訊息"
+msgstr "沒有訊息"
 
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
@@ -12681,16 +12613,18 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">你有郵件!</span>"
 
-#, fuzzy
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "New Pounces"
-msgstr "新增好友狀態捕捉"
-
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常? - acli 20090730
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "關閉"
+
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">你有郵件!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">你捕捉到了好友狀態!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
@@ -12738,7 +12672,6 @@
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -12815,64 +12748,59 @@
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "開始輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "暫停輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "登入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 由閒置返回 (%s)"
-
-#, fuzzy, c-format
+msgstr "由閒置返回"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "返回"
-
-#, fuzzy, c-format
+msgstr "由離開返回"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "停止輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "登出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "閒置"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "離開期間"
-
-#, fuzzy, c-format
+msgstr "離開"
+
+#, c-format
 msgid "Sent a message"
 msgstr "送出訊息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "未知的捕捉事件。請匯報這個問題!"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "未知的捕捉事件……請匯報這個問題!"
+
+# XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法解開表情主題檔。"
+
 msgid "Theme failed to load."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法載入表情主題。"
+
 msgid "Theme failed to copy."
-msgstr "無法打開表情主題。"
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
 msgid "Install Theme"
@@ -12895,9 +12823,8 @@
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友清單"
+msgstr "好友清單主題"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12909,9 +12836,8 @@
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "即時訊息交談視窗"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
@@ -13017,9 +12943,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自動偵測 IP 位址(_A)"
+msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
@@ -13039,9 +12965,10 @@
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "中繼伺服器 (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
@@ -13223,7 +13150,7 @@
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應:"
+msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13388,11 +13315,10 @@
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-# XXX 20080810 acli - 暫譯
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "指定的捷徑已有相關的自選表情,請指定另一個捷徑。"
+msgstr "「%s」已自選表情,請指定另一個捷徑。"
 
 msgid "Custom Smiley"
 msgstr "自選表情"
@@ -13406,28 +13332,26 @@
 msgid "Add Smiley"
 msgstr "新增表情"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "圖像(_I)"
-
+msgstr "圖像(_I):"
+
+# XXX 暫譯 - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "捷徑"
+msgstr "捷徑文字(_H):"
 
 msgid "Smiley"
 msgstr "表情"
 
-#, fuzzy
+# XXX 暫譯 - 20090305 acli
 msgid "Shortcut Text"
-msgstr "捷徑"
+msgstr "捷徑文字"
 
 msgid "Custom Smiley Manager"
 msgstr "自選表情管理"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "選擇好友"
+msgstr "選擇好友圖示"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
@@ -13512,7 +13436,6 @@
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13547,9 +13470,8 @@
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入圖像「%s」,原因不明,大概是圖像檔已損壞"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "在瀏覽器中打開連結(_O):"
+msgstr "打開連結(_O)"
 
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
@@ -13557,9 +13479,21 @@
 msgid "_Copy Email Address"
 msgstr "複製電子郵件地址(_C)"
 
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13584,6 +13518,9 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13655,80 +13592,73 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
-#, fuzzy
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
 msgid "Server name request"
-msgstr "伺服器位址"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-# XXX
-#, fuzzy
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜,看了原始碼也看不明,開發者又不答我的問題 - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "登入會議伺服器"
-
-#, fuzzy
+msgstr "請輸入 XMPP 伺服器名稱"
+
 msgid "Select an XMPP server to query"
-msgstr "選擇查詢的會議伺服器"
-
-#  XXX 暫譯
-#, fuzzy
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Find Services"
-msgstr "所用之網上服務"
-
-#, fuzzy
+msgstr "搜尋服務"
+
 msgid "Add to Buddy List"
-msgstr "送出好友清單"
-
-#, fuzzy
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "離開"
-
-#, fuzzy
+msgstr "閘道器"
+
 msgid "Directory"
-msgstr "日誌目錄"
-
-#, fuzzy
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "選取音效"
-
-#, fuzzy
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub 服務"
-
-#, fuzzy
+msgstr "PubSub 葉子節點"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "描述"
+msgstr ""
+"\n"
+"<b>描述:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "服務探尋資訊"
-
-#, fuzzy
+msgstr "服務探索"
+
 msgid "_Browse"
-msgstr "瀏覽器(_B):"
-
-#, fuzzy
+msgstr "瀏覽(_B)"
+
 msgid "Server does not exist"
-msgstr "使用者不存在"
-
-#, fuzzy
+msgstr "伺服器不存在"
+
 msgid "Server does not support service discovery"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#, fuzzy
+msgstr "伺服器不支援服務探索"
+
 msgid "XMPP Service Discovery"
-msgstr "服務探尋資訊"
-
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "讓你瀏覽和註冊服務。"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
 
 msgid "Buddy is idle"
 msgstr "好友閒置"
@@ -14137,7 +14067,6 @@
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14267,7 +14196,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "輸入通知顏色"
 
@@ -14302,23 +14230,20 @@
 msgstr ""
 
 # XXX 這是我譯的,但我認為這是很差的譯文,看了也不知是什麼 - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "啟用輸入通知"
-
-#, fuzzy
+msgstr "停用輸入通知"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "GTK+ 佈景主題控制設定"
+
 msgid "Colors"
-msgstr "關閉"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "雜項"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
@@ -14359,10 +14284,10 @@
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」(即說:我知道有新版本了,稍後我會下載,暫時別煩我)
 msgid "Later"
-msgstr "稍後"
-
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息(quit message),ui_name通常就是「pidgin」
+msgstr "稍後下載"
+
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14406,7 +14331,6 @@
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14465,103 +14389,85 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根據使用者所定義的規則來取代送出訊息中的文字。"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "尚未登入"
-
-#, fuzzy
+msgstr "剛巧登入"
+
 msgid "Just logged out"
-msgstr "尚未登入"
+msgstr "剛巧登出"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
 msgid "Icon for Chat"
-msgstr "加入聊天室"
-
-#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
-#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#, fuzzy
+msgstr "代表聊天室的圖示"
+
 msgid "Ignored"
-msgstr "忽略"
-
-#, fuzzy
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
 msgid "Founder"
-msgstr "再大聲"
-
-#, fuzzy
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員,Konversation譯「助理」,Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#, fuzzy
+msgstr "助理"
+
 msgid "Authorization dialog"
-msgstr "給予認證"
-
-# TODO 要覆查 - 20061025
-#, fuzzy
+msgstr "認證視窗"
+
 msgid "Error dialog"
-msgstr "錯誤訊息"
-
-# XXX 20070518
-#, fuzzy
+msgstr "錯誤訊息視窗"
+
 msgid "Information dialog"
-msgstr "資訊"
+msgstr "資訊訊息視窗"
 
 msgid "Mail dialog"
-msgstr ""
-
-#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#, fuzzy
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20090730
 msgid "Question dialog"
-msgstr "對話視窗 (Request Dialog)"
-
-#, fuzzy
+msgstr "提問視窗"
+
 msgid "Warning dialog"
-msgstr "警告等級"
+msgstr "警告訊息視窗"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "這是什麼類型的視窗?"
+
 msgid "Status Icons"
-msgstr "狀態:%s"
-
-#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#, fuzzy
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "聊天室區域 (Locale)"
-
-#, fuzzy
+msgstr "聊天室圖示"
+
 msgid "Dialog Icons"
-msgstr "更改圖示"
-
-#, fuzzy
+msgstr "視窗圖示"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "Pidgin 圖示主題編輯器"
+
 msgid "Contact"
-msgstr "聯絡資訊"
-
-#, fuzzy
+msgstr "好友"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "好友清單"
-
-#, fuzzy
+msgstr "Pidgin 好友清單主題編輯器"
+
 msgid "Edit Buddylist Theme"
-msgstr "好友清單"
+msgstr "編輯好友清單主題"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "編輯圖示主題"
 
 #. *< type
 #. *< ui_requirement
@@ -14570,16 +14476,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器。"
 
 #. *< type
 #. *< ui_requirement
@@ -14737,9 +14641,10 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K);"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14747,7 +14652,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
@@ -14791,6 +14695,27 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "無法開啟Socket"
 
@@ -14816,23 +14741,10 @@
 #~ msgid "Read error"
 #~ msgstr "讀取錯誤"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與伺服器建立連線:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "寫入錯誤"
-
 # NOTE 這是功能名稱(直譯)
 #~ msgid "Last Activity"
 #~ msgstr "最近活動"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "服務探尋資訊"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "服務探尋項目"
@@ -14856,9 +14768,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "臨時指令"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub 服務"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 位元組串流"
 
@@ -14884,7 +14793,7 @@
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #~ msgid "Software Version"
-#~ msgstr "軟件版本"
+#~ msgstr "軟體版本"
 
 #~ msgid "Stream Initiation"
 #~ msgstr "開始串流"
@@ -14930,7 +14839,7 @@
 #~ msgstr "Jingle 音訊"
 
 #~ msgid "User Nickname"
-#~ msgstr "使用者網名"
+#~ msgstr "使用者暱稱"
 
 #~ msgid "Jingle ICE UDP"
 #~ msgstr "Jingle ICE UDP"
@@ -14939,7 +14848,7 @@
 #~ msgstr "Jingle ICE TCP"
 
 #~ msgid "Jingle Video"
-#~ msgstr "Jingle 視像"
+#~ msgstr "Jingle 視訊"
 
 #~ msgid "Jingle DTMF"
 #~ msgstr "Jingle DTMF"
@@ -14948,7 +14857,7 @@
 #~ msgstr "收到的訊息"
 
 #~ msgid "Public Key Publishing"
-#~ msgstr "發佈公開密碼匙"
+#~ msgstr "發佈公鑰"
 
 # NOTE Jabber 新功能規格
 #~ msgid "User Browsing"
@@ -14971,6 +14880,9 @@
 #~ msgid "Hop Check"
 #~ msgstr "中繼段檢查"
 
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
 #~ msgid "Read Error"
 #~ msgstr "讀取錯誤"
 
@@ -14992,14 +14904,11 @@
 # XXX 暫譯
 #~ msgid ""
 #~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "你已經被登出,因為你已在其他電腦上登入。"
+#~ msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15007,14 +14916,17 @@
 #~ "無法連線到 BOS 伺服器:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "你可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
 
 #~ msgid "Could Not Connect"
 #~ msgstr "無法連線"
 
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "無法解密伺服器回應"
@@ -15046,81 +14958,6 @@
 #~ msgid "Could not create listen socket"
 #~ msgstr "無法建立 Socket 監聽"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "密碼錯誤"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與 %s 建立連線:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入你想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
 #~ msgid "Looking up %s"
 #~ msgstr "找尋 %s 中"
 
@@ -15148,19 +14985,19 @@
 
 #~ msgid ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "訊息被丟棄,因為你達到了伺服器所限制的發送速度。"
+#~ msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
 #~ msgid "Chat in %s is not available."
 #~ msgstr "在 %s 不可以聊天。"
 
 #~ msgid "You are sending messages too fast to %s."
-#~ msgstr "你送訊息給 %s 的速度太快了。"
+#~ msgstr "您送訊息給 %s 的速度太快了。"
 
 #~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "你遺失了一個由 %s 送來的訊息,因為它太大了。"
+#~ msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
 #~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "你遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
+#~ msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
 #~ msgid "Failure."
 #~ msgstr "失敗。"
@@ -15203,15 +15040,15 @@
 #~ msgstr "暫時無法使用該項服務。"
 
 #~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "你目前登入系統的警告等級太高,以致無法登入。"
+#~ msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
 #~ msgid ""
 #~ "You have been connecting and disconnecting too frequently.  Wait ten "
 #~ "minutes and try again.  If you continue to try, you will need to wait "
 #~ "even longer."
 #~ msgstr ""
-#~ "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連"
-#~ "線,那麼你的等待時間將會更加的延長。"
+#~ "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+#~ "線,那麼您的等待時間將會更加的延長。"
 
 #~ msgid "An unknown signon error has occurred: %s."
 #~ msgstr "發生了一個未知的登入錯誤:%s。"
@@ -15220,7 +15057,7 @@
 #~ msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
 #~ msgid "Invalid Groupname"
-#~ msgstr "無效的羣組名稱"
+#~ msgstr "無效的群組名稱"
 
 #~ msgid "Connection Closed"
 #~ msgstr "連線關閉"
@@ -15229,16 +15066,16 @@
 #~ msgstr "等待回覆中..."
 
 #~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC 結束了暫停狀態。你現在可以繼續的傳送你的訊息。"
+#~ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
 #~ msgid "Password Change Successful"
 #~ msgstr "密碼修改成功"
 
 #~ msgid "Get Dir Info"
-#~ msgstr "取得使用者個人資料"
+#~ msgstr "取得使用者個人資訊"
 
 #~ msgid "Set Dir Info"
-#~ msgstr "設定使用者個人資料"
+#~ msgstr "設定使用者個人資訊"
 
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "無法開啟 %s 以供寫入!"
@@ -15261,26 +15098,73 @@
 #~ msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
 #~ msgid "%s requests you to send them a file"
-#~ msgstr "%s 要求你傳送檔案給他(她)。"
+#~ msgstr "%s 要求您傳送檔案給他(她)。"
 
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 協定模組"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器(日本地區)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器(日本地區)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
 #~ msgid "%s Options"
 #~ msgstr "%s 選項"
 
 #~ msgid "Proxy Options"
 #~ msgstr "代理伺服器選項"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
 #~ msgid "By log size"
-#~ msgstr "根據日誌大小"
+#~ msgstr "依照日誌大小"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "在瀏覽器中打開連結(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN 伺服器(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "表情圖像(_I)"
 
@@ -15306,14 +15190,6 @@
 #~ msgstr[0] "與伺服器失去連線(%d 秒內收不到任何資料)"
 #~ msgstr[1] "與伺服器失去連線(%d 秒內收不到任何資料)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -15324,14 +15200,9 @@
 #~ "與伺服器之間的連線突然中斷:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -15493,10 +15364,6 @@
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"
 
--- a/po/zh_TW.po	Mon Aug 17 15:56:16 2009 +0000
+++ b/po/zh_TW.po	Wed Aug 19 00:37:01 2009 +0000
@@ -1,9 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -17,7 +20,7 @@
 #        screen name 和 user name 在意義上是沒有分別的!
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
@@ -47,10 +50,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -635,11 +638,12 @@
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為您並未登入,所以訊息無法送出:"
 
-# XXX 這是什麼?
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -918,12 +922,12 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "計算中..."
-
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
 msgid "Hangup"
-msgstr ""
+msgstr "掛斷"
 
 #. Number of actions
 msgid "Accept"
@@ -932,26 +936,28 @@
 msgid "Reject"
 msgstr "拒絕"
 
+#  XXX 暫譯 - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "撥打中。"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "通話已中斷。"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
-
+msgstr "%s 希望與您進行語音通話。"
+
+# XXX 媒體? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s 嘗試與您以一種未獲支援的方式進行媒體通話。"
+
 msgid "You have rejected the call."
-msgstr "您離開了頻道%s%s"
-
+msgstr "您拒絕了通話。"
+
+# FIXME 暫譯,譯文有待改進 - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:語音通話。"
 
 msgid "Emails"
 msgstr "電子郵件"
@@ -1205,8 +1211,9 @@
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1230,7 +1237,7 @@
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1301,7 +1308,7 @@
 msgstr "您在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
@@ -1359,8 +1366,9 @@
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound,也在其他地方用到,改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1508,7 +1516,7 @@
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給您。"
+msgstr "%s 在 %s 送出一個訊息給您"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
@@ -1618,22 +1626,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
-
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL(或同類型)網址前綴"
+
 msgid "TinyURL"
-msgstr "樂曲網址"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
-
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫,因為如果是在電腦上複製,無論網址長短,複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "當接收到含有網址的訊息時,使用 TinyURL 縮短網址,好方便抄寫"
 
 msgid "accounts"
 msgstr "帳號清單"
@@ -1690,9 +1703,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1749,6 +1762,44 @@
 msgid "_View Certificate..."
 msgstr "檢視憑證(_V)"
 
+# FIXME 譯文不太通順 - acli 20070913
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的憑證聲稱它應該屬於「%s」,您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL 憑證錯誤"
+
+msgid "Invalid certificate chain"
+msgstr "無效的憑證鏈"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"無法核實這張憑證,因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1757,28 +1808,11 @@
 "automatically checked."
 msgstr "「%s」出示的憑證是自簽的,無法自動進行核實。"
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的憑證鍊是無效的。"
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "SSL 憑證錯誤"
-
-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 ""
-"無法核實這張憑證,因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1796,19 +1830,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "憑證機構的簽章是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的憑證聲稱它應該屬於「%s」,您目前可能的連線可能不是您心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1845,7 +1866,7 @@
 msgstr "+++ %s 登出"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1892,10 +1913,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#, fuzzy
 msgid "Invite to chat"
-msgstr "邀請進入會議室"
+msgstr "邀請進入聊天室"
 
 #. Put our happy label in it.
 msgid ""
@@ -2038,6 +2057,10 @@
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2234,9 +2257,9 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
 
-#, fuzzy
+# FIXME 譯文有待改進 - acli 20090731
 msgid "Error creating conference."
-msgstr "連線開啟錯誤"
+msgstr "建立會議失敗。"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2661,7 +2684,6 @@
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2670,7 +2692,7 @@
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
@@ -2715,7 +2737,6 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時,利用「好友狀態捕捉」功能儲存送出的訊息。"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2749,9 +2770,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問,務必使用「好友狀態捕捉」儲存離線訊息。"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "輸入密碼"
+msgstr "一次性密碼"
 
 #. *< type
 #. *< ui_requirement
@@ -2760,13 +2780,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密碼支援"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "強制密碼只用一次"
 
 #. *  description
 msgid ""
@@ -2966,18 +2986,15 @@
 "找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit,詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
-
-#, fuzzy
+"找不到 Apple 的「Bonjour For Windows」工具,詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "無法接收連入的即時訊息連線\n"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3031,24 +3048,20 @@
 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 ""
-"無法建立 Socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法建立 Socket:%s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "無法聯結 Socket 到通訊埠"
-
-#, fuzzy, c-format
+msgstr "無法連結 Socket 到通訊埠:%s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
+msgstr "無法監聽 Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -3057,7 +3070,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
+"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -3093,17 +3106,14 @@
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "填寫註冊資料欄位。"
-
-#, fuzzy
+msgstr "必需填妥所有註冊資料欄位"
+
 msgid "Passwords do not match"
-msgstr "新密碼並不相符。"
-
-#, fuzzy
+msgstr "兩個密碼並不相符"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgstr "無法註冊新帳號,錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3118,9 +3128,8 @@
 msgstr "舊密碼(再次確認)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "請輸入驗證圖片內的文字"
+
 msgid "Captcha"
 msgstr "驗證圖片"
 
@@ -3263,9 +3272,9 @@
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱「%s」:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3278,9 +3287,8 @@
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "尚未連線到伺服器。"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3321,9 +3329,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
-#, fuzzy
 msgid "GG server"
-msgstr "設定使用者資訊..."
+msgstr "Gadu-Gadu 伺服器"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3339,7 +3346,6 @@
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
@@ -3363,11 +3369,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 ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
+msgstr "與伺服器之間的連線突然中斷:%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3378,9 +3382,8 @@
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 暱稱不可含有空白字元"
+msgstr "IRC 暱稱和伺服器名稱均不可含有空白字元"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
@@ -3390,13 +3393,13 @@
 msgstr "無法連線"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "無法連線到「%s」"
-
-#, fuzzy, c-format
+msgstr "無法連線:%s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "伺服器關閉連線。"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3588,13 +3591,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "聊天室名稱正在使用中"
-
-#, fuzzy
+msgstr "暱稱「%s」已在使用中。"
+
 msgid "Nickname in use"
-msgstr "暱稱"
+msgstr "暱稱已在使用中"
 
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
@@ -3831,13 +3833,11 @@
 msgid "execute"
 msgstr "執行"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#, fuzzy
+msgstr "伺服器要求使用 TLS/SSL,但找不到 TLS/SSL 支援。"
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "您指定必須加密,但找不到 TLS/SSL 支援。"
+msgstr "您要求加密,但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3851,57 +3851,44 @@
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "認證失敗"
-
-#, fuzzy
+msgstr "SASL 認證失敗"
+
 msgid "Invalid response from server"
-msgstr "伺服器送來了無效的回應。"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "您指定必須加密,但這伺服器沒有加密功能。"
+msgstr "您要求加密,但這伺服器沒有加密功能。"
 
 # XXX 好像有些怪,譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL 錯誤"
+msgstr "SASL 錯誤:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "BOSH 連線管理員中斷了您的工作階段。"
+
 msgid "No session ID given"
-msgstr "沒有給予原因"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
+msgstr "沒有給定工作階段代碼"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支援給定的 XMPP 版本"
-
-#, fuzzy
+msgstr "不支援的 BOSH 協定版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法與伺服器建立連線"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy
+msgstr "無法與伺服器建立連線:%s"
+
 msgid "Unable to establish SSL connection"
-msgstr "無法初始化連結"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3918,6 +3905,11 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3970,9 +3962,8 @@
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "本地端檔案:"
+msgstr "本地端時間:"
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3987,11 +3978,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已登出"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
@@ -4017,7 +4007,6 @@
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4026,7 +4015,6 @@
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4160,9 +4148,8 @@
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+msgstr "無效的伺服器名稱"
+
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4173,26 +4160,23 @@
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-#, fuzzy
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "別名:"
-
-#, fuzzy
+msgstr "從屬關係:"
+
 msgid "No users found"
-msgstr "找不到符合的使用者"
-
-#, fuzzy
+msgstr "找不到任何使用者"
+
 msgid "Roles:"
-msgstr "職責"
-
-#, fuzzy
+msgstr "身份:"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4200,9 +4184,9 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#, fuzzy
+# FIXME 譯文聽來好像有點怪 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "無法連線到伺服器。"
+msgstr "畸型的 BOSH 網址"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4270,10 +4254,6 @@
 msgid "Change Registration"
 msgstr "變更註冊資訊"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "無法連線到伺服器。"
-
 msgid "Error unregistering account"
 msgstr "移除帳號註冊錯誤"
 
@@ -4293,7 +4273,7 @@
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
@@ -4610,16 +4590,16 @@
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級:「%s」"
-
-#  XXX 暫譯 - ambrose 20070415
+msgstr "不明的從屬關係:「%s」"
+
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4640,19 +4620,20 @@
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "無法「嗶」使用者 %s ,因為沒有有關對方的任何資料。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為沒有有關對方的任何資料。"
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "無法「嗶」使用者 %s ,因為對方目前可能離線。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為對方目前可能離線。"
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "無法「嗶」使用者 %s ,因為對方的用戶端不支援這個功能。"
+msgstr ""
+"無法「嗶」%s ,因為對方的用戶端不支援這個功能,或者目前關閉了這個功能。"
 
 # XXX 這是暫譯 - acli 20070913
 #, c-format
@@ -4668,38 +4649,38 @@
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了您一聲"
 
-#, fuzzy, c-format
+# XXX 媒體? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
-
-#, fuzzy, c-format
+msgstr "無法與 %s 進行媒體通話,因為這個 JID 是無效的"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
 #  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
-
-#, fuzzy
+msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+
 msgid "Media Initiation Failed"
-msgstr "註冊失敗"
-
-#  FIXME 這不通順 - acli 20070614
-#, fuzzy, c-format
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
 
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090730
 msgid "Initiate Media"
-msgstr "開啟聊天室(_C)"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
@@ -4719,23 +4700,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]:禁止某使用者進入聊天室"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#, fuzzy
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [暱稱1] [暱"
+"稱2] ...: 取得與聊天室有從屬關係的使用者,或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [暱稱1] [暱稱"
+"2] ...: 取得在聊天室有身份的使用者,或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
@@ -4796,7 +4775,7 @@
 msgstr "檔案傳輸代理伺服器"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH 網址"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4858,32 +4837,29 @@
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "沒有給予原因"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "您被 %s 踢出:(%s)"
-
-#, fuzzy, c-format
+msgstr "您已被踢出:(%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s 踢出 (%s)"
-
-#, fuzzy
+msgstr "已被踢出 (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "開啟檔案途中發生錯誤。"
-
-#, fuzzy
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」? 20090305 acli
 msgid "Transfer was closed."
-msgstr "檔案傳輸失敗"
-
-#, fuzzy
+msgstr "傳輸已被中止。"
+
 msgid "Failed to open the file"
-msgstr "無法開啟檔案「%s」:%s"
+msgstr "無法開啟檔案"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5226,9 +5202,25 @@
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對您眨眼,<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對您眨眼,但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段,<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段,但無法給語音片段存檔"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個語音聊天的邀請,但目前還沒有語音聊天的支援。"
 
 msgid "Nudge"
 msgstr "呼叫"
@@ -5385,6 +5377,27 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息:"
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
+
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
@@ -5577,13 +5590,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "不明錯誤(代碼 %d)"
+msgstr "不明錯誤(代碼 %d):%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
@@ -5655,25 +5669,21 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "這個伺服器不支援我們使用的通訊協定。"
-
-#, fuzzy
+msgstr "這個伺服器不支援我們使用的通訊協定"
+
 msgid "Error parsing HTTP"
-msgstr "解析 HTTP 途中發生錯誤。"
-
-#, fuzzy
+msgstr "解析 HTTP 途中發生錯誤"
+
 msgid "You have signed on from another location"
-msgstr "您由其他的地方登入。"
+msgstr "您由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
-
-#, fuzzy
+msgstr "暫時無法使用 MSN 伺服器,請過一會後重試。"
+
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN 伺服器將暫時關閉。"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5702,13 +5712,15 @@
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#, fuzzy, c-format
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
-
+msgstr "%s 要求看您的 webcam,但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個 webcam 邀請,但目前還沒有這個功能的支援。"
 
 msgid "Away From Computer"
 msgstr "不在電腦前"
@@ -5906,15 +5918,15 @@
 msgstr "通訊協定錯誤,代碼 %d:%s"
 
 # NOTE 第一個 %s 是錯誤訊息
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 您的密碼的長度為 %d 個字元,超出了估計中 MySpaceIM 所設 %d 字元的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼,然後重試。"
+"%s 您的密碼的長度為 %zu 個字元,超出了 %d 字元的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼,然後重試。"
 
 msgid "Incorrect username or password"
 msgstr "錯誤的帳號或密碼"
@@ -6019,6 +6031,8 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"設定使用者名稱途中發生錯誤。請重試,或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:可取得此使用者名稱"
@@ -6283,9 +6297,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "無法 Ping 使用者 %s"
+msgstr "無法登入:%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6416,7 +6430,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到您剛才送出的訊息。"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6444,10 +6457,9 @@
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-# XXX 暫譯 - 20061025
-#, fuzzy
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
+msgstr "伺服器發出了奇怪的回應,伺服器位址 "
 
 #. username connecting too frequently
 msgid ""
@@ -6457,12 +6469,13 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#, fuzzy, c-format
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "解析 %s 途中發生了錯誤"
+msgstr "要求途中發生了錯誤,伺服器位址 "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL 不允許您的帳號在這裏登入"
 
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
@@ -6470,9 +6483,8 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6519,7 +6531,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
@@ -6579,7 +6590,7 @@
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6738,17 +6749,15 @@
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
-
-#, fuzzy, c-format
+msgstr "好友備註"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"無法連線至認證伺服器:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法連線至認證伺服器:%s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法連線到 BOS 伺服器:%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6760,14 +6769,14 @@
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;"
-"或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+"無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6785,14 +6794,13 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "使用者不存在"
-
+msgstr "使用者名稱不存在"
+
+# XXX「suspend」真是「停用」嗎?
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "您的帳號目前停用中。"
+msgstr "您的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6801,22 +6809,21 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"您的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "您所輸入的 SecurID 碼無效。"
+msgstr "您所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6824,12 +6831,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 "確定(_O)"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6839,12 +6840,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息:"
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證!"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -7147,17 +7142,14 @@
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以"
-"英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7172,18 +7164,18 @@
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為您的好友清單中有太多的好友,所以沒有辦法加入好友 %s。請移除其中一個,然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單,原因不明。"
 
@@ -7222,7 +7214,7 @@
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
@@ -7239,10 +7231,10 @@
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明:"
+msgstr "好友備註:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7261,7 +7253,7 @@
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7273,12 +7265,12 @@
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」,不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
+msgstr "允許在網路上檢視您目前的狀態(會導致您收到垃圾訊息!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
@@ -7352,9 +7344,8 @@
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "使用者沒有登入"
+msgstr "使用 clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7490,9 +7481,8 @@
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證?"
+msgstr "允許新增您為好友"
 
 msgid "Cellphone Number"
 msgstr "行動電話號碼"
@@ -7556,40 +7546,37 @@
 msgid "Note"
 msgstr "備註"
 
+# NOTE 正式的QQ介面寫「备注」(備註)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "修改地址"
+msgstr "好友備註"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "請隨意修改備註"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼? - acli 20090305
 msgid "Server says:"
-msgstr "伺服器忙碌"
+msgstr "伺服器回應:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "請求已獲接受。"
 
 msgid "Your request was rejected."
-msgstr ""
-
-# NOTE Require意為「需要」,不是「要求」
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入您的好友清單?"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7606,14 +7593,16 @@
 msgid "Sorry, you're not my style."
 msgstr "不好意思,你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
-
-#, fuzzy
+msgstr "%u 需要認證"
+
+# NOTE 這是視窗標題,對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入您的好友清單?"
-
+msgstr "新增好友認證"
+
+# NOTE 其他協定譯「認證要求訊息:」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7631,7 +7620,7 @@
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7690,10 +7679,10 @@
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7719,19 +7708,17 @@
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
-
-#  NOTE QQ「member」應是「成員」
+msgstr "成功加入群組 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入群組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入群組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
@@ -7740,15 +7727,15 @@
 msgstr "失敗:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun,未知的回覆"
+msgstr "加入群組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開群組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
+msgstr "請注意,假如您是創立者,這最終會把這個群組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
 #  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
@@ -7758,14 +7745,14 @@
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的變更了 Qun 成員"
+msgstr "成功的變更了群組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的變更了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個群 (Qun)"
+msgstr "成功建立了一個群組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎?"
@@ -7773,9 +7760,10 @@
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入群組 %d"
+msgstr "使用者 %u 要求加入群組 %u,理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7783,11 +7771,12 @@
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
-
+msgstr "加入群組 %u 失敗,群組管理員為 %u"
+
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了您加入群組 %1$u,理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
 #, c-format
@@ -7801,9 +7790,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7866,9 +7855,12 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯:「客戶端旗標」
+#  NOTE 根據原始碼,所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間:</b>%s<br>\n"
+msgstr "<b>相容性:</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7927,7 +7919,7 @@
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "如有遺漏務請通知……謝謝!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
@@ -7949,14 +7941,13 @@
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 群"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -7998,7 +7989,7 @@
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進,原文也是
 msgid "Keep alive interval (seconds)"
@@ -8008,7 +7999,6 @@
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
@@ -8028,7 +8018,7 @@
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8046,9 +8036,11 @@
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
-
+msgstr "輸入驗證文字"
+
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -8071,17 +8063,15 @@
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論(但可能會錯)- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8136,15 +8126,14 @@
 msgid "QQ Qun Command"
 msgstr "QQ 群組指令"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8270,7 +8259,6 @@
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8283,12 +8271,11 @@
 "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果您想開啟一個新的會"
 "議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -9125,7 +9112,6 @@
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
@@ -9139,22 +9125,16 @@
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "無法讀取 SILC 密鑰對"
+msgstr "無法載入 SILC 密鑰對"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "無法讀取 SILC 密鑰對"
-
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
@@ -9455,9 +9435,8 @@
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 密鑰對中..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "無法產生 SILC 密鑰對\n"
+msgstr "無法產生 SILC 密鑰對"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9595,7 +9574,6 @@
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
@@ -9603,20 +9581,18 @@
 msgid "John Noname"
 msgstr "無名氏"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對:%s"
+msgstr "無法載入 SILC 密鑰對:%s"
 
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "不明的伺服器回應。"
-
-#, fuzzy
+msgstr "不明的伺服器回應"
+
 msgid "Unable to create listen socket"
-msgstr "無法建立 Socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
@@ -9679,7 +9655,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
@@ -9711,9 +9686,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo 帳號"
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9725,12 +9699,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo 協定模組"
+msgstr "Yahoo JAPAN 協定模組"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "無法發送您的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9757,28 +9730,24 @@
 msgstr "新增好友被拒"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "收到無效的資料"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "錯誤的帳號或密碼"
+msgstr "未有輸入帳號或密碼"
 
 #, c-format
 msgid ""
@@ -9803,18 +9772,18 @@
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
+# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
+msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
@@ -9823,21 +9792,16 @@
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-#, fuzzy, c-format
+msgstr "伺服器發出了奇怪的 HTTP 回應"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "與 %s 之間的連線突然中斷:%s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
+msgstr "無法與 %s 建立連線:%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9879,7 +9843,7 @@
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9895,9 +9859,9 @@
 msgstr "開始 Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
-
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+msgstr "請輸入希望啟動的 ID"
+
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室?"
@@ -9920,9 +9884,9 @@
 msgid "Unable to connect."
 msgstr "無法連線。"
 
-# TODO - 覆查譯文 - 20061028
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -9994,11 +9958,8 @@
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10053,7 +10014,6 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
@@ -10177,7 +10137,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10189,7 +10149,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10207,17 +10167,18 @@
 msgid "Exposure"
 msgstr "現身程度"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
+msgstr "無法解析 HTTP 代理伺服應的回應:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, fuzzy, c-format
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgstr "拒絕存取:HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10462,12 +10423,15 @@
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#, fuzzy, c-format
+# NOTE 第一個 %s 是 description,第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10519,8 +10483,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I):"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10584,9 +10548,8 @@
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "代理伺服器"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10633,9 +10596,8 @@
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "帳號"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10660,17 +10622,14 @@
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "新增聊天室(_A)"
+msgstr "語音通話(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-# XXX 暫譯
-#, fuzzy
+msgstr "語音/視像通話"
+
 msgid "_Video Call"
-msgstr "視像聊天"
+msgstr "視像通話(_V)"
 
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
@@ -10681,11 +10640,9 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "離線時顯示"
 
@@ -10817,9 +10774,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/工具/憑證(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具/表情(_Y)"
+msgstr "/工具/自定表情(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
@@ -10949,8 +10905,9 @@
 msgid "By status"
 msgstr "依照狀態"
 
+# XXX 暫譯 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "依照日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -10967,7 +10924,7 @@
 msgstr "重新啟動"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常見問題"
 
 msgid "Welcome back!"
 msgstr "歡迎歸來!"
@@ -11099,109 +11056,99 @@
 msgstr "背景顏色"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "好友清單的背景顏色"
+
 msgid "Layout"
-msgstr "寮國文"
+msgstr "佈局"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "好友清單內圖示、名稱和狀態的佈局"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "背景顏色"
+msgstr "展開的群組的背景顏色"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "群組展開時的群組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼,這個「文字」選項應該係指PidginThemeFont(字體名稱、字體顏色兩項),下同
 msgid "Expanded Text"
-msgstr "展開(_E)"
+msgstr "展開的群組的名稱"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "群組展開時群組名稱的字體及文字顏色"
+
 msgid "Collapsed Background Color"
-msgstr "設定背景顏色"
+msgstr "收起的群組的背景顏色"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "群組收起時群組名稱的背景顏色"
+
 msgid "Collapsed Text"
-msgstr "收起(_C)"
+msgstr "收起的群組的名稱"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "群組收起時群組名稱的字體及文字顏色"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "設定背景顏色"
+msgstr "好友/聊天室的背景顏色"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "好友或聊天室名稱的背景顏色"
+
 msgid "Contact Text"
-msgstr "捷徑"
-
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋,當contact收起時,我們見到的是priority buddy
+# NOTE 但當contact展開時,我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理,所謂「text information for when a contact is expanded」應該是指contact的名稱
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
 msgid "On-line Text"
-msgstr "上線"
+msgstr "上線好友的名稱"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
 msgid "Away Text"
-msgstr "離開"
+msgstr "離開好友的名稱"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
 msgid "Off-line Text"
-msgstr "離線"
+msgstr "離線好友的名稱"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-# XXX 要覆查 - acli 20070914
-#, fuzzy
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
 msgid "Idle Text"
-msgstr "情緒描述"
+msgstr "閒置好友的名稱"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
 msgid "Message Text"
-msgstr "訊息送出"
+msgstr "有未讀訊息的好友名稱"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "提到您的暱稱的聊天室名稱"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "聊天室中提到您的暱稱時聊天室名稱的字體及文字顏色"
+
 msgid "The text information for a buddy's status"
-msgstr "更改 %s 的個人資訊"
+msgstr "好友狀態的字體及文字顏色"
 
 # XXX 譯文有待改進 - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "請輸入這張憑證所屬的主機名稱。"
 
@@ -11253,7 +11200,6 @@
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "上次提到"
 
@@ -11302,21 +11248,18 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#, fuzzy
+# XXX 媒體?  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/交談/觀看歷史記錄(_L)"
+msgstr "/交談/媒體/語音/視像通話(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
@@ -11390,17 +11333,15 @@
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#, fuzzy
+# XXX 媒體? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/交談/更多"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/交談/觀看歷史記錄"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/交談/更多"
+msgstr "/交談/媒體/語音/視像通話"
 
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
@@ -11600,7 +11541,7 @@
 msgstr "張家興"
 
 msgid "voice and video"
-msgstr ""
+msgstr "語音及視像功能"
 
 msgid "support"
 msgstr "支援"
@@ -11738,9 +11679,8 @@
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "羅馬尼亞文"
+msgstr "亞美尼亞文"
 
 msgid "Indonesian"
 msgstr "印尼文"
@@ -11763,9 +11703,9 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "其他"
+msgstr "高棉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註:KDE 譯「坎納達」
@@ -11865,8 +11805,9 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦西里文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
@@ -11949,7 +11890,7 @@
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11959,8 +11900,8 @@
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12193,14 +12134,6 @@
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12220,7 +12153,6 @@
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過(或已啟動)的連結時的連結顏色。"
 
@@ -12258,21 +12190,18 @@
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時,用來顯示對方帳號的顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是代表對方「輕聲的說」時,用來顯示對帳號的顏色。"
 
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是輕聲訊息時,用來顯示對帳號的顏色。"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
@@ -12286,7 +12215,7 @@
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12296,7 +12225,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12533,7 +12462,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12555,6 +12484,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12565,7 +12495,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12586,6 +12516,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12620,23 +12551,25 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX 媒體? - acli 20090730
 msgid "/_Media"
-msgstr ""
-
+msgstr "/媒體(_M)"
+
+# XXX 暫譯 - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
 msgid "Calling..."
-msgstr "計算中..."
+msgstr "撥打中..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s 希望跟您進行語音/視像通話。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s 希望跟您進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12665,9 +12598,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#, fuzzy
 msgid "No message"
-msgstr "不明的訊息"
+msgstr "沒有訊息"
 
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
@@ -12675,16 +12607,18 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
 
-#, fuzzy
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "New Pounces"
-msgstr "新增好友狀態捕捉"
-
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常? - acli 20090730
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "關閉"
+
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您捕捉到了好友狀態!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
@@ -12732,7 +12666,6 @@
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -12809,64 +12742,59 @@
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "開始輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "暫停輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "登入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 由閒置返回 (%s)"
-
-#, fuzzy, c-format
+msgstr "由閒置返回"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "返回"
-
-#, fuzzy, c-format
+msgstr "由離開返回"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "停止輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "登出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "閒置"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "離開期間"
-
-#, fuzzy, c-format
+msgstr "離開"
+
+#, c-format
 msgid "Sent a message"
 msgstr "送出訊息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "未知的捕捉事件。請回報這個問題!"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "未知的捕捉事件……請回報這個問題!"
+
+# XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法解開表情主題檔。"
+
 msgid "Theme failed to load."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法載入表情主題。"
+
 msgid "Theme failed to copy."
-msgstr "無法打開表情主題。"
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
 msgid "Install Theme"
@@ -12889,9 +12817,8 @@
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友清單"
+msgstr "好友清單主題"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12903,9 +12830,8 @@
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "即時訊息交談視窗"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
@@ -13011,9 +12937,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自動偵測 IP 位址(_A)"
+msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
@@ -13033,9 +12959,10 @@
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "中繼伺服器 (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
@@ -13217,7 +13144,7 @@
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應:"
+msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13382,11 +13309,10 @@
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-# XXX 20080810 acli - 暫譯
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "給定的捷徑已有相關的自訂表情,請指定另一個捷徑。"
+msgstr "「%s」已自訂表情,請指定另一個捷徑。"
 
 msgid "Custom Smiley"
 msgstr "自訂表情"
@@ -13400,28 +13326,26 @@
 msgid "Add Smiley"
 msgstr "新增表情"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "影像(_I)"
-
+msgstr "影像(_I):"
+
+# XXX 暫譯 - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "捷徑"
+msgstr "捷徑文字(_H):"
 
 msgid "Smiley"
 msgstr "表情"
 
-#, fuzzy
+# XXX 暫譯 - 20090305 acli
 msgid "Shortcut Text"
-msgstr "捷徑"
+msgstr "捷徑文字"
 
 msgid "Custom Smiley Manager"
 msgstr "自訂表情管理"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "選擇好友"
+msgstr "選擇好友圖示"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
@@ -13506,7 +13430,6 @@
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13541,9 +13464,8 @@
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "在瀏覽器中打開連結(_O):"
+msgstr "打開連結(_O)"
 
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
@@ -13551,9 +13473,21 @@
 msgid "_Copy Email Address"
 msgstr "複製電子郵件地址(_C)"
 
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13578,6 +13512,9 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13649,80 +13586,73 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
-#, fuzzy
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
 msgid "Server name request"
-msgstr "伺服器位址"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-# XXX
-#, fuzzy
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜,看了原始碼也看不明,開發者又不答我的問題 - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "登入會議伺服器"
-
-#, fuzzy
+msgstr "請輸入 XMPP 伺服器名稱"
+
 msgid "Select an XMPP server to query"
-msgstr "選擇查詢的會議伺服器"
-
-#  XXX 暫譯
-#, fuzzy
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Find Services"
-msgstr "所用之線上服務"
-
-#, fuzzy
+msgstr "搜尋服務"
+
 msgid "Add to Buddy List"
-msgstr "送出好友清單"
-
-#, fuzzy
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "離開"
-
-#, fuzzy
+msgstr "閘道器"
+
 msgid "Directory"
-msgstr "日誌目錄"
-
-#, fuzzy
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "選取音效"
-
-#, fuzzy
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub 服務"
-
-#, fuzzy
+msgstr "PubSub 葉子節點"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "描述"
+msgstr ""
+"\n"
+"<b>描述:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "服務探尋資訊"
-
-#, fuzzy
+msgstr "服務探索"
+
 msgid "_Browse"
-msgstr "瀏覽器(_B):"
-
-#, fuzzy
+msgstr "瀏覽(_B)"
+
 msgid "Server does not exist"
-msgstr "使用者不存在"
-
-#, fuzzy
+msgstr "伺服器不存在"
+
 msgid "Server does not support service discovery"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#, fuzzy
+msgstr "伺服器不支援服務探索"
+
 msgid "XMPP Service Discovery"
-msgstr "服務探尋資訊"
-
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "讓您瀏覽和註冊服務。"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
 
 msgid "Buddy is idle"
 msgstr "好友閒置"
@@ -14131,7 +14061,6 @@
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14261,7 +14190,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "輸入通知顏色"
 
@@ -14296,23 +14224,20 @@
 msgstr ""
 
 # XXX 這是我譯的,但我認為這是很差的譯文,看了也不知是什麼 - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "啟用輸入通知"
-
-#, fuzzy
+msgstr "停用輸入通知"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "GTK+ 佈景主題控制設定"
+
 msgid "Colors"
-msgstr "關閉"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "雜項"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
@@ -14353,10 +14278,10 @@
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」(即說:我知道有新版本了,稍後我會下載,暫時別煩我)
 msgid "Later"
-msgstr "稍後"
-
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息(quit message),ui_name通常就是「pidgin」
+msgstr "稍後下載"
+
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14400,7 +14325,6 @@
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14459,103 +14383,85 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "尚未登入"
-
-#, fuzzy
+msgstr "剛巧登入"
+
 msgid "Just logged out"
-msgstr "尚未登入"
+msgstr "剛巧登出"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
 msgid "Icon for Chat"
-msgstr "加入聊天室"
-
-#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
-#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#, fuzzy
+msgstr "代表聊天室的圖示"
+
 msgid "Ignored"
-msgstr "忽略"
-
-#, fuzzy
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
 msgid "Founder"
-msgstr "再大聲"
-
-#, fuzzy
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員,Konversation譯「助理」,Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#, fuzzy
+msgstr "助理"
+
 msgid "Authorization dialog"
-msgstr "給予認證"
-
-# TODO 要覆查 - 20061025
-#, fuzzy
+msgstr "認證視窗"
+
 msgid "Error dialog"
-msgstr "錯誤訊息"
-
-# XXX 20070518
-#, fuzzy
+msgstr "錯誤訊息視窗"
+
 msgid "Information dialog"
-msgstr "資訊"
+msgstr "資訊訊息視窗"
 
 msgid "Mail dialog"
-msgstr ""
-
-#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#, fuzzy
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20090730
 msgid "Question dialog"
-msgstr "對話視窗 (Request Dialog)"
-
-#, fuzzy
+msgstr "提問視窗"
+
 msgid "Warning dialog"
-msgstr "警告等級"
+msgstr "警告訊息視窗"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "這是什麼類型的視窗?"
+
 msgid "Status Icons"
-msgstr "狀態:%s"
-
-#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#, fuzzy
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "聊天室區域 (Locale)"
-
-#, fuzzy
+msgstr "聊天室圖示"
+
 msgid "Dialog Icons"
-msgstr "變更圖示"
-
-#, fuzzy
+msgstr "視窗圖示"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "Pidgin 圖示主題編輯器"
+
 msgid "Contact"
-msgstr "聯絡資訊"
-
-#, fuzzy
+msgstr "好友"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "好友清單"
-
-#, fuzzy
+msgstr "Pidgin 好友清單主題編輯器"
+
 msgid "Edit Buddylist Theme"
-msgstr "好友清單"
+msgstr "編輯好友清單主題"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "編輯圖示主題"
 
 #. *< type
 #. *< ui_requirement
@@ -14564,16 +14470,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器。"
 
 #. *< type
 #. *< ui_requirement
@@ -14731,9 +14635,10 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K);"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14741,7 +14646,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
@@ -14785,6 +14689,27 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "無法開啟Socket"
 
@@ -14810,23 +14735,10 @@
 #~ msgid "Read error"
 #~ msgstr "讀取錯誤"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與伺服器建立連線:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "寫入錯誤"
-
 # NOTE 這是功能名稱(直譯)
 #~ msgid "Last Activity"
 #~ msgstr "最近活動"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "服務探尋資訊"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "服務探尋項目"
@@ -14850,9 +14762,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "臨時指令"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub 服務"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 位元組串流"
 
@@ -14965,6 +14874,9 @@
 #~ msgid "Hop Check"
 #~ msgstr "中繼段檢查"
 
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
 #~ msgid "Read Error"
 #~ msgstr "讀取錯誤"
 
@@ -14991,9 +14903,6 @@
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15001,14 +14910,17 @@
 #~ "無法連線到 BOS 伺服器:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
 
 #~ msgid "Could Not Connect"
 #~ msgstr "無法連線"
 
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "無法解密伺服器回應"
@@ -15040,81 +14952,6 @@
 #~ msgid "Could not create listen socket"
 #~ msgstr "無法建立 Socket 監聽"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "密碼錯誤"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與 %s 建立連線:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
 #~ msgid "Looking up %s"
 #~ msgstr "找尋 %s 中"
 
@@ -15260,21 +15097,68 @@
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 協定模組"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器(日本地區)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器(日本地區)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
 #~ msgid "%s Options"
 #~ msgstr "%s 選項"
 
 #~ msgid "Proxy Options"
 #~ msgstr "代理伺服器選項"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
 #~ msgid "By log size"
 #~ msgstr "依照日誌大小"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "在瀏覽器中打開連結(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN 伺服器(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "表情圖像(_I)"
 
@@ -15300,14 +15184,6 @@
 #~ msgstr[0] "與伺服器失去連線(%d 秒內收不到任何資料)"
 #~ msgstr[1] "與伺服器失去連線(%d 秒內收不到任何資料)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -15318,14 +15194,9 @@
 #~ "與伺服器之間的連線突然中斷:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -15487,10 +15358,6 @@
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"