[evolution] Updated French translation



commit 8fc6748bdea0e1a8dd295f2add3054c7b1e356e8
Author: Bruno Brouard <annoa b gmail com>
Date:   Thu Sep 1 22:10:29 2011 +0200

    Updated French translation

 po/fr.po | 9144 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 4348 insertions(+), 4796 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 9f1535e..69b53cb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,14 +24,14 @@
 # Claude Paroz <claude 2xlibre net>, 2007-2011.
 # Laurent Coudeur <laurentc iol ie>, 2010.
 #
-#: ../shell/main.c:615
+#: ../shell/main.c:569
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution\n"
-"POT-Creation-Date: 2011-03-08 23:15+0000\n"
-"PO-Revision-Date: 2011-02-26 11:09+0100\n"
+"product=evolution&keywords=I18N+L10N\n"
+"POT-Creation-Date: 2011-08-31 00:39+0000\n"
+"PO-Revision-Date: 2011-08-27 11:25+0200\n"
 "Last-Translator: Bruno Brouard <annoa b gmail com>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
@@ -58,22 +58,34 @@ msgstr ""
 "une nouvelle carte avec la mÃme adresseÂ?"
 
 #: ../addressbook/addressbook.error.xml.h:4
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Une liste de contacts nommÃe ÂÂ{0} existe dÃjà dans cette liste de "
+"contacts. Voulez-vous quand mÃme l'ajouterÂ?"
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Ajouter avec les doublons"
+
+#: ../addressbook/addressbook.error.xml.h:6
 msgid "Address '{0}' already exists."
 msgstr "L'adresse ÂÂ{0}ÂÂ existe dÃjÃ."
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Impossible d'ajouter un nouveau contact"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Impossible de dÃplacer le contact."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "Ãditeur de catÃgorie non disponible."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -84,16 +96,16 @@ msgstr ""
 "beaucoup de mots de passe sont sensibles à la casseÂ; le verrouillage "
 "majuscules est peut-Ãtre actif."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
 msgstr ""
 "Impossible d'obtenir les informations relatives au schÃma du serveur LDAP."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
 msgstr "Impossible de supprimer le carnet d'adresses."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 msgid ""
 "Currently you can only access the GroupWise System Address Book from "
 "Evolution. Please use some other GroupWise mail client once to get your "
@@ -104,55 +116,66 @@ msgstr ""
 "obtenir les contacts frÃquents et les dossiers de contacts personnels de "
 "GroupWise."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
 msgstr "Supprimer le carnet d'adresses ÂÂ{0}ÂÂÂ?"
 
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_Ne pas supprimer"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Erreur lors de l'enregistrement de {0} vers {1}Â: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
 msgstr "L'authentification sur le serveur LDAP a ÃchouÃ."
 
-#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "La suppression du contact a ÃchouÃ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
 msgstr "CrÃation du carnet d'adresses GroupWiseÂ:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "Le serveur a renvoyà des informations relatives au schÃma non valides."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "La liste ÂÂ{0} est dÃjà dans cette liste de contacts."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "Passer les doublons"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Certaines adresses existent dÃjà dans cette liste de contacts."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
 msgstr ""
 "Il est possible que certaines fonctionnalitÃs ne fonctionnent pas "
 "correctement avec la version actuelle de votre serveur"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Le carnet d'adresses d'Evolution a quittà de faÃon inattendue."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "L'image que vous avez sÃlectionnÃe est grande. Voulez-vous la redimensionner "
 "avant de l'enregistrerÂ?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -163,16 +186,16 @@ msgstr ""
 "Renseignez-vous auprÃs de votre administrateur sur les bases de recherche "
 "prises en charge."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Ce carnet d'adresses ne peut pas Ãtre ouvert."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr ""
 "Ce serveur de carnet d'adresses n'a aucune des bases de recherche suggÃrÃes."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -180,33 +203,33 @@ msgstr ""
 "Il se peut que le serveur de carnet d'adresses soit injoignable, que le nom "
 "du serveur contienne une faute ou que votre rÃseau soit coupÃ."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Ce carnet d'adresses sera dÃfinitivement supprimÃ."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 "Ce serveur ne prend pas en charge les informations relatives au schÃma "
 "LDAPv3."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "Impossible d'effectuer une recherche."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
 msgstr "Impossible d'enregistrer {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
 msgstr "Voulez-vous enregistrer les modificationsÂ?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -215,7 +238,7 @@ msgstr ""
 "mais il ne peut pas Ãtre supprimà de la source. Voulez-vous en faire une "
 "copie à la place�"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -226,13 +249,21 @@ msgstr ""
 "rÃsultats, il est recommandà de mettre à niveau votre serveur vers une "
 "version supportÃe"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"Vous essayez d'ajouter des adresses qui font dÃjà partie de cette liste. "
+"Voulez-vous quand mÃme les ajouterÂ?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr ""
 "Vous ne disposez pas des droits nÃcessaires pour supprimer des contacts dans "
 "ce carnet d'adresses."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
@@ -241,38 +272,36 @@ msgstr ""
 "ces modificationsÂ?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
 "pas Ãtà redÃmarrÃ."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:610
-#: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "A_jouter"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Abandonner"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Ne pas enregistrer"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "_Redimensionner"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "Anniversaire"
@@ -283,9 +312,9 @@ msgstr "Anniversaire"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
-#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:116
-#: ../shell/main.c:133
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
+#: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:140
 msgid "Birthday"
 msgstr "Date de naissance"
 
@@ -295,7 +324,7 @@ msgid "Blog:"
 msgstr "BlogÂ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tÃgories..."
@@ -305,24 +334,24 @@ msgid "Calendar:"
 msgstr "CalendrierÂ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:950
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Contact"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:623
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "Ãditeur de contacts"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:502
-#: ../addressbook/gui/widgets/eab-contact-display.c:844
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Adresse Ãlectronique"
 
@@ -335,8 +364,10 @@ msgid "Full _Name..."
 msgstr "_Nom complet..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1306
+#: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Domicile"
 
@@ -370,17 +401,13 @@ msgid "Nic_kname:"
 msgstr "_SurnomÂ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:429
-#: ../plugins/groupwise-features/camel-gw-listener.c:454
-#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "Notes"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:69
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:408
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Autre"
@@ -406,9 +433,11 @@ msgid "Web addresses"
 msgstr "Sites Web"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:67
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:1303
+#: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Bureau"
 
@@ -433,9 +462,9 @@ msgid "_Blog:"
 msgstr "_BlogÂ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:881
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../plugins/itip-formatter/itip-view.c:1922
+#: ../calendar/gui/dialogs/event-page.c:710
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "C_alendrierÂ:"
 
@@ -513,74 +542,74 @@ msgstr "_OÃÂ:"
 msgid "_Zip/Postal Code:"
 msgstr "_Code postalÂ:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:381
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "Erreur lors de la modification du contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:638
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2649
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Ãditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3070
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "SÃlectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -588,43 +617,43 @@ msgstr ""
 "La donnÃe sur le contact n'est pas valideÂ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3356
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ÂÂ%sÂÂ n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3363
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s ÂÂ%sÂÂ n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3378
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3389
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s ÂÂ%sÂÂ est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3404
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:392
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:395
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "Mo_difier entiÃrement"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:443
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "_Nom complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "_Adresse Ãlectronique"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:465
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "_SÃlectionner le carnet d'adresses"
 
@@ -694,7 +723,7 @@ msgid "_Suffix:"
 msgstr "_SuffixeÂ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "Ãditeur de liste de contacts"
 
@@ -711,7 +740,7 @@ msgid "_List name:"
 msgstr "_Nom de la listeÂ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "_SÃlectionner..."
 
@@ -721,27 +750,26 @@ msgstr ""
 "_Saisissez une adresse Ãlectronique ou dÃplacez un contact dans la liste ci-"
 "dessousÂ:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
-msgid "_Members"
-msgstr "_Membres"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
+msgid "_Members"
+msgstr "_Membres"
+
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contact modifiÃÂ:"
@@ -758,11 +786,11 @@ msgstr "Contact en double dÃtectÃ"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
 msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to save the changes anyway?"
 msgstr ""
 "Le nom ou l'adresse Ãlectronique de ce contact existe dÃjà dans ce dossier. "
-"Voulez-vous quand mÃme l'ajouterÂ?"
+"Voulez-vous quand mÃme enregistrer les modificationsÂ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -781,60 +809,54 @@ msgstr ""
 "dans ce dossier. Voulez-vous quand mÃme l'ajouterÂ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
-#: ../calendar/gui/tasktypes.xml.h:7
-#, c-format
-msgid "Cancelled"
-msgstr "AnnulÃ"
-
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "Fusionner le contact"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Name contains"
 msgstr "Le nom contient"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:145
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Aucun contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:342
+#: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de l'affichage du carnet"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:756
+#: ../addressbook/gui/widgets/e-addressbook-model.c:768
 msgid "Search Interrupted"
 msgstr "Recherche interrompue"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
@@ -851,7 +873,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Colle les contacts depuis le presse-papiers"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:745
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
 msgstr "Supprimer les contacts sÃlectionnÃs"
 
@@ -859,34 +881,34 @@ msgstr "Supprimer les contacts sÃlectionnÃs"
 msgid "Select all visible contacts"
 msgstr "SÃlectionne tous les contacts visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Voulez-vous vraiment supprimer ces listes de contactsÂ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Voulez-vous vraiment supprimer cette liste de contactsÂ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Voulez-vous vraiment supprimer cette liste de contacts (%s)Â?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Voulez-vous vraiment supprimer ces contactsÂ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 msgid "Are you sure you want to delete this contact?"
 msgstr "Voulez-vous vraiment supprimer ce contactÂ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Voulez-vous vraiment supprimer ce contact (%s)Â?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -901,16 +923,16 @@ msgstr[1] ""
 "L'affichage de %d contacts implique l'ouverture de %d nouvelles fenÃtres.\n"
 "Voulez-vous vraiment afficher tous ces contactsÂ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Assistant"
 msgstr "Adjoint"
 
@@ -939,7 +961,7 @@ msgid "Car Phone"
 msgstr "TÃlÃphone (voiture)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -947,7 +969,7 @@ msgid "Categories"
 msgstr "CatÃgories"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Company"
 msgstr "SociÃtÃ"
 
@@ -996,22 +1018,22 @@ msgid "Journal"
 msgstr "Journal"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Manager"
 msgstr "Directeur"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Mobile Phone"
 msgstr "TÃlÃphone portable"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:509
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Nickname"
 msgstr "Surnom"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:733
 msgid "Note"
 msgstr "Note"
 
@@ -1040,13 +1062,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:571
+#: ../calendar/gui/e-meeting-list-view.c:585
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "RÃle"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Spouse"
 msgstr "Conjoint(e)"
 
@@ -1076,7 +1098,7 @@ msgstr "UnitÃ"
 msgid "Web Site"
 msgstr "Site Web"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1086,7 +1108,7 @@ msgstr ""
 "\n"
 "Recherche des contacts..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1100,7 +1122,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour crÃer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1114,7 +1136,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour crÃer un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1124,7 +1146,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:204
 msgid ""
 "\n"
 "\n"
@@ -1134,136 +1156,137 @@ msgstr ""
 "\n"
 "Il n'y a aucun ÃlÃment à afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard.c:98
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Work Email"
 msgstr "Adresse Ãlectronique (travail)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Home Email"
 msgstr "Adresse Ãlectronique (domicile)"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-#: ../addressbook/gui/widgets/e-minicard.c:805
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Autre adresse Ãlectronique"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:184
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:187
 msgid "evolution address book"
 msgstr "carnet d'adresses d'Evolution"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:167
+#: ../addressbook/gui/widgets/ea-minicard-view.c:170
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "dossier actuel du carnet d'adresses %s possÃde %d carte"
 msgstr[1] "dossier actuel du carnet d'adresses %s possÃde %d cartes"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:31
+#: ../addressbook/gui/widgets/ea-minicard.c:34
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:153
+#: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
 msgstr "Liste de contactsÂ: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:154
+#: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
 msgstr "ContactÂ: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:180
+#: ../addressbook/gui/widgets/ea-minicard.c:183
 msgid "evolution minicard"
 msgstr "mini-carte d'Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "Copier l'_adresse Ãlectronique"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174
-#: ../widgets/misc/e-web-view.c:397
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "Copie l'adresse Ãlectronique dans le presse-papiers"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message Ã..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:404
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Envoie un courriel à cette adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:424
-#: ../addressbook/gui/widgets/eab-contact-display.c:811
-msgid "List Members"
-msgstr "Membres de la liste"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
+msgid "Open map"
+msgstr "Ouvrir la carte"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
+msgid "List Members:"
+msgstr "Membres de la listeÂ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:541
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Department"
 msgstr "Service"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Profession"
 msgstr "Profession"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:543
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 msgid "Position"
 msgstr "Position"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Video Chat"
 msgstr "VidÃo-confÃrence"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:427
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../calendar/gui/dialogs/calendar-setup.c:437
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Libre/OccupÃ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
 msgstr "TÃlÃphone"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Address"
 msgstr "Adresse"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Home Page"
 msgstr "Site Web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Web Log"
 msgstr "Journal en ligne"
 
@@ -1271,38 +1294,42 @@ msgstr "Journal en ligne"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:112
-#: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:112
-#: ../modules/calendar/e-task-shell-migrate.c:128
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:138
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:122
+#: ../modules/calendar/e-memo-shell-migrate.c:120
+#: ../modules/calendar/e-task-shell-backend.c:122
+#: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:829
+#: ../addressbook/gui/widgets/eab-contact-display.c:971
+msgid "List Members"
+msgstr "Membres de la liste"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:989
 msgid "Job Title"
 msgstr "Fonction"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:866
+#: ../addressbook/gui/widgets/eab-contact-display.c:1026
 msgid "Home page"
 msgstr "Page Web personnelle"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:875
+#: ../addressbook/gui/widgets/eab-contact-display.c:1035
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
-#: ../widgets/misc/e-web-view.c:858
+#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel à %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:113
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1313,7 +1340,7 @@ msgstr ""
 "tÃlÃchargà pour une consultation hors ligne. Veuillez charger ce carnet "
 "d'adresses une fois en mode connectà pour tÃlÃcharger son contenu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1322,7 +1349,7 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. VÃrifiez que le chemin %s existe "
 "et que vous avez les permissions pour y accÃder."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1331,7 +1358,7 @@ msgstr ""
 "utiliser LDAP dans Evolution, vous devez installer un paquet d'Evolution "
 "avec support LDAP activÃ."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1339,11 +1366,11 @@ msgstr ""
 "Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
 "ou le serveur n'est pas accessible."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
 msgstr "Message d'erreur dÃtaillÃÂ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:200
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1356,7 +1383,7 @@ msgstr ""
 "recherche ou augmenter le nombre maximum de rÃsultats dans\n"
 "les prÃfÃrences du serveur d'annuaires de ce carnet d'adresses."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:207
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1370,7 +1397,7 @@ msgstr ""
 "d'adresses."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:179
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr ""
@@ -1378,7 +1405,7 @@ msgstr ""
 "requÃte. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:220
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr ""
@@ -1386,138 +1413,154 @@ msgstr ""
 "requÃte. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#: ../addressbook/gui/widgets/eab-gui-util.c:232
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Cette requÃte ne s'est pas terminÃe correctement. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:214
+#: ../addressbook/gui/widgets/eab-gui-util.c:254
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:294
 msgid "Select Address Book"
 msgstr "SÃlection du carnet d'adresses"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:357
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:455
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "DÃplacer le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:457
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "Copier le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "DÃplacer les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:462
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:39
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Affichage de la carte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:721
-#: ../addressbook/importers/evolution-ldif-importer.c:519
-#: ../addressbook/importers/evolution-vcard-importer.c:278
-#: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:741
+#: ../addressbook/importers/evolution-ldif-importer.c:539
+#: ../addressbook/importers/evolution-vcard-importer.c:282
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importation..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1016
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
 msgstr "Importateur Outlook CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1025
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Importateur Mozilla CSV et Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1034
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV ou Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1035
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importateur Evolution CSV et Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:753
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
 msgstr "Assistant d'importation LDIF d'Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:639
+#: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:640
+#: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
 msgstr "Assistant d'importation vCard d'Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:741
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "Impossible d'ouvrir le fichier"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
-msgid "Couldn't get list of address books"
-msgstr "Impossible d'obtenir la liste des carnets d'adresses"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "Impossible d'obtenir la liste des carnets d'adressesÂ: %s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/event-page.c:2894
+#: ../calendar/gui/dialogs/memo-page.c:932
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:312
+msgid "Unknown error"
+msgstr "Erreur inconnue"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
-msgid "failed to open book"
-msgstr "Impossible d'ouvrir le livre"
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "Impossible d'ouvrir le client ÂÂ%sÂÂÂ: %s"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "Indiquer un fichier de sortie au lieu de la sortie standard"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "OUTPUTFILE"
 msgstr "FICHIERSORTIE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
 msgstr "Liste des dossiers locaux de carnet d'adresses"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
 msgstr "Afficher les cartes comme des vcards ou des fichiers csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:70
+#: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
 msgstr "Exporter en mode asynchrone"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:73
+#: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -1525,30 +1568,30 @@ msgstr ""
 "Le nombre de cartes dans un fichier de sortie en mode asynchrone, la taille "
 "par dÃfaut est 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:75
+#: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
 msgstr "NUMÃRO"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:137
+#: ../addressbook/tools/evolution-addressbook-export.c:138
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Erreur avec les arguments de la ligne de commande, veuillez utiliser "
 "l'option --help pour voir leur utilisation."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:151
+#: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
 msgstr "Ne prend en charge que les formats csv et vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:160
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
 msgstr "En mode async, la sortie doit Ãtre un fichier."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:168
+#: ../addressbook/tools/evolution-addressbook-export.c:169
 msgid "In normal mode, there is no need for the size option."
 msgstr "En mode normal, il n'y a pas besoin de l'option de taille."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:199
+#: ../addressbook/tools/evolution-addressbook-export.c:200
 msgid "Unhandled error"
 msgstr "Erreur non gÃrÃe"
 
@@ -1967,7 +2010,7 @@ msgstr ""
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
 msgstr "_Enregistrer"
 
@@ -1976,7 +2019,7 @@ msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envoyer"
@@ -1985,46 +2028,33 @@ msgstr "_Envoyer"
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1776
-#: ../plugins/caldav/caldav-browse-server.c:921
-#: ../plugins/google-account-setup/google-source.c:439
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "Saisissez le mot de passe"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:114
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
+msgid "day"
 msgid_plural "days"
 msgstr[0] "jour"
 msgstr[1] "jours"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
 msgstr "Heure de dÃbut"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "Rendez-vous"
 
@@ -2034,9 +2064,9 @@ msgstr "_Tout fermer"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
-#: ../plugins/itip-formatter/itip-view.c:1044
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
+#: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "LieuÂ:"
 
@@ -2044,7 +2074,7 @@ msgstr "LieuÂ:"
 msgid "Snooze _time:"
 msgstr "_DurÃe du reportÂ:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:896
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:916
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Fermer"
@@ -2053,11 +2083,21 @@ msgstr "_Fermer"
 msgid "_Snooze"
 msgstr "_Reporter"
 
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+msgid "days"
+msgstr "jours"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../plugins/google-account-setup/google-contacts-source.c:378
 msgid "hours"
 msgstr "heures"
 
@@ -2068,39 +2108,39 @@ msgstr "lieu du rendez-vous"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 msgid "minutes"
 msgstr "minutes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "Aucun rÃsumà disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 msgid "No location information available."
 msgstr "Aucune information sur le lieu."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "%d alarme est prÃsente"
-msgstr[1] "%d alarmes sont prÃsentes"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Vous avez %d rappel"
+msgstr[1] "Vous avez %d rappels"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1771
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2113,7 +2153,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenÃtre\n"
 "d'avertissement classique à la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1777
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2130,7 +2170,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programmeÂ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1792
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger à propos de ce programme."
 
@@ -2139,7 +2179,7 @@ msgid "invalid time"
 msgstr "Heure non valide"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:396
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2148,7 +2188,7 @@ msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:402
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2159,7 +2199,7 @@ msgstr[1] "%d minutes"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2167,23 +2207,19 @@ msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: ../calendar/gui/cal-editor-utils.c:105
-msgid "Invalid object"
-msgstr "Objet non valide"
-
-#: ../calendar/gui/calendar-view-factory.c:117
+#: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
 msgstr "Vue journaliÃre"
 
-#: ../calendar/gui/calendar-view-factory.c:120
+#: ../calendar/gui/calendar-view-factory.c:119
 msgid "Work Week View"
 msgstr "Vue hebdomadaire de travail"
 
-#: ../calendar/gui/calendar-view-factory.c:123
+#: ../calendar/gui/calendar-view-factory.c:122
 msgid "Week View"
 msgstr "Vue hebdomadaire"
 
-#: ../calendar/gui/calendar-view-factory.c:126
+#: ../calendar/gui/calendar-view-factory.c:125
 msgid "Month View"
 msgstr "Vue mensuelle"
 
@@ -2212,16 +2248,16 @@ msgstr "CatÃgorie"
 msgid "Classification"
 msgstr "Classification"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidentiel"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:522
+#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Description"
@@ -2245,7 +2281,7 @@ msgstr "Existe"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Emplacement"
 
@@ -2254,15 +2290,15 @@ msgstr "Emplacement"
 msgid "Organizer"
 msgstr "Organisateur"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:770 ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "PrivÃ"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-cal-model.c:768
-#: ../calendar/gui/e-task-table.c:492 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
@@ -2278,7 +2314,7 @@ msgstr "RÃcurrence"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "RÃsumÃ"
 
@@ -2308,54 +2344,54 @@ msgid "is not"
 msgstr "n'est pas"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Ãditer l'alarme"
+msgid "Edit Reminder"
+msgstr "Modifier le rappel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:435
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Pop up an alert"
 msgstr "Afficher une alerte"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:431
+#: ../calendar/gui/e-alarm-list.c:434
 msgid "Play a sound"
 msgstr "Jouer un son"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Run a program"
 msgstr "Lancer un programme"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:439
+#: ../calendar/gui/e-alarm-list.c:442
 msgid "Send an email"
 msgstr "Envoyer un courriel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Ajouter une alarme"
+msgid "Add Reminder"
+msgstr "Ajouter le rappel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarme"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "_Message personnalisÃ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "Alarme sonore personnalisÃe"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "Rappel sonore personnalisÃ"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "_MessageÂ:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Options"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "Rappel"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "RÃpÃter"
@@ -2377,8 +2413,8 @@ msgid "_Program:"
 msgstr "_ProgrammeÂ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "_RÃpÃter l'alarme"
+msgid "_Repeat the reminder"
+msgstr "_RÃpÃter le rappel"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2401,7 +2437,7 @@ msgid "end of appointment"
 msgstr "la fin du rendez-vous"
 
 # RÃpÃter l'alarme: x fois toutes les x minutes
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "fois toutes les"
@@ -2418,7 +2454,7 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "le dÃbut du rendez-vous"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -2427,91 +2463,95 @@ msgid "A_dd"
 msgstr "A_jouter"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmes"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Reminders"
+msgstr "Rappels"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "TypeÂ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:509
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "_TypeÂ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:280
+#: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_NomÂ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu du calendrier pour les opÃrations hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des tÃches pour les opÃrations "
 "hors ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 "_Copier localement le contenu de la liste des mÃmos pour les opÃrations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:340
+msgid "Sh_ow reminder notifications"
+msgstr "Afficher les n_otifications de rappels"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:413
 msgid "Colo_r:"
 msgstr "Couleu_rÂ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
-#: ../modules/addressbook/addressbook-config.c:1010
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../calendar/gui/dialogs/calendar-setup.c:436
+#: ../calendar/gui/dialogs/calendar-setup.c:448
+#: ../calendar/gui/dialogs/calendar-setup.c:459
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "GÃnÃral"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Liste des tÃches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Memo List"
 msgstr "Liste des mÃmos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:548
 msgid "Calendar Properties"
 msgstr "PropriÃtÃs du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:548
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:607
 msgid "Task List Properties"
 msgstr "PropriÃtÃs de la liste des tÃches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:607
 msgid "New Task List"
 msgstr "Nouvelle liste de tÃches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:666
 msgid "Memo List Properties"
 msgstr "PropriÃtÃs de la liste des mÃmos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:666
 msgid "New Memo List"
 msgstr "Nouvelle liste de mÃmos"
 
@@ -2566,259 +2606,265 @@ msgstr ""
 "%s  Vous n'avez effectuà aucune modification. Voulez-vous mettre à jour "
 "l'ÃditeurÂ?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:445
+#: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "Erreur de validationÂ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:260
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
 msgstr "Impossible d'enregistrer les piÃces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:535
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:650
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "Ãditer le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:657
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
 msgstr "RÃunion - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:665
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "TÃche attribuÃe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:667
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
 msgstr "TÃche - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
 msgstr "MÃmo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:688
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "Aucun rÃsumÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:809
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "Conserver l'ÃlÃment d'origineÂ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1005
-msgid "Click here to close the current window"
-msgstr "Cliquez ici pour fermer la fenÃtre actuelle"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "Close the current window"
+msgstr "Fermer la fenÃtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1012 ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:414 ../widgets/misc/e-web-view.c:1068
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
+#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Copie la sÃlection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1019 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:107 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
+#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Coupe la sÃlection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1026
-#: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:562
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Supprime la sÃlection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1033
-msgid "Click here to view help available"
-msgstr "Cliquez ici pour voir l'aide disponible"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "View help"
+msgstr "Afficher l'aide"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1040 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
+#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Colle le contenu du presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-msgid "Click here to save the current window"
-msgstr "Cliquez ici pour enregistrer la fenÃtre actuelle"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+msgid "Save current changes"
+msgstr "Enregistrer les modifications actuelles"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1068 ../mail/e-mail-browser.c:153
-#: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:567
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
+#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "SÃlectionne tout le texte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1075
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "C_lassification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:167
+#: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1580
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "Ã_dition"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1096
-#: ../shell/e-shell-window-actions.c:1594
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "I_nsertion"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-#: ../composer/e-composer-actions.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117 ../mail/e-mail-browser.c:174
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
-#: ../composer/e-composer-actions.c:285
+#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_PiÃce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
-msgid "Click here to attach a file"
-msgstr "Cliquez ici pour joindre un fichier"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "Joindre un fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1137
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "_CatÃgories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
 msgstr "L'Ãtat indique si les catÃgories sont affichÃes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1145
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "Fu_seau horaire"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
 msgstr "L'Ãtat indique si le champ Fuseau horaire est affichÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1156
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
 msgstr "Classer comme public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "_PrivÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
 msgstr "Classer comme privÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1172
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
 msgstr "Classer comme confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1180
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
 msgstr "Champ _RÃle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
 msgstr "L'Ãtat indique si le champ RÃle est affichÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "L'Ãtat indique si le champ RSVP est affichÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1196
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
 msgstr "Champ _Ãtat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1198
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
 msgstr "L'Ãtat indique si le champ Ãtat est affichÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
 msgstr "Champ _Type"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "L'Ãtat indique si le champ Type de participant est affichÃ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
-#: ../composer/e-composer-private.c:73
+#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Documents rÃcents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1936
-#: ../composer/e-composer-actions.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:2053
+#: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2269
-#: ../calendar/gui/dialogs/comp-editor.c:2432
-#: ../calendar/gui/dialogs/comp-editor.c:3407
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les modifications effectuÃes sur cet ÃlÃment peuvent Ãtre annulÃes en cas de "
 "rÃception d'une mise à jour"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3371
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "piÃce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3439
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelleÂ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:92
-msgid "Could not open source"
-msgstr "Impossible d'ouvrir la source"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:100
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
 msgstr "Impossible d'ouvrir la destination"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:109
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "La destination est en lecture seule"
 
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
+msgid "Cannot create object"
+msgstr "Impossible de crÃer l'objet"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
+msgid "Could not open source"
+msgstr "Impossible d'ouvrir la source"
+
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
@@ -2907,12 +2953,12 @@ msgid "Enter Delegate"
 msgstr "Saisissez un dÃlÃguÃ"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "_Alarmes"
+msgid "_Reminders"
+msgstr "_Rappels"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "Cliquez ici pour dÃfinir ou annuler les alarmes de cet ÃvÃnement"
+msgid "Set or unset reminders for this event"
+msgstr "DÃfinir ou annuler les rappels de cet ÃvÃnement"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2931,14 +2977,12 @@ msgid "Make this a recurring event"
 msgstr "Transforme en ÃvÃnement rÃcurrent"
 
 #: ../calendar/gui/dialogs/event-editor.c:240
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
 #: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "Options d'envoi"
 
 #: ../calendar/gui/dialogs/event-editor.c:242
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "InsÃre les options avancÃes d'envoi"
 
@@ -2959,13 +3003,13 @@ msgid "Query free / busy information for the attendees"
 msgstr ""
 "Interroge les personnes attendues sur leur disponibilità (libre/occupÃ)"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "Rendez-vous"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
-#: ../calendar/gui/e-meeting-list-view.c:148
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "Participants"
 
@@ -2973,88 +3017,82 @@ msgstr "Participants"
 msgid "Print this event"
 msgstr "Imprime cet ÃvÃnement"
 
-#: ../calendar/gui/dialogs/event-page.c:765
+#: ../calendar/gui/dialogs/event-page.c:558
 msgid "Event's start time is in the past"
 msgstr "Le dÃbut de l'ÃvÃnement est passÃ"
 
-#: ../calendar/gui/dialogs/event-page.c:806
+#: ../calendar/gui/dialogs/event-page.c:635
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Cet ÃvÃnement ne peut pas Ãtre modifià car le calendrier sÃlectionnà est en "
 "lecture seule"
 
-#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:639
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Vous ne pouvez pas modifier tous les ÃlÃments de cet ÃvÃnement car vous "
 "n'Ãtes pas l'organisateur"
 
-#: ../calendar/gui/dialogs/event-page.c:822
-#: ../calendar/gui/dialogs/event-page.c:2780
-msgid "This event has alarms"
-msgstr "Cet ÃvÃnement possÃde des alarmes"
+#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:3049
+msgid "This event has reminders"
+msgstr "Cet ÃvÃnement possÃde des rappels"
 
-#: ../calendar/gui/dialogs/event-page.c:889
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganisateurÂ:"
 
-#: ../calendar/gui/dialogs/event-page.c:936
-msgid "_Delegatees"
-msgstr "_DÃlÃguÃs"
-
-#: ../calendar/gui/dialogs/event-page.c:938
-msgid "Atte_ndees"
-msgstr "Participa_nts"
-
-#: ../calendar/gui/dialogs/event-page.c:1155
+#: ../calendar/gui/dialogs/event-page.c:1262
 msgid "Event with no start date"
 msgstr "ÃvÃnement sans date de dÃbut"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1265
 msgid "Event with no end date"
 msgstr "ÃvÃnement sans date de fin"
 
-#: ../calendar/gui/dialogs/event-page.c:1329
-#: ../calendar/gui/dialogs/memo-page.c:671
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:707
+#: ../calendar/gui/dialogs/task-page.c:819
 msgid "Start date is wrong"
 msgstr "La date de dÃbut est erronÃe"
 
-#: ../calendar/gui/dialogs/event-page.c:1339
+#: ../calendar/gui/dialogs/event-page.c:1448
 msgid "End date is wrong"
 msgstr "La date de fin est erronÃe"
 
-#: ../calendar/gui/dialogs/event-page.c:1362
+#: ../calendar/gui/dialogs/event-page.c:1471
 msgid "Start time is wrong"
 msgstr "L'heure de dÃbut est erronÃe"
 
-#: ../calendar/gui/dialogs/event-page.c:1369
+#: ../calendar/gui/dialogs/event-page.c:1478
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronÃe"
 
-#: ../calendar/gui/dialogs/event-page.c:1533
-#: ../calendar/gui/dialogs/memo-page.c:712
-#: ../calendar/gui/dialogs/task-page.c:967
-msgid "The organizer selected no longer has an account."
-msgstr "L'organisateur sÃlectionnà n'a plus de compte."
-
-#: ../calendar/gui/dialogs/event-page.c:1539
-#: ../calendar/gui/dialogs/memo-page.c:718
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1643
+#: ../calendar/gui/dialogs/memo-page.c:748
+#: ../calendar/gui/dialogs/task-page.c:873
 msgid "An organizer is required."
 msgstr "Un organisateur est nÃcessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:1564
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1677
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nÃcessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:2654
+#: ../calendar/gui/dialogs/event-page.c:1878
+msgid "_Delegatees"
+msgstr "_DÃlÃguÃs"
+
+#: ../calendar/gui/dialogs/event-page.c:1880
+msgid "Atte_ndees"
+msgstr "Participa_nts"
+
+#: ../calendar/gui/dialogs/event-page.c:2892
 #, c-format
-msgid "Unable to open the calendar '%s'."
-msgstr "Impossible d'ouvrir le calendrier ÂÂ%sÂÂ."
+msgid "Unable to open the calendar '%s': %s"
+msgstr "Impossible d'ouvrir le calendrier ÂÂ%sÂÂÂ: %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3062,79 +3100,79 @@ msgstr "Impossible d'ouvrir le calendrier ÂÂ%sÂÂ."
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2698
-#: ../calendar/gui/dialogs/memo-page.c:931
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/memo-page.c:1006
+#: ../calendar/gui/dialogs/task-page.c:1814
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3009
+#: ../calendar/gui/dialogs/event-page.c:3278
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d jour avant le rendez-vous"
 msgstr[1] "%d jours avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3015
+#: ../calendar/gui/dialogs/event-page.c:3284
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3290
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
 
-#: ../calendar/gui/dialogs/event-page.c:3040
+#: ../calendar/gui/dialogs/event-page.c:3309
 msgid "Customize"
 msgstr "Personnaliser"
 
-#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3046
-msgctxt "cal-alarms"
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/dialogs/event-page.c:3315
+msgctxt "cal-reminders"
 msgid "None"
-msgstr "Aucune"
+msgstr "Aucun"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "Participa_nts..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "Alarme personnalisÃeÂ:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "Rappel personnalisÃÂ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Description de l'ÃvÃnement"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Fuseau _horaireÂ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarme"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:343
+#: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_DescriptionÂ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-#: ../plugins/calendar-weather/calendar-weather.c:362
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "_EmplacementÂ:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "_Rappel"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "RÃ_sumÃÂ:"
@@ -3143,19 +3181,19 @@ msgstr "RÃ_sumÃÂ:"
 msgid "_Time:"
 msgstr "_HeureÂ:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 jour avant le rendez-vous"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 heure avant le rendez-vous"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3173,46 +3211,103 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "jusqu'au"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3176
-msgid "Memo"
-msgstr "MÃmo"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
+msgid "April"
+msgstr "Avril"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
-msgid "Print this memo"
-msgstr "Imprime ce mÃmo"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
+msgid "August"
+msgstr "AoÃt"
 
-#: ../calendar/gui/dialogs/memo-page.c:337
-msgid "Memo's start date is in the past"
-msgstr "Le deÌbut du mÃmo est passeÌ"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
+msgid "December"
+msgstr "DÃcembre"
 
-#: ../calendar/gui/dialogs/memo-page.c:375
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr ""
-"Ce mÃmo ne peut pas Ãtre entiÃrement modifià car la liste sÃlectionnÃe est "
-"en lecture seule"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
+msgid "February"
+msgstr "FÃvrier"
 
-#: ../calendar/gui/dialogs/memo-page.c:379
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "Ce mÃmo ne peut pas Ãtre modifià car vous n'Ãtes pas l'organisateur"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
+msgid "January"
+msgstr "Janvier"
 
-#: ../calendar/gui/dialogs/memo-page.c:892
-#, c-format
-msgid "Unable to open memos in '%s'."
-msgstr "Impossible d'ouvrir les mÃmos dans ÂÂ%sÂÂ."
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
+msgid "July"
+msgstr "Juillet"
 
-#: ../calendar/gui/dialogs/memo-page.c:1063 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2396
-#: ../mail/em-format-html.c:2461 ../mail/em-format-html.c:2485
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
-msgid "To"
-msgstr "Ã"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "June"
+msgstr "Juin"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "Date de _dÃbutÂ:"
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
+msgid "March"
+msgstr "Mars"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
+msgid "May"
+msgstr "Mai"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
+msgid "November"
+msgstr "Novembre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "October"
+msgstr "Octobre"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "Select Date"
+msgstr "SÃlectionnez une date"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "Select _Today"
+msgstr "SÃlectionner au_jourd'hui"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
+msgid "September"
+msgstr "Septembre"
+
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
+msgid "Memo"
+msgstr "MÃmo"
+
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "Imprime ce mÃmo"
+
+#: ../calendar/gui/dialogs/memo-page.c:405
+msgid "Memo's start date is in the past"
+msgstr "Le deÌbut du mÃmo est passeÌ"
+
+#: ../calendar/gui/dialogs/memo-page.c:442
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr ""
+"Ce mÃmo ne peut pas Ãtre entiÃrement modifià car la liste sÃlectionnÃe est "
+"en lecture seule"
+
+#: ../calendar/gui/dialogs/memo-page.c:446
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Ce mÃmo ne peut pas Ãtre modifià car vous n'Ãtes pas l'organisateur"
+
+#: ../calendar/gui/dialogs/memo-page.c:930
+#, c-format
+msgid "Unable to open memos in '%s': %s"
+msgstr "Impossible d'ouvrir les mÃmos dans ÂÂ%sÂÂÂ: %s"
+
+#: ../calendar/gui/dialogs/memo-page.c:1138 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+msgid "To"
+msgstr "Ã"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
+msgid "Sta_rt date:"
+msgstr "Date de _dÃbutÂ:"
+
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
 #: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "_RÃsumÃÂ:"
@@ -3222,10 +3317,10 @@ msgid "T_o:"
 msgstr "_ÃÂ:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:422
+#: ../calendar/gui/dialogs/task-page.c:333
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_GroupeÂ:"
+msgid "_List:"
+msgstr "_ListeÂ:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3270,21 +3365,21 @@ msgstr "Cette instance et celles à venir"
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des rÃcurrences qu'Evolution ne peut Ãditer."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:895
+#: ../calendar/gui/dialogs/recurrence-page.c:968
 msgid "Recurrence date is invalid"
 msgstr "La date de la rÃcurrence n'est pas valide"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:935
+#: ../calendar/gui/dialogs/recurrence-page.c:1008
 msgid "End time of the recurrence was before event's start"
 msgstr "L'heure de fin de la rÃcurrence est antÃrieure au dÃbut de l'ÃvÃnement"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:965
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "on"
 msgstr "le"
 
@@ -3292,7 +3387,7 @@ msgstr "le"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1023
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
 msgid "first"
 msgstr "premiÃre"
 
@@ -3301,7 +3396,7 @@ msgstr "premiÃre"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1102
 msgid "second"
 msgstr "seconde"
 
@@ -3309,7 +3404,7 @@ msgstr "seconde"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1107
 msgid "third"
 msgstr "troisiÃme"
 
@@ -3317,7 +3412,7 @@ msgstr "troisiÃme"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "fourth"
 msgstr "quatriÃme"
 
@@ -3325,7 +3420,7 @@ msgstr "quatriÃme"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 msgid "fifth"
 msgstr "cinquiÃme"
 
@@ -3333,13 +3428,13 @@ msgstr "cinquiÃme"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "last"
 msgstr "dernier"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1146
 msgid "Other Date"
 msgstr "Autre date"
 
@@ -3347,7 +3442,7 @@ msgstr "Autre date"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1079
+#: ../calendar/gui/dialogs/recurrence-page.c:1152
 msgid "1st to 10th"
 msgstr "1er au 10"
 
@@ -3355,7 +3450,7 @@ msgstr "1er au 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1158
 msgid "11th to 20th"
 msgstr "11 au 20"
 
@@ -3363,48 +3458,41 @@ msgstr "11 au 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1164
 msgid "21st to 31st"
 msgstr "21 au 31"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-msgid "day"
-msgstr "jour"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Lundi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Vendredi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1196
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Dimanche"
@@ -3412,33 +3500,33 @@ msgstr "Dimanche"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1245
+#: ../calendar/gui/dialogs/recurrence-page.c:1318
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1492
 msgid "occurrences"
 msgstr "occurrences"
 
 # pas certain de la traduction. Ãa peut Ãtre aussi exclusion ...
-#: ../calendar/gui/dialogs/recurrence-page.c:2123
+#: ../calendar/gui/dialogs/recurrence-page.c:2204
 msgid "Add exception"
 msgstr "Ajouter une exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2164
+#: ../calendar/gui/dialogs/recurrence-page.c:2245
 msgid "Could not get a selection to modify."
 msgstr "Impossible d'obtenir une sÃlection à modifier."
 
 # idem add exception
-#: ../calendar/gui/dialogs/recurrence-page.c:2170
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Modify exception"
 msgstr "Modifier l'exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2295
 msgid "Could not get a selection to delete."
 msgstr "Impossible d'obtenir une sÃlection à dÃtruire."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2348
+#: ../calendar/gui/dialogs/recurrence-page.c:2429
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -3450,7 +3538,7 @@ msgstr "Tous les"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
 msgid "Preview"
 msgstr "AperÃu"
 
@@ -3501,29 +3589,29 @@ msgid "year(s)"
 msgstr "annÃe(s)"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "Envoyer mes alarmes avec cet ÃvÃnement"
+msgid "Send my reminders with this event"
+msgstr "Envoyer mes rappels avec cet ÃvÃnement"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
 msgstr "Avertir _uniquement les nouveaux participants"
 
-#: ../calendar/gui/dialogs/task-details-page.c:352
-#: ../calendar/gui/dialogs/task-details-page.c:374
+#: ../calendar/gui/dialogs/task-details-page.c:351
+#: ../calendar/gui/dialogs/task-details-page.c:373
 msgid "Completed date is wrong"
 msgstr "La date d'achÃvement est erronÃe"
 
-#: ../calendar/gui/dialogs/task-details-page.c:486
+#: ../calendar/gui/dialogs/task-details-page.c:488
 msgid "Web Page"
 msgstr "Page Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-component-preview.c:300
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3531,59 +3619,59 @@ msgstr "AnnulÃ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:595 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "AchevÃe"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1228 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1223 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Haute"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3256
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "En cours"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1221 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Basse"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model.c:1521 ../calendar/gui/e-task-table.c:517
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1227
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1222
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normale"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:593
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non dÃmarrÃe"
 
@@ -3600,7 +3688,7 @@ msgstr "Ã_tatÂ:"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:596
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -3609,7 +3697,7 @@ msgstr "Ãtat"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "IndÃfinie"
@@ -3627,65 +3715,64 @@ msgstr "_PrioritÃÂ:"
 msgid "_Web Page:"
 msgstr "Page _WebÂ:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "DÃtails de l'Ã_tat"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "Cliquer pour modifier ou afficher les dÃtails de l'Ãtat de la tÃche"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
-#: ../plugins/groupwise-features/mail-send-options.c:200
+#: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
 msgstr "Options d'_envoi"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "TÃche"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "DÃtails de la tÃche"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
 msgstr "Imprime cette tÃche"
 
-#: ../calendar/gui/dialogs/task-page.c:339
+#: ../calendar/gui/dialogs/task-page.c:251
 msgid "Task's start date is in the past"
 msgstr "Le deÌbut de la tÃche est passeÌ"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:252
 msgid "Task's due date is in the past"
 msgstr "L'ÃchÃance de la taÌche est passeÌe"
 
-#: ../calendar/gui/dialogs/task-page.c:375
+#: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
 "Cette tÃche ne peut pas Ãtre modifiÃe car la liste de tÃches sÃlectionnÃe "
 "est en lecture seule"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr ""
 "Cette tÃche ne peut pas Ãtre entiÃrement modifiÃe car vous n'Ãtes pas "
 "l'organisateur"
 
-#: ../calendar/gui/dialogs/task-page.c:430
+#: ../calendar/gui/dialogs/task-page.c:341
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_sateurÂ:"
 
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/task-page.c:801
 msgid "Due date is wrong"
 msgstr "La date d'ÃchÃance est erronÃe"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, c-format
-msgid "Unable to open tasks in '%s'."
-msgstr "Impossible d'ouvrir les tÃches dans ÂÂ%sÂÂ."
+msgid "Unable to open tasks in '%s': %s"
+msgstr "Impossible d'ouvrir les tÃches dans ÂÂ%sÂÂÂ: %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3700,7 +3787,7 @@ msgid "Time zone:"
 msgstr "Fuseau horaireÂ:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/e-alarm-list.c:384
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3708,116 +3795,116 @@ msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:387
+#: ../calendar/gui/e-alarm-list.c:390
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:452
 msgid "Unknown action to be performed"
 msgstr "Action inconnue à exÃcuter"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s avant le dÃbut du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s aprÃs le dÃbut du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s au dÃbut du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:486
+#: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s avant la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s aprÃs la fin du rendez-vous"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s à la fin du rendez-vous"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:522
+#: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
 msgstr "%s à %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:530
+#: ../calendar/gui/e-alarm-list.c:533
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: ../calendar/gui/e-cal-component-preview.c:188 ../filter/e-filter-rule.c:667
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../calendar/gui/e-cal-component-preview.c:194
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "CatÃgoriesÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "RÃsumÃÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "Date de dÃbutÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Date d'ÃchÃanceÂ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:284
-#: ../plugins/itip-formatter/itip-view.c:1075
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "ÃtatÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "PrioritÃÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "DescriptionÂ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Page WebÂ:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "CrÃÃ"
 
@@ -3837,12 +3924,12 @@ msgid "Start Date"
 msgstr "Date de dÃbut"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:570
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "OccupÃ"
 
@@ -3862,39 +3949,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Aucune"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1027
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
+#: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1527
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:98
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2485
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
+#: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:462
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:1523
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "RÃcurrent"
 
-#: ../calendar/gui/e-cal-model.c:1525
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "AttribuÃ"
 
-#: ../calendar/gui/e-cal-model.c:2643
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
@@ -3922,7 +4009,7 @@ msgstr "Date d'ÃchÃance"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "PrioritÃ"
 
@@ -3931,64 +4018,64 @@ msgid "Start date"
 msgstr "Date de dÃbut"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:559
+#: ../calendar/gui/e-meeting-list-view.c:573
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:580
+#: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:422
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Cut selected events to the clipboard"
 msgstr "Coupe les ÃvÃnements sÃlectionnÃs vers le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:428
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Copy selected events to the clipboard"
 msgstr "Copie les ÃvÃnements sÃlectionnÃs dans le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Paste events from the clipboard"
 msgstr "Colle les ÃvÃnements depuis le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Delete selected events"
 msgstr "Supprime les ÃvÃnements sÃlectionnÃs"
 
-#: ../calendar/gui/e-calendar-view.c:459 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:261
+#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sÃlectionnÃs"
 
-#: ../calendar/gui/e-calendar-view.c:653 ../calendar/gui/e-memo-table.c:855
-#: ../calendar/gui/e-task-table.c:1084
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-task-table.c:1094
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
 #: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../plugins/itip-formatter/itip-formatter.c:2473
+#: ../calendar/gui/e-meeting-list-view.c:213
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "AcceptÃ"
 
 #: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../plugins/itip-formatter/itip-formatter.c:2479
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "RefusÃ"
 
 #: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "Provisoire"
 
 #: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../plugins/itip-formatter/itip-formatter.c:2482
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "DÃlÃguÃ"
 
@@ -3997,23 +4084,25 @@ msgid "Needs action"
 msgstr "NÃcessite une action"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:538
-#: ../calendar/gui/e-task-table.c:759
+#. To Translators: It will display
+#. * "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "OrganisateurÂ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:543
-#: ../calendar/gui/e-task-table.c:762
+#. With SunOne accounts, there may be no ':' in
+#. * organizer.value.
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "OrganisateurÂ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "LieuÂ: %s"
@@ -4047,27 +4136,27 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:745
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
 
-#: ../calendar/gui/e-day-view-time-item.c:766
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Afficher le second fuseau horaire"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:783
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:175
-#: ../modules/calendar/e-calendar-preferences.c:224
+#: ../calendar/gui/e-day-view-time-item.c:844
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Aucune"
 
-#: ../calendar/gui/e-day-view-time-item.c:810
-#: ../calendar/gui/e-timezone-entry.c:316
-#: ../modules/calendar/e-calendar-preferences.c:251
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "SÃlectionner..."
 
@@ -4077,8 +4166,8 @@ msgstr "SÃlectionner..."
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:841 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:208 ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1875
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4088,10 +4177,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:845 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:1005
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:224
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4100,24 +4189,24 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:849 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1041
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:234
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:756
+#: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
+#: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
+#: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
+#: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
 msgstr "pm"
 
@@ -4143,87 +4232,95 @@ msgstr "Participants optionnels"
 msgid "Resources"
 msgstr "Ressources"
 
-#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/e-meeting-store.c:1022 ../calendar/gui/print.c:1094
 msgid "Individual"
 msgstr "Individuel"
 
-#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1095 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Groupe"
 
-#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1090
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1096
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1091
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1097
 msgid "Room"
 msgstr "Salle"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1105
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/print.c:1111
 msgid "Chair"
 msgstr "PrÃsident"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:1025 ../calendar/gui/print.c:1112
 msgid "Required Participant"
 msgstr "Participant attendu"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1107
+#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1113
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1108
+#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1114
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1034
+#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:1035
 msgid "Needs Action"
 msgstr "NÃcessite une action"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:539
+#: ../calendar/gui/e-meeting-list-view.c:553
 msgid "Attendee                          "
 msgstr "Participant                          "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
 msgid "In Process"
 msgstr "En cours"
 
-#: ../calendar/gui/e-meeting-store.c:1763
+#: ../calendar/gui/e-meeting-store.c:1841
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Saisissez le mot de passe pour accÃder à l'information libre/occupà sur le "
 "serveur %s en tant qu'utilisateur %s"
 
-#: ../calendar/gui/e-meeting-store.c:1772
+#: ../calendar/gui/e-meeting-store.c:1851
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Cause de l'ÃchecÂ: %s"
 
+#: ../calendar/gui/e-meeting-store.c:1856
+#: ../plugins/caldav/caldav-browse-server.c:920
+#: ../plugins/google-account-setup/google-source.c:448
+#: ../plugins/publish-calendar/publish-calendar.c:332
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "Saisissez le mot de passe"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:431
@@ -4330,47 +4427,47 @@ msgstr "Langue"
 msgid "Member"
 msgstr "Membre"
 
-#: ../calendar/gui/e-memo-table.c:419
-#: ../modules/calendar/e-cal-shell-content.c:469
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:438
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
+#: ../modules/calendar/e-memo-shell-view.c:293
+#: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "MÃmos"
 
-#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:723
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* Aucun rÃsumà *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:808
 msgid "Start: "
 msgstr "DÃbutÂ: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:826
 msgid "Due: "
 msgstr "ÃchÃanceÂ: "
 
-#: ../calendar/gui/e-memo-table.c:720
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Cut selected memos to the clipboard"
 msgstr "Coupe les mÃmos sÃlectionnÃs vers le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Copy selected memos to the clipboard"
 msgstr "Copie les mÃmos sÃlectionnÃs vers le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:738
 msgid "Paste memos from the clipboard"
 msgstr "Colle les mÃmos depuis le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:738
-#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../calendar/gui/e-memo-table.c:744
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
 msgstr "Supprime les mÃmos sÃlectionnÃs"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:750
 msgid "Select all visible memos"
 msgstr "SÃlectionne tous les mÃmos visibles"
 
@@ -4382,112 +4479,110 @@ msgstr "Cliquez ici pour ajouter un mÃmo"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:545
+#: ../calendar/gui/e-task-table.c:546
 #, c-format
 msgid "%d%%"
 msgstr "%dÂ%%"
 
-#: ../calendar/gui/e-task-table.c:642 ../calendar/gui/print.c:2159
-#: ../calendar/importers/icalendar-importer.c:81
-#: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:430
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:444
-#: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:428
-#: ../plugins/groupwise-features/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
+#: ../calendar/importers/icalendar-importer.c:85
+#: ../calendar/importers/icalendar-importer.c:1003
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
+#: ../modules/calendar/e-task-shell-view.c:448
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "TÃches"
 
-#: ../calendar/gui/e-task-table.c:949
+#: ../calendar/gui/e-task-table.c:959
 msgid "Cut selected tasks to the clipboard"
 msgstr "Coupe les tÃches sÃlectionnÃes vers le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:955
+#: ../calendar/gui/e-task-table.c:965
 msgid "Copy selected tasks to the clipboard"
 msgstr "Copie les tÃches sÃlectionnÃes dans le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:961
+#: ../calendar/gui/e-task-table.c:971
 msgid "Paste tasks from the clipboard"
 msgstr "Colle les tÃches depuis le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:967
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../calendar/gui/e-task-table.c:977
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
 msgstr "Supprime les tÃches sÃlectionnÃes"
 
-#: ../calendar/gui/e-task-table.c:973
+#: ../calendar/gui/e-task-table.c:983
 msgid "Select all visible tasks"
 msgstr "SÃlectionne toutes les tÃches visibles"
 
-#: ../calendar/gui/e-timezone-entry.c:327
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "SÃlectionner un fuseau horaire"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:225 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1856
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:286
-msgid "It has alarms."
-msgstr "Il possÃde des alarmes."
+#: ../calendar/gui/ea-cal-view-event.c:290
+msgid "It has reminders."
+msgstr "Il possÃde des rappels."
 
-#: ../calendar/gui/ea-cal-view-event.c:289
+#: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
 msgstr "Il possÃde des rÃcurrences."
 
-#: ../calendar/gui/ea-cal-view-event.c:292
+#: ../calendar/gui/ea-cal-view-event.c:296
 msgid "It is a meeting."
 msgstr "C'est une rÃunion."
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:303
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "ÃvÃnement du calendrierÂ: le rÃsumà est %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:306
 msgid "Calendar Event: It has no summary."
 msgstr "ÃvÃnement du calendrierÂ: il n'a pas de rÃsumÃ."
 
-#: ../calendar/gui/ea-cal-view-event.c:322
+#: ../calendar/gui/ea-cal-view-event.c:328
 msgid "calendar view event"
 msgstr "vue des ÃvÃnements du calendrier"
 
-#: ../calendar/gui/ea-cal-view-event.c:551
+#: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
 msgstr "Nouveau rendez-vous"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New All Day Event"
 msgstr "Nouvel ÃvÃnement toute la journÃe"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Meeting"
 msgstr "Nouvelle rÃunion"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "Go to Today"
 msgstr "Aller à aujourd'hui"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Date"
 msgstr "Aller à la date"
 
-#: ../calendar/gui/ea-day-view-main-item.c:308
-#: ../calendar/gui/ea-week-view-main-item.c:340
+#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "un tableau pour consulter et sÃlectionner l'intervalle de temps actuel"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4496,14 +4591,14 @@ msgstr[1] "Il possÃde %d ÃvÃnements."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
 msgid "It has no events."
 msgstr "Il ne possÃde pas d'ÃvÃnements."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:160
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vue hebdomadaire de travailÂ: %s. %s"
@@ -4511,163 +4606,106 @@ msgstr "Vue hebdomadaire de travailÂ: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:166
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vue journaliÃreÂ: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:200
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "vue du calendrier pour une semaine de travail"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:860
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:1001
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:1008
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1034
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
-#: ../calendar/gui/ea-jump-button.c:147
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Bouton du saut"
 
-#: ../calendar/gui/ea-jump-button.c:156
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Cliquez ici, vous pourrez trouver plus d'ÃvÃnements."
 
-#: ../calendar/gui/ea-week-view.c:155
+#: ../calendar/gui/ea-week-view.c:159
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vue mensuelleÂ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vue hebdomadaireÂ: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:193
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for a month"
 msgstr "vue du calendrier pour un mois"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:199
 msgid "calendar view for one or more weeks"
 msgstr "vue du calendrier pour une ou plusieurs semaines"
 
-#: ../calendar/gui/gnome-cal.c:2198
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "Nettoyage"
 
-#: ../calendar/gui/goto-dialog.ui.h:1
-msgid "April"
-msgstr "Avril"
-
-#: ../calendar/gui/goto-dialog.ui.h:2
-msgid "August"
-msgstr "AoÃt"
-
-#: ../calendar/gui/goto-dialog.ui.h:3
-msgid "December"
-msgstr "DÃcembre"
-
-#: ../calendar/gui/goto-dialog.ui.h:4
-msgid "February"
-msgstr "FÃvrier"
-
-#: ../calendar/gui/goto-dialog.ui.h:5
-msgid "January"
-msgstr "Janvier"
-
-#: ../calendar/gui/goto-dialog.ui.h:6
-msgid "July"
-msgstr "Juillet"
-
-#: ../calendar/gui/goto-dialog.ui.h:7
-msgid "June"
-msgstr "Juin"
-
-#: ../calendar/gui/goto-dialog.ui.h:8
-msgid "March"
-msgstr "Mars"
-
-#: ../calendar/gui/goto-dialog.ui.h:9
-msgid "May"
-msgstr "Mai"
-
-#: ../calendar/gui/goto-dialog.ui.h:10
-msgid "November"
-msgstr "Novembre"
-
-#: ../calendar/gui/goto-dialog.ui.h:11
-msgid "October"
-msgstr "Octobre"
-
-#: ../calendar/gui/goto-dialog.ui.h:12
-msgid "Select Date"
-msgstr "SÃlectionnez une date"
-
-#: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
-msgid "Select _Today"
-msgstr "SÃlectionner au_jourd'hui"
-
-#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "September"
-msgstr "Septembre"
-
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
-#: ../calendar/gui/itip-utils.c:573
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "Un organisateur doit Ãtre dÃfini."
 
-#: ../calendar/gui/itip-utils.c:469
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nÃcessaire"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
 msgstr "Informations de l'ÃvÃnement"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
 msgstr "Informations de la tÃche"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "Informations du mÃmo"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
 msgstr "Information Libre/OccupÃ"
 
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
@@ -4675,7 +4713,7 @@ msgstr "Informations du calendrier"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "AcceptÃe"
@@ -4684,7 +4722,7 @@ msgstr "AcceptÃe"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "AcceptÃe provisoirement"
@@ -4696,7 +4734,7 @@ msgstr "AcceptÃe provisoirement"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "RefusÃe"
@@ -4705,7 +4743,7 @@ msgstr "RefusÃe"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "DÃlÃguÃe"
@@ -4713,7 +4751,7 @@ msgstr "DÃlÃguÃe"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Mise à jour"
@@ -4721,7 +4759,7 @@ msgstr "Mise à jour"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:747
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "AnnulÃe"
@@ -4729,7 +4767,7 @@ msgstr "AnnulÃe"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ActualisÃe"
@@ -4737,241 +4775,254 @@ msgstr "ActualisÃe"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/Occupà (%s à %s)"
 
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:969
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Impossible de rÃserver une ressource, le nouvel ÃvÃnement est en conflit "
 "avec un autre."
 
-#: ../calendar/gui/itip-utils.c:869
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
 msgstr "Impossible de rÃserver une ressource, l'erreur estÂ: "
 
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "Vous devez Ãtre inscrit comme participant à l'ÃvÃnement."
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:548
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:549
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:550
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:551
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:552
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:553
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:555
+#: ../calendar/gui/print.c:554
 msgid "31st"
 msgstr "31"
 
-#: ../calendar/gui/print.c:612
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:611
 msgid "Su"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:611
 msgid "We"
 msgstr "Me"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Th"
 msgstr "Je"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:613
+#: ../calendar/gui/print.c:612
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:3001
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " Ã "
 
-#: ../calendar/gui/print.c:3011
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (terminà "
 
-#: ../calendar/gui/print.c:3017
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "Terminà "
 
-#: ../calendar/gui/print.c:3027
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr " (date d'ÃchÃance "
 
-#: ../calendar/gui/print.c:3034
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "Date d'ÃchÃance "
 
-#: ../calendar/gui/print.c:3199
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "RÃsumÃÂ: %s"
 
-#: ../calendar/gui/print.c:3226
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "ParticipantsÂ: "
 
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "ÃtatÂ: %s"
 
-#: ../calendar/gui/print.c:3284
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "PrioritÃÂ: %s"
 
-#: ../calendar/gui/print.c:3302
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage effectuÃÂ: %i"
 
-#: ../calendar/gui/print.c:3313
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "URLÂ: %s"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "CatÃgoriesÂ: %s"
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "ContactsÂ: "
 
@@ -4980,6 +5031,10 @@ msgstr "ContactsÂ: "
 msgid "% Completed"
 msgstr "% effectuÃ"
 
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Cancelled"
+msgstr "AnnulÃ"
+
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "En cours"
@@ -4992,185 +5047,185 @@ msgstr "est supÃrieur Ã"
 msgid "is less than"
 msgstr "est infÃrieur Ã"
 
-#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:84
 msgid "Appointments and Meetings"
 msgstr "Rendez-vous et rÃunions"
 
-#: ../calendar/importers/icalendar-importer.c:350
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1958
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:493
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
 msgstr "Fichiers iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:494
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
 msgstr "Assistant d'importation iCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "RappelÂ!"
 
-#: ../calendar/importers/icalendar-importer.c:662
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
 msgstr "Fichiers vCalendar (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:663
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
 msgstr "Assistant d'importation vCalendar d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:823
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
 msgstr "ÃvÃnements du calendrier"
 
-#: ../calendar/importers/icalendar-importer.c:861
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
 msgstr "Assistant d'importation intelligent du calendrier d'Evolution"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "RÃunion"
 
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ÃvÃnement"
 
-#: ../calendar/importers/icalendar-importer.c:929
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "TÃche"
 
-#: ../calendar/importers/icalendar-importer.c:932
-#: ../calendar/importers/icalendar-importer.c:1245
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "MÃmo"
 
-#: ../calendar/importers/icalendar-importer.c:941
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "possÃde des rÃcurrences"
 
-#: ../calendar/importers/icalendar-importer.c:946
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "est une instance"
 
-#: ../calendar/importers/icalendar-importer.c:951
+#: ../calendar/importers/icalendar-importer.c:1126
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "possÃde des alarmes"
+msgid "has reminders"
+msgstr "possÃde des rappels"
 
-#: ../calendar/importers/icalendar-importer.c:956
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "possÃde des piÃces jointes"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:969
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Public"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:972
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "PriveÌ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:975
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Confidentiel"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:979
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Classification"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:984
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ReÌsumeÌ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:990
+#: ../calendar/importers/icalendar-importer.c:1165
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Emplacement"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:998
-#: ../calendar/importers/icalendar-importer.c:1280
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "DÃbut"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1009
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ÃchÃance"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1021
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Fin"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1031
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "CatÃgories"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "AcheveÌe"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1063
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1074
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisateur"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1097
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Participants"
 
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Description"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Type"
@@ -6724,170 +6779,165 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: ../composer/e-composer-actions.c:204
+#: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../composer/e-composer-actions.c:287
-#: ../widgets/misc/e-attachment-view.c:377
-msgid "Attach a file"
-msgstr "Joindre un fichier"
-
-#: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:296
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:303
 msgid "New _Message"
 msgstr "Nouveau _message"
 
-#: ../composer/e-composer-actions.c:301
+#: ../composer/e-composer-actions.c:305
 msgid "Open New Message window"
 msgstr "Ouvre la fenÃtre Nouveau message"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Configurer Evolution"
 
-#: ../composer/e-composer-actions.c:315
+#: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
 msgstr "Enregistre le fichier actuel"
 
-#: ../composer/e-composer-actions.c:320
+#: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
 msgstr "Enregistre le fichier actuel avec un nom diffÃrent"
 
-#: ../composer/e-composer-actions.c:329
+#: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
 msgstr "_Codage des caractÃres"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:350
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:357
 msgid "Print Pre_view"
 msgstr "_AperÃu avant impression"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:364
 msgid "Save as _Draft"
 msgstr "Enregistrer comme _brouillon"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
 msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
 msgstr "E_nvoyer"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:373
 msgid "Send this message"
 msgstr "Envoie ce message"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
 msgstr "_Chiffrer avec PGP"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
 msgstr "Chiffre ce message avec PGP"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
 msgstr "_Signer avec PGP"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
 msgstr "Signe ce message avec votre clà PGP"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
 msgstr "_Galerie d'images"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Affiche un ensemble d'images qui peuvent Ãtre dÃposÃes dans votre message"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
 msgstr "_Prioriser le message"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:407
 msgid "Set the message priority to high"
 msgstr "Affecte une priorità ÃlevÃe au message"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:413
 msgid "Re_quest Read Receipt"
 msgstr "D_emander un accusà de lecture"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:415
 msgid "Get delivery notification when your message is read"
 msgstr "Obtenir un avertissement quand votre message est lu"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
 msgstr "C_hiffrer avec S/MIME"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Chiffre ce message avec votre certificat de chiffrement S/MIME"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
 msgstr "S_igner avec S/MIME"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signe ce message avec votre certificat de signature S/MIME"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
 msgstr "Champ Cc_i"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Indique si le champ Cci est affichÃ"
 
-#: ../composer/e-composer-actions.c:441
+#: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
 msgstr "Champ _Cc"
 
-#: ../composer/e-composer-actions.c:443
+#: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
 msgstr "Indique si le champ Cc est affichÃ"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
 msgstr "Champ _RÃpondre Ã"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Indique si le champ RÃpondre à est affichÃ"
 
-#: ../composer/e-composer-actions.c:510
+#: ../composer/e-composer-actions.c:514
 msgid "Save Draft"
 msgstr "Enregistrer le brouillon"
 
-#: ../composer/e-composer-header-table.c:36
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-composer-header-table.c:38
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6895,67 +6945,67 @@ msgstr ""
 "Saisissez les adresses qui recevront une copie du message sans apparaÃtre "
 "dans la liste des destinataires du message"
 
-#: ../composer/e-composer-header-table.c:1004
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "_DeÂ:"
 
-#: ../composer/e-composer-header-table.c:1013
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_RÃpondre ÃÂ:"
 
-#: ../composer/e-composer-header-table.c:1017
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_ÃÂ:"
 
-#: ../composer/e-composer-header-table.c:1022
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
 msgstr "_CcÂ:"
 
-#: ../composer/e-composer-header-table.c:1027
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
 msgstr "Cc_iÂ:"
 
-#: ../composer/e-composer-header-table.c:1032
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
 msgstr "_Poster ÃÂ:"
 
-#: ../composer/e-composer-header-table.c:1036
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "_SujetÂ:"
 
-#: ../composer/e-composer-header-table.c:1045
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Si_gnatureÂ:"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
-#: ../composer/e-composer-post-header.c:127
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "Cliquez ici pour sÃlectionner les dossiers de destination"
 
-#: ../composer/e-composer-private.c:245
+#: ../composer/e-composer-private.c:249
 msgid "Undo the last action"
 msgstr "Annule la derniÃre action"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:253
 msgid "Redo the last undone action"
 msgstr "RÃtablit la derniÃre action annulÃe"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:257
 msgid "Search for text"
 msgstr "Recherche de texte"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:261
 msgid "Search for and replace text"
 msgstr "Recherche et remplacement de texte"
 
-#: ../composer/e-composer-private.c:367
+#: ../composer/e-composer-private.c:372
 msgid "Save draft"
 msgstr "Enregistrer le brouillon"
 
-#: ../composer/e-msg-composer.c:784
+#: ../composer/e-msg-composer.c:808
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6963,7 +7013,7 @@ msgstr ""
 "Impossible de signer le message sortantÂ: aucun certificat de signature "
 "dÃfini pour ce compte"
 
-#: ../composer/e-msg-composer.c:793
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6972,17 +7022,17 @@ msgstr ""
 "Impossible de chiffrer le message sortantÂ: aucun certificat de chiffrement "
 "dÃfini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "RÃdaction d'un message"
 
-#: ../composer/e-msg-composer.c:4116
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "L'Ãditeur contient un corps de message non textuel qui ne peut pas Ãtre "
 "ÃditÃ."
 
-#: ../composer/e-msg-composer.c:4821
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "Message sans sujet"
 
@@ -7102,7 +7152,7 @@ msgstr ""
 "Le fichier ÂÂ{0} n'est pas un fichier rÃgulier et ne peut pas Ãtre envoyà "
 "dans un message."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "L'erreur signalÃe Ãtait ÂÂ{0}ÂÂ."
 
@@ -7157,27 +7207,15 @@ msgstr "Enregi_strer dans la boÃte d'envoi"
 msgid "_Try Again"
 msgstr "_Essayer à nouveau"
 
-#: ../capplet/anjal-settings-main.c:216
-msgid "Run Anjal in a window"
-msgstr "Lancer Anjal dans une fenÃtre"
-
-#: ../capplet/anjal-settings-main.c:217
-msgid "Make Anjal the default email client"
-msgstr "Faire de Anjal le client de messagerie par dÃfaut"
-
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:224
+#: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
 msgstr "Identifiant du socket dans lequel s'intÃgrer"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:154
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:238
-msgid "Anjal email client"
-msgstr "Client de messagerie Anjal"
-
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
 msgstr "Saisissez votre nom complet."
@@ -7195,63 +7233,65 @@ msgid "Please enter your password."
 msgstr "Saisissez votre mot de passe."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:66
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "DÃtails personnelsÂ:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "NomÂ:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "Adresse ÃlectroniqueÂ:"
 
-#: ../capplet/settings/mail-account-view.c:489
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
 msgstr "DÃtailsÂ:"
 
-#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
 msgstr "RÃception"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Type de serveurÂ:"
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "Adresse du serveurÂ:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "Nom d'utilisateurÂ:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Utiliser le chiffrementÂ:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "jamais"
 
-#: ../capplet/settings/mail-account-view.c:548
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
 msgstr "Envoi"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -7263,7 +7303,7 @@ msgstr ""
 "Si cela n'est pas possible, vous devrez alors encore saisir d'autres dÃtails "
 "de configuration."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:609
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -7274,12 +7314,12 @@ msgstr ""
 "paramÃtres ont Ãtà prÃ-remplis selon ce que vous avez dÃjà saisi, mais il "
 "est possible que vous deviez les modifier."
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr ""
 "Vous pouvez indiquez des options de configuration de compte supplÃmentaires."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -7288,11 +7328,11 @@ msgstr ""
 "sont prÃ-remplis par le logiciel, mais vous devez tout de mÃme vous assurer "
 "qu'ils sont corrects."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "Vous pouvez indiquer les paramÃtres par dÃfaut de votre compte."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -7300,100 +7340,100 @@ msgstr ""
 "Veuillez vÃrifier les paramÃtres avant que le logiciel essaye de se "
 "connecter au serveur pour rÃcupÃrer vos messages."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2090 ../mail/em-account-editor.c:2211
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2237 ../mail/em-account-editor.c:2370
 msgid "Identity"
 msgstr "IdentitÃ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
 msgstr "Suite - RÃception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "RÃception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
 msgstr "Suite - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
 msgstr "Retour - IdentitÃ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
 msgstr "Suite - Options de rÃception"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "Options de rÃception"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
 msgstr "Retour - RÃception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
 msgstr "Suite - VÃrification des paramÃtres"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
 msgstr "Suite - Valeurs par dÃfaut"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
 msgstr "Retour - Options de rÃception"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3042
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3317
 msgid "Defaults"
 msgstr "Valeurs par dÃfaut"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
 msgstr "Retour - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "VÃrification des paramÃtres du compte"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
 msgstr "Retour - Envoi"
 
-#: ../capplet/settings/mail-account-view.c:740
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
 msgstr "Configurer les contacts Google avec Evolution"
 
-#: ../capplet/settings/mail-account-view.c:741
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
 msgstr "Configurer le calendrier Google avec Evolution"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
 msgstr "Vous devez peut-Ãtre activer l'accÃs IMAP."
 
-#: ../capplet/settings/mail-account-view.c:754
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
 msgstr "ParamÃtres du compte GoogleÂ:"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurer le calendrier Yahoo avec Evolution"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:801
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7403,46 +7443,45 @@ msgstr ""
 "former le nom du calendrier. Confirmez ou corrigez le nom du calendrier s'il "
 "est incorrect."
 
-#: ../capplet/settings/mail-account-view.c:793
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
 msgstr "ParamÃtres du compte YahooÂ:"
 
-#: ../capplet/settings/mail-account-view.c:807
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
 msgstr "Nom du calendrier YahooÂ:"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "Mot de passeÂ:"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1145
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Fermer l'onglet"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "Assistant de compte"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Assistant de compte d'Evolution"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1721
-#: ../modules/addressbook/e-book-shell-backend.c:92
-#: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:103
-#: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:117
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:744 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
+#: ../mail/em-folder-tree-model.c:170
+#: ../modules/addressbook/e-book-shell-backend.c:100
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:102
+#: ../modules/calendar/e-memo-shell-migrate.c:109
+#: ../modules/calendar/e-task-shell-backend.c:102
+#: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
@@ -7471,9 +7510,9 @@ msgstr "Notifications des ÃvÃnements du calendrier"
 msgid "Evolution Alarm Notify"
 msgstr "Notification d'alarmes Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:952
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:253
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:996
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7481,7 +7520,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Messagerie et calendrier d'Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Suite de travail collaboratif"
 
@@ -7499,36 +7538,36 @@ msgid "Email Settings"
 msgstr "ParamÃtres de messagerie"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:223
+#: ../e-util/e-activity.c:227
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (annulÃ)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:226
+#: ../e-util/e-activity.c:230
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (effectuÃ)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:229
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (en attente)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:237
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (annulation en cours)"
 
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:244
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectuÃ)"
@@ -7611,26 +7650,26 @@ msgid "Visual"
 msgstr "Visuel"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
-#: ../widgets/table/e-cell-date-edit.c:308
+#: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Demain"
 
-#: ../e-util/e-datetime-format.c:209
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "Hier"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:217
+#: ../e-util/e-datetime-format.c:220
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Lun. prochain"
@@ -7638,7 +7677,7 @@ msgstr "Lun. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:223
+#: ../e-util/e-datetime-format.c:226
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Mar. prochain"
@@ -7646,7 +7685,7 @@ msgstr "Mar. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:229
+#: ../e-util/e-datetime-format.c:232
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Mer. prochain"
@@ -7654,7 +7693,7 @@ msgstr "Mer. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:235
+#: ../e-util/e-datetime-format.c:238
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Jeu. prochain"
@@ -7662,7 +7701,7 @@ msgstr "Jeu. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:241
+#: ../e-util/e-datetime-format.c:244
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Ven. prochain"
@@ -7670,7 +7709,7 @@ msgstr "Ven. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:247
+#: ../e-util/e-datetime-format.c:250
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sam. prochain"
@@ -7678,54 +7717,54 @@ msgstr "Sam. prochain"
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:253
+#: ../e-util/e-datetime-format.c:256
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Dim. prochain"
 
-#: ../e-util/e-datetime-format.c:335 ../e-util/e-datetime-format.c:345
-#: ../e-util/e-datetime-format.c:354
+#: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
+#: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
 msgstr "Utiliser les rÃglages locaux par dÃfaut"
 
-#: ../e-util/e-datetime-format.c:551
+#: ../e-util/e-datetime-format.c:554
 msgid "Format:"
 msgstr "FormatÂ:"
 
-#: ../e-util/e-file-utils.c:152
+#: ../e-util/e-file-utils.c:151
 msgid "(Unknown Filename)"
 msgstr "(nom de fichier inconnu)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:156
+#: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Ãcriture de ÂÂ%sÂÂ"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:161
+#: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Ãcriture de ÂÂ%sÂÂ vers %s"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:380
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "semaines"
 
-#: ../e-util/e-print.c:157
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Erreur durant l'impression"
 
-#: ../e-util/e-print.c:164
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr ""
 "Le systÃme d'impression a rapportà les informations suivantes sur cette "
 "erreurÂ:"
 
-#: ../e-util/e-print.c:170
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr ""
@@ -7756,132 +7795,124 @@ msgstr "Voulez-vous l'ÃcraserÂ?"
 msgid "File exists \"{0}\"."
 msgstr "Fichier existant ÂÂ{0}ÂÂ."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "Ã_craser"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:117
 msgid "Could not open the link."
 msgstr "Impossible d'ouvrir le lien."
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
 msgstr "Impossible d'afficher l'aide d'Evolution."
 
-#: ../e-util/gconf-bridge.c:1281
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erreur GConfÂ: %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "Toutes les erreurs futures seront affichÃes seulement sur le terminal."
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "RÃpondre Ã"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2397 ../mail/em-format-html.c:2465
-#: ../mail/em-format-html.c:2488 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2398 ../mail/em-format-html.c:2469
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Cci"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
+#: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "Sujet"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2585
-#: ../modules/mail/em-mailer-prefs.c:1119
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "Client de messagerie"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1179
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transfÃrà --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Groupes de discussion"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Portrait"
 
-#: ../em-format/em-format.c:1455
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "piÃce jointe %s"
 
-#: ../em-format/em-format.c:1559
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIMEÂ: erreur inconnue"
 
-#: ../em-format/em-format.c:1741 ../em-format/em-format.c:1935
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../em-format/em-format.c:1751
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../em-format/em-format.c:1771
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../em-format/em-format.c:1772
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIMEÂ: erreur inconnue"
 
-#: ../em-format/em-format.c:1960
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../em-format/em-format.c:1973 ../em-format/em-format.c:2152
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vÃrification de la signature"
 
-#: ../em-format/em-format.c:1974 ../em-format/em-format.c:2139
-#: ../em-format/em-format.c:2153
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vÃrification de la signature"
 
-#: ../em-format/em-format.c:2244
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
 msgstr "Impossible d'analyser le message PGPÂ: "
 
-#: ../em-format/em-format.c:2250 ../mail/em-folder-tree.c:656
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:100
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
 #: ../filter/e-filter-datespec.c:66
@@ -8000,66 +8031,66 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "SÃlectionnez une heure pour la comparaison"
 
-#: ../filter/e-filter-file.c:188
+#: ../filter/e-filter-file.c:190
 msgid "Choose a File"
 msgstr "Choisir un fichier"
 
-#: ../filter/e-filter-rule.c:662
+#: ../filter/e-filter-rule.c:664
 msgid "R_ule name:"
 msgstr "Nom de la _rÃgleÂ:"
 
-#: ../filter/e-filter-rule.c:692
+#: ../filter/e-filter-rule.c:694
 msgid "Find items that meet the following conditions"
 msgstr "Rechercher les ÃlÃments qui remplissent les conditions suivantes"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:719
 msgid "If all conditions are met"
 msgstr "Si toutes les conditions sont remplies"
 
-#: ../filter/e-filter-rule.c:718
+#: ../filter/e-filter-rule.c:720
 msgid "If any conditions are met"
 msgstr "Si une des conditions est remplie"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:723
 msgid "_Find items:"
 msgstr "_Trouver les ÃlÃmentsÂ:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:750
+#: ../filter/e-filter-rule.c:752
 msgid "None"
 msgstr "Aucune"
 
-#: ../filter/e-filter-rule.c:751
+#: ../filter/e-filter-rule.c:753
 msgid "All related"
 msgstr "Tous ceux relatifs"
 
-#: ../filter/e-filter-rule.c:752 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:754 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "RÃponses"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "Replies and parents"
 msgstr "RÃponses et parents"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 msgid "No reply or parent"
 msgstr "Pas de rÃponse ou parent"
 
-#: ../filter/e-filter-rule.c:757
-msgid "I_nclude threads"
-msgstr "I_nclure les fils de discussion"
+#: ../filter/e-filter-rule.c:759
+msgid "I_nclude threads:"
+msgstr "I_nclure les fils de discussionÂ:"
 
-#: ../filter/e-filter-rule.c:782
+#: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
 msgstr "Ajouter une condi_tion"
 
-#: ../filter/e-filter-rule.c:1130 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:316
+#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:319
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/e-filter-rule.c:1130 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:320
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -8091,7 +8122,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -8184,94 +8215,283 @@ msgstr "la date que vous indiquez"
 msgid "years"
 msgstr "annÃes"
 
-#: ../mail/e-mail-attachment-bar.c:86 ../mail/e-mail-attachment-bar.c:91
-#: ../mail/em-format-html-display.c:1122 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:124
-#: ../widgets/misc/e-attachment-paned.c:129
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "Aucune"
+
+#: ../mail/em-account-editor.c:926
+msgid "Never"
+msgstr "Jamais"
+
+#: ../mail/em-account-editor.c:927
+msgid "Always"
+msgstr "Toujours"
+
+#: ../mail/em-account-editor.c:928
+msgid "Ask for each message"
+msgstr "Demander à chaque message"
+
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1786 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "Aucun"
+
+#: ../mail/em-account-editor.c:2185
+msgid "Fil_e:"
+msgstr "_FichierÂ:"
+
+#: ../mail/em-account-editor.c:2185 ../mail/mail-config.ui.h:157
+msgid "_Path:"
+msgstr "_CheminÂ:"
+
+#: ../mail/em-account-editor.c:2234
+msgid "Mail Configuration"
+msgstr "Configuration de la messagerie"
+
+#: ../mail/em-account-editor.c:2235
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"Bienvenue dans l'assistant de configuration de messagerie d'Evolution.\n"
+"\n"
+"Cliquez sur ÂÂContinuerÂÂ pour commencer."
+
+#: ../mail/em-account-editor.c:2238
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"Saisissez vos nom et adresse Ãlectronique ci-dessous. Les champs "
+"ÂÂoptionnelsÂÂ ci-dessous n'ont pas besoin d'Ãtre remplis, Ã moins que vous "
+"ne dÃsiriez inclure ces informations dans les messages que vous envoyez."
+
+#: ../mail/em-account-editor.c:2240 ../mail/em-account-editor.c:2429
+msgid "Receiving Email"
+msgstr "RÃception du courriel"
+
+#: ../mail/em-account-editor.c:2241
+msgid "Please configure the following account settings."
+msgstr "Configurez les paramÃtres de compte suivants."
+
+#: ../mail/em-account-editor.c:2243 ../mail/em-account-editor.c:3026
+msgid "Sending Email"
+msgstr "Envoi du courriel"
+
+#: ../mail/em-account-editor.c:2244
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Saisissez les informations nÃcessaires pour envoyer le courriel. En cas de "
+"doute, adressez-vous à votre administrateur systÃme ou à votre fournisseur "
+"d'accÃs Internet."
+
+#: ../mail/em-account-editor.c:2246 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Informations sur le compte"
+
+#: ../mail/em-account-editor.c:2247
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Saisissez un nom descriptif pour le compte ci-dessous.\n"
+"Ce nom sera seulement utilisà à des fins d'affichage."
+
+#: ../mail/em-account-editor.c:2251
+msgid "Done"
+msgstr "TerminÃ"
+
+#: ../mail/em-account-editor.c:2252
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"FÃlicitations, la configuration de votre messagerie est terminÃe.\n"
+"\n"
+"Vous pouvez maintenant envoyer et recevoir des courriels avec Evolution.\n"
+"\n"
+"Cliquez sur ÂÂAppliquerÂÂ pour enregistrer les paramÃtres."
+
+# Toutes les n minutes (StÃphane)
+#: ../mail/em-account-editor.c:2788
+msgid "Check for _new messages every"
+msgstr "VÃrifier les _nouveaux messages toutes les"
+
+#: ../mail/em-account-editor.c:2796
+msgid "minu_tes"
+msgstr "minu_tes"
+
+#: ../mail/em-account-editor.c:3456 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "SÃcuritÃ"
+
+#. Most sections for this is auto-generated from the camel config
+#. Most sections for this is auto-generated fromt the camel config
+#: ../mail/em-account-editor.c:3510 ../mail/em-account-editor.c:3593
+msgid "Receiving Options"
+msgstr "Options de rÃception"
+
+#: ../mail/em-account-editor.c:3511 ../mail/em-account-editor.c:3594
+msgid "Checking for New Messages"
+msgstr "Recherche de nouveaux messages"
+
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "PiÃce jointe"
 msgstr[1] "PiÃces jointes"
 
-#: ../mail/e-mail-attachment-bar.c:604
-#: ../widgets/misc/e-attachment-paned.c:619
+#: ../mail/e-mail-attachment-bar.c:608
+#: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
 msgstr "Vue en icÃnes"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:610
+#: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
 msgstr "Vue en liste"
 
-#: ../mail/e-mail-browser.c:125 ../shell/e-shell-window-actions.c:1405
-#: ../shell/e-shell-window-actions.c:1412
-#: ../shell/e-shell-window-actions.c:1419
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "Ferme cette fenÃtre"
 
-#: ../mail/e-mail-browser.c:282
+#: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
-#: ../mail/e-mail-display.c:62
+#: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
 msgstr "_Ajouter dans le carnet d'adresses..."
 
-#: ../mail/e-mail-display.c:69
+#: ../mail/e-mail-display.c:73
 msgid "_To This Address"
 msgstr "_Ã cette adresse"
 
-#: ../mail/e-mail-display.c:76
+#: ../mail/e-mail-display.c:80
 msgid "_From This Address"
 msgstr "_De cette adresse"
 
-#: ../mail/e-mail-display.c:85
+#: ../mail/e-mail-display.c:87
+msgid "Send _Reply To..."
+msgstr "Envoyer un _RÃpondre Ã..."
+
+#: ../mail/e-mail-display.c:89
+msgid "Send a reply message to this address"
+msgstr "Envoie un message de rÃponse à cette adresse"
+
+#: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
 msgstr "CrÃer un nouveau dossier de _recherche"
 
-#: ../mail/e-mail-folder-utils.c:88
+#: ../mail/e-mail-folder-utils.c:111
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Enregistrement du message dans le dossier ÂÂ%sÂÂ"
 
-#: ../mail/e-mail-label-dialog.c:219
+#: ../mail/e-mail-folder-utils.c:274
+msgid "Forwarded messages"
+msgstr "Messages transfÃrÃs"
+
+#: ../mail/e-mail-folder-utils.c:391
+msgid "Scanning messages for duplicates"
+msgstr "VÃrification de la prÃsence de doublons parmi les messages"
+
+#: ../mail/e-mail-folder-utils.c:584
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "RÃcupÃration de %d message"
+msgstr[1] "RÃcupÃration de %d messages"
+
+#: ../mail/e-mail-folder-utils.c:833
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "Suppression du dossier ÂÂ%sÂÂ"
+
+#: ../mail/e-mail-folder-utils.c:967
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "Le fichier ÂÂ%s a Ãtà supprimÃ."
+
+#: ../mail/e-mail-folder-utils.c:971
+msgid "File has been removed."
+msgstr "Le fichier a Ãtà supprimÃ."
+
+#: ../mail/e-mail-folder-utils.c:1030
+msgid "Removing attachments"
+msgstr "Suppression des piÃces jointes"
+
+#: ../mail/e-mail-folder-utils.c:1194
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "Enregistrement de %d message"
+msgstr[1] "Enregistrement de %d messages"
+
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:612
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "URI de dossier non valide ÂÂ%sÂÂ"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Logiciel de filtrage de pourrielÂ:"
+
+#: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
 msgstr "_Nom de l'ÃtiquetteÂ:"
 
-#: ../mail/e-mail-label-list-store.c:37
+#: ../mail/e-mail-label-list-store.c:41
 msgid "I_mportant"
 msgstr "I_mportant"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:38
+#: ../mail/e-mail-label-list-store.c:42
 msgid "_Work"
 msgstr "_Bureau"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:39
+#: ../mail/e-mail-label-list-store.c:43
 msgid "_Personal"
 msgstr "_Personnel"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:40
+#: ../mail/e-mail-label-list-store.c:44
 msgid "_To Do"
 msgstr "Ã _faire"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:45
 msgid "_Later"
 msgstr "Plus _tard"
 
-#: ../mail/e-mail-label-manager.c:161
-#: ../modules/mail/e-mail-shell-view-actions.c:627
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:684
 msgid "Add Label"
 msgstr "Ajouter une Ãtiquette"
 
-#: ../mail/e-mail-label-manager.c:212
+#: ../mail/e-mail-label-manager.c:216
 msgid "Edit Label"
 msgstr "Modifier l'Ãtiquette"
 
-#: ../mail/e-mail-label-manager.c:346
+#: ../mail/e-mail-label-manager.c:350
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8279,66 +8499,66 @@ msgstr ""
 "NoteÂ: le tiret bas dans les Ãtiquettes est utilisÃ\n"
 "comme raccourci dans le menu."
 
-#: ../mail/e-mail-label-tree-view.c:84
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Couleur"
 
-#: ../mail/e-mail-label-tree-view.c:94
-#: ../modules/plugin-manager/evolution-plugin-manager.c:66
-#: ../plugins/caldav/caldav-browse-server.c:1296
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../widgets/menus/gal-define-views-dialog.c:334
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../plugins/caldav/caldav-browse-server.c:1295
+#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Nom"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:738 ../mail/em-folder-tree.c:3138
-#: ../modules/mail/e-mail-shell-view-private.c:1118
-#: ../modules/mail/e-mail-shell-view-private.c:1129
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:720
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "BoÃte de rÃception"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1116
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:742
-#: ../modules/mail/e-mail-shell-view-private.c:1120
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "BoÃte d'envoi"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:744
-#: ../modules/mail/e-mail-shell-view-private.c:1122
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "EnvoyÃs"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:733
-#: ../modules/mail/e-mail-shell-view-private.c:1124
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:581
+#: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
+#: ../plugins/templates/templates.c:1293
 msgid "Templates"
 msgstr "ModÃles"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
 msgstr "Migration..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:168
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migration de ÂÂ%sÂÂÂ:"
 
-#: ../mail/e-mail-migrate.c:660
+#: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
 msgstr "Migration des dossiers"
 
-#: ../mail/e-mail-migrate.c:661
+#: ../mail/e-mail-migrate.c:723
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8350,743 +8570,726 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/e-mail-migrate.c:1126
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr ""
 "Impossible de crÃer les dossiers de stockage de courriel local sur ÂÂ%sÂÂÂ: %s"
 
-#: ../mail/e-mail-notebook-view.c:562
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "SÃlectionnez un dossier"
 
-#. XXX e-error should provide a widget layout and API suitable
-#. *     for packing additional widgets to the right of the alert
-#. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:111
-#: ../modules/calendar/e-task-shell-view-actions.c:576
-msgid "Do not ask me again"
-msgstr "Ne plus poser la question"
-
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "C_opier"
 
-#. Translators: %s is replaced with a folder name
-#. %d with count of duplicate messages.
-#: ../mail/e-mail-reader.c:523
-#, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-"Le dossier ÂÂ%sÂÂ contient %d message en double. Voulez-vous vraiment le "
-"supprimerÂ?"
-msgstr[1] ""
-"Le dossier ÂÂ%sÂÂ contient %d messages en double. Voulez-vous vraiment les "
-"supprimerÂ?"
-
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "DÃplacer vers le dossier"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "_DÃplacer"
 
-#. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1423
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_Ne plus poser la question."
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Toujours ignorer les en-tÃtes Reply-To: des listes de diffusion."
 
-#: ../mail/e-mail-reader.c:1581
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "Enregistrer le message..."
-msgstr[1] "Enregistrer les messages..."
-
-#. Translators: This is a part of a suggested file name
-#. * used when saving a message or multiple messages to an
-#. * mbox format, when the first message doesn't have a
-#. * Subject. The extension ".mbox" is appended to this
-#. * string, thus it will be something like "Message.mbox"
-#. * at the end.
-#: ../mail/e-mail-reader.c:1602
-#: ../plugins/groupwise-features/notification.ui.h:1
-#: ../plugins/groupwise-features/properties.ui.h:3
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Message"
-msgstr[1] "Messages"
-
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "A_jouter l'expÃditeur au carnet d'adresses"
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Ajoute l'expÃditeur au carnet d'adresses"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "Filtrer les _pourriels"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "Filtre les messages sÃlectionnÃs pour la recherche de pourriels"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "Copie les messages sÃlectionnÃs dans un autre dossier"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_Supprimer le message"
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "Marque les messages sÃlectionnÃs pour suppression"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Filtrer sur la _liste de diffusion..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "CrÃe une rÃgle pour filtrer les messages de cette liste de diffusion"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filtrer sur les _destinataires..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "CrÃe une rÃgle pour filtrer les messages de ces destinataires"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filtrer sur l'_expÃditeur..."
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "CrÃe une rÃgle pour filtrer les messages de cet expÃditeur"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filtrer sur le _sujet..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "CrÃe une rÃgle pour filtrer les messages contenant ce sujet"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "A_ppliquer les filtres"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "Applique les rÃgles de filtrage aux messages sÃlectionnÃs"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "_Rechercher dans le message..."
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "Recherche un texte dans le corps du message affichÃ"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "_Effacer le marqueur"
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Supprime la marque ÂÂdonner suiteÂÂ des messages sÃlectionnÃs"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "Marquer comme _achevÃ"
 
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "DÃfinit la marque ÂÂdonner suiteÂÂ Ã ÂÂachevÃÂÂ pour les messages sÃlectionnÃs"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "Donner _suite..."
 
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "Marque les messages sÃlectionnÃs comme à suivre"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "_PiÃce jointe"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 "Fait suivre le message sÃlectionnà à un correspondant comme une piÃce jointe"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "Faire suivre comme piÃce _jointe"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "_Dans le corps"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "Fait suivre le message sÃlectionnà dans le corps d'un nouveau message"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "Faire su_ivre dans le corps"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_CitÃ"
 
-#: ../mail/e-mail-reader.c:1997 ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "Fait suivre le message sÃlectionnà en le citant comme une rÃponse"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Faire s_uivre en citation "
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "Char_ger les images"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "Force le chargement des images contenues dans les courriels HTML"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_Important"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "Marque les messages sÃlectionnÃs comme important"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_Pourriel"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "Marque les messages sÃlectionnÃs comme pourriels"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "_Non pourriel"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "Marque les messages sÃlectionnÃs comme non pourriels"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "_Lu"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "Marque les messages sÃlectionnÃs comme lus"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "Sans i_mportance"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "Marque les messages sÃlectionnÃs comme sans importance"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "Non l_u"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "Marque les messages sÃlectionnÃs comme non lus"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "Ã_diter comme un nouveau message..."
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ouvre les messages sÃlectionnÃs dans l'Ãditeur"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "RÃdiger un _nouveau message"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "Ouvre une fenÃtre pour la rÃdaction d'un courriel"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_Ouvrir dans une nouvelle fenÃtre"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "Ouvre les messages sÃlectionnÃs dans une nouvelle fenÃtre"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "_DÃplacer vers le dossier..."
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "DÃplace les messages sÃlectionnÃs vers un autre dossier"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "Ba_sculer vers le dossier"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "Affiche le dossier parent"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "Basculer vers l'o_nglet suivant"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "Bascule vers l'onglet suivant"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "Basculer vers l'onglet _prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "Bascule vers l'onglet prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "Fermer l'_onglet actuel"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "Ferme l'onglet actuel"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "Message _suivant"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "Affiche le message suivant"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "Message _important suivant"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "Affiche le message important suivant"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "_Fil de discussion suivant"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "Affiche le fil suivant"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "Message _non lu suivant"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "Affiche le message non lu suivant"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "Message _prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "Affiche le message prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Message i_mportant prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "Affiche le message important prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "_Fil de discussion prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "Affiche le fil de discussion prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "Message non lu _prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "Affiche le message non lu prÃcÃdent"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Imprime ce message"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "PrÃvisualise le message à imprimer"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "Re_diriger"
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige le message sÃlectionnà à un correspondant"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "Supp_rimer les piÃces jointes"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "Supprime les piÃces jointes"
 
-#: ../mail/e-mail-reader.c:2198
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "Supp_rimer les messages en double"
 
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "VÃrifie la prÃsence de doublon parmi les messages sÃlectionnÃs"
 
-#: ../mail/e-mail-reader.c:2205 ../mail/mail.error.xml.h:102
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:179
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "RÃpondre à _tous"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "RÃpond à tous les destinataires du message sÃlectionnÃ"
 
-#: ../mail/e-mail-reader.c:2212 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "RÃpondre à la _liste"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "RÃpond à la liste de diffusion du message sÃlectionnÃ"
 
-#: ../mail/e-mail-reader.c:2219
-#: ../modules/mail/e-mail-attachment-handler.c:186
+#: ../mail/e-mail-reader.c:2118
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_RÃpondre à l'expÃditeur"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "RÃpond à l'expÃditeur du message sÃlectionnÃ"
 
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "Enregi_strer comme mbox..."
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "Enregistre les messages sÃlectionnÃs comme un fichier mbox"
 
-#: ../mail/e-mail-reader.c:2233
-msgid "Search Folder from Mailing _List..."
-msgstr "Dossier de recherche sur la _liste de diffusion..."
-
-#: ../mail/e-mail-reader.c:2235
-msgid "Create a search folder for this mailing list"
-msgstr "CrÃe un dossier de recherche pour cette liste de diffusion"
-
-#: ../mail/e-mail-reader.c:2240
-msgid "Search Folder from Recipien_ts..."
-msgstr "Dossier de recherche sur les des_tinataires..."
-
-#: ../mail/e-mail-reader.c:2242
-msgid "Create a search folder for these recipients"
-msgstr "CrÃe un dossier de recherche pour ces destinataires"
-
-#: ../mail/e-mail-reader.c:2247
-msgid "Search Folder from Sen_der..."
-msgstr "Dossier de recherche sur l'e_xpÃditeur..."
-
-#: ../mail/e-mail-reader.c:2249
-msgid "Create a search folder for this sender"
-msgstr "CrÃe un dossier de recherche pour cet expÃditeur"
-
-#: ../mail/e-mail-reader.c:2254
-msgid "Search Folder from S_ubject..."
-msgstr "Dossier de recherche sur le _sujet..."
-
-#: ../mail/e-mail-reader.c:2256
-msgid "Create a search folder for this subject"
-msgstr "CrÃe un dossier de recherche pour ce sujet"
-
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "Source du _message"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "Affiche la source brute du message"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "_RÃcupÃrer le message"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "RÃcupÃre les messages sÃlectionnÃs"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "Taille _normale"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "Restaure la taille du texte à sa valeur d'origine"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "Zoom a_vant"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "Augmente la taille du texte"
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "Zoom a_rriÃre"
 
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "Diminue la taille du texte"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "CrÃer une _rÃgle"
 
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "Codage des c_aractÃres"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "_Faire suivre comme"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "RÃpondre au _groupe"
 
-#: ../mail/e-mail-reader.c:2333
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "A_ller Ã"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "Mar_quer comme"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_Message"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../mail/e-mail-reader.c:2379
+#: ../mail/e-mail-reader.c:2235
+msgid "Search Folder from Mailing _List..."
+msgstr "Dossier de recherche sur la _liste de diffusion..."
+
+#: ../mail/e-mail-reader.c:2237
+msgid "Create a search folder for this mailing list"
+msgstr "CrÃe un dossier de recherche pour cette liste de diffusion"
+
+#: ../mail/e-mail-reader.c:2242
+msgid "Search Folder from Recipien_ts..."
+msgstr "Dossier de recherche sur les des_tinataires..."
+
+#: ../mail/e-mail-reader.c:2244
+msgid "Create a search folder for these recipients"
+msgstr "CrÃe un dossier de recherche pour ces destinataires"
+
+#: ../mail/e-mail-reader.c:2249
+msgid "Search Folder from Sen_der..."
+msgstr "Dossier de recherche sur l'e_xpÃditeur..."
+
+#: ../mail/e-mail-reader.c:2251
+msgid "Create a search folder for this sender"
+msgstr "CrÃe un dossier de recherche pour cet expÃditeur"
+
+#: ../mail/e-mail-reader.c:2256
+msgid "Search Folder from S_ubject..."
+msgstr "Dossier de recherche sur le _sujet..."
+
+#: ../mail/e-mail-reader.c:2258
+msgid "Create a search folder for this subject"
+msgstr "CrÃe un dossier de recherche pour ce sujet"
+
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "Marquer pour _donner suite..."
 
-#: ../mail/e-mail-reader.c:2387
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "Marquer comme _pourriel"
 
-#: ../mail/e-mail-reader.c:2395
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _pourriel"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/e-mail-reader.c:2403
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "Marquer comme non im_portant"
 
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "_Mode de rÃticule"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Affiche un curseur clignotant dans le corps des messages affichÃs"
 
-#: ../mail/e-mail-reader.c:2459
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Tous les en-_tÃtes du message"
 
-#: ../mail/e-mail-reader.c:2461
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "Affiche les messages avec tous les en-tÃtes"
 
-#: ../mail/e-mail-reader.c:2699
-msgid "Unable to retrieve message"
-msgstr "Impossible de rÃcupÃrer le message"
-
-#: ../mail/e-mail-reader.c:2761 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "RÃcupÃration du message ÂÂ%sÂÂ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3379 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:538
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:249
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Par dÃfaut"
 
-#: ../mail/e-mail-reader.c:3550
-#: ../modules/mail/e-mail-attachment-handler.c:172
+#: ../mail/e-mail-reader.c:3415
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ../mail/e-mail-reader.c:3551
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "Fait suivre le message sÃlectionnà à un correspondant"
 
-#: ../mail/e-mail-reader.c:3570
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
 msgstr "RÃpondre au groupe"
 
-#: ../mail/e-mail-reader.c:3571
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "RÃpond à la liste de diffusion ou à tous les destinataires"
 
-#: ../mail/e-mail-reader.c:3616 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:746
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../mail/e-mail-reader.c:3649
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
-#: ../widgets/misc/e-calendar.c:201
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Suivant"
 
-#: ../mail/e-mail-reader.c:3653
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
-#: ../widgets/misc/e-calendar.c:177
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "PrÃcÃdent"
 
-#: ../mail/e-mail-reader.c:3663 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "RÃpondre"
 
-#: ../mail/e-mail-reader.c:4298
+#: ../mail/e-mail-reader.c:4205
 #, c-format
 msgid "Folder '%s'"
 msgstr "Dossier ÂÂ%sÂÂ"
 
-#: ../mail/e-mail-session.c:643
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "Ne plus me prÃvenir"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:669
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"Le dossier ÂÂ%sÂÂ contient %u message en double. Voulez-vous vraiment le "
+"supprimerÂ?"
+msgstr[1] ""
+"Le dossier ÂÂ%sÂÂ contient %u messages en double. Voulez-vous vraiment les "
+"supprimerÂ?"
+
+#: ../mail/e-mail-reader-utils.c:1046
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "Enregistrer le message..."
+msgstr[1] "Enregistrer les messages..."
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1067
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Message"
+msgstr[1] "Messages"
+
+#: ../mail/e-mail-session.c:863
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Saisissez la phrase de passe pour %s"
 
-#: ../mail/e-mail-session.c:645
+#: ../mail/e-mail-session.c:867
 msgid "Enter Passphrase"
 msgstr "Saisissez la phrase de passe"
 
-#: ../mail/e-mail-session.c:648
+#: ../mail/e-mail-session.c:871
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../mail/e-mail-session.c:650
+#: ../mail/e-mail-session.c:875
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../mail/e-mail-session.c:701
+#: ../mail/e-mail-session.c:926
 #, c-format
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulà l'opÃration."
 
-#: ../mail/e-mail-session.c:871
+#: ../mail/e-mail-session.c:1039
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr ""
 "Aucune adresse de destination fournie, le transfert du message a Ãtà annulÃ."
 
-#: ../mail/e-mail-session.c:880
+#: ../mail/e-mail-session.c:1048
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Aucun compte à utiliser n'a Ãtà trouvÃ, le transfert du message a Ãtà annulÃ."
 
-#: ../mail/e-mail-session.c:1284 ../mail/mail-ops.c:1220
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "Ouverture du dossier ÂÂ%sÂÂ"
-
-#: ../mail/e-mail-session.c:1300
+# http://www.go-evolution.org/Camel.Transport
+#: ../mail/e-mail-session-utils.c:419
 #, c-format
-msgid "Invalid folder: %s"
-msgstr "Dossier non valideÂ: %s"
+msgid "Cannot get transport for account '%s'"
+msgstr "Impossible d'accÃder au systÃme d'envoi du compte ÂÂ%sÂÂ"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a ÃchouÃÂ: %s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9095,188 +9298,45 @@ msgstr ""
 "L'ajout à %s a ÃchouÃÂ: %s\n"
 "Ajoutà au dossier local ÂÂEnvoyÃs à la place."
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "L'ajout au dossier local ÂÂEnvoyÃsÂÂ a ÃchouÃÂ: %s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
-#: ../mail/mail-ops.c:866
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: ../mail/e-mail-session-utils.c:850
+#: ../mail/e-mail-session-utils.c:873
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "DÃsabonnement au dossier ÂÂ%sÂÂ"
 
-#: ../mail/e-mail-store-utils.c:39
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "DÃconnexion de ÂÂ%sÂÂ"
 
-#: ../mail/e-mail-store-utils.c:130
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnexion à ÂÂ%sÂÂ"
 
+#: ../mail/e-mail-store-utils.c:334
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "PrÃparation du compte ÂÂ%sÂÂ pour utilisation hors ligne"
+
 #: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "Marquer pour donner suite"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:564 ../mail/mail-config.ui.h:69
-#: ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "Sans chiffrement"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../mail/em-account-editor.c:568 ../mail/mail-config.ui.h:126
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "Chiffrement TLS"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../mail/em-account-editor.c:572 ../mail/mail-config.ui.h:91
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "Chiffrement SSL"
-
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:835 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "Aucune"
-
-#: ../mail/em-account-editor.c:916
-msgid "Never"
-msgstr "Jamais"
-
-#: ../mail/em-account-editor.c:917
-msgid "Always"
-msgstr "Toujours"
-
-#: ../mail/em-account-editor.c:918
-msgid "Ask for each message"
-msgstr "Demander à chaque message"
-
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1700 ../widgets/misc/e-account-tree-view.c:127
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "Aucun"
-
-#: ../mail/em-account-editor.c:2087
-msgid "Mail Configuration"
-msgstr "Configuration de la messagerie"
-
-#: ../mail/em-account-editor.c:2088
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Bienvenue dans l'assistant de configuration de messagerie d'Evolution.\n"
-"\n"
-"Cliquez sur ÂÂSuivantÂÂ pour commencer."
-
-#: ../mail/em-account-editor.c:2091
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"Saisissez vos nom et adresse Ãlectronique ci-dessous. Les champs "
-"ÂÂoptionnelsÂÂ ci-dessous n'ont pas besoin d'Ãtre remplis, Ã moins que vous "
-"ne dÃsiriez inclure ces informations dans les messages que vous envoyez."
-
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2256
-msgid "Receiving Email"
-msgstr "RÃception du courriel"
-
-#: ../mail/em-account-editor.c:2094
-msgid "Please configure the following account settings."
-msgstr "Configurez les paramÃtres de compte suivants."
-
-#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2756
-msgid "Sending Email"
-msgstr "Envoi du courriel"
-
-#: ../mail/em-account-editor.c:2097
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"Saisissez les informations nÃcessaires pour envoyer le courriel. En cas de "
-"doute, adressez-vous à votre administrateur systÃme ou à votre fournisseur "
-"d'accÃs Internet."
-
-#: ../mail/em-account-editor.c:2099 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Informations sur le compte"
-
-#: ../mail/em-account-editor.c:2100
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Saisissez un nom descriptif pour le compte ci-dessous.\n"
-"Ce nom sera seulement utilisà à des fins d'affichage."
-
-#: ../mail/em-account-editor.c:2104
-msgid "Done"
-msgstr "TerminÃ"
-
-#: ../mail/em-account-editor.c:2105
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"FÃlicitations, la configuration de votre messagerie est terminÃe.\n"
-"\n"
-"Vous pouvez maintenant envoyer et recevoir des courriels avec Evolution.\n"
-"\n"
-"Cliquez sur ÂÂAppliquerÂÂ pour enregistrer les paramÃtres."
-
-# Toutes les n minutes (StÃphane)
-#: ../mail/em-account-editor.c:2570
-msgid "Check for _new messages every"
-msgstr "VÃrifier les _nouveaux messages toutes les"
-
-#: ../mail/em-account-editor.c:2578
-msgid "minu_tes"
-msgstr "minu_tes"
-
-#: ../mail/em-account-editor.c:2861
-msgid "Please select a folder from the current account."
-msgstr "SÃlectionnez un dossier du compte actuel."
-
-#: ../mail/em-account-editor.c:3171 ../mail/mail-config.ui.h:98
-msgid "Security"
-msgstr "SÃcuritÃ"
-
-#. Most sections for this is auto-generated from the camel config
-#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
-msgid "Receiving Options"
-msgstr "Options de rÃception"
-
-#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
-msgid "Checking for New Messages"
-msgstr "Recherche de nouveaux messages"
-
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1173
+#. Note to translators: this is the attribution string used
+#. * when quoting messages.  Each ${Variable} gets replaced
+#. * with a value.  To see a full list of available variables,
+#. * see mail/em-composer-utils.c:attribvars array.
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9284,36 +9344,36 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} Ã ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a ÃcritÂ:"
 
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
 # Ordre des paramÃtres inversà pour plus de sens en franÃais
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1851
+#: ../mail/em-composer-utils.c:1986
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Votre message ÂÂ%2$s du %3$s à %1$s a Ãtà lu."
 
-#: ../mail/em-composer-utils.c:1905
+#: ../mail/em-composer-utils.c:2046
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notification de distribution pourÂ: ÂÂ%sÂÂ"
 
-#: ../mail/em-composer-utils.c:2356
+#: ../mail/em-composer-utils.c:2583
 msgid "an unknown sender"
 msgstr "un expÃditeur inconnu"
 
-#: ../mail/em-composer-utils.c:2787
+#: ../mail/em-composer-utils.c:2988
 msgid "Posting destination"
 msgstr "Destination d'envoi"
 
-#: ../mail/em-composer-utils.c:2788
+#: ../mail/em-composer-utils.c:2989
 msgid "Choose folders to post the message to."
 msgstr "Choisissez les dossiers auxquels envoyer ce message."
 
-#: ../mail/em-filter-folder-element.c:339
+#: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
 msgstr "SÃlectionnez un dossier"
 
@@ -9431,7 +9491,7 @@ msgstr "n'est pas dÃfini"
 msgid "is set"
 msgstr "est dÃfini"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
 msgid "Junk"
 msgstr "Pourriel"
 
@@ -9481,7 +9541,7 @@ msgid "Play Sound"
 msgstr "Jouer le son"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Lu"
 
@@ -9562,146 +9622,224 @@ msgid "Unset Status"
 msgstr "Retirer l'Ãtat"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:536
+#: ../mail/em-filter-rule.c:538
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:567
+#: ../mail/em-filter-rule.c:569
 msgid "Add Ac_tion"
 msgstr "Ajouter une ac_tion"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:124
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messages non lusÂ:"
 msgstr[1] "Messages non lusÂ:"
 
-#. TODO: can this be done in a loop?
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:128
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total des messagesÂ:"
 msgstr[1] "Total des messagesÂ:"
 
-#: ../mail/em-folder-properties.c:146
+#: ../mail/em-folder-properties.c:175
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Utilisation de votre quota (%s)Â:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "Utilisation de votre quota"
 
-#: ../mail/em-folder-properties.c:290
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "PropriÃtÃs du dossier"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:79
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sÃlectionner un dossier>"
 
-#: ../mail/em-folder-selector.c:261
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "C_rÃer"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "_Nom du dossierÂ:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165 ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "Dossiers de recherche"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "SANS_CORRESPONDANCE"
-
-#: ../mail/em-folder-tree-model.c:808 ../mail/em-folder-tree-model.c:1085
-msgid "Loading..."
-msgstr "Chargement..."
-
-#: ../mail/em-folder-tree.c:197
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "Examen des dossiers dans ÂÂ%sÂÂ"
-
-#: ../mail/em-folder-tree.c:625
+#: ../mail/em-folder-tree.c:647
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractÃre ÂÂ/ÂÂ"
 
-#: ../mail/em-folder-tree.c:1245
+#: ../mail/em-folder-tree.c:767
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1482
+#: ../mail/em-folder-tree.c:1589
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:1938 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "DÃplacement du dossier %s"
 
-#: ../mail/em-folder-tree.c:1942 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:1951 ../mail/message-list.c:2243
+#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2211
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "DÃplacement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1955 ../mail/message-list.c:2245
+#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2213
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1974
+#: ../mail/em-folder-tree.c:2101
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de dÃposer le ou les messages dans le stockage de haut niveau"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
+#: ../mail/mail-vfolder.c:1123 ../mail/mail-vfolder.c:1237
+msgid "Search Folders"
+msgstr "Dossiers de recherche"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+msgid "UNMATCHED"
+msgstr "SANS_CORRESPONDANCE"
+
+#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "DÃplacer le dossier vers"
 
-#: ../mail/em-folder-utils.c:422
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "Copier le dossier vers"
 
-#: ../mail/em-folder-utils.c:571
-#: ../plugins/groupwise-features/share-folder-common.c:138
-#, c-format
-msgid "Creating folder '%s'"
-msgstr "CrÃation du dossier ÂÂ%sÂÂ"
-
-#: ../mail/em-folder-utils.c:741
+#: ../mail/em-folder-utils.c:589
 msgid "Create Folder"
 msgstr "CrÃation d'un dossier"
 
-#: ../mail/em-folder-utils.c:742
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
+#: ../mail/em-folder-utils.c:590
 msgid "Specify where to create the folder:"
 msgstr "PrÃcisez l'emplacement de crÃation du dossierÂ:"
 
-#: ../mail/em-format-html-display.c:84 ../mail/em-format-html.c:1601
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Formatage des messages"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Formatage du message..."
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "RÃcupÃration de ÂÂ%sÂÂ"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Non signÃ"
 
-#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Signature valide"
+
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Signature non valide"
+
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "Signature valide, mais impossible de vÃrifier l'expÃditeur"
+
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "La signature existe, mais elle requiert une clà publique"
+
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "Non chiffrÃ"
+
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "ChiffrÃ, faiblement"
+
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "ChiffrÃ"
+
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "ChiffrÃ, fortement"
+
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "Partie externe au corps inconnue."
+
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "Partie externe au corps mal formÃe."
+
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointeur sur le site FTP (%s)"
+
+#: ../mail/em-format-html.c:2172
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointeur sur le fichier local (%s) valide sur le site ÂÂ%sÂÂ"
+
+#: ../mail/em-format-html.c:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointeur sur le fichier local (%s)"
+
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointeur sur des donnÃes distantes (%s)"
+
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointeur sur des donnÃes externes inconnues (type ÂÂ%sÂÂ)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "DeÂ: %s"
+
+#: ../mail/em-format-html.c:2937
+msgid "(no subject)"
+msgstr "(pas de sujet)"
+
+#: ../mail/em-format-html.c:3013
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Ce message a Ãtà envoyà par %s pour le compte de %s"
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -9709,11 +9847,7 @@ msgstr ""
 "Ce message n'est pas signÃ. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1602
-msgid "Valid signature"
-msgstr "Signature valide"
-
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9721,11 +9855,7 @@ msgstr ""
 "Ce message est signà et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1603
-msgid "Invalid signature"
-msgstr "Signature non valide"
-
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -9733,11 +9863,7 @@ msgstr ""
 "La signature de ce message ne peut pas Ãtre vÃrifiÃe, il se peut qu'il ait "
 "Ãtà altÃrà lors de la transmission."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1604
-msgid "Valid signature, but cannot verify sender"
-msgstr "Signature valide, mais impossible de vÃrifier l'expÃditeur"
-
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9745,22 +9871,14 @@ msgstr ""
 "Ce message est signà avec une signature valide, mais l'expÃditeur du message "
 "ne peut pas Ãtre vÃrifiÃ."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1605
-msgid "Signature exists, but need public key"
-msgstr "La signature existe, mais elle requiert une clà publique"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Ce message est signà avec une signature dont la clà publique est absente."
 
-#: ../mail/em-format-html-display.c:95 ../mail/em-format-html.c:1611
-msgid "Unencrypted"
-msgstr "Non chiffrÃ"
-
-#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9768,11 +9886,7 @@ msgstr ""
 "Ce message n'est pas chiffrÃ. Son contenu peut Ãtre lu lors de son passage "
 "sur Internet."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1612
-msgid "Encrypted, weak"
-msgstr "ChiffrÃ, faiblement"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9782,11 +9896,7 @@ msgstr ""
 "sera difficile, mais pas impossible, pour une tierce personne de voir le "
 "contenu de ce message dans une pÃriode de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1613
-msgid "Encrypted"
-msgstr "ChiffrÃ"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -9794,11 +9904,7 @@ msgstr ""
 "Ce message est chiffrÃ. Il sera difficile pour une tierce personne de voir "
 "le contenu de ce message."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1614
-msgid "Encrypted, strong"
-msgstr "ChiffrÃ, fortement"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9808,15 +9914,15 @@ msgstr ""
 "vraiment difficile, pour une tierce personne, de voir le contenu de ce "
 "message dans une pÃriode de temps raisonnable."
 
-#: ../mail/em-format-html-display.c:236 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:249
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:538
+#: ../mail/em-format-html-display.c:556
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9825,29 +9931,41 @@ msgstr ""
 "Ãtre traitÃ. Vous pouvez l'afficher non formatà ou avec un Ãditeur de texte "
 "externe."
 
+# Titre de fenÃtre
+#: ../mail/em-format-html-display.c:746
+msgid "Save Image"
+msgstr "Enregistrement de l'image"
+
+#: ../mail/em-format-html-display.c:794
+msgid "Save _Image..."
+msgstr "Enregistrer l'_image..."
+
+#: ../mail/em-format-html-display.c:796
+msgid "Save the image to a file"
+msgstr "Enregistre l'image dans un fichier"
+
 # ÂÂTerminà le pourrait poser un pb si ÂÂhier Ãtait ajoutà par exemple (StÃphane)
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "Terminà "
 
-#: ../mail/em-format-html-display.c:812
+#: ../mail/em-format-html-display.c:1036
 msgid "Overdue:"
 msgstr "RetardÂ:"
 
-#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:816
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr " "
 
-#: ../mail/em-format-html-display.c:1047 ../mail/em-format-html-display.c:1094
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:1049
+#: ../mail/em-format-html-display.c:1322
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formatÃ"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
@@ -9856,120 +9974,67 @@ msgstr "_Ouvrir avec"
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: ../mail/em-format-html.c:161
-msgid "Formatting message"
-msgstr "Formatage des messages"
-
-#: ../mail/em-format-html.c:360
-msgid "Formatting Message..."
-msgstr "Formatage du message..."
-
-#: ../mail/em-format-html.c:1445 ../mail/em-format-html.c:1455
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "RÃcupÃration de ÂÂ%sÂÂ"
-
-#: ../mail/em-format-html.c:1976
-msgid "Unknown external-body part."
-msgstr "Partie externe au corps inconnue."
-
-#: ../mail/em-format-html.c:1984
-msgid "Malformed external-body part."
-msgstr "Partie externe au corps mal formÃe."
-
-#: ../mail/em-format-html.c:2014
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointeur sur le site FTP (%s)"
-
-#: ../mail/em-format-html.c:2025
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointeur sur le fichier local (%s) valide sur le site ÂÂ%sÂÂ"
-
-#: ../mail/em-format-html.c:2027
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointeur sur le fichier local (%s)"
-
-#: ../mail/em-format-html.c:2048
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointeur sur des donnÃes distantes (%s)"
-
-#: ../mail/em-format-html.c:2059
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointeur sur des donnÃes externes inconnues (type ÂÂ%sÂÂ)"
-
-#. To translators: This message suggests to the receipients that the sender of the mail is
-#. different from the one listed in From field.
-#: ../mail/em-format-html.c:2763
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Ce message a Ãtà envoyà par %s pour le compte de %s"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "Aucun flux HTML disponible"
 
-#: ../mail/em-subscription-editor.c:1105
+#: ../mail/em-subscription-editor.c:1161
 msgid "Folder Subscriptions"
 msgstr "Gestion des abonnements"
 
-#: ../mail/em-subscription-editor.c:1144
+#: ../mail/em-subscription-editor.c:1200
 msgid "_Account:"
 msgstr "_CompteÂ:"
 
-#: ../mail/em-subscription-editor.c:1159
+#: ../mail/em-subscription-editor.c:1215
 msgid "Clear Search"
 msgstr "Effacer la recherche"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1233
 msgid "Sho_w items that contain:"
 msgstr "Affic_her les eÌleÌments qui contiennentÂ:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1272
 msgid "Subscribe to the selected folder"
 msgstr "Abonne au dossier sÃlectionnÃ"
 
-#: ../mail/em-subscription-editor.c:1217
+#: ../mail/em-subscription-editor.c:1273
 msgid "Su_bscribe"
 msgstr "S'a_bonner"
 
-#: ../mail/em-subscription-editor.c:1228
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../mail/em-subscription-editor.c:1284
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Unsubscribe from the selected folder"
 msgstr "DÃsabonne le dossier sÃlectionnÃ"
 
-#: ../mail/em-subscription-editor.c:1229
-#: ../modules/mail/e-mail-shell-view-actions.c:1176
+#: ../mail/em-subscription-editor.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "_Unsubscribe"
 msgstr "Se _dÃsabonner"
 
-#: ../mail/em-subscription-editor.c:1240
+#: ../mail/em-subscription-editor.c:1296
 msgid "Collapse all folders"
 msgstr "Groupe tous les dossiers"
 
-#: ../mail/em-subscription-editor.c:1241
+#: ../mail/em-subscription-editor.c:1297
 msgid "C_ollapse All"
 msgstr "Grouper _tout"
 
-#: ../mail/em-subscription-editor.c:1251
+#: ../mail/em-subscription-editor.c:1307
 msgid "Expand all folders"
 msgstr "DÃplie tous les dossiers"
 
-#: ../mail/em-subscription-editor.c:1252
+#: ../mail/em-subscription-editor.c:1308
 msgid "E_xpand All"
 msgstr "DÃ_plier tout"
 
-#: ../mail/em-subscription-editor.c:1262
+#: ../mail/em-subscription-editor.c:1318
 msgid "Refresh the folder list"
 msgstr "Actualiser la liste des dossiers"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1330
 msgid "Stop the current operation"
 msgstr "ArrÃter l'opÃration en cours"
 
@@ -9977,23 +10042,23 @@ msgstr "ArrÃter l'opÃration en cours"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:101
+#: ../mail/em-utils.c:102
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Voulez-vous vraiment ouvrir %d messages en une foisÂ?"
 msgstr[1] "Voulez-vous vraiment ouvrir %d messages en une foisÂ?"
 
-#: ../mail/em-utils.c:153
-#: ../modules/mailto-handler/evolution-mailto-handler.c:151
+#: ../mail/em-utils.c:158
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Ne plus jamais afficher ce message"
 
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:331
 msgid "Message Filters"
 msgstr "Filtres de messages"
 
-#: ../mail/em-utils.c:904
+#: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -10002,7 +10067,7 @@ msgstr "Messages de %s"
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:610
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "Ajouter un dossier"
 
@@ -10059,7 +10124,7 @@ msgid "Always request read receipt"
 msgstr "Toujours demander un accusà de lecture"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "DurÃe d'affichage en secondes de l'erreur dans la barre d'Ãtat."
 
@@ -10197,19 +10262,27 @@ msgstr "Largeur par dÃfaut de la fenÃtre de navigation des courriels."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr ""
+"Indique si les en-tÃtes de message dans le panneau latÃral doivent Ãtre "
+"rÃduits ou Ãtendus par dÃfaut. ÂÂ0ÂÂ = ÃtendusÂ; ÂÂ1ÂÂ = rÃduits"
+
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 "Indique s'il faut vÃrifier les adresses pour le filtrage des pourriels "
 "seulement dans le carnet d'adresses local"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Indique s'il faut consulter le carnet d'adresses pour l'expÃditeur du "
 "courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10222,13 +10295,13 @@ msgstr ""
 "l'opÃration peut Ãtre lente si vous utilisez des carnets d'adresses distants "
 "(tel que LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Indique s'il faut utiliser des en-tÃtes personnalisÃs pour la dÃtection des "
 "pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10238,7 +10311,7 @@ msgstr ""
 "pourriels. Si cette option est active et que des en-tÃtes sont renseignÃs, "
 "la dÃtection des pourriels sera plus rapide."
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10246,50 +10319,50 @@ msgstr ""
 "Indique s'il faut utiliser les mÃmes polices pour les lignes ÂÂDeÂÂ et "
 "ÂÂSujetÂÂ dans la colonne ÂÂMessagesÂÂ en affichage verticale."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for loading/attaching files to composer."
 msgstr "RÃpertoire pour charger/joindre des fichiers dans l'Ãditeur."
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Directory for saving mail component files."
 msgstr "RÃpertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Activer ou dÃsactiver la troncature des noms de dossier dans le panneau "
 "latÃral"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 "N'afficher que les textes de message ne dÃpassant pas une certaine taille"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Ne pas ajouter de sÃparateur de signature"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Afficher les indicateurs de fautes d'orthographe au fil de la saisie."
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Junk folders on exit"
 msgstr "Vider les dossiers Pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty Trash folders on exit"
 msgstr "Vider les dossiers Corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vider tous les dossiers Pourriels en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vider tous les dossiers Corbeille en quittant Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10297,34 +10370,34 @@ msgstr ""
 "Activer les images animÃes dans les messages HTML. Beaucoup de personnes les "
 "trouvent ennuyantes et prÃfÃrent voir des images fixes."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 "Activer la lecture au curseur, ainsi vous pouvez voir un curseur quand vous "
 "lisez vos mails."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Activer ou dÃsactiver la barre d'espace magique"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 "Activer ou dÃsactiver la confirmation lors du marquage de plusieurs messages."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Activer ou dÃsactiver la fonctionnalità de recherche interactive"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
 msgstr "Activer les dossiers de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable search folders on startup."
 msgstr "Activer les dossiers de recherche au dÃmarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10332,7 +10405,7 @@ msgstr ""
 "Activer la barre de recherche latÃrale qui permet une recherche interactive "
 "de noms de dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10340,7 +10413,7 @@ msgstr ""
 "Activer ceci pour dÃfiler avec la barre Espace dans l'aperÃu des messages, "
 "les listes de messages et les dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10348,27 +10421,27 @@ msgstr ""
 "Activer pour n'afficher que les textes de messages dont la taille ne dÃpasse "
 "pas celle dÃfinie par la clà ÂÂmessage_text_part_limitÂÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activer pour utiliser des paramÃtres d'affichage des listes de messages "
 "similaires pour tous les dossiers"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activer pour utiliser des paramÃtres d'affichage des listes de messages "
 "similaires pour tous les dossiers."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
 msgstr "Activer/dÃsactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Coder les noms de fichiers à la maniÃre Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10381,31 +10454,31 @@ msgstr ""
 "qu'ils ne suivent pas le standard RFC 2231 mais utilisent le RFC 2047 qui "
 "est incorrect)."
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
 msgstr "Vider la boÃte d'envoi aprÃs le filtrage"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Forward message."
 msgstr "Message de transfert."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
 msgstr "RÃpondre au groupe rÃpond à la liste"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
 msgstr "Hauteur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
 msgstr "Hauteur du panneau de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Masque l'aperÃu par dossier et supprime la sÃlection"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10413,7 +10486,7 @@ msgstr ""
 "Si un utilisateur essaye d'ouvrir 10 messages ou plus en une seule fois, lui "
 "demander si c'est rÃellement ce qu'il dÃsire."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -10424,11 +10497,11 @@ msgstr ""
 "qui est attribuà à un afficheur de composant bonobo, dans la base des types "
 "MIME GNOME, peut Ãtre utilisà pour l'affichage du contenu."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
 msgstr "Ignorer l'en-tÃte Reply-To: des listes"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10436,7 +10509,7 @@ msgstr ""
 "Hauteur initiale de la fenÃtre ÂÂÃditeur de filtresÂÂ. La valeur est mise à "
 "jour si l'utilisateur redimensionne la fenÃtre verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10444,7 +10517,7 @@ msgstr ""
 "Hauteur initiale de la fenÃtre ÂÂGestion des abonnementsÂÂ. La valeur est "
 "mise à jour si l'utilisateur redimensionne la fenÃtre verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10453,7 +10526,7 @@ msgstr ""
 "valeur est mise à jour si l'utilisateur redimensionne la fenÃtre "
 "verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10461,7 +10534,7 @@ msgstr ""
 "Hauteur initiale de la fenÃtre ÂÂEnvoi et rÃception du courrielÂÂ. La valeur "
 "est mise à jour si l'utilisateur redimensionne la fenÃtre verticalement."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10474,7 +10547,7 @@ msgstr ""
 "fenÃtre ÂÂÃditeur de filtres ne peut pas Ãtre maximisÃe. Cette clà n'est "
 "qu'un dÃtail d'implÃmentation."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10487,7 +10560,7 @@ msgstr ""
 "fenÃtre ÂÂGestion des abonnements ne peut pas Ãtre maximisÃe. Cette clà "
 "n'est qu'un dÃtail d'implÃmentation."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10500,7 +10573,7 @@ msgstr ""
 "la fenÃtre ÂÂÃditeur de dossiers de rechercheÂÂ ne peut pas Ãtre maximisÃe. "
 "Cette clà n'est qu'un dÃtail d'implÃmentation."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10514,7 +10587,7 @@ msgstr ""
 "la fenÃtre ÂÂEnvoi et rÃception du courrielÂÂ ne peut pas Ãtre maximisÃe. "
 "Cette clà n'est qu'un dÃtail d'implÃmentation."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10522,7 +10595,7 @@ msgstr ""
 "Largeur initiale de la fenÃtre ÂÂÃditeur de filtresÂÂ. La valeur est mise à "
 "jour si l'utilisateur redimensionne la fenÃtre horizontalement."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10530,7 +10603,7 @@ msgstr ""
 "Largeur initiale de la fenÃtre ÂÂGestion des abonnementsÂÂ. La valeur est "
 "mise à jour si l'utilisateur redimensionne la fenÃtre horizontalement."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10539,7 +10612,7 @@ msgstr ""
 "valeur est mise à jour si l'utilisateur redimensionne la fenÃtre "
 "horizontalement."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10547,7 +10620,7 @@ msgstr ""
 "Largeur initiale de la fenÃtre ÂÂEnvoi et rÃception du courrielÂÂ. La valeur "
 "est mise à jour si l'utilisateur redimensionne la fenÃtre horizontalement."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10558,7 +10631,7 @@ msgstr ""
 "bouton de barre d'outils ÂÂRÃpondre au groupeÂÂ de ne rÃpondre qu'Ã la liste "
 "de diffusion par laquelle le message auquel vous rÃpondez est arrivÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10568,7 +10641,7 @@ msgstr ""
 "suppression de messages du dossier de recherche supprime dÃfinitivement ces "
 "messages, et ne les supprime pas simplement des rÃsultats de recherche."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10577,7 +10650,7 @@ msgstr ""
 "rÃpondez en privà à un message qui est arrivà par l'intermÃdiaire d'une "
 "liste de diffusion."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10585,7 +10658,7 @@ msgstr ""
 "Ceci active ou dÃsactive les fenÃtres de confirmation qui informent que vous "
 "envoyez une rÃponse à de nombreuses personnes."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10596,7 +10669,7 @@ msgstr ""
 "liste de diffusion, mais que la liste a placà un en-tÃte ÂÂReply-To: qui "
 "redirige votre rÃponse sur la liste."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10605,41 +10678,41 @@ msgstr ""
 "envoyez un message à des destinataires non saisis sous la forme d'adresses "
 "de courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Junk was run"
 msgstr "DerniÃre fois oà les pourriels ont Ãtà vidÃs"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Last time Empty Trash was run"
 msgstr "DerniÃre fois oà la corbeille a Ãtà vidÃe"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Layout style"
 msgstr "Style de l'agencement"
 
-#: ../mail/evolution-mail.schemas.in.h:105
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:106
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delà duquel les messages doivent Ãtre journalisÃs."
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of Labels and their associated colors"
 msgstr "Liste des Ãtiquettes et des couleurs qui leur sont associÃes"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Liste des types MIME Ã vÃrifier pour les visionneurs de composants Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
 msgstr "Liste des licences acceptÃes"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of accounts"
 msgstr "Liste de comptes"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10648,17 +10721,17 @@ msgstr ""
 "liste contient des chaÃnes dÃsignant les noms des sous-dossiers relatifs à /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-tÃtes personnels et de leur activation."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Liste des codes de langue des dictionnaires utilisÃs pour la vÃrification "
 "orthographique."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -10667,15 +10740,15 @@ msgstr ""
 "liste contient des chaÃnes de type nom:couleur oà les couleurs utilisent le "
 "codage hexadÃcimal HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste des noms de protocoles dont la licence a Ãtà acceptÃe."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
 msgstr "Charger les images pour les messages HTML en utilisant http"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10686,88 +10759,88 @@ msgstr ""
 "charger les images si l'expÃditeur est dans le carnet d'adresses et 2 - "
 "toujours charger les images à partir du rÃseau."
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
 msgstr "Enregistre les actions des filtres dans le fichier de journal indiquÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal oà enregistrer les actions des filtres"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal oà enregistrer les actions des filtres."
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser height"
 msgstr "Hauteur du navigateur de courriels"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser maximized"
 msgstr "Navigateur de courriels maximisÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mail browser width"
 msgstr "Largeur du navigateur de courriels"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu aprÃs le dÃlai indiquÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu aprÃs le dÃlai indiquÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message ÂÂPreviewÂÂ"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message ÂÂPreviewÂÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message text limit for display"
 msgstr "Taille limite du texte des messages à l'affichage"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Style d'affichage des messages (ÂÂnormalÂÂ, ÂÂen-tÃtes completsÂÂ, ÂÂsourceÂÂ)"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Nombre minimum de jours entre les vidages de pourriels en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Nombre minimum de jours entre les vidages de corbeille en quittant"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "DurÃe minimum en jours entre les vidages de pourriels en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "DurÃe minimum en jours avant de vider la corbeille en quittant."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses à afficher pour Ã/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Original message."
 msgstr "Message initial."
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
 msgstr "Emplacement oà le contenu de la galerie de photos doit Ãtre recherchÃ"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10776,59 +10849,59 @@ msgstr ""
 "navigateur), ÂÂalwaysÂÂ (toujours fermer la fenÃtre) ou ÂÂaskÂÂ (ou toute "
 "autre valeur, demander à l'utilisateur)"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Demander avant l'envoi à des destinataires non saisis sous la forme "
 "d'adresses de courriel"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quand il ou elle essaie de nettoyer un dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans sujet."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 "Demander lors de la suppression de messages dans un dossier de recherche"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Demander lorsqu'une liste de diffusion dÃtourne les rÃponses privÃes"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying privately to list messages"
 msgstr ""
 "Demander lors de rÃponses privÃes à des messages de listes de diffusion"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when replying to many recipients"
 msgstr "Demander lors de rÃponses à de nombreux destinataires"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Demander lors de l'envoi de 10 messages ou plus à la fois"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10836,67 +10909,67 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML Ã des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages oà seuls des destinataires sans à ou Cc "
 "dÃfinis."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Demander lorsque l'utilisateur essaye d'envoyer des message HTML non dÃsirÃs"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
 msgstr "Ajouter les signatures personnalisÃes en haut des rÃponses"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
 msgstr "Positionner le curseur en bas des rÃponses"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
 msgstr ""
 "ReconnaÃtre les frimousses dans le texte et les remplacer par des images."
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
 msgstr "ReconnaÃtre les liens dans le texte et les remplacer."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
 msgstr "RÃpertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
 msgstr "Chercher la photo de l'expÃditeur dans les carnets d'adresses locaux"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
 msgstr "Envoyer par dÃfaut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
 msgstr "Envoyer par dÃfaut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
 msgstr "Colonne du courriel de l'expÃditeur dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
 msgstr "DÃlai de synchronisation avec le serveur"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10904,68 +10977,68 @@ msgstr ""
 "DÃfinir à ÂÂvrai si vous ne souhaitez pas ajouter une sÃparation avant la "
 "signature dans la rÃdaction d'un message."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Afficher le champ ÂÂCciÂÂ lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Afficher le champ ÂÂCcÂÂ lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 "Afficher le champ ÂÂDe lors de l'envoi d'un message à un groupe de "
 "discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Afficher le champ ÂÂRÃpondre àlors de l'envoi à un groupe de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Afficher le champ ÂÂRÃpondre ÃÂÂ lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
 msgstr "Afficher tous les en-tÃtes des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
 msgstr "Affiche tous les en-tÃtes lors de l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show animated images as animations."
 msgstr "Afficher les images animÃes comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Afficher les messages supprimÃs (comme barrÃs) dans la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
 msgstr ""
 "Afficher les messages marquÃs comme supprimÃs dans la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
 msgstr "Afficher la valeur d'origine de l'en-tÃte ÂÂDateÂÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expÃditeur"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10973,7 +11046,7 @@ msgstr ""
 "Afficher le champ ÂÂCciÂÂ lors de l'envoi d'un message. Cette option est "
 "contrÃlÃe par le menu Affichage lorsqu'un compte de messagerie est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10981,7 +11054,7 @@ msgstr ""
 "Afficher le champ ÂÂCcÂÂ lors de l'envoi d'un message. Cette option est "
 "contrÃlÃe par le menu Affichage lorsqu'un compte de messagerie est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10990,7 +11063,7 @@ msgstr ""
 "discussion. Cette option est contrÃlÃe par le menu Affichage lorsqu'un "
 "compte de groupe de discussion est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10999,7 +11072,7 @@ msgstr ""
 "discussion. Cette option est contrÃlÃe par le menu Affichage lorsqu'un "
 "compte de groupe de discussion est choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11008,7 +11081,7 @@ msgstr ""
 "est contrÃlÃe par le menu Affichage lorsqu'un compte de messagerie est "
 "choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11016,7 +11089,7 @@ msgstr ""
 "Afficher le courriel de l'expÃditeur dans une colonne à part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11027,11 +11100,11 @@ msgstr ""
 "tÃte ÂÂDate dans le format prÃfÃrà de l'utilisateur et dans le fuseau "
 "horaire local."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Afficher la photo de l'expÃditeur dans le volet de lecture de message."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11050,39 +11123,43 @@ msgstr ""
 "Ãgalement respectÃe. Cela fonctionne par une comparaison de l'en-tÃte Reply-"
 "To: avec l'en-tÃte List-Post:, s'il existe."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Couleur du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "Langues du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "State of message headers in paned view"
+msgstr "Ãtat des en-tÃtes de message dans le panneau latÃral"
+
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par dÃfaut pour le traitement du pourriel"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970 (Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La derniÃre fois que la corbeille a Ãtà vidÃe, en jours depuis le 1/1/1970 "
 "(Epoch)."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11094,11 +11171,11 @@ msgstr ""
 "d'aperÃu sous la liste des messages. ÂÂ1ÂÂ (vue verticale) place le panneau "
 "d'aperÃu à cÃtà de la liste des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
 msgstr "La police de terminal pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11106,7 +11183,7 @@ msgstr ""
 "Le texte qui est insÃrà lors du transfert d'un message, indiquant que le "
 "message transfÃrà suit."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11114,7 +11191,7 @@ msgstr ""
 "Le texte qui est insÃrà lors d'une rÃponse à un message, indiquant que le "
 "message d'origine suit (top posting)."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11122,19 +11199,19 @@ msgstr ""
 "Le texte qui est insÃrà lors d'une rÃponse à un message, attribuant le "
 "message à l'auteur d'origine."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
 msgstr "La police à largeur variable pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"Cette option peut prendre les valeurs suivantesÂ: 0Âpour les erreurs, 1Âpour "
+"Cette option peut prendre les valeurs suivantesÂ: 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de dÃbogage."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11145,7 +11222,7 @@ msgstr ""
 "Cette valeur n'est utilisÃe que lorsque la clà ÂÂforce_message_limit est "
 "activÃe."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11155,7 +11232,7 @@ msgstr ""
 "soient activÃs. Si le greffon listà par dÃfaut est dÃsactivÃ, les autres "
 "greffons disponibles ne prendront pas le relais."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11163,7 +11240,7 @@ msgstr ""
 "Cette clà est lue une fois, puis dÃfinie à faux aprÃs la lecture. Cela "
 "dÃsÃlectionne le message dans la liste et supprime l'aperÃu pour ce dossier."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11175,7 +11252,7 @@ msgstr ""
 "XML est &lt;header enabled&gt; - activà si l'en-tÃte est affichà dans la vue "
 "du courriel."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11186,11 +11263,11 @@ msgstr ""
 "d'adresses local pour exclure du filtrage pourriel les courriels envoyÃs par "
 "des contacts connus."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option would help in improving the speed of fetching."
 msgstr "Cette option peut aider à accÃlÃrer la vitesse de chargement."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11198,7 +11275,7 @@ msgstr ""
 "Cela dÃfinit le nombre d'adresses à afficher dans la vue de la liste de "
 "messages par dÃfaut, au-delà duquel ÂÂ... est affichÃ."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11206,7 +11283,7 @@ msgstr ""
 "Ce paramÃtre indique si les fils de discussion doivent Ãtre dans un Ãtat "
 "Ãtendu ou compact par dÃfaut. NÃcessite un redÃmarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11216,7 +11293,7 @@ msgstr ""
 "dernier message de chaque fil de discussion, plutÃt que par date. Evolution "
 "nÃcessite un redÃmarrage."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -11226,35 +11303,27 @@ msgstr ""
 "du systÃme, habituellement ~/Images, est utilisÃ. Ce dossier est Ãgalement "
 "utilisà si le chemin fourni ne pointe pas vers un dossier existant."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
 msgstr "Liste de messages basÃe sur les sujets"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
 msgstr "DÃlai avant de marquer les messages comme vus"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
 msgstr "DÃlai avant de marquer les messages comme vus."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
 msgstr "ChaÃne UID pour le compte par dÃfaut."
 
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Couleur de soulignement des mots mal orthographiÃs lors de la vÃrification "
-"orthographique en cours de frappe."
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "Use SpamAssassin daemon and client"
-msgstr "Utiliser le dÃmon et le client Spamassassin"
-
 #: ../mail/evolution-mail.schemas.in.h:218
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Utiliser le dÃmon et le client Spamassassin (spamc/spamd)."
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr ""
+"Couleur de soulignement des mots mal orthographiÃs lors de la vÃrification "
+"orthographique en cours de frappe."
 
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Use custom fonts"
@@ -11265,14 +11334,6 @@ msgid "Use custom fonts for displaying mail."
 msgstr "Utiliser des polices personnalisÃes pour afficher le courriel."
 
 #: ../mail/evolution-mail.schemas.in.h:221
-msgid "Use only local spam tests."
-msgstr "Utiliser seulement des tests de pourriels locaux."
-
-#: ../mail/evolution-mail.schemas.in.h:222
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Utiliser seulement des tests de pourriels locaux (pas de DNS)."
-
-#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11282,7 +11343,7 @@ msgstr ""
 "curseur en rÃpondant à un message. On indique ici si le curseur doit se "
 "positionner au dÃbut ou à la fin du message."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11292,17 +11353,17 @@ msgstr ""
 "signature en rÃpondant à un message. On indique ici si elle doit Ãtre placÃe "
 "au dÃbut ou à la fin du message."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Largeur de polices variable"
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indique si une demande d'accusà de lecture doit Ãtre ajoutÃe à chaque "
 "message par dÃfaut."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11313,7 +11374,7 @@ msgstr ""
 "toutes lesÂÂ lorsqu'Evolution dÃmarre. Cette option ne peut Ãtre utilisÃe "
 "que conjointement à l'option ÂÂsend_recv_on_startÂÂ."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11321,13 +11382,13 @@ msgstr ""
 "Indique s'il faut vÃrifier la prÃsence de nouveaux messages lorsqu'Evolution "
 "dÃmarre. Cela signifie Ãgalement l'envoi des messages de la boÃte d'envoi."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indique s'il faut dÃsactiver la fonctionnalità de coupure des noms de "
 "dossier dans le panneau latÃral."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11335,13 +11396,13 @@ msgstr ""
 "Retomber ou pas sur le tri par sujet quand les messages ne contiennent pas "
 "d'en-tÃtes In-Reply-To ou References."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indique si les fils de discussion doivent Ãtre triÃs suivant le dernier "
 "message de leur fil"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11352,11 +11413,11 @@ msgstr ""
 "utilisÃe et si approximativement une minute s'est ÃcoulÃe depuis la derniÃre "
 "action invoquÃe."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Largeur du panneau de la liste des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Largeur du panneau de la liste des messages."
 
@@ -11364,89 +11425,87 @@ msgstr "Largeur du panneau de la liste des messages."
 msgid "Importing Elm data"
 msgstr "Importation des donnÃes Elm"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
-#: ../modules/mail/e-mail-shell-view.c:1044
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1051
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "Courriel"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
 msgstr "Assistant d'importation Elm d'Evolution"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
 msgstr "Importation des boÃtes à lettres de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:242
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:249
 msgid "_Destination folder:"
 msgstr "_Dossier de destinationÂ:"
 
-#: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:252
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:259
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "SÃlectionnez un dossier"
 
-#: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:253
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../mail/importers/evolution-mbox-importer.c:143
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "SÃlectionnez un dossier pour l'importation"
 
-#: ../mail/importers/evolution-mbox-importer.c:403
+#: ../mail/importers/evolution-mbox-importer.c:417
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../mail/importers/evolution-mbox-importer.c:408
+#: ../mail/importers/evolution-mbox-importer.c:422
 msgctxt "mboxImp"
 msgid "From"
 msgstr "De"
 
-#: ../mail/importers/evolution-mbox-importer.c:452
-#: ../shell/e-shell-utils.c:253
+#: ../mail/importers/evolution-mbox-importer.c:466
+#: ../shell/e-shell-utils.c:221
 msgid "Berkeley Mailbox (mbox)"
 msgstr "BoÃte à lettres Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:453
+#: ../mail/importers/evolution-mbox-importer.c:467
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boÃte à lettres Berkeley"
 
-#: ../mail/importers/mail-importer.c:65
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Importation des boÃtes à lettres"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:593
-#: ../plugins/pst-import/pst-importer.c:480
-#: ../plugins/pst-import/pst-importer.c:589
+#: ../mail/importers/mail-importer.c:153
+#: ../plugins/dbx-import/dbx-importer.c:603
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importation de ÂÂ%sÂÂ"
 
-#: ../mail/importers/mail-importer.c:308
+#: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: ../mail/importers/pine-importer.c:223
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
 msgstr "Importation des donnÃes de Pine"
 
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../mail/importers/pine-importer.c:458
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../mail/importers/pine-importer.c:462
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
 msgstr "Assistant d'importation Pine d'Evolution"
 
-#: ../mail/importers/pine-importer.c:463
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
 msgstr "Importation des boÃtes à lettres de Pine."
 
@@ -11455,7 +11514,7 @@ msgstr "Importation des boÃtes à lettres de Pine."
 msgid "Mail to %s"
 msgstr "Courriel à %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:281
 #, c-format
 msgid "Mail from %s"
 msgstr "Courriel de %s"
@@ -11465,12 +11524,12 @@ msgstr "Courriel de %s"
 msgid "Subject is %s"
 msgstr "Le sujet est %s"
 
-#: ../mail/mail-autofilter.c:303
+#: ../mail/mail-autofilter.c:305
 #, c-format
 msgid "%s mailing list"
 msgstr "Liste de diffusion %s"
 
-#: ../mail/mail-autofilter.c:394
+#: ../mail/mail-autofilter.c:414
 msgid "Add Filter Rule"
 msgstr "Ajouter une rÃgle de filtre"
 
@@ -11479,7 +11538,7 @@ msgstr "Ajouter une rÃgle de filtre"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:492
+#: ../mail/mail-autofilter.c:517
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11506,454 +11565,486 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 "_Toujours signer les messages sortants lors de l'utilisation de ce compte"
 
+#: ../mail/mail-config.ui.h:4
+msgid ""
+"All new emails with header that matches given content will be automatically "
+"filtered as junk"
+msgstr ""
+"Tous les nouveaux courriels dont les en-tÃtes correspondent au contenu donnà "
+"seront automatiquement filtrÃs comme pourriels"
+
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "Permettre à une liste de _diffusion de rediriger une rÃponse privÃe vers la "
 "liste"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "Chiffrer Ãgalement pour _moi-mÃme lors de l'envoi de messages chiffrÃs"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) ÃÂ:"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachÃe (Cc_i) ÃÂ:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Toujours faire _confiance aux clÃs de mon trousseau lors du chiffrement"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Toujours chiffrer pour _moi-mÃme lors de l'envoi de messages chiffrÃs"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Toujours demander un accusà de _lecture"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
 msgstr "Appliquer les mÃmes _paramÃtres d'affichage à tous les dossiers"
 
-#: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
 msgstr "Authentification"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
 msgstr "InsÃrer automatiquement les images de frimou_sses"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
 msgstr "Jeu de _caractÃresÂ:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "Ch_eck for Supported Types"
 msgstr "_VÃrifier les types pris en charge"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Check cu_stom headers for junk"
 msgstr "DÃtecter les pourriels en utilisant des en-tÃtes per_sonnalisÃs"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "Check for new _messages on start"
 msgstr "VÃrifier les _nouveaux messages au dÃmarrage"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check for new messa_ges in all active accounts"
 msgstr "VÃrifier les nouveaux _messages de tous les comptes actifs"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
 msgstr "DÃtecter les pourriels dans les _messages entrants"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Check spelling while I _type"
 msgstr "VÃrifier l'or_thographe pendant la frappe"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "_Effacer"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "E_ffacer"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Couleur pour les _mots mal orthographiÃsÂ:"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "RÃdaction de messages"
 
-#: ../mail/mail-config.ui.h:27
-#: ../modules/plugin-manager/evolution-plugin-manager.c:157
+#: ../mail/mail-config.ui.h:28
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Confirmer avant le nettoyage d'un dossier"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Confirmations"
 msgstr "Confirmations"
 
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:155
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../mail/mail-config.ui.h:31
+#: ../modules/addressbook/autocompletion-config.c:178
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Format de date et d'heure"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Default Behavior"
 msgstr "Comportement par dÃfaut"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Default character e_ncoding:"
 msgstr "_Codage des caractÃres par dÃfautÂ:"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Supprimer le courriel"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Supprimer les pourriels en q_uittant"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numÃriquement les messages _sortants (par dÃfaut)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:39
 msgid "Displayed Message Headers"
 msgstr "Afficher les en-tÃtes des messages"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "Ne _pas marquer les messages comme pourriel si l'expÃditeur est prÃsent dans "
 "mon carnet d'adresses"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Do not quote"
 msgstr "Ne pas citer"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
 msgstr "Dossier des _brouillonsÂ:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
 msgstr "_Adresse ÃlectroniqueÂ:"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
 msgstr "Vider les dossiers corbeille en qui_ttant"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "Certificat de _chiffrementÂ:"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Chiffrer les messages sortants (par dÃfaut)"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "F_all back to threading messages by subject"
 msgstr "Revenir au tri des messages par su_jet"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed Width Font:"
 msgstr "Police à largeur fi_xeÂ:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
 msgstr "Nom compl_etÂ:"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "RÃpondre au groupe ne rÃpond qu'Ã la liste de diffusion, si possible"
 
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "Messages HTML"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "Serveur mandataire H_TTPÂ:"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
+msgid "Header content"
+msgstr "Contenu de l'en-tÃte"
+
+#: ../mail/mail-config.ui.h:57
+msgid "Header name"
+msgstr "Nom de l'en-tÃte"
+
+#: ../mail/mail-config.ui.h:58
 msgid "Headers"
 msgstr "En-tÃtes"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "Ignorer les en-tÃtes Reply-To des listes de diffusion"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:61
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
 msgstr "Dans le corps (style Outlook)"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Ãtiquettes"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "En-tÃtes des messages"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Emplacement de la boÃte à lettres"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Affichage des messages"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
 msgid "Message Receipts"
 msgstr "AccusÃs de rÃception des messages"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "Pas de serveur mandataire _pourÂ:"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Sans chiffrement"
+
+#: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "L'option est ignorÃe si des pourriels par en-tÃtes personnalisÃs sont "
 "dÃtectÃs."
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Or_ganization:"
 msgstr "Or_ganisationÂ:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clà PGP/GPGÂ:"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
 msgstr "_Mot de passeÂ:"
 
-#: ../mail/mail-config.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../mail/mail-config.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "Port:"
 msgstr "PortÂ:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Proxy Settings"
 msgstr "RÃglages du serveur mandataire"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Quoted"
 msgstr "CitÃ"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "Re_member password"
 msgstr "_MÃmoriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
 msgid "Re_ply-To:"
 msgstr "RÃ_pondre ÃÂ:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Remember _password"
 msgstr "_MÃmoriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
 msgid "Replies and Forwards"
 msgstr "RÃponses et transferts"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "Chiffrement SSL"
+
+#: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL n'est pas pris en charge dans cette compilation d'Evolution"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
 msgstr ""
 "R_echercher la photo de l'expÃditeur uniquement dans les carnets d'adresses "
 "locaux"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_Ãlectionner..."
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:98
 msgid "S_end message receipts:"
 msgstr "_Envoie des accusÃs de rÃception des messagesÂ:"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Police par _dÃfautÂ:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "SÃlection d'une police HTML Ã largeur fixe"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
 msgstr "SÃlection d'une police HTML Ã largeur variable"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
 msgstr "Photo de l'expÃditeur"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:106
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Envoi d'une rÃponse _privÃe à un message de liste de diffusion"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Envoi d'un message contenant des _destinataires non saisis sous la forme "
 "d'adresses de courriel"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
 msgid "Sending a message with an _empty subject line"
 msgstr "Envoi d'un m_essage dÃpourvu de sujet"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Envoi d'un message oà seuls des destinataires Cc_i sont dÃfinis"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Envoi d'une rÃponse à un grand _nombre de destinataires"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyÃsÂ:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
 msgstr "_Type de serveurÂ:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:119
+msgid "Set custom junk header"
+msgstr "DÃfinir un en-tÃte de pourriels personnalisÃ"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Si_gning algorithm:"
 msgstr "Algorithme de si_gnatureÂ:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
 msgstr "Certificat de s_ignatureÂ:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
 msgstr "Signat_ureÂ:"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:124
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:125
 msgid "Signing _algorithm:"
 msgstr "Algorithme de signat_ureÂ:"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:126
 msgid "Special Folders"
 msgstr "Dossiers spÃciaux"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
 msgstr "_Commencer la rÃdaction en bas lors des rÃponses"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:129
 msgid "Start up"
 msgstr "DÃmarrage"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "Chiffrement TLS"
+
+#: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
 msgstr "T_ypeÂ:"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:132
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11961,7 +12052,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a Ãtà installÃ."
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11971,7 +12062,7 @@ msgstr ""
 "signature. Le nom indiquà ne sera utilisà que\n"
 "pour l'affichage."
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:136
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -11979,7 +12070,7 @@ msgstr ""
 "Pour aider à prÃvenir des incidents et des soucis de courriels, demander "
 "confirmation avant de prendre en compte les actions cochÃes suivantesÂ:"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11987,144 +12078,140 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez dÃsigner ce compte.\n"
 "Par exempleÂ: ÂÂTravailÂÂ ou ÂÂPersonnelÂÂ"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:139
 msgid "Us_ername:"
 msgstr "_Nom d'utilisateurÂ:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
 msgstr "Utiliser l'_authentification"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:141
 msgid "User _Name:"
 msgstr "_Nom d'utilisateurÂ:"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images à partir d'Internet"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../mail/mail-config.ui.h:141
-msgid "_Default junk plugin:"
-msgstr "_Greffon pourriel par dÃfautÂ:"
-
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:145
 msgid "_Direct connection to the Internet"
 msgstr "Connexion _directe à Internet"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les demandes de _rÃunion (compatibilità Outlook)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "Style de _transfertÂ:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
 msgstr "Dossier des _pourrielsÂ:"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr ""
 "C_onserver la signature au-dessus du message d'origine lors des rÃponses"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Langues"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
 msgstr "_Afficher les images seulement dans les messages des contacts"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "Rechercher seulement dans le carnet d'adresses _local"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par dÃfaut"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "Configuration _manuelle du serveur mandataireÂ:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images à partir d'Internet"
 
-#: ../mail/mail-config.ui.h:154
-msgid "_Path:"
-msgstr "_CheminÂ:"
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Port:"
+msgstr "_PortÂ:"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Demander l'autorisation lors de l'envoi de messages HTML Ã des contacts qui "
 "n'en veulent pas"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "Style de _rÃponse Â:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_ScriptÂ:"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "_Serveur mandataire HTTP sÃcurisÃÂ:"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "S_erveurÂ:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
 msgstr "A_fficher les images animÃes"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Afficher la photo de l'expÃditeur dans l'aperÃu du courriel"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
 msgstr "Dossier de la c_orbeilleÂ:"
 
-#: ../mail/mail-config.ui.h:165
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sÃcurisÃeÂ:"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_Utiliser les rÃglages par dÃfaut du systÃme"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mÃmes polices que dans les autres applications"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "description"
 
@@ -12144,63 +12231,64 @@ msgstr "Tous les dossiers locaux"
 msgid "Call"
 msgstr "Appel"
 
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "_AchevÃe"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Signature numÃrique"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Accord de licence"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Aucune rÃponse nÃcessaire"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "RÃpondre à tous"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Revoir"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Sources de dossier de recherche"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
 msgstr "Informations de sÃcuritÃ"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "Dossiers spÃcifiques"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12208,23 +12296,23 @@ msgstr ""
 "Les messages sÃlectionnÃs pour suivi sont listÃs ci-aprÃs.\n"
 "SÃlectionnez une action de suivi dans le menu ÂÂMarqueurÂÂ."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Accepter la licence"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Date d'ÃchÃanceÂ:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_MarqueurÂ:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:789
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -12233,204 +12321,133 @@ msgstr "Ping sur %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrage des messages sÃlectionnÃs"
 
-#: ../mail/mail-ops.c:226
+#: ../mail/mail-ops.c:205
 msgid "Fetching Mail"
 msgstr "RÃcupÃration du courriel"
 
-#: ../mail/mail-ops.c:785
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: ../mail/mail-ops.c:831
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Ãchec lors de l'envoi de %d sur %d messages"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "AnnulÃ."
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "TerminÃ."
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "DÃplacement des messages vers ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:941
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copie des messages vers ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1062
-#, c-format
-msgid "Scanning folders in '%s'"
-msgstr "Examen des dossiers dans ÂÂ%sÂÂ"
-
-#: ../mail/mail-ops.c:1178
-msgid "Forwarded messages"
-msgstr "Messages transfÃrÃs"
-
-#: ../mail/mail-ops.c:1295
-#, c-format
-msgid "Retrieving quota information for folder '%s'"
-msgstr "RÃcupÃration des informations de quota pour le dossier ÂÂ%sÂÂ"
-
-#: ../mail/mail-ops.c:1370
-#, c-format
-msgid "Opening store '%s'"
-msgstr "Ouverture du stockage ÂÂ%sÂÂ"
-
-#: ../mail/mail-ops.c:1446
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "Suppression du dossier ÂÂ%sÂÂ"
-
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1678
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1679
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1239
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualisation du dossier ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1901
+#: ../mail/mail-ops.c:1428
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Nettoyage du dossier ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1973
+#: ../mail/mail-ops.c:1513
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:1974
-msgid "Local Folders"
-msgstr "Dossiers locaux"
-
-#: ../mail/mail-ops.c:2147
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "RÃcupÃration de %d message"
-msgstr[1] "RÃcupÃration de %d messages"
-
-#: ../mail/mail-ops.c:2240
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "Enregistrement de %d message"
-msgstr[1] "Enregistrement de %d messages"
-
-#: ../mail/mail-ops.c:2336
-#, c-format
-msgid "Error saving messages to: %s:\n"
-msgstr "Erreur lors de l'enregistrement des messages versÂ: %sÂ:\n"
-
-#: ../mail/mail-ops.c:2411
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "PrÃparation du compte ÂÂ%sÂÂ pour utilisation hors ligne"
-
-#: ../mail/mail-ops.c:2502
-msgid "Checking Service"
-msgstr "Service de vÃrification"
-
-#: ../mail/mail-ops.c:2582
+#: ../mail/mail-ops.c:1615
 #, c-format
 msgid "Disconnecting %s"
 msgstr "DÃconnexion de ÂÂ%sÂÂ"
 
-#: ../mail/mail-ops.c:2639
-#, c-format
-msgid "Removing attachments"
-msgstr "Suppression des piÃces jointes"
-
-#: ../mail/mail-ops.c:2686
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "Le fichier ÂÂ%s a Ãtà supprimÃ."
-
-#: ../mail/mail-send-recv.c:191
+#: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:436
+#: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
 msgstr "Envoi et rÃception du courriel"
 
-#: ../mail/mail-send-recv.c:452
+#: ../mail/mail-send-recv.c:459
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
+#: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:903
+#: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
 
-#: ../mail/mail-tools.c:69
+#: ../mail/mail-tools.c:72
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Impossible de crÃer le dossier spool ÂÂ%sÂÂÂ: %s"
 
-#: ../mail/mail-tools.c:102
+#: ../mail/mail-tools.c:106
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentative de movemail d'une source non mbox ÂÂ%sÂÂ"
 
-#: ../mail/mail-tools.c:214
+#: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message transfÃrà - %s"
 
-#: ../mail/mail-tools.c:216
+#: ../mail/mail-tools.c:217
 msgid "Forwarded message"
 msgstr "Message transfÃrÃ"
 
-#: ../mail/mail-vfolder.c:86
+#: ../mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Mise en place du dossier de rechercheÂ: %s"
 
-#: ../mail/mail-vfolder.c:235
+#: ../mail/mail-vfolder.c:232
 #, c-format
-msgid "Updating Search Folders for '%s:%s'"
-msgstr "Mise à jour des dossiers de recherche pour ÂÂ%s:%sÂÂ"
-
-#: ../mail/mail-vfolder.c:242
-#, c-format
-msgid "Updating Search Folders for '%s'"
-msgstr "Mise à jour des dossiers de recherche pour ÂÂ%sÂÂ"
+msgid "Updating Search Folders for '%s' : %s"
+msgstr "Mise à jour des dossiers de recherche pour ÂÂ%sÂÂÂ: %s"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the URI of the
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:718
+#: ../mail/mail-vfolder.c:677
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12449,11 +12466,11 @@ msgstr[1] ""
 "%s ont Ãtà modifiÃs pour prendre en compte la suppression du dossier\n"
 "ÂÂ%sÂÂ."
 
-#: ../mail/mail-vfolder.c:1297
+#: ../mail/mail-vfolder.c:1310
 msgid "Edit Search Folder"
 msgstr "Ãditer un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1415
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
@@ -12669,23 +12686,19 @@ msgstr "Fermer la fenÃtre du message."
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:45
-msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "Supprimer les messages du dossier de recherche ÂÂ{0}ÂÂÂ?"
-
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Disable"
 msgstr "_Ne pas dÃsactiver"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Send"
 msgstr "_Ne pas envoyer"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Synchronize"
 msgstr "_Ne pas synchroniser"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -12693,34 +12706,34 @@ msgstr ""
 "DÃsirez-vous synchroniser localement les dossiers qui sont marquÃs pour une "
 "utilisation hors ligneÂ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "Voulez-vous marquer tous les messages comme lusÂ?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Voulez-vous enregistrer vos modificationsÂ?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Saisissez le mot de passe."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Erreur de chargement des dÃfinitions du filtre."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Erreur durant l'exÃcution de l'opÃration."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Erreur durant {0}."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -12739,32 +12752,63 @@ msgstr ""
 "dÃroulÃe. VÃrifiez que l'espace disque est suffisant si vous choisissez de "
 "migrer maintenant."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
 msgstr "Le format du courriel local d'Evolution a Ãtà modifiÃ."
 
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to download messages for offline viewing."
+msgstr "Ãchec lors du tÃlÃchargement des messages pour utilisation hors ligne."
+
 #: ../mail/mail.error.xml.h:64
+msgid "Failed to find duplicate messages."
+msgstr "Ãchec lors de la recherche de messages en double."
+
+#: ../mail/mail.error.xml.h:65
+msgid "Failed to open folder."
+msgstr "Ãchec lors de l'ouverture du dossier."
+
+#: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Ãchec lors de l'interrogation du serveur pour obtenir une liste des "
+"mÃcanismes d'authentification pris en charge."
+
+#: ../mail/mail.error.xml.h:67
+msgid "Failed to remove attachments from messages."
+msgstr "Ãchec lors de la suppression des piÃces jointes des messages."
+
+#: ../mail/mail.error.xml.h:68
+msgid "Failed to retrieve messages."
+msgstr "Ãchec lors de la rÃcupÃration des messages."
+
+#: ../mail/mail.error.xml.h:69
+msgid "Failed to save messages to disk."
+msgstr "Ãchec lors de l'enregistrement des messages sur le disque."
+
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "Ãchec du dÃsabonnement au dossier."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "Le fichier existe mais ne peut pas Ãtre ÃcrasÃ."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "Le fichier existe mais n'est pas un fichier rÃgulier."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Le dossier ÂÂ{0}ÂÂ ne contient pas de messages en double."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si vous continuez vous ne serez pas capable de rÃcupÃrer ces messages."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12772,19 +12816,19 @@ msgstr ""
 "Si vous supprimez le dossier, tout son contenu ainsi que le contenu de ses "
 "sous-dossiers sera dÃfinitivement supprimÃs."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Si vous supprimez le dossier, tout son contenu sera dÃfinitivement supprimÃ."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Si vous continuez, tous les comptes des mandataires seront dÃfinitivement "
 "supprimÃs."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12792,13 +12836,13 @@ msgstr ""
 "Si vous continuez, toutes les informations sur le compte\n"
 "et sur les mandataires seront dÃfinitivement supprimÃs."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Si vous continuez, toutes les informations sur le compte seront "
 "dÃfinitivement supprimÃes."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12806,23 +12850,23 @@ msgstr ""
 "Si vous quittez, ces messages ne seront pas envoyÃs avant qu'Evolution soit "
 "Ã nouveau dÃmarrÃ."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "Authentification non valide"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "Filtres du courriel automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12834,36 +12878,47 @@ msgstr ""
 "champ, s'il est ajoutÃ, listera tous les destinataires de votre message. "
 "Pour Ãviter cela, vous devriez ajouter au moins un destinataire ÃÂ: ou CcÂ:."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:88
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"Les messages affichÃs dans les dossiers de recherche ne sont pas des copies. "
+"Leur suppression du dossier de recherche supprimera les messages rÃels du ou "
+"des dossiers dans lesquels ils rÃsident physiquement. Voulez-vous vraiment "
+"supprimer ces messagesÂ?"
+
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "J_amais"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "Aucun message en double trouvÃ."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "Aucune source n'a Ãtà sÃlectionnÃe."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ouvrir trop de messages en une fois peut prendre un long moment."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "VÃrifiez les paramÃtres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Activez le compte ou bien effectuez l'envoi en utilisant un autre compte."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12872,7 +12927,7 @@ msgstr ""
 "rechercher des adresses Ãlectroniques en cliquant sur le bouton ÂÂÃÂ:ÂÂ Ã "
 "cÃtà de la boÃte de saisie."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12882,67 +12937,67 @@ msgstr ""
 "courriel HTMLÂ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "Saisissez un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ProblÃme lors de la migration de l'ancien dossier de courriel ÂÂ{0}ÂÂ."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mÃcanismes "
 "d'authentification pris en charge."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "Accusà de rÃception demandÃ."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "RÃellement supprimer le dossier ÂÂ{0}ÂÂ et tous ses sous-dossiersÂ?"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "Voulez-vous vraiment supprimer le dossier ÂÂ{0}ÂÂÂ?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "Supprimer les messages en doubleÂ?"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "RÃpondre en _privÃ"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "Dossiers de recherche automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "Envoyer une rÃponse en privÃÂ?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "Envoyer une rÃponse à tous les destinatairesÂ?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "Signature dÃjà existante"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Faut-il synchroniser localement les dossiers pour une utilisation hors "
 "ligneÂ?"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12950,7 +13005,7 @@ msgstr ""
 "Les dossiers systÃme sont nÃcessaires pour que Evolution fonctionne "
 "correctement, et ne peuvent pas Ãtre renommÃs, dÃplacÃs ou supprimÃs."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12967,7 +13022,7 @@ msgstr ""
 "champ, s'il est ajoutÃ, listera tous les destinataires de votre message. "
 "Pour Ãviter cela, vous devriez ajouter au moins un destinataire ÃÂ: ou CcÂ: "
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12976,7 +13031,7 @@ msgstr ""
 "valideÂ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12985,11 +13040,15 @@ msgstr ""
 "validesÂ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "Le fichier de script doit exister et Ãtre exÃcutable."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:126
+msgid "These messages are not copies."
+msgstr "Ces messages ne sont pas des copies."
+
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12998,7 +13057,7 @@ msgstr ""
 "si nÃcessaire, allez dans l'Ãditeur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -13006,13 +13065,13 @@ msgstr ""
 "Ce message ne peut pas Ãtre envoyà car le compte que vous avez choisi pour "
 "l'envoi n'est pas actif"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Ce message ne peut pas Ãtre envoyà car vous n'avez indiquà aucun destinataire"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13020,11 +13079,11 @@ msgstr ""
 "Le serveur ne prend pas en charge ce type d'authentification et il se peut "
 "qu'il ne prenne en charge aucune identification du tout."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "Cette signature a Ãtà modifiÃe, mais n'a pas Ãtà enregistrÃe."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13032,15 +13091,15 @@ msgstr ""
 "Marque tous les messages dans le dossier sÃlectionnÃ, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Marque tous les messages dans le dossier sÃlectionnà comme lus."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13048,33 +13107,27 @@ msgstr ""
 "Impossible d'ouvrir le dossier Brouillons pour ce compte. Voulez-vous "
 "utiliser le dossier Brouillons gÃnÃrique à la placeÂ?"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:138
+msgid "Unable to retrieve message."
+msgstr "Impossible de rÃcupÃrer le message."
+
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Utiliser le _dÃfaut"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par dÃfautÂ?"
 
-#: ../mail/mail.error.xml.h:132
-msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
-"Do you really want to do this?"
-msgstr ""
-"AttentionÂ: la suppression d'un message du dossier de recherche supprimera "
-"le message d'un de vos dossiers local ou distant.\n"
-"Est-ce vraiment ce que vous souhaitezÂ?"
-
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "Voulez-vous fermer la fenÃtre du messageÂ?"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13084,7 +13137,7 @@ msgstr ""
 "diffusion, mais la liste a Ãtà configurÃe pour rediriger toutes les rÃponses "
 "vers la liste. Voulez-vous vraiment continuerÂ?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13094,7 +13147,7 @@ msgstr ""
 "vous rÃpondez en privà à l'expÃditeur et non à la liste. Voulez-vous "
 "vraiment continuerÂ?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13102,34 +13155,34 @@ msgstr ""
 "Vous rÃpondez à un message qui a Ãtà envoyà à de nombreux destinataires. "
 "Voulez-vous vraiment rÃpondre à TOUSÂ?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr ""
 "Vous ne disposez pas des droits nÃcessaires pour supprimer ce courriel."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Certains messages n'ont pas Ãtà envoyÃs. Voulez-vous vraiment quitter le "
 "programmeÂ?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas crÃer deux comptes avec le mÃme nom."
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13139,146 +13192,154 @@ msgstr ""
 "Soit en sÃlectionnant les dossiers individuellement, et/ou en sÃlectionnant "
 "tous les dossiers locaux, tous les dossiers distants, ou les deux."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 "Votre identification sur le serveur ÂÂ{0}ÂÂ en tant que ÂÂ{0}ÂÂ a ÃchouÃ."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "_Toujours"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:149
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_DÃsactiver"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: ../mail/mail.error.xml.h:151
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "_Quitter Evolution"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "_Migrer maintenant"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "_Non"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "En_voyer un accusà de rÃception"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "_Synchroniser"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "_Oui"
 
-#: ../mail/message-list.c:1215
+#: ../mail/mail.error.xml.h:169
+msgid "{0}"
+msgstr "{0}"
+
+#: ../mail/message-list.c:1210
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1216
+#: ../mail/message-list.c:1211
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1217
+#: ../mail/message-list.c:1212
 msgid "Answered"
 msgstr "RÃpondu"
 
-#: ../mail/message-list.c:1218
+#: ../mail/message-list.c:1213
 msgid "Forwarded"
 msgstr "TransfÃrÃ"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1214
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1215
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1219
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1220
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1224
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1230
+#: ../mail/message-list.c:1225
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1849 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1831 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1856 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1838 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1865
+#: ../mail/message-list.c:1847
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1859
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1885
+#: ../mail/message-list.c:1867
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1869
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2672
+#: ../mail/message-list.c:2650
 msgid "Select all visible messages"
 msgstr "SÃlectionne tous les messages visibles"
 
-#: ../mail/message-list.c:2830 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2808 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:4003
+msgid "Follow-up"
+msgstr "Donner suite"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4498 ../mail/message-list.c:4922
+#: ../mail/message-list.c:4507 ../mail/message-list.c:4926
 msgid "Generating message list"
 msgstr "GÃnÃration de la liste des messages"
 
-#: ../mail/message-list.c:4737
+#: ../mail/message-list.c:4744
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13286,7 +13347,7 @@ msgstr ""
 "Aucun message ne remplit vos critÃres de recherche. Effacez la recherche "
 "avec le menu Recherche->Effacer ou modifiez les critÃres."
 
-#: ../mail/message-list.c:4739
+#: ../mail/message-list.c:4746
 msgid "There are no messages in this folder."
 msgstr "Il n'y a aucun message dans ce dossier."
 
@@ -13315,7 +13376,7 @@ msgid "Sent Messages"
 msgstr "Messages envoyÃs"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:568
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Size"
 msgstr "Taille"
 
@@ -13324,27 +13385,27 @@ msgid "Subject - Trimmed"
 msgstr "Sujet - TronquÃ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1508
+#: ../modules/mail/e-mail-shell-view-actions.c:1562
 msgid "Body contains"
 msgstr "Le corps contient"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1515
+#: ../modules/mail/e-mail-shell-view-actions.c:1569
 msgid "Message contains"
 msgstr "Le message contient"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "Recipients contain"
 msgstr "Les destinataires contiennent"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Sender contains"
 msgstr "L'expÃditeur contient"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Subject contains"
 msgstr "Le sujet contient"
 
@@ -13352,7 +13413,7 @@ msgstr "Le sujet contient"
 msgid "Subject or Addresses contains"
 msgstr "Le sujet ou les adresses contiennent"
 
-#: ../modules/addressbook/addressbook-config.c:205
+#: ../modules/addressbook/addressbook-config.c:207
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13360,7 +13421,7 @@ msgstr ""
 "SÃlectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge SSL."
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13368,7 +13429,7 @@ msgstr ""
 "SÃlectionner cette option signifie que Evolution se connectera à votre "
 "serveur LDAP uniquement si votre serveur LDAP prend en charge TLS."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13378,15 +13439,15 @@ msgstr ""
 "SSL ni TLS. Cela signifie que votre connexion ne sera pas sÃcurisÃe et que "
 "vous serez vulnÃrable aux failles de sÃcuritÃ."
 
-#: ../modules/addressbook/addressbook-config.c:608
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utiliser dans le calendrier _Anniversaires"
 
-#: ../modules/addressbook/addressbook-config.c:644
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "Copier localement le contenu du _carnet pour les opÃrations hors ligne"
 
-#: ../modules/addressbook/addressbook-config.c:751
+#: ../modules/addressbook/addressbook-config.c:778
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13396,7 +13457,7 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur systÃme le port à utiliser."
 
-#: ../modules/addressbook/addressbook-config.c:825
+#: ../modules/addressbook/addressbook-config.c:857
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13406,7 +13467,7 @@ msgstr ""
 "Notez qu'indiquer ÂÂAdresse Ãlectronique implique l'accÃs anonyme à votre "
 "serveur LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:900
+#: ../modules/addressbook/addressbook-config.c:937
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13418,29 +13479,29 @@ msgstr ""
 "les entrÃes sous la base de recherche. Un domaine de recherche ÂÂoneÂÂ "
 "inclura les entrÃes se trouvant un niveau en dessous de la base."
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../modules/addressbook/addressbook-config.c:1021
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "DÃtails"
 
-#: ../modules/addressbook/addressbook-config.c:1022
-#: ../modules/mail/e-mail-shell-view.c:54
+#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "TÃlÃchargement"
 
-#: ../modules/addressbook/addressbook-config.c:1230
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "PropriÃtÃs du carnet d'adresses"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -13487,10 +13548,14 @@ msgid "Show autocompleted name with an address"
 msgstr "Afficher le nom autocomplÃtà avec une adresse"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Show maps"
+msgstr "Afficher les cartes"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
 msgstr "Afficher le panneau d'aperÃu"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13498,7 +13563,7 @@ msgstr ""
 "L'UID du carnet d'adresses sÃlectionnà (ou ÂÂprincipalÂÂ) dans le panneau "
 "latÃral de la vue ÂÂContactsÂÂ."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13510,7 +13575,7 @@ msgstr ""
 "d'aperÃu sous la liste des contacts. ÂÂ1ÂÂ (vue verticale) place le panneau "
 "d'aperÃu à cÃtà de la liste des contacts."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13518,17 +13583,17 @@ msgstr ""
 "Le nombre de caractÃres qui doivent Ãtre saisis avant qu'Evolution essaye de "
 "complÃter."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "L'URI du dossier utilisà en dernier dans le dialogue de sÃlection de noms"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "L'URI du dossier utilisà en dernier dans le dialogue de sÃlection de noms."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13536,333 +13601,359 @@ msgstr ""
 "Indique s'il faut forcer l'affichage de l'adresse Ãlectronique avec le nom "
 "du contact autocomplÃtà dans la zone de saisie."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether to show maps in preview pane."
+msgstr "Indique s'il faut afficher les cartes dans le panneau d'aperÃu."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
 msgstr "Indique s'il faut afficher le panneau d'aperÃu."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:161
-#: ../modules/mail/em-mailer-prefs.c:1140
+#: ../modules/addressbook/autocompletion-config.c:184
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "Colonne de _tableauÂ:"
 
-#: ../modules/addressbook/autocompletion-config.c:164
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "ComplÃtion automatique"
 
-#: ../modules/addressbook/autocompletion-config.c:167
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "Toujours _afficher l'adresse du contact autocomplÃtÃ"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:94
-#: ../modules/addressbook/e-book-shell-migrate.c:153
+#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:278
-#: ../modules/addressbook/e-book-shell-view-actions.c:773
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
 msgstr "CrÃe un nouveau contact"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
 msgstr "_Liste de contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
-#: ../modules/addressbook/e-book-shell-view-actions.c:780
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
 msgstr "CrÃe une nouvelle liste de contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Carnet d'_adresses"
 
-#: ../modules/addressbook/e-book-shell-backend.c:295
-#: ../modules/addressbook/e-book-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-backend.c:321
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
 msgstr "CrÃe un nouveau carnet d'adresses"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:312
-#: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:105
-#: ../modules/calendar/e-cal-shell-migrate.c:59
+#: ../modules/addressbook/e-book-shell-backend.c:338
+#: ../modules/addressbook/e-book-shell-view.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:322
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
 msgstr "Certificats"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:549
+#: ../modules/addressbook/e-book-shell-view-actions.c:387
+#: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
 msgstr "Enregistrer comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
 msgstr "Co_pier tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Copie les contacts du carnet d'adresses sÃlectionnà dans un autre"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
 msgstr "_Supprimer le carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:689
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
 msgstr "Supprime le carnet d'adresses sÃlectionnÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
 msgstr "DÃpla_cer tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
 msgstr "DÃplace les contacts du carnet d'adresses sÃlectionnà dans un autre"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address _Book Properties"
 msgstr "PropriÃtÃs du _carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
 msgstr "Affiche les propriÃtÃs du carnet d'adresses sÃlectionnÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
-#: ../modules/calendar/e-task-shell-view-actions.c:750
-#: ../modules/mail/e-mail-shell-view-actions.c:1155
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+msgid "Address Book _Map"
+msgstr "_Carte du carnet d'adresses"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+msgid "Show map with all contacts from selected address book"
+msgstr ""
+"Affiche la carte avec tous les contacts du carnet d'adresses sÃlectionnÃ"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:717
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
 msgstr "Renomme le carnet d'adresses sÃlectionnÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
-msgid "S_ave Address Book as vCard"
-msgstr "_Enregistrer le carnet d'adresses comme vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:724
-msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Enregistre les contacts du carnet d'adresses sÃlectionnà comme vCard"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:731
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
 msgstr "ArrÃte le chargement"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Copy Contact To..."
 msgstr "_Copier le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:738
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
 msgstr "Copie les contacts sÃlectionnÃs dans un autre carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
 msgstr "_Supprimer le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Find in Contact..."
 msgstr "_Rechercher dans le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:752
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
 msgstr "Recherche du texte dans le contact affichÃ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
 msgstr "_Faire suivre le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
 msgstr "Envoie les contacts sÃlectionnÃs à une autre personne"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
 msgstr "_DÃplacer le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:766
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
 msgstr "DÃplace les contacts sÃlectionnÃs dans un autre carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
 msgstr "_Ouvrir le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:787
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
 msgstr "Affiche le contact actuel"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
 msgstr "Envoyer un _message au contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:794
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
 msgstr "Envoie un message aux contacts sÃlectionnÃs"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "A_ctions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
-#: ../modules/calendar/e-task-shell-view-actions.c:815
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Preview"
 msgstr "_AperÃu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
-#: ../modules/calendar/e-memo-shell-view-actions.c:676
-#: ../modules/calendar/e-task-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "_Properties"
 msgstr "_PropriÃtÃs"
 
-#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:830
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-msgid "_Save as vCard..."
-msgstr "_Enregistrer comme vCard..."
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+msgid "Address Book Map"
+msgstr "Carte du carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:858
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
 msgstr "_AperÃu du contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
 msgstr "Affiche la fenÃtre de prÃvisualisation des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:897
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
+msgid "Show _Maps"
+msgstr "Afficher les _cartes"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
+msgid "Show maps in contact preview window"
+msgstr "Affiche les cartes dans la fenÃtre d'aperÃu des contacts"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "_Classic View"
 msgstr "Affichage _classique"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
 msgstr "Affiche l'aperÃu du contact sous la liste des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:904
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "_Vertical View"
 msgstr "Affichage _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
 msgstr "Affiche l'aperÃu du contact à cÃtà de la liste des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "Toutes les catÃgories"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "DiffÃrent"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:966
-#: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Recherche avancÃe"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Print all shown contacts"
 msgstr "Imprime tous les contacts visibles"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Preview the contacts to be printed"
 msgstr "PrÃvisualise les contacts à imprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "Print selected contacts"
 msgstr "Imprime les contacts sÃlectionnÃs"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+msgid "S_ave Address Book as vCard"
+msgstr "_Enregistrer le carnet d'adresses comme vCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "Enregistre les contacts du carnet d'adresses sÃlectionnà comme vCard"
+
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:1122
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+msgid "_Save as vCard..."
+msgstr "_Enregistrer comme vCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1124
 msgid "Save selected contacts as a vCard"
 msgstr "Enregistre les contacts sÃlectionnÃs comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Forward Contacts"
 msgstr "_Faire suivre les contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contact"
 msgstr "_Faire suivre le contact"
 
-#: ../modules/addressbook/e-book-shell-view.c:378
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contacts"
 msgstr "Envoyer un _message aux contacts"
 
-#: ../modules/addressbook/e-book-shell-view.c:380
+#: ../modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to List"
 msgstr "Envoyer un _message à la liste"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
-#: ../modules/addressbook/eab-composer-util.c:143
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "vCards multiples"
 
-#: ../modules/addressbook/eab-composer-util.c:151
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "vCard pour %s"
 
-#: ../modules/addressbook/eab-composer-util.c:163
-#: ../modules/addressbook/eab-composer-util.c:190
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Informations sur le contact"
 
-#: ../modules/addressbook/eab-composer-util.c:192
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
@@ -13947,10 +14038,6 @@ msgstr "_Trouver les bases de recherche possibles"
 msgid "_Login method:"
 msgstr "_MÃthode d'identificationÂ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "_PortÂ:"
-
 #: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Domain_e de rechercheÂ:"
@@ -13959,14 +14046,48 @@ msgstr "Domain_e de rechercheÂ:"
 msgid "_Timeout:"
 msgstr "_DÃlaiÂ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Utiliser une connexion sÃcurisÃeÂ:"
-
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cartes"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Ãchec du lancement de Bogofilter (%s)Â: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr ""
+"Ãchec lors du filtrage du contenu des courriels en utilisant BogofilterÂ: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Ãchec ou arrÃt brutal de Bogofilter lors du traitement d'un courriel"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Options de Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Convertir le texte du message en _Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Convertit les messages en Unicode"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Convertit le texte des messages en Unicode UTF-8 pour unifier les balises "
+"spam/ham provenant de diffÃrents jeux de caractÃres."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -13998,38 +14119,43 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alerts"
 msgstr "Alertes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Day _ends:"
 msgstr "La journÃe se _termine ÃÂ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "Days"
 msgstr "Jours"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Default Free/Busy Server"
 msgstr "Serveur Libre/Occupà par dÃfaut"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Display"
 msgstr "Affichage"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "Afficher les alarmes dans la zone de _notification uniquement"
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display reminders in _notification area only"
+msgstr "Afficher les rappels dans la zone de _notification uniquement"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Hours"
 msgstr "Heures"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
 msgid "Minutes"
 msgstr "Minutes"
 
+# Titre d'onglet
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Publishing Information"
+msgstr "Publication d'informations"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "S_un"
@@ -14044,8 +14170,8 @@ msgid "Se_cond zone:"
 msgstr "DeuxiÃme f_useauÂ:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "SÃlectionnez les calendriers pour les notifications d'alarme"
+msgid "Select the calendars for reminder notification"
+msgstr "SÃlectionnez les calendriers pour les notifications de rappel"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
@@ -14076,269 +14202,265 @@ msgstr "TÃches d'_aujourd'huiÂ:"
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "ModÃleÂ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Heure"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Format de dateÂ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Utiliser le fuseau horaire du s_ystÃme"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
-msgstr "La s_emaine dÃbuteÂunÂ:"
+msgstr "La s_emaine dÃbute unÂ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "Sem. de travail"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Jours ouvrÃsÂ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des ÃlÃments"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "La _journÃe dÃbute ÃÂ:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Masquer les tÃches effectuÃes aprÃs"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "TÃches en _retardÂ:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "_Sam"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr ""
 "_Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Di_visions horairesÂ:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "M_er"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "avant chaque anniversaire"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ExÃcutions par alarme"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "Demander une confirmation pour la suppression des ÃlÃments"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
 "Couleur des tÃches qui sont à effectuer aujourd'hui, dans le format "
 "ÂÂ#rrggbbÂÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Couleur des tÃches qui sont en retard, dans le format ÂÂ#rrggbbÂÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "Rappel des anniversaires"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "UnitÃs pour le rappel des anniversaires"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "Valeur pour le rappel des anniversaires"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "Calendriers pour lesquels lancer les alarmes"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "Calendriers pour lesquels lancer les rappels"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Couleur de la ligne de l'heure actuelle (MBL) dans la barre de temps (vide "
 "par dÃfaut)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr ""
 "Couleur de la ligne de l'heure actuelle (MBL) dans l'affichage du jour."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "Compresser les week-ends dans la vue mensuelle"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Confirmer le nettoyage"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
 "Jours pour lesquels les heures de dÃbut et de fin du travail doivent Ãtre "
 "indiquÃes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Rappel par dÃfaut des rendez-vous"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "UnitÃs par dÃfaut du rappel"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valeur par dÃfaut du rappel"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "RÃpertoire de sauvegarde des fichiers d'alarmes audio"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "RÃpertoire de sauvegarde des fichiers audio de rappel"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "URL des serveurs Libre/OccupÃ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "URL du modÃle Libre/OccupÃ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Masquer les tÃches terminÃes"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Masquer les unitÃs des tÃches"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Masquer la valeur de la tÃche"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Position du panneau horizontal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Heure à laquelle la journÃe de travail se termine, dans le format 24 heures, "
 "de 0 Ã 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Heure à laquelle la journÃe de travail commence, dans le format 24 heures, "
 "de 0 Ã 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr ""
 "Si ÂÂvraiÂÂ, le panneau d'aperÃu des mÃmos est affichà dans la fenÃtre "
 "principale."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr ""
 "Si ÂÂvraiÂÂ, le panneau d'aperÃu des tÃches est affichà dans la fenÃtre "
 "principale."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Intervalles affichÃs dans les vues quotidiennes et hebdomadaires de travail, "
 "en minutes."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "Dernier dÃclenchement de l'alarme"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "Dernier dÃclenchement du rappel"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 "Liste des fuseaux horaires secondaires rÃcemment utilisÃs dans une vue "
 "quotidienne."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste des URL des serveurs pour les publications des informations de type "
 "Libre/OccupÃ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure actuelle (MBL)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Vue du jour"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Barre de temps"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14346,55 +14468,55 @@ msgstr ""
 "Nombre maximum de fuseaux horaires rÃcemment utilisÃs à enregistrer dans une "
 "liste ÂÂday_second_zonesÂÂ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Nombre maximum de fuseaux horaires rÃcemment utilisÃs à enregistrer."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Style de l'agencement des mÃmos"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position du panneau d'aperÃu des mÃmos (horizontale)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "Position du panneau d'aperÃu des mÃmos (verticale)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute à laquelle les journÃes de travail se terminent, de 0 à 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute à laquelle les journÃes de travail commencent, de 0 à 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Position du panneau horizontal dans la vue mensuelle"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "Position du panneau vertical dans la vue mensuelle"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "Nombre d'unitÃs pour dÃterminer un rappel d'anniversaire."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Nombre d'unitÃs pour dÃterminer un rappel par dÃfaut."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nombre d'unitÃs pour dÃterminer quand masquer les tÃches."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Couleur des tÃches en retard"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14402,7 +14524,7 @@ msgstr ""
 "Position du panneau horizontal hors vue mensuelle, entre le navigateur de "
 "dates du calendrier et la liste des tÃches, en pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14410,21 +14532,21 @@ msgstr ""
 "Position du panneau horizontal en vue mensuelle, entre le navigateur de vues "
 "et de dates du calendrier et la liste des tÃches, en pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Position du panneau d'aperÃu des mÃmos pour une orientation verticale."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Position du panneau d'aperÃu des tÃches pour une orientation horizontale."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Position du panneau d'aperÃu des tÃches pour une orientation verticale."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14432,7 +14554,7 @@ msgstr ""
 "Position du panneau vertical, entre les listes du calendrier, et le "
 "navigateur de dates du calendrier."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14440,7 +14562,7 @@ msgstr ""
 "Position du panneau vertical en vue mensuelle, entre le navigateur de vues "
 "et de dates du calendrier et la liste des tÃches, en pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -14448,34 +14570,38 @@ msgstr ""
 "Position du panneau vertical hors vue mensuelle, entre le navigateur de vues "
 "et de dates du calendrier et la liste des tÃches, en pixels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Calendrier principal"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Liste principale de mÃmos"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Liste principale de tÃches"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "Programmes qui peuvent Ãtre lancÃs par les alarmes."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "Programmes qui peuvent Ãtre lancÃs par les rappels."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fuseaux horaires secondaires rÃcemment utilisÃs dans une vue quotidienne"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "ÃvÃnements rÃcurrents en italique"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "Programmes de rappel"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "RÃpertoire de sauvegarde des alarmes audio"
+msgid "Save directory for reminder audio"
+msgstr "RÃpertoire de sauvegarde des rappels audio"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14508,8 +14634,8 @@ msgstr ""
 "dans le calendrier en bas à gauche."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "Afficher les alarmes dans la zone de notification"
+msgid "Show display reminders in notification tray"
+msgstr "Afficher les rappels dans la zone de notification"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14635,7 +14761,7 @@ msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr ""
-"Cette option peut prendre les valeurs suivantesÂ: 0Âpour les erreurs, 1Âpour "
+"Cette option peut prendre les valeurs suivantesÂ: 0 pour les erreurs, 1 pour "
 "les avertissements et 2 pour les messages de dÃbogage."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
@@ -14643,8 +14769,8 @@ msgid "Time divisions"
 msgstr "Divisions horaires"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "Heure à laquelle la derniÃre alarme a Ãtà lancÃe, en time_t."
+msgid "Time the last reminder ran, in time_t."
+msgstr "Heure à laquelle le dernier rappel a Ãtà lancÃ, en time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14693,10 +14819,10 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Jour de dÃbut de la semaine, de dimanche (0) Ã samedi (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr ""
 "Indique s'il faut utiliser une icÃne de notification pour afficher les "
-"alarmes."
+"rappels."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14818,114 +14944,125 @@ msgstr "Heure à laquelle les jours ouvrÃs commencent"
 msgid "Workday start minute"
 msgstr "Minute à laquelle les jours ouvrÃs commencent"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:267
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:348
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "SÃlectionner un calendrier"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:375
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "SÃlectionner une liste de tÃches"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "I_mporter dans le calendrier"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:392
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "I_mporter dans les tÃches"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+msgid "Selected Calendars for Reminders"
+msgstr "Calendriers sÃlectionnÃs pour les rappels"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "Ti_me and date:"
+msgstr "Date et _heureÂ:"
+
+#: ../modules/calendar/e-calendar-preferences.c:842
+msgid "_Date only:"
+msgstr "_Date uniquementÂ:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:107
-#: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:160
+#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-migrate.c:198
+#: ../modules/calendar/e-memo-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-migrate.c:152
+#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "Sur le Web"
 
-#: ../modules/calendar/e-cal-shell-backend.c:109
-#: ../plugins/calendar-weather/calendar-weather.c:121
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "MÃtÃo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:196
-#: ../modules/calendar/e-cal-shell-migrate.c:62
+#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
-#: ../modules/calendar/e-cal-shell-backend.c:421
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "CrÃe un nouveau rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-backend.c:428
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Rendez-vous toute la _journÃe"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "CrÃe un nouveau rendez-vous toute la journÃe"
 
-#: ../modules/calendar/e-cal-shell-backend.c:435
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_RÃunion"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "CrÃe une nouvelle demande de rÃunion"
 
-#: ../modules/calendar/e-cal-shell-backend.c:445
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Calendrier"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "CrÃe un nouveau calendrier"
 
-#: ../modules/calendar/e-cal-shell-backend.c:750
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tÃches"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:221
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "Chargement des calendriers"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:636
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
 msgstr "_Nouveau calendrier..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:653
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "SÃlecteur de calendrier"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:998
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:218
-#: ../modules/calendar/e-cal-shell-view-actions.c:247
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Imprimer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:306
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14937,306 +15074,309 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Nettoyer les ÃvÃnements plus vieux que"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:534
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "Copie d'ÃlÃments"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 msgid "Moving Items"
 msgstr "DÃplacement d'ÃlÃments"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "ÃvÃnement"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1133
-#: ../modules/calendar/e-cal-shell-view-memopad.c:216
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:510
-#: ../modules/calendar/e-task-shell-view-actions.c:627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-memopad.c:220
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
 msgstr "Enregistrer comme iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "Supprim_er le calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
 msgstr "Supprime le calendrier sÃlectionnÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "En arriÃre"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "En avant"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "SÃlectionne le jour d'aujourd'hui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "SÃlectionner une _date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
 msgstr "SÃlectionne une date prÃcise"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
-#: ../modules/calendar/e-task-shell-view-actions.c:799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "Nettoy_er"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
 msgstr "Nettoie les anciens rendez-vous et les anciennes rÃunions"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-#: ../modules/calendar/e-task-shell-view-actions.c:743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
 msgstr "Actualise le calendrier sÃlectionnÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
 msgstr "Renomme le calendrier sÃlectionnÃ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "Afficher _uniquement ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "DÃlÃguer une _rÃunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "Su_pprimer le rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
 msgstr "Supprime les rendez-vous sÃlectionnÃs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
 msgstr "Supprime cette occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
 msgstr "Supprime toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "Nouvel ÃvÃn_ement toute la journÃe..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
 msgstr "CrÃe un nouvel ÃvÃnement toute la journÃe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "Nouvelle _rÃunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
 msgstr "CrÃe une nouvelle rÃunion"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "DÃplacer _vers le calendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _dÃplaÃable"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "_Ouvrir un rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
 msgstr "Affiche le rendez-vous actuel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "_RÃpondre"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-msgid "Save as iCalendar..."
-msgstr "Enregistrer comme iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _rÃunion..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
 msgstr "Convertit un rendez-vous en rÃunion"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ertir en rendez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
 msgstr "Convertit une rÃunion en rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "Jour"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "Affiche une journÃe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "Affiche comme une liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "Mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "Affiche un mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "Semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "Affiche une semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "Affiche une semaine de travail"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
-#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1707
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "Le rÃsumà contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "Imprime ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "PrÃvisualise le calendrier à imprimer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1799
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "_Save as iCalendar..."
+msgstr "_Enregistrer comme iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 msgid "Go To"
 msgstr "Aller Ã"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:214
-#: ../modules/calendar/e-memo-shell-view-actions.c:508
+#: ../modules/calendar/e-cal-shell-view-memopad.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "mÃmo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-memopad.c:261
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "Nouveau _mÃmo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
 msgstr "CrÃe un nouveau mÃmo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-memopad.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "_Ouvrir le mÃmo"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:266
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
 msgstr "Affiche le mÃmo sÃlectionnÃ"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-memo-shell-view-actions.c:654
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:290
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-memopad.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
 msgstr "Imprime le mÃmo sÃlectionnÃ"
 
@@ -15244,247 +15384,229 @@ msgstr "Imprime le mÃmo sÃlectionnÃ"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "tÃche"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "_Attribuer une tÃche"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminÃ"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
 msgstr "Marque les tÃches sÃlectionnÃes comme terminÃes"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
 msgstr "Marque les tÃches sÃlectionnÃes comme incomplÃtes"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "Nouvelle _tÃche"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:282
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
 msgstr "CrÃe une nouvelle tÃche"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "_Ouvrir une tÃche"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
 msgstr "Affiche les tÃches sÃlectionnÃes"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
 #: ../modules/calendar/e-task-shell-view-actions.c:1028
-msgid "_Save as iCalendar..."
-msgstr "_Enregistrer comme iCalendar..."
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "Imprime la tÃche sÃlectionnÃe"
 
-#: ../modules/calendar/e-calendar-preferences.c:437
-msgid "Selected Calendars for Alarms"
-msgstr "Calendriers sÃlectionnÃs pour les alarmes"
-
-#: ../modules/calendar/e-calendar-preferences.c:836
-msgid "Ti_me and date:"
-msgstr "Date et _heureÂ:"
-
-#: ../modules/calendar/e-calendar-preferences.c:837
-msgid "_Date only:"
-msgstr "_Date uniquementÂ:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:281
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "MÃm_o"
 
-#: ../modules/calendar/e-memo-shell-backend.c:288
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "MÃmo _partagÃ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:290
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
 msgstr "CrÃe un nouveau mÃmo partagÃ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Li_ste de mÃmos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
 msgstr "CrÃe une nouvelle liste de mÃmos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:216
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
 msgstr "Chargement des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:578
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "SÃlecteur de liste de mÃmos"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:885
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ouverture des mÃmos de %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Imprimer les mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:570
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "_Supprimer le mÃmo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:577
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "_Rechercher dans le mÃmo..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
 msgstr "Recherche un texte dans le mÃmo affichÃ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
 msgstr "Su_pprimer la liste de mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
 msgstr "Supprime la liste de mÃmos sÃlectionnÃe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "_Nouvelle liste de mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
 msgstr "Actualise la liste de mÃmos sÃlectionnÃe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
 msgstr "Renomme la liste de mÃmos sÃlectionnÃe"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "Afficher _uniquement cette liste de mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:712
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "_AperÃu des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
 msgstr "Affiche le panneau d'aperÃu des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:735
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
 msgstr "Affiche l'aperÃu des mÃmos sous la liste des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:742
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
 msgstr "Affiche l'aperÃu des mÃmos à cÃtà de la liste des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:800
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
 msgstr "Imprime la liste des mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:807
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
 msgstr "PrÃvisualise la liste des mÃmos à imprimer"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "Supprimer les mÃmos"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "Supprimer le mÃmo"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d mÃmo"
 msgstr[1] "%d mÃmos"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:424
-#: ../modules/calendar/e-task-shell-view-private.c:575
+#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
 msgstr "%d sÃlectionnÃ(s)"
 
-#: ../modules/calendar/e-memo-shell-view.c:223
-msgid "Delete Memos"
-msgstr "Supprimer les mÃmos"
-
-#: ../modules/calendar/e-memo-shell-view.c:225
-msgid "Delete Memo"
-msgstr "Supprimer le mÃmo"
-
-#: ../modules/calendar/e-task-shell-backend.c:280
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_TÃche"
 
-#: ../modules/calendar/e-task-shell-backend.c:287
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "TÃche _attribuÃe"
 
-#: ../modules/calendar/e-task-shell-backend.c:289
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
 msgstr "CrÃe une nouvelle tÃche attribuÃe"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Liste de _tÃches"
 
-#: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
 msgstr "CrÃe une nouvelle liste de tÃches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:216
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
 msgstr "Chargement des tÃches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:578
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "SÃlecteur de liste de tÃches"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:885
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tÃches à %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:241
-#: ../modules/calendar/e-task-shell-view-actions.c:256
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Imprimer les tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:569
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15496,617 +15618,584 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tÃchesÂ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:591
+msgid "Do not ask me again"
+msgstr "Ne plus poser la question"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "_Supprimer la tÃche"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "_Rechercher dans la tÃche..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "Recherche du texte dans la tÃche affichÃe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "Copier..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:722
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "S_upprimer la liste des tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
 msgstr "Supprime la liste de tÃches sÃlectionnÃe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
 msgstr "Actualise la liste de tÃches sÃlectionnÃe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
 msgstr "Renomme la liste de tÃches sÃlectionnÃe"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "Afficher _uniquement cette liste de tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
 msgstr "Supprime les tÃches terminÃes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:876
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "A_perÃu de la tÃche"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:878
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
 msgstr "Afficher le panneau d'aperÃu des tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:899
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
 msgstr "Affiche l'aperÃu des tÃches sous la liste des tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:906
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
 msgstr "Affiche l'aperÃu des tÃches à cÃtà de la liste des tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "TÃches actuelles"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:928
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "TÃches terminÃes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "TÃches des 7 prochains jours"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "TÃches en retard"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:949
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "TÃches avec des piÃces jointes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:999
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
 msgstr "Imprime la liste de tÃches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1006
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Preview the list of tasks to be printed"
 msgstr "PrÃvisualise la liste de tÃches à imprimer"
 
-#: ../modules/calendar/e-task-shell-view-private.c:468
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "Supprimer les tÃches"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "Supprimer la tÃche"
+
+#: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: ../modules/calendar/e-task-shell-view-private.c:571
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tÃche"
 msgstr[1] "%d tÃches"
 
-#: ../modules/calendar/e-task-shell-view.c:358
-msgid "Delete Tasks"
-msgstr "Supprimer les tÃches"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "Assistant de compte d'Evolution"
 
-#: ../modules/calendar/e-task-shell-view.c:360
-msgid "Delete Task"
-msgstr "Supprimer la tÃche"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "Ãditeur de comptes"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:382
+#: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
 msgstr "%d messages joints"
 
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "Aucun"
-
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:185
+#: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
 msgstr "RÃdiger un nouveau courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:193
+#: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
 msgstr "CrÃe un nouveau dossier pour le courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:494
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../modules/mail/e-mail-shell-backend.c:502
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "PrÃfÃrences du courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:510
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "PrÃfÃrences de l'Ãditeur"
 
-#: ../modules/mail/e-mail-shell-backend.c:518
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "PrÃfÃrences rÃseau"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
-#: ../modules/mail/e-mail-shell-view.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_DÃsactiver le compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Disable this account"
 msgstr "DÃsactiver ce compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Supprime dÃfinitivement les messages effacÃs de tous les dossiers"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1078
-msgid "C_reate Search Folder From Search..."
-msgstr "CrÃer un dossier de _recherche à partir d'une recherche..."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1085
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "_TÃlÃcharger les messages pour utilisation hors ligne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "TÃlÃcharge les messages des comptes et dossiers marquÃs pour utilisation "
 "hors ligne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1092
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boÃte d'envoi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "_Copier le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "Copie le dossier sÃlectionnà vers un autre dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "Supprime dÃfinitivement ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1113
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "Nettoy_er"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Supprime dÃfinitivement les messages effacÃs de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_quer tous les messages comme lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "Marque tous les messages du dossier comme lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "_DÃplacer le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "DÃplace le dossier sÃlectionnà vers un autre dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1134
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "_Nouveau..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "CrÃe un nouveau dossier pour stocker les courriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "Modifie les propriÃtÃs de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1150
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "Actualise le contenu du dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "Modifie le nom de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Select Message _Thread"
 msgstr "SÃlectionner le _fil de discussion de ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "SÃlectionne tous les messages dans le mÃme fil de discussion que le message "
 "sÃlectionnÃ"
 
 # _tip="Select all replies to the currently selected message"
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message S_ubthread"
 msgstr "SÃlectionner les rÃ_ponses à ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all replies to the currently selected message"
 msgstr "SÃlectionne toutes les rÃponses au message actuellement sÃlectionnÃ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1183
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Supprime dÃfinitivement les messages effacÃs de tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "_New Label"
 msgstr "_Nouvelle Ãtiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "N_one"
 msgstr "_Aucun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "_Manage Subscriptions"
 msgstr "_GÃrer les abonnements"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonne ou dÃsabonne aux dossiers sur les serveurs distants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send / _Receive"
 msgstr "Envoyer / _Recevoir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Send queued items and retrieve new items"
 msgstr "Envoie les courriels en attente et rÃcupÃre les nouveaux"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "R_eceive All"
 msgstr "Tout r_ecevoir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Receive new items from all accounts"
 msgstr "Recevoir les nouveaux ÃlÃments de tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_Send All"
 msgstr "_Tout envoyer"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Send queued items in all accounts"
 msgstr "Envoie les courriels en attente de tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:311
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Cancel the current mail operation"
 msgstr "Annule l'opÃration de messagerie en cours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Collapse All _Threads"
 msgstr "Grouper tous les _fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Collapse all message threads"
 msgstr "Groupe tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1276
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "E_xpand All Threads"
 msgstr "DÃ_plier tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Expand all message threads"
 msgstr "DÃplie tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "_Message Filters"
 msgstr "Filtres de _message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Create or edit rules for filtering new mail"
 msgstr "CrÃe ou modifie les rÃgles pour filtrer les nouveaux courriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
-msgid "Search F_olders"
-msgstr "D_ossiers de recherche"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
-msgid "Create or edit search folder definitions"
-msgstr "CrÃe ou modifie les dÃfinitions de dossiers de recherche"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1297
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_Subscriptions..."
 msgstr "_Abonnements..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Label"
 msgstr "Ã_tiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1353
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
+msgid "C_reate Search Folder From Search..."
+msgstr "CrÃer un dossier de _recherche à partir d'une recherche..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
+msgid "Search F_olders"
+msgstr "D_ossiers de recherche"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
+msgid "Create or edit search folder definitions"
+msgstr "CrÃe ou modifie les dÃfinitions de dossiers de recherche"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1381
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show Message _Preview"
 msgstr "Afficher l'a_perÃu du message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1383
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
 msgid "Show message preview pane"
 msgstr "Affiche le panneau de prÃvisualisation des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show _Deleted Messages"
 msgstr "Affiche les messages _supprimÃs"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1445
 msgid "Show deleted messages with a line through them"
 msgstr "Afficher les messages supprimÃs comme barrÃs"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1397
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "_Group By Threads"
 msgstr "_Grouper par fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "Threaded message list"
 msgstr "Liste les messages par fil de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1420
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Show message preview below the message list"
 msgstr "Affiche l'aperÃu du message sous la liste des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1427
+#: ../modules/mail/e-mail-shell-view-actions.c:1481
 msgid "Show message preview alongside the message list"
 msgstr "Affiche l'aperÃu du message à cÃtà de la liste des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1489
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1496
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1449
+#: ../modules/mail/e-mail-shell-view-actions.c:1503
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1456
+#: ../modules/mail/e-mail-shell-view-actions.c:1510
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Messages with Attachments"
 msgstr "Messages avec une piÃce jointe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "No Label"
 msgstr "Aucune Ãtiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Recent Messages"
 msgstr "Messages rÃcents"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "Subject or Addresses contain"
 msgstr "Le sujet ou les adresses contiennent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1553
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Rechercher dans tous les comptes"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Rechercher dans un compte"
+
+#: ../modules/mail/e-mail-shell-view.c:958
+msgid "Proxy _Logout"
+msgstr "_DÃconnecter le mandataire"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d sÃlectionnÃ, "
 msgstr[1] "%d sÃlectionnÃs, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d supprimÃ"
 msgstr[1] "%d supprimÃs"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d pourriel"
 msgstr[1] "%d pourriels"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1079
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d brouillon"
 msgstr[1] "%d brouillons"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d non envoyÃ"
 msgstr[1] "%d non envoyÃs"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1091
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d envoyÃ"
 msgstr[1] "%d envoyÃs"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
-msgstr[0] "%d non lu,"
-msgstr[1] "%d non lus,"
+msgstr[0] "%d non lu, "
+msgstr[1] "%d non lus, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1126
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "Corbeille"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1600
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "Envoyer / Recevoir"
 
-#: ../modules/mail/e-mail-shell-view.c:563
-msgid "All Account Search"
-msgstr "Rechercher dans tous les comptes"
-
-#: ../modules/mail/e-mail-shell-view.c:746
-msgid "Account Search"
-msgstr "Rechercher dans un compte"
-
-#: ../modules/mail/e-mail-shell-view.c:951
-msgid "Proxy _Logout"
-msgstr "_DÃconnecter le mandataire"
-
-#: ../modules/mail/em-account-prefs.c:215
-msgid "Evolution Account Assistant"
-msgstr "Assistant de compte d'Evolution"
-
-#: ../modules/mail/em-account-prefs.c:264
-msgid "Account Editor"
-msgstr "Ãditeur de comptes"
-
-#: ../modules/mail/em-composer-prefs.c:502
-#: ../modules/plugin-manager/evolution-plugin-manager.c:356
+#: ../modules/mail/em-composer-prefs.c:493
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:220
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ActivÃ"
 
-#: ../modules/mail/em-composer-prefs.c:506
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "Langues"
 
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "Ã chaque fois"
 
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "Une fois par jour"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "Une fois par semaine"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../modules/mail/em-mailer-prefs.c:174
-msgid "Add Custom Junk Header"
-msgstr "Ajouter des en-tÃtes de pourriels personnalisÃs"
-
-#: ../modules/mail/em-mailer-prefs.c:182
-msgid "Header Name:"
-msgstr "Nom de l'en-tÃteÂ:"
-
-#: ../modules/mail/em-mailer-prefs.c:183
-msgid "Header Value Contains:"
-msgstr "La valeur de l'en-tÃte contientÂ:"
-
-#: ../modules/mail/em-mailer-prefs.c:283
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "En-tÃte"
 
-#: ../modules/mail/em-mailer-prefs.c:287
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "Contient la valeur"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "Le greffon %s est disponible et le paquet binaire est installÃ."
-
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:775
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
-"Le greffon %s n'est pas disponible. VÃrifiez si le paquet est installÃ."
-
-#: ../modules/mail/em-mailer-prefs.c:739
-msgid "No junk plugin available"
-msgstr "Aucun greffon de pourriel disponible"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1142
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "En-tÃte de _dateÂ:"
 
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1032
 msgid "Show _original header value"
 msgstr "Afficher la valeur d'en-tÃte d'_origine"
 
@@ -16121,7 +16210,7 @@ msgstr ""
 "Chaque fois que Evolution est lancÃ, contrÃle que Evolution est le lecteur "
 "de courriel par dÃfaut."
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:143
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Voulez-vous faire d'Evolution votre client de messagerie par dÃfautÂ?"
 
@@ -16147,35 +16236,63 @@ msgid ""
 msgstr ""
 "Evolution sera de nouveau en ligne dÃs qu'une connexion rÃseau sera Ãtablie."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"Impossible de trouver un compte correspondant dans le service org.gnome."
+"OnlineAccounts à partir duquel obtenir un jeton d'authentification."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAuth"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Cette option se connecte au serveur en utilisant le service GNOME Online "
+"Accounts"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Gestionnaire de greffons"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "NoteÂ: certains changements ne prendront effet qu'aprÃs un redÃmarrage"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:295
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:364
-#: ../modules/plugin-manager/evolution-plugin-manager.c:447
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Greffon"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Greffons"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Active et dÃsactive les greffons"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Greffon de test Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Greffon de test pour le chargeur Python EPlugin."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Bonjour Python"
@@ -16184,47 +16301,93 @@ msgstr "Bonjour Python"
 msgid "Python Plugin Loader tests"
 msgstr "Tests du chargeur de greffons Python"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Greffon de test Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Ãchec du lancement de SpamAssassin (%s)Â: "
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "Greffon de test pour le chargeur Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Ãchec lors du filtrage des courriels en utilisant SpamAssassinÂ: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Ãchec lors de l'Ãcriture de ÂÂ%sÂÂ vers SpamAssassinÂ: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Ãchec lors de la lecture de la sortie de SpamAssassinÂ: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "Ãchec ou arrÃt brutal de SpamAssassin lors du traitement d'un courriel"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Options de SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "I_nclure les tests distants"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Cela rendra SpamAssassin plus fiable, mais plus lent."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Utiliser le dÃmon et le client SpamAssassin"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Utiliser le dÃmon et le client SpamAssassin (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Utiliser seulement des tests de pourriels locaux."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Utiliser seulement des tests de pourriels locaux (pas de DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:392
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
+#: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "SÃlectionnez les informations que vous dÃsirez importerÂ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:548
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
+#: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "De %sÂ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:320
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr "Importation de fichiers"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:395
+#: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Importation annulÃe. Cliquez sur ÂÂSuivantÂÂ pour continuer."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:413
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Importation terminÃe. Cliquez sur ÂÂSuivantÂÂ pour continuer."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:487
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de configuration d'Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:493
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -16237,6 +16400,10 @@ msgstr ""
 "\n"
 "Cliquez sur le bouton ÂÂSuivantÂÂ pour continuer. "
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
+msgid "Loading accounts..."
+msgstr "Chargement des comptes..."
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Ajouter les carnets d'adresses locaux à Evolution."
@@ -16253,13 +16420,12 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des piÃces jointes doit rechercher "
 "dans le corps d'un message"
 
-#. Check buttons
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
+#: ../plugins/attachment-reminder/attachment-reminder.c:125
 msgid "_Do not show this message again."
 msgstr "_Ne plus afficher ce message."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:411
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
+#: ../plugins/templates/templates.c:450
 msgid "Keywords"
 msgstr "Mots-clÃs"
 
@@ -16276,8 +16442,8 @@ msgid "Message has no attachments"
 msgstr "Message sans piÃce jointe"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-msgid "_Add attachment..."
-msgstr "A_jouter une piÃce jointe..."
+msgid "_Add Attachment..."
+msgstr "_Ajouter une piÃce jointe..."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -16300,23 +16466,23 @@ msgstr "IntÃgration des sons"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Joue les piÃces jointes sonores directement dans les courriels."
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
 msgstr "SÃlectionnez le nom de l'archive Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:216
+#: ../plugins/backup-restore/backup-restore.c:219
 msgid "_Restart Evolution after backup"
 msgstr "_RedÃmarrer Evolution aprÃs l'archivage"
 
-#: ../plugins/backup-restore/backup-restore.c:242
+#: ../plugins/backup-restore/backup-restore.c:245
 msgid "Select name of the Evolution backup file to restore"
 msgstr "SÃlectionnez le nom de l'archive d'Evolution à restaurer"
 
-#: ../plugins/backup-restore/backup-restore.c:255
+#: ../plugins/backup-restore/backup-restore.c:258
 msgid "_Restart Evolution after restore"
 msgstr "_RedÃmarrer Evolution aprÃs la restauration"
 
-#: ../plugins/backup-restore/backup-restore.c:323
+#: ../plugins/backup-restore/backup-restore.c:326
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16326,142 +16492,143 @@ msgstr ""
 "tous les courriels, calendriers, tÃches, mÃmos et carnets d'adresses. Il "
 "restaure Ãgalement tous vos paramÃtres personnels, filtres de courriel, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:330
+#: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurer Evolution à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Please select an Evolution Archive to restore:"
 msgstr "SÃlectionnez une archive d'Evolution pour la restaurationÂ:"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:343
 msgid "Choose a file to restore"
 msgstr "Choisissez un fichier à restaurer"
 
-#: ../plugins/backup-restore/backup-restore.c:348
+#: ../plugins/backup-restore/backup-restore.c:351
 msgid "Restore from backup"
 msgstr "Restaurer à partir de l'archive"
 
-#: ../plugins/backup-restore/backup-restore.c:386
+#: ../plugins/backup-restore/backup-restore.c:389
 msgid "_Back up Evolution Data..."
 msgstr "_Archiver les donnÃes d'Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:388
+#: ../plugins/backup-restore/backup-restore.c:391
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 "Archive les donnÃes et les paramÃtres d'Evolution dans un fichier archive"
 
-#: ../plugins/backup-restore/backup-restore.c:393
+#: ../plugins/backup-restore/backup-restore.c:396
 msgid "R_estore Evolution Data..."
 msgstr "R_estaurer les donnÃes d'Evolution..."
 
-#: ../plugins/backup-restore/backup-restore.c:395
+#: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Restaure les donnÃes et les paramÃtres d'Evolution à partir d'un fichier "
 "archive"
 
-#: ../plugins/backup-restore/backup.c:79
+#: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "Archive le rÃpertoire d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:81
+#: ../plugins/backup-restore/backup.c:79
 msgid "Restore Evolution directory"
 msgstr "Restaure le rÃpertoire d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:83
+#: ../plugins/backup-restore/backup.c:81
 msgid "Check Evolution Back up"
 msgstr "ContrÃle l'archive Evolution"
 
-#: ../plugins/backup-restore/backup.c:85
+#: ../plugins/backup-restore/backup.c:83
 msgid "Restart Evolution"
 msgstr "RedÃmarre Evolution"
 
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
 msgstr "Avec interface graphique"
 
-#: ../plugins/backup-restore/backup.c:289
-#: ../plugins/backup-restore/backup.c:399
+#. FIXME Will the versioned setting always work?
+#: ../plugins/backup-restore/backup.c:295
+#: ../plugins/backup-restore/backup.c:412
 msgid "Shutting down Evolution"
 msgstr "Ferme Evolution"
 
-#: ../plugins/backup-restore/backup.c:296
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
 msgstr "Archivage des comptes et des paramÃtres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Archivage des donnÃes d'Evolution (courriels, contacts, calendriers, tÃches "
 "et mÃmos)"
 
-#: ../plugins/backup-restore/backup.c:317
+#: ../plugins/backup-restore/backup.c:327
 msgid "Back up complete"
 msgstr "Archivage terminÃ"
 
-#: ../plugins/backup-restore/backup.c:322
-#: ../plugins/backup-restore/backup.c:496
+#: ../plugins/backup-restore/backup.c:334
+#: ../plugins/backup-restore/backup.c:521
 msgid "Restarting Evolution"
 msgstr "RedÃmarrage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:403
+#: ../plugins/backup-restore/backup.c:418
 msgid "Back up current Evolution data"
 msgstr "Archiver les donnÃes actuelles d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:409
+#: ../plugins/backup-restore/backup.c:426
 msgid "Extracting files from back up"
 msgstr "Extraction des fichiers de l'archive"
 
-#: ../plugins/backup-restore/backup.c:466
+#: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
 msgstr "Chargement des paramÃtres d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:481
+#: ../plugins/backup-restore/backup.c:502
 msgid "Removing temporary back up files"
 msgstr "Suppression des fichiers d'archive temporaires"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
 msgstr "ContrÃle des sources locales"
 
-#: ../plugins/backup-restore/backup.c:678
+#: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Archivage vers le dossier %s"
 
-#: ../plugins/backup-restore/backup.c:683
+#: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Back up"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:705
+#: ../plugins/backup-restore/backup.c:728
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:743
+#: ../plugins/backup-restore/backup.c:766
 msgid "Backing up Evolution Data"
 msgstr "Archivage des donnÃes d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:744
+#: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Veuillez attendre qu'Evolution finisse d'archiver vos donnÃes."
 
-#: ../plugins/backup-restore/backup.c:746
+#: ../plugins/backup-restore/backup.c:769
 msgid "Restoring Evolution Data"
 msgstr "Restauration des donnÃes d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:747
+#: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Veuillez attendre qu'Evolution finisse de restaurer vos donnÃes."
 
-#: ../plugins/backup-restore/backup.c:765
+#: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "En fonction de la quantità de donnÃes sur votre compte, cela peut prendre du "
@@ -16532,38 +16699,38 @@ msgstr ""
 "paramÃtres actuels d'Evolution avant de les restaurer tels qu'ils se "
 "trouvent dans l'archive."
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contacts automatiques"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:709
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
 msgstr ""
 "CrÃer des entrÃes dans le carnet d'_adresses lors de l'envoi de courriels"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
 msgstr "SÃlectionnez un carnet d'adresses pour les contacts automatiques"
 
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
 msgstr "Contacts de messagerie instantanÃe"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:745
+#: ../plugins/bbdb/bbdb.c:735
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Synchroniser les informations et les images des contacts depuis la liste de "
 "contacts Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:751
+#: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
 msgstr "SÃlectionnez un carnet d'adresses pour la liste de contacts Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:762
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Synchronize with _buddy list now"
 msgstr "Synchroniser maintenant avec la liste de _contacts"
 
@@ -16585,72 +16752,17 @@ msgstr ""
 "de courriel de la personne à qui vous rÃpondez. ComplÃte Ãgalement les "
 "informations de messagerie instantanÃe issues de vos listes de contacts."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
-#, c-format
-msgid "Bogofilter is not available. Please install it first."
-msgstr "Bogofilter n'est pas disponible. Vous devez d'abord l'installer."
-
-#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "Erreur pendant le lancement de %sÂ: %s."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "Le processus fils Bogofilter ne rÃpond pas, il va Ãtre tuÃ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr ""
-"En attente du processus fils Bogofilter interrompu, terminaison en cours..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Ãchec du tube vers Bogofilter, code erreurÂ: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
-msgid "Convert message text to _Unicode"
-msgstr "Convertir le texte du message en _Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "Convertit les messages en Unicode"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"Convertit le texte des messages en Unicode UTF-8 pour unifier les balises "
-"spam/ham provenant de diffÃrents jeux de caractÃres."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Filtre de pourriel Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Options de Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtre les pourriels en utilisant Bogofilter."
-
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
 msgstr ""
 "Ãchec de l'authentification. Le serveur a besoin d'une identification "
 "correcte."
 
-#: ../plugins/caldav/caldav-browse-server.c:206
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
 msgstr "L'URL indiquà est introuvable."
 
-#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16659,118 +16771,119 @@ msgstr ""
 "Le serveur a renvoyà des donnÃes inattendues.\n"
 "%dÂ-Â%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:340
-#: ../plugins/caldav/caldav-browse-server.c:664
+#: ../plugins/caldav/caldav-browse-server.c:339
+#: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
 msgstr "Ãchec de l'analyse de la rÃponse du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:434
+#: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
 msgstr "ÃvÃnements"
 
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "User's calendars"
 msgstr "Calendriers de l'utilisateur"
 
-#: ../plugins/caldav/caldav-browse-server.c:565
-#: ../plugins/caldav/caldav-browse-server.c:733
+#: ../plugins/caldav/caldav-browse-server.c:564
+#: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
 msgstr "Impossible d'obtenir l'URL du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:731
-#: ../plugins/caldav/caldav-browse-server.c:772
-#: ../plugins/caldav/caldav-browse-server.c:1431
+#: ../plugins/caldav/caldav-browse-server.c:730
+#: ../plugins/caldav/caldav-browse-server.c:771
+#: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
 msgstr "Recherche des calendriers de l'utilisateur..."
 
-#: ../plugins/caldav/caldav-browse-server.c:770
+#: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
 msgstr "Impossible de trouver un calendrier pour l'utilisateur."
 
-#: ../plugins/caldav/caldav-browse-server.c:902
+#: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Ãchec de la tentative prÃcÃdenteÂ: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:904
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Ãchec de la tentative prÃcÃdente avec le code %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:909
+#: ../plugins/caldav/caldav-browse-server.c:908
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Saisissez le mot de passe pour l'utilisateur %s sur le serveur %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:968
+#: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Impossible de crÃer le message soup pour l'URL ÂÂ%sÂÂ"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1214
+#: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
 msgstr "Recherche dans le contenu du dossier..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1263
-#: ../plugins/caldav/caldav-source.c:256
+#: ../plugins/caldav/caldav-browse-server.c:1262
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Server _handles meeting invitations"
 msgstr "Le serveur gÃ_re les invitations aux rÃunions"
 
-#: ../plugins/caldav/caldav-browse-server.c:1270
+#: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
 msgstr "Liste des calendriers disponiblesÂ:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1308
+#: ../plugins/caldav/caldav-browse-server.c:1307
 msgid "Supports"
 msgstr "Prises en charge"
 
-#: ../plugins/caldav/caldav-browse-server.c:1335
-#: ../plugins/caldav/caldav-source.c:254
-msgid "User e-_mail:"
+#: ../plugins/caldav/caldav-browse-server.c:1334
+#: ../plugins/caldav/caldav-source.c:255
+msgid "User e_mail:"
 msgstr "A_dresse Ãlectronique de l'utilisateurÂ:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Impossible de crÃer le fil de discussionÂ: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1516
+#: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "L'URL du serveur ÂÂ%sÂÂ n'est pas valide"
 
-#: ../plugins/caldav/caldav-browse-server.c:1522
+#: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
 msgstr "Recherche d'un calendrier CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:235
-#: ../plugins/calendar-http/calendar-http.c:100
+#: ../plugins/caldav/caldav-source.c:236
+#: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_URLÂ:"
 
-#: ../plugins/caldav/caldav-source.c:242
-#: ../plugins/google-account-setup/google-contacts-source.c:349
-msgid "Use _SSL"
-msgstr "Utiliser _SSL"
+#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/calendar-http/calendar-http.c:138
+#: ../plugins/google-account-setup/google-contacts-source.c:351
+msgid "Use _secure connection"
+msgstr "_Utiliser une connexion sÃcurisÃe"
 
-#: ../plugins/caldav/caldav-source.c:244
-#: ../plugins/google-account-setup/google-contacts-source.c:327
-#: ../plugins/google-account-setup/google-source.c:638
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+#: ../plugins/caldav/caldav-source.c:245
+#: ../plugins/google-account-setup/google-contacts-source.c:329
+#: ../plugins/google-account-setup/google-source.c:656
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "_Nom d'utilisateurÂ:"
 
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-source.c:260
 msgid "Brows_e server for a calendar"
 msgstr "_Rechercher un calendrier sur le serveur"
 
-#: ../plugins/caldav/caldav-source.c:277
-#: ../plugins/calendar-file/calendar-file.c:191
-#: ../plugins/calendar-http/calendar-http.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:399
-#: ../plugins/google-account-setup/google-contacts-source.c:367
-#: ../plugins/google-account-setup/google-source.c:645
+#: ../plugins/caldav/caldav-source.c:278
+#: ../plugins/calendar-file/calendar-file.c:195
+#: ../plugins/calendar-http/calendar-http.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:403
+#: ../plugins/google-account-setup/google-contacts-source.c:369
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Re_fresh:"
 msgstr "Ac_tualiserÂ:"
 
@@ -16782,31 +16895,31 @@ msgstr "Ajoute la prise en charge de CalDAV Ã Evolution."
 msgid "CalDAV Support"
 msgstr "Support CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
 msgstr "Options de _personnalisation"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "File _name:"
 msgstr "_Nom du fichierÂ:"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:152
 msgid "Choose calendar file"
 msgstr "Choisissez un fichier de calendrier"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On open"
 msgstr "Ã l'ouverture"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
 msgstr "Ã la modification du fichier"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:202
 msgid "Periodically"
 msgstr "PÃriodiquement"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
 msgstr "_Forcer la lecture seule"
 
@@ -16818,11 +16931,7 @@ msgstr "Ajoute des calendriers locaux à Evolution."
 msgid "Local Calendars"
 msgstr "Calendriers locaux"
 
-#: ../plugins/calendar-http/calendar-http.c:134
-msgid "_Secure connection"
-msgstr "Connexion _sÃcurisÃe"
-
-#: ../plugins/calendar-http/calendar-http.c:194
+#: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "_Nom d'utilisateurÂ:"
 
@@ -16834,62 +16943,62 @@ msgstr "Ajoute des calendriers Web à Evolution."
 msgid "Web Calendars"
 msgstr "Calendriers Web"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Fog"
 msgstr "MÃtÃoÂ: brouillard"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy"
 msgstr "MÃtÃoÂ: nuageux"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy Night"
 msgstr "MÃtÃoÂ: nuit nuageuse"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Overcast"
 msgstr "MÃtÃoÂ: couvert"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Showers"
 msgstr "MÃtÃoÂ: averse"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Snow"
 msgstr "MÃtÃoÂ: neige"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Sunny"
 msgstr "MÃtÃoÂ: ensoleillÃ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Clear Night"
 msgstr "MÃtÃoÂ: nuit claire"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Thunderstorms"
 msgstr "MÃtÃoÂ: orages "
 
-#: ../plugins/calendar-weather/calendar-weather.c:226
+#: ../plugins/calendar-weather/calendar-weather.c:230
 msgid "Select a location"
 msgstr "SÃlectionnez un emplacement"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:332
-#: ../plugins/calendar-weather/calendar-weather.c:377
+#: ../plugins/calendar-weather/calendar-weather.c:336
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/calendar-weather/calendar-weather.c:452
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "_Units:"
 msgstr "_UnitÃsÂ:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:461
+#: ../plugins/calendar-weather/calendar-weather.c:465
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃtrique (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:464
+#: ../plugins/calendar-weather/calendar-weather.c:468
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Anglo-saxon (Fahrenheit, pouces, etc)"
 
@@ -16901,25 +17010,7 @@ msgstr "Ajoute des calendriers mÃtÃo à Evolution."
 msgid "Weather Calendars"
 msgstr "Calendriers de mÃtÃo"
 
-#: ../plugins/contacts-map/contacts-map.c:55
-#: ../plugins/contacts-map/contacts-map.c:201
-msgid "Contacts map"
-msgstr "Carte des contacts"
-
-#: ../plugins/contacts-map/contacts-map.c:56
-msgid "Show a map of all the contacts"
-msgstr "Affiche une carte de tous les contacts"
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
-msgid "Add a map showing the location of contacts when possible."
-msgstr ""
-"Ajoute une carte montrant l'emplacement des contacts quand c'est possible."
-
-#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-msgid "Map for contacts"
-msgstr "Carte des contacts"
-
-#: ../plugins/dbx-import/dbx-importer.c:273
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Importation des donnÃes Outlook Express"
 
@@ -16935,23 +17026,23 @@ msgstr "Importation Outlook DBX"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Dossiers personnels Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:83
+#: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
 msgstr "Marquer comme carnet d'adresses par _dÃfaut"
 
-#: ../plugins/default-source/default-source.c:96
+#: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
 msgstr "_Utiliser ce carnet d'adresses pour l'autocomplÃtion"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
 msgstr "Marquer comme calendrier par _dÃfaut"
 
-#: ../plugins/default-source/default-source.c:106
+#: ../plugins/default-source/default-source.c:110
 msgid "Mark as _default task list"
 msgstr "Marquer comme liste de tÃches par _dÃfaut"
 
-#: ../plugins/default-source/default-source.c:107
+#: ../plugins/default-source/default-source.c:111
 msgid "Mark as _default memo list"
 msgstr "Marquer comme liste de mÃmos par _dÃfaut"
 
@@ -17037,7 +17128,7 @@ msgid "Key"
 msgstr "ClÃ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:417
+#: ../plugins/templates/templates.c:456
 msgid "Values"
 msgstr "Valeurs"
 
@@ -17061,7 +17152,7 @@ msgstr ""
 "de courriel"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:131
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lancer automatiquement lorsqu'un nouveau courriel est ÃditÃ"
 
@@ -17073,11 +17164,11 @@ msgstr "Ãditeur externe par dÃfaut"
 msgid "The default command that must be used as the editor."
 msgstr "La commande à utiliser par dÃfaut pour lancer l'Ãditeur."
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:120
 msgid "Command to be executed to launch the editor: "
 msgstr "Commande à exÃcuter pour lancer l'ÃditeurÂ: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:121
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17085,8 +17176,8 @@ msgstr ""
 "Pour Emacs, saisissez ÂÂxemacsÂÂ\n"
 "pour VI, saisissez ÂÂgvim -fÂÂ"
 
-#: ../plugins/external-editor/external-editor.c:381
-#: ../plugins/external-editor/external-editor.c:383
+#: ../plugins/external-editor/external-editor.c:399
+#: ../plugins/external-editor/external-editor.c:401
 msgid "Compose in External Editor"
 msgstr "Ãdition dans un Ãditeur externe"
 
@@ -17197,499 +17288,48 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 "Le fichier sÃlectionnà ne semble pas Ãtre une image PNG valide. ErreurÂ: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:317
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
 msgid "Server"
-msgstr "Serveur"
-
-#: ../plugins/google-account-setup/google-source.c:438
-#, c-format
-msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr ""
-"Saisissez le mot de passe de l'utilisateur %s pour accÃder à la liste des "
-"calendriers auxquels il est abonnÃ."
-
-#: ../plugins/google-account-setup/google-source.c:549
-#, c-format
-msgid ""
-"Cannot read data from Google server.\n"
-"%s"
-msgstr ""
-"Impossible de lire les donnÃes du serveur Google.\n"
-"%s"
-
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:737
-#: ../plugins/mail-to-task/mail-to-task.c:956
-msgid "Unknown error."
-msgstr "Erreur inconnue."
-
-#: ../plugins/google-account-setup/google-source.c:649
-msgid "Cal_endar:"
-msgstr "C_alendrierÂ:"
-
-#: ../plugins/google-account-setup/google-source.c:684
-msgid "Retrieve _List"
-msgstr "RÃcupÃration de la _liste"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "Ajoute des calendriers Google à Evolution."
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google Calendars"
-msgstr "Calendriers Google"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:453
-msgid "Checklist"
-msgstr "Liste de contrÃle"
-
-#. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:513
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
-
-#: ../plugins/groupwise-features/camel-gw-listener.c:533
-msgid "Failed to authenticate.\n"
-msgstr "L'authentification a ÃchouÃ.\n"
-
-#: ../plugins/groupwise-features/gw-ui.c:112
-msgid "New _Shared Folder..."
-msgstr "Nouveau dossier _partagÃ..."
-
-#: ../plugins/groupwise-features/gw-ui.c:119
-msgid "_Proxy Login..."
-msgstr "Connexion _proxy..."
-
-#: ../plugins/groupwise-features/gw-ui.c:170
-msgid "Junk Mail Settings..."
-msgstr "ParamÃtres de dÃtection des pourriels..."
-
-#: ../plugins/groupwise-features/gw-ui.c:177
-msgid "Track Message Status..."
-msgstr "Surveiller l'Ãtat du message..."
-
-#: ../plugins/groupwise-features/gw-ui.c:183
-msgid "Retract Mail"
-msgstr "RÃtractation du courriel"
-
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "Accepter"
-
-#: ../plugins/groupwise-features/gw-ui.c:338
-msgid "Accept Tentatively"
-msgstr "Accepter provisoirement"
-
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "Refuser"
-
-#: ../plugins/groupwise-features/gw-ui.c:352
-msgid "Rese_nd Meeting..."
-msgstr "Re_nvoyer la rÃunion..."
-
-#: ../plugins/groupwise-features/install-shared.c:178
-#: ../plugins/groupwise-features/share-folder-common.c:353
-msgid "Create folder"
-msgstr "CrÃation d'un dossier"
-
-#: ../plugins/groupwise-features/install-shared.c:230
-#, c-format
-msgid ""
-"The user '%s' has shared a folder with you\n"
-"\n"
-"Message from '%s'\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Click 'Apply' to install the shared folder\n"
-"\n"
-msgstr ""
-"L'utilisateur ÂÂ%s a partagà un dossier avec vous\n"
-"\n"
-"Message de ÂÂ%sÂÂ\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Cliquez sur ÂÂAppliquerÂÂ pour installer le dossier partagÃ\n"
-"\n"
-
-#: ../plugins/groupwise-features/install-shared.c:242
-msgid "Install the shared folder"
-msgstr "Installer le dossier partagÃ"
-
-#: ../plugins/groupwise-features/install-shared.c:246
-msgid "Shared Folder Installation"
-msgstr "Installation du dossier partagÃ"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
-msgid "Junk Settings"
-msgstr "ParamÃtres du pourriel"
-
-#: ../plugins/groupwise-features/junk-mail-settings.c:96
-#: ../plugins/groupwise-features/junk-settings.ui.h:3
-msgid "Junk Mail Settings"
-msgstr "ParamÃtres de dÃtection des pourriels"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:1
-msgid "Email:"
-msgstr "Adresse ÃlectroniqueÂ:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:2
-msgid "Junk List:"
-msgstr "Liste des pourrielsÂ:"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:6
-msgid "_Enable"
-msgstr "_Activer"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:7
-msgid "_Junk List"
-msgstr "_Liste des pourriels"
-
-#: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:12
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "_Enlever"
-
-#: ../plugins/groupwise-features/mail-retract.c:81
-msgid "Message Retract"
-msgstr "RÃtractation du message"
-
-#: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
-msgstr ""
-"Il se peut que le retrait d'un message l'efface de la boÃte aux lettres des "
-"destinataires. Voulez-vous vraiment faire celaÂ?"
-
-#: ../plugins/groupwise-features/mail-retract.c:111
-msgid "Message retracted successfully"
-msgstr "Message rÃtractà avec succÃs"
-
-#: ../plugins/groupwise-features/mail-send-options.c:202
-msgid "Insert Send options"
-msgstr "InsÃre les options d'envoi"
-
-#: ../plugins/groupwise-features/notification.ui.h:3
-#: ../plugins/groupwise-features/properties.ui.h:6
-msgid "The participants will receive the following notification.\n"
-msgstr "Les participants recevront la notification suivante.\n"
-
-#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-msgid "Add Send Options to GroupWise messages"
-msgstr "Ajouter les options d'envoi aux messages GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "Fine-tune your GroupWise accounts."
-msgstr "Ajustez vos comptes GroupWise."
-
-#: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-msgid "GroupWise Features"
-msgstr "FonctionnalitÃs de GroupWise"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
-msgid "Message retract failed"
-msgstr "La rÃtractation du message a ÃchouÃ"
-
-#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-msgid "The server did not allow the selected message to be retracted."
-msgstr "Le serveur ne permet pas la rÃtractation du message sÃlectionnÃ."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr ""
-"Le compte ÂÂ{0}ÂÂ existe dÃjÃ. Veuillez vÃrifier votre arborescence de "
-"dossiers."
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
-msgid "Account Already Exists"
-msgstr "Compte dÃjà existant"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
-msgid "Invalid user"
-msgstr "Utilisateur non valide"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"Ãchec de la connexion du mandataire en tant que ÂÂ{0}ÂÂ. Veuillez vÃrifier "
-"votre adresse de courriel et essayez à nouveau."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "Impossible de donner un accÃs comme mandataire à l'utilisateur ÂÂ{0}ÂÂ"
-
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
-msgid "Specify User"
-msgstr "Indiquer un utilisateur"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
-msgid "You have already given proxy permissions to this user."
-msgstr ""
-"Vous avez dÃjà donnà des permissions en tant que mandataire à cet "
-"utilisateur."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
-msgid "You have to specify a valid user name to give proxy rights."
-msgstr ""
-"Vous devez indiquer un nom d'utilisateur valide pour donner des droits de "
-"mandataire."
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "Impossible de partager le dossier avec l'utilisateur indiquà ÂÂ{0}ÂÂ"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Vous devez indiquer un nom d'utilisateur à ajouter à la liste"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
-msgid "Do you want to resend the meeting?"
-msgstr "Voulez-vous envoyer cette rÃunion à nouveauÂ?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-msgid "Do you want to resend the recurring meeting?"
-msgstr "Voulez-vous envoyer cette rÃunion rÃcurrente à nouveauÂ?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-msgid "Do you want to retract the original item?"
-msgstr "Voulez-vous retirer l'ÃlÃment originalÂ?"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-msgid "The original will be removed from the recipient's mailbox."
-msgstr "L'original sera supprimà de la boÃte de rÃception des destinataires."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-msgid "This is a recurring meeting"
-msgstr "Ceci est une rÃunion rÃcurrente"
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
-msgid "This will create a new meeting using the existing meeting details."
-msgstr ""
-"Ceci crÃera une nouvelle rÃunion avec les dÃtails de la rÃunion existante."
-
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"Ceci crÃera une nouvelle rÃunion avec les dÃtails de la rÃunion existante. "
-"La rÃgle de rÃcurrence doit Ãtre saisie à nouveau."
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
-msgid "Would you like to accept it?"
-msgstr "Voulez-vous l'accepterÂ?"
-
-#. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
-msgid "Would you like to decline it?"
-msgstr "Voulez-vous le refuserÂ?"
-
-#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "C_ustomize notification message"
-msgstr "_Personnaliser le message de notification"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
-msgid "Con_tacts..."
-msgstr "Con_tacts..."
-
-#: ../plugins/groupwise-features/properties.ui.h:4
-msgid "Shared Folder Notification"
-msgstr "Notification de dossier partagÃ"
-
-#: ../plugins/groupwise-features/properties.ui.h:8
-msgid "Users:"
-msgstr "UtilisateursÂ:"
-
-#: ../plugins/groupwise-features/properties.ui.h:11
-msgid "_Not Shared"
-msgstr "_Non partagÃ"
-
-#: ../plugins/groupwise-features/properties.ui.h:13
-msgid "_Shared With..."
-msgstr "_Partagà avec..."
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
-msgid "Access Rights"
-msgstr "Droits d'accÃs"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
-msgid "Add/Edit"
-msgstr "Ajouter/Ãditer"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
-msgid "Con_tacts"
-msgstr "Con_tacts"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
-msgid "Modify _folders/options/rules/"
-msgstr "Modifier _dossiers/options/rÃgles/"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
-msgid "Read items marked _private"
-msgstr "Lire les ÃlÃments marquÃs _privÃs"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
-msgid "Reminder Notes"
-msgstr "Notes de rappel"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
-msgid "Subscribe to my _alarms"
-msgstr "S'abonner à mes _alarmes"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
-msgid "Subscribe to my _notifications"
-msgstr "S'abonner à mes _notifications"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
-msgid "_Write"
-msgstr "_Ãcrire"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
-msgid "permission to read|_Read"
-msgstr "Lectu_re"
-
-#: ../plugins/groupwise-features/proxy-listing.ui.h:1
-msgid "Proxy"
-msgstr "Mandataire"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:239
-msgid "Account Name"
-msgstr "Nom du compte"
-
-#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
-msgid "Proxy Login"
-msgstr "Nom de connexion du mandataire"
-
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:494
-#: ../plugins/groupwise-features/send-options.c:84
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)"
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
-msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
-"L'onglet Mandataire sera accessible seulement lorsque le compte sera en "
-"ligne."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:704
-msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"L'onglet du serveur mandataire sera accessible seulement lorsque le compte "
-"sera actif."
-
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:709
-msgctxt "GW"
-msgid "Proxy"
-msgstr "Mandataire"
-
-#: ../plugins/groupwise-features/proxy.c:935
-#: ../plugins/groupwise-features/share-folder.c:694
-msgid "Add User"
-msgstr "Ajouter un utilisateur"
-
-#: ../plugins/groupwise-features/send-options.c:214
-msgid "Advanced send options"
-msgstr "Options d'envoi avancÃes"
-
-#: ../plugins/groupwise-features/share-folder-common.c:316
-#: ../plugins/groupwise-features/share-folder.c:729
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: ../plugins/groupwise-features/share-folder-common.c:317
-msgid "Enter the users and set permissions"
-msgstr "Saisissez les utilisateurs et rÃglez les permissions"
-
-#: ../plugins/groupwise-features/share-folder-common.c:418
-msgid "Sharing"
-msgstr "Partage"
-
-#: ../plugins/groupwise-features/share-folder.c:532
-msgid "Custom Notification"
-msgstr "Notification personnalisÃe"
-
-#: ../plugins/groupwise-features/share-folder.c:734
-msgid "Add   "
-msgstr "Ajouter"
-
-#: ../plugins/groupwise-features/share-folder.c:740
-msgid "Modify"
-msgstr "Modifier"
-
-#: ../plugins/groupwise-features/status-track.c:125
-msgid "Message Status"
-msgstr "Ãtat du message"
-
-#. Subject
-#: ../plugins/groupwise-features/status-track.c:139
-msgid "Subject:"
-msgstr "SujetÂ:"
-
-#: ../plugins/groupwise-features/status-track.c:153
-msgid "From:"
-msgstr "DeÂ:"
-
-#: ../plugins/groupwise-features/status-track.c:168
-msgid "Creation date:"
-msgstr "Date de crÃationÂ:"
-
-#: ../plugins/groupwise-features/status-track.c:208
-msgid "Recipient: "
-msgstr "DestinataireÂ: "
+msgstr "Serveur"
 
-#: ../plugins/groupwise-features/status-track.c:215
-msgid "Delivered: "
-msgstr "DistribuÃÂ: "
+#: ../plugins/google-account-setup/google-source.c:447
+#, c-format
+msgid "Enter password for user %s to access list of subscribed calendars."
+msgstr ""
+"Saisissez le mot de passe de l'utilisateur %s pour accÃder à la liste des "
+"calendriers auxquels il est abonnÃ."
 
-#: ../plugins/groupwise-features/status-track.c:221
-msgid "Opened: "
-msgstr "OuvertÂ: "
+#: ../plugins/google-account-setup/google-source.c:564
+#, c-format
+msgid ""
+"Cannot read data from Google server.\n"
+"%s"
+msgstr ""
+"Impossible de lire les donnÃes du serveur Google.\n"
+"%s"
 
-#: ../plugins/groupwise-features/status-track.c:226
-msgid "Accepted: "
-msgstr "AcceptÃÂ: "
+#: ../plugins/google-account-setup/google-source.c:564
+#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:1066
+msgid "Unknown error."
+msgstr "Erreur inconnue."
 
-#: ../plugins/groupwise-features/status-track.c:231
-msgid "Deleted: "
-msgstr "SupprimÃÂ: "
+#: ../plugins/google-account-setup/google-source.c:667
+msgid "Cal_endar:"
+msgstr "C_alendrierÂ:"
 
-#: ../plugins/groupwise-features/status-track.c:236
-msgid "Declined: "
-msgstr "RefusÃÂ: "
+#: ../plugins/google-account-setup/google-source.c:702
+msgid "Retrieve _List"
+msgstr "RÃcupÃration de la _liste"
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Completed: "
-msgstr "TerminÃÂ: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "Add Google Calendars to Evolution."
+msgstr "Ajoute des calendriers Google à Evolution."
 
-#: ../plugins/groupwise-features/status-track.c:246
-msgid "Undelivered: "
-msgstr "Non distribuÃÂ: "
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google Calendars"
+msgstr "Calendriers Google"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
@@ -17704,7 +17344,7 @@ msgstr "Affiche les images en piÃces jointes directement dans les courriels."
 msgid "Custom Headers"
 msgstr "En-tÃtes personnalisÃs"
 
-#: ../plugins/imap-features/imap-headers.c:342
+#: ../plugins/imap-features/imap-headers.c:341
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "En-tÃtes IMAP"
@@ -17733,7 +17373,7 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
 "_En-tÃtes de base (le plus rapide)\n"
@@ -17754,149 +17394,149 @@ msgstr "FonctionnalitÃs IMAP"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:490
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Impossible de charger le calendrier ÂÂ%sÂÂ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:645
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 "Un rendez-vous dans le calendrier ÂÂ%sÂÂ est en conflit avec cette rÃunion"
 
-#: ../plugins/itip-formatter/itip-formatter.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:669
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Rendez-vous trouvà dans le calendrier ÂÂ%sÂÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:775
 msgid "Unable to find any calendars"
 msgstr "Impossible de trouver un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:782
 msgid "Unable to find this meeting in any calendar"
 msgstr "Impossible de trouver cette rÃunion dans un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:786
 msgid "Unable to find this task in any task list"
 msgstr "Impossible de trouver cette tÃche dans une liste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this memo in any memo list"
 msgstr "Impossible de trouver ce mÃmo dans une liste"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
-msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1067
+msgid "Opening the calendar. Please wait..."
 msgstr "Ouverture du calendrier. Veuillez patienter..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:883
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 msgid "Searching for an existing version of this appointment"
 msgstr "Recherche d'une version existante de ce rendez-vous"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1166
+#: ../plugins/itip-formatter/itip-formatter.c:1343
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'ÃlÃment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1255
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Impossible d'envoyer l'ÃlÃment au calendrier ÂÂ%sÂÂ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ÂÂ%s a Ãtà envoyÃe au calendrier comme acceptÃe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "ÂÂ%s a Ãtà envoyÃe au calendrier comme provisoire"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ÂÂ%s a Ãtà envoyÃe calendrier comme refusÃe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ÂÂ%s a Ãtà envoyÃe au calendrier comme annulÃe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "L'organisateur a supprimà la dÃlÃgation %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1559
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation à la dÃlÃgation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Impossible d'envoyer l'avis d'annulation au dÃlÃguÃ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1495
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "L'Ãtat du participant n'a pas pu Ãtre mis à jour car l'Ãtat n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1524
+#: ../plugins/itip-formatter/itip-formatter.c:1701
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre à jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1528
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Attendee status updated"
 msgstr "Ãtat du participant mis à jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1532
+#: ../plugins/itip-formatter/itip-formatter.c:1709
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "L'Ãtat du participant ne peut pas Ãtre mis à jour car l'ÃlÃment n'existe plus"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1554
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Meeting information sent"
 msgstr "Les informations de la rÃunion ont Ãtà envoyÃes"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1557
+#: ../plugins/itip-formatter/itip-formatter.c:1734
 msgid "Task information sent"
 msgstr "Les informations de la tÃche ont Ãtà envoyÃes"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1560
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Memo information sent"
 msgstr "Les informations du mÃmo ont Ãtà envoyÃes"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1569
+#: ../plugins/itip-formatter/itip-formatter.c:1746
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la rÃunion, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
+#: ../plugins/itip-formatter/itip-formatter.c:1749
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 "Impossible d'envoyer les informations de la tÃche, celle-ci n'existe pas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Impossible d'envoyer les informations du mÃmo, celui-ci n'existe pas"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1817
 msgid "calendar.ics"
 msgstr "calendrier.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1645
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Save Calendar"
 msgstr "Enregistrer le calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1703
-#: ../plugins/itip-formatter/itip-formatter.c:1714
+#: ../plugins/itip-formatter/itip-formatter.c:1880
+#: ../plugins/itip-formatter/itip-formatter.c:1891
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1704
-#: ../plugins/itip-formatter/itip-formatter.c:1715
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17904,15 +17544,15 @@ msgstr ""
 "Le message prÃtend contenir un calendrier, mais celui-ci n'est pas dans un "
 "format iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1755
-#: ../plugins/itip-formatter/itip-formatter.c:1783
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1960
+#: ../plugins/itip-formatter/itip-formatter.c:2069
 msgid "The item in the calendar is not valid"
 msgstr "L'ÃlÃment dans le calendrier n'est pas valide"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1756
-#: ../plugins/itip-formatter/itip-formatter.c:1784
-#: ../plugins/itip-formatter/itip-formatter.c:1893
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1961
+#: ../plugins/itip-formatter/itip-formatter.c:2070
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17920,11 +17560,11 @@ msgstr ""
 "Le message contient un calendrier, mais celui-ci ne contient aucun "
 "ÃvÃnement, tÃche ou information libre/occupÃ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../plugins/itip-formatter/itip-formatter.c:1974
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des ÃlÃments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1798
+#: ../plugins/itip-formatter/itip-formatter.c:1975
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17932,40 +17572,44 @@ msgstr ""
 "Pour traiter tous ces ÃlÃments, le fichier devra Ãtre enregistrà et le "
 "calendrier importÃ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2633
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2476
+#: ../plugins/itip-formatter/itip-formatter.c:2649
 msgid "Tentatively Accepted"
 msgstr "Acceptà provisoirement"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2594
+#: ../plugins/itip-formatter/itip-formatter.c:2767
 msgid "This meeting recurs"
 msgstr "Cette rÃunion est rÃcurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2597
+#: ../plugins/itip-formatter/itip-formatter.c:2770
 msgid "This task recurs"
 msgstr "Cette tÃche est rÃcurrente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2600
+#: ../plugins/itip-formatter/itip-formatter.c:2773
 msgid "This memo recurs"
 msgstr "Ce mÃmo est rÃcurrent"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2992
+msgid "Meeting Invitations"
+msgstr "Invitations à une rÃunion"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2834
+#: ../plugins/itip-formatter/itip-formatter.c:3017
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message aprÃs intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2844
-#: ../plugins/itip-formatter/itip-formatter.c:2877
+#: ../plugins/itip-formatter/itip-formatter.c:3027
+#: ../plugins/itip-formatter/itip-formatter.c:3060
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2859
+#: ../plugins/itip-formatter/itip-formatter.c:3042
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "SÃlectionnez les calendriers oà chercher les conflits de rÃunions"
 
@@ -18357,7 +18001,7 @@ msgstr "Jour de dÃpartÂ:"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:1055
 msgid "Start time:"
 msgstr "Heure de dÃbutÂ:"
 
@@ -18367,100 +18011,100 @@ msgstr "Jour de finÂ:"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1065
+#: ../plugins/itip-formatter/itip-view.c:1066
 msgid "End time:"
 msgstr "Heure de finÂ:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:876
-#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:879
+#: ../plugins/itip-formatter/itip-view.c:884
 msgid "A_ccept"
 msgstr "A_ccepter"
 
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:855
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:856
 msgid "A_ccept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:867
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Update Attendee Status"
 msgstr "Mettre à jo_ur l'Ãtat du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:873
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Update"
 msgstr "_Mettre à jour"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1085
-#: ../plugins/itip-formatter/itip-view.c:1139
+#: ../plugins/itip-formatter/itip-view.c:1086
+#: ../plugins/itip-formatter/itip-view.c:1140
 msgid "Comment:"
 msgstr "CommentaireÂ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1125
 msgid "Send _reply to sender"
 msgstr "RÃ_pondre à l'expÃditeur"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises à jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Apply to all instances"
 msgstr "_Appliquer à toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1173
 msgid "Show time as _free"
 msgstr "Afficher la pÃriode comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1176
 msgid "_Preserve my reminder"
 msgstr "_Conserver mes rappels"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1181
+#: ../plugins/itip-formatter/itip-view.c:1182
 msgid "_Inherit reminder"
 msgstr "Rappel hÃr_itÃ"
 
-#: ../plugins/itip-formatter/itip-view.c:1924
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Tasks:"
 msgstr "_TÃchesÂ:"
 
-#: ../plugins/itip-formatter/itip-view.c:1926
+#: ../plugins/itip-formatter/itip-view.c:1927
 msgid "_Memos:"
 msgstr "_MÃmosÂ:"
 
@@ -18494,18 +18138,10 @@ msgid "Beep or play sound file."
 msgstr "Bip ou joue un fichier son."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "Activer les messages D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "Activer l'icÃne dans la zone de notification."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "GÃnÃre un message D-Bus à la rÃception d'un nouveau courriel."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
@@ -18513,63 +18149,53 @@ msgstr ""
 "Si ÂÂvraiÂÂ, un bip sera Ãmis, sinon un fichier son sera jouà à la rÃception "
 "de nouveaux messages."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "Avertit uniquement de nouveaux messages dans la ÂÂBoÃte de rÃceptionÂÂ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "Joue un fichier à la rÃception de nouveaux messages."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "Joue un son à thÃme à la rÃception d'un nouveau message si le mode Bip est "
 "inactif."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "Message contextuel associà à l'icÃne."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "Affiche l'icÃne de nouveau message dans la zone de notification à la "
 "rÃception de nouveaux messages."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Nom du fichier son à jouer."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "Fichier son à jouer à la rÃception d'un nouveau message si le mode Bip est "
 "inactif."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Utilise le thÃme sonore"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr ""
 "Indique s'il faut jouer un son ou Ãmettre un bip à la rÃception d'un nouveau "
 "message."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Indique s'il faut afficher un message sur l'icÃne à la rÃception de nouveaux "
-"messages."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr ""
 "Indique s'il faut avertir seulement de la rÃception de nouveaux messages "
 "dans la ÂÂBoÃte de rÃceptionÂÂ."
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18578,74 +18204,66 @@ msgid_plural ""
 "You have received %d new messages\n"
 "in %s."
 msgstr[0] ""
-"Vous avez reÃu %dÂnouveau message\n"
+"Vous avez reÃu %d nouveau message\n"
 "dans %s."
 msgstr[1] ""
-"Vous avez reÃu %dÂnouveaux messages\n"
+"Vous avez reÃu %d nouveaux messages\n"
 "dans %s."
 
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
-#, c-format
-msgid "From: %s"
-msgstr "DeÂ: %s"
-
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "SujetÂ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] "Vous avez reÃu %dÂnouveau message."
-msgstr[1] "Vous avez reÃu %dÂnouveaux messages."
+msgstr[0] "Vous avez reÃu %d nouveau message."
+msgstr[1] "Vous avez reÃu %d nouveaux messages."
 
-#: ../plugins/mail-notification/mail-notification.c:438
-#: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:498
-msgid "Show icon in _notification area"
-msgstr "Afficher une icÃne dans la zone de _notification"
-
-#: ../plugins/mail-notification/mail-notification.c:528
-msgid "Popup _message together with the icon"
-msgstr "_Message contextuel avec l'icÃne"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "Afficher %s"
 
-#: ../plugins/mail-notification/mail-notification.c:715
-msgid "_Play sound when new messages arrive"
+#: ../plugins/mail-notification/mail-notification.c:670
+msgid "_Play sound when a new message arrives"
 msgstr "_Jouer un son à la rÃception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:700
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:713
 msgid "Use sound _theme"
 msgstr "Utiliser le _thÃme sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Play _file:"
 msgstr "Jouer le f_ichierÂ:"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "Select sound file"
 msgstr "SÃlection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:798
 msgid "Notify new messages for _Inbox only"
 msgstr "Avertir uniquement des nouveaux messages de la _boÃte de rÃception"
 
-#: ../plugins/mail-notification/mail-notification.c:855
-msgid "Generate a _D-Bus message"
-msgstr "GÃnÃrer un message _D-Bus"
+#: ../plugins/mail-notification/mail-notification.c:808
+msgid "Show _notification when a new message arrives"
+msgstr "Afficher une _notification à la rÃception de nouveaux messages"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18656,12 +18274,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Avertissement à la rÃception de nouveaux messages."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:157
+#: ../plugins/mail-to-task/mail-to-task.c:235
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "CrÃÃ Ã partir d'un courriel de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:490
+#: ../plugins/mail-to-task/mail-to-task.c:593
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18670,7 +18288,7 @@ msgstr ""
 "Le calendrier sÃlectionnà contient dÃjà l'ÃvÃnement ÂÂ%sÂÂ. Voulez-vous "
 "modifier l'ÃvÃnement existantÂ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:493
+#: ../plugins/mail-to-task/mail-to-task.c:596
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18679,7 +18297,7 @@ msgstr ""
 "La liste de tÃches sÃlectionnÃe contient dÃjà la tÃche ÂÂ%sÂÂ. Voulez-vous "
 "modifier la tÃche existanteÂ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18688,109 +18306,56 @@ msgstr ""
 "La liste de mÃmos sÃlectionnÃe contient dÃjà le mÃmo ÂÂ%sÂÂ. Voulez-vous "
 "modifier le mÃmo existantÂ?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:516
+#: ../plugins/mail-to-task/mail-to-task.c:616
+#, c-format
 msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
 msgstr ""
-"Le calendrier sÃlectionnà contient dÃjà des ÃvÃnements pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouveaux ÃvÃnementsÂ?"
+"Vous avez sÃlectionnà %d courriels à convertir en ÃvÃnements. Voulez-vous "
+"vraiment les ajouter tousÂ?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:619
+#, c-format
 msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
 msgstr ""
-"La liste de tÃches sÃlectionnÃe contient dÃjà des tÃches pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouvelles tÃchesÂ?"
+"Vous avez sÃlectionnà %d courriels à convertir en tÃches. Voulez-vous "
+"vraiment les ajouter tousÂ?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:528
+#: ../plugins/mail-to-task/mail-to-task.c:622
+#, c-format
 msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
 msgstr ""
-"La liste de mÃmos sÃlectionnÃe contient dÃjà des mÃmos pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouveaux mÃmosÂ?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:549
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
-msgstr[0] ""
-"Le calendrier sÃlectionnà contient dÃjà un ÃvÃnement pour ce courriel. "
-"Voulez-vous tout de mÃme crÃer un nouvel ÃvÃnementÂ?"
-msgstr[1] ""
-"Le calendrier sÃlectionnà contient dÃjà des ÃvÃnements pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouveaux ÃvÃnementsÂ?"
-
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:558
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
-msgstr[0] ""
-"La liste de tÃches sÃlectionnÃe contient dÃjà une tÃche pour ce courriel. "
-"Voulez-vous tout de mÃme crÃer une nouvelle tÃcheÂ?"
-msgstr[1] ""
-"La liste de tÃches sÃlectionnÃe contient dÃjà des tÃches pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouvelles tÃchesÂ?"
+"Vous avez sÃlectionnà %d courriels à convertir en mÃmos. Voulez-vous "
+"vraiment les ajouter tousÂ?"
 
-#. Translators: Codewise it is impossible to provide separate strings for all
-#. combinations of singular and plural. Please translate it in the way that you
-#. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:567
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"La liste de mÃmos sÃlectionnÃe contient dÃjà un mÃmo pour ce courriel. "
-"Voulez-vous tout de mÃme crÃer un nouveau mÃmoÂ?"
-msgstr[1] ""
-"La liste de mÃmos sÃlectionnÃe contient dÃjà des mÃmos pour les courriels "
-"concernÃs. Voulez-vous tout de mÃme crÃer de nouveaux mÃmosÂ?"
+#: ../plugins/mail-to-task/mail-to-task.c:641
+msgid "Do you wish to continue converting remaining mails?"
+msgstr "Voulez-vous continuer à convertir les courriels restants�"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:716
 msgid "[No Summary]"
 msgstr "[Aucun rÃsumÃ]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:637
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid "Invalid object returned from a server"
 msgstr "Objet non valide renvoyà par un serveur"
 
-#: ../plugins/mail-to-task/mail-to-task.c:708
+#: ../plugins/mail-to-task/mail-to-task.c:778
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Une erreur est survenue pendant le traitementÂ: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:803
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Impossible d'ouvrir le calendrier. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:744
+#: ../plugins/mail-to-task/mail-to-task.c:810
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18798,7 +18363,7 @@ msgstr ""
 "La source sÃlectionnÃe est en lecture seule, vous ne pouvez donc pas y crÃer "
 "d'ÃvÃnement. Veuillez sÃlectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:747
+#: ../plugins/mail-to-task/mail-to-task.c:813
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18806,7 +18371,7 @@ msgstr ""
 "La source sÃlectionnÃe est en lecture seule, vous ne pouvez donc pas y crÃer "
 "de tÃche. Veuillez sÃlectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:816
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18814,40 +18379,44 @@ msgstr ""
 "La source sÃlectionnÃe est en lecture seule, vous ne pouvez donc pas y crÃer "
 "de mÃmo. Veuillez sÃlectionner une autre source."
 
-#: ../plugins/mail-to-task/mail-to-task.c:956
+#: ../plugins/mail-to-task/mail-to-task.c:1066
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Impossible d'obtenir la liste source. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1127
+msgid "No writable calendar is available."
+msgstr "Aucun calendrier accessible en Ãcriture n'est disponible."
+
+#: ../plugins/mail-to-task/mail-to-task.c:1219
 msgid "Create an _Event"
 msgstr "CrÃer un Ã_vÃnement"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1221
 msgid "Create a new event from the selected message"
 msgstr "CrÃe un nouvel ÃvÃnement à partir du message sÃlectionnÃ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1082
+#: ../plugins/mail-to-task/mail-to-task.c:1226
 msgid "Create a Mem_o"
 msgstr "CrÃer un mÃm_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1228
 msgid "Create a new memo from the selected message"
 msgstr "CrÃe un nouveau mÃmo à partir du message sÃlectionnÃ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1089
+#: ../plugins/mail-to-task/mail-to-task.c:1233
 msgid "Create a _Task"
 msgstr "CrÃer une _tÃche"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1091
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create a new task from the selected message"
 msgstr "CrÃe une nouvelle tÃche à partir du message sÃlectionnÃ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1099
+#: ../plugins/mail-to-task/mail-to-task.c:1243
 msgid "Create a _Meeting"
 msgstr "CrÃer une _rÃunion"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1101
+#: ../plugins/mail-to-task/mail-to-task.c:1245
 msgid "Create a new meeting from the selected message"
 msgstr "CrÃe une nouvelle rÃunion à partir du message sÃlectionnÃ"
 
@@ -18855,61 +18424,61 @@ msgstr "CrÃe une nouvelle rÃunion à partir du message sÃlectionnÃ"
 msgid "Convert a mail message to a task."
 msgstr "Convertit un courriel en tÃche."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
 msgid "Get List _Archive"
 msgstr "RÃcupÃrer l'_archive de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
 msgstr "RÃcupÃre une archive de la liste à laquelle ce message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
 msgstr "RÃcupÃrer les informations d'_utilisation de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 "RÃcupÃre des informations à propos de l'utilisation de la liste à laquelle "
 "appartient ce message"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
 msgstr "_PropriÃtaire de la liste de contacts"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 "Contacte le propriÃtaire de la liste de diffusion auquel ce message "
 "appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "_Post Message to List"
 msgstr "_Envoyer un message à la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
 msgstr ""
 "Envoyer un message à la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
 msgstr "S'_abonner à la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "S'inscrire à la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
 msgstr "Se _dÃsabonner de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr ""
 "Se dÃsabonner de la liste de diffusion à laquelle le message appartient"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
 msgstr "_Liste de diffusion"
 
@@ -19016,15 +18585,15 @@ msgstr ""
 "Voulez-vous marquer comme lu seulement les messages dans le dossier actuel, "
 "ou aussi ceux dans les sous-dossiersÂ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:193
+#: ../plugins/mark-all-read/mark-all-read.c:213
 msgid "In Current Folder and _Subfolders"
 msgstr "Dans le dossier actuel et les _sous-dossiers"
 
-#: ../plugins/mark-all-read/mark-all-read.c:207
+#: ../plugins/mark-all-read/mark-all-read.c:227
 msgid "In Current _Folder Only"
 msgstr "Seulement dans le _dossier actuel"
 
-#: ../plugins/mark-all-read/mark-all-read.c:444
+#: ../plugins/mark-all-read/mark-all-read.c:573
 msgid "Mark Me_ssages as Read"
 msgstr "Marquer les me_ssages comme lus"
 
@@ -19091,16 +18660,6 @@ msgstr "Afficher les parties HTML s_upprimÃes comme piÃces jointes"
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-msgid "Evolution Profiler"
-msgstr "Analyseur de performances d'Evolution"
-
-#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Profile data events in Evolution (for developers only)."
-msgstr ""
-"Analyse la performance des ÃvÃnements de donnÃes dans Evolution (pour les "
-"dÃveloppeurs uniquement)."
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
 msgstr "Importation de messages Outlook à partir d'un fichier PST"
@@ -19113,35 +18672,31 @@ msgstr "Importation Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "Dossiers personnels Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:309
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "_Courriel"
 
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "Dossier de destinationÂ:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:331
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "C_arnet d'adresses"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:338
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "Ren_dez-vous"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:344 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_TÃches"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:350
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
 msgstr "EntrÃes de _journal"
 
-#: ../plugins/pst-import/pst-importer.c:365
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
 msgstr "Importation des donnÃes Outlook"
 
@@ -19198,11 +18753,11 @@ msgstr "Voulez-vous vraiment supprimer cet emplacementÂ?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
+#: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
 msgstr "Impossible de crÃer le thread de publication."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
 msgstr "_Publier les informations des calendriers"
 
@@ -19294,160 +18849,103 @@ msgstr "Nom d'_utilisateurÂ:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:69
-#: ../plugins/publish-calendar/publish-format-ical.c:82
+#: ../plugins/publish-calendar/publish-format-fb.c:88
+#: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr ""
 "Impossible de publier le calendrierÂ: le moteur du calendrier n'existe plus"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:475
+#: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
 msgstr "Nouvel emplacement"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:477
+#: ../plugins/publish-calendar/url-editor-dialog.c:489
 msgid "Edit Location"
 msgstr "Modifier l'emplacement"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "SpamAssassin non trouvÃ, codeÂ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Impossible de transfÃrer vers le programmeÂ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "Erreur aprÃs le clonageÂ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "Le processus fils SpamAssassin ne rÃpond pas, il va Ãtre tuÃ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "En attente du processus fils Spamassassin interrompu, fermeture..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "Ãchec du tube vers SpamAssassin, code erreurÂ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "SpamAssassin n'est pas disponible. Vous devez d'abord l'installer."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "Cela rendra SpamAssassin plus fiable, mais plus lent"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "I_nclure les tests distants"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Filtrer les pourriels en utilisant SpamAssassin."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "Filtre de pourriel SpamAssassin"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "Options de SpamAssassin"
-
-#.
-#. * Translator: the %F %T is the thirth argument for a strftime function.
-#. * It lets you define the formatting of the date in the csv-file.
-#. *
-#: ../plugins/save-calendar/csv-format.c:161
+#. Translators: the %F %T is the third argument for a
+#. * strftime function.  It lets you define the formatting
+#. * of the date in the csv-file.
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Liste de description"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Liste des catÃgories"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Liste de commentaire"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "Liste de contacts"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "DÃbut"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Fin"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "ÃchÃance"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "pourcentage effectuÃ"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Liste des participants"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "ModifiÃ"
 
-#: ../plugins/save-calendar/csv-format.c:530
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
 msgstr "_Options avancÃes pour le format CSV"
 
-#: ../plugins/save-calendar/csv-format.c:537
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "_Ajouter un en-tÃte"
 
-#: ../plugins/save-calendar/csv-format.c:546
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "_DÃlimiteur des champsÂ:"
 
-#: ../plugins/save-calendar/csv-format.c:553
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "_SÃparateur d'enregistrementÂ:"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "En_capsuler les valeurs avecÂ:"
 
-#: ../plugins/save-calendar/csv-format.c:582
-msgid "Comma separated value format (.csv)"
-msgstr "Format CSVÂÂ (.csv)"
+#: ../plugins/save-calendar/csv-format.c:627
+msgid "Comma separated values (.csv)"
+msgstr "Valeurs sÃparÃes par des virgules (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:162
-msgid "iCalendar format (.ics)"
-msgstr "Format iCalendar (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iCalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19466,27 +18964,27 @@ msgstr "Enregistrer un calendrier ou une liste de tÃches sur disque."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:369
-msgid "RDF format (.rdf)"
-msgstr "Format RDF (.rdf)"
+#: ../plugins/save-calendar/rdf-format.c:375
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
 msgstr "Forma_tÂ:"
 
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "SÃlectionner un fichier de destination"
 
-#: ../plugins/save-calendar/save-calendar.c:334
+#: ../plugins/save-calendar/save-calendar.c:336
 msgid "Save the selected calendar to disk"
 msgstr "Enregistrer le calendrier sÃlectionnà sur le disque"
 
-#: ../plugins/save-calendar/save-calendar.c:365
+#: ../plugins/save-calendar/save-calendar.c:367
 msgid "Save the selected memo list to disk"
 msgstr "Enregistrer la liste de mÃmos sÃlectionnÃe sur le disque"
 
-#: ../plugins/save-calendar/save-calendar.c:396
+#: ../plugins/save-calendar/save-calendar.c:398
 msgid "Save the selected task list to disk"
 msgstr "Enregistrer la liste de tÃches sÃlectionnÃe sur le disque"
 
@@ -19499,18 +18997,24 @@ msgstr ""
 "substitution dans le corps des messages."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr "Greffon de modÃles basÃs sur des brouillons"
+msgid ""
+"Drafts based template plugin. You can use variables like $ORIG[subject], "
+"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
+"an email you are replying to."
+msgstr ""
+"Greffon ModÃle basà sur des brouillons. Vous pouvez utiliser des variables "
+"comme $ORIG[subject], $ORIG[from], $ORIG[to] ou $ORIG[body] qui seront "
+"remplacÃes par les valeurs du courriel auquel vous rÃpondez."
 
-#: ../plugins/templates/templates.c:635
+#: ../plugins/templates/templates.c:1066
 msgid "No Title"
 msgstr "Sans titre"
 
-#: ../plugins/templates/templates.c:746
+#: ../plugins/templates/templates.c:1167
 msgid "Save as _Template"
 msgstr "Enregistrer comme _modÃle"
 
-#: ../plugins/templates/templates.c:748
+#: ../plugins/templates/templates.c:1169
 msgid "Save as Template"
 msgstr "Enregistre comme modÃle"
 
@@ -19530,27 +19034,27 @@ msgstr "vCards dans le corps du message"
 msgid "Show vCards directly in mail messages."
 msgstr "Afficher les vCards directement dans les messages."
 
-#: ../plugins/vcard-inline/vcard-inline.c:198
-#: ../plugins/vcard-inline/vcard-inline.c:283
+#: ../plugins/vcard-inline/vcard-inline.c:206
+#: ../plugins/vcard-inline/vcard-inline.c:291
 msgid "Show Full vCard"
 msgstr "Afficher tous les champs de la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:201
+#: ../plugins/vcard-inline/vcard-inline.c:209
 msgid "Show Compact vCard"
 msgstr "Afficher partiellement la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:262
+#: ../plugins/vcard-inline/vcard-inline.c:270
 msgid "There is one other contact."
 msgstr "Il existe un autre contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:279
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Il existe %d autre contact."
 msgstr[1] "Il existe %d autres contacts."
 
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:300
 msgid "Save in Address Book"
 msgstr "Enregistrer dans le carnet d'adresses"
 
@@ -19562,15 +19066,15 @@ msgstr "Ajouter des contacts WebDAV Ã Evolution."
 msgid "WebDAV contacts"
 msgstr "Contacts WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
 msgstr "URLÂ:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Ã_viter IfMatch (requis pour Apache < 2.2.8)"
 
@@ -19740,7 +19244,7 @@ msgstr "Le panneau latÃral est visible"
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de dÃveloppement"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "DÃmarrer en mode hors ligne"
 
@@ -19857,7 +19361,7 @@ msgid "Use HTTP proxy"
 msgstr "Utiliser un serveur mandataire HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
+msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Nom d'utilisateur à fournir à l'authentification lors de l'usage du serveur "
 "mandataire HTTP."
@@ -19903,11 +19407,11 @@ msgstr "Style des boutons de la fenÃtre"
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenÃtre sont visibles"
 
-#: ../shell/e-shell-content.c:695 ../shell/e-shell-content.c:696
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Recherches"
 
-#: ../shell/e-shell-content.c:738
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
@@ -19915,42 +19419,38 @@ msgstr "Enregistrer la recherche"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:935
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "_AfficherÂ:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:968
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "_RechercherÂ:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "_dans "
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:223
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:257
-msgid "iCalendar (.ics)"
-msgstr "iCalendar (.ics)"
-
-#: ../shell/e-shell-utils.c:278
+#: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Tous les fichiers (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Enregistrement de l'Ãtat de l'interface utilisateur"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Christophe Merlet <redfox redfoxcenter org>\n"
@@ -19973,269 +19473,273 @@ msgstr ""
 "Yannick Tailliez <ytdispatch-libre yahoo com>\n"
 "RÃmi Peixoto <remi peixoto gmail com>"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Site Web d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1215
+#: ../shell/e-shell-window-actions.c:902
+msgid "Categories Editor"
+msgstr "Ãditeur de catÃgories"
+
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy n'est pas installÃ."
 
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy ne peut pas Ãtre exÃcutÃ."
 
-#: ../shell/e-shell-window-actions.c:1398
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Affiche les informations concernant Evolution"
 
-#: ../shell/e-shell-window-actions.c:1403
-#: ../shell/e-shell-window-actions.c:1417
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Fermer la fenÃtre"
 
-#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "Ouvre le manuel d'utilisation d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1452
-msgid "Evolution _FAQ"
-msgstr "_FAQ d'Evolution"
-
-#: ../shell/e-shell-window-actions.c:1454
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Ouvre la page Web de la Foire aux questions"
-
-#: ../shell/e-shell-window-actions.c:1459
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "O_ublier les mots de passe"
 
-#: ../shell/e-shell-window-actions.c:1461
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "Oublie tous les mots de passe mÃmorisÃs"
 
-#: ../shell/e-shell-window-actions.c:1466
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1468
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "Importe les donnÃes d'autres programmes"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Nouvelle _fenÃtre"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "CrÃe une nouvelle fenÃtre pour afficher cette vue"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1502
+msgid "Available Cate_gories"
+msgstr "CatÃ_gories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1504
+msgid "Manage available categories"
+msgstr "GÃre les catÃgories disponibles"
+
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "_RÃfÃrence rapide"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "Affiche les raccourcis clavier d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1503
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ../shell/e-shell-window-actions.c:1508
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "Recherche _avancÃe..."
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "Construit une recherche plus ÃlaborÃe"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "Efface les paramÃtres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1522
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "Mo_difier les recherches enregistrÃes..."
 
 # Utilisation de l'infinitif dans les infobulles du Bureau
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "GÃrer vos recherches enregistrÃes"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../shell/e-shell-window-actions.c:1536
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "Applique les paramÃtres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "Enre_gistrer la recherche..."
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "Enregistre les paramÃtres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "Soumettre un _rapport d'anomalie..."
 
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumet un rapport d'anomalie en utilisant Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "Bascule Evolution en mode hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1571
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-actions.c:1573
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "Bascule Evolution en mode en ligne"
 
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_Agencement"
 
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../shell/e-shell-window-actions.c:1615
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../shell/e-shell-window-actions.c:1622
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "A_pparence du sÃlecteur"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "_FenÃtre"
 
-#: ../shell/e-shell-window-actions.c:1665
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "Afficher la barre _latÃrale"
 
-#: ../shell/e-shell-window-actions.c:1667
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "Affiche la barre latÃrale"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "Afficher les b_outons"
 
-#: ../shell/e-shell-window-actions.c:1675
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "Affiche les boutons du sÃlecteur"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "Afficher la _barre d'Ãtat"
 
-#: ../shell/e-shell-window-actions.c:1683
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "Affiche la barre d'Ãtat"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "Afficher la barre d'ou_tils"
 
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "Affiche la barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "_IcÃnes uniquement"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "Affiche les boutons de la fenÃtre avec uniquement des icÃnes"
 
-#: ../shell/e-shell-window-actions.c:1720
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "_Texte uniquement"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "Affiche les boutons de la fenÃtre avec uniquement du texte"
 
-#: ../shell/e-shell-window-actions.c:1727
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "IcÃnes _et texte"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "Affiche les boutons de la fenÃtre avec des icÃnes et du texte"
 
-#: ../shell/e-shell-window-actions.c:1734
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Style de la _barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1736
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Affiche les boutons de la fenÃtre en utilisant les paramÃtres de la barre "
 "d'outils du bureau"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "DÃfinir les vues..."
 
-#: ../shell/e-shell-window-actions.c:1746
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "CrÃe ou Ãdite des vues"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "Enregistrer la vue personnalisÃe..."
 
-#: ../shell/e-shell-window-actions.c:1753
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "Enregistrer la vue personnalisÃe actuelle"
 
-#: ../shell/e-shell-window-actions.c:1760
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Vue co_urante"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "Vue personnalisÃe"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "La vue actuelle est une vue personnalisÃe"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "Modifie les paramÃtres de la page pour votre imprimante actuelle"
 
-#: ../shell/e-shell-window-actions.c:2167
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "Change pour %s"
 
-#: ../shell/e-shell-window-actions.c:2382
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "ExÃcuter ces paramÃtres de recherche"
 
@@ -20245,24 +19749,24 @@ msgstr "ExÃcuter ces paramÃtres de recherche"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:438
+#: ../shell/e-shell-window.c:442
 msgid "New"
 msgstr "Nouveau"
 
-#: ../shell/e-shell.c:257
+#: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
 msgstr "PrÃparation à la mise hors ligne..."
 
-#: ../shell/e-shell.c:310
+#: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
 msgstr "PrÃparation à la mise en ligne..."
 
-#: ../shell/e-shell.c:372
+#: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
 msgstr "PrÃparation de l'arrÃt..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20301,7 +19805,7 @@ msgstr ""
 "Nous espÃrons que vous apprÃcierez le rÃsultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributionsÂ!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20309,13 +19813,13 @@ msgstr ""
 "Merci,\n"
 "L'Ãquipe d'Evolution\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:226
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:365
+#: ../shell/main.c:308
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20323,52 +19827,52 @@ msgstr ""
 "DÃmarre Evolution en affichant le composant indiquÃ. Les options disponibles "
 "sont ÂÂmailÂÂ, ÂÂcalendarÂÂ, ÂÂcontactsÂÂ, ÂÂtasksÂÂ et ÂÂmemosÂÂ"
 
-#: ../shell/main.c:369
+#: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
 msgstr "Applique la gÃomÃtrie indiquÃe à la fenÃtre principale"
 
-#: ../shell/main.c:373
+#: ../shell/main.c:316
 msgid "Start in online mode"
 msgstr "DÃmarre en mode connectÃ"
 
-#: ../shell/main.c:375
+#: ../shell/main.c:318
 msgid "Ignore network availability"
 msgstr "Ignore la disponibilità du rÃseau"
 
-#: ../shell/main.c:377
+#: ../shell/main.c:320
 msgid "Start in \"express\" mode"
 msgstr "DÃmarre en mode ÂÂexpressÂÂ"
 
-#: ../shell/main.c:380
+#: ../shell/main.c:323
 msgid "Forcibly shut down Evolution"
 msgstr "Force l'arrÃt d'Evolution"
 
-#: ../shell/main.c:383
+#: ../shell/main.c:326
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoie la sortie de dÃbogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:385
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "DÃsactive le chargement des greffons."
 
-#: ../shell/main.c:387
+#: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "DÃsactive l'aperÃu des courriels, contacts et tÃches."
 
-#: ../shell/main.c:391
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 "Importe les URI ou noms de fichier indiquÃs dans la suite des paramÃtres."
 
-#: ../shell/main.c:393
+#: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
 msgstr "Demande à un processus d'Evolution en cours d'exÃcution de quitter"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
-#: ../shell/main.c:627
+#: ../shell/main.c:582
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20377,7 +19881,7 @@ msgstr ""
 "%sÂ: --online et --offline ne peuvent pas Ãtre utilisÃs \n"
 "ensemble. Lancez ÂÂ%s --helpÂÂ pour plus d'informations.\n"
 
-#: ../shell/main.c:633
+#: ../shell/main.c:588
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20495,31 +19999,31 @@ msgstr ""
 msgid "Not a launchable item"
 msgstr "L'ÃlÃment n'est pas exÃcutable"
 
-#: ../smclient/eggsmclient.c:224
+#: ../smclient/eggsmclient.c:226
 msgid "Disable connection to session manager"
 msgstr "DÃsactive la connexion au gestionnaire de sessions"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "Specify file containing saved configuration"
 msgstr "Indique un fichier contenant la configuration enregistrÃe"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:229
 msgid "FILE"
 msgstr "FICHIER"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "Specify session management ID"
 msgstr "Indique l'ID de la gestion de sessions"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:232
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:251
+#: ../smclient/eggsmclient.c:253
 msgid "Session management options:"
 msgstr "Options de gestion de sessionsÂ:"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Show session management options"
 msgstr "Afficher les options de gestion de sessions"
 
@@ -20554,67 +20058,100 @@ msgstr ""
 "Ãmis ce certificat alors vous ne faites pas confiance en l'authenticità de "
 "ce certificat à moins que quelque chose n'indique le contraire ici"
 
-#: ../smime/gui/certificate-manager.c:148
-#: ../smime/gui/certificate-manager.c:460
-#: ../smime/gui/certificate-manager.c:697
-msgid "Select a certificate to import..."
-msgstr "SÃlectionnez un certificat à importer..."
-
-#: ../smime/gui/certificate-manager.c:157
-msgid "All PKCS12 files"
-msgstr "Tous les fichiers PKCS12"
-
-#: ../smime/gui/certificate-manager.c:163
-#: ../smime/gui/certificate-manager.c:475
-#: ../smime/gui/certificate-manager.c:711
-msgid "All files"
-msgstr "Tous les fichiers"
-
-# pluriel ou singulier ?
-#: ../smime/gui/certificate-manager.c:182
-msgid "Failed to import user's certificate"
-msgstr "Impossible d'importer le certificat de l'utilisateur"
-
-#: ../smime/gui/certificate-manager.c:352
-#: ../smime/gui/certificate-manager.c:574
-#: ../smime/gui/certificate-manager.c:808
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Nom de certificat"
 
-#: ../smime/gui/certificate-manager.c:361
-#: ../smime/gui/certificate-manager.c:592
-msgid "Purposes"
-msgstr "Sujets"
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+msgid "Issued To Organization"
+msgstr "Ãmis pour l'organisation"
+
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+msgid "Issued To Organizational Unit"
+msgstr "Ãmis pour l'unità d'organisation"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "NumÃro de sÃrie"
 
-#: ../smime/gui/certificate-manager.c:378
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
+msgid "Purposes"
+msgstr "Sujets"
+
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+msgid "Issued By"
+msgstr "Ãmis par"
+
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
+msgid "Issued By Organization"
+msgstr "Ãmis par l'organisation"
+
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
+msgid "Issued By Organizational Unit"
+msgstr "Ãmis par l'unità d'organisation"
+
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
+msgid "Issued"
+msgstr "Ãmis"
+
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Expire"
 
-#: ../smime/gui/certificate-manager.c:469
-msgid "All email certificate files"
-msgstr "Tous les fichiers de certification de courriel"
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+msgid "SHA1 Fingerprint"
+msgstr "Empreinte numÃrique SHA1"
 
-#: ../smime/gui/certificate-manager.c:502
-msgid "Failed to import contact's certificate"
-msgstr "Impossible d'importer le certificat du contact"
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+msgid "MD5 Fingerprint"
+msgstr "Empreinte numÃrique MD5"
 
-#: ../smime/gui/certificate-manager.c:583
-msgid "E-Mail Address"
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+msgid "Email Address"
 msgstr "Adresse Ãlectronique"
 
-#: ../smime/gui/certificate-manager.c:706
+#: ../smime/gui/certificate-manager.c:570
+msgid "Select a certificate to import..."
+msgstr "SÃlectionnez un certificat à importer..."
+
+#: ../smime/gui/certificate-manager.c:583
+msgid "All files"
+msgstr "Tous les fichiers"
+
+# pluriel ou singulier ?
+#: ../smime/gui/certificate-manager.c:618
+msgid "Failed to import certificate"
+msgstr "Impossible d'importer le certificat"
+
+#: ../smime/gui/certificate-manager.c:985
+msgid "All PKCS12 files"
+msgstr "Tous les fichiers PKCS12"
+
+#: ../smime/gui/certificate-manager.c:1003
+msgid "All email certificate files"
+msgstr "Tous les fichiers de certification de courriel"
+
+#: ../smime/gui/certificate-manager.c:1021
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-manager.c:737
-msgid "Failed to import certificate authority's certificate"
-msgstr "Impossible d'importer le certificat de l'autorità de certification"
-
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -20678,7 +20215,7 @@ msgstr ""
 "ce soit, vous devriez vÃrifier son certificat, sa politique et ses "
 "procÃdures (si elles sont disponibles)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -20738,10 +20275,6 @@ msgstr "Valeur du champ"
 msgid "Fingerprints"
 msgstr "Empreintes numÃriques"
 
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Issued By"
-msgstr "Ãmis par"
-
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Fourni le"
@@ -20750,10 +20283,6 @@ msgstr "Fourni le"
 msgid "Issued To"
 msgstr "Ãmis pour"
 
-#: ../smime/gui/smime-ui.ui.h:26
-msgid "MD5 Fingerprint"
-msgstr "Empreinte numÃrique MD5"
-
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisation (O)"
@@ -20762,10 +20291,6 @@ msgstr "Organisation (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Unità d'organisation (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:29
-msgid "SHA1 Fingerprint"
-msgstr "Empreinte numÃrique SHA1"
-
 #: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Certificat de client SSL"
@@ -20986,47 +20511,49 @@ msgstr "Non critique"
 msgid "Extensions"
 msgstr "Extensions"
 
-#. Translators: This string is used in Certificate details for fields like Issuer
-#. or Subject, which shows the field name on the left and its respective value
-#. on the right, both as stored in the certificate itself. You probably do not
-#. need to change this string, unless changing the order of name and value.
-#. As a result example: "OU = VeriSign Trust Network"
-#.
-#: ../smime/lib/e-cert.c:1045
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../smime/lib/e-cert.c:1047
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithme de signature de certificat"
 
-#: ../smime/lib/e-cert.c:1109
+#: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
 msgstr "Ãmetteur"
 
-#: ../smime/lib/e-cert.c:1164
+#: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
 msgstr "ID unique de l'Ãmetteur"
 
-#: ../smime/lib/e-cert.c:1183
+#: ../smime/lib/e-cert.c:1185
 msgid "Subject Unique ID"
 msgstr "ID unique du sujet"
 
-#: ../smime/lib/e-cert.c:1229
+#: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
 msgstr "Fichier de mots de passe PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:251
+#: ../smime/lib/e-pkcs12.c:250
 msgid "Enter password for PKCS12 file:"
 msgstr "Saisissez le mot de passe pour le fichier PKCS12Â:"
 
 # pluriel ou singulier ?
-#: ../smime/lib/e-pkcs12.c:353
+#: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
 msgstr "Certificats importÃs"
 
@@ -21107,7 +20634,7 @@ msgstr "Avec l'Ã_tat"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
 msgstr "UTC"
 
@@ -21137,14 +20664,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_SÃlection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:346
+#: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "DÃfinir les vues pour %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:354
 #: ../widgets/menus/gal-define-views-dialog.c:356
+#: ../widgets/menus/gal-define-views-dialog.c:358
 msgid "Define Views"
 msgstr "DÃfinir les vues"
 
@@ -21153,11 +20680,11 @@ msgstr "DÃfinir les vues"
 msgid "Define Views for \"%s\""
 msgstr "DÃfinir les vues pour ÂÂ%sÂÂ"
 
-#: ../widgets/menus/gal-view-factory-etable.c:109
+#: ../widgets/menus/gal-view-factory-etable.c:111
 msgid "Table"
 msgstr "Tableau"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:273
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
 msgid "Save Current View"
 msgstr "Enregistrement de la vue actuelle"
 
@@ -21169,7 +20696,7 @@ msgstr "_CrÃer une nouvelle vue"
 msgid "_Replace existing view"
 msgstr "_Remplacer la vue existante"
 
-#: ../widgets/menus/gal-view-new-dialog.c:106
+#: ../widgets/menus/gal-view-new-dialog.c:108
 msgid "Define New View"
 msgstr "DÃfinir une nouvelle vue"
 
@@ -21185,122 +20712,130 @@ msgstr "Type de la vue"
 msgid "Type of view:"
 msgstr "Type de la vueÂ:"
 
-#: ../widgets/misc/e-account-manager.c:349
+#: ../widgets/misc/e-account-manager.c:353
 msgid "De_fault"
 msgstr "DÃ_faut"
 
-#: ../widgets/misc/e-account-tree-view.c:270
+#: ../widgets/misc/e-account-tree-view.c:243
+msgid "Account Name"
+msgstr "Nom du compte"
+
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../widgets/misc/e-attachment-dialog.c:304
+#: ../widgets/misc/e-attachment-dialog.c:308
 msgid "Attachment Properties"
 msgstr "PropriÃtÃs de la piÃce jointe"
 
-#: ../widgets/misc/e-attachment-dialog.c:326
+#: ../widgets/misc/e-attachment-dialog.c:330
 msgid "_Filename:"
 msgstr "Nom du _fichierÂ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:361
+#: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
 msgstr "Type MIMEÂ:"
 
-#: ../widgets/misc/e-attachment-dialog.c:369
-#: ../widgets/misc/e-attachment-store.c:556
+#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-store.c:559
 msgid "_Suggest automatic display of attachment"
 msgstr "_SuggÃrer l'affichage automatique de la piÃce jointe"
 
-#: ../widgets/misc/e-attachment-handler-image.c:96
+#: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
 msgstr "Impossible de dÃfinir comme arriÃre-plan"
 
-#: ../widgets/misc/e-attachment-handler-image.c:148
+#: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
 msgstr "DÃfinir comme _arriÃre-plan"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:90
+#: ../widgets/misc/e-attachment-handler-sendto.c:93
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "Impossible d'envoyer la piÃce jointe"
 msgstr[1] "Impossible d'envoyer les piÃces jointes"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:132
+#: ../widgets/misc/e-attachment-handler-sendto.c:135
 msgid "_Send To..."
 msgstr "_Envoyer Ã..."
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:134
+#: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
 msgstr "Envoyer les piÃces jointes sÃlectionnÃes quelque part"
 
-#: ../widgets/misc/e-attachment-icon-view.c:158
-#: ../widgets/misc/e-attachment-tree-view.c:543
+#: ../widgets/misc/e-attachment-icon-view.c:162
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Loading"
 msgstr "Chargement"
 
-#: ../widgets/misc/e-attachment-icon-view.c:170
-#: ../widgets/misc/e-attachment-tree-view.c:555
+#: ../widgets/misc/e-attachment-icon-view.c:174
+#: ../widgets/misc/e-attachment-tree-view.c:559
 msgid "Saving"
 msgstr "Enregistrement"
 
-#: ../widgets/misc/e-attachment-paned.c:93
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "Masquer la barre des piÃces _jointes"
 
-#: ../widgets/misc/e-attachment-paned.c:95
-#: ../widgets/misc/e-attachment-paned.c:635
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:639
 msgid "Show Attachment _Bar"
 msgstr "Afficher la barre des piÃces _jointes"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "Add Attachment"
 msgstr "Ajouter une piÃce jointe"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "A_ttach"
 msgstr "_Joindre"
 
-#: ../widgets/misc/e-attachment-store.c:610
+#: ../widgets/misc/e-attachment-store.c:613
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Enregistrer la piÃce jointe"
 msgstr[1] "Enregistrer les piÃces jointes"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:639
-#: ../widgets/misc/e-attachment.c:1806 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
 msgid "attachment.dat"
 msgstr "piÃcejointe.dat"
 
-#: ../widgets/misc/e-attachment-view.c:349
+#: ../widgets/misc/e-attachment-view.c:404
+msgid "Open With Other Application..."
+msgstr "Ouvrir avec une autre application..."
+
+#: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../widgets/misc/e-attachment-view.c:375
+#: ../widgets/misc/e-attachment-view.c:437
 msgid "A_dd Attachment..."
 msgstr "A_jouter une piÃce jointe..."
 
-#: ../widgets/misc/e-attachment-view.c:399
+#: ../widgets/misc/e-attachment-view.c:461
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../widgets/misc/e-attachment-view.c:406
+#: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
 msgstr "Tout ma_squer"
 
-#: ../widgets/misc/e-attachment-view.c:413
+#: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../widgets/misc/e-attachment-view.c:420
+#: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
 msgstr "Tout affic_her dans le corps"
 
-#: ../widgets/misc/e-attachment-view.c:738
+#: ../widgets/misc/e-attachment-view.c:803
 #, c-format
-msgid "Open with \"%s\""
+msgid "Open With \"%s\""
 msgstr "Ouvrir dans ÂÂ%sÂÂ"
 
-#: ../widgets/misc/e-attachment-view.c:741
+#: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ouvrir cette piÃce jointe dans %s"
@@ -21309,78 +20844,82 @@ msgstr "Ouvrir cette piÃce jointe dans %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:994
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "Message joint"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
 msgstr "Un chargement est dÃjà en cours"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
 msgstr "Un enregistrement est dÃjà en cours"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Impossible de charger ÂÂ%sÂÂ"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Impossible de charger la piÃce jointe"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Impossible d'ouvrir ÂÂ%sÂÂ"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Impossible d'ouvrir la piÃce jointe"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
 msgstr "Le contenu de la piÃce jointe n'est pas chargÃ"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Impossible d'enregistrer ÂÂ%sÂÂ"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Impossible d'enregistrer la piÃce jointe"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:363
 msgid "Ctrl-click to open a link"
 msgstr "Cliquez en appuyant sur Ctrl pour ouvrir un lien"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1229
+#: ../widgets/misc/e-calendar-item.c:1247
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:225
+#: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Calendrier mensuel"
 
-#: ../widgets/misc/e-charset-combo-box.c:92
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "Codage des caractÃres"
 
-#: ../widgets/misc/e-charset-combo-box.c:115
+#: ../widgets/misc/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "Saisissez le jeu de caractÃres à utiliser"
 
-#: ../widgets/misc/e-charset-combo-box.c:335
+#: ../widgets/misc/e-charset-combo-box.c:339
 msgid "Other..."
 msgstr "Autre..."
 
+#: ../widgets/misc/e-contact-map-window.c:355
+msgid "Contacts Map"
+msgstr "Carte des contacts"
+
 #: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "Date et heure"
@@ -21426,7 +20965,7 @@ msgstr "Date non valide"
 msgid "Invalid Time Value"
 msgstr "Heure non valide"
 
-#: ../widgets/misc/e-import-assistant.c:245
+#: ../widgets/misc/e-import-assistant.c:249
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21434,37 +20973,37 @@ msgstr ""
 "Choisissez le fichier à importer dans Evolution et sÃlectionnez son type "
 "dans la liste."
 
-#: ../widgets/misc/e-import-assistant.c:262
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
 msgstr "Nom du f_ichierÂ:"
 
-#: ../widgets/misc/e-import-assistant.c:272
+#: ../widgets/misc/e-import-assistant.c:276
 msgid "Select a file"
 msgstr "SÃlectionnez un fichier"
 
-#: ../widgets/misc/e-import-assistant.c:286
-#: ../widgets/misc/e-import-assistant.c:461
+#: ../widgets/misc/e-import-assistant.c:290
+#: ../widgets/misc/e-import-assistant.c:465
 msgid "File _type:"
 msgstr "_Type de fichierÂ:"
 
-#: ../widgets/misc/e-import-assistant.c:329
-#: ../widgets/misc/e-import-assistant.c:905
+#: ../widgets/misc/e-import-assistant.c:333
+#: ../widgets/misc/e-import-assistant.c:910
 msgid "Choose the destination for this import"
 msgstr "Choisissez la destination de cette importation"
 
-#: ../widgets/misc/e-import-assistant.c:354
+#: ../widgets/misc/e-import-assistant.c:358
 msgid "Choose the type of importer to run:"
 msgstr "Choisissez l'assistant d'importation à lancerÂ:"
 
-#: ../widgets/misc/e-import-assistant.c:362
+#: ../widgets/misc/e-import-assistant.c:366
 msgid "Import data and settings from _older programs"
 msgstr "Importer les donnÃes et paramÃtres d'_anciens programmes"
 
-#: ../widgets/misc/e-import-assistant.c:370
+#: ../widgets/misc/e-import-assistant.c:374
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: ../widgets/misc/e-import-assistant.c:522
+#: ../widgets/misc/e-import-assistant.c:526
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21476,38 +21015,38 @@ msgstr ""
 "bouton ÂÂPrÃcÃdentÂÂ."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:762
+#: ../widgets/misc/e-import-assistant.c:767
 msgid "_Cancel Import"
 msgstr "_Annuler l'importation"
 
-#: ../widgets/misc/e-import-assistant.c:904
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Preview data to be imported"
 msgstr "PrÃvisualiser les donnÃes à importer"
 
-#: ../widgets/misc/e-import-assistant.c:910
-#: ../widgets/misc/e-import-assistant.c:923
-#: ../widgets/misc/e-import-assistant.c:1270
-#: ../widgets/misc/e-import-assistant.c:1336
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:928
+#: ../widgets/misc/e-import-assistant.c:1273
+#: ../widgets/misc/e-import-assistant.c:1349
+#: ../widgets/misc/e-import-assistant.c:1358
 msgid "Import Data"
 msgstr "Importer les donnÃes"
 
-#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:923
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 "Choisissez dans la liste le type de fichier que vous souhaitez importer."
 
-#: ../widgets/misc/e-import-assistant.c:1260
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1263
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid "Evolution Import Assistant"
 msgstr "Assistant d'importation d'Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Import Location"
 msgstr "Importer un emplacement"
 
-#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1291
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21517,28 +21056,28 @@ msgstr ""
 "Cet assistant va vous guider dans le processus d'importation de fichiers "
 "externes dans Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "Type d'importateurs"
 
-#: ../widgets/misc/e-import-assistant.c:1310
+#: ../widgets/misc/e-import-assistant.c:1318
 msgid "Select Information to Import"
 msgstr "SÃlectionnez les informations à importer"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "SÃlectionnez un fichier"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1344
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr ""
 "Cliquez sur ÂÂAppliquer pour commencer à importer le fichier dans Evolution."
 
-#: ../widgets/misc/e-map.c:866
+#: ../widgets/misc/e-map.c:869
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:872
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21548,70 +21087,70 @@ msgstr ""
 "clavier doivent sÃlectionner le fuseau horaire grÃce à la zone de liste "
 "dÃroulante situÃe en bas."
 
-#: ../widgets/misc/e-online-button.c:23
+#: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolution est actuellement en ligne. Cliquez sur ce bouton pour travailler "
 "hors ligne."
 
-#: ../widgets/misc/e-online-button.c:26
+#: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolution est actuellement hors ligne. Cliquez sur ce bouton pour travailler "
 "en ligne."
 
-#: ../widgets/misc/e-online-button.c:29
+#: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Evolution est actuellement hors ligne parce que le rÃseau est indisponible."
 
-#: ../widgets/misc/e-preferences-window.c:275
+#: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "PrÃfÃrences d'Evolution"
 
-#: ../widgets/misc/e-search-bar.c:75
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "CorrespondÂ: %d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "Ferme la barre de recherche"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "_RechercherÂ:"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "Efface la recherche"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_PrÃcÃdent"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Recherche l'occurrence prÃcÃdente de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:620
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "Recherche la prochaine occurrence de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:639
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "Respecter la _casse"
 
-#: ../widgets/misc/e-search-bar.c:667
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 "La fin de la page a Ãtà atteinte, la recherche continue depuis le dÃbut"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "Le dÃbut de la page a Ãtà atteint, la recherche continue depuis la fin"
 
@@ -21750,38 +21289,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "Aucune"
 
-#: ../widgets/misc/e-signature-editor.c:134
-#: ../widgets/misc/e-signature-editor.c:560
-#: ../widgets/misc/e-signature-manager.c:348
-#: ../widgets/misc/e-signature-script-dialog.c:215
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:564
+#: ../widgets/misc/e-signature-manager.c:372
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "_Enregistrer et fermer"
 
-#: ../widgets/misc/e-signature-editor.c:427
+#: ../widgets/misc/e-signature-editor.c:431
 msgid "Edit Signature"
 msgstr "Ãditer la signature"
 
-#: ../widgets/misc/e-signature-editor.c:442
+#: ../widgets/misc/e-signature-editor.c:446
 msgid "_Signature Name:"
 msgstr "Nom de la _signatureÂ:"
 
-#: ../widgets/misc/e-signature-manager.c:293
+#: ../widgets/misc/e-signature-manager.c:317
 msgid "Add Signature Script"
 msgstr "Ajouter un script de signature"
 
-#: ../widgets/misc/e-signature-manager.c:358
+#: ../widgets/misc/e-signature-manager.c:382
 msgid "Edit Signature Script"
 msgstr "Modifier le script de signature"
 
-#: ../widgets/misc/e-signature-manager.c:577
+#: ../widgets/misc/e-signature-manager.c:602
 msgid "Add _Script"
 msgstr "Ajouter un sc_ript"
 
-#: ../widgets/misc/e-signature-script-dialog.c:264
+#: ../widgets/misc/e-signature-script-dialog.c:268
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21790,11 +21329,11 @@ msgstr ""
 "La sortie de ce script sera utilisÃe pour votre\n"
 "signature. Le nom indiquà ne sera utilisà que pour l'affichage."
 
-#: ../widgets/misc/e-signature-script-dialog.c:309
+#: ../widgets/misc/e-signature-script-dialog.c:313
 msgid "S_cript:"
 msgstr "S_criptÂ:"
 
-#: ../widgets/misc/e-signature-script-dialog.c:340
+#: ../widgets/misc/e-signature-script-dialog.c:344
 msgid "Script file must be executable."
 msgstr "Le fichier de script doit Ãtre exÃcutable."
 
@@ -21802,78 +21341,86 @@ msgstr "Le fichier de script doit Ãtre exÃcutable."
 msgid "Click here to go to URL"
 msgstr "Cliquez ici pour aller à l'URL"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "Copie le lien dans le presse-papiers"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
-#: ../widgets/misc/e-web-view.c:387
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "Ouvre le lien dans un navigateur Web"
 
-#: ../widgets/misc/e-web-view.c:395
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "Copier l'_adresse Ãlectronique"
 
-#: ../widgets/misc/e-web-view.c:424 ../widgets/misc/e-web-view.c:1080
+#: ../widgets/misc/e-web-view.c:447
+msgid "_Copy Image"
+msgstr "_Copier l'image"
+
+#: ../widgets/misc/e-web-view.c:449
+msgid "Copy the image to the clipboard"
+msgstr "Copie l'image dans le presse-papiers"
+
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "SÃlectionne tout le texte et les images"
 
-#: ../widgets/misc/e-web-view.c:860 ../widgets/misc/e-web-view.c:862
-#: ../widgets/misc/e-web-view.c:864
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../widgets/misc/e-web-view.c:866
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
-#: ../widgets/misc/e-web-view.c:868
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
 
-#: ../widgets/misc/ea-calendar-item.c:299
-#: ../widgets/misc/ea-calendar-item.c:308
+#: ../widgets/misc/ea-calendar-item.c:302
+#: ../widgets/misc/ea-calendar-item.c:311
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:314
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "CalendrierÂ: du %s au %s"
 
-#: ../widgets/misc/ea-calendar-item.c:347
+#: ../widgets/misc/ea-calendar-item.c:350
 msgid "evolution calendar item"
 msgstr "ÃlÃment du calendrier d'Evolution"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "liste des popups"
 
-#: ../widgets/table/e-cell-date-edit.c:300
+#: ../widgets/table/e-cell-date-edit.c:299
 msgid "Now"
 msgstr "Maintenant"
 
 #. Translators: "None" as a label of a button to unset date in a date table cell
-#: ../widgets/table/e-cell-date-edit.c:317
+#: ../widgets/table/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Aucune"
 
-#: ../widgets/table/e-cell-date-edit.c:325
+#: ../widgets/table/e-cell-date-edit.c:324
 msgid "OK"
 msgstr "Valider"
 
-#: ../widgets/table/e-cell-date-edit.c:869
+#: ../widgets/table/e-cell-date-edit.c:868
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit Ãtre dans le formatÂ: %s"
@@ -21882,34 +21429,34 @@ msgstr "La date doit Ãtre dans le formatÂ: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Le pourcentage doit Ãtre compris entre 0 et 100 inclus"
 
-#: ../widgets/table/e-table-click-to-add.c:592
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
+#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
 msgid "click to add"
 msgstr "cliquez pour ajouter"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Ascending)"
 msgstr "(Croissant)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
 msgid "(Descending)"
 msgstr "(DÃcroissant)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:394
 msgid "Not sorted"
 msgstr "Non triÃ"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:435
 msgid "No grouping"
 msgstr "Aucun groupement"
 
-#: ../widgets/table/e-table-config.c:654
+#: ../widgets/table/e-table-config.c:659
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Afficher les champs"
 
-#: ../widgets/table/e-table-config.c:674
+#: ../widgets/table/e-table-config.c:679
 msgid "Available Fields"
 msgstr "Champs disponibles"
 
@@ -21918,7 +21465,7 @@ msgid "A_vailable Fields:"
 msgstr "Champs _disponiblesÂ:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -21931,7 +21478,7 @@ msgid "Clear _All"
 msgstr "_Tout effacer"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1660
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "Descending"
 msgstr "DÃcroissant"
 
@@ -21979,6 +21526,10 @@ msgstr "_Champs affichÃs..."
 msgid "_Group By..."
 msgstr "_Grouper par..."
 
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "_Enlever"
+
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "_Afficher le champ dans Affichage"
@@ -21991,11 +21542,11 @@ msgstr "_Afficher ces champs dans l'ordreÂ:"
 msgid "_Sort..."
 msgstr "_Trier..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:117
+#: ../widgets/table/e-table-field-chooser-dialog.c:119
 msgid "Add a Column"
 msgstr "Ajouter une colonne"
 
-#: ../widgets/table/e-table-field-chooser.c:151
+#: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -22010,7 +21561,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -22023,106 +21574,107 @@ msgstr[1] "%sÂ: %s (%d ÃlÃments)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:365
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ÃlÃment)"
 msgstr[1] "%s (%d ÃlÃments)"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1525
+#: ../widgets/table/e-table-header-item.c:1544
 msgid "Sort _Ascending"
 msgstr "Tri _croissant"
 
-#: ../widgets/table/e-table-header-item.c:1528
+#: ../widgets/table/e-table-header-item.c:1547
 msgid "Sort _Descending"
 msgstr "Tri _dÃcroissant"
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1550
 msgid "_Unsort"
 msgstr "_Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1553
 msgid "Group By This _Field"
 msgstr "Grouper par ce _champ"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "Group By _Box"
 msgstr "Grouper par _boÃte"
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1560
 msgid "Remove This _Column"
 msgstr "Enlever cette c_olonne"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1563
 msgid "Add a C_olumn..."
 msgstr "_Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1548
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "A_lignment"
 msgstr "A_lignement"
 
-#: ../widgets/table/e-table-header-item.c:1551
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "B_est Fit"
 msgstr "_Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1554
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "Format Column_s..."
 msgstr "Format des colonne_s..."
 
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Custo_mize Current View..."
 msgstr "_Personnaliser la vue actuelle..."
 
-#: ../widgets/table/e-table-header-item.c:1617
+#: ../widgets/table/e-table-header-item.c:1636
 msgid "_Sort By"
 msgstr "_Trier par"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1635
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Custom"
 msgstr "_Personnaliser"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
 msgstr "affiche un fils"
 
 #. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
 msgid "toggle the cell"
 msgstr "bascule la cellule"
 
 #. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:212
+#: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
 msgstr "Ãtend la rangÃe du ETree contenant cette cellule"
 
 #. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:219
+#: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "rÃduit la rangÃe du ETree contenant cette cellule"
 
-#: ../widgets/table/gal-a11y-e-cell.c:119
+#: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
 msgstr "Cellule de tableau"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "clic"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:154
+#: ../widgets/table/gal-a11y-e-table-column-header.c:157
 msgid "sort"
 msgstr "tri"
 
-#: ../widgets/text/e-text.c:2283
+#: ../widgets/text/e-text.c:2306
 msgid "Select All"
 msgstr "Tout sÃlectionner"
 
-#: ../widgets/text/e-text.c:2295
+#: ../widgets/text/e-text.c:2318
 msgid "Input Methods"
 msgstr "MÃthodes de saisie"
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]