changeset 31192:ab175460cea7

propagate from branch 'im.pidgin.pidgin' (head a40442de9721475c1c76ef276eff179a92ef75d4) to branch 'im.pidgin.pidgin.openq' (head 4ca166a4577992e025d979389130769bd825ce86)
author SHiNE CsyFeK <csyfek@gmail.com>
date Sun, 06 Feb 2011 05:26:52 +0000
parents 4deef745de87 (current diff) feff62713d9c (diff)
children 1bf763879b96
files
diffstat 25 files changed, 2726 insertions(+), 2807 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sun Feb 06 05:23:22 2011 +0000
+++ b/COPYRIGHT	Sun Feb 06 05:26:52 2011 +0000
@@ -379,6 +379,7 @@
 Riley Patterson
 Havoc Pennington
 Ted Percival
+Hugo Pereira Da Costa
 Eduardo Pérez
 Matt Perry
 Ani Peter
@@ -413,6 +414,7 @@
 Etan Reisner
 David Reiss
 Luoh Ren-Shan
+Noa Resare
 Daniele Ricci
 Kristian Rietveld
 Pekka Riikonen
--- a/ChangeLog	Sun Feb 06 05:23:22 2011 +0000
+++ b/ChangeLog	Sun Feb 06 05:26:52 2011 +0000
@@ -32,12 +32,16 @@
 	  Samstag) (#13073)
 	* Fixed bugs in purple_str_to_time() that caused the most recent 'make
 	  check' failures.  (Nader Morshed) (#13131)
+	* Correct an issue that caused some UIs other than Pidgin or Finch to
+	  leave a buddy in the "is typing" state.  (Jan Kaluza)
 
 	Pidgin:
 	* Support using the Page Up and Page Down keys on the numeric keypad in
 	  the conversation window.  (Ryan Flegel) (#13127)
 	* Fix a few memory leaks. (Nader Morshed) (#13162)
 	* Support rendering strikethrough when received as in-line CSS. (#13168)
+	* Editable comboboxes are now more friendly to some GTK+ themes. (Hugo
+	  Pereira Da Costa) (#13164).
 
 	Plugins:
 	* The Voice/Video Settings plugin no longer resets selected devices to
@@ -58,6 +62,9 @@
 	  (Nikita Kozlov) (#13136)
 	* Handle Connection: Close headers for BOSH, when the server does not
 	  terminate the connection itself. (#13008)
+	* Improved parsing for DIGEST-MD5, which should resolve issues
+	  connecting to some jabberd2 servers.  This corrects an issue parsing
+	  one-character or empty elements. (Noa Resare) (#a14514)
 
 	Yahoo!/Yahoo! JAPAN:
 	* Fix a crash when an account disconnects before a p2p session is
--- a/libpurple/conversation.c	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/conversation.c	Sun Feb 06 05:26:52 2011 +0000
@@ -999,12 +999,6 @@
 		}
 	}
 
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
-		if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) {
-			purple_conv_im_set_typing_state(PURPLE_CONV_IM(conv), PURPLE_NOT_TYPING);
-		}
-	}
-
 	if (ops && ops->write_conv)
 		ops->write_conv(conv, who, alias, displayed, flags, mtime);
 
@@ -1229,6 +1223,10 @@
 		c->ui_ops->write_im(c, who, message, flags, mtime);
 	else
 		purple_conversation_write(c, who, message, flags, mtime);
+
+	if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) {
+		purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING);
+	}
 }
 
 gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what)
--- a/libpurple/protocols/jabber/Makefile.am	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Sun Feb 06 05:26:52 2011 +0000
@@ -11,6 +11,7 @@
 			  auth.c \
 			  auth.h \
 			  auth_digest_md5.c \
+			  auth_digest_md5.h \
 			  auth_plain.c \
 			  auth_scram.c \
 			  auth_scram.h \
--- a/libpurple/protocols/jabber/auth_digest_md5.c	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.c	Sun Feb 06 05:26:52 2011 +0000
@@ -27,6 +27,7 @@
 #include "util.h"
 #include "xmlnode.h"
 
+#include "auth_digest_md5.h"
 #include "auth.h"
 #include "jabber.h"
 
@@ -43,7 +44,7 @@
 }
 
 /* Parts of this algorithm are inspired by stuff in libgsasl */
-static GHashTable* parse_challenge(const char *challenge)
+GHashTable* jabber_auth_digest_md5_parse(const char *challenge)
 {
 	const char *token_start, *val_start, *val_end, *cur;
 	GHashTable *ret = g_hash_table_new_full(g_str_hash, g_str_equal,
@@ -77,12 +78,12 @@
 					val_start++;
 
 				val_end = cur;
-				while (val_end != val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
+				while (val_end >= val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
 						|| *val_end == '\r' || *val_end == '\n'
 						|| *val_end == '"'  || *val_end == '\0'))
 					val_end--;
 
-				if (val_start != val_end)
+				if (val_end - val_start + 1 >= 0)
 					value = g_strndup(val_start, val_end - val_start + 1);
 			}
 
@@ -186,7 +187,7 @@
 			dec_in != NULL ? strlen(dec_in) : 0,
 			dec_in != NULL  ? dec_in : "(null)");
 
-	parts = parse_challenge(dec_in);
+	parts = jabber_auth_digest_md5_parse(dec_in);
 
 	if (g_hash_table_lookup(parts, "rspauth")) {
 		char *rspauth = g_hash_table_lookup(parts, "rspauth");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/jabber/auth_digest_md5.h	Sun Feb 06 05:26:52 2011 +0000
@@ -0,0 +1,39 @@
+/**
+ * @file auth_digest_md5.h Implementation of SASL DIGEST-MD5 authentication
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+#ifndef PURPLE_JABBER_AUTH_DIGEST_MD5_H_
+#define PURPLE_JABBER_AUTH_DIGEST_MD5_H_
+
+#include "internal.h"
+
+/*
+ * Every function in this file is ONLY exposed for tests.
+ * DO NOT USE ANYTHING HERE OR YOU WILL BE SENT TO THE PIT OF DESPAIR.
+ */
+
+/*
+ * Parse a DIGEST-MD5 challenge.
+ */
+GHashTable *jabber_auth_digest_md5_parse(const char *challenge);
+
+#endif /* PURPLE_JABBER_AUTH_DIGEST_MD5_H_ */
--- a/libpurple/tests/Makefile.am	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/tests/Makefile.am	Sun Feb 06 05:26:52 2011 +0000
@@ -11,6 +11,7 @@
 	    tests.h \
 		test_cipher.c \
 		test_jabber_caps.c \
+		test_jabber_digest_md5.c \
 		test_jabber_jutil.c \
 		test_jabber_scram.c \
 		test_qq.c \
--- a/libpurple/tests/check_libpurple.c	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/tests/check_libpurple.c	Sun Feb 06 05:26:52 2011 +0000
@@ -85,6 +85,7 @@
 
 	srunner_add_suite(sr, cipher_suite());
 	srunner_add_suite(sr, jabber_caps_suite());
+	srunner_add_suite(sr, jabber_digest_md5_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
 	srunner_add_suite(sr, jabber_scram_suite());
 	srunner_add_suite(sr, qq_suite());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/tests/test_jabber_digest_md5.c	Sun Feb 06 05:26:52 2011 +0000
@@ -0,0 +1,59 @@
+#include <string.h>
+
+#include "tests.h"
+#include "../util.h"
+#include "../protocols/jabber/auth_digest_md5.h"
+#include "../protocols/jabber/jutil.h"
+
+START_TEST(test_parsing)
+{
+	GHashTable *table;
+
+	table = jabber_auth_digest_md5_parse("r=\"realm\",token=   \"   asdf\"");
+	fail_if(g_hash_table_lookup(table, "r") == NULL);
+	assert_string_equal("realm", g_hash_table_lookup(table, "r"));
+	fail_if(g_hash_table_lookup(table, "token") == NULL);
+	assert_string_equal("asdf", g_hash_table_lookup(table, "token"));
+	g_hash_table_destroy(table);
+
+	table = jabber_auth_digest_md5_parse("r=\"a\", token=   \"   asdf\"");
+	fail_if(g_hash_table_lookup(table, "r") == NULL);
+	assert_string_equal("a", g_hash_table_lookup(table, "r"));
+	fail_if(g_hash_table_lookup(table, "token") == NULL);
+	assert_string_equal("asdf", g_hash_table_lookup(table, "token"));
+	g_hash_table_destroy(table);
+
+	table = jabber_auth_digest_md5_parse("r=\"\", token=   \"   asdf\"");
+	fail_if(g_hash_table_lookup(table, "r") == NULL);
+	assert_string_equal("", g_hash_table_lookup(table, "r"));
+	fail_if(g_hash_table_lookup(table, "token") == NULL);
+	assert_string_equal("asdf", g_hash_table_lookup(table, "token"));
+	g_hash_table_destroy(table);
+
+	table = jabber_auth_digest_md5_parse("realm=\"somerealm\",nonce=\"OA6MG9tEQGm2hh\",qop=\"auth\",charset=utf-8,algorithm=md5-sess");
+	fail_if(g_hash_table_lookup(table, "realm") == NULL);
+	assert_string_equal("somerealm", g_hash_table_lookup(table, "realm"));
+	fail_if(g_hash_table_lookup(table, "nonce") == NULL);
+	assert_string_equal("OA6MG9tEQGm2hh", g_hash_table_lookup(table, "nonce"));
+	fail_if(g_hash_table_lookup(table, "qop") == NULL);
+	assert_string_equal("auth", g_hash_table_lookup(table, "qop"));
+	fail_if(g_hash_table_lookup(table, "charset") == NULL);
+	assert_string_equal("utf-8", g_hash_table_lookup(table, "charset"));
+	fail_if(g_hash_table_lookup(table, "algorithm") == NULL);
+	assert_string_equal("md5-sess", g_hash_table_lookup(table, "algorithm"));
+
+	g_hash_table_destroy(table);
+
+}
+END_TEST
+
+Suite *
+jabber_digest_md5_suite(void)
+{
+	Suite *s = suite_create("Jabber SASL DIGEST-MD5 functions");
+
+	TCase *tc = tcase_create("Parsing Functionality");
+	tcase_add_test(tc, test_parsing);
+	suite_add_tcase(s, tc);
+	return s;
+}
--- a/libpurple/tests/tests.h	Sun Feb 06 05:23:22 2011 +0000
+++ b/libpurple/tests/tests.h	Sun Feb 06 05:26:52 2011 +0000
@@ -10,6 +10,7 @@
 Suite * master_suite(void);
 Suite * cipher_suite(void);
 Suite * jabber_caps_suite(void);
+Suite * jabber_digest_md5_suite(void);
 Suite * jabber_jutil_suite(void);
 Suite * jabber_scram_suite(void);
 Suite * qq_suite(void);
--- a/pidgin/gtkutils.c	Sun Feb 06 05:23:22 2011 +0000
+++ b/pidgin/gtkutils.c	Sun Feb 06 05:26:52 2011 +0000
@@ -2924,7 +2924,7 @@
 	GtkComboBox *ret = NULL;
 	GtkWidget *the_entry = NULL;
 
-	ret = GTK_COMBO_BOX(gtk_combo_box_new_text());
+	ret = GTK_COMBO_BOX(gtk_combo_box_entry_new_text());
 	the_entry = gtk_entry_new();
 	gtk_container_add(GTK_CONTAINER(ret), the_entry);
 
--- a/po/ChangeLog	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/ChangeLog	Sun Feb 06 05:26:52 2011 +0000
@@ -1,6 +1,21 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.10
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Gideon van Melle)
+	* Hebrew translation updated (Shalom Craimer)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Occitan translation updated (Yannig Marchegay)
+	* Polish translation updated (Piotr Drąg)
+	* Romanian translation updated (Mişu Moldovan)
+	* Russian translation updated (Антон Самохвалов)
+	* Spanish translation updated (Javier Fernández-Sanguino Peña)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
 
 version 2.7.9
 	* Czech translation updated (David Vachulka)
--- a/po/bn.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/bn.po	Sun Feb 06 05:26:52 2011 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 20:34-0500\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
 "PO-Revision-Date: 2010-12-19 13:37+0600\n"
 "Last-Translator: israt <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
@@ -2466,8 +2466,12 @@
 "ফাইল সংরক্ষণের ‍‍পাথ\n"
 "(অনুগ্রহ করে সম্পূর্ণ পাথ প্রদান করুন)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "বন্ধু তালিকার বহির্ভূত ব্যবহারকারী থেকে স্বয়ংক্রিয় ভাবে বাতিল করা হবে"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"যখন একজন ব্যবহারকারী থেকে ফাইল স্থানান্তরের অনুরোধ আসে\n"
+" যা আপনার বন্ধু তালিকায় *নেই*:"
 
 # tithi
 msgid ""
@@ -2480,6 +2484,10 @@
 msgid "Create a new directory for each user"
 msgstr "প্রত্যেক ব্যবহারকারীর জন্য একটি নতুন ডিরেক্টরি তৈরি করা হবে"
 
+# Translated by sadia
+msgid "Escape the filenames"
+msgstr "ফাইলনাম এড়িয়ে যাওয়া"
+
 msgid "Notes"
 msgstr "নোট"
 
@@ -3993,7 +4001,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল-টেক্সট প্রমাণীকরণ প্রয়োজন"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "সার্ভার থেকে অকার্যকর উত্তর"
 
@@ -6605,6 +6616,22 @@
 msgid "Retrieving User Information..."
 msgstr "ব্যবহারকারীর তথ্য খুঁজে আনা হচ্ছে..."
 
+# Kick =  তিরস্কার
+# OR  পদাঘাত
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "MultiMX হতে আপনাকে তিরস্কার করা হয়েছে।"
+
+msgid "was kicked"
+msgstr "তিরস্কার করা হয়েছে"
+
+msgid "_Room Name:"
+msgstr "আসরের নাম (_R):"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "আপনাকে আমন্ত্রণ জানানো হয়েছে"
+
 # Translated by sadia
 msgid "Loading menu..."
 msgstr "মেনু লোড করা হচ্ছে..."
@@ -6640,22 +6667,6 @@
 msgid "Enable splash-screen popup"
 msgstr "স্প্ল্যাশ স্ক্রীন পপ আপ সক্রিয় করা হবে"
 
-# Kick =  তিরস্কার
-# OR  পদাঘাত
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "MultiMX হতে আপনাকে তিরস্কার করা হয়েছে।"
-
-msgid "was kicked"
-msgstr "তিরস্কার করা হয়েছে"
-
-msgid "_Room Name:"
-msgstr "আসরের নাম (_R):"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "আপনাকে আমন্ত্রণ জানানো হয়েছে"
-
 msgid "Last Online"
 msgstr "শেষ যখন অনলাইনে"
 
@@ -8546,91 +8557,6 @@
 "এটির জন্য দুটি কম্পিউটারের মধ্যে সরাসরি সংযোগ প্রয়োজন যা কিনা IM এর ছবির জন্য "
 "আবশ্যক। যেহেতু আপনার IP ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তায় ঝুঁকি থাকতে পারে।"
 
-msgid "Invalid SNAC"
-msgstr "অকার্যকর SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "সার্ভার হারের সীমা পেরিয়ে গেছে"
-
-msgid "Client rate limit exceeded"
-msgstr "ক্লায়েন্ট হারের সীমা পেরিয়ে গেছে"
-
-msgid "Service unavailable"
-msgstr "সার্ভিস বিদ্যমান নয়"
-
-# tithi
-msgid "Service not defined"
-msgstr "সেবা নির্ধারিত নয়"
-
-# tithi
-msgid "Obsolete SNAC"
-msgstr "অপ্রচলিত SNAC"
-
-# tithi
-msgid "Not supported by host"
-msgstr "হোস্ট দ্বারা সমর্থিত নয়"
-
-# tithi
-msgid "Not supported by client"
-msgstr "ক্লায়েন্ট দ্বারা সমর্থিত নয়"
-
-# tithi
-msgid "Refused by client"
-msgstr "ক্লায়েন্ট দ্বারা প্রত্যাখ্যাত"
-
-# tithi
-msgid "Reply too big"
-msgstr "অতিরিক্ত বড় উত্তর"
-
-# tithi
-msgid "Responses lost"
-msgstr "প্রতিক্রিয়া হারিয়ে গেছে"
-
-msgid "Request denied"
-msgstr "অনুরোধ প্রত্যাখ্যাত"
-
-# tithi
-msgid "Busted SNAC payload"
-msgstr "ব্যর্থ SNAC পেলোড"
-
-# tithi
-msgid "Insufficient rights"
-msgstr "অপর্যাপ্ত অধিকার"
-
-# tithi
-msgid "In local permit/deny"
-msgstr "স্থানীয় অনুমতি/অস্বীকারে"
-
-# tithi
-msgid "Warning level too high (sender)"
-msgstr "সতর্কতা স্তর খুব উচ্চ (প্রেরক)"
-
-# tithi
-msgid "Warning level too high (receiver)"
-msgstr "সতর্কতা স্তর খুব উচ্চ (গ্রাহক)"
-
-# tithi
-msgid "User temporarily unavailable"
-msgstr "ব্যবহারকারীকে সাময়িকভাবে পাওয়া যায়না"
-
-# tithi
-msgid "No match"
-msgstr "কোনো মিল নেই"
-
-# tithi
-msgid "List overflow"
-msgstr "লিস্ট ওভার‌ফ্লো"
-
-msgid "Request ambiguous"
-msgstr "অনুরোধ অস্পষ্ট"
-
-# tithi
-msgid "Queue full"
-msgstr "কিউ পরিপূর্ণ"
-
-msgid "Not while on AOL"
-msgstr "AOL এ থাকা অবস্থায় নয়"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "বন্ধু আইকন"
@@ -8767,6 +8693,91 @@
 msgid "Capabilities"
 msgstr "ক্ষমতা"
 
+msgid "Invalid SNAC"
+msgstr "অকার্যকর SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "সার্ভার হারের সীমা পেরিয়ে গেছে"
+
+msgid "Client rate limit exceeded"
+msgstr "ক্লায়েন্ট হারের সীমা পেরিয়ে গেছে"
+
+msgid "Service unavailable"
+msgstr "সার্ভিস বিদ্যমান নয়"
+
+# tithi
+msgid "Service not defined"
+msgstr "সেবা নির্ধারিত নয়"
+
+# tithi
+msgid "Obsolete SNAC"
+msgstr "অপ্রচলিত SNAC"
+
+# tithi
+msgid "Not supported by host"
+msgstr "হোস্ট দ্বারা সমর্থিত নয়"
+
+# tithi
+msgid "Not supported by client"
+msgstr "ক্লায়েন্ট দ্বারা সমর্থিত নয়"
+
+# tithi
+msgid "Refused by client"
+msgstr "ক্লায়েন্ট দ্বারা প্রত্যাখ্যাত"
+
+# tithi
+msgid "Reply too big"
+msgstr "অতিরিক্ত বড় উত্তর"
+
+# tithi
+msgid "Responses lost"
+msgstr "প্রতিক্রিয়া হারিয়ে গেছে"
+
+msgid "Request denied"
+msgstr "অনুরোধ প্রত্যাখ্যাত"
+
+# tithi
+msgid "Busted SNAC payload"
+msgstr "ব্যর্থ SNAC পেলোড"
+
+# tithi
+msgid "Insufficient rights"
+msgstr "অপর্যাপ্ত অধিকার"
+
+# tithi
+msgid "In local permit/deny"
+msgstr "স্থানীয় অনুমতি/অস্বীকারে"
+
+# tithi
+msgid "Warning level too high (sender)"
+msgstr "সতর্কতা স্তর খুব উচ্চ (প্রেরক)"
+
+# tithi
+msgid "Warning level too high (receiver)"
+msgstr "সতর্কতা স্তর খুব উচ্চ (গ্রাহক)"
+
+# tithi
+msgid "User temporarily unavailable"
+msgstr "ব্যবহারকারীকে সাময়িকভাবে পাওয়া যায়না"
+
+# tithi
+msgid "No match"
+msgstr "কোনো মিল নেই"
+
+# tithi
+msgid "List overflow"
+msgstr "লিস্ট ওভার‌ফ্লো"
+
+msgid "Request ambiguous"
+msgstr "অনুরোধ অস্পষ্ট"
+
+# tithi
+msgid "Queue full"
+msgstr "কিউ পরিপূর্ণ"
+
+msgid "Not while on AOL"
+msgstr "AOL এ থাকা অবস্থায় নয়"
+
 # tithi
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
@@ -9420,16 +9431,16 @@
 msgstr "সার্ভার নির্বাচন"
 
 # tithi
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 # tithi
 msgid "QQ2007"
 msgstr "QQ2007"
 
 # tithi
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "TCP দ্বারা সংযোগ করা হবে"
@@ -13272,10 +13283,6 @@
 msgid "Fatal Error"
 msgstr "মারাত্মক ত্রুটি"
 
-# tithi
-msgid "bug master"
-msgstr "বাগ মাস্টার"
-
 msgid "artist"
 msgstr "শিল্পী"
 
@@ -13472,6 +13479,9 @@
 msgid "Maithili"
 msgstr "মৈথিলি"
 
+msgid "Meadow Mari"
+msgstr "মিইডো মারি"
+
 msgid "Macedonian"
 msgstr "ম্যাসেডনিয়"
 
@@ -16808,6 +16818,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "আপনার এই অ্যাপ্লিকেশনটি আনইন্সটল করার অনুমতি নেই।"
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "বন্ধু তালিকার বহির্ভূত ব্যবহারকারী থেকে স্বয়ংক্রিয় ভাবে বাতিল করা হবে"
+
+# tithi
+#~ msgid "bug master"
+#~ msgstr "বাগ মাস্টার"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "ইন-ব্যান্ড বাইটস্ট্রিম বিনিময়ে ত্রুটি হয়েছে\n"
 
--- a/po/cs.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/cs.po	Sun Feb 06 05:26:52 2011 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-26 22:11-0500\n"
-"PO-Revision-Date: 2010-12-21 09:08+0100\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-02-01 21:09+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
@@ -2328,8 +2328,12 @@
 "Cesta, kam ukládat soubory\n"
 "(Zadejte prosím plnou cestu)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "Automaticky odmítat od uživatelů, kteří nejsou na seznamu kamarádů"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Když přijde požadavek na přenos souboru od někoho,\n"
+"kdo není v seznamu kamarádů:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2342,6 +2346,9 @@
 msgid "Create a new directory for each user"
 msgstr "Vytvořit nový adresář pro každého uživatele"
 
+msgid "Escape the filenames"
+msgstr "Upravit jména souborů"
+
 msgid "Notes"
 msgstr "Poznámky"
 
@@ -3793,7 +3800,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Neplatná odpověď od serveru"
 
@@ -6074,6 +6084,20 @@
 msgid "Retrieving User Information..."
 msgstr "Získávám informace o uživateli..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Byl jste vykopnut z MultiMX."
+
+msgid "was kicked"
+msgstr "byl vykopnut"
+
+msgid "_Room Name:"
+msgstr "_Místnost:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Přišlo vám pozvání"
+
 msgid "Loading menu..."
 msgstr "Načítám menu..."
 
@@ -6101,20 +6125,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Povolit zobrazení spouštěcí obrazovky"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Byl jste vykopnut z MultiMX."
-
-msgid "was kicked"
-msgstr "byl vykopnut"
-
-msgid "_Room Name:"
-msgstr "_Místnost:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Přišlo vám pozvání"
-
 msgid "Last Online"
 msgstr "Naposledy připojen"
 
@@ -7776,75 +7786,6 @@
 "Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
 "pro soukromí."
 
-msgid "Invalid SNAC"
-msgstr "Neplatné SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Překročen limit poměru serveru"
-
-msgid "Client rate limit exceeded"
-msgstr "Překročen limit poměru klienta"
-
-msgid "Service unavailable"
-msgstr "Služba nedostupná"
-
-msgid "Service not defined"
-msgstr "Služba nedefinována"
-
-msgid "Obsolete SNAC"
-msgstr "Zastaralé SNAC"
-
-msgid "Not supported by host"
-msgstr "Nepodporováno hostitelem"
-
-msgid "Not supported by client"
-msgstr "Nepodporováno klientem"
-
-msgid "Refused by client"
-msgstr "Odmítnuto klientem"
-
-msgid "Reply too big"
-msgstr "Odpověď příliš velká"
-
-msgid "Responses lost"
-msgstr "Odpovědi ztraceny"
-
-msgid "Request denied"
-msgstr "Požadavek zamítnut"
-
-msgid "Busted SNAC payload"
-msgstr "Poškozená data SNAC"
-
-msgid "Insufficient rights"
-msgstr "Nedostatečná oprávnění"
-
-msgid "In local permit/deny"
-msgstr "V místním povolit/zakázat"
-
-msgid "Warning level too high (sender)"
-msgstr "Hladina varování příliš vysoká (odeslání)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Hladina varování příliš vysoká (příjem)"
-
-msgid "User temporarily unavailable"
-msgstr "Uživatel dočasně nedostupný"
-
-msgid "No match"
-msgstr "Žádná shoda"
-
-msgid "List overflow"
-msgstr "Přetečení seznamu"
-
-msgid "Request ambiguous"
-msgstr "Požadavek nejednoznačný"
-
-msgid "Queue full"
-msgstr "Fronta plná"
-
-msgid "Not while on AOL"
-msgstr "Ne když na AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Ikona kamaráda"
@@ -7963,6 +7904,75 @@
 msgid "Capabilities"
 msgstr "Schopnosti"
 
+msgid "Invalid SNAC"
+msgstr "Neplatné SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Překročen limit poměru serveru"
+
+msgid "Client rate limit exceeded"
+msgstr "Překročen limit poměru klienta"
+
+msgid "Service unavailable"
+msgstr "Služba nedostupná"
+
+msgid "Service not defined"
+msgstr "Služba nedefinována"
+
+msgid "Obsolete SNAC"
+msgstr "Zastaralé SNAC"
+
+msgid "Not supported by host"
+msgstr "Nepodporováno hostitelem"
+
+msgid "Not supported by client"
+msgstr "Nepodporováno klientem"
+
+msgid "Refused by client"
+msgstr "Odmítnuto klientem"
+
+msgid "Reply too big"
+msgstr "Odpověď příliš velká"
+
+msgid "Responses lost"
+msgstr "Odpovědi ztraceny"
+
+msgid "Request denied"
+msgstr "Požadavek zamítnut"
+
+msgid "Busted SNAC payload"
+msgstr "Poškozená data SNAC"
+
+msgid "Insufficient rights"
+msgstr "Nedostatečná oprávnění"
+
+msgid "In local permit/deny"
+msgstr "V místním povolit/zakázat"
+
+msgid "Warning level too high (sender)"
+msgstr "Hladina varování příliš vysoká (odeslání)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Hladina varování příliš vysoká (příjem)"
+
+msgid "User temporarily unavailable"
+msgstr "Uživatel dočasně nedostupný"
+
+msgid "No match"
+msgstr "Žádná shoda"
+
+msgid "List overflow"
+msgstr "Přetečení seznamu"
+
+msgid "Request ambiguous"
+msgstr "Požadavek nejednoznačný"
+
+msgid "Queue full"
+msgstr "Fronta plná"
+
+msgid "Not while on AOL"
+msgstr "Ne když na AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8552,14 +8562,14 @@
 msgid "Select Server"
 msgstr "Vyberte server"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Připojit se pomocí TCP"
@@ -12088,9 +12098,6 @@
 msgid "Fatal Error"
 msgstr "Fatální chyba"
 
-msgid "bug master"
-msgstr "lovec chyb"
-
 msgid "artist"
 msgstr "umělec"
 
@@ -12270,6 +12277,9 @@
 msgid "Maithili"
 msgstr "Maithili"
 
+msgid "Meadow Mari"
+msgstr "Meadow Mari"
+
 msgid "Macedonian"
 msgstr "Makedonština"
 
@@ -15350,6 +15360,12 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "Automaticky odmítat od uživatelů, kteří nejsou na seznamu kamarádů"
+
+#~ msgid "bug master"
+#~ msgstr "lovec chyb"
+
 #~ msgid "Error requesting %s"
 #~ msgstr "Chyba žádosti %s"
 
--- a/po/es.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/es.po	Sun Feb 06 05:26:52 2011 +0000
@@ -7,7 +7,7 @@
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com>
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, 2006-2008, July 2009, July 2010, August 2010
+# 	      January 2005, 2006-2008, July 2009, July 2010, August 2010, January 2011
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:33-0500\n"
-"PO-Revision-Date: 2010-12-15 03:32+0100\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-30 21:28+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "Language: \n"
@@ -2475,10 +2475,12 @@
 "Ruta donde se guardarán los archivos\n"
 "(Debe dar la ruta completa)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr ""
-"Rechazar automáticamente las transferencias de usuarios que no están en mi "
-"lista de amigos"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Cuando llega una solicitud de transferencia de un usuario que\n"
+"*no* está en su lista de amigos:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2491,6 +2493,9 @@
 msgid "Create a new directory for each user"
 msgstr "Crear un directorio para cada usuario"
 
+msgid "Escape the filenames"
+msgstr "Indentar los nombres de fichero"
+
 msgid "Notes"
 msgstr "Notas"
 
@@ -3954,7 +3959,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "El servidor solicita autenticación en claro sobre un canal no cifrado"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Respuesta inválida del servidor"
 
@@ -6298,6 +6306,20 @@
 msgid "Retrieving User Information..."
 msgstr "Obteniendo la información del usuario..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Ha sido expulsado de este MultiMX."
+
+msgid "was kicked"
+msgstr "fue expulsado"
+
+msgid "_Room Name:"
+msgstr "Nombre de _Sala:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Ha sido invitado"
+
 msgid "Loading menu..."
 msgstr "Cargando el menú..."
 
@@ -6325,20 +6347,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Activar la pantalla de bienvenida"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Ha sido expulsado de este MultiMX."
-
-msgid "was kicked"
-msgstr "fue expulsado"
-
-msgid "_Room Name:"
-msgstr "Nombre de _Sala:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Ha sido invitado"
-
 msgid "Last Online"
 msgstr "Última conexión"
 
@@ -8007,75 +8015,6 @@
 "para Imágenes de MI.  Como su dirección IP será revelada, puede considerarse "
 "esto como un riesgo a su privacidad."
 
-msgid "Invalid SNAC"
-msgstr "SNAC inválido"
-
-msgid "Server rate limit exceeded"
-msgstr "Se excedió el límite de tasa del servidor"
-
-msgid "Client rate limit exceeded"
-msgstr "Se excedió el límite de tasa del cliente"
-
-msgid "Service unavailable"
-msgstr "Servicio no disponible"
-
-msgid "Service not defined"
-msgstr "Servicio no definido"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "No soportado por el servidor"
-
-msgid "Not supported by client"
-msgstr "No soportado por el cliente"
-
-msgid "Refused by client"
-msgstr "Rechazado por el cliente"
-
-msgid "Reply too big"
-msgstr "Respuesta demasiado grande"
-
-msgid "Responses lost"
-msgstr "Respuestas perdidas"
-
-msgid "Request denied"
-msgstr "Solicitud denegada"
-
-msgid "Busted SNAC payload"
-msgstr "Carga de SNAC destrozada"
-
-msgid "Insufficient rights"
-msgstr "Derechos insuficientes"
-
-msgid "In local permit/deny"
-msgstr "En la lista local de autorizar/negar"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivel de aviso demasiado alto (emisor)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivel de aviso demasiado alto (receptor)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente no disponible"
-
-msgid "No match"
-msgstr "No hubo coincidencia"
-
-msgid "List overflow"
-msgstr "Desbordamiento de la lista"
-
-msgid "Request ambiguous"
-msgstr "Solicitud ambigua"
-
-msgid "Queue full"
-msgstr "Cola llena"
-
-msgid "Not while on AOL"
-msgstr "No mientras esté en AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Icono de amigo"
@@ -8194,6 +8133,75 @@
 msgid "Capabilities"
 msgstr "Capacidades"
 
+msgid "Invalid SNAC"
+msgstr "SNAC inválido"
+
+msgid "Server rate limit exceeded"
+msgstr "Se excedió el límite de tasa del servidor"
+
+msgid "Client rate limit exceeded"
+msgstr "Se excedió el límite de tasa del cliente"
+
+msgid "Service unavailable"
+msgstr "Servicio no disponible"
+
+msgid "Service not defined"
+msgstr "Servicio no definido"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsoleto"
+
+msgid "Not supported by host"
+msgstr "No soportado por el servidor"
+
+msgid "Not supported by client"
+msgstr "No soportado por el cliente"
+
+msgid "Refused by client"
+msgstr "Rechazado por el cliente"
+
+msgid "Reply too big"
+msgstr "Respuesta demasiado grande"
+
+msgid "Responses lost"
+msgstr "Respuestas perdidas"
+
+msgid "Request denied"
+msgstr "Solicitud denegada"
+
+msgid "Busted SNAC payload"
+msgstr "Carga de SNAC destrozada"
+
+msgid "Insufficient rights"
+msgstr "Derechos insuficientes"
+
+msgid "In local permit/deny"
+msgstr "En la lista local de autorizar/negar"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (emisor)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso demasiado alto (receptor)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuario temporalmente no disponible"
+
+msgid "No match"
+msgstr "No hubo coincidencia"
+
+msgid "List overflow"
+msgstr "Desbordamiento de la lista"
+
+msgid "Request ambiguous"
+msgstr "Solicitud ambigua"
+
+msgid "Queue full"
+msgstr "Cola llena"
+
+msgid "Not while on AOL"
+msgstr "No mientras esté en AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8786,14 +8794,14 @@
 msgid "Select Server"
 msgstr "Seleccionar servidor"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Conectar por TCP"
@@ -12353,9 +12361,6 @@
 msgid "Fatal Error"
 msgstr "Error fatal"
 
-msgid "bug master"
-msgstr "maestro de las erratas"
-
 msgid "artist"
 msgstr "artista"
 
@@ -12536,6 +12541,9 @@
 msgid "Maithili"
 msgstr "Maithili"
 
+msgid "Meadow Mari"
+msgstr "Mari"
+
 msgid "Macedonian"
 msgstr "Macedonio"
 
@@ -15685,6 +15693,14 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tiene permisos para desinstalar esta aplicación."
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr ""
+#~ "Rechazar automáticamente las transferencias de usuarios que no están en "
+#~ "mi lista de amigos"
+
+#~ msgid "bug master"
+#~ msgstr "maestro de las erratas"
+
 #~ msgid "Error requesting %s"
 #~ msgstr "Error al solicitar %s"
 
@@ -15757,20 +15773,20 @@
 #~ msgstr "Album"
 
 #~ msgid "Current Mood"
-#~ msgstr "Luna actual"
+#~ msgstr "Estado de ánimo actual"
 
 #~ msgid "New Mood"
-#~ msgstr "Luna nueva"
+#~ msgstr "Nuevo estado de ánimo"
 
 #~ msgid "Change your Mood"
-#~ msgstr "Cambiar su luna"
+#~ msgstr "Cambiar su estado de ánimo"
 
 #~ msgid "How do you feel right now?"
 #~ msgstr "¿Cómo se encuentra justo ahora?"
 
 #, fuzzy
 #~ msgid "Change Mood..."
-#~ msgstr "Cambiar su contraseña..."
+#~ msgstr "Cambiar su estado de ánimo..."
 
 #~ msgid "Pager server"
 #~ msgstr "Servidor buscapersonas"
--- a/po/he.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/he.po	Sun Feb 06 05:26:52 2011 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:33-0500\n"
-"PO-Revision-Date: 2010-12-16 16:39+0200\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-26 08:34+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -2278,8 +2278,12 @@
 "נתיב לשמור בו את הקבצים\n"
 "(יש לספק נתיב מלא)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "דחה אוטומטית ממשתמשים שאינם ברשימת החברים שלי"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"כאשר מגיעה בקשה להעברת-קובץ ממשתמש\n"
+"אשר *אינו* ברשימת החברים שלך:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2291,6 +2295,9 @@
 msgid "Create a new directory for each user"
 msgstr "צור ספרייה חדשה עבור כל משתמש"
 
+msgid "Escape the filenames"
+msgstr "קדד אותיות בעייתיות בשמות הקבצים"
+
 msgid "Notes"
 msgstr "הערות"
 
@@ -3724,7 +3731,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "תגובה לא תקפה מהשרת"
 
@@ -5980,6 +5990,20 @@
 msgid "Retrieving User Information..."
 msgstr "שולף מידע משתמש..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "נבעטת מתוך MultiMX זה."
+
+msgid "was kicked"
+msgstr "נבעט/ה"
+
+msgid "_Room Name:"
+msgstr "שם _חדר:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "הוזמנת"
+
 msgid "Loading menu..."
 msgstr "טוען תפריט..."
 
@@ -6007,20 +6031,6 @@
 msgid "Enable splash-screen popup"
 msgstr "אפשר פתיחת חלון-הקדמה"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "נבעטת מתוך MultiMX זה."
-
-msgid "was kicked"
-msgstr "נבעט/ה"
-
-msgid "_Room Name:"
-msgstr "שם _חדר:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "הוזמנת"
-
 msgid "Last Online"
 msgstr "חיבור אחרון"
 
@@ -7620,75 +7630,6 @@
 "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
 "ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
-msgid "Invalid SNAC"
-msgstr "SNAC לא תקף"
-
-msgid "Server rate limit exceeded"
-msgstr "הפרזת מעבר למגבלת השרת"
-
-msgid "Client rate limit exceeded"
-msgstr "הפרזת מעבר למגבלת הלקוח"
-
-msgid "Service unavailable"
-msgstr "השירות אינו זמין"
-
-msgid "Service not defined"
-msgstr "שירות אינו מוגדר"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC מיושן"
-
-msgid "Not supported by host"
-msgstr "לא נתמך על-ידי השרת"
-
-msgid "Not supported by client"
-msgstr "לא נתמך על-ידי הלקוח"
-
-msgid "Refused by client"
-msgstr "החיבור נדחה על ידי הלקוח."
-
-msgid "Reply too big"
-msgstr "המענה גדול מדיי"
-
-msgid "Responses lost"
-msgstr "אבדו המשובים"
-
-msgid "Request denied"
-msgstr "הבקשה נדחית"
-
-msgid "Busted SNAC payload"
-msgstr "מידע פגום ב-SNAC"
-
-msgid "Insufficient rights"
-msgstr "אין די הרשאות"
-
-msgid "In local permit/deny"
-msgstr "באישור/שלילה מקומיים"
-
-msgid "Warning level too high (sender)"
-msgstr "רמת אזהרה גבוהה מדי (שולח("
-
-msgid "Warning level too high (receiver)"
-msgstr "רמת אזהרה גבוהה מדי (מקבל)"
-
-msgid "User temporarily unavailable"
-msgstr "המשתמש אינו זמין כרגע"
-
-msgid "No match"
-msgstr "אין התאמה"
-
-msgid "List overflow"
-msgstr "גלישת מגבולות הרשימה"
-
-msgid "Request ambiguous"
-msgstr "בקשה לא ברורה"
-
-msgid "Queue full"
-msgstr "התור מלא"
-
-msgid "Not while on AOL"
-msgstr "לא בזמן שהות ב-AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "סמל איש הקשר"
@@ -7807,6 +7748,75 @@
 msgid "Capabilities"
 msgstr "יכולות"
 
+msgid "Invalid SNAC"
+msgstr "SNAC לא תקף"
+
+msgid "Server rate limit exceeded"
+msgstr "הפרזת מעבר למגבלת השרת"
+
+msgid "Client rate limit exceeded"
+msgstr "הפרזת מעבר למגבלת הלקוח"
+
+msgid "Service unavailable"
+msgstr "השירות אינו זמין"
+
+msgid "Service not defined"
+msgstr "שירות אינו מוגדר"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC מיושן"
+
+msgid "Not supported by host"
+msgstr "לא נתמך על-ידי השרת"
+
+msgid "Not supported by client"
+msgstr "לא נתמך על-ידי הלקוח"
+
+msgid "Refused by client"
+msgstr "החיבור נדחה על ידי הלקוח."
+
+msgid "Reply too big"
+msgstr "המענה גדול מדיי"
+
+msgid "Responses lost"
+msgstr "אבדו המשובים"
+
+msgid "Request denied"
+msgstr "הבקשה נדחית"
+
+msgid "Busted SNAC payload"
+msgstr "מידע פגום ב-SNAC"
+
+msgid "Insufficient rights"
+msgstr "אין די הרשאות"
+
+msgid "In local permit/deny"
+msgstr "באישור/שלילה מקומיים"
+
+msgid "Warning level too high (sender)"
+msgstr "רמת אזהרה גבוהה מדי (שולח("
+
+msgid "Warning level too high (receiver)"
+msgstr "רמת אזהרה גבוהה מדי (מקבל)"
+
+msgid "User temporarily unavailable"
+msgstr "המשתמש אינו זמין כרגע"
+
+msgid "No match"
+msgstr "אין התאמה"
+
+msgid "List overflow"
+msgstr "גלישת מגבולות הרשימה"
+
+msgid "Request ambiguous"
+msgstr "בקשה לא ברורה"
+
+msgid "Queue full"
+msgstr "התור מלא"
+
+msgid "Not while on AOL"
+msgstr "לא בזמן שהות ב-AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8398,14 +8408,14 @@
 msgid "Select Server"
 msgstr "בחר שרת"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "התחבר בעזרת TCP"
@@ -11881,9 +11891,6 @@
 msgid "Fatal Error"
 msgstr "שגיאה קטלנית"
 
-msgid "bug master"
-msgstr "שר-הבאגים"
-
 msgid "artist"
 msgstr "אמן"
 
@@ -12063,6 +12070,9 @@
 msgid "Maithili"
 msgstr "מאת'ילי"
 
+msgid "Meadow Mari"
+msgstr "Meadow Mari"
+
 msgid "Macedonian"
 msgstr "מקדונית"
 
@@ -15107,6 +15117,12 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ".אין לך זכות למחוק תוכנה זאת"
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "דחה אוטומטית ממשתמשים שאינם ברשימת החברים שלי"
+
+#~ msgid "bug master"
+#~ msgstr "שר-הבאגים"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "ארעה שגיאה בעת ההעברה בזרם בתווך\n"
 
--- a/po/nl.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/nl.po	Sun Feb 06 05:26:52 2011 +0000
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2010-12-14 10:45+0100\n"
-"Last-Translator: Dingoe <translations@gvmelle.com>\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-25 10:45+0100\n"
+"Last-Translator: Gideon van Melle <translations@gvmelle.com>\n"
 "Language-Team: Dutch <translations@gvmelle.com>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s heeft %s in zijn/haar vriendt gemaakt%s%s"
+msgstr "%s%s%s%s heeft %s in zijn/haar vriend gemaakt%s%s"
 
 msgid "Add buddy to your list?"
 msgstr "Vriend toevoegen aan uw lijst?"
@@ -2365,8 +2365,12 @@
 "Pad voor opslaan bestanden\n"
 "(Geef spv het volledige pad)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisch verwerpen van gebruikers die niet in vriendenlijst staan"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Als een bestandsoverdracht aanvraag komt van gebruiker die\n"
+"*niet\" op uw vriendenlijst staat:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2379,6 +2383,9 @@
 msgid "Create a new directory for each user"
 msgstr "Een nieuwe map voor elke gebruiker aanmaken"
 
+msgid "Escape the filenames"
+msgstr "*Escape* de bestandsnamen"
+
 msgid "Notes"
 msgstr "Notities"
 
@@ -3862,7 +3869,10 @@
 "Server vereist een waarmerking via tekstaanmelding via een ongecodeerde "
 "datastroom"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Ongeldig antwoord van server"
 
@@ -6178,6 +6188,20 @@
 msgid "Retrieving User Information..."
 msgstr "Ophalen Gebruikersinformatie..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "U bent uit deze MultiMX gegooid."
+
+msgid "was kicked"
+msgstr "eruit gegooid"
+
+msgid "_Room Name:"
+msgstr "_Ruimtenaam:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "U heeft uitgenodigd"
+
 msgid "Loading menu..."
 msgstr "Menu aan 't laden..."
 
@@ -6205,20 +6229,6 @@
 msgid "Enable splash-screen popup"
 msgstr "inschakelen splashscreen pop-up"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "U bent uit deze MultiMX gegooid."
-
-msgid "was kicked"
-msgstr "eruit gegooid"
-
-msgid "_Room Name:"
-msgstr "_Ruimtenaam:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "U heeft uitgenodigd"
-
 msgid "Last Online"
 msgstr "Laatste Online"
 
@@ -7892,75 +7902,6 @@
 "afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy "
 "beschouwd kunnen worden omdat de ander dan uw IP-adres te weten komt."
 
-msgid "Invalid SNAC"
-msgstr "Ongeldige SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Server snelheidslimiet overschreden"
-
-msgid "Client rate limit exceeded"
-msgstr "Cliënt snelheidslimiet overschreden"
-
-msgid "Service unavailable"
-msgstr "Service niet beschikbaar"
-
-msgid "Service not defined"
-msgstr "Service niet gedefinieerd"
-
-msgid "Obsolete SNAC"
-msgstr "Verouderde SNAC"
-
-msgid "Not supported by host"
-msgstr "Niet ondersteund door computer"
-
-msgid "Not supported by client"
-msgstr "Niet ondersteund door cliënt"
-
-msgid "Refused by client"
-msgstr "Gewegerd door cliënt"
-
-msgid "Reply too big"
-msgstr "Antwoord te groot"
-
-msgid "Responses lost"
-msgstr "Reacties verloren"
-
-msgid "Request denied"
-msgstr "Aanvraag geweigerd"
-
-msgid "Busted SNAC payload"
-msgstr "SNAC bagage kapot"
-
-msgid "Insufficient rights"
-msgstr "Niet genoeg rechten"
-
-msgid "In local permit/deny"
-msgstr "In lokale toestaan/weigeren"
-
-msgid "Warning level too high (sender)"
-msgstr "Waarschuwingsniveau te hoog (verzender)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Waarschuwingsniveau te hoog (ontvanger)"
-
-msgid "User temporarily unavailable"
-msgstr "Gebruiker tijdelijk niet beschikbaar"
-
-msgid "No match"
-msgstr "Geen overeenkomstige resultaten"
-
-msgid "List overflow"
-msgstr "Te grote lijst"
-
-msgid "Request ambiguous"
-msgstr "Dubieuze aanvraag"
-
-msgid "Queue full"
-msgstr "Wachtrij vol"
-
-msgid "Not while on AOL"
-msgstr "Niet tijdens AOL"
-
 # msgstr ""
 # "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
 # "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
@@ -8083,6 +8024,75 @@
 msgid "Capabilities"
 msgstr "Mogelijkheden"
 
+msgid "Invalid SNAC"
+msgstr "Ongeldige SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Server snelheidslimiet overschreden"
+
+msgid "Client rate limit exceeded"
+msgstr "Cliënt snelheidslimiet overschreden"
+
+msgid "Service unavailable"
+msgstr "Service niet beschikbaar"
+
+msgid "Service not defined"
+msgstr "Service niet gedefinieerd"
+
+msgid "Obsolete SNAC"
+msgstr "Verouderde SNAC"
+
+msgid "Not supported by host"
+msgstr "Niet ondersteund door computer"
+
+msgid "Not supported by client"
+msgstr "Niet ondersteund door cliënt"
+
+msgid "Refused by client"
+msgstr "Gewegerd door cliënt"
+
+msgid "Reply too big"
+msgstr "Antwoord te groot"
+
+msgid "Responses lost"
+msgstr "Reacties verloren"
+
+msgid "Request denied"
+msgstr "Aanvraag geweigerd"
+
+msgid "Busted SNAC payload"
+msgstr "SNAC bagage kapot"
+
+msgid "Insufficient rights"
+msgstr "Niet genoeg rechten"
+
+msgid "In local permit/deny"
+msgstr "In lokale toestaan/weigeren"
+
+msgid "Warning level too high (sender)"
+msgstr "Waarschuwingsniveau te hoog (verzender)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Waarschuwingsniveau te hoog (ontvanger)"
+
+msgid "User temporarily unavailable"
+msgstr "Gebruiker tijdelijk niet beschikbaar"
+
+msgid "No match"
+msgstr "Geen overeenkomstige resultaten"
+
+msgid "List overflow"
+msgstr "Te grote lijst"
+
+msgid "Request ambiguous"
+msgstr "Dubieuze aanvraag"
+
+msgid "Queue full"
+msgstr "Wachtrij vol"
+
+msgid "Not while on AOL"
+msgstr "Niet tijdens AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8677,14 +8687,14 @@
 msgid "Select Server"
 msgstr "Selecteer Server"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Verbinden via TCP"
@@ -12256,9 +12266,6 @@
 msgid "Fatal Error"
 msgstr "Fatale fout"
 
-msgid "bug master"
-msgstr "bug master"
-
 msgid "artist"
 msgstr "artiest"
 
@@ -12438,6 +12445,9 @@
 msgid "Maithili"
 msgstr "Maithili"
 
+msgid "Meadow Mari"
+msgstr "Meadow Mari"
+
 msgid "Macedonian"
 msgstr "Macedonisch"
 
@@ -15584,6 +15594,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "U mag dit programma niet verwijderen."
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr ""
+#~ "Automatisch verwerpen van gebruikers die niet in vriendenlijst staan"
+
+#~ msgid "bug master"
+#~ msgstr "bug master"
+
 #~ msgid "Error requesting %s"
 #~ msgstr "Fout opvragen  %s"
 
--- a/po/nn.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/nn.po	Sun Feb 06 05:26:52 2011 +0000
@@ -1,19 +1,19 @@
 #
-# Yngve Spjeld Landro <l10n@landro.net>, 2010.
+# Yngve Spjeld Landro <l10n@landro.net>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2010-12-14 04:02+0100\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-20 05:01+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
 "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -2357,9 +2357,12 @@
 "Fillagringsbane\n"
 "(før opp heile filbana)"
 
-# var: Automatisk avvising frå brukarar utanfor vennelista
-msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisk avvising av brukarar utanfor vennelista"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Når ein filoverføringsførespurnad kjem frå ein brukar som\n"
+"*ikkje* er i vennelista di:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2372,6 +2375,9 @@
 msgid "Create a new directory for each user"
 msgstr "Lag ein ny katalog for kvar brukar"
 
+msgid "Escape the filenames"
+msgstr "Vern filnamna (esc.-sekv.)"
+
 msgid "Notes"
 msgstr "Notat"
 
@@ -3822,7 +3828,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Tenaren krev autentisering i klartekst over eit ukryptert samband"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Ugyldig svar frå tenaren"
 
@@ -6123,6 +6132,20 @@
 msgid "Retrieving User Information..."
 msgstr "Hentar brukaropplysningar…"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Du er blitt sparka ut frå denne MultiMX-en."
+
+msgid "was kicked"
+msgstr "blei sparka ut"
+
+msgid "_Room Name:"
+msgstr "Rom_namn:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Du har invitert "
+
 msgid "Loading menu..."
 msgstr "Lastar menyen…"
 
@@ -6151,20 +6174,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Bruk oppstartsvindauge"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Du er blitt sparka ut frå denne MultiMX-en."
-
-msgid "was kicked"
-msgstr "blei sparka ut"
-
-msgid "_Room Name:"
-msgstr "Rom_namn:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Du har invitert "
-
 msgid "Last Online"
 msgstr "Sist tilkopla"
 
@@ -7809,75 +7818,6 @@
 "for lynmeldingsbilete. Fordi IP-adressa vil bli avslørt, blir dette sett på "
 "som ein tryggleiksrisiko."
 
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Overskriden tenargrense"
-
-msgid "Client rate limit exceeded"
-msgstr "Overskriden klientgrense"
-
-msgid "Service unavailable"
-msgstr "Tenesta er utilgjengeleg"
-
-msgid "Service not defined"
-msgstr "Tenesta er ikkje definert"
-
-msgid "Obsolete SNAC"
-msgstr "Forelda SNAC"
-
-msgid "Not supported by host"
-msgstr "Ikkje støtta av verten"
-
-msgid "Not supported by client"
-msgstr "Ikkje støtta av klienten"
-
-msgid "Refused by client"
-msgstr "Avvist av klienten"
-
-msgid "Reply too big"
-msgstr "Svaret er for stort"
-
-msgid "Responses lost"
-msgstr "Tapte svar"
-
-msgid "Request denied"
-msgstr "Førsepurnad avvist"
-
-msgid "Busted SNAC payload"
-msgstr "Ødelagt SNAC-pakkeinnhald"
-
-msgid "Insufficient rights"
-msgstr "Ikkje nok rettar"
-
-msgid "In local permit/deny"
-msgstr "I lokal tilgangs-/forbodsliste"
-
-msgid "Warning level too high (sender)"
-msgstr "For høgt åtvaringsnivå (sendar)"
-
-msgid "Warning level too high (receiver)"
-msgstr "For høgt åtvaringsnivå (mottakar)"
-
-msgid "User temporarily unavailable"
-msgstr "Brukaren er mellombels utilgjengeleg"
-
-msgid "No match"
-msgstr "Ikkje noko samsvar"
-
-msgid "List overflow"
-msgstr "Lista er full"
-
-msgid "Request ambiguous"
-msgstr "Uklar førespurnad"
-
-msgid "Queue full"
-msgstr "Køen er full"
-
-msgid "Not while on AOL"
-msgstr "Ikkje når pålogga AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Venneikon"
@@ -7997,6 +7937,75 @@
 msgid "Capabilities"
 msgstr "Evner"
 
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Overskriden tenargrense"
+
+msgid "Client rate limit exceeded"
+msgstr "Overskriden klientgrense"
+
+msgid "Service unavailable"
+msgstr "Tenesta er utilgjengeleg"
+
+msgid "Service not defined"
+msgstr "Tenesta er ikkje definert"
+
+msgid "Obsolete SNAC"
+msgstr "Forelda SNAC"
+
+msgid "Not supported by host"
+msgstr "Ikkje støtta av verten"
+
+msgid "Not supported by client"
+msgstr "Ikkje støtta av klienten"
+
+msgid "Refused by client"
+msgstr "Avvist av klienten"
+
+msgid "Reply too big"
+msgstr "Svaret er for stort"
+
+msgid "Responses lost"
+msgstr "Tapte svar"
+
+msgid "Request denied"
+msgstr "Førsepurnad avvist"
+
+msgid "Busted SNAC payload"
+msgstr "Ødelagt SNAC-pakkeinnhald"
+
+msgid "Insufficient rights"
+msgstr "Ikkje nok rettar"
+
+msgid "In local permit/deny"
+msgstr "I lokal tilgangs-/forbodsliste"
+
+msgid "Warning level too high (sender)"
+msgstr "For høgt åtvaringsnivå (sendar)"
+
+msgid "Warning level too high (receiver)"
+msgstr "For høgt åtvaringsnivå (mottakar)"
+
+msgid "User temporarily unavailable"
+msgstr "Brukaren er mellombels utilgjengeleg"
+
+msgid "No match"
+msgstr "Ikkje noko samsvar"
+
+msgid "List overflow"
+msgstr "Lista er full"
+
+msgid "Request ambiguous"
+msgstr "Uklar førespurnad"
+
+msgid "Queue full"
+msgstr "Køen er full"
+
+msgid "Not while on AOL"
+msgstr "Ikkje når pålogga AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8589,14 +8598,14 @@
 msgid "Select Server"
 msgstr "Vel tenar"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Kopla til med TCP"
@@ -11352,19 +11361,19 @@
 msgstr "Skjul når du er fråkopla"
 
 msgid "Show When Offline"
-msgstr "Vis når du er fråkopla"
+msgstr "Vis når du er fr_åkopla"
 
 msgid "_Alias..."
-msgstr "Ka_llenamn…"
+msgstr "_Kallenamn …"
 
 msgid "_Remove"
 msgstr "_Fjern"
 
 msgid "Set Custom Icon"
-msgstr "Tilpassa ikon"
+msgstr "_Tilpassa ikon"
 
 msgid "Remove Custom Icon"
-msgstr "Fjern eige ikon"
+msgstr "Fjern tilpa_ssa ikon"
 
 msgid "Add _Buddy..."
 msgstr "Legg til _venn…"
@@ -11383,16 +11392,16 @@
 msgstr "_Bli med"
 
 msgid "Auto-Join"
-msgstr "Automatisk pålogging"
+msgstr "Bli med auto_matisk"
 
 msgid "Persistent"
-msgstr "Varig"
+msgstr "_Varig"
 
 msgid "_Edit Settings..."
-msgstr "Endra _innstillingar…"
+msgstr "Endra _innstillingar …"
 
 msgid "_Collapse"
-msgstr "_Slå saman"
+msgstr "Sl_å saman"
 
 msgid "_Expand"
 msgstr "_Utvid"
@@ -12149,9 +12158,6 @@
 msgid "Fatal Error"
 msgstr "Alvorleg feil"
 
-msgid "bug master"
-msgstr "feilrettingsansvarleg"
-
 msgid "artist"
 msgstr "kunstnar"
 
@@ -12332,6 +12338,10 @@
 msgid "Maithili"
 msgstr "Maithili"
 
+#, fuzzy
+msgid "Meadow Mari"
+msgstr "Ny e-post"
+
 msgid "Macedonian"
 msgstr "Makedonsk"
 
@@ -12625,7 +12635,7 @@
 msgstr "Fjern venn"
 
 msgid "_Remove Buddy"
-msgstr "_Fjern venn"
+msgstr "Fje_rn venn"
 
 #, c-format
 msgid ""
@@ -13534,13 +13544,13 @@
 msgstr "Slå på automatisk port_vidaresending"
 
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Før opp _portrekkje det skal lyttast til:"
+msgstr "Før opp portr_ekkje det skal lyttast til:"
 
 msgid "_Start:"
-msgstr "_Start:"
+msgstr "_start:"
 
 msgid "_End:"
-msgstr "_Slutt:"
+msgstr "s_lutt:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
@@ -15441,6 +15451,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikkje rettar til å avinstallera dette programmet."
 
+#~ msgid "bug master"
+#~ msgstr "feilrettingsansvarleg"
+
+# var: Automatisk avvising frå brukarar utanfor vennelista
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "Automatisk avvising av brukarar utanfor vennelista"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "Overføringa av samtidsdatastraumen feila\n"
 
--- a/po/oc.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/oc.po	Sun Feb 06 05:26:52 2011 +0000
@@ -12,13 +12,14 @@
 # D'autres documents utiles peuvent être consultés sur lo projet de
 # traduction de GNOME.
 # http://wiki.traduc.org/gnomefr/
+# Éric Boumaour <zongo_fr@users.sourceforge.net>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2008-05-09 01:31+0200\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-09 00:11+0100\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "Language: \n"
@@ -63,7 +64,7 @@
 msgstr ""
 
 msgid "Account was not added"
-msgstr ""
+msgstr "Compte pas apondut"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
@@ -89,17 +90,16 @@
 msgstr ""
 
 msgid "Modify Account"
-msgstr ""
+msgstr "Modificar lo compte"
 
 msgid "New Account"
-msgstr ""
+msgstr "Compte novèl"
 
 msgid "Protocol:"
 msgstr "Protocòl :"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Nom d'utilizaire :"
+msgstr "Nom d'utilizaire :"
 
 msgid "Password:"
 msgstr "Mot de pas :"
@@ -126,7 +126,7 @@
 msgstr ""
 
 msgid "Delete Account"
-msgstr ""
+msgstr "Suprimir lo compte"
 
 #. Delete button
 msgid "Delete"
@@ -207,7 +207,7 @@
 msgstr ""
 
 msgid "Add in group"
-msgstr ""
+msgstr "Apondre al grop"
 
 msgid "Account"
 msgstr "Compte"
@@ -219,7 +219,7 @@
 msgstr ""
 
 msgid "Chats"
-msgstr ""
+msgstr "Charradissas"
 
 #. Extract their Name and put it in
 msgid "Name"
@@ -259,7 +259,7 @@
 msgstr ""
 
 msgid "Edit"
-msgstr "Edicion"
+msgstr "Modificar"
 
 msgid "Edit Settings"
 msgstr ""
@@ -277,10 +277,10 @@
 msgstr ""
 
 msgid "Send File"
-msgstr "_Enviar un fichièr"
+msgstr "Mandar un fichièr"
 
 msgid "Blocked"
-msgstr ""
+msgstr "Blocat"
 
 msgid "Show when offline"
 msgstr ""
@@ -344,19 +344,19 @@
 msgstr "Novèl..."
 
 msgid "Saved..."
-msgstr ""
+msgstr "Enregistrats..."
 
 msgid "Plugins"
 msgstr "Ajustons"
 
 msgid "Block/Unblock"
-msgstr ""
+msgstr "Blocar/desblocar"
 
 msgid "Block"
-msgstr ""
+msgstr "Blocar"
 
 msgid "Unblock"
-msgstr ""
+msgstr "Desblocar"
 
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
@@ -385,7 +385,7 @@
 msgstr ""
 
 msgid "Join"
-msgstr ""
+msgstr "Jónher"
 
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
@@ -400,7 +400,7 @@
 msgstr ""
 
 msgid "Block/Unblock..."
-msgstr ""
+msgstr "Blocar/desblocar..."
 
 msgid "Join Chat..."
 msgstr ""
@@ -418,7 +418,7 @@
 msgstr ""
 
 msgid "Offline buddies"
-msgstr ""
+msgstr "Los contactes desconnectats"
 
 msgid "Sort"
 msgstr "Ordenar"
@@ -436,7 +436,7 @@
 msgstr ""
 
 msgid "Chat"
-msgstr "Chad"
+msgstr "Charradissa"
 
 msgid "Grouping"
 msgstr ""
@@ -590,7 +590,7 @@
 msgstr ""
 
 msgid "Conversation"
-msgstr ""
+msgstr "Charradissa"
 
 msgid "Clear Scrollback"
 msgstr ""
@@ -601,9 +601,8 @@
 msgid "Add Buddy Pounce..."
 msgstr ""
 
-#, fuzzy
 msgid "Invite..."
-msgstr "Convidar"
+msgstr "Convidar..."
 
 msgid "Enable Logging"
 msgstr ""
@@ -711,15 +710,15 @@
 msgid "Pause"
 msgstr "Pausa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Transferriment de fichièrs"
-msgstr[1] "Transferriment de fichièrs"
+msgstr[0] ""
+msgstr[1] ""
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "Transferriment de fichièrs"
+msgstr "Transferiment de fichièrs"
 
 msgid "Progress"
 msgstr "Avançament"
@@ -763,9 +762,8 @@
 msgid "%.2f KiB/s"
 msgstr "%.2f ko/s"
 
-#, fuzzy
 msgid "Sent"
-msgstr "Definir"
+msgstr "Mandat"
 
 msgid "Received"
 msgstr ""
@@ -777,9 +775,8 @@
 msgid "The file was saved as %s."
 msgstr ""
 
-#, fuzzy
 msgid "Sending"
-msgstr "Segondas"
+msgstr "A mandar"
 
 msgid "Receiving"
 msgstr ""
@@ -828,14 +825,13 @@
 msgstr ""
 
 msgid "All Conversations"
-msgstr ""
+msgstr "Totas las charradissas"
 
 msgid "System Log"
 msgstr ""
 
-#, fuzzy
 msgid "Calling..."
-msgstr "A calcular..."
+msgstr ""
 
 msgid "Hangup"
 msgstr ""
@@ -910,9 +906,8 @@
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
 #. * notify_message. So tread carefully.
-#, fuzzy
 msgid "URI"
-msgstr "URL"
+msgstr "URI"
 
 msgid "ERROR"
 msgstr "ERROR"
@@ -1033,7 +1028,7 @@
 msgstr ""
 
 msgid "Send a message"
-msgstr ""
+msgstr "Mandar un messatge"
 
 msgid "Execute a command"
 msgstr ""
@@ -1167,7 +1162,7 @@
 msgstr ""
 
 msgid "Open File..."
-msgstr ""
+msgstr "Dobrir un fichièr..."
 
 msgid "Choose Location..."
 msgstr ""
@@ -1212,9 +1207,8 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
-#, fuzzy
 msgid "Attention received"
-msgstr "L'autentificacion a abocat"
+msgstr ""
 
 msgid "GStreamer Failure"
 msgstr ""
@@ -1311,7 +1305,7 @@
 msgstr "Títol"
 
 msgid "Type"
-msgstr "Tipe"
+msgstr "Mena"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1482,9 +1476,8 @@
 msgid "TinyURL (or other) address prefix"
 msgstr ""
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
 msgstr ""
@@ -1503,7 +1496,7 @@
 msgstr ""
 
 msgid "Offline Buddies"
-msgstr ""
+msgstr "Contactes desconnectats"
 
 msgid "Online/Offline"
 msgstr ""
@@ -1598,7 +1591,7 @@
 msgstr "Desconegut"
 
 msgid "Buddies"
-msgstr ""
+msgstr "Contactes"
 
 msgid "buddy list"
 msgstr ""
@@ -1745,10 +1738,10 @@
 msgstr ""
 
 msgid "Send Message"
-msgstr "Enviar un messatge"
+msgstr "Mandar un messatge"
 
 msgid "_Send Message"
-msgstr "_Enviar un messatge"
+msgstr "_Mandar un messatge"
 
 #, c-format
 msgid "%s entered the room."
@@ -1774,9 +1767,8 @@
 msgid "%s left the room (%s)."
 msgstr ""
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Convidar"
+msgstr "Convidar a una charradissa"
 
 #. Put our happy label in it.
 msgid ""
@@ -1837,7 +1829,7 @@
 msgstr ""
 
 msgid "Unknown reason"
-msgstr "Rason desconeguda"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -1926,9 +1918,9 @@
 msgid "File transfer cancelled"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s a changé son état de %s en %s."
+msgstr ""
 
 #, c-format
 msgid "%s cancelled the file transfer"
@@ -2121,9 +2113,8 @@
 msgid "Error with your webcam"
 msgstr ""
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Error de connexion"
+msgstr ""
 
 #, c-format
 msgid "Error creating session: %s"
@@ -2189,13 +2180,13 @@
 msgstr ""
 
 msgid "_Save"
-msgstr "_Enregistrar"
+msgstr "Enregi_strar"
 
 msgid "_Cancel"
 msgstr "_Anullar"
 
 msgid "Ask"
-msgstr ""
+msgstr "Demandar"
 
 msgid "Auto Accept"
 msgstr ""
@@ -2212,7 +2203,9 @@
 "(Please provide the full path)"
 msgstr ""
 
-msgid "Automatically reject from users not in buddy list"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
 msgstr ""
 
 msgid ""
@@ -2223,6 +2216,9 @@
 msgid "Create a new directory for each user"
 msgstr ""
 
+msgid "Escape the filenames"
+msgstr ""
+
 msgid "Notes"
 msgstr "Nòtas"
 
@@ -2462,7 +2458,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2474,13 +2470,13 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr ""
+msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
 msgid "General Log Reading Configuration"
@@ -2573,7 +2569,7 @@
 msgstr ""
 
 msgid "Offline Message"
-msgstr ""
+msgstr "Messatge desconnectat"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
@@ -2590,9 +2586,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Picatz lo mot de pas"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2700,7 +2695,7 @@
 #. *< priority
 #. *< id
 msgid "GNUTLS"
-msgstr ""
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
@@ -2716,7 +2711,7 @@
 #. *< priority
 #. *< id
 msgid "NSS"
-msgstr ""
+msgstr "NSS"
 
 #. *< name
 #. *< version
@@ -2851,7 +2846,7 @@
 msgstr ""
 
 msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
@@ -2908,9 +2903,8 @@
 msgid "You must fill in all registration fields"
 msgstr ""
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "Los mots de pas son pas los meteisses."
+msgstr "Los mots de pas son pas los meteisses"
 
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
@@ -2930,9 +2924,8 @@
 msgid "Enter captcha text"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha"
-msgstr "Enregistrar l'imatge"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3031,7 +3024,7 @@
 msgstr "Absent(a)"
 
 msgid "UIN"
-msgstr ""
+msgstr "UIN"
 
 #. first name
 #. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
@@ -3088,9 +3081,9 @@
 msgid "Chat _name:"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
+msgstr ""
 
 #. 1. connect to server
 #. connect to the server
@@ -3103,9 +3096,8 @@
 msgid "This chat name is already in use"
 msgstr ""
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Connectat"
+msgstr "Sètz pas connectat al servidor"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3146,9 +3138,8 @@
 msgid "Gadu-Gadu User"
 msgstr ""
 
-#, fuzzy
 msgid "GG server"
-msgstr "Connectat"
+msgstr "Servidor GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3187,9 +3178,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 "Connectat"
+msgstr ""
 
 msgid "View MOTD"
 msgstr ""
@@ -3270,9 +3261,9 @@
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "Rason : %s"
+msgstr ""
 
 msgid "End of ban list"
 msgstr ""
@@ -3289,10 +3280,10 @@
 msgstr ""
 
 msgid " <i>(ircop)</i>"
-msgstr ""
+msgstr " <i>(ircop)</i>"
 
 msgid " <i>(identified)</i>"
-msgstr ""
+msgstr " <i>(identificat)</i>"
 
 msgid "Nick"
 msgstr "Escais"
@@ -3400,9 +3391,8 @@
 msgid "The nickname \"%s\" is already being used."
 msgstr ""
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "Escais"
+msgstr ""
 
 msgid "Cannot change nick"
 msgstr ""
@@ -3585,7 +3575,7 @@
 msgstr ""
 
 msgid "PONG"
-msgstr ""
+msgstr "PONG"
 
 msgid "CTCP PING reply"
 msgstr ""
@@ -3605,7 +3595,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr ""
 
@@ -3639,17 +3632,15 @@
 "Allow this and continue authentication?"
 msgstr ""
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "L'autentificacion a abocat"
+msgstr ""
 
 #, c-format
 msgid "SASL error: %s"
 msgstr ""
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid "Unsupported Extension"
 msgstr ""
@@ -3673,16 +3664,14 @@
 msgid "User not found"
 msgstr "Utilizaire pas trobat"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid "Resource Constraint"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to canonicalize username"
-msgstr "Activat"
+msgstr ""
 
 msgid "Unable to canonicalize password"
 msgstr ""
@@ -3705,9 +3694,9 @@
 msgid "Unable to establish a connection with the server"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "Connectat"
+msgstr ""
 
 msgid "Unable to establish SSL connection"
 msgstr ""
@@ -3746,7 +3735,7 @@
 
 #. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
-msgstr "País"
+msgstr "Païs"
 
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
@@ -3782,14 +3771,13 @@
 msgstr ""
 
 msgid "Client"
-msgstr ""
+msgstr "Client"
 
 msgid "Operating System"
 msgstr "Sistèma d'explotacion"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Fichièr local :"
+msgstr "Ora locala"
 
 msgid "Priority"
 msgstr "Prioritat"
@@ -3797,16 +3785,15 @@
 msgid "Resource"
 msgstr "Ressorga"
 
-#, fuzzy
 msgid "Uptime"
-msgstr "Data"
+msgstr ""
 
 msgid "Logged Off"
 msgstr ""
 
 #, c-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s i a"
 
 msgid "Middle Name"
 msgstr ""
@@ -3850,7 +3837,7 @@
 msgstr ""
 
 msgid "Log In"
-msgstr ""
+msgstr "Connexion"
 
 msgid "Log Out"
 msgstr "Desconnectar"
@@ -3860,7 +3847,7 @@
 
 #. last name
 msgid "Last Name"
-msgstr "Nom"
+msgstr ""
 
 msgid "The following are the results of your search"
 msgstr ""
@@ -3971,17 +3958,14 @@
 msgid "Find Rooms"
 msgstr ""
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Aliàs :"
-
-#, fuzzy
+msgstr ""
+
 msgid "No users found"
-msgstr "Utilizaire pas trobat"
-
-#, fuzzy
+msgstr ""
+
 msgid "Roles:"
-msgstr "Ròtle"
+msgstr "Ròtles :"
 
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
@@ -3989,9 +3973,8 @@
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "Connectat"
+msgstr ""
 
 msgid "Invalid XMPP ID"
 msgstr ""
@@ -4030,7 +4013,7 @@
 msgstr ""
 
 msgid "State"
-msgstr "Estat"
+msgstr ""
 
 msgid "Postal code"
 msgstr ""
@@ -4058,7 +4041,7 @@
 msgstr ""
 
 msgid "Register"
-msgstr "Enregistrar"
+msgstr "S'enregistrar"
 
 #, c-format
 msgid "Change Account Registration at %s"
@@ -4111,7 +4094,7 @@
 msgstr "De"
 
 msgid "To"
-msgstr "A"
+msgstr "Destinacion"
 
 msgid "None (To pending)"
 msgstr ""
@@ -4129,13 +4112,11 @@
 msgid "Allow Buzz"
 msgstr ""
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Nom de grop"
-
-#, fuzzy
+msgstr ""
+
 msgid "Mood Comment"
-msgstr "Entresenhas"
+msgstr ""
 
 #. primitive
 #. ID
@@ -4407,9 +4388,8 @@
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "L'autentificacion a abocat"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -4505,9 +4485,8 @@
 msgid "Use old-style SSL"
 msgstr ""
 
-#, fuzzy
 msgid "Connection security"
-msgstr "Connexion perduda"
+msgstr ""
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
@@ -4525,7 +4504,7 @@
 msgstr ""
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4538,7 +4517,7 @@
 
 #, c-format
 msgid "Message from %s"
-msgstr "Messatge de %s"
+msgstr ""
 
 #, c-format
 msgid "%s has set the topic to: %s"
@@ -4596,9 +4575,8 @@
 msgid "_Accept Defaults"
 msgstr ""
 
-#, fuzzy
 msgid "No reason"
-msgstr "Rason desconeguda"
+msgstr "Pas de rason"
 
 #, c-format
 msgid "You have been kicked: (%s)"
@@ -4634,23 +4612,20 @@
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#, fuzzy
 msgid "Afraid"
 msgstr "Arab"
 
-#, fuzzy
 msgid "Amazed"
-msgstr "Animar"
+msgstr ""
 
 msgid "Amorous"
 msgstr ""
 
 msgid "Angry"
-msgstr ""
-
-#, fuzzy
+msgstr "Encolerat"
+
 msgid "Annoyed"
-msgstr "Qual que siá"
+msgstr ""
 
 msgid "Anxious"
 msgstr ""
@@ -4664,73 +4639,59 @@
 msgid "Bored"
 msgstr ""
 
-#, fuzzy
 msgid "Brave"
-msgstr "Enregistrar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Calm"
-msgstr "Anullar"
+msgstr ""
 
 msgid "Cautious"
 msgstr ""
 
-#, fuzzy
 msgid "Cold"
-msgstr "Gras"
-
-#, fuzzy
+msgstr ""
+
 msgid "Confident"
-msgstr "Se connectar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Confused"
-msgstr "Contunhar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Contemplative"
-msgstr "Se connectar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Contented"
-msgstr "Connectat"
-
-#, fuzzy
+msgstr ""
+
 msgid "Cranky"
-msgstr "Entrepresa"
+msgstr ""
 
 msgid "Crazy"
 msgstr ""
 
-#, fuzzy
 msgid "Creative"
-msgstr "Crear"
+msgstr ""
 
 msgid "Curious"
 msgstr ""
 
-#, fuzzy
 msgid "Dejected"
-msgstr "executar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Depressed"
-msgstr "Suprimir"
-
-#, fuzzy
+msgstr ""
+
 msgid "Disappointed"
-msgstr "_Desactivar"
+msgstr ""
 
 msgid "Disgusted"
 msgstr ""
 
-#, fuzzy
 msgid "Dismayed"
-msgstr "_Desactivar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Distracted"
-msgstr "_Desactivar"
+msgstr ""
 
 msgid "Embarrassed"
 msgstr ""
@@ -4744,9 +4705,8 @@
 msgid "Flirtatious"
 msgstr ""
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Pichon nom"
+msgstr ""
 
 msgid "Grateful"
 msgstr ""
@@ -4754,13 +4714,11 @@
 msgid "Grieving"
 msgstr ""
 
-#, fuzzy
 msgid "Grumpy"
-msgstr "Grop"
-
-#, fuzzy
+msgstr ""
+
 msgid "Guilty"
-msgstr "Ciutat"
+msgstr ""
 
 msgid "Happy"
 msgstr ""
@@ -4768,9 +4726,8 @@
 msgid "Hopeful"
 msgstr ""
 
-#, fuzzy
 msgid "Hot"
-msgstr "_Òste :"
+msgstr "Caud"
 
 msgid "Humbled"
 msgstr ""
@@ -4778,9 +4735,8 @@
 msgid "Humiliated"
 msgstr ""
 
-#, fuzzy
 msgid "Hungry"
-msgstr "Ongrés"
+msgstr ""
 
 msgid "Hurt"
 msgstr ""
@@ -4794,17 +4750,14 @@
 msgid "In love"
 msgstr ""
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesian"
-
-#, fuzzy
+msgstr ""
+
 msgid "Interested"
-msgstr "Interfaç"
-
-#, fuzzy
+msgstr "Interessat"
+
 msgid "Intoxicated"
-msgstr "Convidar"
+msgstr ""
 
 msgid "Invincible"
 msgstr ""
@@ -4812,62 +4765,50 @@
 msgid "Jealous"
 msgstr ""
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Pas cap"
-
-#, fuzzy
+msgstr "Sol"
+
 msgid "Lost"
-msgstr "_Òste :"
+msgstr "Ò_ste :"
 
 msgid "Lucky"
 msgstr ""
 
-#, fuzzy
 msgid "Mean"
-msgstr "Aleman"
-
-#, fuzzy
+msgstr ""
+
 msgid "Moody"
-msgstr "Modificar"
+msgstr ""
 
 msgid "Nervous"
 msgstr ""
 
-#, fuzzy
 msgid "Neutral"
-msgstr "Defaut"
-
-#, fuzzy
+msgstr "Neutre"
+
 msgid "Offended"
-msgstr "Desconnectat"
+msgstr ""
 
 msgid "Outraged"
 msgstr ""
 
-#, fuzzy
 msgid "Playful"
-msgstr "Legir"
-
-#, fuzzy
+msgstr ""
+
 msgid "Proud"
-msgstr "Grop"
-
-#, fuzzy
+msgstr ""
+
 msgid "Relaxed"
-msgstr "Renommar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Relieved"
-msgstr "Suprimir"
-
-#, fuzzy
+msgstr ""
+
 msgid "Remorseful"
-msgstr "Suprimir"
-
-#, fuzzy
+msgstr ""
+
 msgid "Restless"
-msgstr "Enregistrar"
+msgstr ""
 
 msgid "Sad"
 msgstr ""
@@ -4878,9 +4819,8 @@
 msgid "Satisfied"
 msgstr ""
 
-#, fuzzy
 msgid "Serious"
-msgstr "Sons"
+msgstr ""
 
 msgid "Shocked"
 msgstr ""
@@ -4888,9 +4828,8 @@
 msgid "Shy"
 msgstr ""
 
-#, fuzzy
 msgid "Sick"
-msgstr "Escais"
+msgstr "Malaut"
 
 #. Sleepy / Tired
 msgid "Sleepy"
@@ -4899,13 +4838,11 @@
 msgid "Spontaneous"
 msgstr ""
 
-#, fuzzy
 msgid "Stressed"
-msgstr "Velocitat :"
-
-#, fuzzy
+msgstr ""
+
 msgid "Strong"
-msgstr "Arrestar"
+msgstr ""
 
 msgid "Surprised"
 msgstr ""
@@ -4916,13 +4853,11 @@
 msgid "Thirsty"
 msgstr ""
 
-#, fuzzy
 msgid "Tired"
-msgstr "Firebird"
-
-#, fuzzy
+msgstr "Las"
+
 msgid "Undefined"
-msgstr "Soslinhat"
+msgstr ""
 
 msgid "Weak"
 msgstr ""
@@ -4984,9 +4919,8 @@
 msgid "Already logged in"
 msgstr ""
 
-#, fuzzy
 msgid "Invalid username"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid "Invalid friendly name"
 msgstr ""
@@ -5190,9 +5124,8 @@
 msgid "Nudging %s..."
 msgstr ""
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "Adreça electronica"
+msgstr "Adreça electronica..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr ""
@@ -5201,23 +5134,20 @@
 msgid "Set friendly name for %s."
 msgstr ""
 
-#, fuzzy
 msgid "Set Friendly Name"
-msgstr "Nom d'ostal"
+msgstr ""
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#, fuzzy
 msgid "This Location"
-msgstr "Emplaçament"
+msgstr ""
 
 msgid "This is the name that identifies this location"
 msgstr ""
 
-#, fuzzy
 msgid "Other Locations"
-msgstr "Emplaçament"
+msgstr "Autres emplaçaments"
 
 msgid "You can sign out from other locations here"
 msgstr ""
@@ -5286,9 +5216,8 @@
 msgid "Playing a game"
 msgstr ""
 
-#, fuzzy
 msgid "Working"
-msgstr "Professional"
+msgstr ""
 
 msgid "Has you"
 msgstr ""
@@ -5314,9 +5243,8 @@
 msgid "Out to Lunch"
 msgstr ""
 
-#, fuzzy
 msgid "Game Title"
-msgstr "Títol"
+msgstr ""
 
 msgid "Office Title"
 msgstr ""
@@ -5324,9 +5252,8 @@
 msgid "Set Friendly Name..."
 msgstr ""
 
-#, fuzzy
 msgid "View Locations..."
-msgstr "Emplaçament"
+msgstr ""
 
 msgid "Set Home Phone Number..."
 msgstr ""
@@ -5364,9 +5291,8 @@
 "be valid email addresses."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to Add"
-msgstr "Activat"
+msgstr ""
 
 msgid "Authorization Request Message:"
 msgstr ""
@@ -5435,7 +5361,7 @@
 msgstr ""
 
 msgid "Personal"
-msgstr "Terminal"
+msgstr "Personal"
 
 msgid "Significant Other"
 msgstr ""
@@ -5466,7 +5392,7 @@
 
 #. Business
 msgid "Work"
-msgstr "Professional"
+msgstr ""
 
 msgid "Company"
 msgstr "Entrepresa"
@@ -5569,9 +5495,9 @@
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Error desconeguda"
+msgstr ""
 
 msgid "Unable to add user"
 msgstr ""
@@ -5581,9 +5507,8 @@
 msgid "Unknown error (%d)"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Activat"
+msgstr ""
 
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
@@ -5735,9 +5660,8 @@
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
 msgstr ""
 
-#, fuzzy
 msgid "The two PINs you entered do not match."
-msgstr "Los mots de pas son pas los meteisses."
+msgstr ""
 
 msgid "The Display Name you entered is invalid."
 msgstr ""
@@ -5771,16 +5695,14 @@
 
 #. display name
 #. nick name (required)
-#, fuzzy
 msgid "Display Name"
-msgstr "Nom d'ostal"
+msgstr ""
 
 #. hidden
 msgid "Hide my number"
 msgstr ""
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Telefòn mobil"
 
@@ -5796,9 +5718,8 @@
 msgid "There is no splash-screen currently available"
 msgstr ""
 
-#, fuzzy
 msgid "About"
-msgstr "A prepaus de %s"
+msgstr "A prepaus"
 
 #. display / change profile
 msgid "Change Profile..."
@@ -5809,9 +5730,8 @@
 msgstr ""
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "A prepaus de %s"
+msgstr "A prepaus..."
 
 #. the file is too big
 msgid "The file you are trying to send is too large!"
@@ -5828,9 +5748,8 @@
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Connexion"
+msgstr "Connexion..."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
@@ -5881,59 +5800,23 @@
 msgstr ""
 
 #. ask for input (required)
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Picatz lo mot de pas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Your Country"
-msgstr "País"
+msgstr "Vòstre païs"
 
 msgid "Your Language"
 msgstr ""
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Autorizar"
+msgstr ""
 
 msgid "MXit account validation"
 msgstr ""
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Entresenhas sul servidor"
-
-msgid "Loading menu..."
-msgstr ""
-
-#, fuzzy
-msgid "Status Message"
-msgstr "Messatges enviats"
-
-#, fuzzy
-msgid "Rejection Message"
-msgstr "Enviar un messatge"
-
-#. hidden number
-#, fuzzy
-msgid "Hidden Number"
-msgstr "L'expression es pas valida"
-
-msgid "Your MXit ID..."
-msgstr ""
-
-#. Configuration options
-#. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
-msgid "WAP Server"
-msgstr "Servidor"
-
-#, fuzzy
-msgid "Connect via HTTP"
-msgstr "Se connectar"
-
-msgid "Enable splash-screen popup"
 msgstr ""
 
 #. you were kicked
@@ -5943,7 +5826,6 @@
 msgid "was kicked"
 msgstr ""
 
-#, fuzzy
 msgid "_Room Name:"
 msgstr "_Sala :"
 
@@ -5951,18 +5833,43 @@
 msgid "You have invited"
 msgstr ""
 
-#, fuzzy
+msgid "Loading menu..."
+msgstr ""
+
+msgid "Status Message"
+msgstr ""
+
+msgid "Rejection Message"
+msgstr ""
+
+#. hidden number
+msgid "Hidden Number"
+msgstr ""
+
+msgid "Your MXit ID..."
+msgstr ""
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "Servidor WAP"
+
+msgid "Connect via HTTP"
+msgstr ""
+
+msgid "Enable splash-screen popup"
+msgstr ""
+
 msgid "Last Online"
-msgstr "En linha"
+msgstr ""
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr ""
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Messatge de %s"
+msgstr ""
 
 msgid "Unable to process your request at this time"
 msgstr ""
@@ -5970,18 +5877,16 @@
 msgid "Timeout while waiting for a response from the MXit server."
 msgstr ""
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 #, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
 
-#, fuzzy
 msgid "Message Error"
-msgstr "Messatge de %s"
+msgstr ""
 
 msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
@@ -5997,38 +5902,30 @@
 msgid "Logout error: %s (%i)"
 msgstr ""
 
-#, fuzzy
 msgid "Contact Error"
-msgstr "Error de connexion"
+msgstr ""
 
 msgid "Message Sending Error"
 msgstr ""
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Estatut"
-
-#, fuzzy
+msgstr ""
+
 msgid "Mood Error"
-msgstr "Error"
-
-#, fuzzy
+msgstr ""
+
 msgid "Invitation Error"
-msgstr "Error de connexion"
-
-#, fuzzy
+msgstr ""
+
 msgid "Contact Removal Error"
-msgstr "Error de connexion"
-
-#, fuzzy
+msgstr ""
+
 msgid "Subscription Error"
-msgstr "Error de connexion"
-
-#, fuzzy
+msgstr ""
+
 msgid "Contact Update Error"
-msgstr "Error de connexion"
-
-#, fuzzy
+msgstr ""
+
 msgid "File Transfer Error"
 msgstr "Transferiment de fichièr"
 
@@ -6038,9 +5935,8 @@
 msgid "MultiMx Invitation Error"
 msgstr ""
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Perfil"
+msgstr "Error de perfil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
@@ -6072,28 +5968,23 @@
 msgid "In Love"
 msgstr ""
 
-#, fuzzy
 msgid "Pending"
-msgstr "Segondas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Invited"
-msgstr "Convidar"
-
-#, fuzzy
+msgstr "Convidat"
+
 msgid "Rejected"
-msgstr "executar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Deleted"
-msgstr "Suprimir"
+msgstr "Suprimit"
 
 msgid "MXit Advertising"
 msgstr ""
 
-#, fuzzy
 msgid "More Information"
-msgstr "Entresenhas"
+msgstr ""
 
 #, c-format
 msgid "No such user: %s"
@@ -6120,9 +6011,8 @@
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr "Connectat"
+msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -6143,7 +6033,7 @@
 msgstr ""
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
 msgid "IM Friends"
 msgstr ""
@@ -6254,7 +6144,7 @@
 msgstr ""
 
 msgid "Song"
-msgstr ""
+msgstr "Cançon"
 
 msgid "Total Friends"
 msgstr ""
@@ -6519,9 +6409,9 @@
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Activat"
+msgstr ""
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6769,43 +6659,39 @@
 msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
+msgstr ""
 
 msgid "Offline message store full"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
+msgstr ""
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Impossible de dobrir le fichièr '%s' : %s"
+msgstr ""
 
 msgid "Thinking"
 msgstr ""
 
-#, fuzzy
 msgid "Shopping"
-msgstr "S'arrèsta de picar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Questioning"
-msgstr "Estonian"
-
-#, fuzzy
+msgstr ""
+
 msgid "Eating"
-msgstr "Alèrta"
+msgstr "A manjar"
 
 msgid "Watching a movie"
 msgstr ""
@@ -6825,9 +6711,8 @@
 msgid "Having fun"
 msgstr ""
 
-#, fuzzy
 msgid "Sleeping"
-msgstr "Segondas"
+msgstr "A dormir"
 
 msgid "Using a PDA"
 msgstr ""
@@ -6855,39 +6740,33 @@
 msgstr ""
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Alèrta"
+msgstr ""
 
 msgid "Browsing the web"
 msgstr ""
 
-#, fuzzy
 msgid "Smoking"
-msgstr "Professional"
-
-#, fuzzy
+msgstr ""
+
 msgid "Writing"
-msgstr "Professional"
+msgstr ""
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Professional"
+msgstr ""
 
 msgid "Listening to music"
 msgstr ""
 
-#, fuzzy
 msgid "Studying"
-msgstr "Segondas"
+msgstr "A estudiar"
 
 msgid "In the restroom"
 msgstr ""
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Connectat"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -6965,21 +6844,17 @@
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Corrièl"
-
-#, fuzzy
+msgstr ""
+
 msgid "Depression"
-msgstr "Mèstier"
-
-#, fuzzy
+msgstr ""
+
 msgid "At home"
-msgstr "A prepaus de %s"
-
-#, fuzzy
+msgstr "A l'ostal"
+
 msgid "At work"
-msgstr "Ret"
+msgstr "Al trabalh"
 
 msgid "At lunch"
 msgstr ""
@@ -7307,7 +7182,7 @@
 msgstr ""
 
 msgid "(no name)"
-msgstr ""
+msgstr "(pas de nom)"
 
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
@@ -7350,9 +7225,8 @@
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr ""
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7383,9 +7257,8 @@
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Messatges enviats"
+msgstr ""
 
 msgid "End Direct IM Session"
 msgstr ""
@@ -7451,17 +7324,15 @@
 msgid "Set Privacy Options..."
 msgstr ""
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Tièra de contactes"
-
-#, fuzzy
+msgstr ""
+
 msgid "Show Invisible List"
-msgstr "Invisible"
+msgstr ""
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr ""
+msgstr "Confirmar lo compte"
 
 msgid "Display Currently Registered Email Address"
 msgstr ""
@@ -7511,6 +7382,124 @@
 "considered a privacy risk."
 msgstr ""
 
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+msgid "Voice"
+msgstr "Votz"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+msgid "Games"
+msgstr "Jòcs"
+
+msgid "ICQ Xtraz"
+msgstr ""
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr ""
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr ""
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr "Aparelh de fotografiar"
+
+msgid "Screen Sharing"
+msgstr "Nom d'utilisateur"
+
+msgid "IP Address"
+msgstr "Adreça IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Telefòn mobil"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. use_html_status
+msgid "Additional Information"
+msgstr "Entresenhas suplementàrias"
+
+msgid "Zip Code"
+msgstr "Còdi postal"
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr "Division"
+
+msgid "Position"
+msgstr "Posicion"
+
+msgid "Web Page"
+msgstr "Pagina web"
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
 msgid "Invalid SNAC"
 msgstr ""
 
@@ -7580,125 +7569,6 @@
 msgid "Not while on AOL"
 msgstr ""
 
-#. Label
-msgid "Buddy Icon"
-msgstr ""
-
-msgid "Voice"
-msgstr "Votz"
-
-msgid "AIM Direct IM"
-msgstr ""
-
-msgid "Get File"
-msgstr ""
-
-msgid "Games"
-msgstr "Jòcs"
-
-msgid "ICQ Xtraz"
-msgstr ""
-
-msgid "Add-Ins"
-msgstr ""
-
-msgid "Send Buddy List"
-msgstr ""
-
-msgid "ICQ Direct Connect"
-msgstr ""
-
-msgid "AP User"
-msgstr ""
-
-msgid "ICQ RTF"
-msgstr ""
-
-msgid "Nihilist"
-msgstr ""
-
-msgid "ICQ Server Relay"
-msgstr ""
-
-msgid "Old ICQ UTF8"
-msgstr ""
-
-msgid "Trillian Encryption"
-msgstr ""
-
-msgid "ICQ UTF8"
-msgstr ""
-
-msgid "Hiptop"
-msgstr ""
-
-msgid "Security Enabled"
-msgstr ""
-
-msgid "Video Chat"
-msgstr ""
-
-msgid "iChat AV"
-msgstr ""
-
-msgid "Live Video"
-msgstr ""
-
-msgid "Camera"
-msgstr "Aparelh de fotografiar"
-
-#, fuzzy
-msgid "Screen Sharing"
-msgstr "Nom d'utilisateur"
-
-msgid "IP Address"
-msgstr "Adreça IP"
-
-msgid "Warning Level"
-msgstr ""
-
-msgid "Buddy Comment"
-msgstr ""
-
-#, c-format
-msgid "User information not available: %s"
-msgstr ""
-
-msgid "Mobile Phone"
-msgstr "Telefòn mobil"
-
-msgid "Personal Web Page"
-msgstr ""
-
-#. aim_userinfo_t
-#. use_html_status
-msgid "Additional Information"
-msgstr "Entresenhas suplementàrias"
-
-msgid "Zip Code"
-msgstr "Còdi postal"
-
-msgid "Work Information"
-msgstr ""
-
-msgid "Division"
-msgstr "Division"
-
-msgid "Position"
-msgstr "Posicion"
-
-msgid "Web Page"
-msgstr "Pagina web"
-
-msgid "Online Since"
-msgstr ""
-
-msgid "Member Since"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -7733,16 +7603,14 @@
 "\""
 msgstr ""
 
-#, fuzzy
 msgid "Visible List"
-msgstr "Invisible"
+msgstr "Tièra visibla"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
 msgstr ""
 
-#, fuzzy
 msgid "Invisible List"
-msgstr "Invisible"
+msgstr "Tièra invisibla"
 
 msgid "These buddies will always see you as offline"
 msgstr ""
@@ -7796,7 +7664,7 @@
 msgstr ""
 
 msgid "Dragon"
-msgstr ""
+msgstr "Dragon"
 
 msgid "Snake"
 msgstr ""
@@ -7805,36 +7673,34 @@
 msgstr ""
 
 msgid "Goat"
-msgstr ""
+msgstr "Cabra"
 
 msgid "Monkey"
-msgstr ""
+msgstr "Monin"
 
 msgid "Rooster"
 msgstr ""
 
 msgid "Dog"
-msgstr ""
+msgstr "Can"
 
 msgid "Pig"
-msgstr ""
+msgstr "Tesson"
 
 msgid "Other"
 msgstr "Autre"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisible"
+msgstr "Visible"
 
 msgid "Friend Only"
 msgstr ""
 
-#, fuzzy
 msgid "Private"
-msgstr "Crear"
+msgstr "Privat"
 
 msgid "QQ Number"
-msgstr ""
+msgstr "Numèro QQ"
 
 msgid "Country/Region"
 msgstr ""
@@ -7848,9 +7714,8 @@
 msgid "Phone Number"
 msgstr ""
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Autorizar"
+msgstr ""
 
 msgid "Cellphone Number"
 msgstr ""
@@ -7858,7 +7723,6 @@
 msgid "Personal Introduction"
 msgstr ""
 
-#, fuzzy
 msgid "City/Area"
 msgstr "Ciutat"
 
@@ -7874,67 +7738,54 @@
 msgid "Horoscope"
 msgstr ""
 
-#, fuzzy
 msgid "Zodiac"
 msgstr "Signe del zodiac"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Gras"
+msgstr ""
 
 msgid "True"
-msgstr ""
-
-#, fuzzy
+msgstr "Verai"
+
 msgid "False"
-msgstr "Error"
-
-#, fuzzy
+msgstr "Fals"
+
 msgid "Modify Contact"
-msgstr "Entresenhas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Modify Address"
-msgstr "Adreça personala"
-
-#, fuzzy
+msgstr "Modificar l'adreça"
+
 msgid "Modify Extended Information"
-msgstr "Entresenhas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Modify Information"
-msgstr "Entresenhas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Update"
-msgstr "Data"
-
-#, fuzzy
+msgstr ""
+
 msgid "Could not change buddy information."
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 msgid "Note"
 msgstr "Nòta"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Tièra de contactes"
+msgstr ""
 
 msgid "Change his/her memo as you like"
 msgstr ""
 
-#, fuzzy
 msgid "_Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr "_Modificar"
+
 msgid "Memo Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Server says:"
-msgstr "_Servidor :"
+msgstr ""
 
 msgid "Your request was accepted."
 msgstr ""
@@ -7946,20 +7797,17 @@
 msgid "%u requires verification: %s"
 msgstr ""
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Autorizar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Enter answer here"
-msgstr "Picatz lo mot de pas"
+msgstr ""
 
 msgid "Send"
-msgstr "Segondas"
-
-#, fuzzy
+msgstr "Mandar"
+
 msgid "Invalid answer."
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid "Authorization denied message:"
 msgstr ""
@@ -7971,9 +7819,8 @@
 msgid "%u needs authorization"
 msgstr ""
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Autorizar"
+msgstr ""
 
 msgid "Enter request here"
 msgstr ""
@@ -7981,17 +7828,14 @@
 msgid "Would you be my friend?"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Apondre lo contacte"
-
-#, fuzzy
+msgstr ""
+
 msgid "Add buddy"
-msgstr "Apondre lo contacte"
-
-#, fuzzy
+msgstr "Apondre un contacte"
+
 msgid "Invalid QQ Number"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid "Failed sending authorize"
 msgstr ""
@@ -8021,7 +7865,7 @@
 
 #, c-format
 msgid "Message: %s"
-msgstr ""
+msgstr "Messatge : %s"
 
 msgid "ID: "
 msgstr ""
@@ -8030,7 +7874,7 @@
 msgstr ""
 
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
 msgid "Please enter Qun number"
 msgstr ""
@@ -8054,28 +7898,23 @@
 msgstr ""
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "Títol"
-
-#, fuzzy
+msgstr ""
+
 msgid "Notice"
-msgstr "Nòta"
-
-#, fuzzy
+msgstr ""
+
 msgid "Detail"
-msgstr "Defaut"
+msgstr ""
 
 msgid "Creator"
 msgstr "Creator"
 
-#, fuzzy
 msgid "About me"
-msgstr "A prepaus de %s"
-
-#, fuzzy
+msgstr "A prepaus de ieu"
+
 msgid "Category"
-msgstr "Creator"
+msgstr "Categoria"
 
 msgid "The Qun does not allow others to join"
 msgstr ""
@@ -8086,9 +7925,9 @@
 msgid "Input request here"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 msgid "Successfully joined Qun"
 msgstr ""
@@ -8100,16 +7939,14 @@
 msgid "QQ Qun Operation"
 msgstr ""
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Error"
+msgstr ""
 
 msgid "Join Qun, Unknown Reply"
 msgstr ""
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "Quitar"
+msgstr ""
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -8119,13 +7956,11 @@
 msgid "Sorry, you are not our style"
 msgstr ""
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "Entresenhas sus l'utilizaire"
-
-#, fuzzy
+msgstr ""
+
 msgid "Successfully changed Qun information"
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 msgid "You have successfully created a Qun"
 msgstr ""
@@ -8152,13 +7987,13 @@
 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 "Suprimir un contacte"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Suprimir un contacte"
+msgstr ""
 
 #, c-format
 msgid "Unknown-%d"
@@ -8168,7 +8003,7 @@
 msgstr "Nivèl"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
 msgstr ""
@@ -8180,9 +8015,8 @@
 msgstr ""
 
 msgid " Video"
-msgstr ""
-
-#, fuzzy
+msgstr " Vidèo"
+
 msgid " Zone"
 msgstr "Pas cap"
 
@@ -8193,11 +8027,10 @@
 msgstr ""
 
 msgid "Invalid name"
-msgstr "L'expression es pas valida"
-
-#, fuzzy
+msgstr ""
+
 msgid "Select icon..."
-msgstr "Seleccionar una poliça"
+msgstr ""
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8253,7 +8086,7 @@
 
 #, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr ""
+msgstr "<b>IP</b> : %s<br>\n"
 
 msgid "Login Information"
 msgstr ""
@@ -8282,31 +8115,27 @@
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "A prepaus de %s"
-
-#, fuzzy
+msgstr "A prepaus d'OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Modificar lo mot de pas"
+msgstr ""
 
 msgid "Change Password"
 msgstr "Modificar lo mot de pas"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Entresenhas"
+msgstr "Entresenhas sul compte"
 
 msgid "Update all QQ Quns"
 msgstr ""
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "A prepaus de %s"
-
-#, fuzzy
+msgstr "A prepaus d'OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Adreça personala"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -8318,34 +8147,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "Protocòl"
-
-#, fuzzy
+msgstr ""
+
 msgid "Auto"
-msgstr "Autor"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Seleccionar un utilizaire"
-
-msgid "QQ2005"
-msgstr ""
-
-msgid "QQ2007"
 msgstr ""
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
+msgid "QQ2007"
+msgstr "QQ2007"
+
+msgid "QQ2005"
+msgstr "QQ2005"
+
 msgid "Connect by TCP"
-msgstr "Se connectar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Show server notice"
-msgstr "Entresenhas sul servidor"
+msgstr ""
 
 msgid "Show server news"
 msgstr ""
@@ -8356,9 +8180,8 @@
 msgid "Keep alive interval (seconds)"
 msgstr ""
 
-#, fuzzy
 msgid "Update interval (seconds)"
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 msgid "Unable to decrypt server reply"
 msgstr ""
@@ -8367,9 +8190,9 @@
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -8378,9 +8201,8 @@
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "L'autentificacion a abocat"
+msgstr "L'activacion a abocat"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8395,13 +8217,11 @@
 msgid "Failed captcha verification"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha Image"
-msgstr "Enregistrar l'imatge"
-
-#, fuzzy
+msgstr ""
+
 msgid "Enter code"
-msgstr "Picatz lo mot de pas"
+msgstr ""
 
 msgid "QQ Captcha Verification"
 msgstr ""
@@ -8422,9 +8242,8 @@
 msgid "Socket error"
 msgstr ""
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Connectat"
+msgstr ""
 
 msgid "Requesting token"
 msgstr ""
@@ -8432,33 +8251,30 @@
 msgid "Unable to resolve hostname"
 msgstr ""
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "L'expression es pas valida"
-
-#, fuzzy
+msgstr ""
+
 msgid "Connecting to server"
-msgstr "Connectat"
-
-#, fuzzy
+msgstr "Connexion al servidor"
+
 msgid "QQ Error"
-msgstr "Error"
-
-#, fuzzy, c-format
+msgstr "Error QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Servidor"
-
-#, 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"
+msgstr "De %s :"
 
 #, c-format
 msgid ""
@@ -8466,9 +8282,8 @@
 "%s"
 msgstr ""
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "Rason desconeguda"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -8476,20 +8291,17 @@
 "Room %u, reply 0x%02X"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "Comanda"
+msgstr ""
 
 msgid "Unable to decrypt login reply"
 msgstr ""
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Rason desconeguda"
-
-#, fuzzy
+msgstr ""
+
 msgid "Unknown CLIENT CMD"
-msgstr "Rason desconeguda"
+msgstr ""
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8674,7 +8486,7 @@
 msgstr ""
 
 msgid "Select User"
-msgstr "Seleccionar un utilizaire"
+msgstr "Causir l'utilizaire"
 
 msgid "Unable to add user: user not found"
 msgstr ""
@@ -9209,7 +9021,7 @@
 msgstr ""
 
 msgid "Personal Information"
-msgstr "Entresenhas personalas"
+msgstr ""
 
 msgid "Birth Day"
 msgstr ""
@@ -9308,7 +9120,7 @@
 msgstr ""
 
 msgid "Ping"
-msgstr "Ajuston"
+msgstr "Ping"
 
 msgid "Ping failed"
 msgstr ""
@@ -9367,9 +9179,8 @@
 msgid "Disconnected by server"
 msgstr ""
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Connectat"
+msgstr ""
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -9417,7 +9228,7 @@
 msgstr "SMS"
 
 msgid "MMS"
-msgstr ""
+msgstr "MMS"
 
 msgid "Video conferencing"
 msgstr ""
@@ -9642,7 +9453,7 @@
 msgstr ""
 
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
@@ -9693,7 +9504,7 @@
 
 #, c-format
 msgid "Country: \t%s\n"
-msgstr ""
+msgstr "Païs : \t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
@@ -9705,7 +9516,7 @@
 
 #, c-format
 msgid "Version: \t%s\n"
-msgstr ""
+msgstr "Version : \t%s\n"
 
 #, c-format
 msgid ""
@@ -9810,9 +9621,8 @@
 msgid "Unable to create connection"
 msgstr ""
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Rason desconeguda"
+msgstr ""
 
 msgid "Unable to create listen socket"
 msgstr ""
@@ -9820,9 +9630,8 @@
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Entresenhas sul servidor"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -9879,9 +9688,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Protocòl"
+msgstr ""
 
 msgid "Pager port"
 msgstr ""
@@ -9917,9 +9725,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Protocòl"
+msgstr ""
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -9971,9 +9778,8 @@
 msgstr ""
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Picatz lo mot de pas"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -9994,9 +9800,8 @@
 msgid "Ignore buddy?"
 msgstr ""
 
-#, fuzzy
 msgid "Invalid username or password"
-msgstr "L'expression es pas valida"
+msgstr ""
 
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
@@ -10030,9 +9835,9 @@
 msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "Connectat"
+msgstr ""
 
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
@@ -10238,9 +10043,8 @@
 msgid "User Rooms"
 msgstr ""
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Connectat"
+msgstr ""
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10259,7 +10063,7 @@
 msgstr ""
 
 msgid "Anyone"
-msgstr "Qual que siá"
+msgstr ""
 
 msgid "_Class:"
 msgstr ""
@@ -10389,7 +10193,7 @@
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
 msgid "_Yes"
-msgstr "_Òc"
+msgstr "Ò_c"
 
 msgid "_No"
 msgstr "_Non"
@@ -10431,17 +10235,15 @@
 msgstr ""
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ordenar"
+msgstr "Acorchi"
 
 msgid "The text-shortcut for the smiley"
 msgstr ""
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Enregistrar l'imatge"
+msgstr ""
 
 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -10506,7 +10308,7 @@
 #.
 #, c-format
 msgid "%x %X"
-msgstr ""
+msgstr "%x %X"
 
 msgid "Calculating..."
 msgstr "A calcular..."
@@ -10518,37 +10320,37 @@
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segonda"
-msgstr[1] "%d secondes"
+msgstr[1] "%d segondas"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jorn"
-msgstr[1] "%d jours"
+msgstr[1] "%d jorns"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d ora"
+msgstr[1] "%s, %d oras"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
-msgstr[1] "%d heures"
+msgstr[1] "%d oras"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d minuta"
+msgstr[1] "%s, %d minutas"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuta"
-msgstr[1] "%d minutes"
+msgstr[1] "%d minutas"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10582,11 +10384,11 @@
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
 #, c-format
 msgid " (%s)"
-msgstr ""
+msgstr " (%s)"
 
 #. 10053
 msgid "Connection interrupted by other software on your computer."
@@ -10598,11 +10400,11 @@
 
 #. 10060
 msgid "Connection timed out."
-msgstr "Connectat"
+msgstr ""
 
 #. 10061
 msgid "Connection refused."
-msgstr "Connectat"
+msgstr ""
 
 #. 10048
 msgid "Address already in use."
@@ -10636,7 +10438,7 @@
 msgstr ""
 
 msgid "_Username:"
-msgstr "_Nom d'utilizaire :"
+msgstr "Nom d'_utilizaire :"
 
 msgid "Remember pass_word"
 msgstr ""
@@ -10655,9 +10457,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr ""
 
-#, fuzzy
 msgid "Ad_vanced"
-msgstr "_Avançat"
+msgstr "A_vançat"
 
 msgid "Use GNOME Proxy Settings"
 msgstr ""
@@ -10672,10 +10473,10 @@
 msgstr "HTTP"
 
 msgid "SOCKS 4"
-msgstr ""
+msgstr "SOCKS 4"
 
 msgid "SOCKS 5"
-msgstr ""
+msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
 msgstr ""
@@ -10696,7 +10497,7 @@
 msgstr ""
 
 msgid "_Host:"
-msgstr "_Òste :"
+msgstr "Ò_ste :"
 
 msgid "_Port:"
 msgstr "_Pòrt :"
@@ -10719,9 +10520,8 @@
 msgid "Create _this new account on the server"
 msgstr ""
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "Proxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Activat"
@@ -10753,9 +10553,8 @@
 msgid "The background color for the buddy list"
 msgstr ""
 
-#, fuzzy
 msgid "Layout"
-msgstr "Laossian"
+msgstr ""
 
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr ""
@@ -10763,9 +10562,8 @@
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Color de fons"
+msgstr ""
 
 msgid "The background color of an expanded group"
 msgstr ""
@@ -10780,9 +10578,8 @@
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Color de fons"
+msgstr "Col"
 
 msgid "The background color of a collapsed group"
 msgstr ""
@@ -10798,63 +10595,56 @@
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Color de fons"
+msgstr ""
 
 msgid "The background color of a contact or chat"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
-#, fuzzy
 msgid "Contact Text"
-msgstr "Ordenar"
+msgstr ""
 
 msgid "The text information for when a contact is expanded"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "En linha"
+msgstr ""
 
 msgid "The text information for when a buddy is online"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
-#, fuzzy
 msgid "Away Text"
-msgstr "Absent(a)"
+msgstr "Tèxte dels contactes absents"
 
 msgid "The text information for when a buddy is away"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Desconnectat"
+msgstr ""
 
 msgid "The text information for when a buddy is offline"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
-#, fuzzy
 msgid "Idle Text"
-msgstr "Inactiu"
+msgstr ""
 
 msgid "The text information for when a buddy is idle"
 msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
-#, fuzzy
 msgid "Message Text"
-msgstr "Messatge"
+msgstr ""
 
 msgid "The text information for when a buddy has an unread message"
 msgstr ""
@@ -10888,9 +10678,8 @@
 msgid "Please update the necessary fields."
 msgstr ""
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "_Compte :"
+msgstr "_Compte"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10901,10 +10690,10 @@
 msgstr ""
 
 msgid "_Block"
-msgstr ""
+msgstr "_Blocar"
 
 msgid "Un_block"
-msgstr ""
+msgstr "Des_blocar"
 
 msgid "Move to"
 msgstr ""
@@ -10925,7 +10714,7 @@
 msgstr ""
 
 msgid "_Send File..."
-msgstr "_Enviar lo fichièr..."
+msgstr "_Mandar un fichièr..."
 
 msgid "Add Buddy _Pounce..."
 msgstr ""
@@ -10940,7 +10729,7 @@
 msgstr ""
 
 msgid "_Alias..."
-msgstr ""
+msgstr "_Aliàs..."
 
 msgid "_Remove"
 msgstr "_Suprimir"
@@ -10998,9 +10787,8 @@
 msgid "Please select your mood from the list"
 msgstr ""
 
-#, fuzzy
 msgid "Message (optional)"
-msgstr "Messatge"
+msgstr ""
 
 msgid "Edit User Mood"
 msgstr ""
@@ -11009,7 +10797,7 @@
 #. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
 #. Buddies menu
 msgid "/_Buddies"
-msgstr ""
+msgstr "/_Contactes"
 
 msgid "/Buddies/New Instant _Message..."
 msgstr ""
@@ -11058,15 +10846,14 @@
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/_Comptse"
-
-#, fuzzy
+msgstr "/_Comptes"
+
 msgid "/Accounts/Manage Accounts"
-msgstr "/Comptes/Gerir"
+msgstr "/Comptes/Gerir los comptes"
 
 #. Tools
 msgid "/_Tools"
-msgstr ""
+msgstr "/_Espleches"
 
 msgid "/Tools/Buddy _Pounces"
 msgstr ""
@@ -11108,20 +10895,17 @@
 msgid "/Help/Online _Help"
 msgstr ""
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Entresenhas"
+msgstr ""
 
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Entresenhas sul servidor"
-
-#, fuzzy
+msgstr ""
+
 msgid "/Help/_Translator Information"
-msgstr "Entresenhas personalas"
+msgstr ""
 
 msgid "/Help/_About"
 msgstr "/Ajuda/_A prepaus"
@@ -11251,7 +11035,7 @@
 msgstr "<b>Mot de pas :</b>"
 
 msgid "_Login"
-msgstr "Se _connectar"
+msgstr "_Connexion"
 
 msgid "/Accounts"
 msgstr "/Comptes"
@@ -11285,11 +11069,10 @@
 msgstr ""
 
 msgid "Add a buddy.\n"
-msgstr ""
-
-#, fuzzy
+msgstr "Apondre un contacte.\n"
+
 msgid "Buddy's _username:"
-msgstr "_Nom d'utilizaire :"
+msgstr ""
 
 msgid "(Optional) A_lias:"
 msgstr ""
@@ -11311,7 +11094,7 @@
 msgstr ""
 
 msgid "A_lias:"
-msgstr ""
+msgstr "A_liàs :"
 
 msgid "_Group:"
 msgstr "_Grop :"
@@ -11337,9 +11120,8 @@
 msgid "_Edit Account"
 msgstr ""
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Modificar lo mot de pas"
+msgstr ""
 
 msgid "No actions available"
 msgstr ""
@@ -11348,7 +11130,7 @@
 msgstr "_Desactivar"
 
 msgid "/Tools"
-msgstr ""
+msgstr "/Espleches"
 
 msgid "/Buddies/Sort Buddies"
 msgstr ""
@@ -11395,9 +11177,8 @@
 msgid "Get Away Message"
 msgstr ""
 
-#, fuzzy
 msgid "Last Said"
-msgstr "Nom"
+msgstr ""
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -11425,7 +11206,7 @@
 
 #. Conversation menu
 msgid "/_Conversation"
-msgstr ""
+msgstr "/_Charradissa"
 
 msgid "/Conversation/New Instant _Message..."
 msgstr ""
@@ -11460,9 +11241,8 @@
 msgid "/Conversation/Se_nd File..."
 msgstr ""
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "Connectat"
+msgstr ""
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
@@ -11502,7 +11282,7 @@
 
 #. Options
 msgid "/_Options"
-msgstr ""
+msgstr "/_Opcions"
 
 msgid "/Options/Enable _Logging"
 msgstr ""
@@ -11520,7 +11300,7 @@
 msgstr ""
 
 msgid "/Options"
-msgstr ""
+msgstr "/Opcions"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -11528,7 +11308,7 @@
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
 msgid "/Conversation"
-msgstr ""
+msgstr "/Charradissa"
 
 msgid "/Conversation/View Log"
 msgstr ""
@@ -11545,9 +11325,8 @@
 msgid "/Conversation/Send File..."
 msgstr ""
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "Connectat"
+msgstr ""
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
@@ -11605,19 +11384,17 @@
 msgstr ""
 
 msgid "_Send"
-msgstr "_Enviar"
+msgstr "_Mandar"
 
 #. Setup the label telling how many people are in the room.
 msgid "0 people in room"
 msgstr "0 persona dins la sala"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Tampar l'onglet"
-
-#, fuzzy
+msgstr ""
+
 msgid "Find:"
-msgstr "Recercar"
+msgstr "Recercar :"
 
 #, c-format
 msgid "%d person in room"
@@ -11650,7 +11427,7 @@
 msgstr ""
 
 msgid "Close all tabs"
-msgstr ""
+msgstr "Tampar totes los onglets"
 
 msgid "Detach this tab"
 msgstr ""
@@ -11659,7 +11436,7 @@
 msgstr "Tampar l'onglet"
 
 msgid "Close conversation"
-msgstr ""
+msgstr "Tampar la charradissa"
 
 msgid "Last created window"
 msgstr ""
@@ -11671,10 +11448,10 @@
 msgstr ""
 
 msgid "By group"
-msgstr ""
+msgstr "Per grop"
 
 msgid "By account"
-msgstr ""
+msgstr "Per compte"
 
 msgid "Find"
 msgstr "Recercar"
@@ -11707,13 +11484,13 @@
 msgstr ""
 
 msgid "Level "
-msgstr ""
+msgstr "Nivèl "
 
 msgid "Select the debug filter level."
 msgstr ""
 
 msgid "All"
-msgstr "Totes"
+msgstr "Tot"
 
 msgid "Misc"
 msgstr ""
@@ -11722,17 +11499,13 @@
 msgstr "Alèrta"
 
 msgid "Error "
-msgstr ""
+msgstr "Error "
 
 msgid "Fatal Error"
 msgstr ""
 
-msgid "bug master"
-msgstr ""
-
-#, fuzzy
 msgid "artist"
-msgstr "Artista"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
@@ -11764,7 +11537,7 @@
 msgstr ""
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr ""
@@ -11781,9 +11554,8 @@
 msgid "Arabic"
 msgstr "Arab"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Jòcs"
+msgstr ""
 
 msgid "Belarusian Latin"
 msgstr "Bielorus latin"
@@ -11794,9 +11566,8 @@
 msgid "Bengali"
 msgstr "Bengalí"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "Bengalí"
+msgstr "Bengalí indian"
 
 msgid "Bosnian"
 msgstr "Bosniac"
@@ -11852,9 +11623,8 @@
 msgid "French"
 msgstr "Francés"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Curd"
+msgstr "Irlandés"
 
 msgid "Galician"
 msgstr "Galician"
@@ -11874,9 +11644,8 @@
 msgid "Hungarian"
 msgstr "Ongrés"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Romanian"
+msgstr ""
 
 msgid "Indonesian"
 msgstr "Indonesian"
@@ -11893,9 +11662,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr ""
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Autre"
+msgstr ""
 
 msgid "Kannada"
 msgstr "Kannadà"
@@ -11915,24 +11683,23 @@
 msgid "Maithili"
 msgstr ""
 
+msgid "Meadow Mari"
+msgstr ""
+
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Òme"
-
-#, fuzzy
+msgstr ""
+
 msgid "Mongolian"
-msgstr "Macedonian"
-
-#, fuzzy
+msgstr ""
+
 msgid "Marathi"
-msgstr "Gujarati"
-
-#, fuzzy
+msgstr ""
+
 msgid "Malay"
-msgstr "Òme"
+msgstr ""
 
 msgid "Bokmål Norwegian"
 msgstr ""
@@ -11947,11 +11714,10 @@
 msgstr "Nòrvegian (Nynorsk)"
 
 msgid "Occitan"
-msgstr ""
-
-#, fuzzy
+msgstr "Occitan"
+
 msgid "Oriya"
-msgstr "Opcions"
+msgstr ""
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12007,7 +11773,6 @@
 msgid "Turkish"
 msgstr "Turc"
 
-#, fuzzy
 msgid "Ukranian"
 msgstr "Ukrainien"
 
@@ -12068,14 +11833,13 @@
 msgid "About %s"
 msgstr "A prepaus de %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Entresenhas"
+msgstr ""
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Entresenhas sus l'utilizaire"
+msgstr ""
 
 msgid "Current Developers"
 msgstr ""
@@ -12089,9 +11853,9 @@
 msgid "Retired Crazy Patch Writers"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Entresenhas sul servidor"
+msgstr ""
 
 msgid "Current Translators"
 msgstr ""
@@ -12099,9 +11863,9 @@
 msgid "Past Translators"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Entresenhas"
+msgstr ""
 
 msgid "_Name"
 msgstr "_Nom"
@@ -12205,44 +11969,35 @@
 msgid "Right-click for more unread messages...\n"
 msgstr ""
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "Modificar lo mot de pas"
-
-#, fuzzy
+msgstr ""
+
 msgid "Show Buddy _List"
-msgstr "Tièra de contactes"
-
-#, fuzzy
+msgstr ""
+
 msgid "_Unread Messages"
-msgstr "Messatges pas legits"
-
-#, fuzzy
+msgstr "Messatges _pas legits"
+
 msgid "New _Message..."
-msgstr "Enviar un messatge"
-
-#, fuzzy
+msgstr "_Messatge novèl..."
+
 msgid "_Accounts"
-msgstr "/_Comptse"
-
-#, fuzzy
+msgstr "/_Comptes"
+
 msgid "Plu_gins"
-msgstr "Ajustons"
-
-#, fuzzy
+msgstr "A_justons"
+
 msgid "Pr_eferences"
-msgstr "Preferéncias"
-
-#, fuzzy
+msgstr "Pr_eferéncias"
+
 msgid "Mute _Sounds"
-msgstr "Sons"
+msgstr ""
 
 msgid "_Blink on New Message"
 msgstr ""
 
-#, fuzzy
 msgid "_Quit"
-msgstr "Quitar"
+msgstr "_Quitar"
 
 msgid "Not started"
 msgstr ""
@@ -12403,7 +12158,7 @@
 msgstr ""
 
 msgid "Select Font"
-msgstr "Seleccionar una poliça"
+msgstr ""
 
 msgid "Select Text Color"
 msgstr ""
@@ -12412,7 +12167,7 @@
 msgstr ""
 
 msgid "_URL"
-msgstr ""
+msgstr "_URL"
 
 msgid "_Description"
 msgstr "_Descripcion"
@@ -12495,15 +12250,14 @@
 msgid "Insert Smiley"
 msgstr ""
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Attention !"
+msgstr ""
 
 msgid "<b>_Bold</b>"
 msgstr ""
 
 msgid "<i>_Italic</i>"
-msgstr ""
+msgstr "<i>_Italic</i>"
 
 msgid "<u>_Underline</u>"
 msgstr ""
@@ -12536,7 +12290,7 @@
 msgstr "_Imatge"
 
 msgid "_Link"
-msgstr ""
+msgstr "_Ligam"
 
 msgid "_Horizontal rule"
 msgstr ""
@@ -12544,9 +12298,8 @@
 msgid "_Smile!"
 msgstr ""
 
-#, fuzzy
 msgid "_Attention!"
-msgstr "Attention !"
+msgstr "_Atencion !"
 
 msgid "Log Deletion Failed"
 msgstr ""
@@ -12622,7 +12375,7 @@
 msgstr ""
 
 msgid "NAME"
-msgstr ""
+msgstr "NOM"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
@@ -12703,12 +12456,11 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
-#, fuzzy
 msgid "No message"
-msgstr "Messatge"
+msgstr ""
 
 msgid "Open All Messages"
-msgstr ""
+msgstr "Dobrir totes los messatges"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
@@ -12754,9 +12506,8 @@
 msgid "<b>Web site:</b>"
 msgstr ""
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "Nom de fichièr :"
+msgstr "<b>Nom de fichièr :</b>"
 
 msgid "Configure Pl_ugin"
 msgstr ""
@@ -12765,11 +12516,10 @@
 msgstr ""
 
 msgid "Select a file"
-msgstr "Seleccionar un fichièr"
-
-#, fuzzy
+msgstr ""
+
 msgid "Modify Buddy Pounce"
-msgstr "Entresenhas"
+msgstr ""
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12818,7 +12568,7 @@
 msgstr ""
 
 msgid "Send a _message"
-msgstr ""
+msgstr "Mandar un _messatge"
 
 msgid "E_xecute a command"
 msgstr ""
@@ -12844,13 +12594,11 @@
 msgid "Pounce Target"
 msgstr ""
 
-#, fuzzy
 msgid "Started typing"
-msgstr "Comença a picar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Paused while typing"
-msgstr "L'utilizaire es a picar..."
+msgstr ""
 
 msgid "Signed on"
 msgstr ""
@@ -12861,23 +12609,20 @@
 msgid "Returned from being away"
 msgstr ""
 
-#, fuzzy
 msgid "Stopped typing"
 msgstr "S'arrèsta de picar"
 
 msgid "Signed off"
 msgstr ""
 
-#, fuzzy
 msgid "Became idle"
-msgstr "Enregistrar lo fichièr"
+msgstr ""
 
 msgid "Went away"
 msgstr ""
 
-#, fuzzy
 msgid "Sent a message"
-msgstr "Messatges enviats"
+msgstr ""
 
 msgid "Unknown.... Please report this!"
 msgstr ""
@@ -12891,9 +12636,8 @@
 msgid "The default Pidgin sound theme"
 msgstr ""
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Tièra de contactes"
+msgstr ""
 
 msgid "The default Pidgin status icon theme"
 msgstr ""
@@ -12907,9 +12651,8 @@
 msgid "Theme failed to copy."
 msgstr ""
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Seleccionar una poliça"
+msgstr ""
 
 #. Instructions
 msgid ""
@@ -12918,20 +12661,17 @@
 "list."
 msgstr ""
 
-#, fuzzy
 msgid "Buddy List Theme:"
-msgstr "Tièra de contactes"
-
-#, fuzzy
+msgstr ""
+
 msgid "Status Icon Theme:"
-msgstr "Estatut"
+msgstr ""
 
 msgid "Sound Theme:"
 msgstr ""
 
-#, fuzzy
 msgid "Smiley Theme:"
-msgstr "Enregistrar l'imatge"
+msgstr ""
 
 msgid "Keyboard Shortcuts"
 msgstr ""
@@ -12949,9 +12689,8 @@
 msgid "On unread messages"
 msgstr ""
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Connectat"
+msgstr ""
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12976,10 +12715,10 @@
 msgstr ""
 
 msgid "Top"
-msgstr "Superior"
+msgstr "Naut"
 
 msgid "Bottom"
-msgstr "Inferior"
+msgstr "Bais"
 
 msgid "Left"
 msgstr "Esquèrra"
@@ -13046,17 +12785,15 @@
 msgid "Cannot start browser configuration program."
 msgstr ""
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Desactivar"
+msgstr "Desactivat"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Servidor :"
+msgstr "Servidor ST_UN :"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
@@ -13073,42 +12810,36 @@
 msgid "_Manually specify range of ports to listen on:"
 msgstr ""
 
-#, fuzzy
 msgid "_Start:"
-msgstr "Estat :"
-
-#, fuzzy
+msgstr ""
+
 msgid "_End:"
-msgstr "_Enviar"
+msgstr "_Fin :"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr ""
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Servidor :"
-
-#, fuzzy
+msgstr "Servidor _TURN :"
+
 msgid "_UDP Port:"
-msgstr "_Pòrt :"
-
-#, fuzzy
+msgstr "Pòrt _UDP :"
+
 msgid "Use_rname:"
-msgstr "_Nom d'utilizaire :"
-
-#, fuzzy
+msgstr "Nom d'utilizai_re :"
+
 msgid "Pass_word:"
-msgstr "Mot de pas :"
+msgstr "Mot de _pas :"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
-msgstr "Opcions"
+msgstr "Opera"
 
 msgid "Netscape"
-msgstr ""
+msgstr "Netscape"
 
 msgid "Mozilla"
 msgstr "Mozilla"
@@ -13117,7 +12848,7 @@
 msgstr "Konqueror"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -13163,7 +12894,7 @@
 msgstr ""
 
 msgid "_Browser:"
-msgstr ""
+msgstr "_Navigador :"
 
 msgid "_Open link in:"
 msgstr ""
@@ -13206,11 +12937,9 @@
 msgid "No proxy"
 msgstr ""
 
-#, fuzzy
 msgid "P_ort:"
 msgstr "_Pòrt :"
 
-#, fuzzy
 msgid "User_name:"
 msgstr "_Nom d'utilizaire :"
 
@@ -13274,24 +13003,20 @@
 msgid "Sounds when conversation has _focus"
 msgstr ""
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Activat"
-
-#, fuzzy
+msgstr "A_ctivar los sons :"
+
 msgid "V_olume:"
-msgstr "Volum :"
+msgstr "V_olum :"
 
 msgid "Play"
 msgstr "Legir"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "Navegador"
-
-#, fuzzy
+msgstr ""
+
 msgid "_Reset"
-msgstr "Reinicializar"
+msgstr "_Reinicializar"
 
 msgid "_Report idle time:"
 msgstr ""
@@ -13325,14 +13050,13 @@
 msgstr "Interfaç"
 
 msgid "Browser"
-msgstr "Navegador"
+msgstr "Navigador"
 
 msgid "Status / Idle"
 msgstr ""
 
-#, fuzzy
 msgid "Themes"
-msgstr "Tèst"
+msgstr "Tèmas"
 
 msgid "Allow all users to contact me"
 msgstr ""
@@ -13344,7 +13068,7 @@
 msgstr ""
 
 msgid "Block all users"
-msgstr ""
+msgstr "Blocar totes los utilizaires"
 
 msgid "Block only the users below"
 msgstr ""
@@ -13383,7 +13107,7 @@
 msgstr ""
 
 msgid "Block User"
-msgstr ""
+msgstr "Blocar un utilizaire"
 
 msgid "Type a user to block."
 msgstr ""
@@ -13393,7 +13117,7 @@
 
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "Blocar %s ?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
@@ -13473,29 +13197,24 @@
 msgid "Add Smiley"
 msgstr ""
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Imatge"
+msgstr "_Imatge :"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Ordenar"
-
-#, fuzzy
+msgstr ""
+
 msgid "Smiley"
-msgstr "Talha"
-
-#, fuzzy
+msgstr ""
+
 msgid "Shortcut Text"
-msgstr "Ordenar"
+msgstr ""
 
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Seleccionar una poliça"
+msgstr ""
 
 msgid "Click to change your buddyicon for this account."
 msgstr ""
@@ -13516,7 +13235,7 @@
 msgstr ""
 
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 msgid "Facebook (XMPP)"
 msgstr ""
@@ -13601,9 +13320,8 @@
 msgid "Could not set icon"
 msgstr ""
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Dobrir lo ligam dins lo navegaire"
+msgstr "D_obrir lo ligam"
 
 msgid "_Copy Link Location"
 msgstr "_Copiar l'emplaçament del ligam"
@@ -13611,9 +13329,8 @@
 msgid "_Copy Email Address"
 msgstr ""
 
-#, fuzzy
 msgid "_Open File"
-msgstr "_Enviar un fichièr"
+msgstr "D_obrir lo fichièr"
 
 msgid "Open _Containing Directory"
 msgstr ""
@@ -13621,19 +13338,17 @@
 msgid "Save File"
 msgstr "Enregistrar lo fichièr"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "Legir un son"
-
-#, fuzzy
+msgstr "_Legir un son"
+
 msgid "_Save File"
-msgstr "Enregistrar lo fichièr"
+msgstr "Enregi_strar lo fichièr"
 
 msgid "Do you really want to clear?"
 msgstr ""
 
 msgid "Select color"
-msgstr "Seleccionar una color"
+msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -13641,7 +13356,7 @@
 msgstr "Pidgin"
 
 msgid "_Alias"
-msgstr ""
+msgstr "_Aliàs"
 
 msgid "Close _tabs"
 msgstr ""
@@ -13650,22 +13365,19 @@
 msgstr ""
 
 msgid "_Invite"
-msgstr ""
-
-#, fuzzy
+msgstr "Conv_idar"
+
 msgid "_Modify..."
-msgstr "_Modificar"
-
-#, fuzzy
+msgstr "_Modificar..."
+
 msgid "_Add..."
-msgstr "_Apondre"
+msgstr "_Apondre..."
 
 msgid "_Open Mail"
 msgstr ""
 
-#, fuzzy
 msgid "_Edit"
-msgstr "Edicion"
+msgstr "_Edicion"
 
 msgid "Pidgin Tooltip"
 msgstr ""
@@ -13679,9 +13391,8 @@
 msgid "none"
 msgstr "pas cap"
 
-#, fuzzy
 msgid "Small"
-msgstr "Corrièl"
+msgstr "Pichons"
 
 msgid "Smaller versions of the default smileys"
 msgstr ""
@@ -13793,7 +13504,7 @@
 msgstr ""
 
 msgid "Sent Messages"
-msgstr "Messatges enviats"
+msgstr "Messatges mandats"
 
 msgid "Received Messages"
 msgstr ""
@@ -13813,13 +13524,11 @@
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
 msgstr "Nom d'utilisateur envoyé"
 
-#, fuzzy
 msgid "Enter an XMPP Server"
-msgstr "Picatz lo mot de pas"
+msgstr ""
 
 msgid "Select an XMPP server to query"
 msgstr ""
@@ -13827,16 +13536,14 @@
 msgid "Find Services"
 msgstr ""
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "Tièra de contactes"
+msgstr "Apondre a la tièra de contactes"
 
 msgid "Gateway"
 msgstr ""
 
-#, fuzzy
 msgid "Directory"
-msgstr "Creator"
+msgstr ""
 
 msgid "PubSub Collection"
 msgstr ""
@@ -13844,19 +13551,19 @@
 msgid "PubSub Leaf"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descripcion"
+msgstr ""
+"\n"
+"<b>Descripcion :</b> "
 
 #. Create the window.
 msgid "Service Discovery"
 msgstr ""
 
-#, fuzzy
 msgid "_Browse"
-msgstr "Navegador"
+msgstr ""
 
 msgid "Server does not exist"
 msgstr ""
@@ -14034,13 +13741,13 @@
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "Entresenhas opcionalas :"
+msgstr ""
 
 msgid "First name:"
 msgstr "Pichon nom :"
 
 msgid "Last name:"
-msgstr "Nom :"
+msgstr "Nom d'ostal :"
 
 msgid "Email:"
 msgstr ""
@@ -14281,9 +13988,8 @@
 msgid "Conversation Entry"
 msgstr ""
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "Connectat"
+msgstr ""
 
 msgid "Request Dialog"
 msgstr ""
@@ -14292,7 +13998,7 @@
 msgstr ""
 
 msgid "Select Color"
-msgstr "Seleccionar una color"
+msgstr ""
 
 #, c-format
 msgid "Select Interface Font"
@@ -14314,9 +14020,8 @@
 msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-#, fuzzy
 msgid "Colors"
-msgstr "Tampar"
+msgstr "Colors"
 
 msgid "Fonts"
 msgstr "Poliças"
@@ -14358,9 +14063,8 @@
 msgid "New Version Available"
 msgstr ""
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
+msgstr "Pus tard"
 
 msgid "Download Now"
 msgstr ""
@@ -14399,9 +14103,8 @@
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "Connectat"
+msgstr ""
 
 #. *< summary
 msgid ""
@@ -14472,34 +14175,29 @@
 msgid "Icon for Chat"
 msgstr ""
 
-#, fuzzy
 msgid "Ignored"
-msgstr "Ignorar"
-
-#, fuzzy
+msgstr "Ignorat"
+
 msgid "Founder"
-msgstr "Expeditor"
+msgstr ""
 
 #. A user in a chat room who has special privileges.
-#, fuzzy
 msgid "Operator"
-msgstr "Opcions"
+msgstr "Operador"
 
 #. 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 "Autorizar"
+msgstr ""
 
 msgid "Error dialog"
 msgstr ""
 
-#, fuzzy
 msgid "Information dialog"
-msgstr "Entresenhas"
+msgstr ""
 
 msgid "Mail dialog"
 msgstr ""
@@ -14507,38 +14205,32 @@
 msgid "Question dialog"
 msgstr ""
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Alèrta"
+msgstr ""
 
 msgid "What kind of dialog is this?"
 msgstr ""
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "Estatut"
+msgstr ""
 
 msgid "Chatroom Emblems"
 msgstr ""
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "Modificar lo mot de pas"
+msgstr ""
 
 msgid "Pidgin Icon Theme Editor"
 msgstr ""
 
-#, fuzzy
 msgid "Contact"
-msgstr "Se connectar"
-
-#, fuzzy
+msgstr "Contacte"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Tièra de contactes"
-
-#, fuzzy
+msgstr ""
+
 msgid "Edit Buddylist Theme"
-msgstr "Tièra de contactes"
+msgstr ""
 
 msgid "Edit Icon Theme"
 msgstr ""
@@ -14608,10 +14300,10 @@
 msgstr ""
 
 msgid "12 hour time format"
-msgstr ""
+msgstr "Format 12 oras"
 
 msgid "24 hour time format"
-msgstr ""
+msgstr "Format 24 oras"
 
 msgid "Show dates in..."
 msgstr ""
@@ -14649,35 +14341,29 @@
 "timestamp formats."
 msgstr ""
 
-#, fuzzy
 msgid "Audio"
-msgstr "Autor"
-
-#, fuzzy
+msgstr ""
+
 msgid "Video"
-msgstr "Votz"
+msgstr "Vidèo"
 
 msgid "Output"
 msgstr ""
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "Ajustons"
-
-#, fuzzy
+msgstr "A_juston"
+
 msgid "_Device"
-msgstr "Periferic"
+msgstr "_Periferic"
 
 msgid "Input"
 msgstr ""
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "Ajustons"
-
-#, fuzzy
+msgstr "A_juston"
+
 msgid "D_evice"
-msgstr "Periferic"
+msgstr "P_eriferic"
 
 #. *< magic
 #. *< major version
@@ -14800,7 +14486,7 @@
 msgstr ""
 
 msgid "Account: "
-msgstr ""
+msgstr "Compte : "
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
@@ -14876,13 +14562,12 @@
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Emplaçament"
+msgstr "Traduccions"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr ""
+msgstr "Seguent >"
 
 #. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
@@ -14895,9 +14580,8 @@
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Ordenar"
+msgstr "Acorchis"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
@@ -14908,9 +14592,8 @@
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "Data de debuta"
+msgstr ""
 
 #. Installer Subsection Detailed Description
 msgid ""
--- a/po/pl.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/pl.po	Sun Feb 06 05:26:52 2011 +0000
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2010-12-14 13:40+0100\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-25 11:04+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
@@ -2372,8 +2372,12 @@
 "Ścieżka do zapisywania plików w\n"
 "(proszę podać pełną ścieżkę)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "Automatyczne odrzucanie od użytkowników spoza listy znajomych"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Kiedy żądanie przesłania pliku zostaje odebrane od\n"
+"użytkownika, który *nie* jest na liście znajomych:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2385,6 +2389,9 @@
 msgid "Create a new directory for each user"
 msgstr "Utworzenie nowego katalogu dla każdego użytkownika"
 
+msgid "Escape the filenames"
+msgstr "Sekwencja sterująca przed nazwami plików"
+
 msgid "Notes"
 msgstr "Notatki"
 
@@ -3852,7 +3859,10 @@
 "Serwer wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
 "niezaszyfrowanego strumienia"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Nieprawidłowa odpowiedź z serwera"
 
@@ -6181,6 +6191,20 @@
 msgid "Retrieving User Information..."
 msgstr "Pobieranie informacji o użytkowniku..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Użytkownik został wyrzucony z tego MultiMX."
+
+msgid "was kicked"
+msgstr "został wyrzucony"
+
+msgid "_Room Name:"
+msgstr "_Nazwa pokoju:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Zaproszono"
+
 msgid "Loading menu..."
 msgstr "Wczytywanie menu..."
 
@@ -6208,20 +6232,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Włączenie wyskakującego ekranu powitalnego"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Użytkownik został wyrzucony z tego MultiMX."
-
-msgid "was kicked"
-msgstr "został wyrzucony"
-
-msgid "_Room Name:"
-msgstr "_Nazwa pokoju:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Zaproszono"
-
 msgid "Last Online"
 msgstr "Ostatnio online"
 
@@ -7910,75 +7920,6 @@
 "niezbędne dla obrazów komunikatora. Ponieważ adres IP zostanie ujawniony, "
 "może się to wiązać z zagrożeniem prywatności."
 
-msgid "Invalid SNAC"
-msgstr "Nieprawidłowe SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Przekroczono ograniczenie prędkości serwera"
-
-msgid "Client rate limit exceeded"
-msgstr "Przekroczono ograniczenie prędkości klienta"
-
-msgid "Service unavailable"
-msgstr "Usługa jest niedostępna"
-
-msgid "Service not defined"
-msgstr "Nie określono usługi"
-
-msgid "Obsolete SNAC"
-msgstr "Przestarzałe SNAC"
-
-msgid "Not supported by host"
-msgstr "Nieobsługiwane przez serwer"
-
-msgid "Not supported by client"
-msgstr "Nieobsługiwane przez klienta"
-
-msgid "Refused by client"
-msgstr "Odmowa klienta"
-
-msgid "Reply too big"
-msgstr "Odpowiedź jest za duża"
-
-msgid "Responses lost"
-msgstr "Utracono odpowiedzi"
-
-msgid "Request denied"
-msgstr "Odrzucono prośby"
-
-msgid "Busted SNAC payload"
-msgstr "Uszkodzone dane SNAC"
-
-msgid "Insufficient rights"
-msgstr "Niewystarczające uprawnienia"
-
-msgid "In local permit/deny"
-msgstr "W lokalnym pozwoleniu/odmowie"
-
-msgid "Warning level too high (sender)"
-msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
-
-msgid "User temporarily unavailable"
-msgstr "Użytkownik jest tymczasowo niedostępny"
-
-msgid "No match"
-msgstr "Brak wyników"
-
-msgid "List overflow"
-msgstr "Lista jest pełna"
-
-msgid "Request ambiguous"
-msgstr "Niejednoznaczna prośba"
-
-msgid "Queue full"
-msgstr "Kolejka jest pełna"
-
-msgid "Not while on AOL"
-msgstr "Nie podczas używania AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Ikona znajomego"
@@ -8097,6 +8038,75 @@
 msgid "Capabilities"
 msgstr "Możliwości"
 
+msgid "Invalid SNAC"
+msgstr "Nieprawidłowe SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Przekroczono ograniczenie prędkości serwera"
+
+msgid "Client rate limit exceeded"
+msgstr "Przekroczono ograniczenie prędkości klienta"
+
+msgid "Service unavailable"
+msgstr "Usługa jest niedostępna"
+
+msgid "Service not defined"
+msgstr "Nie określono usługi"
+
+msgid "Obsolete SNAC"
+msgstr "Przestarzałe SNAC"
+
+msgid "Not supported by host"
+msgstr "Nieobsługiwane przez serwer"
+
+msgid "Not supported by client"
+msgstr "Nieobsługiwane przez klienta"
+
+msgid "Refused by client"
+msgstr "Odmowa klienta"
+
+msgid "Reply too big"
+msgstr "Odpowiedź jest za duża"
+
+msgid "Responses lost"
+msgstr "Utracono odpowiedzi"
+
+msgid "Request denied"
+msgstr "Odrzucono prośby"
+
+msgid "Busted SNAC payload"
+msgstr "Uszkodzone dane SNAC"
+
+msgid "Insufficient rights"
+msgstr "Niewystarczające uprawnienia"
+
+msgid "In local permit/deny"
+msgstr "W lokalnym pozwoleniu/odmowie"
+
+msgid "Warning level too high (sender)"
+msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
+
+msgid "User temporarily unavailable"
+msgstr "Użytkownik jest tymczasowo niedostępny"
+
+msgid "No match"
+msgstr "Brak wyników"
+
+msgid "List overflow"
+msgstr "Lista jest pełna"
+
+msgid "Request ambiguous"
+msgstr "Niejednoznaczna prośba"
+
+msgid "Queue full"
+msgstr "Kolejka jest pełna"
+
+msgid "Not while on AOL"
+msgstr "Nie podczas używania AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8692,14 +8702,14 @@
 msgid "Select Server"
 msgstr "Wybór serwera"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Połączenie przez TCP"
@@ -12252,9 +12262,6 @@
 msgid "Fatal Error"
 msgstr "Błąd krytyczny"
 
-msgid "bug master"
-msgstr "władca błędów"
-
 msgid "artist"
 msgstr "artysta"
 
@@ -12434,6 +12441,9 @@
 msgid "Maithili"
 msgstr "maithili"
 
+msgid "Meadow Mari"
+msgstr "maryjski"
+
 msgid "Macedonian"
 msgstr "macedoński"
 
--- a/po/ro.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/ro.po	Sun Feb 06 05:26:52 2011 +0000
@@ -1,15 +1,16 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# 2002-2010, Mișu Moldovan <dumol@gnome.org>
+# 2002-2011, Mișu Moldovan <dumol@gnome.org>
 # 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
-msgid ""
-msgstr ""
-"Project-Id-Version: pidgin-2.7.8\n"
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin-2.7.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2010-12-17 18:47+0200\n"
-"Last-Translator: Mișu Moldovan <dumol@l10n.ro>\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-31 00:11+0200\n"
+"Last-Translator: Mișu Moldovan <dumol@gnome.org>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +97,7 @@
 msgstr "(Probabil ați uitat să faceți „make install”.)"
 
 msgid "Modify Account"
-msgstr "Modificare cont"
+msgstr "Editare cont"
 
 msgid "New Account"
 msgstr "Cont nou"
@@ -105,7 +106,7 @@
 msgstr "Protocol:"
 
 msgid "Username:"
-msgstr "Nume utilizator:"
+msgstr "Nume de utilizator:"
 
 msgid "Password:"
 msgstr "Parolă:"
@@ -212,7 +213,7 @@
 msgstr "Eroare la adăugarea contactului"
 
 msgid "Username"
-msgstr "Nume utilizator"
+msgstr "Nume de utilizator"
 
 msgid "Alias (optional)"
 msgstr "Alias (opțional)"
@@ -285,7 +286,7 @@
 msgstr "Detalii"
 
 msgid "Add Buddy Pounce"
-msgstr "Adăugare întâmpinare"
+msgstr "Adăugați o întâmpinare"
 
 msgid "Send File"
 msgstr "Trimitere fișier"
@@ -637,7 +638,7 @@
 msgstr "Arată marcaje de timp"
 
 msgid "Add Buddy Pounce..."
-msgstr "Adăugare întâmpinare..."
+msgstr "Adăugați o întâmpinare..."
 
 msgid "Invite..."
 msgstr "Invită..."
@@ -1112,7 +1113,7 @@
 msgstr "Întâmpinare doar în starea de indisponibilitate"
 
 msgid "Recurring"
-msgstr "Recurentă"
+msgstr "Recurență"
 
 msgid "Cannot create pounce"
 msgstr "Nu se poate crea întâmpinarea"
@@ -1128,7 +1129,7 @@
 msgstr "Sigur doriți să ștergeți întâmpinarea la %s pentru %s?"
 
 msgid "Buddy Pounces"
-msgstr "Întâmpinări contacte"
+msgstr "Întâmpinări pentru contacte"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
@@ -1247,7 +1248,7 @@
 
 #. Create the window.
 msgid "Room List"
-msgstr "Listă camere de chat"
+msgstr "Lista camerelor de chat"
 
 msgid "Buddy logs in"
 msgstr "Un contact se autentifică"
@@ -1551,10 +1552,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr "TinyURL pentru linkul de mai sus: %s"
+msgstr "TinyURL pentru adresa de mai sus: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr "Aștepați până când TinyURL oferă un link mai scurt..."
+msgstr "Așteptați ca TinyURL să genereze o adresă mai scurtă..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "Creează TinyURL doar pentru URL-uri de această lungime sau mai mari"
@@ -2322,9 +2323,7 @@
 msgstr "Auto-acceptare"
 
 msgid "Auto-accept file transfer requests from selected users."
-msgstr ""
-"Permite acceptarea automată a transferurilor de fișiere inițiate de anumiți "
-"utilizatori."
+msgstr "Acceptare automată pentru anumite transferuri de fișiere."
 
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
@@ -2367,9 +2366,12 @@
 "Cale pentru salvarea fișierelor:\n"
 "(Precizați calea completă)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr ""
-"Refuză automat pentru utilizatorii ce nu fac parte din lista de contacte"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Când se primește o cerere de transfer de fișiere de la un\n"
+"utilizator ce NU e în lista de contacte:"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2381,6 +2383,9 @@
 msgid "Create a new directory for each user"
 msgstr "Creează un nou director pentru fiecare utilizator"
 
+msgid "Escape the filenames"
+msgstr "Evită interpretarea caracterelor speciale în nume"
+
 msgid "Notes"
 msgstr "Notițe"
 
@@ -2441,7 +2446,7 @@
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "Exemplu de modul DBus"
+msgstr "Exemplu de modul DBus."
 
 #. *< type
 #. *< ui_requirement
@@ -2650,7 +2655,7 @@
 
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "Opțiuni de citire a înregistrărilor"
+msgstr "Opțiuni de import a înregistrărilor"
 
 msgid "Fast size calculations"
 msgstr "Calcul rapid mărime"
@@ -2669,7 +2674,7 @@
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "Citire înregistrări"
+msgstr "Import de înregistrări"
 
 #. *< name
 #. *< version
@@ -2728,7 +2733,7 @@
 "apară dedesubtul numelui de utilizator în fereastra de discuții."
 
 msgid "Offline Message Emulation"
-msgstr "Emulare mesaje offline"
+msgstr "Emulare de mesaje offline"
 
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator offline."
@@ -2738,7 +2743,7 @@
 "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 „Întâmpinări contacte”."
+"întâmpinarea din fereastra „Întâmpinări pentru contacte”."
 
 #, c-format
 msgid ""
@@ -2754,7 +2759,8 @@
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
-"Puteți edita ori șterge întâmpinarea din fereastra „Întâmpinări contacte"
+"Puteți edita ori șterge întâmpinarea din fereastra „Întâmpinări pentru "
+"contacte”"
 
 msgid "Yes"
 msgstr "Da"
@@ -2962,7 +2968,7 @@
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Notificări stări contacte"
+msgstr "Notificări pentru stările contactelor"
 
 #. *< name
 #. *< version
@@ -3628,7 +3634,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mesaj]:  Setați un mesaj în absență sau, dacă nu precizați un mesaj, "
+"away [mesaj]:  Definiți un mesaj în absență sau, dacă nu precizați un mesaj, "
 "reveniți din absență."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
@@ -3700,8 +3706,8 @@
 "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;pseudonim|chat&gt;:  Setați sau resetați "
-"un chat sau un mod utilizator."
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;pseudonim|chat&gt;:  Inițializați sau "
+"reinițializați un chat sau un mod pentru utilizator."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
@@ -3782,7 +3788,8 @@
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Setați sau resetați un mod utilizator."
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Inițializați sau reinițializați un mod "
+"pentru utilizator."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
@@ -3835,7 +3842,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Răspuns nevalid de la server."
 
@@ -4151,7 +4161,7 @@
 msgstr "Ca_meră:"
 
 msgid "_Server:"
-msgstr "_Server:"
+msgstr "Ser_ver:"
 
 msgid "_Handle:"
 msgstr "A_dministrare:"
@@ -4595,7 +4605,7 @@
 
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Nu se poate seta rolul „%s” pentru utilizatorul: %s"
+msgstr "Nu se poate defini rolul „%s” pentru utilizatorul: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
@@ -4682,14 +4692,15 @@
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr ""
-"ban &lt;nume utilizator&gt; [chat]:  Blocați accesul unui utilizator în chat."
+"ban &lt;nume de utilizator&gt; [chat]:  Blocați accesul unui utilizator în "
+"chat."
 
 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;deținător|administrator|membru|renegat|nimic&gt; [pseudonim1] "
-"[pseudonim2] ...: Aflați utilizatorii cu o afiliere sau setați afilierea "
+"[pseudonim2] ...: Aflați utilizatorii cu o afiliere sau definiți afilierea "
 "utilizatorilor față de camera de chat."
 
 msgid ""
@@ -5502,10 +5513,10 @@
 msgstr "Pagină"
 
 msgid "Playing a game"
-msgstr "Joacă ceva"
+msgstr "Mă joc"
 
 msgid "Working"
-msgstr "Lucrează"
+msgstr "Lucrez"
 
 msgid "Has you"
 msgstr "Vă are în listă"
@@ -6152,6 +6163,20 @@
 msgid "Retrieving User Information..."
 msgstr "Se obțin detaliile utilizatorului..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Ați fost dat afară din acest MultiMX."
+
+msgid "was kicked"
+msgstr "a fost dat afară"
+
+msgid "_Room Name:"
+msgstr "Numele came_rei:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Ați fost invitat"
+
 msgid "Loading menu..."
 msgstr "Se încarcă meniul..."
 
@@ -6179,20 +6204,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Activare popup pentru imaginea de pornire"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Ați fost dat afară din acest MultiMX."
-
-msgid "was kicked"
-msgstr "a fost dat afară"
-
-msgid "_Room Name:"
-msgstr "Nume came_ră:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Ați fost invitat"
-
 msgid "Last Online"
 msgstr "Ultima oară online"
 
@@ -7063,16 +7074,16 @@
 msgstr "Nu se poate trimite mesajul către %s: %s"
 
 msgid "Thinking"
-msgstr "Mă gândesc"
+msgstr "Pe gânduri"
 
 msgid "Shopping"
 msgstr "La cumpărături"
 
 msgid "Questioning"
-msgstr "Pun întrebări"
+msgstr "În dubiu"
 
 msgid "Eating"
-msgstr "Mănânc"
+msgstr "La masă"
 
 msgid "Watching a movie"
 msgstr "Văd un film"
@@ -7096,7 +7107,7 @@
 msgstr "Dorm"
 
 msgid "Using a PDA"
-msgstr "Folosesc un PDA"
+msgstr "Sunt pe PDA"
 
 msgid "Meeting friends"
 msgstr "Cu prietenii"
@@ -7109,10 +7120,10 @@
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
-msgstr "Mobil"
+msgstr "Pe mobil"
 
 msgid "Searching the web"
-msgstr "Caut pe net"
+msgstr "Mă dau pe net"
 
 msgid "At a party"
 msgstr "La o petrecere"
@@ -7571,16 +7582,16 @@
 "posibilă trimiterea de imagini IM."
 
 msgid "Unable to set AIM profile."
-msgstr "Nu se poate seta profilul AIM."
+msgstr "Nu se poate inițializa profilul 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 ""
-"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 după o conectare "
-"pe deplin reușită."
+"Se pare că ați cerut să vă inițializați profilul înainte de a vă "
+"autentifica. Profilul vă va rămâne neschimbat și încercați să-l "
+"reinițializați după o conectare pe deplin reușită."
 
 #, c-format
 msgid ""
@@ -7710,10 +7721,10 @@
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Comentariu contact pentru %s"
+msgstr "Comentariu pentru contactul %s"
 
 msgid "Buddy Comment:"
-msgstr "Comentariu contact:"
+msgstr "Comentariu pentru contact:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7836,7 +7847,7 @@
 msgstr "Nu utiliza criptare"
 
 msgid "Use clientLogin"
-msgstr "Utilizați clientLogin"
+msgstr "Utilizează clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7875,75 +7886,6 @@
 "necesară pentru imaginile IM. Pentru că adresa IP vă va fi expusă, luați în "
 "considerare riscurile la care vă expuneți."
 
-msgid "Invalid SNAC"
-msgstr "SNAC nevalid"
-
-msgid "Server rate limit exceeded"
-msgstr "S-a depășit limitarea de server"
-
-msgid "Client rate limit exceeded"
-msgstr "S-a depășit limitarea de client"
-
-msgid "Service unavailable"
-msgstr "Serviciu indisponibil"
-
-msgid "Service not defined"
-msgstr "Serviciu nedefinit"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC învechit"
-
-msgid "Not supported by host"
-msgstr "Nesuportat de către server"
-
-msgid "Not supported by client"
-msgstr "Nesuportat de către client"
-
-msgid "Refused by client"
-msgstr "Refuzat de către client"
-
-msgid "Reply too big"
-msgstr "Răspuns supradimensionat"
-
-msgid "Responses lost"
-msgstr "Răspunsuri pierdute"
-
-msgid "Request denied"
-msgstr "Cerere respinsă"
-
-msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC nevalidă"
-
-msgid "Insufficient rights"
-msgstr "Drepturi insuficiente"
-
-msgid "In local permit/deny"
-msgstr "În lista permiși/refuzați locală"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivel de avertizare prea ridicat (pentru expeditor)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivel de avertizare prea ridicat (pentru destinatar)"
-
-msgid "User temporarily unavailable"
-msgstr "Utilizatorul este temporar indisponibil."
-
-msgid "No match"
-msgstr "Nicio potrivire"
-
-msgid "List overflow"
-msgstr "Listă suprasaturată"
-
-msgid "Request ambiguous"
-msgstr "Cerere ambiguă"
-
-msgid "Queue full"
-msgstr "Coadă plină"
-
-msgid "Not while on AOL"
-msgstr "Nu (cât timp e pe AOL)"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Avatar"
@@ -8021,7 +7963,7 @@
 msgstr "Nivel de avertizare"
 
 msgid "Buddy Comment"
-msgstr "Comentariu contact"
+msgstr "Comentariu pentru contact"
 
 #, c-format
 msgid "User information not available: %s"
@@ -8062,6 +8004,75 @@
 msgid "Capabilities"
 msgstr "Facilități"
 
+msgid "Invalid SNAC"
+msgstr "SNAC nevalid"
+
+msgid "Server rate limit exceeded"
+msgstr "S-a depășit limitarea de server"
+
+msgid "Client rate limit exceeded"
+msgstr "S-a depășit limitarea de client"
+
+msgid "Service unavailable"
+msgstr "Serviciu indisponibil"
+
+msgid "Service not defined"
+msgstr "Serviciu nedefinit"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC învechit"
+
+msgid "Not supported by host"
+msgstr "Nesuportat de către server"
+
+msgid "Not supported by client"
+msgstr "Nesuportat de către client"
+
+msgid "Refused by client"
+msgstr "Refuzat de către client"
+
+msgid "Reply too big"
+msgstr "Răspuns supradimensionat"
+
+msgid "Responses lost"
+msgstr "Răspunsuri pierdute"
+
+msgid "Request denied"
+msgstr "Cerere respinsă"
+
+msgid "Busted SNAC payload"
+msgstr "Încărcătură SNAC nevalidă"
+
+msgid "Insufficient rights"
+msgstr "Drepturi insuficiente"
+
+msgid "In local permit/deny"
+msgstr "În lista permiși/refuzați locală"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivel de avertizare prea ridicat (pentru expeditor)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de avertizare prea ridicat (pentru destinatar)"
+
+msgid "User temporarily unavailable"
+msgstr "Utilizatorul este temporar indisponibil."
+
+msgid "No match"
+msgstr "Nicio potrivire"
+
+msgid "List overflow"
+msgstr "Listă suprasaturată"
+
+msgid "Request ambiguous"
+msgstr "Cerere ambiguă"
+
+msgid "Queue full"
+msgstr "Coadă plină"
+
+msgid "Not while on AOL"
+msgstr "Nu (cât timp e pe AOL)"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8654,14 +8665,14 @@
 msgid "Select Server"
 msgstr "Selectați serverul"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Conectare folosind TCP"
@@ -8986,7 +8997,7 @@
 msgstr "Ultim client cunoscut"
 
 msgid "User Name"
-msgstr "Nume utilizator"
+msgstr "Nume de utilizator"
 
 msgid "Sametime ID"
 msgstr "ID Sametime"
@@ -9217,7 +9228,7 @@
 msgstr "IM parolat"
 
 msgid "Cannot set IM key"
-msgstr "Nu se poate seta cheia IM"
+msgstr "Nu se poate inițializa cheia IM"
 
 msgid "Set IM Password"
 msgstr "Introducere parolă IM"
@@ -9438,7 +9449,8 @@
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Setați numărul maxim de utilizatori în chat. Zero pentru număr nelimitat."
+"Definiți numărul maxim de utilizatori în chat. Zero pentru un număr "
+"nelimitat."
 
 msgid "Invite List"
 msgstr "Listă invitații"
@@ -9546,7 +9558,7 @@
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> a setat modurile chat-ului <I>%s</I> astfel: %s"
+msgstr "<I>%s</I> a definit modurile chat-ului <I>%s</I> astfel: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
@@ -9554,7 +9566,7 @@
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> a setat modurile pentru <I>%s</I> astfel: %s"
+msgstr "<I>%s</I> a definit modurile pentru <I>%s</I> astfel: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
@@ -9906,11 +9918,11 @@
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "chat-ul %s nu are setat niciun mod"
+msgstr "chat-ul %s nu are niciun mod definit"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Nu s-au putut seta modurile chat-ului %s"
+msgstr "Nu s-au putut defini modurile chat-ului %s"
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
@@ -10091,7 +10103,7 @@
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "Nume utilizator: \t%s\n"
+msgstr "Nume de utilizator: \t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
@@ -10324,7 +10336,7 @@
 msgstr "Utilizează proxy-ul contului pentru conexiuni HTTP și HTTPS"
 
 msgid "Chat room list URL"
-msgstr "Adresă listă camere de chat"
+msgstr "Adresa listei camerelor de chat"
 
 msgid "Yahoo JAPAN ID..."
 msgstr "Identitate Yahoo Japonia..."
@@ -10743,13 +10755,14 @@
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"instance &lt;instanță&gt;:  Setați instanța de utilizat în această clasă"
+"instance &lt;instanță&gt;:  Definiți instanța de utilizat în această clasă"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instanță&gt;:  Setați instanța de utilizat în această clasă"
+msgstr "inst &lt;instanță&gt;:  Definiți instanța de utilizat în această clasă"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;instanță&gt;:  Setați instanța de utilizat în această clasă"
+msgstr ""
+"topic &lt;instanță&gt;:  Definiți instanța de utilizat în această clasă"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
@@ -10932,7 +10945,7 @@
 msgstr "Eroare SSL necunoscută"
 
 msgid "Unset"
-msgstr "Nesetat"
+msgstr "Nedefinit"
 
 msgid "Do not disturb"
 msgstr "Nu deranjați"
@@ -11084,7 +11097,7 @@
 
 #. 10061
 msgid "Connection refused."
-msgstr "Conexiune resetată."
+msgstr "Conexiune refuzată."
 
 #. 10048
 msgid "Address already in use."
@@ -11124,14 +11137,14 @@
 msgstr "Nume _utilizator:"
 
 msgid "Remember pass_word"
-msgstr "_Salvare parolă"
+msgstr "Sal_vare parolă"
 
 #. Build the user options frame.
 msgid "User Options"
 msgstr "Opțiuni personale"
 
 msgid "_Local alias:"
-msgstr "_Alias local:"
+msgstr "Alias l_ocal:"
 
 msgid "New _mail notifications"
 msgstr "Notificare la _mail nou"
@@ -11186,7 +11199,7 @@
 msgstr "P_ort:"
 
 msgid "Pa_ssword:"
-msgstr "Pa_rolă:"
+msgstr "_Parolă:"
 
 msgid "Unable to save new account"
 msgstr "Nu se poate salva noul cont"
@@ -11232,8 +11245,8 @@
 "<b>Adaugă...</b> de câte ori doriți.\n"
 "\n"
 "Veți putea reveni la această fereastră pentru a adăuga, edita sau șterge "
-"conturi utilizând <b>Conturi->Administrare conturi</b> în fereastra listei "
-"de contacte."
+"conturi utilizând <b>Conturi->Administrare</b> în fereastra listei de "
+"contacte."
 
 #, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
@@ -11242,7 +11255,7 @@
 
 #. Buddy List
 msgid "Background Color"
-msgstr "Culoare fundal"
+msgstr "Culoarea fundalului"
 
 msgid "The background color for the buddy list"
 msgstr "Culoarea de fundal pentru lista de contacte"
@@ -11257,7 +11270,7 @@
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
 msgid "Expanded Background Color"
-msgstr "Culoare fundal la desfacere"
+msgstr "Culoarea fundalului la desfacere"
 
 msgid "The background color of an expanded group"
 msgstr "Culoarea de fundal a unui grup desfăcut"
@@ -11265,15 +11278,15 @@
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
 msgid "Expanded Text"
-msgstr "Text text la desfacere"
+msgstr "Culoarea textului la desfacere"
 
 msgid "The text information for when a group is expanded"
-msgstr "Informația text pentru un grup desfăcut"
+msgstr "Detaliile textului pentru un grup desfăcut"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
 msgid "Collapsed Background Color"
-msgstr "Culoare fundal la strângere"
+msgstr "Culoarea fundalului la strângere"
 
 msgid "The background color of a collapsed group"
 msgstr "Culoarea de fundal a unui grup strâns"
@@ -11284,13 +11297,13 @@
 msgstr "Text la strângere"
 
 msgid "The text information for when a group is collapsed"
-msgstr "Informația text pentru un grup strâns"
+msgstr "Detaliile textului pentru un grup strâns"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
 msgid "Contact/Chat Background Color"
-msgstr "Culoare fundal contact/chat"
+msgstr "Culoarea fundalului pentru contacte și chat-uri"
 
 msgid "The background color of a contact or chat"
 msgstr "Culoarea de fundal a unui contact sau chat"
@@ -11298,64 +11311,65 @@
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
 msgid "Contact Text"
-msgstr "Text contact"
+msgstr "Textul contactului"
 
 msgid "The text information for when a contact is expanded"
-msgstr "Informația text pentru un contact strâns"
+msgstr "Detaliile textului pentru un contact desfăcut"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
 msgid "Online Text"
-msgstr "Text online"
+msgstr "Textul contactelor online"
 
 msgid "The text information for when a buddy is online"
-msgstr "Informația text pentru un contact online"
+msgstr "Detaliile textului pentru contacte online"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
 msgid "Away Text"
-msgstr "Text absent"
+msgstr "Textul contactelor absente"
 
 msgid "The text information for when a buddy is away"
-msgstr "Informația text pentru un contact absent"
+msgstr "Detaliile textului pentru contacte absente"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
 msgid "Offline Text"
-msgstr "Text offline"
+msgstr "Textul contactelor offline"
 
 msgid "The text information for when a buddy is offline"
-msgstr "Informația text pentru un contact offline"
+msgstr "Detaliile textului pentru contacte offline"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
 msgid "Idle Text"
-msgstr "Text inactiv"
+msgstr "Textul contactelor inactive"
 
 msgid "The text information for when a buddy is idle"
-msgstr "Informația text pentru un contact inactiv"
+msgstr "Detaliile textului pentru contacte inactive"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message Text"
-msgstr "Text mesaj"
+msgstr "Textul mesajelor necitite"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr "Informația text pentru un contact cu un mesaj necitit"
+msgstr "Detaliile textului pentru contacte cu mesaje necitite"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr "Textul mesajului (utilizatorul a spus)"
+msgstr "Textul mesajelor noi"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
-"Informația text pentru un chat cu un mesaj necitit ce vă menționează numele"
+"Detaliile textului pentru un chat cu un mesaj necitit ce vă menționează "
+"numele"
 
 msgid "The text information for a buddy's status"
-msgstr "Informația text pentru starea unui contact"
+msgstr "Detaliile textului pentru statusul unui contact"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -11383,8 +11397,7 @@
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr ""
-"Introduceți informațiile despre chat-ul în care doriți să participați.\n"
+msgstr "Introduceți detaliile chat-ului în care doriți intrați.\n"
 
 msgid "Room _List"
 msgstr "_Listă de camere"
@@ -11493,7 +11506,7 @@
 msgstr "Mesaj (opțional)"
 
 msgid "Edit User Mood"
-msgstr "Schimbare a propriei dispoziții"
+msgstr "Schimbați-vă dispoziția"
 
 #. NOTE: Do not set any accelerator to Control+O. It is mapped by
 #. gtk_blist_key_press_cb to "Get User Info" on the selected buddy.
@@ -11551,14 +11564,14 @@
 msgstr "/_Conturi"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/Conturi/Administrare conturi"
+msgstr "/Conturi/Administrare"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/_Unelte"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Unelte/Î_ntâmpinări contacte"
+msgstr "/Unelte/Î_ntâmpinări pentru contacte"
 
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"
@@ -11582,7 +11595,7 @@
 msgstr "/Unelte/_Transfer de fișiere"
 
 msgid "/Tools/R_oom List"
-msgstr "/Unelte/_Listă camere de chat"
+msgstr "/Unelte/_Lista camerelor de chat"
 
 msgid "/Tools/System _Log"
 msgstr "/Unelte/În_registrări de sistem"
@@ -11690,7 +11703,7 @@
 msgstr "/Unelte/Securitate"
 
 msgid "/Tools/Room List"
-msgstr "/Unelte/Listă camere de chat"
+msgstr "/Unelte/Lista camerelor de chat"
 
 #, c-format
 msgid "%d unread message from %s\n"
@@ -11741,7 +11754,7 @@
 "parte:"
 
 msgid "<b>Username:</b>"
-msgstr "<b>Nume utilizator:</b>"
+msgstr "<b>Nume de utilizator:</b>"
 
 msgid "<b>Password:</b>"
 msgstr "<b>Parolă:</b>"
@@ -11764,8 +11777,8 @@
 "<span weight='bold' size='larger'>Bun venit în %s!</span>\n"
 "\n"
 "Nu aveți niciun cont activ. Activați-vă conturile de mesagerie instant în "
-"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare "
-"conturi</b>. Abia după activare veți putea utiliza conturile definite."
+"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare</b>. "
+"Abia după activare veți putea utiliza conturile definite."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -11786,16 +11799,16 @@
 msgstr "/Contacte/Arată/Iconițele de protocol"
 
 msgid "Add a buddy.\n"
-msgstr "Adaugă un contact.\n"
+msgstr "Adăugați un contact.\n"
 
 msgid "Buddy's _username:"
-msgstr "Nume de _utilizator:"
+msgstr "_Nume de utilizator:"
 
 msgid "(Optional) A_lias:"
-msgstr "A_lias (opțional):"
+msgstr "_Alias (opțional):"
 
 msgid "Add buddy to _group:"
-msgstr "Adaugă contactul în _grupul:"
+msgstr "_Grup:"
 
 msgid "This protocol does not support chat rooms."
 msgstr "Acest protocol nu suportă camere de chat."
@@ -11810,20 +11823,20 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Introduceți un alias și informațiile necesare pentru acel chat pe care "
-"doriți să-l adăugați în lista de contacte.\n"
+"Introduceți un alias și informațiile necesare pentru chat-ul pe care doriți "
+"să-l adăugați în lista de contacte.\n"
 
 msgid "A_lias:"
-msgstr "A_lias:"
+msgstr "_Alias:"
 
 msgid "_Group:"
 msgstr "_Grup:"
 
 msgid "Auto_join when account connects."
-msgstr "Intră a_utomat la autentificarea contului."
+msgstr "I_ntră automat la autentificarea contului."
 
 msgid "_Remain in chat after window is closed."
-msgstr "_Rămâi în chat după închiderea ferestrei."
+msgstr "Rămâi în chat _după închiderea ferestrei."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Introduceți numele grupului de adăugat."
@@ -11934,7 +11947,7 @@
 msgstr "/Discuție/_Mesaj nou..."
 
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Discuție/Intrare într-un _chat..."
+msgstr "/Discuție/Intrare într-un c_hat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Discuție/C_aută..."
@@ -11961,10 +11974,10 @@
 msgstr "/Discuție/Media/Ap_el audio\\/video"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Discuție/_Trimite un fișier..."
+msgstr "/Discuție/Trimite un _fișier..."
 
 msgid "/Conversation/Get _Attention"
-msgstr "/Discuție/Cere _atenție"
+msgstr "/Discuție/Cere a_tenție"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
@@ -11979,7 +11992,7 @@
 msgstr "/Discuție/Mai m_ult"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Discuție/Al_ias..."
+msgstr "/Discuție/A_lias..."
 
 msgid "/Conversation/_Block..."
 msgstr "/Discuție/_Blochează..."
@@ -12170,7 +12183,7 @@
 msgstr "Nu în fereastra chat-urilor"
 
 msgid "New window"
-msgstr "În fereastră nouă"
+msgstr "În ferestre noi"
 
 msgid "By group"
 msgstr "După grup"
@@ -12229,9 +12242,6 @@
 msgid "Fatal Error"
 msgstr "Erori fatale"
 
-msgid "bug master"
-msgstr "admin al rapoartelor de erori"
-
 msgid "artist"
 msgstr "artist"
 
@@ -12411,6 +12421,9 @@
 msgid "Maithili"
 msgstr "Maithili"
 
+msgid "Meadow Mari"
+msgstr "Meadow Mari"
+
 msgid "Macedonian"
 msgstr "Macedoneană"
 
@@ -12826,64 +12839,64 @@
 msgstr "Fără iconițe în _selecție"
 
 msgid "Hyperlink color"
-msgstr "Culoare adresă"
+msgstr "Culoarea adreselor web"
 
 msgid "Color to draw hyperlinks."
-msgstr "Culoare pentru afișarea adreselor."
+msgstr "Culoarea pentru afișarea adreselor web."
 
 msgid "Hyperlink visited color"
-msgstr "Culoare adresă web"
+msgstr "Culoarea adreselor web vizitate"
 
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Culoare pentru afișarea adreselor web vizitate (ori activate)."
+msgstr "Culoarea pentru afișarea adreselor web vizitate (ori activate)."
 
 msgid "Hyperlink prelight color"
-msgstr "Culoare evidențiere adresă"
+msgstr "Culoarea de evidențiere a adresei"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Culoare pentru afișarea adreselor sub cursorul de maus."
+msgstr "Culoarea de afișare a adreselor web sub cursorul de maus."
 
 msgid "Sent Message Name Color"
-msgstr "Culoare pentru mesaje trimise"
+msgstr "Culoarea mesajelor trimise"
 
 msgid "Color to draw the name of a message you sent."
-msgstr "Culoare de utilizat pentru numele mesajelor pe care le trimiteți."
+msgstr "Culoarea de utilizat pentru numele mesajelor pe care le trimiteți."
 
 msgid "Received Message Name Color"
-msgstr "Culoare pentru mesaje primite"
+msgstr "Culoarea mesajelor primite"
 
 msgid "Color to draw the name of a message you received."
-msgstr "Culoare de utilizat pentru numele mesajelor pe care le primiți."
+msgstr "Culoarea de utilizat pentru numele mesajelor pe care le primiți."
 
 msgid "\"Attention\" Name Color"
-msgstr "Culoare de atenționare"
+msgstr "Culoarea de atenționare"
 
 msgid "Color to draw the name of a message you received containing your name."
-msgstr "Culoare de utilizat pentru numele mesajelor ce vă pomenesc numele."
+msgstr "Culoarea de utilizat pentru numele mesajelor ce vă pomenesc numele."
 
 msgid "Action Message Name Color"
-msgstr "Culoare pentru mesajele comenzi"
+msgstr "Culoarea pentru mesajele comenzi"
 
 msgid "Color to draw the name of an action message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoarea de utilizat pentru numele mesajelor de tip comandă."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Culoare pentru mesajele comenzi în mod discret"
+msgstr "Culoarea pentru mesajele comenzi în mod discret"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr "Culoare de utilizat pentru numele mesajelor discrete de acțiune."
+msgstr "Culoarea de utilizat pentru numele mesajelor discrete de acțiune."
 
 msgid "Whisper Message Name Color"
-msgstr "Culoare pentru mesajele discrete"
+msgstr "Culoarea mesajelor discrete"
 
 msgid "Color to draw the name of a whispered message."
-msgstr "Culoare de utilizat pentru numele mesajelor discrete."
+msgstr "Culoarea de utilizat pentru numele mesajelor discrete."
 
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
 msgid "The color to use for the typing notification"
-msgstr "Culoare de utilizat pentru notificarea tastării"
+msgstr "Culoarea de utilizat pentru notificările de tastare"
 
 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
@@ -12951,7 +12964,7 @@
 msgstr "Inserare adresă"
 
 msgid "_Insert"
-msgstr "Inserea_ză"
+msgstr "Ins_erare"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -13009,7 +13022,7 @@
 msgstr "Nume font"
 
 msgid "Foreground Color"
-msgstr "Culoare text"
+msgstr "Culoarea textului"
 
 msgid "Reset Formatting"
 msgstr "Fără formatare"
@@ -13051,16 +13064,16 @@
 msgstr "_Nume font"
 
 msgid "Foreground _color"
-msgstr "Culoare te_xt"
+msgstr "Culoarea te_xtului"
 
 msgid "Bac_kground color"
-msgstr "Culoare f_undal"
+msgstr "Culoarea f_undalului"
 
 msgid "_Image"
 msgstr "_Imagine"
 
 msgid "_Link"
-msgstr "_Link"
+msgstr "_Adresă web"
 
 msgid "_Horizontal rule"
 msgstr "Linie _orizontală"
@@ -13360,13 +13373,13 @@
 msgstr "O_prirea din tastare"
 
 msgid "Sends a _message"
-msgstr "Trimiterea unui _mesaj"
+msgstr "Tr_imiterea unui mesaj"
 
 msgid "Ope_n an IM window"
 msgstr "Desc_hide o discuție"
 
 msgid "_Pop up a notification"
-msgstr "Deschide _o fereastră de notificare"
+msgstr "De_schide o fereastră de notificare"
 
 msgid "Send a _message"
 msgstr "Trimite un mesa_j"
@@ -13387,13 +13400,13 @@
 msgstr "_Testare"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Întâmpinare doar în starea de _indisponibilitate"
+msgstr "Întâmpinare doar în starea de indisponibi_litate"
 
 msgid "_Recurring"
 msgstr "Re_curentă"
 
 msgid "Pounce Target"
-msgstr "Țintă întâmpinare"
+msgstr "Ținta întâmpinării"
 
 msgid "Started typing"
 msgstr "A început să tasteze"
@@ -13493,7 +13506,7 @@
 msgstr "Pentru mesajele necitite"
 
 msgid "Conversation Window"
-msgstr "Fereastra de discuții"
+msgstr "Fereastră de discuții"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -13515,7 +13528,7 @@
 msgstr "Arată _butoanele de închidere a taburilor"
 
 msgid "_Placement:"
-msgstr "_Plasament:"
+msgstr "_Plasare:"
 
 msgid "Top"
 msgstr "Sus"
@@ -13536,7 +13549,7 @@
 msgstr "Vertical in dreapta"
 
 msgid "N_ew conversations:"
-msgstr "D_iscuții noi:"
+msgstr "Di_scuții noi:"
 
 msgid "Show _formatting on incoming messages"
 msgstr "_Păstrează formatarea mesajelor primite"
@@ -13554,7 +13567,7 @@
 msgstr "Notifică contactele când le scri_u"
 
 msgid "Highlight _misspelled words"
-msgstr "_Evidențiază greșelile de ortografie"
+msgstr "E_vidențiază greșelile de ortografie"
 
 msgid "Use smooth-scrolling"
 msgstr "Derulare cu efect"
@@ -13598,7 +13611,7 @@
 msgstr "Utilizează adresa IP _autodetectată: %s"
 
 msgid "ST_UN server:"
-msgstr "Server ST_UN:"
+msgstr "Ser_ver STUN:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
@@ -13610,7 +13623,7 @@
 msgstr "Porturi"
 
 msgid "_Enable automatic router port forwarding"
-msgstr "Acti_vează automat „port forwarding” în ruter"
+msgstr "Activea_ză automat „port forwarding” în ruter"
 
 msgid "_Manually specify range of ports to listen on:"
 msgstr "_Specificați intervalul de porturi:"
@@ -13632,7 +13645,7 @@
 msgstr "Port _UDP:"
 
 msgid "Use_rname:"
-msgstr "_Nume utilizator:"
+msgstr "_Nume de utilizator:"
 
 msgid "Pass_word:"
 msgstr "_Parolă:"
@@ -13684,7 +13697,7 @@
 msgstr "Chromium (chrome)"
 
 msgid "Manual"
-msgstr "Manual"
+msgstr "Personalizat"
 
 msgid "Browser Selection"
 msgstr "Navigator preferat"
@@ -13702,23 +13715,23 @@
 msgstr "_Navigator:"
 
 msgid "_Open link in:"
-msgstr "_Deschide adresa:"
+msgstr "_Deschide adresele web:"
 
 msgid "Browser default"
-msgstr "După cum e setat navigatorul"
+msgstr "Respectând opțiunile navigatorului"
 
 msgid "Existing window"
-msgstr "Într-o fereastră existentă"
+msgstr "În ferestre existente"
 
 msgid "New tab"
-msgstr "Într-un tab nou"
+msgstr "În taburi noi"
 
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
-"_Manual:\n"
+"_Personalizat:\n"
 "(%s pentru adresă)"
 
 msgid "Proxy Server"
@@ -13748,7 +13761,7 @@
 msgstr "P_ort:"
 
 msgid "User_name:"
-msgstr "_Nume utilizator:"
+msgstr "_Nume de utilizator:"
 
 msgid "Log _format:"
 msgstr "_Formatul înregistrărilor:"
@@ -13803,7 +13816,7 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"Comandă de _redare sunet\n"
+"Comandă de _redare audio\n"
 "(%s pentru numele fișierului)"
 
 msgid "M_ute sounds"
@@ -13853,7 +13866,7 @@
 msgstr "Utilizează _ultimul status"
 
 msgid "Status to a_pply at startup:"
-msgstr "Status de utilizat la _pornire:"
+msgstr "Status de utili_zat la pornire:"
 
 msgid "Interface"
 msgstr "Interfață"
@@ -14006,7 +14019,7 @@
 msgstr "Editare iconiță simbolică"
 
 msgid "Add Smiley"
-msgstr "Adăugare iconiță simbolică"
+msgstr "Adăugați o iconiță simbolică"
 
 msgid "_Image:"
 msgstr "_Imagine:"
@@ -14016,7 +14029,7 @@
 msgstr "_Textul combinației de semne"
 
 msgid "Smiley"
-msgstr "Iconiță simbolice"
+msgstr "Iconiță simbolică"
 
 msgid "Shortcut Text"
 msgstr "Textul combinației de semne"
@@ -14078,7 +14091,7 @@
 "use it as the buddy icon for this user."
 msgstr ""
 "Puteți trimite această imagine printr-un transfer de fișiere, o puteți "
-"insera în acest mesaj sau o puteți seta ca avatar pentru acest contact."
+"insera în acest mesaj sau o puteți utiliza ca avatar pentru acest contact."
 
 msgid "Set as buddy icon"
 msgstr "Utilizează ca avatar"
@@ -14090,20 +14103,20 @@
 msgstr "Inserează în mesaj"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Doriți să o setați ca avatar pentru acest contact?"
+msgstr "Doriți să o utilizați ca avatar pentru acest contact?"
 
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 "Puteți trimite această imagine printr-un transfer de fișiere sau o puteți "
-"seta ca avatar pentru acest contact."
+"utiliza ca avatar pentru acest contact."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Puteți insera imaginea în acest mesaj sau o puteți seta ca avatar pentru "
+"Puteți insera imaginea în acest mesaj sau o puteți utiliza ca avatar pentru "
 "acest contact."
 
 #. I don't know if we really want to do anything here.  Most of
@@ -14145,7 +14158,7 @@
 msgstr "Nu s-a putut utiliza iconița"
 
 msgid "_Open Link"
-msgstr "_Deschide linkul"
+msgstr "_Deschide adresa"
 
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
@@ -14192,7 +14205,7 @@
 msgstr "_Invită"
 
 msgid "_Modify..."
-msgstr "_Modifică..."
+msgstr "E_ditare..."
 
 msgid "_Add..."
 msgstr "_Adaugă..."
@@ -14254,7 +14267,7 @@
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Modul pentru disponibilitatea contactelor"
+msgstr "Modul pentru prevederea disponibilității contactelor."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
@@ -14391,7 +14404,7 @@
 msgstr "Descoperire de servicii"
 
 msgid "_Browse"
-msgstr "_Navigare:"
+msgstr "_Navigare"
 
 msgid "Server does not exist"
 msgstr "Server inexistent"
@@ -14403,7 +14416,7 @@
 msgstr "Descoperire de servicii XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr "Permite navigarea și înregistrarea serviciilor"
+msgstr "Permite navigarea și înregistrarea de servicii XMPP."
 
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
@@ -14416,7 +14429,7 @@
 msgstr "După numărul discuțiilor"
 
 msgid "Conversation Placement"
-msgstr "Plasament discuții"
+msgstr "Plasarea discuțiilor"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 msgid ""
@@ -14440,12 +14453,12 @@
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr "Ferestre extra"
+msgstr "Plasare extra"
 
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "Opțiuni de plasare a discuțiilor în plus."
+msgstr "Opțiuni suplimentare de plasare a discuțiilor."
 
 #. *< summary
 #. *  description
@@ -14651,7 +14664,7 @@
 msgstr "Adaugă o căsuță în lista de contacte care vă anunță mailurile noi."
 
 msgid "Markerline"
-msgstr "Marcaj mesaje noi"
+msgstr "Marcaj pentru mesaje noi"
 
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Marchează cu o linie mesajele noi dintr-o discuție."
@@ -14790,7 +14803,7 @@
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "Notificări mesaje"
+msgstr "Notificări pentru mesaje"
 
 #. *< name
 #. *< version
@@ -14827,10 +14840,10 @@
 "- Trimite un mesaj contactelor din listă atunci când se autentifică."
 
 msgid "Hyperlink Color"
-msgstr "Culoare adresă web"
+msgstr "Culoarea adresei web"
 
 msgid "Visited Hyperlink Color"
-msgstr "Culoare adresă web vizitată"
+msgstr "Culoarea adresei web vizitate"
 
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidențierea mesajelor"
@@ -14845,13 +14858,13 @@
 msgstr "Introducere text"
 
 msgid "Conversation History"
-msgstr "Istoricul discuției"
+msgstr "Înregistrări de discuții"
 
 msgid "Request Dialog"
-msgstr "Dialog cerere"
+msgstr "Fereastră de dialog"
 
 msgid "Notify Dialog"
-msgstr "Dialog notificare"
+msgstr "Fereastră de notificare"
 
 msgid "Select Color"
 msgstr "Alegeți o culoare"
@@ -14865,10 +14878,10 @@
 msgstr "Alegeți un font pentru %s"
 
 msgid "GTK+ Interface Font"
-msgstr "Font interfață GTK+"
+msgstr "Fontul interfeței GTK+"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Temă combinații de taste GTK+ Text"
+msgstr "Tema de combinații de taste GTK+ Text"
 
 msgid "Disable Typing Notification Text"
 msgstr "Dezactivează textul notificării la tastare"
@@ -14896,7 +14909,7 @@
 msgstr "Recitește fișierele gtkrc"
 
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Modificare a temei GTK+ în Pidgin"
 
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Permite accesul la cele mai uzuale opțiuni gtkrc."
@@ -14935,7 +14948,7 @@
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "Notificări versiuni noi"
+msgstr "Notificări pentru versiuni noi"
 
 #. *< name
 #. *< version
@@ -14965,7 +14978,7 @@
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
-msgstr "Buton de trimitere în fereastra de discuții"
+msgstr "Buton de trimitere în fereastra de discuții."
 
 #. *< summary
 msgid ""
@@ -15019,10 +15032,10 @@
 msgstr "Activează corectarea ultimului cuvânt la trimitere"
 
 msgid "Text replacement"
-msgstr "Corecturi text"
+msgstr "Corecturi de text"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
+msgstr "Schimbă mesajele trimise după reguli predefinite."
 
 msgid "Just logged in"
 msgstr "Tocmai s-a autentificat"
@@ -15148,7 +15161,7 @@
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "Marcaje de timp în stil iChat"
+msgstr "Marcaje de timp în stil iChat."
 
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
@@ -15192,7 +15205,7 @@
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Formatare marcaje de timp"
+msgstr "Formatare pentru marcajele de timp"
 
 #. *< name
 #. *< version
@@ -15370,7 +15383,7 @@
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Trimitere și primire blocuri XMPP brute"
+msgstr "Trimitere și primire de blocuri XMPP brute"
 
 #. *  description
 msgid "This plugin is useful for debugging XMPP servers or clients."
@@ -15519,6 +15532,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nu aveţi drepturile de acces necesare dezinstalării acestei aplicaţii."
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr ""
+#~ "Refuză automat pentru utilizatorii ce nu fac parte din lista de contacte"
+
+#~ msgid "bug master"
+#~ msgstr "admin al rapoartelor de erori"
+
 #~ msgid "Error requesting %s"
 #~ msgstr "Eroare la cererea %s"
 
--- a/po/ru.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/ru.po	Sun Feb 06 05:26:52 2011 +0000
@@ -3,14 +3,14 @@
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
 # Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2008.
-# Антон Самохвалов <samant.ua@mail.ru>, 2008-2010.
+# Антон Самохвалов <samant.ua@mail.ru>, 2008-2011.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -1277,9 +1277,8 @@
 msgid "Someone says your username in chat"
 msgstr "Кто-то произносит ваше имя пользователя в чате"
 
-#, fuzzy
 msgid "Attention received"
-msgstr "Требуется активация"
+msgstr "Получено внимание"
 
 msgid "GStreamer Failure"
 msgstr "Ошибка GStreamer"
@@ -1566,10 +1565,10 @@
 msgid "TinyURL plugin"
 msgstr "Модуль TinyURL"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
-"При получении сообщения с адресами URL, TinyURL для облегчённого копирования"
+"При получении сообщения с адресами URL, использовать TinyURL для облегчения "
+"копирования"
 
 msgid "Online"
 msgstr "В сети"
@@ -1667,13 +1666,11 @@
 msgid "Set User Info"
 msgstr "Установить пользовательскую информацию"
 
-#, fuzzy
 msgid "This protocol does not support setting a public alias."
-msgstr "Этот протокол не поддерживает чаты."
-
-#, fuzzy
+msgstr "Этот протокол не поддерживает установку общего доменного имени."
+
 msgid "This protocol does not support fetching the public alias."
-msgstr "Этот протокол не поддерживает чаты."
+msgstr "Этот протокол не поддерживает получение общего доменного имени."
 
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -1702,13 +1699,12 @@
 "Сертификат ещё не подтверждён.  Проверьте правильность даты и времени на "
 "вашем компьютере."
 
-#, fuzzy
 msgid ""
 "The certificate has expired and should not be considered valid.  Check that "
 "your computer's date and time are accurate."
 msgstr ""
-"Сертификат ещё не подтверждён.  Проверьте правильность даты и времени на "
-"вашем компьютере."
+"Срок сертификата истёк и его больше нельзя считать действительным.  "
+"Проверьте правильность времени и даты на вашем компьютере."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -2361,8 +2357,11 @@
 "Сохранять файлы в\n"
 "(укажите полный путь)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "Отвергать автоматически от пользователей не из списка собеседников"
+#, fuzzy
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr "При поступлении запроса передачи файлов от %s"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2375,6 +2374,10 @@
 msgid "Create a new directory for each user"
 msgstr "Создайте для каждого пользователя новую папку"
 
+#, fuzzy
+msgid "Escape the filenames"
+msgstr "%s отменил передачу файла"
+
 msgid "Notes"
 msgstr "Заметки"
 
@@ -3838,7 +3841,10 @@
 msgstr ""
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Неверный отклик от сервера"
 
@@ -3900,21 +3906,20 @@
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
-
-#, fuzzy
+"Этот сервер не поддерживает привязку канала, но не выглядит его рекламой. "
+"Это говорит о возможной MITM атаке"
+
 msgid "Server does not support channel binding"
-msgstr "Сервер не поддерживает блокировку"
-
-#, fuzzy
+msgstr "Сервер не поддерживает привязку канала"
+
 msgid "Unsupported channel binding method"
-msgstr "Неподдерживаемая кодировка"
+msgstr "Неподдерживаемый метод привязки канала"
 
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "Неверное имя пользователя"
+msgstr "Неверная кодировка имя пользователя"
 
 msgid "Resource Constraint"
 msgstr "Недостаток ресурсов"
@@ -4367,15 +4372,13 @@
 msgstr "Текст настроения"
 
 msgid "Allow Buzz"
-msgstr "Разрешить сплетни"
-
-#, fuzzy
+msgstr "Разрешить оклики"
+
 msgid "Mood Name"
-msgstr "Отчество"
-
-#, fuzzy
+msgstr "Имя настроения"
+
 msgid "Mood Comment"
-msgstr "Комментарий собеседника"
+msgstr "Комментарий настроения"
 
 #. primitive
 #. ID
@@ -4631,7 +4634,7 @@
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s позвал вас!"
+msgstr "%s окликнул вас!"
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4645,19 +4648,18 @@
 msgid "Unable to initiate media with %s: user is not online"
 msgstr "Обмен файлами с %s не удаётся: пользователь не в сети"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr ""
-"Обмен файлами с %s не удаётся: нет подписки на присутствие пользователя"
+msgstr "Обмен файлами с %s не удался: нет подписки на присутствие пользователя"
 
 msgid "Media Initiation Failed"
 msgstr "Обмен файлами не удался"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Выберите ресурс %s, которому вы хотели бы отправить файл"
+msgstr "Выберите ресурс %s, с которым вы хотели бы начать обмен файлами"
 
 msgid "Select a Resource"
 msgstr "Выбрать ресурс"
@@ -4723,11 +4725,10 @@
 msgstr "прозвон &lt;jid&gt;:\tПрозвонить пользователя/компонент/сервер."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "трёп: окликнуть пользователя, чтобы привлечь его внимание"
-
-#, fuzzy
+msgstr "оклик: окликнуть пользователя, чтобы привлечь его внимание"
+
 msgid "mood: Set current user mood"
-msgstr "Выберите корректного пользователя"
+msgstr "настроение: Установите текущее настроение пользователя"
 
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
@@ -4749,20 +4750,17 @@
 msgid "Domain"
 msgstr "Домен"
 
-#, fuzzy
 msgid "Require encryption"
-msgstr "Требовать авторизацию"
-
-#, fuzzy
+msgstr "Требовать шифрование"
+
 msgid "Use encryption if available"
-msgstr "Пользовательская информация для %s недоступна"
+msgstr "Если доступно, использовать шифрование"
 
 msgid "Use old-style SSL"
-msgstr ""
-
-#, fuzzy
+msgstr "Использовать SSL старого образца"
+
 msgid "Connection security"
-msgstr "Сброс соединения"
+msgstr "Безопасность соединения"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
@@ -4892,31 +4890,26 @@
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Выберите ресурс %s, которому вы хотели бы отправить файл"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Арабский"
-
-#, fuzzy
+msgstr "Боязливый"
+
 msgid "Amazed"
-msgstr "Стыдящийся"
-
-#, fuzzy
+msgstr "Изумлённый"
+
 msgid "Amorous"
-msgstr "Великолепный"
+msgstr "Влюбчивый"
 
 msgid "Angry"
 msgstr "Рассерженный"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Изгнан"
+msgstr "Раздражённый"
 
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Вы отправляете"
+msgstr "Возбуждённый"
 
 msgid "Ashamed"
 msgstr "Стыдящийся"
@@ -4924,82 +4917,65 @@
 msgid "Bored"
 msgstr "Скучающий"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Сохранить"
-
-#, fuzzy
+msgstr "Храбрый"
+
 msgid "Calm"
-msgstr "Сфера"
-
-#, fuzzy
+msgstr "Тихий"
+
 msgid "Cautious"
-msgstr "Чаты"
-
-#, fuzzy
+msgstr "Осторожный"
+
 msgid "Cold"
-msgstr "Жирный"
-
-#, fuzzy
+msgstr "Холодный"
+
 msgid "Confident"
-msgstr "Конфликт"
-
-#, fuzzy
+msgstr "Уверенный"
+
 msgid "Confused"
-msgstr "Продолжить"
-
-#, fuzzy
+msgstr "Обескураженный"
+
 msgid "Contemplative"
-msgstr "Контакт"
-
-#, fuzzy
+msgstr "Задумчивый"
+
 msgid "Contented"
-msgstr "Соединение установлено"
-
-#, fuzzy
+msgstr "Довольный"
+
 msgid "Cranky"
-msgstr "Компания"
+msgstr "Капризный"
 
 msgid "Crazy"
-msgstr ""
-
-#, fuzzy
+msgstr "Сумасшедший"
+
 msgid "Creative"
-msgstr "Создать"
-
-#, fuzzy
+msgstr "Творческий"
+
 msgid "Curious"
-msgstr "Великолепный"
-
-#, fuzzy
+msgstr "Любопытный"
+
 msgid "Dejected"
-msgstr "Отклонено"
-
-#, fuzzy
+msgstr "Удручённый"
+
 msgid "Depressed"
-msgstr "Удалено"
-
-#, fuzzy
+msgstr "Подавленный"
+
 msgid "Disappointed"
-msgstr "Соединение разорвано."
+msgstr "Разочарованный"
 
 msgid "Disgusted"
-msgstr ""
-
-#, fuzzy
+msgstr "Отвращающий"
+
 msgid "Dismayed"
-msgstr "Отключено"
-
-#, fuzzy
+msgstr "Встревоженный"
+
 msgid "Distracted"
-msgstr "Независимый"
+msgstr "Рассеянный"
 
 msgid "Embarrassed"
-msgstr ""
-
-#, fuzzy
+msgstr "Стеснительный"
+
 msgid "Envious"
-msgstr "Озабоченный"
+msgstr "Завистливый"
 
 msgid "Excited"
 msgstr "Возбуждённый"
@@ -5469,9 +5445,8 @@
 msgid "Other Locations"
 msgstr "Местоположение пользователя"
 
-#, fuzzy
 msgid "You can sign out from other locations here"
-msgstr "Вы уже откуда-то подключены"
+msgstr "Здесь Вы можете отключиться из других мест"
 
 #. TODO: Due to limitations in our current request field API, the
 #. following string will show up with a trailing colon.  This should
@@ -5479,18 +5454,16 @@
 #. a separate purple_request_field_label_new_without_colon function,
 #. or by never automatically adding the colon and requiring that
 #. callers add the colon themselves.
-#, fuzzy
 msgid "You are not signed in from any other locations."
-msgstr "Вы уже откуда-то подключены"
-
-#, fuzzy
+msgstr "Вы ниоткуда не вошли в сеть."
+
 msgid "Allow multiple logins?"
-msgstr "Разрешить одновременный вход с разных мест"
+msgstr "Разрешить одновременные входы с разных мест?"
 
 msgid ""
 "Do you want to allow or disallow connecting from multiple locations "
 "simultaneously?"
-msgstr ""
+msgstr "Вы разрешаете одновременный вход в сеть из разных мест или нет?"
 
 msgid "Allow"
 msgstr "Разрешить"
@@ -5812,12 +5785,11 @@
 msgid "Show custom smileys"
 msgstr "Показать свои смайлики"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "Не удаётся создать соединение"
+msgstr "Разрешить прямые соединения"
 
 msgid "Allow connecting from multiple locations"
-msgstr ""
+msgstr "Разрешить соединения из нескольких мест"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "подталкивание: подтолкнуть пользователя, чтобы привлечь его внимание"
@@ -5825,13 +5797,11 @@
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Аутентификация Windows Live ID: не могу соединиться"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Аутентификация Windows Live ID: неверный ответ"
-
-#, fuzzy
+msgstr "Аутентификация Windows Live ID:некорректный ответ"
+
 msgid "The following users are missing from your addressbook"
-msgstr "Следующие пользователи отсутствуют в вашей адресной книге"
+msgstr "Следующие пользователи из вашей адресной книги отсутствуют"
 
 #, c-format
 msgid "Unknown error (%d): %s"
@@ -6043,9 +6013,8 @@
 msgid "The two PINs you entered do not match."
 msgstr "Два введённых PIN-кода не совпадают."
 
-#, fuzzy
 msgid "The Display Name you entered is invalid."
-msgstr "Введённое имя неправильное."
+msgstr "Введённое Вами имя отображения некорректно."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -6065,7 +6034,7 @@
 "Информация о вашем профиле ещё не получена. Пожалуйста, попробуйте позже."
 
 msgid "Your UID"
-msgstr ""
+msgstr "Ваш UID"
 
 #. pin
 #. pin (required)
@@ -6128,26 +6097,23 @@
 msgid "Logging In..."
 msgstr "Входит в сеть..."
 
-#, fuzzy
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Не удаётся соединиться с сервером MXit. Пожалуйста, проверьте ваши настройки "
-"сервера."
+"Не удаётся соединиться с сервером MXit. Пожалуйста, проверьте настройки "
+"вашего сервера."
 
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "Введённый ключ SecurID неверный."
+msgstr "Введённый Вами PIN-код неправильной длины [7-10]."
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
 msgstr "Зарегистрировать новую учётную запись MXit"
 
@@ -6212,6 +6178,24 @@
 msgid "Retrieving User Information..."
 msgstr "Получение информации о пользователе..."
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Вас выгнали: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Неверный билет"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Комната:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Вам пришла почта!"
+
 msgid "Loading menu..."
 msgstr "Загрузка меню..."
 
@@ -6241,24 +6225,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Включить контекстное меню экрана-заставки"
 
-#. you were kicked
-#, fuzzy
-msgid "You have been kicked from this MultiMX."
-msgstr "Вас выгнали: (%s)"
-
-#, fuzzy
-msgid "was kicked"
-msgstr "Неверный билет"
-
-#, fuzzy
-msgid "_Room Name:"
-msgstr "_Комната:"
-
-#. Display system message in chat window
-#, fuzzy
-msgid "You have invited"
-msgstr "Вам пришла почта!"
-
 #, fuzzy
 msgid "Last Online"
 msgstr "В сети"
@@ -7047,6 +7013,8 @@
 "You required encryption in your account settings, but one of the servers "
 "doesn't support it."
 msgstr ""
+"Вы запросили шифрование настройками учётной записи, но один из серверов его "
+"не поддерживает"
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
@@ -7054,9 +7022,8 @@
 msgid "Error requesting %s: %s"
 msgstr "Ошибка запроса %s: %s"
 
-#, fuzzy
 msgid "The server returned an empty response"
-msgstr "Не удаётся соединиться: сервер вернул пустой ответ."
+msgstr "Сервер ответил тишиной"
 
 msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
@@ -7365,6 +7332,8 @@
 "You required encryption in your account settings, but encryption is not "
 "supported by your system."
 msgstr ""
+"Вы запросили шифрование настройками учётной записи, но ваша система не "
+"поддерживает его."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7973,75 +7942,6 @@
 "Картинок IM. Поскольку ваш IP-адрес будет открыт, это может повлечь угрозу "
 "конфиденциальности."
 
-msgid "Invalid SNAC"
-msgstr "Неверный SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Превышен предел скорости сервера"
-
-msgid "Client rate limit exceeded"
-msgstr "Превышен предел скорости клиента"
-
-msgid "Service unavailable"
-msgstr "Служба недоступна"
-
-msgid "Service not defined"
-msgstr "Служба не определена"
-
-msgid "Obsolete SNAC"
-msgstr "Устаревший SNAC"
-
-msgid "Not supported by host"
-msgstr "Не поддерживается узлом"
-
-msgid "Not supported by client"
-msgstr "Не поддерживается клиентом"
-
-msgid "Refused by client"
-msgstr "Отвергнуто клиентом"
-
-msgid "Reply too big"
-msgstr "Ответ слишком велик"
-
-msgid "Responses lost"
-msgstr "Отклики потеряны"
-
-msgid "Request denied"
-msgstr "Запрос отвергнут"
-
-msgid "Busted SNAC payload"
-msgstr "Сломана полезная нагрузка SNAC"
-
-msgid "Insufficient rights"
-msgstr "Недостаточные права"
-
-msgid "In local permit/deny"
-msgstr "В местном разрешении/запрете"
-
-msgid "Warning level too high (sender)"
-msgstr "Уровень предупреждения слишком высок (отправитель)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Уровень предупреждения слишком высок (получатель)"
-
-msgid "User temporarily unavailable"
-msgstr "Пользователь временно недоступен"
-
-msgid "No match"
-msgstr "Нет совпадения"
-
-msgid "List overflow"
-msgstr "Переполнение списка"
-
-msgid "Request ambiguous"
-msgstr "Неясный запрос"
-
-msgid "Queue full"
-msgstr "Очередь полна"
-
-msgid "Not while on AOL"
-msgstr "Не в AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Значок собеседника"
@@ -8160,58 +8060,122 @@
 msgid "Capabilities"
 msgstr "Возможности"
 
+msgid "Invalid SNAC"
+msgstr "Неверный SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Превышен предел скорости сервера"
+
+msgid "Client rate limit exceeded"
+msgstr "Превышен предел скорости клиента"
+
+msgid "Service unavailable"
+msgstr "Служба недоступна"
+
+msgid "Service not defined"
+msgstr "Служба не определена"
+
+msgid "Obsolete SNAC"
+msgstr "Устаревший SNAC"
+
+msgid "Not supported by host"
+msgstr "Не поддерживается узлом"
+
+msgid "Not supported by client"
+msgstr "Не поддерживается клиентом"
+
+msgid "Refused by client"
+msgstr "Отвергнуто клиентом"
+
+msgid "Reply too big"
+msgstr "Ответ слишком велик"
+
+msgid "Responses lost"
+msgstr "Отклики потеряны"
+
+msgid "Request denied"
+msgstr "Запрос отвергнут"
+
+msgid "Busted SNAC payload"
+msgstr "Сломана полезная нагрузка SNAC"
+
+msgid "Insufficient rights"
+msgstr "Недостаточные права"
+
+msgid "In local permit/deny"
+msgstr "В местном разрешении/запрете"
+
+msgid "Warning level too high (sender)"
+msgstr "Уровень предупреждения слишком высок (отправитель)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Уровень предупреждения слишком высок (получатель)"
+
+msgid "User temporarily unavailable"
+msgstr "Пользователь временно недоступен"
+
+msgid "No match"
+msgstr "Нет совпадения"
+
+msgid "List overflow"
+msgstr "Переполнение списка"
+
+msgid "Request ambiguous"
+msgstr "Неясный запрос"
+
+msgid "Queue full"
+msgstr "Очередь полна"
+
+msgid "Not while on AOL"
+msgstr "Не в AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
 msgid "Appear Online"
-msgstr "Появляется в сети"
+msgstr "Видимый для всех"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear offline to the chosen user when your status is set to
 #. Invisible (this is the default).
-#, fuzzy
 msgid "Don't Appear Online"
-msgstr "Появляется в сети"
+msgstr "Невидимый лишь для избранных"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to always appear offline to the chosen user (even when your status
 #. isn't Invisible).
 msgid "Appear Offline"
-msgstr "Вероятно не в сети"
+msgstr "Невидимый для всех"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear offline to the chosen user if you are invisible, and
 #. appear online to the chosen user if you are not invisible (this is the
 #. default).
-#, fuzzy
 msgid "Don't Appear Offline"
-msgstr "Вероятно не в сети"
-
-#, fuzzy
+msgstr "Невидимый для избранных"
+
 msgid "you have no buddies on this list"
-msgstr "Вас выгнали: (%s)"
-
-#, fuzzy, c-format
+msgstr "в этом списке у вас нет собеседников"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
-"них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
-
-#, fuzzy
+"Вы можете добавить собеседника в этот список правым щелчком мыши, выбрав "
+"затем \"%s\""
+
 msgid "Visible List"
-msgstr "Видимый"
+msgstr "Список видимости"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "Эти собеседники увидят ваш статус при переключении в \"Невидимый\""
+
 msgid "Invisible List"
-msgstr "Список приглашённых"
+msgstr "Список невидимости"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "Эти собеседники никогда не увидят вас в сети"
 
 msgid "Aquarius"
 msgstr "Водолей"
@@ -8811,14 +8775,14 @@
 msgid "Select Server"
 msgstr "Выберите сервер"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "Соединение по TCP"
@@ -11768,9 +11732,8 @@
 msgid "/Tools/Pr_ivacy"
 msgstr "/Средства/К_онфиденциальность"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Средства/Системный _журнал"
+msgstr "/Средства/Установить н_астроение"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Средства/Передача _файлов"
@@ -11791,20 +11754,17 @@
 msgid "/Help/Online _Help"
 msgstr "/Помощь/Помощь в _сети"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Информация о собеседнике"
+msgstr "/Помощь/Информация о с_борке"
 
 msgid "/Help/_Debug Window"
 msgstr "/Помощь/Окно _отладки"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Информация о сервере"
-
-#, fuzzy
+msgstr "/Помощь/Информация о разработ_чике"
+
 msgid "/Help/_Translator Information"
-msgstr "Персональная информация"
+msgstr "/Помощь/Информация о перево_дчике"
 
 msgid "/Help/_About"
 msgstr "/Помощь/О _программе"
@@ -12426,9 +12386,6 @@
 msgid "Fatal Error"
 msgstr "Неисправимая ошибка"
 
-msgid "bug master"
-msgstr "мастер глюков"
-
 msgid "artist"
 msgstr "исполнитель"
 
@@ -12611,6 +12568,10 @@
 msgid "Maithili"
 msgstr "Суахили"
 
+#, fuzzy
+msgid "Meadow Mari"
+msgstr "Новая почта"
+
 msgid "Macedonian"
 msgstr "Македонский"
 
@@ -12727,7 +12688,7 @@
 msgid "Lithuanian"
 msgstr "Литовский"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
@@ -12736,15 +12697,12 @@
 "copyrighted by its contributors, a list of whom is also distributed with "
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s - графический модульный клиент обмена сообщениями, основывающийся на "
-"библиотеке libpurple, позволяющей использовать AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu и QQ одновременно.  Написан с использованием GTK+."
-"<BR><BR>Вы можете изменять и распространять программу по условиям GPL "
-"(версии 2 или более поздней).  Копия GPL содержится в файле 'COPYING', "
-"распространяемом с %s.  Авторские права на %s принадлежат участникам "
-"проекта.  Полный список участников проекта смотрите в файле 'COPYRIGHT'.  Мы "
-"не предоставляем никаких гарантий на эту программу.<BR><BR>"
+"%s - клиент обмена сообщениями, основанный на библиотеке libpurple, которая "
+"позволяет одновременно подключаться по нескольким службам. %s написан на С с "
+"использованием GTK+. %s выпущен, и может быть изменён или перераспределён, "
+"по условиям GPL версии 2 (или поздней).  Копия GPL распространяется вместе с "
+"%s. Права на %s защищены его участниками, список которых также "
+"распространяется с %s.  Гарантия на %s не предоставляется. <BR><BR>"
 
 #, c-format
 msgid ""
@@ -12753,8 +12711,11 @@
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\"><B>Полезные ресурсы</B></FONT><BR>\t<A HREF=\"%s\">Веб-"
+"сайт</A><BR>\t<A HREF=\"%s\">Часто задаваемые вопросы</A><BR>\tIRC канал: "
+"#pidgin на irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
+
+#, c-format
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
@@ -12764,25 +12725,25 @@
 "welcome to post in another language, but the responses may be less helpful."
 "<br/>"
 msgstr ""
-"<font size=\"4\">Помощь от других пользователей Pidgin:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Это <b>публичная</b> "
-"почтовая рассылка! (<a href=\"http://pidgin.im/pipermail/support/\">архив</"
-"a>)<br/>Мы не можем помочь по сторонним протоколам или модулям!<br/>Основной "
-"язык этой рассылки - <b>английский</b>.  Вы, конечно, можете писать на "
-"другом языке, но ответы могут быть менее полезными.<br/><br/>"
+"<font size=\"4\"><b>Помощь от других пользователей Pidgin</b></font> "
+"доступна по эл.почте <a href=\"mailto:support@pidgin.im\">support@pidgin.im</"
+"a><br/>Это <b>публичная</b> почтовая рассылка! (<a href=\"http://pidgin.im/"
+"pipermail/support/\">архив</a>)<br/>Мы не можем помочь по протоколам или "
+"модулям третьих лиц!<br/>Основной язык этой рассылки - <b>английский</b>.  "
+"Вы, конечно, можете писать на другом языке, но ответы могут оказаться менее "
+"полезными.<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "О %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Информация о собеседнике"
+msgstr "Информация о сборке"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Информация о собеседнике"
+msgstr "Информация о сборке %s"
 
 msgid "Current Developers"
 msgstr "Текущие разработчики"
@@ -13210,7 +13171,7 @@
 msgstr "Уменьшить размер шрифта"
 
 msgid "Font Face"
-msgstr "Облик шрифта"
+msgstr "Вид шрифта"
 
 msgid "Foreground Color"
 msgstr "Цвет текста"
@@ -13224,9 +13185,8 @@
 msgid "Insert Smiley"
 msgstr "Вставить смайлик"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Кнопка отправки"
+msgstr "Обратить внимание"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Жирный</b>"
@@ -13253,7 +13213,7 @@
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
 msgid "_Font face"
-msgstr "_Облик шрифта"
+msgstr "_Вид шрифта"
 
 msgid "Foreground _color"
 msgstr "Цвет _текста"
@@ -13405,13 +13365,11 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Выхожу, потому что уже запущен другой клиент libpurple.\n"
 
-#, fuzzy
 msgid "_Media"
 msgstr "/_Медиа"
 
-#, fuzzy
 msgid "_Hangup"
-msgstr "Приостановить разговор"
+msgstr "_Удержать звонок"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13471,9 +13429,8 @@
 msgid "Dismiss"
 msgstr "Распустить"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">На вас набросились!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Следующие модули будут выгружены."
@@ -13660,14 +13617,13 @@
 msgstr "Выборы тем"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Из списка ниже, выберите тему смайликов, которую вы бы хотели использовать.\n"
-" Новые темы можно установить перетаскиванием их в список тем."
+"Из списка ниже выберите тему, которую вы хотели бы использовать.\n"
+"Новые темы можно установить перетаскиванием их в список тем."
 
 msgid "Buddy List Theme:"
 msgstr "Тема Списка собеседников:"
@@ -13817,9 +13773,8 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Разрешить автоматическую переадресацию портов маршрутизатора"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Указать диапазон прослушиваемых портов _вручную"
+msgstr "Указать диапазон прослушивае_мых портов вручную:"
 
 msgid "_Start:"
 msgstr "_Начало:"
@@ -13834,9 +13789,8 @@
 msgid "_TURN server:"
 msgstr "_TURN сервер:"
 
-#, fuzzy
 msgid "_UDP Port:"
-msgstr "П_орт:"
+msgstr "_UDP порт:"
 
 msgid "Use_rname:"
 msgstr "Им_я пользователя:"
@@ -13860,7 +13814,7 @@
 msgstr "Konqueror"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -13884,11 +13838,11 @@
 
 #. Translators: please do not translate "chromium-browser" here!
 msgid "Chromium (chromium-browser)"
-msgstr ""
+msgstr "Chromium (chromium-browser)"
 
 #. Translators: please do not translate "chrome" here!
 msgid "Chromium (chrome)"
-msgstr ""
+msgstr "Chromium (chrome)"
 
 msgid "Manual"
 msgstr "Другой"
@@ -13931,7 +13885,6 @@
 msgid "Proxy Server"
 msgstr "Прокси-сервер"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr "Настройки прокси выставляются в настройках GNOME"
 
@@ -14236,13 +14189,11 @@
 msgid "Select Buddy Icon"
 msgstr "Выбрать иконку собеседника"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "Щёлкните, чтобы изменить свою иконку для этой учётной записи."
-
-#, fuzzy
+msgstr "Щёлкните, чтобы изменить иконку для этой учётной записи."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Щёлкните, чтобы изменить свою иконку для всех учётных записей."
+msgstr "Щёлкните, чтобы изменить иконку для всех учётных записей."
 
 msgid "Waiting for network connection"
 msgstr "Ожидание сетевого соединения"
@@ -14260,7 +14211,7 @@
 msgstr "Google-общение"
 
 msgid "Facebook (XMPP)"
-msgstr ""
+msgstr "Facebook (XMPP)"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
@@ -14328,13 +14279,12 @@
 msgid "Cannot send launcher"
 msgstr "Нельзя отправить ярлык"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"Вы перетянули кнопку запуска рабочего стола. Скорее всего вы хотели "
-"отправить то, на что эта кнопка ссылается, а не саму её."
+"Вы перетянули значок запуска с рабочего стола. Скорее всего вы хотели "
+"отправить то, на что этот значок ссылается, а не его самого."
 
 #, c-format
 msgid ""
@@ -14357,7 +14307,6 @@
 msgid "Could not set icon"
 msgstr "Не удалось установить значок"
 
-#, fuzzy
 msgid "_Open Link"
 msgstr "_Открыть ссылку"
 
@@ -14367,28 +14316,23 @@
 msgid "_Copy Email Address"
 msgstr "_Скопировать адрес email"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "Открыть файл..."
-
-#, fuzzy
+msgstr "_Открыть файл"
+
 msgid "Open _Containing Directory"
-msgstr "Открыть содержащий каталог"
+msgstr "Открыть _содержащую папку"
 
 msgid "Save File"
 msgstr "Сохранить файл"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "Воспроизвести звук"
-
-#, fuzzy
+msgstr "_Воспроизводить звук"
+
 msgid "_Save File"
-msgstr "Сохранить файл"
-
-#, fuzzy
+msgstr "_Сохранить файл"
+
 msgid "Do you really want to clear?"
-msgstr "Вы действительно хотите удалить %s?"
+msgstr "Вы действительно хотите очистить?"
 
 msgid "Select color"
 msgstr "Выбрать цвет"
@@ -14413,7 +14357,6 @@
 msgid "_Modify..."
 msgstr "_Изменить..."
 
-#, fuzzy
 msgid "_Add..."
 msgstr "_Добавить..."
 
@@ -14438,9 +14381,8 @@
 msgid "Small"
 msgstr "Маленький"
 
-#, fuzzy
 msgid "Smaller versions of the default smileys"
-msgstr "Меньшие версии смайликов по умолчанию"
+msgstr "Уменьшенные версии смайликов по умолчанию"
 
 msgid "Response Probability:"
 msgstr "Вероятность отклика:"
@@ -14628,11 +14570,12 @@
 msgid "Allows browsing and registering services."
 msgstr "Позволяет просматривать и регистрировать службы."
 
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
+msgstr ""
+"Этот модуль полезен для регистрации с базовыми транспортными или другими "
+"XMPP службами."
 
 msgid "By conversation count"
 msgstr "По количеству бесед"
@@ -14934,14 +14877,13 @@
 msgstr "Модуль музыкальной переписки для совместного сочинения"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"Модуль музыкальной переписки позволяет нескольким пользователям совместно "
-"работать над кусочком мелодии путём редактирования общих результатов в "
-"реальном времени."
+"Модуль музыкальной переписки позволяет нескольким пользователям одновременно "
+"работать над кусочком мелодии путём редактирования общих данных в реальном "
+"времени."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14972,7 +14914,6 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Установить подсказку \"С_РОЧНО\" оконного менеджера"
 
-#, fuzzy
 msgid "_Flash window"
 msgstr "_Мигающее окно"
 
@@ -14981,9 +14922,8 @@
 msgstr "_Поднимать окно беседы"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "_Поднимать окно беседы"
+msgstr "_Показать окно беседы"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -15058,17 +14998,14 @@
 msgid "Hyperlink Color"
 msgstr "Цвет гиперссылки"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
 msgstr "Цвет посещённой гиперссылки"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
-msgstr "Цвет надписи подсвеченного сообщения"
-
-#, fuzzy
+msgstr "Цвет имени подсвеченного сообщения"
+
 msgid "Typing Notification Color"
-msgstr "Цвет набора уведомления"
+msgstr "Цвет уведомления о печатании"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Горизонтальное разделение GtkTreeView"
@@ -15076,7 +15013,6 @@
 msgid "Conversation Entry"
 msgstr "Область ввода окна беседы"
 
-#, fuzzy
 msgid "Conversation History"
 msgstr "История общения"
 
@@ -15203,7 +15139,6 @@
 msgstr "Кнопка отправки окна беседы."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -15395,21 +15330,19 @@
 msgid "Timestamp Format Options"
 msgstr "Параметры формата времени"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "_Принудительно использовать 24-часовой формат времени"
-
-#, fuzzy
+msgstr "_Принудительно использовать формат времени:"
+
 msgid "Use system default"
-msgstr "Используемый по умолчанию"
-
-#, fuzzy
+msgstr "Использовать системный по умолчанию"
+
 msgid "12 hour time format"
-msgstr "_Принудительно использовать 24-часовой формат времени"
+msgstr "12-часовой формат времени"
 
 #, fuzzy
 msgid "24 hour time format"
-msgstr "_Принудительно использовать 24-часовой формат времени"
+msgstr "24-часовой формат времени"
 
 msgid "Show dates in..."
 msgstr "Показывать дату..."
@@ -15485,9 +15418,8 @@
 msgid "Voice/Video Settings"
 msgstr "Голосовые/Видео настройки"
 
-#, fuzzy
 msgid "Voice and Video Settings"
-msgstr "Голосовые/Видео настройки"
+msgstr "Голосовые и видео настройки"
 
 #. *< name
 #. *< version
@@ -15757,6 +15689,12 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "У Вас нет прав на удаление этого приложения."
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "Отвергать автоматически от пользователей не из списка собеседников"
+
+#~ msgid "bug master"
+#~ msgstr "мастер глюков"
+
 #, fuzzy
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "Произошла ошибка при передаче внутриполосного потока байт\n"
@@ -15879,12 +15817,11 @@
 #~ msgid "Unable to listen on socket: %s"
 #~ msgstr "Не удаётся прослушивать сокет: %s"
 
-#, fuzzy
 #~ msgid "%s just sent you a Nudge!"
 #~ msgstr "%s просто подтолкнул вас!"
 
 #~ msgid "Friendly name changes too rapidly"
-#~ msgstr "Дружественные изменения именни слишком быстры"
+#~ msgstr "Дружественное имя изменяется слишком быстро"
 
 #~ msgid "This Hotmail account may not be active."
 #~ msgstr "Эта учётная запись горячей почты может быть неактивна."
@@ -15934,13 +15871,12 @@
 #~ msgid "%s has removed you from his or her buddy list."
 #~ msgstr "%s удалил вас из своего списка собеседников."
 
-#, fuzzy
 #~ msgid ""
 #~ "The last action you attempted could not be performed because you are over "
 #~ "the rate limit. Please wait 10 seconds and try again.\n"
 #~ msgstr ""
 #~ "Последнее предпринятое вами действие не может быть выполнено, так как вы "
-#~ "превысили предел. Подождите 10 секунд и попытайтесь снова."
+#~ "превысили предел частоты. Пожалуйста, попробуйте снова через 10 секунд."
 
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
@@ -15949,13 +15885,11 @@
 #~ "<FONT SIZE=\"4\">ЧаВо:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
 #~ "FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
-#, fuzzy
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">IRC канал:</FONT> #pidgin на irc.freenode.net<BR><BR>"
 
-#, fuzzy
 #~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 #~ msgstr ""
 #~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
--- a/po/uk.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/uk.po	Sun Feb 06 05:26:52 2011 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the Pidgin package.
 #
 # Maxim V. Dziumanenko <mvd@mylinux.com.ua>, 2004-2005.
-# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009-2010.
+# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2009-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-26 22:11-0500\n"
-"PO-Revision-Date: 2010-12-19 22:07+0300\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
+"PO-Revision-Date: 2011-01-30 21:27+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "Language: uk\n"
@@ -2360,8 +2360,12 @@
 "Шлях де зберігати файли\n"
 "(Будь ласка, вкажіть повний шлях)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "Автоматично відхилити від користувачів, які не в переліку контактів"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr ""
+"Коли запит на передавання файлу надходить від користувача,\n"
+"який *не* в вашому переліку контактів"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2374,6 +2378,9 @@
 msgid "Create a new directory for each user"
 msgstr "Створити нову теку для кожного користувача"
 
+msgid "Escape the filenames"
+msgstr "Екранувати назви файлів"
+
 msgid "Notes"
 msgstr "Примітки"
 
@@ -3832,7 +3839,10 @@
 msgstr ""
 "Сервер вимагає автентифікацію звичайним текстом через нешифрований потік"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "Неправильна відповідь від сервера"
 
@@ -6141,6 +6151,20 @@
 msgid "Retrieving User Information..."
 msgstr "Отримання відомостей про користувача..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Вас викинули з цього MultiMX."
+
+msgid "was kicked"
+msgstr "був викинутий"
+
+msgid "_Room Name:"
+msgstr "_Назва кімнати:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Вас запросили"
+
 msgid "Loading menu..."
 msgstr "Завантаження меню..."
 
@@ -6168,20 +6192,6 @@
 msgid "Enable splash-screen popup"
 msgstr "Увімкнути виринаючу екранну заставку"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "Вас викинули з цього MultiMX."
-
-msgid "was kicked"
-msgstr "був викинутий"
-
-msgid "_Room Name:"
-msgstr "_Назва кімнати:"
-
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "Вас запросили"
-
 msgid "Last Online"
 msgstr "Востаннє в мережі"
 
@@ -7870,75 +7880,6 @@
 "та є необхідним для передавання зображень. Так як ваша ІР адреса буде "
 "розкрита, це може вважатись загрозою безпеці."
 
-msgid "Invalid SNAC"
-msgstr "Неправильний SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "Досягнуто обмеження швидкості сервера"
-
-msgid "Client rate limit exceeded"
-msgstr "Досягнуто обмеження швидкості клієнта"
-
-msgid "Service unavailable"
-msgstr "Послуга недоступна"
-
-msgid "Service not defined"
-msgstr "Послуга не визначена"
-
-msgid "Obsolete SNAC"
-msgstr "Застарілий SNAC"
-
-msgid "Not supported by host"
-msgstr "Не підтримується вузлом"
-
-msgid "Not supported by client"
-msgstr "Не підтримується клієнтом"
-
-msgid "Refused by client"
-msgstr "Відкинута клієнтом"
-
-msgid "Reply too big"
-msgstr "Відповідь завелика"
-
-msgid "Responses lost"
-msgstr "Відповіді втрачені"
-
-msgid "Request denied"
-msgstr "Запит відхилений"
-
-msgid "Busted SNAC payload"
-msgstr "Зіпсовані дані SNAC"
-
-msgid "Insufficient rights"
-msgstr "Недостатньо прав"
-
-msgid "In local permit/deny"
-msgstr "В місцевому переліку дозволених/заборонених"
-
-msgid "Warning level too high (sender)"
-msgstr "Рівень попередження дуже високий (відправник)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Рівень попередження дуже високий (отримувач)"
-
-msgid "User temporarily unavailable"
-msgstr "Користувач тимчасово недоступний"
-
-msgid "No match"
-msgstr "Немає збігів"
-
-msgid "List overflow"
-msgstr "Перелік переповнений"
-
-msgid "Request ambiguous"
-msgstr "Запит незрозумілий"
-
-msgid "Queue full"
-msgstr "Черга переповнена"
-
-msgid "Not while on AOL"
-msgstr "Не тоді, коли у AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "Значок користувача"
@@ -8057,6 +7998,75 @@
 msgid "Capabilities"
 msgstr "Можливості"
 
+msgid "Invalid SNAC"
+msgstr "Неправильний SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "Досягнуто обмеження швидкості сервера"
+
+msgid "Client rate limit exceeded"
+msgstr "Досягнуто обмеження швидкості клієнта"
+
+msgid "Service unavailable"
+msgstr "Послуга недоступна"
+
+msgid "Service not defined"
+msgstr "Послуга не визначена"
+
+msgid "Obsolete SNAC"
+msgstr "Застарілий SNAC"
+
+msgid "Not supported by host"
+msgstr "Не підтримується вузлом"
+
+msgid "Not supported by client"
+msgstr "Не підтримується клієнтом"
+
+msgid "Refused by client"
+msgstr "Відкинута клієнтом"
+
+msgid "Reply too big"
+msgstr "Відповідь завелика"
+
+msgid "Responses lost"
+msgstr "Відповіді втрачені"
+
+msgid "Request denied"
+msgstr "Запит відхилений"
+
+msgid "Busted SNAC payload"
+msgstr "Зіпсовані дані SNAC"
+
+msgid "Insufficient rights"
+msgstr "Недостатньо прав"
+
+msgid "In local permit/deny"
+msgstr "В місцевому переліку дозволених/заборонених"
+
+msgid "Warning level too high (sender)"
+msgstr "Рівень попередження дуже високий (відправник)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Рівень попередження дуже високий (отримувач)"
+
+msgid "User temporarily unavailable"
+msgstr "Користувач тимчасово недоступний"
+
+msgid "No match"
+msgstr "Немає збігів"
+
+msgid "List overflow"
+msgstr "Перелік переповнений"
+
+msgid "Request ambiguous"
+msgstr "Запит незрозумілий"
+
+msgid "Queue full"
+msgstr "Черга переповнена"
+
+msgid "Not while on AOL"
+msgstr "Не тоді, коли у AOL"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
@@ -8648,14 +8658,14 @@
 msgid "Select Server"
 msgstr "Виберіть сервер"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "З'єднання по TCP"
@@ -12222,9 +12232,6 @@
 msgid "Fatal Error"
 msgstr "Фатальна помилка"
 
-msgid "bug master"
-msgstr "спеціаліст з вад"
-
 msgid "artist"
 msgstr "виконавець"
 
@@ -12404,6 +12411,9 @@
 msgid "Maithili"
 msgstr "Майтхілі"
 
+msgid "Meadow Mari"
+msgstr "Луговомарійська"
+
 msgid "Macedonian"
 msgstr "Македонська"
 
@@ -15504,5 +15514,11 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Ви не маєте права на видалення цієї програми."
 
+#~ msgid "bug master"
+#~ msgstr "спеціаліст з вад"
+
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "Автоматично відхилити від користувачів, які не в переліку контактів"
+
 #~ msgid "Error requesting %s"
 #~ msgstr "Помилка запиту %s"
--- a/po/zh_HK.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/zh_HK.po	Sun Feb 06 05:26:52 2011 +0000
@@ -1,14 +1,14 @@
 # NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.27 2010/12/17 01:08:13 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2011, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2011, 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.659 2010/12/17 03:16:38 acli Exp $
+# $InternalId: zh_TW.po,v 1.661 2011/02/01 04:45:39 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,9 +60,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.8\n"
+"Project-Id-Version: Pidgin 2.7.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
 "PO-Revision-Date: 2010-12-16 19:32-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -2439,8 +2439,10 @@
 "檔案儲存路徑\n"
 "(請提供完整路徑)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "自動拒絕非來自好友清單中的使用者"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr "當一個不在你好友清單內的使用者要求檔案傳輸時"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2453,6 +2455,9 @@
 msgid "Create a new directory for each user"
 msgstr "給每個使用者建立該使用者專用的目綠"
 
+msgid "Escape the filenames"
+msgstr "逸出檔案名稱中的特別字符"
+
 msgid "Notes"
 msgstr "備註"
 
@@ -3920,7 +3925,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "伺服器送來了無效的回應"
 
@@ -6434,6 +6442,21 @@
 msgid "Retrieving User Information..."
 msgstr "讀取使用者資訊中..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "你已經從MultiMX中被踢出。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名稱(_R):"
+
+# NOTE 很差的原文,其實整合上下文後是「You have invited: %s」(%s 是被邀請者)
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "你邀請了"
+
 msgid "Loading menu..."
 msgstr "載入清單中..."
 
@@ -6462,21 +6485,6 @@
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "你已經從MultiMX中被踢出。"
-
-msgid "was kicked"
-msgstr "被踢出"
-
-msgid "_Room Name:"
-msgstr "聊天室名稱(_R):"
-
-# NOTE 很差的原文,其實整合上下文後是「You have invited: %s」(%s 是被邀請者)
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "你邀請了"
-
 msgid "Last Online"
 msgstr "最近上線"
 
@@ -8126,90 +8134,6 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息圖像時所必須的。"
 "這樣將會曝露你的 IP 位址,因此可能會有私隱方面的風險。"
 
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "超出了伺服器端的速率上限"
-
-msgid "Client rate limit exceeded"
-msgstr "超出了用戶端的速率上限"
-
-# NOTE SNAC 錯誤代碼5,見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE 應係指給定了一個已定義的服務 (Service, Family),但因某種原因,伺服器暫時無法提供該服務
-msgid "Service unavailable"
-msgstr "服務不存在"
-
-msgid "Service not defined"
-msgstr "服務未定義"
-
-# XXX 譯文有待改進 - acli 20100809
-msgid "Obsolete SNAC"
-msgstr "已作廢的舊式 SNAC"
-
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-msgid "Not supported by client"
-msgstr "用戶端不支援"
-
-msgid "Refused by client"
-msgstr "被用戶端拒絕"
-
-# XXX 譯文有待改進 - acli 20100809
-msgid "Reply too big"
-msgstr "回應太大"
-
-msgid "Responses lost"
-msgstr "遺失回應"
-
-msgid "Request denied"
-msgstr "請求被拒"
-
-# NOTE SNAC 錯誤代碼14 (0x0e),見 http://iserverd.khstu.ru/oscar/errorlist.html,指 SNAC 負載內出現了格式上的錯誤
-# XXX 譯文有待改進 - acli 20100809
-msgid "Busted SNAC payload"
-msgstr "畸型的 SNAC 負載"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE SNAC 錯誤代碼16 (0x10),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# XXX 譯文有待改進 - acli 20100809
-msgid "In local permit/deny"
-msgstr "在本地端的允許/拒絕清單內"
-
-# NOTE SNAC 錯誤代碼17 (0x11),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
-msgid "Warning level too high (sender)"
-msgstr "(發送者)警告等級過高"
-
-# NOTE SNAC 錯誤代碼18 (0x12),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
-msgid "Warning level too high (receiver)"
-msgstr "(接收者)警告等級過高"
-
-msgid "User temporarily unavailable"
-msgstr "使用者暫時不在線上"
-
-msgid "No match"
-msgstr "沒有相符的記錄"
-
-# NOTE SNAC 錯誤代碼21 (0x15),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE OSCAR 協定至少有三種「List」,譯成「好友清單」可能不對
-msgid "List overflow"
-msgstr "清單已滿"
-
-msgid "Request ambiguous"
-msgstr "不明確的請求"
-
-msgid "Queue full"
-msgstr "佇列已滿"
-
-# NOTE SNAC 錯誤代碼24 (0x18),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
-# XXX 譯文有待改進 - acli 20100809
-msgid "Not while on AOL"
-msgstr "不適合於 AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -8344,6 +8268,90 @@
 msgid "Capabilities"
 msgstr "兼容性"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "超出了伺服器端的速率上限"
+
+msgid "Client rate limit exceeded"
+msgstr "超出了用戶端的速率上限"
+
+# NOTE SNAC 錯誤代碼5,見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的服務 (Service, Family),但因某種原因,伺服器暫時無法提供該服務
+msgid "Service unavailable"
+msgstr "服務不存在"
+
+msgid "Service not defined"
+msgstr "服務未定義"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Obsolete SNAC"
+msgstr "已作廢的舊式 SNAC"
+
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+msgid "Not supported by client"
+msgstr "用戶端不支援"
+
+msgid "Refused by client"
+msgstr "被用戶端拒絕"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Reply too big"
+msgstr "回應太大"
+
+msgid "Responses lost"
+msgstr "遺失回應"
+
+msgid "Request denied"
+msgstr "請求被拒"
+
+# NOTE SNAC 錯誤代碼14 (0x0e),見 http://iserverd.khstu.ru/oscar/errorlist.html,指 SNAC 負載內出現了格式上的錯誤
+# XXX 譯文有待改進 - acli 20100809
+msgid "Busted SNAC payload"
+msgstr "畸型的 SNAC 負載"
+
+msgid "Insufficient rights"
+msgstr "權限不夠"
+
+# NOTE SNAC 錯誤代碼16 (0x10),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
+msgid "In local permit/deny"
+msgstr "在本地端的允許/拒絕清單內"
+
+# NOTE SNAC 錯誤代碼17 (0x11),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
+msgid "Warning level too high (sender)"
+msgstr "(發送者)警告等級過高"
+
+# NOTE SNAC 錯誤代碼18 (0x12),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
+msgid "Warning level too high (receiver)"
+msgstr "(接收者)警告等級過高"
+
+msgid "User temporarily unavailable"
+msgstr "使用者暫時不在線上"
+
+msgid "No match"
+msgstr "沒有相符的記錄"
+
+# NOTE SNAC 錯誤代碼21 (0x15),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR 協定至少有三種「List」,譯成「好友清單」可能不對
+msgid "List overflow"
+msgstr "清單已滿"
+
+msgid "Request ambiguous"
+msgstr "不明確的請求"
+
+msgid "Queue full"
+msgstr "佇列已滿"
+
+# NOTE SNAC 錯誤代碼24 (0x18),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
+# XXX 譯文有待改進 - acli 20100809
+msgid "Not while on AOL"
+msgstr "不適合於 AOL"
+
 #  NOTE 這四個字串在 Oscar (ICQ) 的解釋在此:http://pidgin.im/pipermail/translators/2010-November/000554.html
 #  NOTE Oscar: 把好友新增到 Visible List 內
 #  NOTE Yahoo: 狀態為「隱身」時,對某指定的好友報稱上線
@@ -8988,14 +8996,14 @@
 msgid "Select Server"
 msgstr "選擇伺服器"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "使用 TCP 連線"
@@ -12626,10 +12634,6 @@
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-# XXX 暫譯 - 20090226 acli
-msgid "bug master"
-msgstr "除錯主管"
-
 # NOTE 這個「artist」(有別於其他的「Artist」字串)係指設計pidgin圖示的「graphic designer」,絕對不可譯成「藝人」
 msgid "artist"
 msgstr "平面設計"
@@ -12835,6 +12839,11 @@
 msgid "Maithili"
 msgstr "邁蒂利文"
 
+#  NOTE 代碼 mhr,一種芬蘭語系的東歐語文,維基百科譯「平地馬里語」
+#  XXX 找不到正式的台灣譯文,參閱 http://zh.wikipedia.org/zh/马里语
+msgid "Meadow Mari"
+msgstr "平地馬里文"
+
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
 msgid "Macedonian"
 msgstr "馬其頓文"
@@ -16027,6 +16036,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "你沒有權限移除程式。"
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "自動拒絕非來自好友清單中的使用者"
+
+# XXX 暫譯 - 20090226 acli
+#~ msgid "bug master"
+#~ msgstr "除錯主管"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "帶內位元組流傳輸途中發生錯誤\n"
 
--- a/po/zh_TW.po	Sun Feb 06 05:23:22 2011 +0000
+++ b/po/zh_TW.po	Sun Feb 06 05:26:52 2011 +0000
@@ -1,12 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2011, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2011, 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.659 2010/12/17 03:16:38 acli Exp $
+# $InternalId: zh_TW.po,v 1.661 2011/02/01 04:45:39 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,9 +58,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.8\n"
+"Project-Id-Version: Pidgin 2.7.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
+"POT-Creation-Date: 2011-02-02 23:34-0500\n"
 "PO-Revision-Date: 2010-12-16 19:32-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -2437,8 +2437,10 @@
 "檔案儲存路徑\n"
 "(請提供完整路徑)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "自動拒絕非來自好友清單中的使用者"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr "當一個不在您好友清單內的使用者要求檔案傳輸時"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2451,6 +2453,9 @@
 msgid "Create a new directory for each user"
 msgstr "給每個使用者建立該使用者專用的目綠"
 
+msgid "Escape the filenames"
+msgstr "逸出檔案名稱中的特別字元"
+
 msgid "Notes"
 msgstr "備註"
 
@@ -3918,7 +3923,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "伺服器送來了無效的回應"
 
@@ -6432,6 +6440,21 @@
 msgid "Retrieving User Information..."
 msgstr "讀取使用者資訊中..."
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "您已經從MultiMX中被踢出。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名稱(_R):"
+
+# NOTE 很差的原文,其實整合上下文後是「You have invited: %s」(%s 是被邀請者)
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "您邀請了"
+
 msgid "Loading menu..."
 msgstr "載入清單中..."
 
@@ -6460,21 +6483,6 @@
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
-#. you were kicked
-msgid "You have been kicked from this MultiMX."
-msgstr "您已經從MultiMX中被踢出。"
-
-msgid "was kicked"
-msgstr "被踢出"
-
-msgid "_Room Name:"
-msgstr "聊天室名稱(_R):"
-
-# NOTE 很差的原文,其實整合上下文後是「You have invited: %s」(%s 是被邀請者)
-#. Display system message in chat window
-msgid "You have invited"
-msgstr "您邀請了"
-
 msgid "Last Online"
 msgstr "最後上線"
 
@@ -8124,90 +8132,6 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr "超出了伺服器端的速率上限"
-
-msgid "Client rate limit exceeded"
-msgstr "超出了用戶端的速率上限"
-
-# NOTE SNAC 錯誤代碼5,見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE 應係指給定了一個已定義的服務 (Service, Family),但因某種原因,伺服器暫時無法提供該服務
-msgid "Service unavailable"
-msgstr "服務不存在"
-
-msgid "Service not defined"
-msgstr "服務未定義"
-
-# XXX 譯文有待改進 - acli 20100809
-msgid "Obsolete SNAC"
-msgstr "已作廢的舊式 SNAC"
-
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-msgid "Not supported by client"
-msgstr "用戶端不支援"
-
-msgid "Refused by client"
-msgstr "被用戶端拒絕"
-
-# XXX 譯文有待改進 - acli 20100809
-msgid "Reply too big"
-msgstr "回應太大"
-
-msgid "Responses lost"
-msgstr "遺失回應"
-
-msgid "Request denied"
-msgstr "請求被拒"
-
-# NOTE SNAC 錯誤代碼14 (0x0e),見 http://iserverd.khstu.ru/oscar/errorlist.html,指 SNAC 負載內出現了格式上的錯誤
-# XXX 譯文有待改進 - acli 20100809
-msgid "Busted SNAC payload"
-msgstr "畸型的 SNAC 負載"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE SNAC 錯誤代碼16 (0x10),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# XXX 譯文有待改進 - acli 20100809
-msgid "In local permit/deny"
-msgstr "在本地端的允許/拒絕清單內"
-
-# NOTE SNAC 錯誤代碼17 (0x11),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
-msgid "Warning level too high (sender)"
-msgstr "(發送者)警告等級過高"
-
-# NOTE SNAC 錯誤代碼18 (0x12),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
-msgid "Warning level too high (receiver)"
-msgstr "(接收者)警告等級過高"
-
-msgid "User temporarily unavailable"
-msgstr "使用者暫時不在線上"
-
-msgid "No match"
-msgstr "沒有相符的記錄"
-
-# NOTE SNAC 錯誤代碼21 (0x15),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE OSCAR 協定至少有三種「List」,譯成「好友清單」可能不對
-msgid "List overflow"
-msgstr "清單已滿"
-
-msgid "Request ambiguous"
-msgstr "不明確的請求"
-
-msgid "Queue full"
-msgstr "佇列已滿"
-
-# NOTE SNAC 錯誤代碼24 (0x18),見 http://iserverd.khstu.ru/oscar/errorlist.html
-# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
-# XXX 譯文有待改進 - acli 20100809
-msgid "Not while on AOL"
-msgstr "不適合於 AOL"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -8342,6 +8266,90 @@
 msgid "Capabilities"
 msgstr "相容性"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr "超出了伺服器端的速率上限"
+
+msgid "Client rate limit exceeded"
+msgstr "超出了用戶端的速率上限"
+
+# NOTE SNAC 錯誤代碼5,見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 應係指給定了一個已定義的服務 (Service, Family),但因某種原因,伺服器暫時無法提供該服務
+msgid "Service unavailable"
+msgstr "服務不存在"
+
+msgid "Service not defined"
+msgstr "服務未定義"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Obsolete SNAC"
+msgstr "已作廢的舊式 SNAC"
+
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+msgid "Not supported by client"
+msgstr "用戶端不支援"
+
+msgid "Refused by client"
+msgstr "被用戶端拒絕"
+
+# XXX 譯文有待改進 - acli 20100809
+msgid "Reply too big"
+msgstr "回應太大"
+
+msgid "Responses lost"
+msgstr "遺失回應"
+
+msgid "Request denied"
+msgstr "請求被拒"
+
+# NOTE SNAC 錯誤代碼14 (0x0e),見 http://iserverd.khstu.ru/oscar/errorlist.html,指 SNAC 負載內出現了格式上的錯誤
+# XXX 譯文有待改進 - acli 20100809
+msgid "Busted SNAC payload"
+msgstr "畸型的 SNAC 負載"
+
+msgid "Insufficient rights"
+msgstr "權限不夠"
+
+# NOTE SNAC 錯誤代碼16 (0x10),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# XXX 譯文有待改進 - acli 20100809
+msgid "In local permit/deny"
+msgstr "在本地端的允許/拒絕清單內"
+
+# NOTE SNAC 錯誤代碼17 (0x11),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
+msgid "Warning level too high (sender)"
+msgstr "(發送者)警告等級過高"
+
+# NOTE SNAC 錯誤代碼18 (0x12),見 http://iserverd.khstu.ru/oscar/errorlist.html,參見其他涉及「warning level」的譯文
+msgid "Warning level too high (receiver)"
+msgstr "(接收者)警告等級過高"
+
+msgid "User temporarily unavailable"
+msgstr "使用者暫時不在線上"
+
+msgid "No match"
+msgstr "沒有相符的記錄"
+
+# NOTE SNAC 錯誤代碼21 (0x15),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE OSCAR 協定至少有三種「List」,譯成「好友清單」可能不對
+msgid "List overflow"
+msgstr "清單已滿"
+
+msgid "Request ambiguous"
+msgstr "不明確的請求"
+
+msgid "Queue full"
+msgstr "佇列已滿"
+
+# NOTE SNAC 錯誤代碼24 (0x18),見 http://iserverd.khstu.ru/oscar/errorlist.html
+# NOTE 可能是指在 AOL 裏要求了一種 ICQ 的服務
+# XXX 譯文有待改進 - acli 20100809
+msgid "Not while on AOL"
+msgstr "不適合於 AOL"
+
 #  NOTE 這四個字串在 Oscar (ICQ) 的解釋在此:http://pidgin.im/pipermail/translators/2010-November/000554.html
 #  NOTE Oscar: 把好友新增到 Visible List 內
 #  NOTE Yahoo: 狀態為「隱身」時,對某指定的好友報稱上線
@@ -8986,14 +8994,14 @@
 msgid "Select Server"
 msgstr "選擇伺服器"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "使用 TCP 連線"
@@ -12620,10 +12628,6 @@
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-# XXX 暫譯 - 20090226 acli
-msgid "bug master"
-msgstr "除錯主管"
-
 # NOTE 這個「artist」(有別於其他的「Artist」字串)係指設計pidgin圖示的「graphic designer」,絕對不可譯成「藝人」
 msgid "artist"
 msgstr "平面設計"
@@ -12829,6 +12833,11 @@
 msgid "Maithili"
 msgstr "邁蒂利文"
 
+#  NOTE 代碼 mhr,一種芬蘭語系的東歐語文,維基百科譯「平地馬里語」
+#  XXX 找不到正式的台灣譯文,參閱 http://zh.wikipedia.org/zh/马里语
+msgid "Meadow Mari"
+msgstr "平地馬里文"
+
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
 msgid "Macedonian"
 msgstr "馬其頓文"
@@ -16021,6 +16030,13 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "您沒有權限移除程式。"
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "自動拒絕非來自好友清單中的使用者"
+
+# XXX 暫譯 - 20090226 acli
+#~ msgid "bug master"
+#~ msgstr "除錯主管"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "帶內位元組流傳輸途中發生錯誤\n"