changeset 25885:138c729f8c9a

explicit merge of 'c2a520001286f0c95c761be82c041c4379ddf407' and '992be28ad76925d4927129b06b738ba938de82d6'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:11:08 +0000
parents 212fb65cef7f (current diff) 8e75a1525156 (diff)
children a4a17fe80160
files libpurple/protocols/myspace/myspace.c libpurple/protocols/myspace/user.c libpurple/protocols/simple/simple.c
diffstat 10 files changed, 975 insertions(+), 1457 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jan 02 22:10:31 2009 +0000
+++ b/ChangeLog	Fri Jan 02 22:11:08 2009 +0000
@@ -92,6 +92,11 @@
 	  buddylist.  (Thanks to Casey Ho)
 	* Fix a crash when closing an authorization minidialog with the X
 	  then immediately going offline (Paul Aurich)
+	* Fix a crash when closing Pidgin related to custom smileys (disassociate
+	  smileys from GtkIMHtml widgets when they are destroyed).
+	* Fix adding custom a custom smiley using the context menu from a
+	  conversation in the case when no custom smiley had been added before
+	  using the smiley manager.
 
 	Finch:
 	* Allow binding meta+arrow keys for actions.
--- a/libpurple/protocols/myspace/markup.c	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/markup.c	Fri Jan 02 22:11:08 2009 +0000
@@ -193,7 +193,7 @@
 	decor_str = xmlnode_get_attrib(root, "s");
 
 	/* Validate the font face, to avoid constructing invalid HTML later */
-	if (strchr(face, '\'') != NULL)
+	if (face != NULL && strchr(face, '\'') != NULL)
 		face = NULL;
 
 	height = height_str != NULL ? atol(height_str) : 12;
--- a/libpurple/protocols/myspace/message.c	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/message.c	Fri Jan 02 22:11:08 2009 +0000
@@ -715,10 +715,6 @@
 		return;
 	}
 
-#ifdef MSIM_MSG_DEBUG_FREE
-	msim_msg_dump("msim_msg_free: freeing %s", msg);
-#endif
-
 	g_list_foreach(msg, msim_msg_free_element, NULL);
 	g_list_free(msg);
 }
@@ -872,8 +868,6 @@
 	success = msim_send_raw(session, raw);
 	g_free(raw);
 
-	msim_msg_dump("msim_msg_send()ing %s\n", msg);
-
 	return success;
 }
 
--- a/libpurple/protocols/myspace/myspace.c	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Fri Jan 02 22:11:08 2009 +0000
@@ -60,7 +60,6 @@
 		const gchar *uid_field_name, guint uid)
 {
 	MsimMessageElement *elem;
-	msim_msg_dump("msim_do_postprocessing msg: %s\n", msg);
 
 	/* First, check - if the field already exists, replace <uid> within it */
 	if ((elem = msim_msg_get(msg, uid_field_name)) != NULL) {
@@ -95,8 +94,6 @@
 		msg = msim_msg_insert_before(msg, uid_before, uid_field_name, MSIM_TYPE_INTEGER, GUINT_TO_POINTER(uid));
 	}
 
-	msim_msg_dump("msim_postprocess_outgoing_cb: postprocessed msg=%s\n", msg);
-
 	return msg;
 }
 
@@ -122,8 +119,6 @@
 
 	msg = (MsimMessage *)data;
 
-	msim_msg_dump("msim_postprocess_outgoing_cb() got msg=%s\n", msg);
-
 	/* Obtain userid from userinfo message. */
 	body = msim_msg_get_dictionary(userinfo, "body");
 	g_return_if_fail(body != NULL);
@@ -194,7 +189,6 @@
 	g_return_val_if_fail(msg != NULL, FALSE);
 
 	/* Store information for msim_postprocess_outgoing_cb(). */
-	msim_msg_dump("msim_postprocess_outgoing: msg before=%s\n", msg);
 	msg = msim_msg_append(msg, "_username", MSIM_TYPE_STRING, g_strdup(username));
 	msg = msim_msg_append(msg, "_uid_field_name", MSIM_TYPE_STRING, g_strdup(uid_field_name));
 	msg = msim_msg_append(msg, "_uid_before", MSIM_TYPE_STRING, g_strdup(uid_before));
@@ -215,7 +209,6 @@
 			/* Don't have uid offhand - need to ask for it, and wait until hear back before sending. */
 			purple_debug_info("msim", ">>> msim_postprocess_outgoing: couldn't find username %s in blist\n",
 					username ? username : "(NULL)");
-			msim_msg_dump("msim_postprocess_outgoing - scheduling lookup, msg=%s\n", msg);
 			/* TODO: where is cloned message freed? Should be in _cb. */
 			msim_lookup_user(session, username, msim_postprocess_outgoing_cb, msim_msg_clone(msg));
 			return TRUE;       /* not sure of status yet - haven't sent! */
@@ -228,8 +221,6 @@
 
 	msg = msim_do_postprocessing(msg, uid_before, uid_field_name, uid);
 
-	msim_msg_dump("msim_postprocess_outgoing: msg after (uid immediate)=%s\n", msg);
-
 	rc = msim_msg_send(session, msg);
 
 	/* TODO: free
@@ -874,8 +865,6 @@
 
 	g_return_if_fail(reply != NULL);
 
-	msim_msg_dump("msim_check_inbox_cb: reply=%s\n", reply);
-
 	body = msim_msg_get_dictionary(reply, "body");
 
 	if (body == NULL)
@@ -1088,8 +1077,6 @@
 	gchar *msg;
 	guint buddy_count;
 
-	msim_msg_dump("msim_got_contact_list: reply=%s", reply);
-
 	body = msim_msg_get_dictionary(reply, "body");
 	if (!body) {
 		/* No friends. Not an error. */
@@ -1140,6 +1127,8 @@
 /**
  * Get contact list, calling msim_got_contact_list() with
  * what_to_do_after as user_data gpointer.
+ *
+ * @param what_to_do_after should be one of the MSIM_CONTACT_LIST_* #defines.
  */
 static gboolean
 msim_get_contact_list(MsimSession *session, int what_to_do_after)
@@ -1164,36 +1153,38 @@
 
 	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 
+	/* Set display name to username (otherwise will show email address) */
+	purple_connection_set_display_name(session->gc, session->username);
+
 	/* The session is now set up, ready to be connected. This emits the
 	 * signedOn signal, so clients can now do anything with msimprpl, and
 	 * we're ready for it (session key, userid, username all setup). */
 	purple_connection_update_progress(session->gc, _("Connected"), 3, 4);
 	purple_connection_set_state(session->gc, PURPLE_CONNECTED);
 
-	/* Set display name to username (otherwise will show email address) */
-	purple_connection_set_display_name(session->gc, session->username);
-
 	body = msim_msg_new(
 			"UserID", MSIM_TYPE_INTEGER, session->userid,
 			NULL);
 
 	/* Request IM info about ourself. */
 	msim_send(session,
-			"persist", MSIM_TYPE_STRING, g_strdup("persist"),
+			"persist", MSIM_TYPE_INTEGER, 1,
 			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
+			"cmd", MSIM_TYPE_INTEGER, MSIM_CMD_GET,
 			"dsn", MSIM_TYPE_INTEGER, MG_OWN_MYSPACE_INFO_DSN,
-			"uid", MSIM_TYPE_INTEGER, session->userid,
 			"lid", MSIM_TYPE_INTEGER, MG_OWN_MYSPACE_INFO_LID,
 			"rid", MSIM_TYPE_INTEGER, session->next_rid++,
+			"UserID", MSIM_TYPE_INTEGER, session->userid,
 			"body", MSIM_TYPE_DICTIONARY, body,
 			NULL);
 
 	/* Request MySpace info about ourself. */
+	purple_debug_error("MARK", "Fetching info about ourself\n");
 	msim_send(session,
-			"persist", MSIM_TYPE_STRING, g_strdup("persist"),
+			"persist", MSIM_TYPE_INTEGER, 1,
 			"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
+			"cmd", MSIM_TYPE_INTEGER, MSIM_CMD_GET,
 			"dsn", MSIM_TYPE_INTEGER, MG_OWN_IM_INFO_DSN,
-			"uid", MSIM_TYPE_INTEGER, session->userid,
 			"lid", MSIM_TYPE_INTEGER, MG_OWN_IM_INFO_LID,
 			"rid", MSIM_TYPE_INTEGER, session->next_rid++,
 			"body", MSIM_TYPE_STRING, g_strdup(""),
@@ -1316,8 +1307,6 @@
 	g_return_val_if_fail(MSIM_SESSION_VALID(session), FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
-	msim_msg_dump("msim_status msg=%s\n", msg);
-
 	/* Helpfully looked up by msim_incoming_resolve() for us. */
 	username = msim_msg_get_string(msg, "_username");
 	g_return_val_if_fail(username != NULL, FALSE);
@@ -1755,7 +1744,6 @@
 
 	if (cb) {
 		purple_debug_info("msim", "msim_process_reply: calling callback now\n");
-		msim_msg_dump("for msg=%s\n", msg);
 		/* Clone message, so that the callback 'cb' can use it (needs to free it also). */
 		cb(session, msim_msg_clone(msg), data);
 		g_hash_table_remove(session->user_lookup_cb, GUINT_TO_POINTER(rid));
@@ -1855,10 +1843,6 @@
 	g_return_val_if_fail(session != NULL, FALSE);
 	g_return_val_if_fail(msg != NULL, FALSE);
 
-#ifdef MSIM_DEBUG_MSG
-	msim_msg_dump("ready to process: %s\n", msg);
-#endif
-
 	if (msim_msg_get_integer(msg, "lc") == 1) {
 		return msim_login_challenge(session, msg);
 	} else if (msim_msg_get_integer(msg, "lc") == 2) {
@@ -2794,6 +2778,10 @@
  *
  * @return Bytes successfully sent, or -1 on error.
  */
+/*
+ * TODO: This needs to do non-blocking writes and use a watcher to check
+  *      when the fd is available to be written to.
+ */
 static int
 msim_send_really_raw(PurpleConnection *gc, const char *buf, int total_bytes)
 {
@@ -2968,7 +2956,6 @@
 {
 	MsimMessage *body;
 	gchar *completed;
-	msim_msg_dump("msim_import_friends_cb=%s", reply);
 
 	/* Check if the friends were imported successfully. */
 	body = msim_msg_get_dictionary(reply, "body");
@@ -3457,16 +3444,6 @@
 	return FALSE;
 }
 
-#ifdef MSIM_DEBUG_MSG
-static void
-print_hash_item(gpointer key, gpointer value, gpointer user_data)
-{
-	purple_debug_info("msim", "%s=%s\n",
-			key ? (gchar *)key : "(NULL)",
-			value ? (gchar *)value : "(NULL)");
-}
-#endif
-
 /**
  * Initialize plugin.
  */
--- a/libpurple/protocols/myspace/myspace.h	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Fri Jan 02 22:11:08 2009 +0000
@@ -63,7 +63,6 @@
 /*#define MSIM_SEND_CLIENT_VERSION              */
 
 /* Debugging options */
-/*#define MSIM_DEBUG_MSG                */
 /* Low-level and rarely needed */
 /*#define MSIM_DEBUG_PARSE             */
 /*#define MSIM_DEBUG_LOGIN_CHALLENGE*/
--- a/libpurple/protocols/myspace/session.h	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/session.h	Fri Jan 02 22:11:08 2009 +0000
@@ -34,6 +34,9 @@
 	guint sesskey;                      /**< Session key from server */
 	guint userid;                       /**< This user's numeric user ID */
 	gchar *username;                    /**< This user's unique username */
+	gboolean show_only_to_list;
+	int privacy_mode;
+	int offline_message_mode;
 	gint fd;                            /**< File descriptor to/from server */
 
 	/* TODO: Remove. */
--- a/libpurple/protocols/myspace/user.c	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/myspace/user.c	Fri Jan 02 22:11:08 2009 +0000
@@ -407,6 +407,39 @@
 		return FALSE;
 	}
 
+	if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN &&
+		msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) {
+		/*
+		 * Some of this info will be available on the buddy list if the
+		 * has themselves as their own buddy.
+		 *
+		 * Much of the info is already available in MsimSession,
+		 * stored in msim_we_are_logged_on().
+		 */
+		gchar *tmpstr;
+
+		tmpstr = msim_msg_get_string(body, "ShowOnlyToList");
+		if (tmpstr != NULL) {
+			session->show_only_to_list = g_str_equal(tmpstr, "True");
+			g_free(tmpstr);
+		}
+
+		session->privacy_mode = msim_msg_get_integer(body, "PrivacyMode");
+		session->offline_message_mode = msim_msg_get_integer(body, "OfflineMessageMode");
+
+		msim_send(session,
+				"blocklist", MSIM_TYPE_BOOLEAN, TRUE,
+				"sesskey", MSIM_TYPE_INTEGER, session->sesskey,
+				"idlist", MSIM_TYPE_STRING,
+						g_strdup_printf("w%d|c%d",
+								session->show_only_to_list ? 1 : 0,
+								session->privacy_mode),
+				NULL);
+	} else if (msim_msg_get_integer(msg, "dsn") == MG_OWN_MYSPACE_INFO_DSN &&
+			msim_msg_get_integer(msg, "lid") == MG_OWN_MYSPACE_INFO_LID) {
+		/* TODO: same as above, but for MySpace info. */
+	}
+
 	username = msim_msg_get_string(body, "UserName");
 
 	if (!username) {
@@ -443,19 +476,6 @@
 		msim_store_user_info_each(key_str, value_str, user);
 	}
 
-	if (msim_msg_get_integer(msg, "dsn") == MG_OWN_IM_INFO_DSN &&
-		msim_msg_get_integer(msg, "lid") == MG_OWN_IM_INFO_LID) {
-		/* TODO: do something with our own IM info, if we need it for some
-		 * specific purpose. Otherwise it is available on the buddy list,
-		 * if the user has themselves as their own buddy.
-		 *
-		 * However, much of the info is already available in MsimSession,
-		 * stored in msim_we_are_logged_on(). */
-	} else if (msim_msg_get_integer(msg, "dsn") == MG_OWN_MYSPACE_INFO_DSN &&
-			msim_msg_get_integer(msg, "lid") == MG_OWN_MYSPACE_INFO_LID) {
-		/* TODO: same as above, but for MySpace info. */
-	}
-
 	msim_msg_free(body);
 	g_free(username);
 
@@ -538,8 +558,6 @@
 	purple_debug_info("msim", "msim_lookup_userid: "
 			"asynchronously looking up <%s>\n", user);
 
-	msim_msg_dump("msim_lookup_user: data=%s\n", (MsimMessage *)data);
-
 	/* Setup callback. Response will be associated with request using 'rid'. */
 	rid = msim_new_reply_callback(session, cb, data);
 
@@ -593,7 +611,6 @@
 
 	g_return_if_fail(MSIM_SESSION_VALID(session));
 
-	msim_msg_dump("username_is_set message is: %s\n", userinfo);
 	cmd = msim_msg_get_integer(userinfo, "cmd");
 	dsn = msim_msg_get_integer(userinfo, "dsn");
 	uid = msim_msg_get_integer(userinfo, "uid");
@@ -681,8 +698,6 @@
 	purple_debug_info("msim", "msim_set_username: "
 			"Setting username %s\n", username);
 
-	msim_msg_dump("msim_set_username: data=%s\n", (MsimMessage *)data);
-
 	/* Setup callback. Response will be associated with request using 'rid'. */
 	rid = msim_new_reply_callback(session, cb, data);
 
--- a/libpurple/protocols/simple/simple.c	Fri Jan 02 22:10:31 2009 +0000
+++ b/libpurple/protocols/simple/simple.c	Fri Jan 02 22:11:08 2009 +0000
@@ -1951,7 +1951,8 @@
 	if (userserver[1] == NULL || userserver[1][0] == '\0') {
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("SIP connect server not specified"));
+			_("Unable to connect to server. Please enter the "
+			  "address of the server you wish to connect to."));
 		return;
 	}
 
--- a/po/fi.po	Fri Jan 02 22:10:31 2009 +0000
+++ b/po/fi.po	Fri Jan 02 22:11:08 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2008-09-30 19:46+0300\n"
+"POT-Creation-Date: 2008-12-16 00:12+0200\n"
+"PO-Revision-Date: 2008-12-16 00:16+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -4650,6 +4650,19 @@
 msgid "Unable to retrieve MSN Address Book"
 msgstr "MSN-osoitekirjaa ei onnistuttu noutamaan"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Ei voi lisätä \"%s\"."
+
+msgid "Buddy Add error"
+msgstr "Tuttavan lisäysvirhe"
+
+msgid "The username specified does not exist."
+msgstr "Syötetty käyttäjänimi ei ole olemassa."
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Tuttavien synkronointiongelma käyttäjätilillä %s (%s)"
@@ -4971,6 +4984,12 @@
 msgid "Page"
 msgstr "Lähetä"
 
+msgid "Playing a game"
+msgstr "Pelaamassa peliä"
+
+msgid "Working"
+msgstr "Tekee töitä"
+
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
@@ -5007,6 +5026,12 @@
 msgid "Album"
 msgstr "Levy"
 
+msgid "Game Title"
+msgstr "Pelin nimi"
+
+msgid "Office Title"
+msgstr "Kappaleen nimi"
+
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
@@ -5197,8 +5222,8 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-msgid "Profile URL"
-msgstr "Profiilin URL"
+msgid "View web profile"
+msgstr "Näytä WWW-profiili"
 
 #. *< type
 #. *< ui_requirement
@@ -5446,19 +5471,15 @@
 msgid "Do you want to delete this buddy from your address book as well?"
 msgstr "Haluatko poistaa tämän tuttavan myös osoitekirjastasi?"
 
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Ei voi lisätä \"%s\"."
-
 msgid "The username specified is invalid."
 msgstr "Syötetty käyttäjänimi on virheellinen."
 
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
+msgid "Profile URL"
+msgstr "Profiilin URL"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5472,18 +5493,12 @@
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-msgid "Missing Cipher"
-msgstr "Salaus puuttuu"
-
-msgid "The RC4 cipher could not be found"
-msgstr "RC4-salausta ei löydetty"
-
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Päivitä libpurpleen jossa RC4-tuki (>= 2.0.1). MySpaceIM-liitännäistä ei "
-"ladattu."
+#, c-format
+msgid "No such user: %s"
+msgstr "Käyttäjää ei löydy: %s"
+
+msgid "User lookup"
+msgstr "Käyttäjän haku"
 
 msgid "Reading challenge"
 msgstr "Luetaan tunnistushaastetta"
@@ -5494,11 +5509,17 @@
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
-msgstr[1] "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Käyttäjänimeä ei asetettu"
+
+msgid "You appear to have no MySpace username."
+msgstr "Sinulla ei näytä olevan MySpace-käyttäjänimeä."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Haluatko asettaa sen nyt? (Huom: TÄTÄ EI VOI MUUTTAA)"
+
+msgid "Lost connection with server"
+msgstr "Yhteys palvelimeen katkesi"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5519,14 +5540,25 @@
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Käyttäjänimeä ei asetettu"
-
-msgid "You appear to have no MySpace username."
-msgstr "Sinulla ei näytä olevan MySpace-käyttäjänimeä."
-
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr "Haluatko asettaa sen nyt? (Huom: TÄTÄ EI VOI MUUTTAA)"
+msgid "IM Friends"
+msgstr "Pikaviestikaverit"
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d tuttava lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
+"palvelinpuolen luettelossa olevat)"
+msgstr[1] ""
+"%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
+"palvelinpuolen luettelossa olevat)"
+
+msgid "Add contacts from server"
+msgstr "Lisää tuttavia palvelimelta"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
@@ -5553,31 +5585,6 @@
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-virhe"
 
-msgid "Failed to add buddy"
-msgstr "Tuttavan lisääminen epäonnistui"
-
-msgid "'addbuddy' command failed."
-msgstr "\"addbuddy\"-komento epäonnistui."
-
-msgid "persist command failed"
-msgstr "persist-komento epäonnistui"
-
-#, c-format
-msgid "No such user: %s"
-msgstr "Käyttäjää ei löydy: %s"
-
-msgid "User lookup"
-msgstr "Käyttäjän haku"
-
-msgid "Failed to remove buddy"
-msgstr "Tuttavaa poistaminen epäonnistui"
-
-msgid "'delbuddy' command failed"
-msgstr "\"delbuddy\"-komento epäonnistui"
-
-msgid "blocklist command failed"
-msgstr "blocklist-komento epäonnistui"
-
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
@@ -5591,25 +5598,36 @@
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
 
-msgid "IM Friends"
-msgstr "Pikaviestikaverit"
-
-#, c-format
-msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d tuttava lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
-"palvelinpuolen luettelossa olevat)"
-msgstr[1] ""
-"%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
-"palvelinpuolen luettelossa olevat)"
-
-msgid "Add contacts from server"
-msgstr "Lisää tuttavia palvelimelta"
+msgid "Failed to add buddy"
+msgstr "Tuttavan lisääminen epäonnistui"
+
+msgid "'addbuddy' command failed."
+msgstr "\"addbuddy\"-komento epäonnistui."
+
+msgid "persist command failed"
+msgstr "persist-komento epäonnistui"
+
+msgid "Failed to remove buddy"
+msgstr "Tuttavaa poistaminen epäonnistui"
+
+msgid "'delbuddy' command failed"
+msgstr "\"delbuddy\"-komento epäonnistui"
+
+msgid "blocklist command failed"
+msgstr "blocklist-komento epäonnistui"
+
+msgid "Missing Cipher"
+msgstr "Salaus puuttuu"
+
+msgid "The RC4 cipher could not be found"
+msgstr "RC4-salausta ei löydetty"
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Päivitä libpurpleen jossa RC4-tuki (>= 2.0.1). MySpaceIM-liitännäistä ei "
+"ladattu."
 
 msgid "Add friends from MySpace.com"
 msgstr "Lisää kavereita MySpacesta"
@@ -5651,9 +5669,6 @@
 msgid "User"
 msgstr "Käyttäjä"
 
-msgid "Profile"
-msgstr "Profiili"
-
 msgid "Headline"
 msgstr "Otsikko"
 
@@ -5666,16 +5681,6 @@
 msgid "Client Version"
 msgstr "Asiakasohjelman versio"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Käyttäjänimeä ei asetettu"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM - Aseta käyttäjänimi"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Syötä käyttäjänimi tarkistaaksesi sen saatavuus:"
-
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Käyttäjänimi saatavilla"
 
@@ -5685,12 +5690,22 @@
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "KUN TÄMÄ ON KERRAN ASETETTU, SITÄ EI VOI MUUTTAA"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Aseta käyttäjänimi"
+
 msgid "This username is unavailable."
 msgstr "Tämä käyttäjänimi ei ole saatavilla."
 
 msgid "Please try another username:"
 msgstr "Yritä toista käyttäjänimeä:"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Käyttäjänimeä ei asetettu"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Syötä käyttäjänimi tarkistaaksesi sen saatavuus:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6631,6 +6646,9 @@
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
+msgid "Profile"
+msgstr "Profiili"
+
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
@@ -6819,13 +6837,11 @@
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
-#, fuzzy
 msgid "Unable to Add"
 msgstr "Lisääminen epäonnistui"
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
-msgstr "Tuttavien nouto ei onnistunut"
+msgstr "Tuttavien noutaminen ei onnistunut"
 
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
@@ -7123,16 +7139,14 @@
 msgid "Other"
 msgstr "Muu"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Näkymätön"
-
-msgid "Firend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Näkyvissä"
+
+msgid "Friend Only"
+msgstr "Vain kaverit"
+
 msgid "Private"
-msgstr "Yksityisyys"
+msgstr "Yksityinen"
 
 msgid "QQ Number"
 msgstr "QQ-numero"
@@ -7149,9 +7163,8 @@
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Valtuuta tuttava?"
+msgstr "Valtuuta lisäys"
 
 msgid "Cellphone Number"
 msgstr "Matkapuhelinnumero"
@@ -7159,100 +7172,82 @@
 msgid "Personal Introduction"
 msgstr "Henkilökohtainen esittely"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Paikkakunta"
-
-#, fuzzy
+msgstr "Paikkakunta/alue"
+
 msgid "Publish Mobile"
-msgstr "Oma matkapuhelin"
-
-#, fuzzy
+msgstr "Julkaise matkapuhelin"
+
 msgid "Publish Contact"
-msgstr "Anna kontaktiryhmälle lempinimi"
+msgstr "Julkaise yhteystiedot"
 
 msgid "College"
 msgstr "Yliopisto"
 
-#, fuzzy
 msgid "Horoscope"
 msgstr "Horoskooppimerkki"
 
-#, fuzzy
 msgid "Zodiac"
 msgstr "Eläinradan merkki"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Estetty"
-
-#, fuzzy
+msgstr "Veriryhmä"
+
 msgid "True"
-msgstr "härkä"
-
-#, fuzzy
+msgstr "Tosi"
+
 msgid "False"
-msgstr "Epäonnistunut"
-
-#, fuzzy
+msgstr "Epätosi"
+
 msgid "Modify Contact"
-msgstr "Muokkaa tiliä"
-
-#, fuzzy
+msgstr "Muokkaa yhteystietoa"
+
 msgid "Modify Address"
-msgstr "Kotiosoite"
-
-#, fuzzy
+msgstr "Muokkaa osoitetta"
+
 msgid "Modify Extended Information"
-msgstr "Muokkaa tietojani"
-
-#, fuzzy
+msgstr "Muokkaa lisätietoja"
+
 msgid "Modify Information"
 msgstr "Muokkaa tietoja"
 
 msgid "Update"
 msgstr "Päivitä"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Muuta tuttavan tietoja."
-
-#, c-format
-msgid "%d needs Q&A"
-msgstr ""
-
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Lisää tuttava"
-
-#, fuzzy
-msgid "Input answer here"
-msgstr "Anna syy tähän"
+msgstr "Tuttavan tietojen muuttaminen ei onnistunut."
+
+#, c-format
+msgid "%u requires verification"
+msgstr "%u pyytää valtuutusta"
+
+msgid "Add buddy question"
+msgstr "Lisää tuttavakysymys"
+
+msgid "Enter answer here"
+msgstr "Syötä vastaus tähän"
 
 msgid "Send"
 msgstr "Lähetä"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Virheellinen salasana"
+msgstr "Virheellinen vastaus."
 
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#, fuzzy
-msgid "Sorry, You are not my style."
-msgstr "Pahoittelut, en ole kiinnostunut..."
-
-#, c-format
-msgid "%d needs authentication"
-msgstr "Käyttäjä %d tarvitsee valtuutuksen"
-
-#, fuzzy
+msgid "Sorry, you're not my style."
+msgstr "Pahoittelut, et ole tyyliäni."
+
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u tarvitsee valtuutuksen"
+
 msgid "Add buddy authorize"
-msgstr "Lisää tuttava tuttavaluetteloon?"
-
-msgid "Input request here"
-msgstr "Anna syy tähän"
+msgstr "Lisää tuttavavaltuutus"
+
+msgid "Enter request here"
+msgstr "Syötä pyyntö tähän"
 
 msgid "Would you be my friend?"
 msgstr "Haluaisitko olla kaverini?"
@@ -7260,28 +7255,25 @@
 msgid "QQ Buddy"
 msgstr "QQ-tuttava"
 
-#, fuzzy
 msgid "Add buddy"
 msgstr "Lisää tuttava"
 
 msgid "Invalid QQ Number"
 msgstr "Epäkelpo QQ-numero"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "Voisitko valtuuttaa minut?"
-
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Tuttavaa poistaminen epäonnistui"
-
-#, fuzzy, c-format
+msgstr "Valtuutuksen lähetys epäonnistui"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Tuttavan %u poistaminen epäonnistui"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "Poista toisen tuttavista"
-
-#, fuzzy
+msgstr "%d:n tuttavalistalta poistuminen epäonnistui"
+
 msgid "No reason given"
-msgstr "Syytä ei annettu."
+msgstr "Syytä ei annettu"
 
 #. only need to get value
 #, c-format
@@ -7291,7 +7283,7 @@
 msgid "Would you like to add him?"
 msgstr "Haluatko lisätä hänet?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
 msgstr "%s hylkäsi pyynnön"
 
@@ -7314,59 +7306,55 @@
 msgid "You can only search for permanent Qun\n"
 msgstr "Voit etsiä vain pysyviä Quneja\n"
 
-#, fuzzy
+msgid "(Invalid UTF-8 string)"
+msgstr "(Viallinen UTF-8-merkkijono)"
+
 msgid "Not member"
-msgstr "En ole jäsen"
+msgstr "Ei jäsen"
 
 msgid "Member"
 msgstr "Jäsen"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Pyyntövalintaikkuna"
-
-#, fuzzy
+msgstr "Pyydetään"
+
 msgid "Admin"
-msgstr "Ylläpitäjän hälytys"
-
-#, fuzzy
+msgstr "Ylläpitäjä"
+
 msgid "Notice"
-msgstr "Huomautus:"
-
-#, fuzzy
+msgstr "Huomautus"
+
 msgid "Detail"
 msgstr "Yksityiskohdat"
 
 msgid "Creator"
 msgstr "Luoja"
 
-#, fuzzy
 msgid "About me"
-msgstr "Tietoja %sistä"
-
-#, fuzzy
+msgstr "Omat tiedot"
+
 msgid "Category"
-msgstr "Keskusteluvirhe"
-
-#, fuzzy
+msgstr "Luokka"
+
 msgid "The Qun does not allow others to join"
-msgstr "Tämä ryhmä ei salli muiden liittyä"
-
-#, fuzzy
+msgstr "Tämä Qun ei salli muiden liittyä"
+
 msgid "Join QQ Qun"
-msgstr "Liity ryhmäkeskusteluun"
-
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
-
-#, fuzzy
+msgstr "Liity QQ Quniin"
+
+msgid "Input request here"
+msgstr "Anna syy tähän"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Liityttiin onnistuneesti Quniin %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Qun-jäsentä muokattu onnistuneesti"
-
-#, c-format
-msgid "Qun %d denied to join"
-msgstr "Qun %d kielsi liittymisen"
+msgstr "Liityttiin onnistuneesti Quniin"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "Qun %u kielsi liittymisen"
 
 msgid "QQ Qun Operation"
 msgstr "QQ Qun -toiminta"
@@ -7374,12 +7362,11 @@
 msgid "Failed:"
 msgstr "Epäonnistui:"
 
-msgid "Join Qun, Unknow Reply"
+msgid "Join Qun, Unknown Reply"
 msgstr "Quniin liittyminen, tuntematon vastaus"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Poistu Qunista"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7388,51 +7375,47 @@
 "Huomaa, että olet samalla Qunin luoja, \n"
 "Tämä toiminto poistaa lopulta tämän Qunin."
 
-#, fuzzy
-msgid "Sorry, you are not our style ..."
-msgstr "Pahoittelut, en ole kiinnostunut..."
-
-#, fuzzy
-msgid "Successfully changed Qun member"
-msgstr "Qun-jäsentä muokattu onnistuneesti"
-
-#, fuzzy
+msgid "Sorry, you are not our style"
+msgstr "Pahoittelut, et ole tyyliämme"
+
+msgid "Successfully changed Qun members"
+msgstr "Qun-jäseniä muokattu onnistuneesti"
+
 msgid "Successfully changed Qun information"
 msgstr "Qun-tietojen muokkaus onnistui"
 
 msgid "You have successfully created a Qun"
 msgstr "Qun:n luonti onnistui"
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Haluatko asettaa Qun:n yksityiskohdat nyt?"
+msgid "Would you like to set up detailed information now?"
+msgstr "Haluatko asettaa yksityiskohtaiset tiedot nyt?"
 
 msgid "Setup"
 msgstr "Asetukset"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "%d pyysi liittymään Quniin %d"
-
-#, c-format
-msgid "%d request to join Qun %d"
-msgstr "%d pyysi liittymään Quniin %d"
-
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
-
-#, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Poista tuttava"
-
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "%u pyysi liittymään Quniin %u: %s"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "%u pyysi liittymään Quniin %u"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Liittyminen Quniin %u epäonnistui, ylläpitäjä %u"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>Quniin %u liittyminen hyväksyttiin ylläpitäjän %u toimesta: %s</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Poistettiin tuttava %u.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>Uusi tuttava %u liittyi.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7468,37 +7451,36 @@
 msgid "Invalid name"
 msgstr "Epäkelpo nimi"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Valitse kansio..."
-
-#, fuzzy, c-format
+msgstr "Valitse kuvake..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Kirjautumisaika</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Parhaillaan kirjautuneena</b>: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Yhteensä tuttavia linjoilla</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Viimeisin päivitys:</b> %s<br>\n"
+msgstr "<b>Viimeisin päivitys</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Palvelin:</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
+msgstr "<b>Asiakasmerkintä</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Yhteystila</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Internet-osoitteeni:</b> %s<br>\n"
+msgstr "<b>Internet-IP-osoitteeni</b>: %s:%d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
@@ -7520,45 +7502,41 @@
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
 msgstr "<b>Vastaanotettiin moneen kertaan</b>: %lu<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Aika</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Palvelin:</b>: %s<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "Kirjautumistietoja"
 
-#, fuzzy
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<b>Ulkoinen käyttäjä</b><br>"
+msgstr "<p><b>Alkuperäinen tekijä</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Koodin tuottajat</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Viimeisin päivitys:</b> %s<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Ihanat päivitysten kirjoittajat</b>:<br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Lähetetty</b>: %lu<br>\n"
+msgstr "<p><b>Tunnustus</b>:<br>\n"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>Ja, kaikki pojat takahuoneessa...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "Tietoja %sistä"
-
-#, fuzzy
+msgstr "<i>Liity vapaasti joukkoomme!</i> :)"
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr "Tietoja OpenQ %s:sta"
+
 msgid "Change Icon"
-msgstr "Tallenna kuvake"
+msgstr "Vaihda kuvake"
 
 msgid "Change Password"
 msgstr "Vaihda salasana"
@@ -7567,11 +7545,10 @@
 msgstr "Tilin tiedot"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Päivitä kaikki QQ Qunit"
+
 msgid "About OpenQ"
-msgstr "Tietoja %sistä"
+msgstr "Tietoja OpenQ:sta"
 
 #. *< type
 #. *< ui_requirement
@@ -7583,27 +7560,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "QQ-yhteyskäytäntöliitännäinen"
 
 msgid "Auto"
 msgstr "Auto"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "Valitse käyttäjä"
+msgstr "Valitse palvelin"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#. #endif
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
 msgstr "Yhdistetään käyttäen TCP:tä"
 
@@ -7613,25 +7587,18 @@
 msgid "Show server news"
 msgstr "Näytä palvelinuutiset"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Jatkuvan yhteydenpidon aikaväli (s)"
-
-#, fuzzy
+msgstr "Jatkuvan yhteydenpidon aikaväli (sekunneissa)"
+
 msgid "Update interval (seconds)"
-msgstr "Päivitysten aikaväli (s)"
-
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
+msgstr "Päivitysten aikaväli (sekunneissa)"
+
+msgid "Cannot decrypt server reply"
+msgstr "Palvelinvastauksen salausta ei voi purkaa"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Poletin pyyntö epäonnistui, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7639,56 +7606,53 @@
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX ei ole tällä hetkellä tuettuna"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Vaatii rekisteröinnin"
-
-#, fuzzy, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr "Epäkelpo poletin vastauskoodi, 0x%02X"
-
-msgid "Keep alive error"
-msgstr "Jatkuvan yhteydenpidon virhe"
-
-#, fuzzy
-msgid "Requesting captcha ..."
-msgstr "Pyydetään käyttäjän %s huomiota..."
-
-msgid "Checking code of captcha ..."
-msgstr ""
-
-msgid "Failed captcha verify"
-msgstr ""
-
-#, fuzzy
+msgstr "Vaatii aktivoinnin"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Tuntematon vastauskoodi kirjauduttaessa (0x%02X)"
+
+msgid "Could not decrypt server reply"
+msgstr "Palvelinvastauksen salausta ei voi purkaa"
+
+msgid "Requesting captcha"
+msgstr "Pyydetään captchaa"
+
+msgid "Checking captcha"
+msgstr "Tarkistetaan captchaa"
+
+msgid "Failed captcha verification"
+msgstr "Captchan tarkistus epäonnistui"
+
 msgid "Captcha Image"
-msgstr "Tallenna kuva"
-
-#, fuzzy
+msgstr "Captcha-kuva"
+
 msgid "Enter code"
-msgstr "Anna salasana"
-
-msgid "QQ Captcha Verifing"
-msgstr ""
-
-#, fuzzy
+msgstr "Syötä koodi"
+
+msgid "QQ Captcha Verification"
+msgstr "QQ-Captcha-tarkistus"
+
 msgid "Enter the text from the image"
-msgstr "Anna ryhmän nimi"
-
-#, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
-
-#, c-format
-msgid ""
-"Unknow reply code when login (0x%02X):\n"
+msgstr "Syötä teksti kuvasta"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Tuntematon vastaus tarkistettaessa salasanaa (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Tuntematon vastauskoosi kirjauduttaessa sisään (0x%02X):\n"
+"%s"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 msgid "Unable to connect."
@@ -7697,14 +7661,6 @@
 msgid "Socket error"
 msgstr "Pistokevirhe"
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Yhteys palvelimeen katkesi:\n"
-"%d, %s"
-
 msgid "Unable to read from socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
@@ -7714,12 +7670,11 @@
 msgid "Connection lost"
 msgstr "Yhteys katkesi"
 
-#, fuzzy
-msgid "Get server ..."
-msgstr "Aseta käyttäjätiedot..."
-
-msgid "Request token"
-msgstr "Pyydä poletti"
+msgid "Getting server"
+msgstr "Haetaan palvelinta"
+
+msgid "Requesting token"
+msgstr "Pyydetään polettia"
 
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voi löytää"
@@ -7727,63 +7682,62 @@
 msgid "Invalid server or port"
 msgstr "Epäkelpo palvelin tai portti"
 
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Yhdistä palvelimeen"
+msgid "Connecting to server"
+msgstr "Yhdistetään palvelimelle"
 
 msgid "QQ Error"
 msgstr "QQ-virhe"
 
-# c-format
-msgid "Failed to send IM."
-msgstr "Viestin lähettäminen epäonnistui."
-
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "QQ-palvelimen uutisia"
+msgstr ""
+"Palvelimen uutisia:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
 
 #, c-format
 msgid "From %s:"
 msgstr "Lähettäjä %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Palvelimen ohjeet: %s"
-
-msgid "Unknow SERVER CMD"
+msgstr ""
+"Palvelinilmoitus käyttäjältä %s: \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
 msgstr "Tuntematon SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
-msgstr ""
-"Virheellinen vastaus kohteesta %s(0x%02X)\n"
-"Huone %d, vastaus 0x%02X"
+"Room %u, reply 0x%02X"
+msgstr ""
+"Virheellinen vastaus %s(0x%02X)\n"
+"Huone %u, vastaus 0x%02X"
 
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-komento"
 
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "Sinä et ole ryhmän \"%s\" jäsen\n"
-
-msgid "Can not decrypt login reply"
+msgid "Could not decrypt login reply"
 msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Tuntematon vastaus-CMD"
-
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Tuntematon SERVER CMD"
+msgid "Unknown LOGIN CMD"
+msgstr "Tuntematon LOGIN CMD"
+
+msgid "Unknown CLIENT CMD"
+msgstr "Tuntematon CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -9746,13 +9700,8 @@
 msgid "Last Update"
 msgstr "Edellinen päivitys"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
-
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid ""
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Tämä profiili näyttää käyttävän kieltä tai muotoa jota ei tueta tällä "
 "hetkellä."
@@ -10363,7 +10312,7 @@
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10377,10 +10326,10 @@
 msgstr ""
 "<span size='larger' weight='bold'>Tervetuloa %siin!</span>\n"
 "\n"
-"Pikaviestintilejä ei ole määritelty. Yhdistääksesi %sillä napsauta <b>Lisää</"
-"b>-painiketta ja määritä ensimmäisen käyttäjätilisi tiedot. Jos haluat %sin "
-"yhdistävän useampiin pikaviestintileihin, napsauta uudestaan <b>Lisää</b>-"
-"painiketta määritelläksesi ne kaikki.\n"
+"Pikaviestintilejä ei ole määritelty. Yhdistääksesi %sillä napsauta "
+"<b>Lisää...</b>-painiketta ja määritä ensimmäisen käyttäjätilisi tiedot. Jos "
+"haluat %sin yhdistävän useampiin pikaviestintileihin, napsauta uudelleen "
+"<b>Lisää...</b>-painiketta määritelläksesi ne kaikki.\n"
 "\n"
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Tilien hallinta</b> Tuttavat-ikkunassa."
@@ -10805,9 +10754,8 @@
 msgid "Auto_join when account becomes online."
 msgstr "Liity automaattisesti kun käyttä_jätili pääsee linjoille."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "Piilota ry_hmäkeskustelu kun ikkuna on suljettu."
+msgstr "Pysy _ryhmäkeskustelussa ikkunan sulkemisen jälkeen."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
@@ -11181,11 +11129,10 @@
 msgstr "Vakavat virheet"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "ohjelmavirheiden hallitsija"
+
 msgid "artist"
-msgstr "Esittäjä"
+msgstr "esittäjä"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
@@ -11194,9 +11141,8 @@
 msgid "support"
 msgstr "tuki"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "kehittäjä & verkkosivujen ylläpitäjä"
+msgstr "verkkosivujen ylläpitäjä"
 
 msgid "Senior Contributor/QA"
 msgstr "Vanhempi osallistuja/laadunvarmistus"
@@ -11218,7 +11164,7 @@
 msgstr "tuki/laadunvarmistus"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "alkuperäinen tekijä"
@@ -12080,7 +12026,7 @@
 "                      Ilman tätä vain ensimmäinen tili otetaan käyttöön).\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12107,11 +12053,6 @@
 "pinolistaus muistivedostiedostosta. Jos et tiedä kuinka\n"
 "pinolistaus (backtrace) haetaan, lue ohjeita osoitteessa\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"Jos tarvitset lisäapua, lähetä pikaviesti joko tunnukselle SeanEgn tai "
-"LSchiere (AIMissa). Seanin ja Luken yhteystiedot muilla yhteyskäytännöillä "
-"ovat osoitteessa\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -12806,13 +12747,11 @@
 msgid "Custom Smiley Manager"
 msgstr "Omien hymiöiden hallinta"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
-
-#, fuzzy
+msgstr "Napsauta muuttaaksesi tämän käyttäjätilin tuttavakuvaketta."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"
+msgstr "Napsauta muuttaaksesi kaikkien käyttäjätilien tuttavakuvaketta."
 
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
@@ -12948,13 +12887,11 @@
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Muokkaa"
-
-#, fuzzy
+msgstr "_Muokkaa..."
+
 msgid "_Add..."
-msgstr "_Lisää"
+msgstr "_Lisää..."
 
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
@@ -12977,12 +12914,11 @@
 msgid "none"
 msgstr "ei mitään"
 
-#, fuzzy
 msgid "Small"
-msgstr "_Pienempi"
+msgstr "Pienet"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Pienemmät versiot oletushymiöistä"
 
 msgid "Response Probability:"
 msgstr "Vastaustodennäköisyys:"
@@ -13446,9 +13382,8 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Aseta ikkunointiohjelman \"_URGENT\"(kiireellinen)-lippu"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "_Ryhmäkeskusteluikkunoille"
+msgstr "_Välkäytä ikkunaa"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13633,18 +13568,16 @@
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Voit päivittää versioon %s %s."
 
 msgid "New Version Available"
 msgstr "Uusi versio saatavilla"
 
-#, fuzzy
 msgid "Later"
-msgstr "Päiväys"
-
-#, fuzzy
+msgstr "Myöhemmin"
+
 msgid "Download Now"
-msgstr "Lataa %s: %s"
+msgstr "Lataa nyt"
 
 #. *< type
 #. *< ui_requirement
@@ -13964,6 +13897,47 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] ""
+#~ "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
+#~ msgstr[1] ""
+#~ "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
+
+#, fuzzy
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Lisää tuttava"
+
+#, fuzzy
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Jatkuvan yhteydenpidon virhe"
+
+#~ msgid ""
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
+#~ msgstr ""
+#~ "Yhteys palvelimeen katkesi:\n"
+#~ "%d, %s"
+
+#, fuzzy
+#~ msgid "Connecting server ..."
+#~ msgstr "Yhdistä palvelimeen"
+
+# c-format
+#~ msgid "Failed to send IM."
+#~ msgstr "Viestin lähettäminen epäonnistui."
+
+#, fuzzy
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "Sinä et ole ryhmän \"%s\" jäsen\n"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "Valitun niminen ryhmä on jo olemassa"
 
@@ -14059,15 +14033,6 @@
 #~ msgid "Change Qun information"
 #~ msgstr "Kanavatiedot"
 
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "System Message"
 #~ msgstr "Järjestelmäviesti"
 
@@ -15919,9 +15884,6 @@
 #~ msgid "Away title: "
 #~ msgstr "Poissaolon otsikko: "
 
-#~ msgid "Buddy List Error"
-#~ msgstr "Tuttavalistan virhe"
-
 #~ msgid ""
 #~ "Usage: %s command [OPTIONS] [URI]\n"
 #~ "\n"
--- a/po/fr.po	Fri Jan 02 22:10:31 2009 +0000
+++ b/po/fr.po	Fri Jan 02 22:11:08 2009 +0000
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 15:52-0800\n"
-"PO-Revision-Date: 2008-08-26 14:30+0200\n"
+"POT-Creation-Date: 2008-12-16 10:10+0100\n"
+"PO-Revision-Date: 2008-12-16 10:09+0100\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -85,7 +85,6 @@
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "Aucun plugin de protocole n'est installé."
 
@@ -1526,10 +1525,10 @@
 msgstr "Pas de groupement"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Sous-groupe emboité"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Emboitage de groupes (expérimental)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "Fournit des options supplémentaires pour le regroupement des contacts."
@@ -1848,7 +1847,7 @@
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "Le processus de résolution s'est arrêté sans répondre."
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -4578,7 +4577,6 @@
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
 msgstr "Afficher les frimousses personnalisées"
 
@@ -4708,6 +4706,19 @@
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Impossible de récupérer le carnet d'adresses MSN"
 
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "Impossible d'ajouter « %s »"
+
+msgid "Buddy Add error"
+msgstr "Erreur à l'ajout de l'utilisateur"
+
+msgid "The username specified does not exist."
+msgstr "Le nom d'utilisateur fourni est non valide."
+
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problème de synchronisation de la liste de contact avec %s (%s)"
@@ -4936,9 +4947,9 @@
 msgid "Passport account not yet verified"
 msgstr "Le compte Passeport n'est pas encore validé"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Passport account suspended"
-msgstr "Le compte Passeport n'est pas encore validé"
+msgstr "Le compte Passeport est suspendu"
 
 #, c-format
 msgid "Bad ticket"
@@ -4952,13 +4963,11 @@
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN : %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Méthodes de contact préférées"
-
-#, fuzzy
+msgstr "AUtres contacts"
+
 msgid "Non-IM Contacts"
-msgstr "Supprimer un contact"
+msgstr "Contacts non instantanés"
 
 msgid "Nudge"
 msgstr "Nudge"
@@ -5031,6 +5040,12 @@
 msgid "Page"
 msgstr "Envoyer"
 
+msgid "Playing a game"
+msgstr "Joue"
+
+msgid "Working"
+msgstr "Travaille"
+
 msgid "Has you"
 msgstr "Vous êtes dans sa liste"
 
@@ -5067,6 +5082,12 @@
 msgid "Album"
 msgstr "Album"
 
+msgid "Game Title"
+msgstr "Nom du jeu"
+
+msgid "Office Title"
+msgstr "Nom du travail"
+
 msgid "Set Friendly Name..."
 msgstr "Changer l'alias..."
 
@@ -5259,8 +5280,8 @@
 "Impossible de récupérer des informations sur le profil de l'utilisateur. Il "
 "est possible que cet utilisateur n'existe pas."
 
-msgid "Profile URL"
-msgstr "Lien du profil"
+msgid "View web profile"
+msgstr "Voir le profil web"
 
 #. *< type
 #. *< ui_requirement
@@ -5315,9 +5336,8 @@
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "Voici les résultats de votre recherche."
+msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
 
 #, c-format
 msgid "Unable to add user on %s (%s)"
@@ -5509,20 +5529,11 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Ajouter au carnet d'adresses"
-
-#, fuzzy
+msgstr "Supprimer le contact du carnet d'adresses ?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
-
-#. only notify the user about problems adding to the friends list
-#. * maybe we should do something else for other lists, but it probably
-#. * won't cause too many problems if we just ignore it
-#, c-format
-msgid "Unable to add \"%s\"."
-msgstr "Impossible d'ajouter « %s »"
+msgstr "Voulez-vous aussi supprimer ce contact de votre carnet d'adresses ?"
 
 msgid "The username specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
@@ -5530,6 +5541,9 @@
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas être actif."
 
+msgid "Profile URL"
+msgstr "Lien du profil"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5543,18 +5557,12 @@
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-msgid "Missing Cipher"
-msgstr "Chiffre manquant"
-
-msgid "The RC4 cipher could not be found"
-msgstr "Le chiffre RC4 n'a pas été trouvé."
-
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Le plugin MySpaceIM ne sera pas chargé. Mettez à jour libpurple avec le "
-"support de RC4 (>= 2.0.1)."
+#, c-format
+msgid "No such user: %s"
+msgstr "Utilisateur inconnu : %s"
+
+msgid "User lookup"
+msgstr "Recherche d'utilisateur"
 
 msgid "Reading challenge"
 msgstr "Lecture du défi"
@@ -5565,12 +5573,19 @@
 msgid "Logging in"
 msgstr "Connexion"
 
-#, c-format
-msgid "Connection to server lost (no data received within %d second)"
-msgid_plural "Connection to server lost (no data received within %d seconds)"
-msgstr[0] "Connexion avec le serveur perdue (aucune donnée depuis %d seconde)."
-msgstr[1] ""
-"Connexion avec le serveur perdue (aucune donnée depuis %d secondes)."
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - Aucun nom d'utilisateur fourni"
+
+msgid "You appear to have no MySpace username."
+msgstr "Il semblerait que vous n'aillez pas de nom d'utilisateur MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+"Voulez-vous en fournir un maintenant ? (Attention : IL NE POURRA PLUS ÊTRE "
+"CHANGÉ !)"
+
+msgid "Lost connection with server"
+msgstr "Connexion perdue avec le serveur"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5591,16 +5606,25 @@
 msgid "MySpace"
 msgstr "MySpace"
 
-msgid "MySpaceIM - No Username Set"
-msgstr "MySpaceIM - Aucun nom d'utilisateur fourni"
-
-msgid "You appear to have no MySpace username."
-msgstr "Il semblerait que vous n'aillez pas de nom d'utilisateur MySpace."
-
-msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-"Voulez-vous en fournir un maintenant ? (Attention : IL NE POURRA PLUS ÊTRE "
-"CHANGÉ !)"
+msgid "IM Friends"
+msgstr "Amis de messagerie"
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d contact a été ajouté ou mis à jour depuis le serveur (y compris les "
+"contacts déjà sur la liste du serveur)."
+msgstr[1] ""
+"%d contacts ont été ajoutés ou mis à jour depuis le serveur (y compris les "
+"contacts déjà sur la liste du serveur)."
+
+msgid "Add contacts from server"
+msgstr "Ajouter les contacts du serveur"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
@@ -5627,31 +5651,6 @@
 msgid "MySpaceIM Error"
 msgstr "Erreur MySpaceIM"
 
-msgid "Failed to add buddy"
-msgstr "Échec lors de l'ajout du contact."
-
-msgid "'addbuddy' command failed."
-msgstr "Échec de la commande « addbuddy »."
-
-msgid "persist command failed"
-msgstr "Échec de la commande « persist »."
-
-#, c-format
-msgid "No such user: %s"
-msgstr "Utilisateur inconnu : %s"
-
-msgid "User lookup"
-msgstr "Recherche d'utilisateur"
-
-msgid "Failed to remove buddy"
-msgstr "Échec lors de la suppression du contact."
-
-msgid "'delbuddy' command failed"
-msgstr "Échec de la commande « delbuddy »."
-
-msgid "blocklist command failed"
-msgstr "Échec de la commande « blocklist »."
-
 msgid "Invalid input condition"
 msgstr "Condition de saisie non valide."
 
@@ -5665,25 +5664,36 @@
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Impossible de se connecter à l'hôte : %s (%d)"
 
-msgid "IM Friends"
-msgstr "Amis de messagerie"
-
-#, c-format
-msgid ""
-"%d buddy was added or updated from the server (including buddies already on "
-"the server-side list)"
-msgid_plural ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr[0] ""
-"%d contact a été ajouté ou mis à jour depuis le serveur (y compris les "
-"contacts déjà sur la liste du serveur)."
-msgstr[1] ""
-"%d contacts ont été ajoutés ou mis à jour depuis le serveur (y compris les "
-"contacts déjà sur la liste du serveur)."
-
-msgid "Add contacts from server"
-msgstr "Ajouter les contacts du serveur"
+msgid "Failed to add buddy"
+msgstr "Échec lors de l'ajout du contact."
+
+msgid "'addbuddy' command failed."
+msgstr "Échec de la commande « addbuddy »."
+
+msgid "persist command failed"
+msgstr "Échec de la commande « persist »."
+
+msgid "Failed to remove buddy"
+msgstr "Échec lors de la suppression du contact."
+
+msgid "'delbuddy' command failed"
+msgstr "Échec de la commande « delbuddy »."
+
+msgid "blocklist command failed"
+msgstr "Échec de la commande « blocklist »."
+
+msgid "Missing Cipher"
+msgstr "Chiffre manquant"
+
+msgid "The RC4 cipher could not be found"
+msgstr "Le chiffre RC4 n'a pas été trouvé."
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Le plugin MySpaceIM ne sera pas chargé. Mettez à jour libpurple avec le "
+"support de RC4 (>= 2.0.1)."
 
 msgid "Add friends from MySpace.com"
 msgstr "Ajouter les amis de MySpace.com"
@@ -5725,9 +5735,6 @@
 msgid "User"
 msgstr "Utilisateur"
 
-msgid "Profile"
-msgstr "Informations"
-
 msgid "Headline"
 msgstr "En-tête"
 
@@ -5740,16 +5747,6 @@
 msgid "Client Version"
 msgstr "Version du client"
 
-#. Protocol won't log in now without a username set.. Disconnect
-msgid "No username set"
-msgstr "Aucun nom d'utilisateur fourni"
-
-msgid "MySpaceIM - Please Set a Username"
-msgstr "MySpaceIM -  Veuillez fournir un nom d'utilisateur"
-
-msgid "Please enter a username to check its availability:"
-msgstr "Saisissez un nom d'utilisateur pour vérifier sa disponibilité :"
-
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nom d'utilisateur disponible"
 
@@ -5759,12 +5756,22 @@
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "Une fois choisi, IL NE POURRA PAS ÊTRE CHANGÉ !"
 
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM -  Veuillez fournir un nom d'utilisateur"
+
 msgid "This username is unavailable."
 msgstr "Ce nom d'utilisateur n'est pas disponible."
 
 msgid "Please try another username:"
 msgstr "Veuillez en essayer un autre :"
 
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr "Aucun nom d'utilisateur fourni"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Saisissez un nom d'utilisateur pour vérifier sa disponibilité :"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
@@ -6212,7 +6219,7 @@
 msgstr "Plugin pour le protocole AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "UIN ICQ..."
 
 #. *< type
 #. *< ui_requirement
@@ -6545,8 +6552,8 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"Vous risquez être déconnecté sous peu. Essayer d'utiliser TOC en attendant. "
-"Regardez %s pour plus d'informations."
+"Vous risquez d'être déconnecté sous peu. Veuillez essayer d'utiliser TOC "
+"entre-temps si cela arrive. Visitez %s pour plus d'informations."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossible de récupérer un code de connexion AIM valide."
@@ -6723,6 +6730,9 @@
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
+msgid "Profile"
+msgstr "Informations"
+
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
@@ -6914,11 +6924,9 @@
 "soit commencer par une lettre et contenir uniquement des lettres, des "
 "chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#, fuzzy
 msgid "Unable to Add"
 msgstr "Impossible d'ajouter"
 
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
@@ -7219,16 +7227,14 @@
 msgid "Other"
 msgstr "Autre"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisible"
-
-msgid "Firend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Visible"
+
+msgid "Friend Only"
+msgstr "Amis seulement"
+
 msgid "Private"
-msgstr "Filtres"
+msgstr "Privé"
 
 msgid "QQ Number"
 msgstr "Numéro QQ"
@@ -7245,9 +7251,8 @@
 msgid "Phone Number"
 msgstr "Téléphone fixe"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Autoriser le contact ?"
+msgstr "Autoriser l'ajout"
 
 msgid "Cellphone Number"
 msgstr "Téléphone portable"
@@ -7255,132 +7260,108 @@
 msgid "Personal Introduction"
 msgstr "Informations personnelles"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Localité"
-
-#, fuzzy
+msgstr "Ville/Localité"
+
 msgid "Publish Mobile"
-msgstr "Téléphone portable personnel"
-
-#, fuzzy
+msgstr "Publier le téléphone portable"
+
 msgid "Publish Contact"
-msgstr "Donner un alias à un contact"
+msgstr "Publier les informations de contact"
 
 msgid "College"
 msgstr "Éducation"
 
-#, fuzzy
 msgid "Horoscope"
 msgstr "Signe du zodiaque"
 
-#, fuzzy
 msgid "Zodiac"
 msgstr "Signe du zodiaque chinois"
 
-#, fuzzy
 msgid "Blood"
-msgstr "Bloqué"
-
-#, fuzzy
+msgstr "Groupe sanguin"
+
 msgid "True"
-msgstr "Taureau"
-
-#, fuzzy
+msgstr "Vrai"
+
 msgid "False"
-msgstr "Échec"
-
-#, fuzzy
+msgstr "Faux"
+
 msgid "Modify Contact"
-msgstr "Modification du compte"
-
-#, fuzzy
+msgstr "Modifier les infos de contact"
+
 msgid "Modify Address"
-msgstr "Adresse personnelle"
-
-#, fuzzy
+msgstr "Modifier l'adresse"
+
 msgid "Modify Extended Information"
-msgstr "Modifier mes informations"
-
-#, fuzzy
+msgstr "Modifier mes infos étendues"
+
 msgid "Modify Information"
 msgstr "Modifier mes informations"
 
-#, fuzzy
 msgid "Update"
-msgstr "Dernière mise à jour"
-
-#, fuzzy
+msgstr "Mettre à jour"
+
 msgid "Could not change buddy information."
-msgstr "Veuillez saisir les informations du contact."
-
-#, c-format
-msgid "%d needs Q&A"
-msgstr ""
-
-#, fuzzy
-msgid "Add buddy Q&A"
-msgstr "Ajouter le contact"
-
-#, fuzzy
-msgid "Input answer here"
-msgstr "Saisissez votre demande"
+msgstr "Impossible de changer les informations du contact."
+
+#, c-format
+msgid "%u requires verification"
+msgstr "%u demande une vérification"
+
+msgid "Add buddy question"
+msgstr "Ajouter une question pour les nouveaux contacts"
+
+msgid "Enter answer here"
+msgstr "Saisissez la réponse ici"
 
 msgid "Send"
 msgstr "Envoyer"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nom d'utilisateur non valide."
+msgstr "Réponse non valide."
 
 msgid "Authorization denied message:"
 msgstr "Message de refus d'autorisation :"
 
-#, fuzzy
-msgid "Sorry, You are not my style."
-msgstr "Désolé, tu n'es pas mon genre..."
-
-#, fuzzy, c-format
-msgid "%d needs authentication"
-msgstr "L'utilisateur %d demande une authentification."
-
-#, fuzzy
+msgid "Sorry, you're not my style."
+msgstr "Désolé, tu n'es pas mon genre."
+
+#, c-format
+msgid "%u needs authorization"
+msgstr "%u demande une autorisation"
+
 msgid "Add buddy authorize"
-msgstr "Ajouter cet utilisateur à la liste de contacts ?"
-
-msgid "Input request here"
+msgstr "Ajouter une autorisation de contact"
+
+msgid "Enter request here"
 msgstr "Saisissez votre demande"
 
 msgid "Would you be my friend?"
 msgstr "Veux-tu être mon ami ?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contact"
-
-#, fuzzy
+msgstr "Contact QQ"
+
 msgid "Add buddy"
-msgstr "Ajouter le contact"
-
-#, fuzzy
+msgstr "Ajouter un contact"
+
 msgid "Invalid QQ Number"
-msgstr "QQ Face non valide"
-
-#, fuzzy
+msgstr "Numéro QQ non valide"
+
 msgid "Failed sending authorize"
-msgstr "Autorise moi, s'il te plaît !"
-
-#, fuzzy, c-format
-msgid "Failed removing buddy %d"
-msgstr "Échec lors de la suppression du contact."
-
-#, fuzzy, c-format
+msgstr "Échec à l'envoi de l'autorisation"
+
+#, c-format
+msgid "Failed removing buddy %u"
+msgstr "Échec lors de la suppression du contact %u"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "L'utilisateur %s vous a supprimé de sa liste de contacts."
-
-#, fuzzy
+msgstr "Échec lors de ma suppression de la liste de %d"
+
 msgid "No reason given"
-msgstr "Pas de raison"
+msgstr "Pas de raison donnée"
 
 #. only need to get value
 #, c-format
@@ -7390,9 +7371,9 @@
 msgid "Would you like to add him?"
 msgstr "Voulez-vous l'ajouter ?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Refuser"
+msgstr "Refusé par %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7407,81 +7388,73 @@
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Saisissez le nouveau nom pour %s"
-
-#, fuzzy
+msgstr "Saisissez le numéro Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Vous ne pouvez cherche que les groupes QQ permanents.\n"
-
-#, fuzzy
+msgstr "Vous ne pouvez chercher que les Qun permanents.\n"
+
+msgid "(Invalid UTF-8 string)"
+msgstr "(Chaine de caractères UTF-8 non valide)"
+
 msgid "Not member"
-msgstr "Je n'en suis pas membre."
+msgstr "Non membre"
 
 msgid "Member"
 msgstr "Membre"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Boite de message pour requête"
-
-#, fuzzy
+msgstr "Demande en cours"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Admin"
+
 msgid "Notice"
-msgstr "Commentaire"
-
-#, fuzzy
+msgstr "Envoi d'infos"
+
 msgid "Detail"
-msgstr "Par défaut"
+msgstr "Détail"
 
 msgid "Creator"
 msgstr "Créateur"
 
-#, fuzzy
 msgid "About me"
-msgstr "À propos de %s"
-
-#, fuzzy
+msgstr "À mon propos"
+
 msgid "Category"
-msgstr "Erreur de discussion"
-
-#, fuzzy
+msgstr "Catégorie"
+
 msgid "The Qun does not allow others to join"
-msgstr "Ce groupe est fermé aux inscriptions."
-
-#, fuzzy
+msgstr "Ce Qun est fermé aux inscriptions"
+
 msgid "Join QQ Qun"
-msgstr "Rejoindre une discussion"
-
-#, c-format
-msgid "Successfully joined Qun %s (%d)"
-msgstr ""
-
-#, fuzzy
+msgstr "Rejoindre un Qun QQ"
+
+msgid "Input request here"
+msgstr "Saisissez votre demande"
+
+#, c-format
+msgid "Successfully joined Qun %s (%u)"
+msgstr "Entrée réussie dans le Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Vous avez modifié la liste des membres du Qun."
-
-#, c-format
-msgid "Qun %d denied to join"
-msgstr ""
+msgstr "Entrée réussie dans le Qun"
+
+#, c-format
+msgid "Qun %u denied from joining"
+msgstr "L'entrée dans le Qun %u a été refusée"
 
 msgid "QQ Qun Operation"
 msgstr "Opération QQ Qun"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Échec"
-
-msgid "Join Qun, Unknow Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Échec :"
+
+msgid "Join Qun, Unknown Reply"
+msgstr "Joindre un Qun, réponse inconnue"
+
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Parir du Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7490,51 +7463,47 @@
 "Note : si vous en êtes le créateur, \n"
 "cette opération peut supprimer ce Qun."
 
-#, fuzzy
-msgid "Sorry, you are not our style ..."
-msgstr "Désolé, tu n'es pas mon genre..."
-
-#, fuzzy
-msgid "Successfully changed Qun member"
+msgid "Sorry, you are not our style"
+msgstr "Désolés, tu n'es pas notre genre."
+
+msgid "Successfully changed Qun members"
 msgstr "Vous avez modifié la liste des membres du Qun."
 
-#, fuzzy
 msgid "Successfully changed Qun information"
 msgstr "Vous avez modifié les informations du Qun."
 
 msgid "You have successfully created a Qun"
 msgstr "Vous avez créé un Qun."
 
-#, fuzzy
-msgid "Would you like to set detailed information now?"
-msgstr "Voulez-vous modifier les paramètres du Qun maintenant ?"
+msgid "Would you like to set up detailed information now?"
+msgstr "Voulez-vous modifier les infos détaillées maintenant ?"
 
 msgid "Setup"
 msgstr "Options"
 
-#, fuzzy, c-format
-msgid "%d requested to join Qun %d for %s"
-msgstr "L'utilisateur %d demande à rejoindre le groupe %d."
-
-#, fuzzy, c-format
-msgid "%d request to join Qun %d"
-msgstr "L'utilisateur %d demande à rejoindre le groupe %d."
-
-#, fuzzy, c-format
-msgid "Failed to join Qun %d, operated by admin %d"
-msgstr "Impossible de joindre le contact dans la discussion"
-
-#, c-format
-msgid "<b>Joining Qun %d is approved by admin %d for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "<b>Removed buddy %d.</b>"
-msgstr "Supprimer un contact"
-
-#, c-format
-msgid "<b>New buddy %d joined.</b>"
-msgstr ""
+#, c-format
+msgid "%u requested to join Qun %u for %s"
+msgstr "L'utilisateur %u demande à rejoindre le Qun %u pour %s"
+
+#, c-format
+msgid "%u request to join Qun %u"
+msgstr "L'utilisateur %u demande à rejoindre le Qun %u"
+
+#, c-format
+msgid "Failed to join Qun %u, operated by admin %u"
+msgstr "Échec pour rejoindre le Qun %u, administré par %u"
+
+#, c-format
+msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
+msgstr "<b>L'entrée dans le Qun %u a été approuvée par l'admin %u pour %s</b>"
+
+#, c-format
+msgid "<b>Removed buddy %u.</b>"
+msgstr "<b>Contact supprimé %u.</b>"
+
+#, c-format
+msgid "<b>New buddy %u joined.</b>"
+msgstr "<b>Nouveau contact %u entré.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7558,9 +7527,8 @@
 msgid " Video"
 msgstr " Vidéo"
 
-#, fuzzy
 msgid " Zone"
-msgstr "Aucun"
+msgstr " Zone"
 
 msgid "Flag"
 msgstr "Drapeau"
@@ -7571,110 +7539,104 @@
 msgid "Invalid name"
 msgstr "Nom d'utilisateur non valide"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Choisir un dossier..."
-
-#, fuzzy, c-format
+msgstr "Choisir une icône..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Heure de connexion :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Heure de connexion :</b> %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Connectés :</b> %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Contacts connectés :</b> %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Dernière mise à jour :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Dernière mise à jour :</b> %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Serveur :</b> %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Serveur :</b> %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Heure de connexion :</b> %s<br>\n"
+msgstr "<b>Étiquette du client :</b> %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Type de connexion :</b> %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Type de connexion :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Adresse internet IP :</b> %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Serveur :</b> %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Envoyés :</b> %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Dernière mise à jour :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ré-envoyés :</b> %lu<br>\n"
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Dernière mise à jour :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Perdus :</b> %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Serveur :</b> %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Reçus :</b> %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Adresse IP publiée :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Doubles reçus :</b> %lu<br>\n"
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Heure de connexion :</b> %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Heure :</b> %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Serveur :</b> %s: %d<br>\n"
+msgstr "<b>IP :</b> %s<br>\n"
 
 msgid "Login Information"
 msgstr "Informations de connexion"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Auteur original :</b><br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Contributeurs au code :</b><br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Dernière mise à jour :</b> %s<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Charmants contributeurs de patchs :</b><br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Serveur :</b> %s: %d<br>\n"
+msgstr "<p><b>Remerciements :</b><br>\n"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>et tous les personnes dans les coulisses...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "About OpenQ r%s"
-msgstr "À propos de %s"
-
-#, fuzzy
+msgstr "<i>N'hésitez pas à mous rejoindre !</i> :)"
+
+#, c-format
+msgid "About OpenQ %s"
+msgstr "À propos de OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Enregistrer l'icône"
+msgstr "Changer l'icône"
 
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informations de connexion"
+msgstr "Informations du compte"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Mettre à jour tous les Quns QQ"
+
 msgid "About OpenQ"
-msgstr "À propos de %s"
+msgstr "À propos de OpenQ"
 
 #. *< type
 #. *< ui_requirement
@@ -7686,59 +7648,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Plugin pour le protocole QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Auteur"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Choisir l'utilisateur"
+msgstr "Choisir le serveur"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#. #endif
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
 msgstr "Connexion par TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Port du serveur"
-
-#, fuzzy
+msgstr "Afficher les infos du serveur"
+
 msgid "Show server news"
-msgstr "Hôte du serveur"
-
-#, fuzzy
+msgstr "Afficher les nouveautés du serveur"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Délai(s) de Keep alive"
-
-#, fuzzy
+msgstr "Délai de Keep alive (en secondes)"
+
 msgid "Update interval (seconds)"
-msgstr "Délai(s) de mise à jour"
-
-#, fuzzy
-msgid "Can not decrypt server reply"
-msgstr "Impossible de déchiffrer la réponse de connexion"
-
-#, fuzzy
-msgid "Can not decrypt get server reply"
-msgstr "Impossible de déchiffrer la réponse de connexion"
+msgstr "Délai de mise à jour (en secondes)"
+
+msgid "Cannot decrypt server reply"
+msgstr "Impossible de déchiffrer la réponse du serveur"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Échec lors de la demande du token, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7746,56 +7694,53 @@
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX n'est pas supportée pour l'instant"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Erreur d'enregistrement"
-
-#, fuzzy, c-format
-msgid "Unknow reply code when login (0x%02X)"
-msgstr "Code du token de réponse non valide : 0x%02X"
-
-msgid "Keep alive error"
-msgstr "Erreur de Keep alive"
-
-#, fuzzy
-msgid "Requesting captcha ..."
-msgstr "Attire l'attention de %s..."
-
-msgid "Checking code of captcha ..."
-msgstr ""
-
-msgid "Failed captcha verify"
-msgstr ""
-
-#, fuzzy
+msgstr "Activation nécessaire"
+
+#, c-format
+msgid "Unknown reply code when logging in (0x%02X)"
+msgstr "Réponse inconnue à la connexion (0x%02X)"
+
+msgid "Could not decrypt server reply"
+msgstr "Impossible de déchiffrer la réponse du serveur"
+
+msgid "Requesting captcha"
+msgstr "Demande de captcha"
+
+msgid "Checking captcha"
+msgstr "Vérification du code du captcha"
+
+msgid "Failed captcha verification"
+msgstr "Échec à la vérification du captcha"
+
 msgid "Captcha Image"
-msgstr "Enregistrer l'image"
-
-#, fuzzy
+msgstr "Image captcha"
+
 msgid "Enter code"
-msgstr "Saisissez le mot de passe"
-
-msgid "QQ Captcha Verifing"
-msgstr ""
-
-#, fuzzy
+msgstr "Saisissez le code"
+
+msgid "QQ Captcha Verification"
+msgstr "Vérification du captcha QQ"
+
 msgid "Enter the text from the image"
-msgstr "Saisissez le nom du groupe"
-
-#, c-format
-msgid "Unknow reply code when checking password (0x%02X)"
-msgstr ""
-
-#, c-format
-msgid ""
-"Unknow reply code when login (0x%02X):\n"
+msgstr "Saisissez le texte de l'image"
+
+#, c-format
+msgid "Unknown reply when checking password (0x%02X)"
+msgstr "Réponse inconnue à la vérification du mot de passe (0x%02X)"
+
+#, c-format
+msgid ""
+"Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Réponse inconnue à la connexion (0x%02X) :\n"
+"%s"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 msgid "Unable to connect."
@@ -7804,14 +7749,6 @@
 msgid "Socket error"
 msgstr "Erreur de socket."
 
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%d, %s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%d, %s"
-
 msgid "Unable to read from socket"
 msgstr "Impossible de lire le socket."
 
@@ -7821,81 +7758,74 @@
 msgid "Connection lost"
 msgstr "Connexion perdue."
 
-#, fuzzy
-msgid "Get server ..."
-msgstr "Modifier les informations..."
-
-#, fuzzy
-msgid "Request token"
-msgstr "Requête refusée"
+msgid "Getting server"
+msgstr "Récupération du serveur"
+
+msgid "Requesting token"
+msgstr "Requête d'un token"
 
 msgid "Couldn't resolve host"
 msgstr "Impossible de trouver l'adresse de l'hôte."
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "Erreur non valide"
-
-#, fuzzy
-msgid "Connecting server ..."
-msgstr "Serveur de connexion"
-
-#, fuzzy
+msgstr "Serveur ou port non valide"
+
+msgid "Connecting to server"
+msgstr "Connexion au serveur"
+
 msgid "QQ Error"
-msgstr "Erreur QQid"
-
-msgid "Failed to send IM."
-msgstr "Impossible d'envoyer le message."
-
-#, fuzzy, c-format
+msgstr "Erreur QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Relais de serveur ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Nouveautés du serveur :\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
+msgid "%s:%s"
+msgstr "%s : %s"
+
+#, c-format
 msgid "From %s:"
-msgstr "De"
-
-#, fuzzy, c-format
+msgstr "De %s :"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instructions du serveur : %s"
-
-msgid "Unknow SERVER CMD"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr ""
+"Info du serveur de %s : \n"
+"%s"
+
+msgid "Unknown SERVER CMD"
+msgstr "Commande SERVER inconnue"
+
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
-"Room %d, reply 0x%02X"
-msgstr ""
-"Réponse %s(0x%02X )\n"
-"Envoi %s(0x%02X )\n"
-"Salon id %d, réponse [0x%02X]: \n"
-"%s"
-
-#, fuzzy
+"Room %u, reply 0x%02X"
+msgstr ""
+"Erreur à la réponse %s(0x%02X)\n"
+"Salon %u, réponse 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Commande"
-
-#, fuzzy, c-format
-msgid "Not a member of room \"%s\"\n"
-msgstr "Vous n'êtes pas membre du groupe « %s ».\n"
-
-msgid "Can not decrypt login reply"
+msgstr "Commande Qun QQ"
+
+msgid "Could not decrypt login reply"
 msgstr "Impossible de déchiffrer la réponse de connexion"
 
-#, fuzzy
-msgid "Unknow LOGIN CMD"
-msgstr "Raison inconnue"
-
-#, fuzzy
-msgid "Unknow CLIENT CMD"
-msgstr "Raison inconnue"
+msgid "Unknown LOGIN CMD"
+msgstr "Commande LOGIN inconnue"
+
+msgid "Unknown CLIENT CMD"
+msgstr "Commande CLIENT inconnue"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -9770,9 +9700,8 @@
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
+msgstr "ID Yahoo..."
 
 #. *< type
 #. *< ui_requirement
@@ -9880,13 +9809,8 @@
 msgid "Last Update"
 msgstr "Dernière mise à jour"
 
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "Les informations sur %s ne sont pas disponibles"
-
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid ""
+"This profile is in a language or format that is not supported at this time."
 msgstr ""
 "Désolé, ce profil a l'air d'être dans une langue ou un format non supporté "
 "pour l'instant."
@@ -10329,9 +10253,9 @@
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Erreur à la lecture depuis %s : %s"
+msgstr "Erreur à la lecture depuis %s : réponse trop longue (%d octets max)"
 
 #, c-format
 msgid ""
@@ -10505,7 +10429,7 @@
 msgid "Protocol"
 msgstr "Protocole"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10517,7 +10441,7 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span weight='bold' size='larger'>Bienvenue dans %s !</span>\n"
+"<span size='larger' weight='bold'>Bienvenue dans %s !</span>\n"
 "\n"
 "Vous n'avez aucun compte configuré. Pour vous connecter avec %s, cliquez le "
 "bouton <b>Ajouter</b> ci-dessous et configurez votre premier compte. Si vous "
@@ -10525,7 +10449,7 @@
 "b> autant de fois que nécessaire.\n"
 "\n"
 "Pour retrouver cette fenêtre afin d'ajouter, modifier ou supprimer des "
-"comptes, choisissez <b>Comptes->Gérer les comptes</b> dans le menu de la "
+"comptes, choisissez <b>Comptes->Gérer les comptes</b> dans la fenêtre de la "
 "liste de contacts."
 
 #, c-format
@@ -10951,9 +10875,8 @@
 msgid "Auto_join when account becomes online."
 msgstr "Rejoindre _automatiquement quand le compte est activé."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Cacher le salon de discussions quand la fenêtre est fermée."
+msgstr "_Rester dans le salon de discussions quand la fenêtre est fermée."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
@@ -11329,11 +11252,10 @@
 msgstr "Erreur critique"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "maitre des bogues"
+
 msgid "artist"
-msgstr "Artiste"
+msgstr "artiste"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
@@ -11342,9 +11264,8 @@
 msgid "support"
 msgstr "support"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "codeur et webmestre"
+msgstr "webmestre"
 
 msgid "Senior Contributor/QA"
 msgstr "contribuant senior/QA"
@@ -11366,7 +11287,7 @@
 msgstr "support/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "auteur original"
@@ -11443,9 +11364,8 @@
 msgid "French"
 msgstr "Français"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Kurde"
+msgstr "Irlandais"
 
 msgid "Galician"
 msgstr "Galicien"
@@ -11864,14 +11784,12 @@
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "Couleur des liens hypertextes"
-
-#, fuzzy
+msgstr "Couleur des liens visités"
+
 msgid "Color to draw hyperlinks after it has been visited (or activated)."
 msgstr ""
-"Couleur pour afficher les liens hypertextes quand la souris les survole."
+"Couleur pour afficher les liens hypertextes une fois visités (ou activés)."
 
 msgid "Hyperlink prelight color"
 msgstr "Couleur de surlignage des liens hypertextes"
@@ -12246,7 +12164,7 @@
 "activé)\n"
 "  -v, --version       affiche le numéro de la version actuelle\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12274,12 +12192,6 @@
 "core. Si vous ne savez pas comment procéder, veuillez suivre\n"
 "les indications sur\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"Si vous avez besoin d'une aide supplémentaire, veuillez contacter\n"
-"par AIM SeanEgn ou LSchiere (en anglais). Les informations pour\n"
-"contacter Sean ou Luke en utilisant un autre protocole sont\n"
-"disponibles sur\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -12750,20 +12662,17 @@
 "_Commande pour le son :\n"
 "(%s pour le nom de fichier)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "_Silencieux"
+msgstr "Silencieu_x"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons quand la conversation est en _avant-plan"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Activer les sons :"
-
-#, fuzzy
+msgstr "Activer les _sons :"
+
 msgid "V_olume:"
-msgstr "Volume :"
+msgstr "_Volume :"
 
 msgid "Play"
 msgstr "Jouer"
@@ -12984,13 +12893,11 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestionnaire de frimousses personnalisée"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "Utiliser cette _icône pour ce compte :"
-
-#, fuzzy
+msgstr "Cliquer pour changer votre icône pour ce compte."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Utiliser cette _icône pour ce compte :"
+msgstr "Cliquer pour changer votre icône pour tous les comptes."
 
 msgid "Waiting for network connection"
 msgstr "En attente de connexion réseau."
@@ -13128,13 +13035,11 @@
 msgid "_Invite"
 msgstr "_Inviter"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Modifier"
-
-#, fuzzy
+msgstr "_Modifier..."
+
 msgid "_Add..."
-msgstr "_Ajouter"
+msgstr "_Ajouter..."
 
 msgid "_Open Mail"
 msgstr "_Ouvrir le courrier"
@@ -13157,12 +13062,11 @@
 msgid "none"
 msgstr "aucun"
 
-#, fuzzy
 msgid "Small"
-msgstr "Courriel"
+msgstr "Petits"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Versions de taille inférieure des frimousses par défaut"
 
 msgid "Response Probability:"
 msgstr "Probabilité de réponse :"
@@ -13644,9 +13548,8 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Envoyer le message « _URGENT » au gestionnaire de fenêtres"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Les fenêtres de _discussions"
+msgstr "_Faire clignoter la fenêtres"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13732,9 +13635,8 @@
 msgid "Hyperlink Color"
 msgstr "Couleur des liens hypertextes"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Couleur des liens hypertextes"
+msgstr "Couleur des liens visités"
 
 msgid "Highlighted Message Name Color"
 msgstr "Nom de la couleur des messages en surbrillance"
@@ -13829,18 +13731,16 @@
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Vous pouvez mettre à jour %s %s aujourd'hui."
 
 msgid "New Version Available"
 msgstr "Nouvelle version disponible"
 
-#, fuzzy
 msgid "Later"
-msgstr "Date"
-
-#, fuzzy
+msgstr "Plus tard"
+
 msgid "Download Now"
-msgstr "Téléchargement de %s : %s"
+msgstr "Télécharger maintenant"
 
 #. *< type
 #. *< ui_requirement
@@ -14153,334 +14053,44 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
 
-#~ msgid "A group with the name already exists."
-#~ msgstr "Un groupe avec ce nom existe déjà."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informations principales"
-
-#~ msgid "Blood Type"
-#~ msgstr "Groupe sanguin"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Mettre à jour mes informations"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Vitesse :"
+#~ msgid "Connection to server lost (no data received within %d second)"
+#~ msgid_plural ""
+#~ "Connection to server lost (no data received within %d seconds)"
+#~ msgstr[0] ""
+#~ "Connexion avec le serveur perdue (aucune donnée depuis %d seconde)."
+#~ msgstr[1] ""
+#~ "Connexion avec le serveur perdue (aucune donnée depuis %d secondes)."
+
+#~ msgid "%d needs Q&A"
+#~ msgstr "%d a besoin d'une réponse"
+
+#~ msgid "Add buddy Q&A"
+#~ msgstr "Ajouter une réponse de contact"
+
+#~ msgid "Can not decrypt get server reply"
+#~ msgstr "Impossible de récupérer la réponse du serveur"
+
+#~ msgid "Keep alive error"
+#~ msgstr "Erreur de Keep alive"
 
 #~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Choisir une figure personnalisée ne marche pas encore. Veuillez choisir "
-#~ "une image dans %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "QQ Face non valide"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Vous avez rejeté la demande de %d."
-
-#~ msgid "Reject request"
-#~ msgstr "Refus de demande"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Ajout d'un contact avec échec d'authentification"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Impossible de charger la liste de contacts."
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Numéro QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Description du groupe"
-
-#~ msgid "Auth"
-#~ msgstr "Authentification"
-
-#~ msgid "Approve"
-#~ msgstr "Approuver"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
+#~ "Lost connection with server:\n"
+#~ "%d, %s"
 #~ msgstr ""
-#~ "Votre demande pour rejoindre le groupe %d a été refusée par "
-#~ "l'administrateur %d."
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Vous (%d) avez quitté le groupe %d."
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Vous (%d) avez rejoint le groupe %d."
-
-#~ msgid "I am a member"
-#~ msgstr "J'en suis membre."
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Mauvaise requête"
-
-#~ msgid "I am the admin"
-#~ msgstr "J'en suis administrateur."
-
-#~ msgid "Unknown status"
-#~ msgstr "État inconnu."
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Supprimer un groupe"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Vous avez saisi un ID de groupe hors de l'intervalle autorisé."
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Êtes-vous sûr de vouloir quitter ce Qun ?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Voulez-vous accepter cette demande ?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Téléphone fixe"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informations du salon"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "%s (%s)"
-
-#~ msgid "System Message"
-#~ msgstr "Message système"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Adresse IP à la dernière connexion :</b> %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Temps de connexion la dernière fois :</b> %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Changer mes informations"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Quitter ce QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Bloquer ce contact"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Code du token de réponse non valide : 0x%02X"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Erreur lors du changement du mot de passe"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Impossible de se connecter au serveur."
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Connexion au serveur %s, tentatives %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Voulez-vous accepter cette demande ?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Voulez-vous ajouter ce contact à votre liste ?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "L'utilisateur %s vous (%s) a ajouté à sa liste de contacts."
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contact"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s veut vous (%s) ajouter en tant que contact."
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "L'utilisateur %s n'est pas dans votre liste de contacts."
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Voulez-vous l'ajouter ?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Port du serveur"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Correspondant déconnecté"
-
-#~ msgid "developer"
-#~ msgstr "codeur"
-
-#~ msgid "XMPP developer"
-#~ msgstr "codeur XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Artistes"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Vous utilisez %s version %s. La dernière version est %s. Vous pouvez la "
-#~ "télécharger depuis <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Nouveautés :</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "Fin de fichier à la lecture du processus de résolution de noms."
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Vos informations ont été mises à jour."
-
-#~ msgid "Input your reason:"
-#~ msgstr "Saisissez votre raison :"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Vous avez supprimé un contact."
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Vous avez été supprimé de la liste d'un contact."
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Vous avez ajouté l'utilisateur %d à votre liste de contacts."
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid non valide"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Veuillez saisir un ID de groupe externe."
-
-#~ msgid "Reason: %s"
-#~ msgstr "Raison : %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr ""
-#~ "Votre demande pour rejoindre le groupe %d a été acceptée par "
-#~ "l'administrateur %d."
-
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ce groupe a été ajouté à votre liste de contacts."
-
-#~ msgid "I am applying to join"
-#~ msgstr "Je demande à être membre."
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Vous avez quitté ce groupe."
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Authentification QQ du groupe"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr ""
-#~ "Votre opération d'authentification a été acceptée par le serveur QQ."
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Saisissez votre raison :"
-
-#~ msgid " Space"
-#~ msgstr "Espace"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Hôte réel :</b> %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Afficher les informations de connexion"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Délai(s) de réenvoi"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "Le nom d'hôte est NULL ou le port est 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr ""
-#~ "Impossible de se connecter, veuillez vérifier les messages de débuggage."
-
-#~ msgid "Unable to login"
-#~ msgstr "Impossible de se connecter."
-
-#~ msgid "Failed room reply"
-#~ msgstr "Échec à la réponse du salon"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "L'utilisateur %s a refusé votre demande."
-
-#~ msgid "User %s approved your request"
-#~ msgstr "L'utilisateur %s a accepté votre demande."
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Annonce de : %s"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Code [0x%02X] : %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Erreur sur une opération du groupe."
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Erreur à la mise en place des paramètres de la connexion."
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Authentification Windows Live ID : impossible de trouver le jeton "
-#~ "d'authentification dans la réponse du serveur."
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Échec de l'authentification Windows Live ID"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Trop méchant (envoyeur)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Trop méchant (destinataire)"
-
-#~ msgid "Available Message"
-#~ msgstr "Message de disponibilité"
-
-#~ msgid "Away Message"
-#~ msgstr "Message d'absence"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(en cours de récupération)</i>"
-
-#~ msgid "Error requesting login token"
-#~ msgstr "Erreur à la demande d'un token de connexion"
-
-#~ msgid "TCP Address"
-#~ msgstr "Adresse TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Adresse UDP"
-
-#~ msgid "Screen name:"
-#~ msgstr "Nom d'utilisateur :"
+#~ "Connexion perdue avec le serveur :\n"
+#~ "%d, %s"
+
+#~ msgid "Connecting server ..."
+#~ msgstr "Connexion au serveur..."
+
+#~ msgid "Failed to send IM."
+#~ msgstr "Impossible d'envoyer le message."
+
+#~ msgid "Not a member of room \"%s\"\n"
+#~ msgstr "Vous n'êtes pas membre du groupe « %s ».\n"
+
+#~ msgid "User information for %s unavailable"
+#~ msgstr "Les informations sur %s ne sont pas disponibles"
 
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Quelqu'un dit votre nom d'utilisateur dans la discussion"
@@ -14493,54 +14103,6 @@
 #~ "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 #~ "l'authentification ?"
 
-#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
-#~ msgstr "Utiliser GSSAPI (Kerberos v5) pour l'authentification"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "Nom d'utilisateur non valide."
-
-#~ msgid "Invalid screen name."
-#~ msgstr "Nom d'utilisateur non valide."
-
-#~ msgid "Screen _name:"
-#~ msgstr "_Nom d'utilisateur :"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">Auteur :</span> %s\n"
-#~ "<span weight=\"bold\">Page web :</span> %s\n"
-#~ "<span weight=\"bold\">Fichier :</span> %s"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "Ce plugin est utilisé pour afficher des informations statistiques à "
-#~ "propos des contacts de l'utilisateur."
-
-#~ msgid "Screen name sent"
-#~ msgstr "Nom d'utilisateur envoyé"
-
-#~ msgid "Screen name"
-#~ msgstr "Nom d'utilisateur"
-
-#~ msgid "_Merge"
-#~ msgstr "_Fusionner"
-
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "Saisissez le nom d'utilisateur de la personne que vous voulez ajouter à "
-#~ "votre liste de contacts. Vous pouvez choisir un alias ou surnom pour le "
-#~ "contact. L'alias sera affiché à la place du nom d'utilisateur chaque fois "
-#~ "que cela est possible.\n"
-
 #~ msgid "A_ccount:"
 #~ msgstr "_Compte :"