changeset 19777:0633ecda7ed0

merge of '7d129d95f3f565e508da7fd81f36de2b51dfb103' and 'efcbceb17defb2e7b8b8ce1aad9f07ee92985ec8'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 12 Sep 2007 15:59:22 +0000
parents 7de244cf98f3 (diff) 7dbeede6da97 (current diff)
children 959b3aaba0b6 305c95ea0a7b 6a0d9fa477d4 4a38af2279c7
files
diffstat 4 files changed, 3614 insertions(+), 2217 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/dnsquery.h	Wed Sep 12 15:56:06 2007 +0000
+++ b/libpurple/dnsquery.h	Wed Sep 12 15:59:22 2007 +0000
@@ -45,16 +45,21 @@
 typedef void  (*PurpleDnsQueryFailedCallback) (PurpleDnsQueryData *query_data, const gchar *error_message);
 
 /**
- * DNS Request UI operations
+ * DNS Request UI operations;  UIs should implement this if they want to do DNS
+ * lookups themselves, rather than relying on the core.
+ *
+ * @see @ref ui-ops
  */
 typedef struct
 {
-	/* If implemented, the UI is responsible for DNS queries */
-	gboolean (*resolve_host)(PurpleDnsQueryData *query_data, PurpleDnsQueryResolvedCallback resolved_cb, PurpleDnsQueryFailedCallback failed_cb);
+	/** If implemented, the UI is responsible for DNS queries */
+	gboolean (*resolve_host)(PurpleDnsQueryData *query_data,
+	                         PurpleDnsQueryResolvedCallback resolved_cb,
+	                         PurpleDnsQueryFailedCallback failed_cb);
 
-	/* After destroy is called, query_data will be feed, so this must
-	 * cancel any further use of it the UI would do. Unneeded if 
-	 * resolve_host is not implemented.
+	/** Called just before @a query_data is freed; this should cancel any
+	 *  further use of @q query_data the UI would make. Unneeded if
+	 *  #resolve_host is not implemented.
 	 */
 	void (*destroy)(PurpleDnsQueryData *query_data);
 
--- a/po/ChangeLog	Wed Sep 12 15:56:06 2007 +0000
+++ b/po/ChangeLog	Wed Sep 12 15:59:22 2007 +0000
@@ -6,6 +6,7 @@
 	* English (British) translation updated (Luke Ross)
 	* Estonian translation updated (Ivar Smolin)
 	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
 	* German translation updated (Bjoern Voigt)
 	* Hungarian translation updated (Gabor Kelemen)
 	* Italian translation updated (Claudio Satriano)
--- a/po/de.po	Wed Sep 12 15:56:06 2007 +0000
+++ b/po/de.po	Wed Sep 12 15:59:22 2007 +0000
@@ -14633,6 +14633,10 @@
 msgid "Arabic"
 msgstr "Arabisch"
 
+#: ../pidgin/gtkdialogs.c:134
+msgid "Belarusian Latin"
+msgstr "Weißrussisch (Latin)"
+
 #: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
 #: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
--- a/po/fr.po	Wed Sep 12 15:56:06 2007 +0000
+++ b/po/fr.po	Wed Sep 12 15:59:22 2007 +0000
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-13 03:22-0400\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
 "PO-Revision-Date: 2007-08-15 10:48+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -33,7 +33,7 @@
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
 #: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -75,13 +75,15 @@
 "vers %s. Veuillez investiguer et terminer la migration à la main. Reportez "
 "cette erreur sur http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -97,74 +99,78 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Le nom d'utilisateur d'un compte ne doit pas être vide."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Mémoriser le mot de passe"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Aucun plugin de protocole n'est installé."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Vous avez peut-être oublié de faire un « make install »)"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Modification du compte"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Nouveau compte"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nom d'utilisateur :"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias :"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045 ../finch/gntstatus.c:144 ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606 ../libpurple/account.c:984
-#: ../libpurple/account.c:1234 ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:798 ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
@@ -176,12 +182,12 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -198,110 +204,112 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348 ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511 ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977 ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021 ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188 ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Annuler"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1042 ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594 ../libpurple/account.c:1268
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1566
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer %s ?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Supprimer le compte"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1916 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1571
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "Vous pouvez activer/désactiver les comptes de la liste suivante."
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928 ../pidgin/gtkconv.c:1653
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Ajouter"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s a fait de %s son contact%s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Ajouter cet utilisateur à la liste de contacts ?"
 
-#: ../finch/gntaccount.c:933 ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s veut ajouter %s à sa liste de contacts%s%s"
 
-#: ../finch/gntaccount.c:958 ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988 ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Autoriser le contact ?"
 
-#: ../finch/gntaccount.c:965 ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591 ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autoriser"
 
-#: ../finch/gntaccount.c:966 ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592 ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Refuser"
 
@@ -325,19 +333,19 @@
 msgid "Error adding buddy"
 msgstr "Erreur à l'ajout du contact."
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nom d'utilisateur"
 
 #: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1020 ../pidgin/gtkdialogs.c:1042
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -346,11 +354,11 @@
 msgid "Group"
 msgstr "Groupe"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986 ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Compte"
 
@@ -363,7 +371,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182 ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Ajouter le contact"
@@ -377,9 +385,10 @@
 msgstr "Discussions"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -391,7 +400,7 @@
 msgid "Auto-join"
 msgstr "Connexion auto"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5814
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Ajouter la discussion"
 
@@ -413,8 +422,8 @@
 msgstr "Un groupe avec ce nom existe déjà."
 
 #: ../finch/gntblist.c:453 ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Ajouter le groupe"
 
@@ -446,7 +455,7 @@
 msgid "Retrieving..."
 msgstr "Récupération en cours..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -457,10 +466,10 @@
 msgstr "Ajouter une alerte"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
@@ -503,16 +512,16 @@
 msgid "Confirm Remove"
 msgstr "Confirmez la suppression"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Supprimer"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82 ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Liste de contacts"
 
@@ -525,15 +534,20 @@
 msgstr "Basculer la marque"
 
 #. General
-#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -543,29 +557,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "Inactif"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "Sur téléphone portable"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -574,12 +588,12 @@
 "Connectés : %d\n"
 "Total : %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Compte : %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -588,49 +602,53 @@
 "\n"
 "Vu récemment : il y a %s"
 
-#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Nouveau..."
 
-#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Sauvé..."
 
-#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:86
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866 ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "_Nom"
 
-#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871 ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "C_ompte"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Saisissez le nom d'utilisateur ou l'alias du destinataire pour le message."
 
-#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -647,43 +665,157 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347 ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Message..."
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Afficher les groupes vides"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Tri par état"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Tri alphabétique"
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Tri par la taille des archives"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "Importer un certificat"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "Saisissez un nom d'hôte"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "Saisissez le nom d'hôte correspondant à ce certificat."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"Impossible d'importer le fichier %s.\n"
+"Vérifiez que le fichier est accessible et au format PEM.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "Erreur à l'import d'un certificat"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "Échec lors de l'import d'un certificats X.509."
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "Choisissez un certificat PEM"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"Échec à l'export du fichier %s.\n"
+"Vérifiez que le droit d'écrire dans le dossier de destination.\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "Erreur à l'export d'un certificat"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "Échec lors de l'export d'un certificats X.509."
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "Exporter un certificat X.509 en PEM"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "Certificat pour %s"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"Nom usuel : %s\n"
+"\n"
+"Empreinte SHA1 :\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "Certificat d'hôte SSL"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "Voulez-vous vraiment supprimer le certificat pour %s ?"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "Confirmation de suppression de certificat"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "Gestionnaire de certificats"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "Infos"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Fermer"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -707,43 +839,47 @@
 "Finch n'essaiera pas de se reconnecter avec le compte tant que cette erreur "
 "ne sera pas corrigée et que vous n'aurez pas réactivé le compte."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Cette commande n'existe pas."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Erreur de syntaxe : mauvais nombre d'arguments pour cette commande."
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "La commande a échoué pour une raison inconnue."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr ""
 "Cette commande fonctionne uniquement dans les discussions, pas les messages."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr ""
 "Cette commande fonctionne uniquement dans les messages, pas les discussions."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Cette commande ne fonctionne pas avec ce protocole."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "Le message n'a pas été envoyé parce que vous n'êtes pas connecté."
+
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -752,48 +888,69 @@
 "\n"
 "%s est en train d'écrire..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Vous avez quitté la discussion."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Archives démarrées. Les nouveaux messages de cette conversation seront "
+"archivés."
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Archives arrêtées. Les nouveaux messages de cette conversation ne seront pas "
+"archivés."
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "Envoyer vers"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Effacer la conversation"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Afficher l'horodatage"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Ajouter une alerte..."
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Activer l'archivage"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Activer les sons"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<Réponse automatique> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Liste des utilisateurs :\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Les options de débuggage supportées sont : version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Cette commande n'existe pas dans ce contexte."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -802,7 +959,7 @@
 "spécifique.\n"
 "Les commandes disponibles dans le contexte actuel sont :\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -810,13 +967,13 @@
 "say &lt;message&gt; : Envoyer un message comme si les commandes étaient "
 "désactivées."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;action&gt; : Envoyer une action à la IRC à un contact ou une "
 "discussion."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -824,44 +981,44 @@
 "debug &lt;option&gt; : Mettre en place des options de débuggage dans la "
 "conversation courante."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear : Effacer le contenu de la fenêtre de conversation."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 "help &lt;commande&gt; : Demander de l'aide sur une commande particulière."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users : Afficher la listes des utilisateurs dans le salon."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins : Afficher la fenêtre des plugins."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist : Afficher la liste de contacts."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts : Afficher la fenêtre des comptes."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin : Afficher la fenêtre de débuggage."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs : Afficher la fenêtre des options."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses : Afficher la fenêtre des états sauvegardés."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:84 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Fenêtre de debug"
 
@@ -887,99 +1044,95 @@
 msgstr "Transfert - %d%% de %d fichiers."
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:85
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transferts de fichiers"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "État"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fichier"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Taille"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Vitesse"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Reste"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087 ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095 ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "État"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Fermer cette fenêtre quand tous les transferts sont terminés"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Effacer les transferts terminés"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Arrêter"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2484
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "Fermer"
-
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Annulé"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Échec"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f Ko/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Le fichier a été sauvé sous le nom %s."
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fini"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfert"
 
@@ -991,11 +1144,11 @@
 msgid "You have mail!"
 msgstr "Vous avez du courrier !"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:497
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Sujet"
 
@@ -1006,17 +1159,17 @@
 msgstr[0] "%s (%s) a reçu %d nouveau message."
 msgstr[1] "%s (%s) a reçu %d nouveaux messages."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:336
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Nouveau courrier"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:918
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Informations pour %s"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Informations sur le contact"
 
@@ -1024,11 +1177,7 @@
 msgid "Continue"
 msgstr "Continuer"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1629 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "Infos"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1590
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "Message"
 
@@ -1036,7 +1185,7 @@
 msgid "Join"
 msgstr "Discuter"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
@@ -1095,7 +1244,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2062
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -1103,7 +1252,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Choisissez un contact pour la création d'une alerte"
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Nouvelle alerte"
@@ -1117,7 +1265,7 @@
 msgstr "Alerte pour"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Compte :"
 
@@ -1126,7 +1274,7 @@
 msgstr "Contact :"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Déclenchement quand le contact..."
 
@@ -1171,7 +1319,7 @@
 msgstr "Envoi d'un message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Action"
 
@@ -1199,70 +1347,82 @@
 msgid "Pounce only when my status is not available"
 msgstr "Alerter uniquement quand mon état est non disponible"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Récurrente"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Impossible de créer l'alerte"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Vous n'avez aucun compte."
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "Vous devez créer un compte avant de pouvoir créer une alerte."
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Êtes-vous sûr de vouloir supprimer l'alerte sur %s pour %s ?"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:83 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Alertes"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s est en train de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s a fait une pause dans la saisie du message (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s vient de se connecter (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s n'est plus inactif (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s n'est plus absent (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a arrêté de vous écrire (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s vient de se déconnecter (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s est devenu inactif (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s est passé absent (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s vous a envoyé un message. (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."
 
@@ -1270,13 +1430,13 @@
 msgid "Based on keyboard use"
 msgstr "Selon l'activité du clavier"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "Depuis le dernier message envoyé"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924 ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Jamais"
 
@@ -1325,12 +1485,12 @@
 msgstr "Changer l'état en"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1464 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "Archivage"
 
@@ -1338,106 +1498,106 @@
 msgid "Not implemented yet."
 msgstr "Fonction non implémentée."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Sauver le fichier..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: ../finch/gntsound.c:94 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Connexion d'un contact"
 
-#: ../finch/gntsound.c:95 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Déconnexion d'un contact"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Réception d'un message"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Début d'une conversation"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Envoi d'un message"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Quelqu'un entre dans la discussion"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Quelqu'un quitte la discussion"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Vous parlez dans la discussion"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Quelqu'un parle dans la discussion"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Quelqu'un dit votre nom d'utilisateur dans la discussion"
 
-#: ../finch/gntsound.c:357 ../pidgin/gtksound.c:310
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "Erreur GStreamer"
 
-#: ../finch/gntsound.c:358 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer n'a pas pu être initialisé."
 
-#: ../finch/gntsound.c:706 ../finch/gntsound.c:791 ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673 ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
 msgid "(default)"
 msgstr "(défaut)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Choisir un fichier son..."
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Préférences sonores"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profils"
 
-#: ../finch/gntsound.c:943 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Bip de console"
 
-#: ../finch/gntsound.c:947 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
 msgid "Command"
 msgstr "Commande"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Pas de son"
 
-#: ../finch/gntsound.c:950 ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
 msgid "Sound Method"
 msgstr "Sortie sonore"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Méthode :"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1447,55 +1607,55 @@
 "(%s pour le nom de fichier)"
 
 #. Sound options
-#: ../finch/gntsound.c:970 ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Jouer les sons quand la conversation est en avant-plan"
 
-#: ../finch/gntsound.c:979 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Toujours"
 
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
 msgid "Only when available"
 msgstr "Seulement quand je suis disponible"
 
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when not available"
 msgstr "Seulement quand je ne suis pas disponible"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Volume (0-100) :"
 
 #. Sound events
-#: ../finch/gntsound.c:1005 ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
 msgid "Sound Events"
 msgstr "Événements sonores"
 
-#: ../finch/gntsound.c:1007 ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
 msgid "Event"
 msgstr "Événement"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fichier"
 
-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
 msgid "Test"
 msgstr "Tester"
 
-#: ../finch/gntsound.c:1029 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: ../finch/gntsound.c:1032 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
 msgid "Choose..."
 msgstr "Choisir..."
 
@@ -1512,9 +1672,9 @@
 msgid "Saved Statuses"
 msgstr "États prédéfinis"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1524,46 +1684,55 @@
 msgid "Type"
 msgstr "Type"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Utiliser"
 
@@ -1575,56 +1744,77 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Saisissez un titre non vide pour l'état."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Titre en double"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Saisissez un titre différent pour cet état."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Sous-état"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "État :"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Message :"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Modifier l'état"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Utiliser un état différent pour les comptes suivants"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Enregistrer et utiliser"
 
-#: ../finch/gntui.c:87 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Certificats"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:89
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "États"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "Erreur au chargement du plugin."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Impossible de trouver l'affichage X."
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Impossible de trouver la fenêtre."
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "Ce plugin ne peut pas être chargé car il n'a pas été compilé avec X11."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntPresse-papier"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Plugin presse-papier"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1751,86 +1941,88 @@
 msgid "accounts"
 msgstr "Comptes"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "Un mot de passe est nécessaire pour la connexion."
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Saisissez le mot de passe pour %s (%s)"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "Mémoriser le mot de passe"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin pour le protocole %s manquant"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Erreur de connexion"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "Les nouveaux mots de passe diffèrent"
 
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "Veuillez renseigner toutes les rubriques."
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "Mot de passe courant"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "Nouveau mot de passe (confirmation)"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "Changer le mot de passe pour %s"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "Saisissez votre mot de passe et un nouveau mot de passe"
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "Changer les informations pour %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Modifier les informations"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contacts"
 
@@ -1838,22 +2030,185 @@
 msgid "buddy list"
 msgstr "Liste de contacts"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "(NE CORRESPOND PAS)"
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s a fournit le certificat suivant pour un usage unique :"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"Nom uisuel : %s %s\n"
+"Empreinte (SHA1) : %s"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "Vérification de certificat à usage unique"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "Autorités du certificat"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "Cache des pairs SSL"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "Accepter le certificat pour %s ?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "Vérification de certificat SSL"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "Accepter"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "Refuser"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "_Voir le certificat..."
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Le certificat fournit par « %s » prétend être de « %s ». Cela porrait "
+"signifier que vous ne vous connectez pas au service que vous vouliez."
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Le certificat fournit par « %s » prétend est auto-signé. Il ne peut être "
+"vérifié automatiquement."
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "La chaine de certificats fournie pour %s est non valide."
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "Erreur de certificat SSL"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "Chaine de certification non valide"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Vous n'avez pas de base de certificats racines. Ce certificat ne peut "
+"être validé."
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Le certificat racine dont est prétendu issu ce certificat est inconnu de Pidgin."
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"La chaine de certification fournie par %s n'a pas de signature numérique "
+"valide issue par l'autorité de certificats dont elle prétend l'origine. "
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "Signature d'autorité de certificats non valide"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"Nom usuel : %s\n"
+"\n"
+"Empreinte (SHA1) : %s\n"
+"\n"
+"Date d'activation : %s\n"
+"Date d'expiration : %s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "Informations du certificat"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "Erreur de désenregistrement"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s vient de se connecter"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s a quitté"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1877,40 +2232,40 @@
 msgid "Unable to send message."
 msgstr "Impossible d'envoyer le message"
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Envoyer un message"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "Envoyer un _message"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon"
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] est entré dans le salon"
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon"
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"
@@ -2433,12 +2788,12 @@
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
 #: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -2482,8 +2837,8 @@
 "terminé\n"
 "(seulement quand aucune conversation n'est ouverte avec l'expéditeur)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "Notes"
 
@@ -2910,7 +3265,7 @@
 "Les messages seront enregistrés en tant qu'alerte. Vous pouvez modifier ou "
 "supprimer l'alerte dans la fenêtre « Alerte »."
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2919,18 +3274,18 @@
 "« %s » est déconnecté. Voulez-vous sauver les messages dans une alerte afin "
 "de les envoyer automatiquement quand « %s » se reconnecte ?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Message déconnecté"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Vous pouvez modifier ou supprimer l'alerte dans la fenêtre « Alertes »."
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2940,9 +3295,9 @@
 msgid "Yes"
 msgstr "Oui"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2952,11 +3307,11 @@
 msgid "No"
 msgstr "Non"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Sauve les messages déconnectés dans une alerte."
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne jamais demander. Toujours créer une alerte."
 
@@ -3051,6 +3406,50 @@
 msgid "Tests to see that most things are working."
 msgstr "Vérifie que la plupart des choses fonctionne correctement."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr "Certificats X.509"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3069,44 +3468,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fournit une interface pour les bibliothèques SSL"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "Fournit le support SSL grâce à la bibliothèque GNUTLS"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Fournit le support SSL grâce à la bibliothèque NSS"
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -3201,25 +3562,25 @@
 "il ?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
 msgid "First name"
 msgstr "Prénom :"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
 msgid "Last name"
 msgstr "Nom :"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3228,13 +3589,13 @@
 msgid "E-Mail"
 msgstr "Courriel"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Compte AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Compte XMPP"
 
@@ -3248,27 +3609,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin pour le protocole Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Personne Purple"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "Nom d'hôte :"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:620
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3280,31 +3632,31 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a fermé la conversation."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-#: ../libpurple/protocols/bonjour/jabber.c:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Impossible d'ouvrir la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Erreur à la mise en place des paramètres de la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Impossible d'affecter un port à la connexion."
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Impossible de se mettre en écoute sur la connexion."
 
@@ -3380,47 +3732,49 @@
 msgid "Registration completed successfully!"
 msgstr "Inscription effectuée."
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Mot de passe (pour vérification)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Saisissez le jeton actuel"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Jeton actuel"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Veuillez renseigner les rubriques suivantes"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Localité"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3428,243 +3782,243 @@
 msgid "Gender"
 msgstr "Genre"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Homme ou femme"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Homme"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Femme"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "En ligne seulement"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Trouver des contacts"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Saisissez votre critère de recherche ci-dessous"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Renseignez les rubriques"
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Votre mot de passe actuel diffère de celui que vous venez de saisir."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Impossible de changer le mot de passe.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Changer le mot de passe du compte Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Changement de mot de passe effectué."
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Saisissez votre mot de passe et un nouveau mot de passe pour cet UIN : "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Changer le le mot de passe Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Choisissez un salon de discussions pour le contact : %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Ajouter à la discussion..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082 ../pidgin/gtkblist.c:3423
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Disponible"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/jabber/buddy.c:2035
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Absent"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prénom"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Année de naissance"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "Impossible d'afficher les résultats de la recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Annuaire public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Aucun utilisateur correspondant trouvé."
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateur qui vérifie votre critère de recherche."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Impossible de lire le socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Votre liste de contacts à été récupérée depuis le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Liste de contacts envoyée"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Échec de la connexion"
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Ajouter à la discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Bloquer"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Vous n'êtes pas connecté au serveur."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Changer de mot de passe..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Envoyer la liste de contacts sur le serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Récupérer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Effacer la liste de contacts du serveur"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Sauver la liste de contacts dans un fichier..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
@@ -3679,16 +4033,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin pour le protocole Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Messagerie polonaise populaire"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
@@ -3745,7 +4099,8 @@
 msgstr "Message du jour pour %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Déconnexion par le serveur"
 
@@ -3759,7 +4114,7 @@
 msgstr "_Salon :"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
@@ -3767,65 +4122,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
-#: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Connexion en cours"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1591
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "Impossible de créer le socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Échec de la connexion"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "Échec de la poignée de main SSL"
-
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Erreur de lecture"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Sujet"
 
@@ -3837,47 +4189,48 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Plugin pour le protocole IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Plugin qui pue moins pour le protocole IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Serveur"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codages"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3893,7 +4246,7 @@
 msgid "Username"
 msgstr "Utilisateur"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3903,7 +4256,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Utiliser SSL"
 
@@ -3934,7 +4287,7 @@
 msgstr " <i>(identifié)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4214,7 +4567,7 @@
 msgstr "names [salon] : Récupérer la liste des personnes dans un salon."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nouveau pseudo&gt; : Changer de pseudonyme"
 
@@ -4347,6 +4700,22 @@
 msgid "Disconnected."
 msgstr "Déconnecté"
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "Erreur inconnue"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr "Échec de la commande Ad-Hoc"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr "execute"
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
@@ -4359,8 +4728,8 @@
 "Le serveur demande une authentification en texte non chiffré au travers d'un "
 "flux crypté."
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4369,33 +4738,33 @@
 "%s demande une authentification en texte clair au travers d'une connexion "
 "non cryptée. Voulez-vous autoriser ceci et continuer l'authentification ?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une méthode d'authentification non supportée"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "Réponse non valide du serveur"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4404,113 +4773,114 @@
 "connexion non cryptée. Voulez-vous autoriser ceci et continuer "
 "l'authentification ?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "Erreur SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nom de famille"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nom usuel"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Adresse (suite)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localité"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Région"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Pays"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Service"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Rôle"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3093
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Modifier la carte de visite XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4518,117 +4888,386 @@
 "Toutes les rubriques ci-dessous sont facultatives. Saisissez uniquement les "
 "informations que vous désirez rendre publiques."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Système d'exploitation"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr "Dernière activité"
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "Informations du service de découverte"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr "Items du service de découverte"
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+msgid "Extended Stanza Addressing"
+msgstr "Adressage étendu de paragraphes"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr "Discussion multi-utilisateurs"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Informations de présence des discussions multi-utilisateurs"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "Flux de données intrabandes"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+msgid "Ad-Hoc Commands"
+msgstr "Commandes ad-hoc"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "Service PubSub"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "Flux de données SOCKS5"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "Données hors de la bande passante"
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+msgid "In-Band Registration"
+msgstr "Enregistrement intrabande"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "Position de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "Avatar de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+msgid "Chat State Notifications"
+msgstr "Notifications d'état de discussions"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "Version du logiciel"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "Initialisation de flux"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Transfert de fichier"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "Humeur de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+msgid "User Activity"
+msgstr "Activité de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+msgid "Entity Capabilities"
+msgstr "Possibilités de l'entité"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "Négociations de session chiffrée"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+msgid "User Tune"
+msgstr "Musique de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+msgid "Roster Item Exchange"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+msgid "Reachability Address"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "Profil de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle audio"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "Pseudo de l'utilisateur"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle Video"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "Reçus des messages"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "Publication de clé publique"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr "L'utilisateur discute"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "L'utilisateur navigue le web"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr "L'utilisateur joue"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr "L'utilisateur observe"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Stanza Encryption"
+msgstr "Chiffrement de paragraphe"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr "Temps de l'entité"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "Livraison retardée"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr "Objets de données collaboratives"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr "Répertoire de fichier et partage"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Service de découverte STUN pour Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Négociation de session chiffré simplifiée"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr "Vérifications des bonds"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "Possibilités"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "Priorité"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Boîte postale"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "Se montrer à"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "Se cacher de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "Annuler la notification de présence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "Désinscription"
 
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "Connexion"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "Déconnexion"
+
 # Repris du fr.po de gabber
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "Bavard"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "Longue absence"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne pas déranger"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "Nom"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "Voici les résultats de votre recherche."
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4636,69 +5275,69 @@
 "Recherchez un utilisateur en renseignant les rubriques ci-dessous. Note : on "
 "peut utiliser % comme joker dans chaque rubrique."
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "Échec de la recherche dans l'annuaire"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 msgid "Could not query the directory server."
 msgstr "Impossible de parler au serveur annuaire."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instructions du serveur : %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "Rechercher un utilisateur XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "Annuaire non valide"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "Saisissez un annuaire d'utilisateurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "Choisissez un annuaire d'utilisateurs pour la recherche"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "Annuaire de recherche"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Salon :"
 
@@ -4790,25 +5429,29 @@
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "Erreur à l'initialisation de la session"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "Erreur d'écriture"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "Erreur de lecture"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/jabber/jabber.c:483
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4817,55 +5460,70 @@
 "Impossible de se connecter au serveur :\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "Impossible de créer le socket."
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Enregistrement de %s@%s réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "Enregistrement sur %s réussi"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Enregistrement auprès du serveur réussi"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Erreur inconnue"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "Enregistrement de %s révoqué"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "Désnregistrement réussi"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "Échec au désenregistrement"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Déjà enregistré"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "État"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4875,378 +5533,541 @@
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "Se désenregistrer"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+"Veuillez remplir les informations ci-dessous pour modifier l'enregistrement "
+"de votre compte."
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr ""
-"Veuillez remplir les information ci-dessous pour l'enregistrement du nouveau "
-"compte"
-
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+"Veuillez remplir les informations ci-dessous pour l'enregistrement du nouveau "
+"compte."
+
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Enregistrer un nouveau compte XMPP"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "Changer les informations du compte sur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "Enregistrer un nouveau compte sur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "Changer l'enregistrement"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "Erreur au désenregistrement du compte"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "Compte révoqué avec succès"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "Initialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "Initialisation SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "Réinitialisation du flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "Non autorisé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "Bidirectionnelle"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "Source (Destination en attente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "Destination"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "Aucune (Destination en attente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Aucun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "Inscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "Humeur"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "Texte d'humeur"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "Artistes musicaux"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "Titre musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "Album musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "Genre musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Tune Comment"
+msgstr "Commentaire musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "Piste musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "Temps musical"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "Année musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "URL musicale"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Allow Buzz"
+msgstr "Autoriser les Buzz"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "Mot de passe changé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "Le mot de passe a été modifié"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "Mot de passe (confirmation)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "Changer de mot de passe XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "Saisissez votre nouveau mot de passe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Modifier les informations..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Changer de mot de passe..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "Chercher des contacts..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "Mauvaise requête"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "Conflit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Feature Not Implemented"
 msgstr "Fonction non implémentée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "Interdit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "Parti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "Item non trouvé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "Malformed XMPP ID"
 msgstr "Identifiant XMPP non valide."
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "Non acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "Non autorisé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "Paiement nécessaire"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "Destinataire non disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "Erreur d'enregistrement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "Serveur distant non trouvé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "Pas de réponse du serveur distant"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Server Overloaded"
 msgstr "Serveur surchargé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Service Unavailable"
 msgstr "Service non disponible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "Inscription nécessaire"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "Requête non attendue"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "Autorisation annulée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "Encodage incorrect de l'autorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "Identifiant d'authentification non valide (authzid)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "Mécanisme d'autorisation non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "Mécanisme d'autorisation trop faible"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "Échec temporaire de l'authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "Échec de l'authentification"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "Mauvais format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "Mauvais préfixe de nom de domaine"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connexion morte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Host Gone"
 msgstr "Hôte perdu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "Hôte inconnu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "Adresse non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "Identifiant non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "Nom de domaine non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Invalid XML"
 msgstr "XML non valide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Non-matching Hosts"
 msgstr "Hôtes non correspondants"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Policy Violation"
 msgstr "Violation des règles"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Remote Connection Failed"
 msgstr "Échec de la connexion à distance"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Resource Constraint"
 msgstr "Limitation sur la ressource"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Restricted XML"
 msgstr "XML restreint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "See Other Host"
 msgstr "Voir l'autre hôte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "Arrêt du système"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "Condition non définie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Unsupported Encoding"
 msgstr "Codage de caractère non supporté"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Unsupported Stanza Type"
 msgstr "Type de strophe non supporté"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "Version non supportée"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML mal formé"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "Erreur dans le flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossible de bannir l'utilisateur %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Affiliation inconnue : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossible d'affilier l'utilisateur %s à « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rôle inconnu : « %s »"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Impossible d'assigner le rôle « %s » pour l'utilisateur : %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossible d'expulser l'utilisateur %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "Impossible d'envoyer un ping à l'utilisateur %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr "Impossible de buzzer, rien n'est connu sur l'utilisateur %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr "Impossible de buzzer, l'utilisateur %s est peut-être déconnecté."
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "Impossible de buzzer, l'utilisateur %s l'interdit."
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure : Configurer un salon de discussions"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [salon] : Quitter le salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register : S'enregistrer dans un salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nouveau sujet] : Voir ou changer le sujet du salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1858
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5254,7 +6075,7 @@
 "affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
 "Change l'affiliation d'un utilisateur dans le salon."
 
-#: ../libpurple/protocols/jabber/jabber.c:1864
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5262,26 +6083,35 @@
 "role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
 "Assigne à un utilisateur un rôle dans le salon."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;utilisateur&gt; [message] : Inviter un utilisateur dans le salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join &lt;room&gt; [serveur] : Entrer dans un salon sur le serveur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1882
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utilisateur&gt; [salon] : Expulser un utilisateur du salon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;utilisateur&gt; &lt;message&gt; : Envoyer un message privé à une "
 "personne."
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr "ping &lt;jid&gt; : Envoyer un ping à un utilisateur/composant/serveur."
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5292,84 +6122,98 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "Plugin pour le protocole XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "Nécessite SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "Forcer l'ancien SSL (port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Autoriser l'authentification en clair pour les flux cryptés"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 msgid "Connect port"
 msgstr "Port de connexion"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Serveur de connexion"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s a quitté la conversation."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "Message de %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a changé le sujet en : %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "Le sujet est : %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Échec de la livraison du message pour %s : %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "Erreur message XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s vient de vous buzzer !"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "Erreur de lecture du XML"
 
-#: ../libpurple/protocols/jabber/presence.c:292
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/jabber/presence.c:366
-#: ../libpurple/protocols/jabber/presence.c:367
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
-#: ../libpurple/protocols/jabber/presence.c:368
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5377,65 +6221,111 @@
 "Vous créez un nouveau salon. Voulez-vous choisir ses paramètres ou utiliser "
 "ceux par défaut ?"
 
-#: ../libpurple/protocols/jabber/presence.c:374
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configurer le salon"
 
-#: ../libpurple/protocols/jabber/presence.c:375
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
-#: ../libpurple/protocols/jabber/presence.c:417
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erreur dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/presence.c:421
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erreur lors de l'arrivée dans la discussion %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, cet utilisateur ne supporte pas le "
 "transfert de fichiers"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Échec d'envoi de fichier"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Impossible d'envoyer le fichier à %s, JID non valide"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossible d'envoyer le fichier à %s, l'utilisateur n'est pas en ligne"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Impossible d'envoyer le fichier à %s, pas d'inscription à la présence de "
 "l'utilisateur"
 
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr ""
 "Veuillez sélectionner parmi les resources de %s, à laquelle vous voulez "
 "envoyer un fichier"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "Choisissez une ressource"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "Modifier l'humeur"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr "Veuillez choisir votre humeur dans la liste."
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "Changer"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "Changer d'humeur..."
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "Changer de pseudo"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "Saisissez un nouveau pseudo."
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Cette information est visible pour tous les contacts de votre liste. Veuillez "
+"choisir quelqe chose d'approprié."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "Changer de pseudo..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "Actions"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "Choisissez une action"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -5689,39 +6579,49 @@
 msgid "MSN Error: %s\n"
 msgstr "Erreur MSN : %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "Vous venez d'envoyer un « Nudge. »"
-
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr "Nudge"
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s vient de vous nudger !"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr "Nudge %s..."
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Le nouvel alias MSN est trop long"
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "Changer l'alias"
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Nom sous lequel les utilisateurs MSN vous verront."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "Numéro de téléphone"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "Numéro de téléphone au travail"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Numéro de téléphone portable"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Autoriser les messages MSN vers votre téléphone portable ?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5729,132 +6629,134 @@
 "Voulez-vous autorisez les contacts de votre liste à vous envoyer des "
 "messages MSN sur votre téléphone portable ?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Autoriser"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Interdire"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas être actif."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Envoyer un message vers un téléphone portable."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Envoyer"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "Vous êtes dans sa liste"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "Bientôt de retour"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "Parti manger"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Changer l'alias..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Changer le numéro de téléphone..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Changer le numéro au travail..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Changer le numéro de téléphone portable..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activer le service pour téléphones portables..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Autoriser les messages sur téléphones portables..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "Ouvrir la boîte au lettres Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Envoyer vers un téléphone portable"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Lancer une _discussion"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "Impossible de se connecter au serveur."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Général"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Âge"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5862,188 +6764,188 @@
 msgid "Location"
 msgstr "Localisation"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "Passe-temps et intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "À propos de moi"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "État matrimonial"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "Intérêts"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "Animaux"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "Ville d'origine"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "Précédents lieux de résidence"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "Musique"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citation préférée"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "Infos du contact"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "Compagnon/Compagne"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "Téléphone personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "Téléphone personnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "Téléphone portable personnel"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "Télécopie personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "Adresse électronique personnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "Messagerie instantanée"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "Anniversaire"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "Professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Position"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "Société"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Service"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "Téléphone professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "Téléphone professionnel 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "Adresse professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "Téléphone portable professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "Bippeur professionnel"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "Télécopie professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "Adresse électronique professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "Messagerie instantanée professionnelle"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "Date d'embauche"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "Choses préférées"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Page web"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "L'utilisateur n'a pas créé de profil public"
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6052,7 +6954,7 @@
 "Impossible de récupérer le profil de l'utilisateur par MSN. Soit "
 "l'utilisateur n'existe pas, soit il n'a pas créé de profil public."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6060,7 +6962,7 @@
 "Impossible de récupérer des informations sur le profil de l'utilisateur. Il "
 "est possible que cet utilisateur n'existe pas."
 
-#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msn/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Lien du profil"
@@ -6075,19 +6977,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "Plugin pour le protocole MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "Utiliser le protocole HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "Afficher les frimousses personnalisées"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge : donner un « Nudge » à un contact pour attirer son attention."
 
@@ -6106,8 +7008,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Impossible de se connecter"
 
@@ -6320,11 +7222,6 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message à cause d'une erreur inconnue :"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s vient de vous envoyer un « Nudge. »"
-
 #: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
@@ -6344,6 +7241,401 @@
 msgid "The screen name specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Chiffre manquant"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "Le chiffre RC4 n'a pas été trouvé."
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+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)."
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Les mots de passe de plus de %d caractères (vous en avez saisi %d) ne sont "
+"pas supportés par MySpace."
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "Erreur MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Lecture du défi"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Taille du défi non valide du serveur"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Connexion"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "Connexion avec le serveur perdue (aucune donnée depuis %d secondes)."
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "Nouveaux courrier électroniques"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Nouveaux commentaires de blog"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Nouveaux commentaires du profile"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nouvelles requêtes d'amis !"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nouveaux commentaires d'image"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. 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).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Connecté"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Aucun nom d'utilisateur fourni"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Veuillez aller sur http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username et saisir un nom d'utilisateur avant de "
+"réessayer de vous connecter."
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Erreur de protocole, code %d : %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Échec lors de l'ajout du contact."
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "Échec de la commande « addbuddy »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "Échec de la commande « persist »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Utilisateur inconnu : %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Recherche d'utilisateur"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Échec lors de la suppression du contact."
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "Échec de la commande « delbuddy »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "Échec de la commande « blocklist »."
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Condition de saisie non valide."
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Buffer de lecture plein."
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Impossible d'interpréter le message."
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Impossible de se connecter à l'hôte : %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Amis de messagerie"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d contacts ont été ajouté ou mis à jour depuis le serveur (y compris les "
+"contacts déjà sur la liste du serveur)."
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Ajouter les contacts du serveur"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Ajouter les amis de MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "Échec de l'import des amis."
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Trouver des gens..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Changer de nom sur la messagerie..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "Gestionnaire d'URL myim"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "Il n'y a pas de compte MySpaceIM pour cette URL myim."
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "Veuillez activer le compte MySpaceIM et réessayer."
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "Afficher le nom dans le texte d'état"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "Afficher l'entête dans le texte d'état"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "Envoyer les frimousses"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "Résolution de l'écran (en dpi)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "Taille de la police (en points)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Utilisateur"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "Informations"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "En-tête"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "Chanson"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "Total d'amis"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "Version du client"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "Zap"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "%s has zapped you!"
+msgstr "%s vient de vous zapper !"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr "Zap %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "Frapper"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "%s has whacked you!"
+msgstr "%s vient de vous frapper !"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "Frappe %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+msgid "Torch"
+msgstr "Bruler"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "%s has torched you!"
+msgstr "%s vient de vous bruler !"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "Brule %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "Embrasser"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s vient de vous embrasser !"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "Embrasse %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "Étreindre"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s vient de vous étreindre !"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "Étreint %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+msgid "Slap"
+msgstr "Gifler"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s vient de vous gifler !"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr "Gifle %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "Pincer les fesses"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s vient de vous pincer les fesses !"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "Pince les fesses de %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s vient de vous faire un high-five !"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "High-five avec %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr "Boulétiser"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "%s has punk'd you!"
+msgstr "%s vient de vous boulétiser !"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr "Boulétise %s..."
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr "Faire pffft"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr "%s vient de vous faire pffft !"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr "Pffft à %s..."
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Les paramètres nécessaires n'ont pas été passés"
@@ -6587,7 +7879,7 @@
 msgstr "Boîte aux lettres"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID Utilisateur"
 
@@ -6703,8 +7995,8 @@
 msgstr "Port du serveur"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
@@ -6712,8 +8004,8 @@
 msgstr "Le serveur a fermé la connexion."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6762,7 +8054,7 @@
 msgstr "Plugin pour le protocole ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codage"
@@ -6792,7 +8084,7 @@
 msgid "Direct IM established"
 msgstr "Connexion directe établie."
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
@@ -6916,8 +8208,8 @@
 "des encodages différents ou le client de %s est défectueux.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Icône du contact"
@@ -6939,7 +8231,7 @@
 msgstr "Discussion"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "Recevoir un fichier"
 
@@ -7012,17 +8304,17 @@
 msgstr "Caméra"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "Libre pour discuter"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "Non disponible"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "Occupé"
 
@@ -7032,8 +8324,8 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -7042,13 +8334,13 @@
 msgstr "En ligne"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1123
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "Adresse IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "Niveau d'avertissement"
 
@@ -7100,14 +8392,14 @@
 "soit contenir uniquement des chiffres."
 
 #: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "Nom d'utilisateur non valide."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "Mot de passe incorrect."
 
@@ -7161,10 +8453,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
@@ -7201,31 +8493,31 @@
 msgid "Unable to initialize connection"
 msgstr "Impossible de créer une connexion."
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "Message pour la demande d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "Autorise moi, s'il te plaît !"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "Pas de raison"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7236,19 +8528,19 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "Autorisation ICQ refusée"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %u a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7261,7 +8553,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7274,7 +8566,7 @@
 "De : %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7287,24 +8579,24 @@
 "Le message est :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utilisateur ICQ %u vous a envoyé un contact : %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Voulez-vous l'ajouter à votre liste de contacts ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "_Décliner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -7312,7 +8604,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient non valides."
 
-#: ../libpurple/protocols/oscar/oscar.c:2575
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -7320,7 +8612,7 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car les messages étaient trop gros."
 
-#: ../libpurple/protocols/oscar/oscar.c:2584
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7330,21 +8622,21 @@
 msgstr[1] ""
 "Vous avez raté %hu messages de %s car le quota limite a été dépassé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2593
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Vous avez raté %hu message de %s car l'envoyeur est trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car l'envoyeur est trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2602
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Vous avez raté %hu message de %s car vous êtes trop méchant."
 msgstr[1] "Vous avez raté %hu messages de %s car vous êtes trop méchant."
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7352,55 +8644,47 @@
 msgstr[1] "Vous avez raté %hu messages de %s pour des raisons inconnues."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "Erreur inconnue"
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossible d'envoyer le message vers %s :"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "Les informations ne sont pas disponibles : %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "En ligne depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2894
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
-msgid "Capabilities"
-msgstr "Possibilités"
-
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "Message de disponibilité"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
-msgid "Profile"
-msgstr "Informations"
-
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "Votre connexion AIM risque d'être coupée"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7408,7 +8692,7 @@
 "[Impossible d'afficher un message de cet utilisateur car il contient des "
 "caractères non valides.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3366
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7416,82 +8700,82 @@
 "La dernière action n'a pas pu être effectuée car vous avez dépassé le quota "
 "limite. Veuillez attendre 10 secondes et réessayer."
 
-#: ../libpurple/protocols/oscar/oscar.c:3449
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vous avez été déconnecté du salon %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Numéro de téléphone portable"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "Page web perso"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informations supplémentaires"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "Code postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "Poste"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "Page web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "Informations professionnelles"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "Message en fenêtre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Le nom d'utilisateur suivant est associé à %s"
 msgstr[1] "Les noms d'utilisateur suivants sont associés à %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3890
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Aucun résultat pour l'adresse électronique %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Vous devriez recevoir un courrier électronique pour confirmer %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3939
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "Confirmation de compte demandée"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "Erreur en changeant les informations du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7500,14 +8784,14 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée diffère de l'originale."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce qu'il est "
 "non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7516,7 +8800,7 @@
 "Erreur 0x%04x : Impossible d'afficher le nom d'utilisateur parce que la "
 "version demandée est trop longue"
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7525,7 +8809,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "une requête en attente pour cet identifiant."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7534,7 +8818,7 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'il y a "
 "trop d'identifiants associés à cette adresse."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7543,32 +8827,32 @@
 "Erreur 0x%04x : Impossible de changer l'adresse électronique parce qu'elle "
 "est non valide."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erreur 0x%04x : Erreur inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'adresse électronique de %s est %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "Infos du compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous devez utiliser une "
 "connexion directe pour envoyer des images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4446
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "Impossible d'envoyer le profil AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4483
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7578,7 +8862,7 @@
 "connexion. Le profil n'a pas été changé. Réessayez une fois la connexion "
 "complète."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7593,11 +8877,11 @@
 "La taille maximale de %d caractères du profil a été dépassée. Il a été "
 "tronqué automatiquement."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "Profil trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7612,11 +8896,11 @@
 "La taille maximale de %d caractères pour le message d'absence a été "
 "dépassée. Il a été tronqué lors de la mise à jour."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7628,17 +8912,17 @@
 "soit commencer par une lettre et contenir uniquement des lettres, des "
 "chiffres et des espaces, soit contenir uniquement des chiffres."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "Impossible d'ajouter"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7647,15 +8931,15 @@
 "contacts. Elle n'est pas perdue et sera de nouveau disponible dans quelques "
 "temps."
 
-#: ../libpurple/protocols/oscar/oscar.c:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
+#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "Orphelins"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7664,17 +8948,17 @@
 "Impossible d'ajouter le contact %s parce qu'il y a trop de contacts dans la "
 "liste. Supprimez un contact et réessayez."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."
 
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7683,24 +8967,24 @@
 "L'utilisateur %s vous a autorisé à l'ajouter à votre liste de contacts. "
 "Voulez-vous le faire ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "Autorisation donnée"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utilisateur %s a accepté votre demande de l'ajouter à votre liste de "
 "contacts."
 
-#: ../libpurple/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "Autorisation accordée"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7711,53 +8995,53 @@
 "contacts pour la raison suivante :\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "Autorisation refusée"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Echange :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "Nom du salon de discussions non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Votre image instantanée n'a pas été envoyée. Vous ne pouvez pas envoyer "
 "d'images dans les discussions AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "Message d'absence"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(en cours de récupération)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "Lien de l'iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commentaire pour %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "Commentaire :"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Connexion directe avec %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7765,66 +9049,66 @@
 "Cela révèle votre adresse IP et peut être considéré comme une faille de "
 "sécurité. Voulez-vous continuer ?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "_Connecter"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "Modifier le commentaire"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'état"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "Connexion directe"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "Redemander autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "Demande d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Sur le web (activer ceci vous fera recevoir du pourriel !)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "Options de confidentialité ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "Le nouvel affichage est non valide"
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Le format d'affichage du nom d'utilisateur permet uniquement de changer les "
 "majuscules et les espaces."
 
-#: ../libpurple/protocols/oscar/oscar.c:6112
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "Nouvelle adresse :"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Vous n'attendez aucune autorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vous attendez une autorisation des contacts suivants"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7832,73 +9116,73 @@
 "Vous pouvez redemander une autorisation de ces contacts en choisissant "
 "« Redemander autorisation » sur un clic droit du contact."
 
-#: ../libpurple/protocols/oscar/oscar.c:6179
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "Chercher un contact par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "Rechercher par adresse électronique"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Saisissez l'adresse électronique du contact que vous cherchez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "Modifier les informations (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "Changer de mot de passe (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurer le transfert de message (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "Changer les options de confidentialité..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "Confirmer le compte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afficher l'adresse courante enregistrée"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Changer l'adresse courante enregistrée..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afficher les demandes d'autorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Chercher un contact par adresse électronique..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "Utiliser le groupe de contacts récents"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "Afficher temps d'inactivité"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7906,26 +9190,26 @@
 "Toujours utiliser le serveur mandataire ICQ pour le transfert de fichiers\n"
 "(plus lent, mais ne révèle pas votre adresse IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Demande à %s de se connecter directement à %s:%hu pour le message"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentative de connexion vers %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "Tentative de connexion au travers d'un serveur mandataire."
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s demande une connexion directe avec %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8134,14 +9418,6 @@
 msgid "Sorry, you are not my type..."
 msgstr "Désolé, tu n'es pas mon genre..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Reject"
-msgstr "Refus"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
 msgstr "Ajout d'un contact avec échec d'authentification"
@@ -8552,7 +9828,8 @@
 msgstr "Vous avez été ajouté par %s."
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Voulez-vous l'ajouter ?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8586,10 +9863,6 @@
 msgid "%s is not in your buddy list"
 msgstr "L'utilisateur %s n'est pas dans votre liste de contacts."
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Voulez-vous l'ajouter ?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Connexion terminée (en écriture)"
@@ -8653,10 +9926,6 @@
 msgid "Starting Services"
 msgstr "Démarrage des services"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Connecté"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8679,7 +9948,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Impossible de se connecter à l'hôte"
 
@@ -8700,37 +9969,33 @@
 msgid "Place Closed"
 msgstr "Endroit fermé"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microphone"
 
+#: ../libpurple/protocols/sametime/sametime.c:3230
+msgid "Speakers"
+msgstr "Haut-parleurs"
+
 #: ../libpurple/protocols/sametime/sametime.c:3231
-msgid "Speakers"
-msgstr "Haut-parleurs"
-
-#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "Transfert de fichier"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Fonctionnalités"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Utilisateur extérieur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Créer une conférence avec l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8739,27 +10004,27 @@
 "Saisissez un sujet pour la nouvelle conférence, ainsi qu'un message "
 "d'invitation à envoyer à %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nouvelle conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Créer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Conférences disponibles"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Créer une nouvelle conférence..."
 
+#: ../libpurple/protocols/sametime/sametime.c:3465
+msgid "Invite user to a conference"
+msgstr "Inviter l'utilisateur à une conférence"
+
 #: ../libpurple/protocols/sametime/sametime.c:3466
-msgid "Invite user to a conference"
-msgstr "Inviter l'utilisateur à une conférence"
-
-#: ../libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8770,27 +10035,27 @@
 "l'utilisateur %s. Choisissez « Créer une nouvelle conférence » si vous "
 "désirer créer une nouvelle conférence afin d'y inviter cet utilisateur."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Inviter à une conférence"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Inviter à une conférence..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Envoyer une proclamation TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8799,42 +10064,42 @@
 "Aucun hôte ou adresse IP n'a été configurée pour le compte Meanwhile %s. "
 "Veuillez en saisir un ci-dessous pour continuer la connexion."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuration de la connexion Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Aucun serveur communautaire Sametime n'a été spécifié."
 
-#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Connecter"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Inconnu (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Dernier client connu"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Identifiant Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Un identifiant d'utilisateur ambigu a été saisi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8844,15 +10109,15 @@
 "Veuillez choisir dans cette liste l'utilisateur que vous voulez ajouter à "
 "votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Choisir l'utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Impossible d'ajouter cet utilisateur parce qu'il est introuvable."
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8861,11 +10126,11 @@
 "L'identifiant « %s » ne correspond à aucun utilisateur dans la communauté "
 "Sametime. Cette entrée a été retirée de votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8874,63 +10139,63 @@
 "Erreur à la lecture du fichier « %s » :\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Liste de contacts stockée sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Mode de stockage de la liste de contacts"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Liste de contacts en local uniquement"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Fusionner avec la liste du serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Fusionner et envoyer la liste sur le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synchroniser la liste avec le serveur"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exporter la liste Sametime du compte %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Impossible d'ajouter ce groupe parce qu'il existe déjà."
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un group nommé « %s » existe déjà dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Correspondances possibles"
 
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
+
 #: ../libpurple/protocols/sametime/sametime.c:5389
-msgid "Notes Address Book group results"
-msgstr "Correspondances des groupes dans le carnet d'adresses Notes"
-
-#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8941,15 +10206,15 @@
 "d'adresses Notes suivants. Veuillez choisir dans cette liste le groupe que "
 "vous voulez ajouter à votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Choisissez le carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Impossible d'ajouter ce groupe parce qu'il n'existe pas."
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8957,11 +10222,11 @@
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun groupe du carnet d'adresses Notes."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Groupe du carnet d'adresses Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8969,12 +10234,12 @@
 "Saisissez le nom d'un groupe de carnet d'adresses Notes dans la rubrique ci-"
 "dessous pour ajouter le groupe et ses membres dans votre liste de contacts."
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Résultats de la recherche sur « %s »"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8985,31 +10250,30 @@
 "Vous pouvez ajouter ces utilisateurs à votre liste de contacts ou leur "
 "envoyer un message avec les boutons ci-dessous."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Aucun résultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "L'identifiant « %s » ne correspond à aucun utilisateur de la communauté "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Aucun résultat"
 
+#: ../libpurple/protocols/sametime/sametime.c:5605
+msgid "Search for a user"
+msgstr "Rechercher un utilisateur"
+
 #: ../libpurple/protocols/sametime/sametime.c:5606
-msgid "Search for a user"
-msgstr "Rechercher un utilisateur"
-
-#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -9017,32 +10281,32 @@
 "Saisissez un nom ou un identifiant partiel ci-dessous pour rechercher des "
 "utilisateurs correspondants dans la communauté Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Recherche d'utilisateurs"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importer une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exporter une liste Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Ajouter un groupe de carnet d'adresses Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Recherche d'utilisateurs..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Forcer la connexion (ignorer les redirections du serveur)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Cacher l'identité du client"
 
@@ -9428,13 +10692,6 @@
 msgid "User Modes"
 msgstr "Modes utilisateur"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "Humeur"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -10100,13 +11357,6 @@
 msgstr "Statistiques du réseau"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Échec du ping"
@@ -10263,7 +11513,7 @@
 msgstr "Votre humeur actuelle"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1638
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10663,7 +11913,7 @@
 msgstr "Protocole de conférences instantanées sécurisées"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2031
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "Réseau"
 
@@ -10927,26 +12177,26 @@
 msgstr "Impossible d'envoyer."
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1489
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "Impossible de se connecter."
 
-#: ../libpurple/protocols/simple/simple.c:1523
-#: ../libpurple/protocols/simple/simple.c:1565
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1629
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "Impossible de créer le socket d'écoute."
 
-#: ../libpurple/protocols/simple/simple.c:1546
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "Impossible de trouver l'adresse de l'hôte."
 
-#: ../libpurple/protocols/simple/simple.c:1637
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "Impossible de résoudre le nom de l'hôte."
 
-#: ../libpurple/protocols/simple/simple.c:1654
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Les identifiants SIP ne peuvent pas avoir d'espace ou de symbole @."
 
@@ -10958,36 +12208,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1829
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin pour le protocole SILC"
 
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "État de publication (note : tout le mode peut vous regarder)"
 
-#: ../libpurple/protocols/simple/simple.c:1864
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "Utiliser UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1866
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "Utiliser un serveur mandataire"
 
-#: ../libpurple/protocols/simple/simple.c:1868
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "Serveur mandataire"
 
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "Utilisateur d'authentification"
 
-#: ../libpurple/protocols/simple/simple.c:1872
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
@@ -11151,8 +12401,8 @@
 msgid "Password Change Successful"
 msgstr "Changement de mot de passe effectué."
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Groupe :"
 
@@ -11213,32 +12463,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin pour le protocole TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s vient de vous envoyer un « Buzz ! »"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Message système Yahoo! pour %s :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "Message de refus d'autorisation :"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
-"votre liste de contacts."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11247,11 +12491,18 @@
 "L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
 "votre liste de contacts pour la raison suivante : %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+"L'utilisateur %s a (rétroactivement) refusé votre demande de l'ajouter à "
+"votre liste de contacts."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refusé"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11263,11 +12514,11 @@
 "service Yahoo!. Vous pouvez vérifier qu'une mise à jour est disponible sur %"
 "s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Échec de l'authentification Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11276,53 +12527,53 @@
 "Vous voulez ignorer %s, mais cet utilisateur est dans votre liste de "
 "contacts. En choisissant « Oui » cela supprimera le contact et l'ignorera."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "Réception d'un message HTTP non attendu du serveur."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problème de connexion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11331,7 +12582,7 @@
 "Connexion perdue avec %s :\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11340,111 +12591,112 @@
 "Impossible de se connecter avec %s :\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "Pas à la maison"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "Pas au bureau"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "Pas au travail"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "De sortie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "Pas dans la liste du serveur"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "Apparaître connecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "Apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "Présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne pas apparaître toujours déconnecté"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "Lancer une conférence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "Paramètres de présence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "Commencer à griffonner"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Activate which ID?"
 msgstr "Activer quelle identité ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Join whom in chat?"
 msgstr "Qui joindre dans une discussion ?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "Activer ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "Joindre l'utilisateur dans une discussion..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Open Inbox"
 msgstr "Ouvrir la boîte au lettres"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
-msgid "You have just sent a Buzz!"
-msgstr "Vous venez d'envoyer un « Buzz ! »"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "Buzz"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Buzz %s..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt; : Entrer dans une discussion sur le réseau Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list : Récupérer la liste des salons du réseau Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz : Faire sonner chez un contact pour attirer son attention."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle : Envoie une demande pour un séance de griffonnage."
 
@@ -11458,131 +12710,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "Serveur de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "Serveur japonais de texto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "Port du pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "Server de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "Server japonais de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "Port de transfert de fichiers"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "Langue du salon de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussions"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Serveur Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "Invitation refusée"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "Impossible d'entrer dans la discussion."
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "Salon de discussions inconnu"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "Le salon de discussions est peut-être plein"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "Non disponible"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
-"minutes avant de pouvoir retourner dans un salon de discussions."
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Vous discutez dans %s"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "Impossible de joindre le contact dans la discussion"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "Le contact n'est peut-être pas dans une discussion"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "Échec de récupération de la liste des salons de discussions"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "Voix"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "Webcams"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "Impossible de récupérer la liste des salons"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "Salon de discussions utilisateur"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11697,6 +12877,78 @@
 msgid "The user's profile is empty."
 msgstr "Le profil de l'utilisateur est vide"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+"%s a décliné votre invitation à la conférence « %s » pour la raison : %s"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "Invitation refusée"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "Impossible d'entrer dans la discussion."
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "Salon de discussions inconnu"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "Le salon de discussions est peut-être plein"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "Non disponible"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Erreur inconnue. Il vous faudra peut-être vous déconnecter et attendre cinq "
+"minutes avant de pouvoir retourner dans un salon de discussions."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Vous discutez dans %s"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "Impossible de joindre le contact dans la discussion"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "Le contact n'est peut-être pas dans une discussion"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "Échec de récupération de la liste des salons de discussions"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "Voix"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "Webcams"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "Impossible de récupérer la liste des salons"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "Salon de discussions utilisateur"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problème de connexion avec le serveur YCHT"
@@ -11723,11 +12975,6 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossible d'écrire dans le salon %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "Utilisateur"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11951,7 +13198,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s est désormais connu sous le nom de %s\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Attire l'attention de %s..."
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s essaie d'attiree votre attention !"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11960,20 +13217,36 @@
 "%s a invité %s dans le salon de discussions %s :\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invité %s dans le salon de discussions %s\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "Accepter l'invitation à la discussion ?"
 
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "Échec de la connexion SSL"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "Échec de la poignée de main SSL"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "Le pair SSL a présenté un certificat non valide."
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "Erreur SSL inconnue"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Enlever"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
@@ -12025,12 +13298,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erreur à la lecture de « %s »."
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12039,67 +13312,67 @@
 "Une erreur est survenue à la lecture de « %s ». Il n'a pas été chargé et "
 "l'ancien fichier a été renommé « %s~ »."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Calcul en cours"
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Inconnu"
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d heure"
 msgstr[1] "%s, %d heures"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Impossible d'ouvrir %s : Trop de redirections"
 
-#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Impossible de se connecter à %s."
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -12108,17 +13381,17 @@
 "Impossible de réserver suffisamment de mémoire pour le contenu de %s. Il "
 "s'agit peut-être d'une attaque du serveur web."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erreur à la lecture depuis %s : %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erreur à l'écriture vers %s : %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible de se connecter à %s : %s"
@@ -12144,37 +13417,37 @@
 msgstr "Orientation de l'espace de notification"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Options de connexion"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocole :"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "Alias _local :"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "Mémoriser le mot de _passe"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Options de l'utilisateur"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Avertir des nouveaux _courriers"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Utiliser cette _icône pour ce compte :"
 
@@ -12208,7 +13481,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Utiliser les paramètres d'environnement"
 
@@ -12230,15 +13503,15 @@
 msgid "Proxy Options"
 msgstr "Options du serveur mandataire"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Type :"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port :"
 
@@ -12246,31 +13519,43 @@
 msgid "_Username:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "_Mot de passe :"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Impossible de sauver le nouveau compte."
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Un compte existe déjà avec les critères saisis."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Ajouter un compte"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Essentiel"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Créer ce nouveau compte sur le serveur"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avancé"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12294,11 +13579,11 @@
 "comptes, choisissez <b>Comptes->Modifier</b> dans le menu de la liste de "
 "contacts"
 
-#: ../pidgin/gtkblist.c:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Entrer dans une discussion"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12307,218 +13592,230 @@
 "voulez entrer.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792 ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "C_ompte :"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "Dé_bloquer"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "_Infos"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Message"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "Envoyer un _fichier"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Ajouter une a_lerte"
 
-#: ../pidgin/gtkblist.c:1153 ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-#: ../pidgin/gtkblist.c:1170 ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1173 ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "_Ajouter un contact"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Ajouter une d_iscussion"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Supprimer un groupe"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Renommer"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Discuter"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Rentrer auto"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "Re_plier"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Etendre"
 
-#: ../pidgin/gtkblist.c:1572 ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576 ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Outils/Silencieux"
 
-#: ../pidgin/gtkblist.c:2044 ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Il n'y a aucun compte actif permettant d'ajouter cet utilisateur."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Contacts"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacts/Envoyer un _message..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacts/_Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacts/Voir les _informations..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacts/Voir les _archives..."
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Contacts/Afficher les contacts _déconnectés"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Contacts/Afficher les groupes _vides"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Contacts/_Afficher les informations des contacts"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Contacts/Afficher les tem_ps d'inactivité"
-
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Contacts/Afficher"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Contacts/Afficher/Contacts _déconnectés"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Contacts/Afficher/Groupes _vides"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Contacts/Afficher/_Informations des contacts"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Contacts/Afficher/_Temps d'inactivité"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Contacts/Afficher/Icônes de _protocole"
+
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacts/_Trier les contacts"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacts/Ajouter un _contact..."
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacts/Ajouter une _discussion..."
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacts/Ajouter un _groupe..."
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Contacts/_Quitter"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/C_omptes"
 
-#: ../pidgin/gtkblist.c:2870 ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Comptes/_Modifier"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Outils/_Alertes"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Outils/_Certificats"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Outils/_Préférences"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Outils/_Filtres"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Outils/_Transferts de fichier"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Outils/_Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Outils/Voir les archives s_ystème"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Outils/_Silencieux"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/Aid_e"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Aide/Aid_e en ligne"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Aide/Fenêtre de _debug"
 
-#: ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Aide/À _propos de"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12527,132 +13824,132 @@
 "\n"
 "<b>Compte :</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Pseudo du contact"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Connecté"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Dernièrement vu"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Étrange"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Fabuleux"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Génial"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactif %dj %dh %02dmin"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactif %dh %02dmin"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactif %dmin"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacts/Envoyer un message..."
 
-#: ../pidgin/gtkblist.c:3590 ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacts/Entrer dans une discussion..."
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacts/Voir les informations..."
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacts/Ajouter un contact..."
 
-#: ../pidgin/gtkblist.c:3593 ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacts/Ajouter une discussion..."
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Contacts/Ajouter un groupe..."
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Outils/Filtres"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Outils/Liste des salons de discussions"
 
-#: ../pidgin/gtkblist.c:3729 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d message non lu de %s\n"
 msgstr[1] "%d messages non lus de %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manuel"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alphabétique"
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Par état"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Par la taille des archives"
 
-#: ../pidgin/gtkblist.c:4018 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Déconnexion de %s"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Réactiver le compte"
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s déconnecté : %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Utilisateur :</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Mot de passe :</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Connexion"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Comptes"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12671,23 +13968,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Contacts/Afficher les contacts _déconnectés"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Contacts/Afficher les groupes vides"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Contacts/Afficher les informations des contacts"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Contacts/Afficher les temps d'inactivité"
-
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Contacts/Afficher/Contacts déconnectés"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Contacts/Afficher/Groupes vides"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Contacts/Afficher/Informations des contacts"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Contacts/Afficher/Temps d'inactivité"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Contacts/Afficher/Icônes de protocole"
+
+#: ../pidgin/gtkblist.c:5501
 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. "
@@ -12699,19 +14000,19 @@
 "que cela est possible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "_Nom d'utilisateur :"
 
-#: ../pidgin/gtkblist.c:5516 ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "_Alias :"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Les salons de discussions ne sont pas supportés par ce protocole."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12719,7 +14020,7 @@
 "Vous n'avez pas de protocole disponible vous permettant d'entrer dans des "
 "salons de discussions."
 
-#: ../pidgin/gtkblist.c:5838
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12727,42 +14028,47 @@
 "Saisissez un alias et les informations nécessaires pour le salon de "
 "discussions que vous voulez ajouter dans la liste de contacts.\n"
 
-#: ../pidgin/gtkblist.c:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Saisissez le nom du groupe à ajouter"
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Comptes/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "Modifier le c_ompte"
 
-#: ../pidgin/gtkblist.c:6603 ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "Aucune action disponible"
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Désactiver"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Activer un compte"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Comptes/Activer un compte"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Outils"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "Serveurs SSL"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12776,26 +14082,26 @@
 "%s n'essaiera pas de se reconnecter avec ce compte tant que cette erreur ne "
 "sera pas corrigée et que vous ne réactiviez pas le compte."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: ../pidgin/gtkconv.c:759 ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 "Ce contact n'utilise pas le même protocole que ce salon de discussions."
 
-#: ../pidgin/gtkconv.c:779
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Il n'y a aucun compte actif vous permettant d'inviter ce contact."
 
-#: ../pidgin/gtkconv.c:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter le contact dans une discussion"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12803,201 +14109,188 @@
 "Saisissez le nom de l'utilisateur que vous voulez inviter dans la "
 "discussion, ainsi qu'un message d'invitation facultatif."
 
-#: ../pidgin/gtkconv.c:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Contact :"
 
-#: ../pidgin/gtkconv.c:903 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Message :"
 
-#: ../pidgin/gtkconv.c:960 ../pidgin/gtkconv.c:2521 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Impossible d'ouvrir le fichier."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation avec %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "Sauver la conversation"
 
-#: ../pidgin/gtkconv.c:1151 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Chercher"
 
-#: ../pidgin/gtkconv.c:1177 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Chercher : "
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Archives démarrées. Les nouveaux messages de cette conversation seront "
-"archivés."
-
-#: ../pidgin/gtkconv.c:1368
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Archives arrêtées. Les nouveaux messages de cette conversation ne seront pas "
-"archivés."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "Ne plus ignorer"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "Dernières paroles"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "Impossible de sauver l'icône sur le disque."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "Enregistrer l'icône"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "Cacher l'icône"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "Enregistrer l'icône sous..."
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "Changer l'icône..."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "Supprimer l'icône"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "Tout afficher"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/_Voir les archives"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/Enregistrer _sous..."
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/_Effacer la conversation"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Ajouter une _alerte..."
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/Voir les _informations"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/Invi_ter..."
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/_Plus"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/_Donner un alias..."
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Bloquer..."
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/Dé_bloquer..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Ajouter..."
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Supprimer..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insérer un _lien..."
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insérer une ima_ge..."
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Fermer"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Activer l'_archivage"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Activer les _sons"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Afficher les _icônes des contacts"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Afficher la _barre de style"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Afficher l'_horodatage"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/Conversation/Plus"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/Options"
 
@@ -13006,178 +14299,174 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3093 ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les archives"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Ajouter une alerte..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Voir les informations"
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Inviter..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Donner un alias..."
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Bloquer..."
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Débloquer..."
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Ajouter..."
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Supprimer..."
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insérer un lien..."
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insérer une image..."
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/Options/Activer l'archivage"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Activer les sons"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Afficher la barre de style"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Afficher l'horodatage"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Afficher l'icône des contacts"
-
-#: ../pidgin/gtkconv.c:3297 ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "L'utilisateur est en train d'écrire..."
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "L'utilisateur a écrit quelque chose et s'est arrêté"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525 ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "_Envoyer vers"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "_Envoyer"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "Personne dans ce salon"
 
-#: ../pidgin/gtkconv.c:5609 ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d personne dans le salon"
 msgstr[1] "%d personnes dans le salon"
 
-#: ../pidgin/gtkconv.c:6338 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "En train d'écrire"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "S'arrête d'écrire"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "Votre pseudonyme apparaît"
 
-#: ../pidgin/gtkconv.c:6348 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "Nouvel événement"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear : Effacer le contenu de la fenêtre de conversation."
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "Confirmer la fermeture"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Vous n'avez pas lu certains messages. Êtes-vous sûr de vouloir fermer la "
 "fenêtre ?"
 
-#: ../pidgin/gtkconv.c:8111
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "Fermer les autres onglets"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "Fermer tous les onglets"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "Détacher cet onglet"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "Fermer cet onglet"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "Fermer la conversation"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "Dernière fenêtre ouverte"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "Séparer les messages et les discussions"
 
-#: ../pidgin/gtkconv.c:9213 ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Nouvelle fenêtre"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "Par groupe"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "Par compte"
 
@@ -13241,7 +14530,7 @@
 msgid "Fatal Error"
 msgstr "Erreur critique"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "codeur principal"
 
@@ -13252,8 +14541,8 @@
 #: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
 #: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
 #: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "codeur"
 
@@ -13265,381 +14554,388 @@
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:104
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "codeur et webmestre"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "contribuant senior/QA"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "portage win32"
 
-#: ../pidgin/gtkdialogs.c:105 ../pidgin/gtkdialogs.c:106
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "mainteneur"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "mainteneur de libfaim"
 
-#: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "codeur et webmestre"
-
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker et conducteur désigné [feignasse]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "codeur XMPP"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "auteur original"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabe"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengalî"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnien"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valencien-Catalan"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
-msgid "Danish"
-msgstr "Danois"
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
-msgid "German"
-msgstr "Allemand"
-
 #: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:147
+msgid "Danish"
+msgstr "Danois"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
+msgid "German"
+msgstr "Allemand"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Grec"
 
-#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "Anglais australien"
 
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "Anglais canadien"
 
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "Anglais britannique"
 
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "Espéranto"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estonien"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "Basque"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "Persan"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "Finnois"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "Français"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "Galicien"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "Gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "Équipe du langage gujarâtî"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "Hébreu"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "Hongrois"
 
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "Indonésien"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "Italien"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "Japonais"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "Géorgien"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducteurs géorgiens d'Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannara"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Équipe de traduction kannara"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Coréen"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurde"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Lituanien"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Macédonien"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norvégien bokmål"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Népalais"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Hollandais, flamand"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norvégien"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norvégien (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Portugais brésilien"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pachto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Roumain"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Russe"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "Slovène"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "Albanais"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Télougou"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thaï"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Turc"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh et l'équipe Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Chinois simplifié"
 
-#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Chinois de Hong-Kong"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Chinois traditionnel"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharique"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s est un client graphique de messagerie modulaire basé sur libpurple "
 "compatible avec AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu et QQ. Il est écrit "
-"avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce programme sous les "
-"conditions énoncées par la licence GNU GPL (version 2 ou ultérieure). Une "
-"copie de la licence GPL est dans le fichier « COPYING » fourni avec %s. Tous "
-"droits réservés par les collaborateurs de %s. Consultez le fichier "
-"« COPYRIGHT » pour avoir la liste complète des collaborateurs. Aucune "
-"garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:392
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIm, Gadu-Gadu et QQ. Il "
+"est écrit avec Gtk+.<BR><BR>Vous pouvez modifier et redistribuer ce "
+"programme sous les conditions énoncées par la licence GNU GPL (version 2 ou "
+"ultérieure). Une copie de la licence GPL est dans le fichier « COPYING » "
+"fourni avec %s. Tous droits réservés par les collaborateurs de %s. Consultez "
+"le fichier « COPYRIGHT » pour avoir la liste complète des collaborateurs. "
+"Aucune garantie n'est fournie pour l'utilisation de ce programme.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC :</FONT> #pidgin sur irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:397
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "Codeurs"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "Patcheurs fous"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "Codeurs retraités"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:452
 msgid "Retired Crazy Patch Writers"
 msgstr "Patcheurs fous retraités"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "Artistes"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "Traducteurs"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "Anciens traducteurs"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "Informations de debug"
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "Informations utilisateur"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13647,11 +14943,11 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les informations."
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "Voir les archives d'un contact"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13659,32 +14955,32 @@
 "Saisissez le nom d'utilisateur ou l'alias de la personne dont vous voulez "
 "les archives."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "Donner un alias à un contact"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "Saisissez un alias pour ce contact"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Saisissez un alias pour %s"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "Donner un alias"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "Donner un alias à un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "Saisissez un alias pour cette discussion"
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13699,15 +14995,15 @@
 "Vous allez supprimer le contact contenant %s et %d autres identifiants de "
 "votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13715,15 +15011,15 @@
 msgstr ""
 "Vous allez fusionner le groupe %s au groupe %s. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "Fusionner des groupes"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "_Fusionner les groupes"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13732,30 +15028,30 @@
 "Vous allez supprimer le groupe %s et tous ses membres de votre liste de "
 "contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "Supprimer un groupe"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "_Supprimer le groupe"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Vous allez supprimer %s de votre liste de contacts. Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "Supprimer un contact"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "_Supprimer le contact"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13764,11 +15060,11 @@
 "Vous allez supprimer le salon de discussions %s de votre liste de contacts. "
 "Voulez-vous continuer ?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "Supprimer un salon de discussions"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "_Supprimer le salon"
 
@@ -13877,7 +15173,7 @@
 msgstr "_Détails du transfert"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13886,44 +15182,44 @@
 msgid "_Resume"
 msgstr "_Reprise"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"
 
-#: ../pidgin/gtkimhtml.c:831 ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Effacer le style"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Couleur des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Couleur pour afficher les liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Couleur de surlignage des liens hypertextes"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Couleur pour afficher les liens hypertextes quand la souris les survole."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Copier l'adresse électronique"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le lien"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13933,7 +15229,7 @@
 "\n"
 "PNG choisi par défaut"
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13943,7 +15239,7 @@
 "\n"
 "Le type PNG est utilisé par défaut."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13954,7 +15250,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13965,35 +15261,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476 ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Changer la police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Changer la couleur du texte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Changer la couleur du fond"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -14001,91 +15297,155 @@
 "Saisissez l'URL et la description du lien à inclure. La description est "
 "facultative."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Saisissez l'URL du lien à insérer."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Insérer un lien"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossible de sauver l'image : %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Insérer une image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Ce thème n'a pas de frimousses."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Souriez !"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820 ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "_Police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Regrouper les items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Dégrouper les items"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Gras"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Italique"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Souligné"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Barré"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Augmenter la taille de la police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Diminuer la taille de la police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Type de police"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Couleur du texte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Effacer le style"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Insérer une image"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Insérer une frimousse"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Gras</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>Itali_que</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Souligné</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Barré</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>Plus g_rand</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>Pl_us petit</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "T_ype de police"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "Couleur du _texte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "Couleur de _fond"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "Fri_mousse"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Lien"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "Barre _horizontale"
+
 #: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
@@ -14258,44 +15618,44 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s a reçu %d nouveau message."
 msgstr[1] "%s a reçu %d nouveaux messages."
 
-#: ../pidgin/gtknotify.c:527
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Vous avez %d nouveau courrier.</b>"
 msgstr[1] "<b>Vous avez %d nouveaux courriers.</b>"
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "La commande « %s » pour le navigateur est non valide."
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994 ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Impossible d'ouvrir l'URL"
 
-#: ../pidgin/gtknotify.c:979 ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erreur au lancement de « %s » : %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -14349,100 +15709,100 @@
 msgstr "Choisissez un fichier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
+#: ../pidgin/gtkpounce.c:592
+msgid "Si_gns on"
+msgstr "Se _connecte"
+
 #: ../pidgin/gtkpounce.c:594
-msgid "Si_gns on"
-msgstr "Se _connecte"
+msgid "Signs o_ff"
+msgstr "Se _déconnecte"
 
 #: ../pidgin/gtkpounce.c:596
-msgid "Signs o_ff"
-msgstr "Se _déconnecte"
+msgid "Goes a_way"
+msgstr "S'_absente"
 
 #: ../pidgin/gtkpounce.c:598
-msgid "Goes a_way"
-msgstr "S'_absente"
+msgid "Ret_urns from away"
+msgstr "_Revient d'absence"
 
 #: ../pidgin/gtkpounce.c:600
-msgid "Ret_urns from away"
-msgstr "_Revient d'absence"
+msgid "Becomes _idle"
+msgstr "Devient _inactif"
 
 #: ../pidgin/gtkpounce.c:602
-msgid "Becomes _idle"
-msgstr "Devient _inactif"
-
-#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "N'est plus i_nactif"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "C_ommence à écrire"
 
+#: ../pidgin/gtkpounce.c:606
+msgid "P_auses while typing"
+msgstr "_Pause pendant la saisie"
+
 #: ../pidgin/gtkpounce.c:608
-msgid "P_auses while typing"
-msgstr "_Pause pendant la saisie"
-
-#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "_S'arrête d'écrire"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Envoi d'un _message"
 
+#: ../pidgin/gtkpounce.c:653
+msgid "Ope_n an IM window"
+msgstr "Ouvrir une _fenêtre de conversation"
+
 #: ../pidgin/gtkpounce.c:655
-msgid "Ope_n an IM window"
-msgstr "Ouvrir une _fenêtre de conversation"
-
-#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Ouvrir une fenêtre de _notification"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Envoyer un _message"
 
+#: ../pidgin/gtkpounce.c:659
+msgid "E_xecute a command"
+msgstr "Exécuter une c_ommande"
+
 #: ../pidgin/gtkpounce.c:661
-msgid "E_xecute a command"
-msgstr "Exécuter une c_ommande"
-
-#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "_Jouer un son"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "Choisir..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Pré_visualisation"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Alerter _uniquement quand mon état n'est pas « Disponible »"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Récurrente"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Par défaut"
 
@@ -14487,7 +15847,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "Lorsque absent"
 
@@ -14584,11 +15944,11 @@
 msgid "Conversation _font:"
 msgstr "Police des _conversations :"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Style par défaut"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14596,119 +15956,119 @@
 "Le texte des messages envoyés apparaîtra comme ceci avec les protocoles "
 "supportant l'ajout du style."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "Serveur ST_UN :"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "_Détection auto de l'adresse IP"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Spécifier _manuellement la plage de ports à écouter"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Premier port : "
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "_Dernier port :"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Serveur mandataire"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Aucun"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "_Utilisateur :"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1326
-msgid "Opera"
-msgstr "Opéra"
-
-#: ../pidgin/gtkprefs.c:1327
-msgid "Netscape"
-msgstr "Netscape"
-
 #: ../pidgin/gtkprefs.c:1328
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Opera"
+msgstr "Opéra"
 
 #: ../pidgin/gtkprefs.c:1329
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1330
-msgid "GNOME Default"
-msgstr "Navigateur de Gnome"
+msgid "Mozilla"
+msgstr "Mozilla"
 
 #: ../pidgin/gtkprefs.c:1331
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "GNOME Default"
+msgstr "Navigateur de Gnome"
+
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Choix du navigateur"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "_Ouvrir les liens :"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Laisser le navigateur choisir"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Dans une fenêtre ouverte"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Dans un nouvel onglet"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14717,63 +16077,63 @@
 "_Manuel :\n"
 "(%s pour l'URL)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "_Format des archives :"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "Archiver tous les _messages"
 
-#: ../pidgin/gtkprefs.c:1474
-msgid "Log all c_hats"
-msgstr "Archiver toutes les _discussions"
-
 #: ../pidgin/gtkprefs.c:1476
+msgid "Log all c_hats"
+msgstr "Archiver toutes les _discussions"
+
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Archiver tous les _changements d'état dans les archives système"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Choix des sons"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Le plus silencieux"
 
-#: ../pidgin/gtkprefs.c:1634
-msgid "Quieter"
-msgstr "Très silencieux"
-
 #: ../pidgin/gtkprefs.c:1636
+msgid "Quieter"
+msgstr "Très silencieux"
+
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Silencieux"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Fort"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Très fort"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Le plus fort"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "_Méthode :"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "Bip de console"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "Pas de son"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14782,81 +16142,81 @@
 "_Commande pour le son :\n"
 "(%s pour le nom de fichier)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "Jouer les sons quand la conversation est en _avant-plan"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "Activer les sons :"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "Volume :"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "Jouer"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "_Rapporter le temps d'inactivité :"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "Selon l'activité du clavier ou de la souris"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "_Réponse automatique :"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "Lorsque absent et inactif"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "Absence automatique"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "Changer d'état lorsque _inactif"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1956
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes avant de passer inactif :"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "_Changer l'état en :"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "État au démarrage"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "Utiliser l'état à la _fermeture"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "État _utilisé au démarrage :"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "Thèmes des frimousses"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "Navigateur"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "État / Inactivité"
 
@@ -14945,23 +16305,23 @@
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../pidgin/gtkrequest.c:1505
-msgid "Would you like to overwrite it?"
-msgstr "Voulez-vous l'écraser ?"
-
 #: ../pidgin/gtkrequest.c:1508
+msgid "Would you like to overwrite it?"
+msgstr "Voulez-vous l'écraser ?"
+
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Choisir un nouveau nom"
 
-#: ../pidgin/gtkrequest.c:1647 ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Choisir un dossier..."
 
@@ -15001,7 +16361,7 @@
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "É_tat :"
 
@@ -15015,7 +16375,7 @@
 msgid "Sa_ve & Use"
 msgstr "Enregistrer _et utiliser"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "État pour %s"
@@ -15028,21 +16388,21 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "L'erreur suivante est survenue au chargement de %s : %s"
 
-#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Impossible de charger l'image."
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Impossible d'envoyer le dossier %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -15051,12 +16411,12 @@
 "%s ne peut pas transférer les dossiers. Vous devez envoyer les fichiers du "
 "dossier individuellement."
 
-#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Vous avez déposé une image."
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15064,23 +16424,23 @@
 "Vous pouvez envoyer cette image à votre correspondant, l'incorporer dans ce "
 "message ou l'utiliser en tant qu'icône pour cet utilisateur."
 
-#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Utiliser comme icône"
 
-#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Envoyer l'image"
 
-#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Insérer dans un message"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Voulez-vous l'utiliser en tant qu'icône pour cette utilisateur ?"
 
-#: ../pidgin/gtkutils.c:1540
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15088,7 +16448,7 @@
 "Vous pouvez envoyer cette image à votre correspondant ou l'utiliser en tant "
 "qu'icône pour cet utilisateur."
 
-#: ../pidgin/gtkutils.c:1541
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15101,11 +16461,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Impossible d'envoyer ce lien."
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15113,7 +16473,7 @@
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
 
-#: ../pidgin/gtkutils.c:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15124,27 +16484,27 @@
 "<b>Taille du fichier :</b> %s\n"
 "<b>Taille de l'image :</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "Le fichier « %s » est trop gros pour %s. Veuillez choisir une image plus "
 "petite.\n"
 
-#: ../pidgin/gtkutils.c:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Erreur d'icône"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Impossible de changer d'icône."
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Impossible d'ouvrir le fichier « %s » : %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15160,31 +16520,31 @@
 msgid "Select color"
 msgstr "Choisir la couleur"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Fermer les _onglets"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "_Récupérer les infos"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Inviter"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Ouvrir le courrier"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Frimousses de Pidgin"
 
@@ -15361,18 +16721,6 @@
 msgid "Select Color for %s"
 msgstr "Choisissez la couleur pour %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Gras"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Italique"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Souligné"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ignorer les styles reçus"
@@ -15621,15 +16969,6 @@
 msgid "E-mail:"
 msgstr "Adresse électronique :"
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
-#, c-format
-msgid ""
-"\n"
-"<b>Buddy Note</b>: %s"
-msgstr ""
-"\n"
-"<b>Commentaires :</b> %s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15651,6 +16990,15 @@
 "Vérifie que tous les signaux de l'interface graphique fonctionnent "
 "correctement."
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Commentaires :</b> %s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historique"
@@ -15702,11 +17050,11 @@
 msgid "Draw Markerline in "
 msgstr "Dessine les lignes de démarcation dans :"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Les fenêtres de _messages"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Les fenêtres de _discussions"
 
@@ -15722,32 +17070,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Partie de messagerie musicale confirmée."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Messagerie musicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Un conflit a eu lieu en exécutant la commande :"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Erreur à l'exécution de l'éditeur"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "L'erreur suivante est survenue :"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Configuration de messagerie musicale"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Chemin de l'éditeur de partitions"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Appliquer"
 
@@ -15759,12 +17107,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin de messagerie musicale pour la composition collaborative."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15773,74 +17121,74 @@
 "de musique en modifiant une partition commune en temps réel."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notification pour"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Seulement quand on dit votre pseudonyme"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fenêtres actives"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Méthode de notification"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Préfixer un _texte au titre de la fenêtre :"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Mettre le n_ombre de nouveaux messages dans le titre de la fenêtre"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Mettre le nombre de nouveaux messages dans une propriété _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Envoyer le message « _URGENT » au gestionnaire de fenêtres"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Passer la conversation en _avant plan"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Suppression de la notification"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Supprimer quand la _fenêtre devient active"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Supprimer quand la fenêtre est _cliquée"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Supprimer lors de l'éc_riture dans la fenêtre"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Supprimer sur envoi d'un _message"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Supprimer lors du changement d'_onglet"
 
@@ -15850,7 +17198,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notification de message"
 
@@ -15858,7 +17206,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Fournit différents moyens d'avertissement de messages non lus."
 
@@ -16230,44 +17578,44 @@
 "Permet à l'utilisateur de personnaliser dans les conversions et les archives "
 "la manière dont est affiché l'horodatage."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacité :"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Fenêtres de conversation"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Fenêtre de _conversation transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "Afficher la barre de défilement dans la fenêtre"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Supprimer la transparence pour les fenêtres de conversation actives"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Toujours en avant plan"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Fenêtre de la liste de contacts"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Fenêtre de la liste de _contacts transparente"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Supprimer la transparence quand la liste des contacts est active"
 
@@ -16277,19 +17625,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparence"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparence variable pour la liste de contacts et les conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16301,47 +17649,47 @@
 "\n"
 "Note : Ce plugin nécessite Windows 2000 ou plus récent."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "Version des bibliothèques GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Démarrage"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Démarrer %s au lancement de Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Liste de contacts _accrochable"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Liste de contacts toujours _visible :"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Seulement quand la fenêtre est accrochée"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "_Faire clignoter la fenêtre dans les discussions actives"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Options de Pidgin Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options spécifiques à Pidgin Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -16395,6 +17743,45 @@
 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 "nudged"
+#~ msgstr "nudgé"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "Vous venez d'envoyer un « Nudge. »"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s vient de vous envoyer un « Nudge. »"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s vient de vous envoyer un « Buzz ! »"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "Vous venez d'envoyer un « Buzz ! »"
+
+#~ msgid "buzzed"
+#~ msgstr "buzzé"
+
+#~ msgid "Attention! %s %s."
+#~ msgstr "Attention ! %s %s."
+
+#~ msgid "Attention!"
+#~ msgstr "Attention !"
+
+#~ msgid "Attention! You have been %s."
+#~ msgstr "Attention ! Vous avez été %s."
+
+#~ msgid "Would like to add him?"
+#~ msgstr "Voulez-vous l'ajouter ?"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/Options/Afficher les _icônes des contacts"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/Options/Afficher l'icône des contacts"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norvégien"
+
 #~ msgid "Socket send error"
 #~ msgstr "Erreur à l'envoi sur le socket."