[evolution/foocanvas] Updated French translation

From: Henning Habighorst <hhabig src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/foocanvas] Updated French translation
Date: Sun, 25 Apr 2010 20:59:24 +0000 (UTC)
commit 827ab5ab511cc6bd9d351b3dc5f6f4d85cde40bb
Author: Bruno Brouard <annoa b gmail com>
Date:   Sun Apr 18 14:11:32 2010 +0200

    Updated French translation

 po/fr.po | 8026 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 3892 insertions(+), 4134 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 174d078..697804d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,13 +24,13 @@
 # Claude Paroz <claude 2xlibre net>, 2007-2010.
 # Laurent Coudeur <laurentc iol ie>, 2010.
 #
-#: ../shell/main.c:479
+#: ../shell/main.c:454
 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: 2010-03-18 11:05+0000\n"
+"POT-Creation-Date: 2010-04-18 09:07+0000\n"
 "PO-Revision-Date: 2010-03-19 21:12+0100\n"
 "Last-Translator: Claude Paroz <claude 2xlibre net>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -118,7 +118,7 @@ msgstr "L'authentification sur le serveur LDAP a Ã©chouÃ©."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1267
 msgid "Failed to delete contact"
 msgstr "La suppression du contact a Ã©chouÃ©"
 
@@ -242,7 +242,7 @@ msgstr ""
 "Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
 "pas Ã©tÃ© redÃ©marrÃ©."
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -265,16 +265,6 @@ msgstr "_Redimensionner"
 msgid "_Use as it is"
 msgstr "_Utiliser tel quel"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
 #: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par dÃ©fautÂ :"
@@ -291,7 +281,7 @@ msgstr "Impossible de lire les donnÃ©es de l'application Adresses du Pilot"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2005
 msgid "Anniversary"
 msgstr "Anniversaire"
 
@@ -302,37 +292,39 @@ msgstr "Anniversaire"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2004 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:107
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "BlogÂ :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tÃ©gories..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "CalendrierÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
 msgid "Contact"
 msgstr "Contact"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2568
 msgid "Contact Editor"
 msgstr "Ã?diteur de contacts"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:291
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
@@ -341,221 +333,189 @@ msgstr "Ã?diteur de contacts"
 msgid "Email"
 msgstr "Adresse Ã©lectronique"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Libre/OccupÃ©Â :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Domicile"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Site WebÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Image"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Messagerie instantanÃ©e"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Travail"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Adresse postale"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "_SurnomÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Notes"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Other"
 msgstr "Autre"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "TÃ©lÃ©phone"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "VidÃ©o-confÃ©renceÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Sites Web"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Journal en ligneÂ :"
-
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Bureau"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Address:"
 msgstr "_AdresseÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Anniversary:"
 msgstr "_AnniversaireÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Assistant:"
 msgstr "_AdjointÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Birthday:"
 msgstr "Date de _naissanceÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+msgid "_Blog:"
+msgstr "_Blog"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../plugins/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "C_alendrierÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_City:"
 msgstr "_VilleÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Company:"
 msgstr "_SociÃ©tÃ©Â :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Country:"
 msgstr "_PaysÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Department:"
 msgstr "_ServiceÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_File under:"
 msgstr "_Classer sousÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Free/Busy:"
 msgstr "_Libre/OccupÃ©Â :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Home Page:"
 msgstr "_Site WebÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Manager:"
 msgstr "_DirecteurÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Office:"
 msgstr "_BureauÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_PO Box:"
 msgstr "_BoÃ®te postaleÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Profession:"
 msgstr "_ProfessionÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Spouse:"
 msgstr "_Conjoint(e)Â :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_State/Province:"
 msgstr "Ã?tat/Pro_vinceÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_TitreÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Video Chat:"
 msgstr "_VidÃ©o-confÃ©renceÂ :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Wants to receive HTML mail"
 msgstr "_PrÃ©fÃ¨re recevoir les courriels en HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Journal en ligneÂ :"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_OÃ¹Â :"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 msgid "_Zip/Postal Code:"
 msgstr "_Code postalÂ :"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Nom"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Modifiable"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -597,7 +557,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "Error adding contact"
 msgstr "Erreur lors de l'ajout du contact"
 
@@ -609,45 +569,21 @@ msgstr "Erreur lors de la modification du contact"
 msgid "Error removing contact"
 msgstr "Erreur lors de la suppression du contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Livre source"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Livre cible"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Nouveau contact"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Champs modifiables"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Champs requis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "ModifiÃ©"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2563
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Ã?diteur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2971
 msgid "Please select an image for this contact"
 msgstr "SÃ©lectionnez une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2972
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -655,56 +591,46 @@ msgstr ""
 "La donnÃ©e sur le contact n'est pas valideÂ :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3249
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â«Â %sÂ Â» n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3256
 #, 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:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3282
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s Â«Â %sÂ Â» est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3296
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "Mo_difier entiÃ¨rement"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Nom complet"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "_Adresse Ã©lectronique"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_SÃ©lectionner le carnet d'adresses"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Le singleton EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr"
@@ -771,7 +697,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:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:674
 msgid "Contact List Editor"
 msgstr "Ã?diteur de liste de contacts"
 
@@ -788,7 +714,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:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Select..."
 msgstr "_SÃ©lectionner..."
 
@@ -798,39 +724,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:767
 msgid "Contact List Members"
 msgstr "Membres de la liste de contacts"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:915
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1331
 msgid "_Members"
 msgstr "_Membres"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1170
 msgid "Error adding list"
 msgstr "Erreur lors de l'ajout de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1184
 msgid "Error modifying list"
 msgstr "Erreur lors de la modification de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1198
 msgid "Error removing list"
 msgstr "Erreur lors de la suppression de la liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Carnet"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Est une nouvelle liste"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Contact modifiÃ©Â :"
@@ -869,31 +783,31 @@ 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:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:237
 msgid "_Merge"
 msgstr "_Fusionner"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:220
 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:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 #: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 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:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Le nom contient"
 
@@ -912,91 +826,62 @@ msgstr[1] "%d contacts"
 msgid "Error getting book view"
 msgstr "Erreur d'obtention de l'affichage du carnet"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "RequÃªte"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "Recherche interrompue"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "ModÃ¨le"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:618
 msgid "Cut selected contacts to the clipboard"
 msgstr "Coupe les contacts sÃ©lectionnÃ©s vers le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Copy selected contacts to the clipboard"
 msgstr "Copie les contacts sÃ©lectionnÃ©s dans le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Paste contacts from the clipboard"
 msgstr "Colle les contacts depuis le presse-papiers"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Supprimer les contacts sÃ©lectionnÃ©s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 msgid "Select all visible contacts"
 msgstr "SÃ©lectionne tous les contacts visibles"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Vue du shell"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Source"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 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:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1289
 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:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1293
 #, 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:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Voulez-vous vraiment supprimer ces contactsÂ ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact?"
 msgstr "Voulez-vous vraiment supprimer ce contactÂ ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Voulez-vous vraiment supprimer ce contact (%s)Â ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1462
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1005,11 +890,11 @@ msgstr ""
 "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:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1467
 msgid "_Don't Display"
 msgstr "_Ne pas afficher"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 msgid "Display _All Contacts"
 msgstr "Afficher _tous les contacts"
 
@@ -1169,7 +1054,6 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Titre"
 
@@ -1181,59 +1065,7 @@ msgstr "UnitÃ©"
 msgid "Web Site"
 msgstr "Site Web"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Largeur"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Hauteur"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "A le focus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Champ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nom du champ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "ModÃ¨le de texte"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Longueur max. du nom du champ"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Largeur des colonnes"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1243,7 +1075,7 @@ msgstr ""
 "\n"
 "Recherche des contacts..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1257,7 +1089,7 @@ msgstr ""
 "\n"
 "ou double-cliquez ici pour crÃ©er un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1271,7 +1103,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour crÃ©er un nouveau contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1281,7 +1113,7 @@ msgstr ""
 "\n"
 "Rechercher le contact."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1291,10 +1123,6 @@ msgstr ""
 "\n"
 "Il n'y a aucun Ã©lÃ©ment Ã  afficher dans cette vue."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adaptateur"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Adresse Ã©lectronique (travail)"
@@ -1304,18 +1132,10 @@ msgid "Home Email"
 msgstr "Adresse Ã©lectronique (domicile)"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:805
 msgid "Other Email"
 msgstr "Autre adresse Ã©lectronique"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "SÃ©lectionnÃ©"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "A le curseur"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
 #: ../addressbook/gui/widgets/ea-minicard-view.c:178
@@ -1358,17 +1178,17 @@ msgid "Copy _Email Address"
 msgstr "Copier l'_adresse Ã©lectronique"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:381
 msgid "Copy the email address to the clipboard"
 msgstr "Copie l'adresse Ã©lectronique dans le presse-papiers"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:386
 msgid "_Send New Message To..."
 msgstr "Envoyer un nouveau _message Ã ..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:388
 msgid "Send a mail message to this address"
 msgstr "Envoie un courriel Ã  cette adresse"
 
@@ -1404,22 +1224,21 @@ msgid "Video Chat"
 msgstr "VidÃ©o-confÃ©rence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:496
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Calendrier"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:116
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Libre/OccupÃ©"
@@ -1447,21 +1266,19 @@ msgid "Web Log"
 msgstr "Journal en ligne"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
+#: ../capplet/settings/mail-capplet-shell.c:350
 #: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/addressbook/e-book-shell-migrate.c:134
 #: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-cal-shell-migrate.c:151
 #: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:119
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Personnel"
@@ -1478,8 +1295,8 @@ msgstr "Page Web personnelle"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:838
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer pour envoyer un courriel Ã  %s"
@@ -1536,11 +1353,11 @@ msgstr "Protocole non pris en charge"
 #. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2659
 msgid "Canceled"
 msgstr "AnnulÃ©"
 
@@ -1678,27 +1495,27 @@ msgstr "Cette requÃªte ne s'est pas terminÃ©e correctement."
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
 msgid "Select Address Book"
 msgstr "SÃ©lection du carnet d'adresses"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:311
 msgid "list"
 msgstr "liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contact to"
 msgstr "DÃ©placer le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contact to"
 msgstr "Copier le contact vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Move contacts to"
 msgstr "DÃ©placer les contacts vers"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:445
 msgid "Copy contacts to"
 msgstr "Copier les contacts vers"
 
@@ -1710,7 +1527,7 @@ msgstr "Affichage de la carte"
 #: ../addressbook/importers/evolution-ldif-importer.c:516
 #: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importation..."
 
@@ -1832,19 +1649,19 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "AccÃ¨s anonyme au serveur LDAP"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a Ã©chouÃ©.\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/caldav/caldav-browse-server.c:808
 #: ../plugins/google-account-setup/google-source.c:440
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
@@ -2002,46 +1819,42 @@ msgid "Are you sure you want to send the task without a summary?"
 msgstr "Voulez-vous vraiment envoyer la tÃ¢che sans rÃ©sumÃ©Â ?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Le dÃ©pÃ´t du calendrier est hors ligne."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Impossible de crÃ©er un nouvel Ã©vÃ¨nement"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Impossible d'enregistrer l'Ã©vÃ¨nement"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Supprimer le calendrier Â«Â {0}Â Â»Â ?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Supprimer la liste des mÃ©mos Â«Â {0}Â Â»Â ?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Supprimer la liste des tÃ¢ches Â«Â {0}Â Â»Â ?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:34
 msgid "Do _not Send"
 msgstr "_Ne pas envoyer"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:35
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "TÃ©lÃ©chargement en cours. Voulez-vous enregistrer ce rendez-vousÂ ?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the task?"
 msgstr "TÃ©lÃ©chargement en cours. Voulez-vous enregistrer la tÃ¢cheÂ ?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:37
 msgid "Editor could not be loaded."
 msgstr "L'Ã©diteur ne peut pas Ãªtre chargÃ©."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -2049,31 +1862,26 @@ msgstr ""
 "Des invitations vont Ãªtre envoyÃ©es par courriel Ã  tous les participants, les "
 "autorisant Ã  accepter cette tÃ¢che."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Des invitations vont Ãªtre envoyÃ©es par courriel Ã  tous les participants, les "
 "autorisant Ã  rÃ©pondre Ã  celle-ci."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
 msgid "Error loading calendar"
 msgstr "Erreur lors du chargement du calendrier"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading memo list"
 msgstr "Erreur lors du chargement de la liste des mÃ©mos"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading task list"
 msgstr "Erreur lors du chargement de la liste des tÃ¢ches"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Erreur sur Â«Â {0}Â Â»"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -2081,7 +1889,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nÃ©cessairement informÃ©s que la rÃ©union a Ã©tÃ© annulÃ©e."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:44
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -2089,7 +1897,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nÃ©cessairement informÃ©s que le mÃ©mo a Ã©tÃ© supprimÃ©."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:45
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -2097,11 +1905,7 @@ msgstr ""
 "Si vous n'envoyez pas un avis d'annulation, les autres participants ne "
 "seront pas nÃ©cessairement informÃ©s que la tÃ¢che a Ã©tÃ© supprimÃ©e."
 
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Le serveur ne rÃ©pond pas."
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -2109,7 +1913,7 @@ msgstr ""
 "L'envoi d'informations Ã  jour permet aux autres participants de maintenir Ã  "
 "jour leurs calendriers."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -2117,7 +1921,7 @@ msgstr ""
 "L'envoi d'informations Ã  jour permet aux autres participants de maintenir Ã  "
 "jour leurs listes de tÃ¢ches."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -2125,7 +1929,7 @@ msgstr ""
 "Des piÃ¨ces jointes ont Ã©tÃ© tÃ©lÃ©chargÃ©es mais l'enregistrement du rendez-vous "
 "sera effectuÃ©, sans les piÃ¨ces jointes, auxquelles il est associÃ©."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -2133,101 +1937,97 @@ msgstr ""
 "Des piÃ¨ces jointes ont Ã©tÃ© tÃ©lÃ©chargÃ©es mais l'enregistrement de la tÃ¢che "
 "sera effectuÃ©, sans les piÃ¨ces jointes, auxquelles elle est associÃ©e."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:50
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Certaines fonctionnalitÃ©s peuvent ne pas fonctionner correctement avec la "
 "version actuelle de votre serveur."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:51
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Le calendrier d'Evolution a quittÃ© de faÃ§on inattendue."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Les calendriers d'Evolution ont quittÃ© de faÃ§on inattendue."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Le mÃ©mo d'Evolution a quittÃ© de faÃ§on inattendue."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Le gestionnaire de tÃ¢ches d'Evolution a quittÃ© de faÃ§on inattendue."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:55
 msgid "The calendar is not marked for offline usage."
 msgstr "Le calendrier n'est pas marquÃ© pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:56
 msgid "The memo list is not marked for offline usage."
 msgstr "La liste des mÃ©mos n'est pas marquÃ©e pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:57
 msgid "The task list is not marked for offline usage."
 msgstr "La liste des tÃ¢ches n'est pas marquÃ©e pour une utilisation hors ligne."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Ce calendrier sera dÃ©finitivement supprimÃ©."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:59
 msgid "This memo list will be removed permanently."
 msgstr "Cette liste des mÃ©mos sera dÃ©finitivement supprimÃ©e."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Cette liste des tÃ¢ches sera dÃ©finitivement supprimÃ©e."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Impossible de charger le calendrier"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Voulez-vous enregistrer les modifications apportÃ©es Ã  ce rendez-vousÂ ?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Voulez-vous enregistrer les modifications apportÃ©es Ã  cette rÃ©unionÂ ?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this memo?"
 msgstr "Voulez-vous enregistrer les modifications apportÃ©es Ã  ce mÃ©moÂ ?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this task?"
 msgstr "Voulez-vous enregistrer les modifications apportÃ©es Ã  cette tÃ¢cheÂ ?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Voulez-vous envoyer un avis d'annulation pour ce mÃ©moÂ ?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Voulez-vous envoyer un avis d'annulation Ã  tous les participantsÂ ?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Voulez-vous envoyer des invitations pour la rÃ©union aux participantsÂ ?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send this task to participants?"
 msgstr "Voulez-vous envoyer cette tÃ¢che aux participantsÂ ?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises Ã  jour sur la rÃ©union aux "
 "participantsÂ ?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Voulez-vous envoyer des informations mises Ã  jour sur la tÃ¢che aux "
 "participantsÂ ?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2238,67 +2038,63 @@ msgstr ""
 "meilleurs rÃ©sultats, il est recommandÃ© de mettre Ã  niveau votre serveur vers "
 "une version prise en charge."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Les modifications de ce rendez-vous n'ont pas encore Ã©tÃ© enregistrÃ©es."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Les modifications de cette rÃ©union n'ont pas encore Ã©tÃ© enregistrÃ©es."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this task, but not yet saved it."
 msgstr "Les modifications de cette tÃ¢che n'ont pas encore Ã©tÃ© enregistrÃ©es."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Les modifications de ce mÃ©mo n'ont pas encore Ã©tÃ© enregistrÃ©es."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Vos calendriers ne seront pas disponibles tant que Evolution n'aura pas Ã©tÃ© "
 "redÃ©marrÃ©."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Vos mÃ©mos ne seront pas disponibles tant que Evolution n'aura pas Ã©tÃ© "
 "redÃ©marrÃ©."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Vos tÃ¢ches ne seront pas disponibles tant que Evolution n'aura pas Ã©tÃ© "
 "redÃ©marrÃ©."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "A_bandonner les modifications"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:80 ../composer/e-composer-actions.c:309
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:82
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "_Send Notice"
 msgstr "_Envoyer un avis"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
 #: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "Partager les Ã©vÃ¨nements sur plusieurs joursÂ :"
@@ -2353,7 +2149,7 @@ msgid_plural "hours"
 msgstr[0] "heure"
 msgstr[1] "heures"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Heure de dÃ©but"
 
@@ -2371,7 +2167,7 @@ msgstr "_Tout fermer"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1573
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 #: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../plugins/itip-formatter/itip-view.c:1027
 msgid "Location:"
 msgstr "LieuÂ :"
 
@@ -2384,11 +2180,11 @@ msgid "_Dismiss"
 msgstr "_Fermer"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1625
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "Ã?_dition"
@@ -2398,8 +2194,8 @@ msgid "_Snooze"
 msgstr "_Reporter"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:332
 msgid "hours"
@@ -2409,9 +2205,10 @@ msgstr "heures"
 msgid "location of appointment"
 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:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "minutes"
@@ -2436,13 +2233,13 @@ msgstr "Aucune information sur le lieu."
 msgid "You have %d alarms"
 msgstr "%d alarmes sont prÃ©sentes"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2455,7 +2252,7 @@ msgstr ""
 "un courriel. Evolution affichera une fenÃªtre\n"
 "d'avertissement classique Ã  la place."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1708
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2472,7 +2269,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programmeÂ ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
 msgid "Do not ask me about this program again."
 msgstr "Ne plus m'interroger Ã  propos de ce programme."
 
@@ -2514,7 +2311,7 @@ msgid "Alarm programs"
 msgstr "ExÃ©cutions par alarme"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 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."
 
@@ -2537,162 +2334,157 @@ msgid "Calendars to run alarms for"
 msgstr "Calendriers pour lesquels lancer les alarmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr ""
-"Cochez cette case pour utiliser le fuseau horaire du systÃ¨me dans Evolution."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Compresser les week-ends dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Confirmer le nettoyage"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr ""
 "Nombre de rÃ©currences par dÃ©faut pour un nouvel Ã©vÃ¨nement. -1 signifie pour "
 "toujours."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Rappel par dÃ©faut des rendez-vous"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Nombre de rÃ©currences par dÃ©faut"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "UnitÃ©s par dÃ©faut du rappel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Valeur par dÃ©faut du rappel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "RÃ©pertoire de sauvegarde des fichiers d'alarmes audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "DÃ©gradÃ© de l'Ã©vÃ¨nement"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Transparence de l'Ã©vÃ¨nement"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "URL des serveurs Libre/OccupÃ©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "URL du modÃ¨le Libre/OccupÃ©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "DÃ©gradÃ© des Ã©vÃ¨nements dans les vues du calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Masquer les tÃ¢ches terminÃ©es"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Masquer les unitÃ©s des tÃ¢ches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Masquer la valeur de la tÃ¢che"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Position du panneau horizontal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Dernier dÃ©clenchement de l'alarme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "Niveau au-delÃ  duquel les messages doivent Ãªtre journalisÃ©s."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr ""
 "Liste des URL des serveurs pour les publications des informations de type "
 "Libre/OccupÃ©."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Ligne de l'heure actuelle (MBL)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Vue du jour"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Couleur de la ligne de l'heure actuelle (MBL) - Barre de temps"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -2700,51 +2492,51 @@ msgstr ""
 "Nombre maximum de fuseaux horaires rÃ©cemment utilisÃ©s Ã  enregistrer dans une "
 "liste Â«Â day_second_zonesÂ Â»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Nombre maximum de fuseaux horaires rÃ©cemment utilisÃ©s Ã  enregistrer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Style de l'agencement des mÃ©mos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Position du panneau d'aperÃ§u des mÃ©mos (horizontale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Position du panneau d'aperÃ§u des mÃ©mos (verticale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minute Ã  laquelle les journÃ©es de travail se terminent, de 0 Ã  59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minute Ã  laquelle les journÃ©es de travail commencent, de 0 Ã  59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Position du panneau horizontal dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Position du panneau vertical dans la vue mensuelle"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Nombre d'unitÃ©s pour dÃ©terminer un rappel par dÃ©faut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nombre d'unitÃ©s pour dÃ©terminer quand masquer les tÃ¢ches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Couleur des tÃ¢ches en retard"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -2752,7 +2544,7 @@ msgstr ""
 "Position du panneau horizontal hors vue mensuelle, entre le navigateur de "
 "dates du calendrier et la liste des tÃ¢ches, en pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2760,21 +2552,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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Position du panneau d'aperÃ§u des mÃ©mos pour une orientation verticale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr ""
 "Position du panneau d'aperÃ§u des tÃ¢ches pour une orientation horizontale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr ""
 "Position du panneau d'aperÃ§u des tÃ¢ches pour une orientation verticale."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -2782,7 +2574,7 @@ msgstr ""
 "Position du panneau vertical, entre les listes du calendrier, et le "
 "navigateur de dates du calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -2790,7 +2582,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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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."
@@ -2798,90 +2590,90 @@ 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."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "Calendrier principal"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Liste principale de mÃ©mos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Liste principale de tÃ¢ches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmes qui peuvent Ãªtre lancÃ©s par les alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 "Fuseaux horaires secondaires rÃ©cemment utilisÃ©s dans une vue quotidienne"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "RÃ©pertoire de sauvegarde des alarmes audio"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Faire dÃ©filer la vue mensuelle d'une semaine"
 
 # Resource Reservation Protocol
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Afficher le champ RSVP dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Afficher le champ rÃ´le dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Afficher le champ des catÃ©gories dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Afficher les alarmes dans la zone de notification"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Afficher le champ Ã©tat dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Afficher le panneau d'aperÃ§u des mÃ©mos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Afficher le panneau d'aperÃ§u des tÃ¢ches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Afficher le champ fuseau horaire dans l'Ã©diteur d'Ã©vÃ¨nement/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Afficher le champ type dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show week number in Day and Work Week View"
 msgstr ""
 "Afficher le numÃ©ro de la semaine dans les vues quotidiennes et hebdomadaires "
 "de travail"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week numbers in date navigator"
 msgstr "Afficher les numÃ©ros de semaine dans le navigateur de dates"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -2889,23 +2681,23 @@ msgstr ""
 "Si activÃ©, affiche le fuseau horaire secondaire dans une vue quotidienne. La "
 "valeur est identique Ã  celle utilisÃ©e pour une clÃ© Â«Â timezoneÂ Â»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
 msgstr "Style de l'agencement des tÃ¢ches"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (horizontal)"
 msgstr "Position du panneau d'aperÃ§u des tÃ¢ches (horizontale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Task preview pane position (vertical)"
 msgstr "Position du panneau d'aperÃ§u des tÃ¢ches (verticale)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Tasks due today color"
 msgstr "Couleurs des tÃ¢ches Ã  effectuer aujourd'hui"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2915,7 +2707,7 @@ msgstr ""
 "remplacÃ© par le nom d'utilisateur de l'adresse Ã©lectronique tandis que %d "
 "sera remplacÃ© par le nom de domaine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2924,7 +2716,7 @@ msgstr ""
 "le calendrier, comme un emplacement non traduit de la base de donnÃ©es des "
 "fuseaux horaires d'Olsen par exemple Â«Â America/New YorkÂ Â»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -2935,7 +2727,7 @@ msgstr ""
 "sous la liste des mÃ©mos. Â«Â 1Â Â» (vue verticale) place le panneau d'aperÃ§u Ã  "
 "cÃ´tÃ© de la liste des mÃ©mos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -2946,11 +2738,11 @@ msgstr ""
 "d'aperÃ§u sous la liste des tÃ¢ches. Â«Â 1Â Â» (vue verticale) place le panneau "
 "d'aperÃ§u Ã  cÃ´tÃ© de la liste des tÃ¢ches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "The second timezone for a Day View"
 msgstr "Le fuseau horaire secondaire pour une vue quotidienne"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -2958,19 +2750,19 @@ msgstr ""
 "Cette option peut prendre les valeurs suivantesÂ : 0Â pour les erreurs, 1Â pour "
 "les avertissements et 2 pour les messages de dÃ©bogage."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time divisions"
 msgstr "Divisions horaires"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time the last alarm ran, in time_t."
 msgstr "Heure Ã  laquelle la derniÃ¨re alarme a Ã©tÃ© lancÃ©e, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -2978,73 +2770,73 @@ msgstr ""
 "Transparence des Ã©vÃ¨nements dans la vue du calendrier, une valeur entre 0 "
 "(transparent) et 1 (opaque)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Twenty four hour time format"
 msgstr "Format de date 24 heures"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "URI du calendrier sÃ©lectionnÃ© (Â«Â principalÂ Â»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "URI de la liste de mÃ©mos sÃ©lectionnÃ©e (Â«Â principaleÂ Â»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "URI de la liste de tÃ¢ches sÃ©lectionnÃ©e (Â«Â principaleÂ Â»)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "UnitÃ©s pour le rappel par dÃ©faut, Â«Â minutesÂ Â», Â«Â hoursÂ Â» ou Â«Â daysÂ Â»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "UnitÃ©s pour dÃ©terminer quand masquer les tÃ¢ches, Â«Â minutesÂ Â», Â«Â hoursÂ Â» ou "
 "Â«Â daysÂ Â»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
 msgstr "Utiliser le fuseau horaire du systÃ¨me"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr ""
 "Utiliser le fuseau horaire du systÃ¨me au lieu de celui dÃ©fini dans Evolution."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Vertical pane position"
 msgstr "Position du panneau vertical"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Week start"
 msgstr "DÃ©but de la semaine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 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)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 "Indique s'il faut utiliser une icÃ´ne de notification pour afficher les "
 "alarmes."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 "Indique s'il faut demander une confirmation pour la suppression des rendez-"
 "vous ou des tÃ¢ches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Indique s'il faut demander une confirmation pour le nettoyage des rendez-"
 "vous et des tÃ¢ches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -3052,105 +2844,105 @@ msgstr ""
 "Indique si les week-ends doivent Ãªtre compressÃ©s dans la vue mensuelle, ce "
 "qui placera samedi et dimanche dans l'espace d'un seul jour."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indique s'il faut afficher l'heure de fin des Ã©vÃ¨nements dans les vues "
 "hebdomadaire et mensuelle."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indique s'il faut dessiner la ligne Marcus Bains (ligne Ã  la date actuelle) "
 "dans le calendrier."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indique s'il faut masquer les tÃ¢ches terminÃ©es dans la vue des tÃ¢ches."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr ""
 "Indique s'il faut faire dÃ©filer la vue mensuelle d'une semaine et pas d'un "
 "mois."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 "Indique s'il faut mettre en place un rappel par dÃ©faut des rendez-vous."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ RSVP dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/"
 "rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ catÃ©gories dans l'Ã©diteur d'Ã©vÃ¨nement/"
 "tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ rÃ´le dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/"
 "rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ Ã©tat dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/"
 "rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indique s'il faut afficher l'heure en format 24h au lieu du format am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ fuseau horaire dans l'Ã©diteur "
 "d'Ã©vÃ¨nement/tÃ¢che/rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indique s'il faut afficher le champ type dans l'Ã©diteur d'Ã©vÃ¨nement/tÃ¢che/"
 "rÃ©union"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr ""
 "Indique s'il faut afficher le numÃ©ro de la semaine dans les vues "
 "quotidiennes et hebdomadaires de travail."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 "Indique s'il faut afficher les numÃ©ros de semaine dans l'Ã©diteur d'Ã©vÃ¨nement/"
 "tÃ¢che/rÃ©union."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
 msgstr "Jours ouvrÃ©s"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday end hour"
 msgstr "Heure Ã  laquelle les jours ouvrÃ©s se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end minute"
 msgstr "Minute Ã  laquelle les jours ouvrÃ©s se terminent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday start hour"
 msgstr "Heure Ã  laquelle les jours ouvrÃ©s commencent"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start minute"
 msgstr "Minute Ã  laquelle les jours ouvrÃ©s commencent"
 
@@ -3200,7 +2992,7 @@ msgid "Classification"
 msgstr "Classification"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:499 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -3244,19 +3036,19 @@ msgid "Organizer"
 msgstr "Organisateur"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:497 ../calendar/gui/e-task-table.c:488
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "PrivÃ©"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:488 ../calendar/gui/e-cal-model.c:495
+#: ../calendar/gui/e-task-table.c:487 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Public"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:299
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "RÃ©currence"
@@ -3339,7 +3131,7 @@ msgstr "Alarme sonore personnalisÃ©e"
 msgid "Mes_sage:"
 msgstr "_MessageÂ :"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:77
 msgid "Options"
 msgstr "Options"
 
@@ -3386,11 +3178,12 @@ msgstr "jour(s)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../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:333
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "jours"
 
@@ -3399,19 +3192,20 @@ msgid "end of appointment"
 msgstr "la fin du rendez-vous"
 
 # RÃ©pÃ©ter l'alarme: x fois toutes les x minutes
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %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"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "le dÃ©but du rendez-vous"
 
@@ -3439,7 +3233,7 @@ msgstr "Aucune"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "SÃ©lectionner..."
 
@@ -3448,12 +3242,12 @@ msgid "Selected Calendars for Alarms"
 msgstr "Calendriers sÃ©lectionnÃ©s pour les alarmes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Date et heureÂ :"
+msgid "Ti_me and date:"
+msgstr "Date et _heureÂ :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Date uniquementÂ :"
+msgid "_Date only:"
+msgstr "_Date uniquementÂ :"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3486,12 +3280,12 @@ msgstr "30 minutes"
 msgid "60 minutes"
 msgstr "60 minutes"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Alertes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "Format de date et d'heure"
@@ -3517,20 +3311,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Afficher les alarmes dans la zone de _notification uniquement"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Vendredi"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:278 ../mail/mail-config.ui.h:54
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2660
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "GÃ©nÃ©ral"
 
@@ -3543,7 +3337,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Lundi"
@@ -3557,186 +3351,198 @@ msgid "None"
 msgstr "Aucune"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "_Dim"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Samedi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Faire dÃ©file_r la vue mensuelle d'une semaine"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "DeuxiÃ¨me f_useauÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "SÃ©lectionnez les calendriers pour les notifications d'alarme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Aff_icher un rappel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Afficher un _rappel"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "Show week _numbers in date navigator"
 msgstr "Afficher les _numÃ©ros de semaine dans le navigateur de dates"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "Show week n_umber in Day and Work Week View"
 msgstr ""
 "Afficher le n_umÃ©ro de la semaine dans les vues quotidiennes et "
 "hebdomadaires de travail"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_asks due today:"
 msgstr "TÃ¢ches d'_aujourd'huiÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Liste des tÃ¢ches"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Template:"
 msgstr "ModÃ¨leÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Heure"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Time _zone:"
 msgstr "Fuseau _horaireÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Time format:"
 msgstr "Format de dateÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Utiliser le fuseau horaire du s_ystÃ¨me"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "La s_emaine dÃ©buteÂ unÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
 msgid "Work Week"
 msgstr "Sem. de travail"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "Work days:"
 msgstr "Jours ouvrÃ©sÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des Ã©lÃ©ments"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Day begins:"
 msgstr "La _journÃ©e dÃ©bute Ã Â :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Fri"
 msgstr "_Ven"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Masquer les tÃ¢ches effectuÃ©es aprÃ¨s"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Mon"
 msgstr "_Lun"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "TÃ¢ches en _retardÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Sat"
 msgstr "_Sam"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.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"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Time divisions:"
 msgstr "Di_visions horairesÂ :"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Tue"
 msgstr "_Mar"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "_Wed"
 msgstr "M_er"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "avant chaque anniversaire"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:76
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
@@ -3745,12 +3551,12 @@ msgid "Type:"
 msgstr "TypeÂ :"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_TypeÂ :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:147
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3774,35 +3580,35 @@ msgstr ""
 "_Copier localement le contenu de la liste des mÃ©mos pour les opÃ©rations hors "
 "ligne"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Couleu_rÂ :"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Liste des mÃ©mos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "PropriÃ©tÃ©s du calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "PropriÃ©tÃ©s de la liste des tÃ¢ches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Nouvelle liste de tÃ¢ches"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "PropriÃ©tÃ©s de la liste des mÃ©mos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Nouvelle liste de mÃ©mos"
 
@@ -3862,254 +3668,234 @@ msgstr ""
 msgid "Validation error: %s"
 msgstr "Erreur de validationÂ : %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " Ã? "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (terminÃ© "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "TerminÃ© "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (date d'Ã©chÃ©ance "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Date d'Ã©chÃ©ance "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:237
 msgid "Could not save attachments"
 msgstr "Impossible d'enregistrer les piÃ¨ces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:505
 msgid "Could not update object"
 msgstr "Impossible de mettre Ã  jour l'objet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "Ã?diter le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "RÃ©union - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "TÃ¢che attribuÃ©e - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "TÃ¢che - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "MÃ©mo - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "Aucun rÃ©sumÃ©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "Conserver l'Ã©lÃ©ment d'origineÂ ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "Cliquez ici pour fermer la fenÃªtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1464
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:398 ../widgets/misc/e-web-view.c:1051
 msgid "Copy the selection"
 msgstr "Copie la sÃ©lection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1471
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1045
 msgid "Cut the selection"
 msgstr "Coupe la sÃ©lection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Supprime la sÃ©lection"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "Cliquez ici pour voir l'aide disponible"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1513
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1057
 msgid "Paste the clipboard"
 msgstr "Colle le contenu du presse-papiers"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "Cliquez ici pour enregistrer la fenÃªtre actuelle"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "SÃ©lectionne tout le texte"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "C_lassification"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1632
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "I_nsertion"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:353
 msgid "_Options"
 msgstr "_Options"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1674 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../composer/e-composer-actions.c:281
 msgid "_Attachment..."
 msgstr "_PiÃ¨ce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "Cliquez ici pour joindre un fichier"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "_CatÃ©gories"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "L'Ã©tat indique si les catÃ©gories sont affichÃ©es"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "Fu_seau horaire"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 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:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "Pu_blic"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "Classer comme public"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "_PrivÃ©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "Classer comme privÃ©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "_Confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "Classer comme confidentiel"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "Champ _RÃ´le"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 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:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "L'Ã©tat indique si le champ RSVP est affichÃ©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "Champ _Ã?tat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "L'Ã©tat indique si le champ Ã?tat est affichÃ©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "Champ _Type"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 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:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "_Documents rÃ©cents"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1683
+#: ../composer/e-composer-actions.c:477
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2958
 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:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "piÃ¨ce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:2988
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version actuelleÂ !"
 
@@ -4131,6 +3917,10 @@ msgstr ""
 "_Supprimer cet Ã©lÃ©ment de toutes les autres boÃ®tes Ã  lettres des "
 "destinatairesÂ ?"
 
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "_Retirer le commentaire"
+
 #: ../calendar/gui/dialogs/delete-error.c:55
 msgid "The event could not be deleted due to a corba error"
 msgstr "Impossible de supprimer l'Ã©vÃ¨nement Ã  cause d'une erreur CORBA"
@@ -4192,60 +3982,60 @@ msgstr "DÃ©lÃ©guer Ã Â :"
 msgid "Enter Delegate"
 msgstr "Saisissez un dÃ©lÃ©guÃ©"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Alarms"
 msgstr "_Alarmes"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:207
 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"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Recurrence"
 msgstr "_RÃ©currence"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Make this a recurring event"
 msgstr "Transforme en Ã©vÃ¨nement rÃ©current"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:219
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Options d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:221
 #: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "InsÃ¨re les options avancÃ©es d'envoi"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:229
 msgid "All _Day Event"
 msgstr "Toute la _journÃ©e"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:231
 msgid "Toggles whether to have All Day Event"
 msgstr "L'Ã©tat indique si dÃ©fini comme Â«Â Ã?vÃ¨nement toute la journÃ©eÂ Â»"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "Show Time as _Busy"
 msgstr "Afficher la pÃ©riode comme _occupÃ©e"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Toggles whether to show time as busy"
 msgstr "L'Ã©tat indique si la pÃ©riode est affichÃ©e comme occupÃ©e"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:248
 msgid "_Free/Busy"
 msgstr "_Libre/OccupÃ©"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "Query free / busy information for the attendees"
 msgstr ""
 "Interroge les personnes attendues sur leur disponibilitÃ© (libre/occupÃ©)"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
+#: ../calendar/gui/dialogs/event-editor.c:296
 msgid "Appoint_ment"
 msgstr "_Rendez-vous"
 
@@ -4262,7 +4052,7 @@ msgstr ""
 "n'Ãªtes pas l'organisateur"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "Cet Ã©vÃ¨nement possÃ¨de des alarmes"
 
@@ -4323,7 +4113,7 @@ msgstr "Un organisateur est nÃ©cessaire."
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nÃ©cessaire."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier Â«Â %sÂ Â»."
@@ -4334,40 +4124,40 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Vous intervenez pour le compte de %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, 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:2966
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "Personnaliser"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:2964
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Aucune"
@@ -4385,8 +4175,10 @@ msgid "15 minutes before appointment"
 msgstr "15 minutes avant le rendez-vous"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "Participant_s..."
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "Participa_nts..."
 
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 #: ../calendar/gui/e-meeting-list-view.c:148
@@ -4401,28 +4193,26 @@ msgstr "Alarme personnalisÃ©eÂ :"
 msgid "Event Description"
 msgstr "Description de l'Ã©vÃ¨nement"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "_RÃ©sumÃ©Â :"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "_Alarm"
 msgstr "_Alarme"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_DescriptionÂ :"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_EmplacementÂ :"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "RÃ©_sumÃ©Â :"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "_HeureÂ :"
@@ -4437,7 +4227,7 @@ msgstr "pour"
 msgid "until"
 msgstr "jusqu'au"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2576
 msgid "Memo"
 msgstr "MÃ©mo"
 
@@ -4451,15 +4241,15 @@ msgstr ""
 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:875
+#: ../calendar/gui/dialogs/memo-page.c:876
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mÃ©mos dans Â«Â %sÂ Â»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1043 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2242
+#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2325
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:78
 msgid "To"
 msgstr "Ã?"
 
@@ -4468,6 +4258,11 @@ msgstr "Ã?"
 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Ã©Â :"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Ã?Â :"
@@ -4478,64 +4273,64 @@ msgstr "_Ã?Â :"
 msgid "_Group:"
 msgstr "_GroupeÂ :"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un Ã©vÃ¨nement rÃ©current. Que souhaitez-vous "
 "modifierÂ ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Vous dÃ©lÃ©guez actuellement un Ã©vÃ¨nement rÃ©current. Que souhaitez-vous "
 "dÃ©lÃ©guerÂ ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement une tÃ¢che rÃ©currente. Que souhaitez-vous "
 "modifierÂ ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Vous modifiez actuellement un mÃ©mo rÃ©current. Que souhaitez-vous modifierÂ ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Seulement cette occurrence"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Cette occurrence et les prÃ©cÃ©dentes"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Cette instance et celles Ã  venir"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 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:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "La date de la rÃ©currence n'est pas valide"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "le"
 
@@ -4543,7 +4338,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "premiÃ¨re"
 
@@ -4552,7 +4347,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "seconde"
 
@@ -4560,7 +4355,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "troisiÃ¨me"
 
@@ -4568,7 +4363,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "quatriÃ¨me"
 
@@ -4576,7 +4371,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "cinquiÃ¨me"
 
@@ -4584,13 +4379,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Autre date"
 
@@ -4598,7 +4393,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1er au 10"
 
@@ -4606,7 +4401,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11 au 20"
 
@@ -4614,47 +4409,47 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "jour"
 
 #. 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:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "le"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "occurrences"
 
 # pas certain de la traduction. Ã§a peut Ãªtre aussi exclusion ...
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Ajouter une exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 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:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Modifier l'exception"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Impossible d'obtenir une sÃ©lection Ã  dÃ©truire."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Date/Heure"
 
@@ -4666,7 +4461,7 @@ msgstr "Tous les"
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:85
 msgid "Preview"
 msgstr "AperÃ§u"
 
@@ -4690,11 +4485,11 @@ msgstr "semaine(s)"
 msgid "year(s)"
 msgstr "annÃ©e(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Envoyer mes alarmes avec cet Ã©vÃ¨nement"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Avertir _uniquement les nouveaux participants"
 
@@ -4703,66 +4498,66 @@ msgstr "Avertir _uniquement les nouveaux participants"
 msgid "Completed date is wrong"
 msgstr "La date d'achÃ¨vement est erronÃ©e"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "Page Web"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2656 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 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:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1123 ../widgets/misc/e-send-options.ui.h:8
 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:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2653
 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:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:512 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1121 ../widgets/misc/e-send-options.ui.h:9
 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:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1243 ../calendar/gui/e-task-table.c:511
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1122
 #: ../widgets/misc/e-send-options.ui.h:13
 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:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:584
+#: ../calendar/gui/print.c:2650 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Non dÃ©marrÃ©e"
 
@@ -4778,7 +4573,7 @@ msgstr "Ã?_tatÂ :"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
+#: ../calendar/gui/e-calendar-view.c:1759
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4788,7 +4583,7 @@ msgstr "Ã?tat"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "IndÃ©finie"
@@ -4798,7 +4593,7 @@ msgid "_Date completed:"
 msgstr "_Date d'achÃ¨vementÂ :"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_PrioritÃ©Â :"
 
@@ -4819,11 +4614,11 @@ msgstr "Cliquer pour modifier ou afficher les dÃ©tails de l'Ã©tat de la tÃ¢che"
 msgid "_Send Options"
 msgstr "Options d'_envoi"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:322
 msgid "_Task"
 msgstr "_TÃ¢che"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:325
 msgid "Task Details"
 msgstr "DÃ©tails de la tÃ¢che"
 
@@ -4853,10 +4648,6 @@ msgstr "La date d'Ã©chÃ©ance est erronÃ©e"
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tÃ¢ches dans Â«Â %sÂ Â»."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Participa_nts..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ca_tÃ©gories..."
@@ -4945,46 +4736,46 @@ msgstr "%s Ã  %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:191 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:197
 msgid "Categories:"
 msgstr "CatÃ©goriesÂ :"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "RÃ©sumÃ©Â :"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:258
 msgid "Start Date:"
 msgstr "Date de dÃ©butÂ :"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "Date d'Ã©chÃ©anceÂ :"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:1058
 msgid "Status:"
 msgstr "Ã?tatÂ :"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "PrioritÃ©Â :"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-cal-component-preview.c:336
 #: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Description:"
 msgstr "DescriptionÂ :"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "Page WebÂ :"
 
@@ -5011,16 +4802,16 @@ msgid "Start Date"
 msgstr "Date de dÃ©but"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:562
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:563
 msgid "Busy"
 msgstr "OccupÃ©"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5031,63 +4822,49 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Aucune"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:829
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1249
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Client par dÃ©faut"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "ParamÃ¨tres du shell"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "ParamÃ¨tres gÃ©nÃ©raux de l'application"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-cal-model.c:501 ../calendar/gui/e-itip-control.c:1197
 #: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:976
+#: ../plugins/itip-formatter/itip-formatter.c:450
+#: ../plugins/itip-formatter/itip-formatter.c:2327
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1245
 msgid "Recurring"
 msgstr "RÃ©current"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1247
 msgid "Assigned"
 msgstr "AttribuÃ©"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2141
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
@@ -5131,90 +4908,90 @@ msgstr "Date de dÃ©but"
 msgid "Type"
 msgstr "Type"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:404
 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:398
+#: ../calendar/gui/e-calendar-view.c:410
 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:404
+#: ../calendar/gui/e-calendar-view.c:416
 msgid "Paste events from the clipboard"
 msgstr "Colle les Ã©vÃ¨nements depuis le presse-papiers"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Delete selected events"
 msgstr "Supprime les Ã©vÃ¨nements sÃ©lectionnÃ©s"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-calendar-view.c:441 ../calendar/gui/e-memo-table.c:187
 #: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sÃ©lectionnÃ©s"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:629 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-task-table.c:1067
 msgid "Updating objects"
 msgstr "Mise Ã  jour des objets"
 
-#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-calendar-view.c:1706
 #: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2315
 msgid "Accepted"
 msgstr "AcceptÃ©"
 
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1707
 #: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2321
 msgid "Declined"
 msgstr "RefusÃ©"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1708
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1709
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2324
 msgid "Delegated"
 msgstr "DÃ©lÃ©guÃ©"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1710
 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:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1852 ../calendar/gui/e-memo-table.c:527
+#: ../calendar/gui/e-task-table.c:742
 #, 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:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1856 ../calendar/gui/e-memo-table.c:532
+#: ../calendar/gui/e-task-table.c:745
 #, c-format
 msgid "Organizer: %s"
 msgstr "OrganisateurÂ : %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/print.c:2608
 #, c-format
 msgid "Location: %s"
 msgstr "LieuÂ : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1903
 #, c-format
 msgid "Time: %s %s"
 msgstr "HeureÂ : %s %s"
@@ -5257,8 +5034,8 @@ msgstr "Afficher le second fuseau horaire"
 #. 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:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:865 ../calendar/gui/e-day-view.c:1879
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1735
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5268,10 +5045,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:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../calendar/gui/e-day-view-top-item.c:869 ../calendar/gui/e-day-view.c:1896
+#: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../modules/calendar/e-cal-shell-view-private.c:913
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5280,27 +5057,27 @@ 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:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../calendar/gui/e-day-view-top-item.c:873 ../calendar/gui/e-day-view.c:1912
+#: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../modules/calendar/e-cal-shell-view-private.c:949
 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:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1076 ../calendar/gui/e-week-view.c:748
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1079 ../calendar/gui/e-week-view.c:751
 #: ../calendar/gui/print.c:821
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2614
+#: ../calendar/gui/e-day-view.c:2609
 #, c-format
 msgid "Week %d"
 msgstr "Semaine %d"
@@ -5397,11 +5174,11 @@ msgstr "Erreur iCalendar"
 
 #: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
 #: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:522
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
@@ -5415,13 +5192,13 @@ msgstr ""
 
 #. Translators: "None" used as a default value for events without Summary received by mail
 #: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../plugins/itip-formatter/itip-formatter.c:2302
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Aucun"
 
 #: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgid "Tentatively Accepted"
 msgstr "AcceptÃ© provisoirement"
 
@@ -5646,7 +5423,7 @@ msgid "Attendee status updated\n"
 msgstr "Ã?tat du participant mis Ã  jour\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 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"
@@ -5701,8 +5478,8 @@ msgid "Send Latest Information"
 msgstr "Envoyer les derniÃ¨res informations"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../modules/mail/e-mail-shell-view-actions.c:970
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -5751,56 +5528,56 @@ msgid "Resources"
 msgstr "Ressources"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:823 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../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:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Salle"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "PrÃ©sident"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:826 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Participant attendu"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Non participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:836
 msgid "Needs Action"
 msgstr "NÃ©cessite une action"
 
@@ -5809,14 +5586,14 @@ msgstr "NÃ©cessite une action"
 msgid "Attendee                          "
 msgstr "Participant                          "
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "En cours"
 
 #. 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2366
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -5825,7 +5602,7 @@ msgstr "%A %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -5835,67 +5612,63 @@ msgstr "%a %d/%m/%Y"
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Absent du bureau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Aucune information"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Par_ticipants..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_ptions"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Afficher Zoom a_rriÃ¨re"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Mettre Ã  jour Libre/OccupÃ©"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "Heure de _dÃ©butÂ :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Heure de _finÂ :"
 
@@ -5924,44 +5697,46 @@ msgid "Member"
 msgstr "Membre"
 
 #: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../modules/calendar/e-cal-shell-content.c:461
 #: ../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:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "MÃ©mos"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:706
 msgid "* No Summary *"
 msgstr "* Aucun rÃ©sumÃ© *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:574 ../calendar/gui/e-task-table.c:786
 msgid "Start: "
 msgstr "DÃ©butÂ : "
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:593 ../calendar/gui/e-task-table.c:804
 msgid "Due: "
 msgstr "Ã?chÃ©anceÂ : "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:709
 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:713
+#: ../calendar/gui/e-memo-table.c:715
 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:719
+#: ../calendar/gui/e-memo-table.c:721
 msgid "Paste memos from the clipboard"
 msgstr "Colle les mÃ©mos depuis le presse-papiers"
 
-#: ../calendar/gui/e-memo-table.c:725
+#: ../calendar/gui/e-memo-table.c:727
 #: ../modules/calendar/e-memo-shell-view-actions.c:556
 msgid "Delete selected memos"
 msgstr "Supprime les mÃ©mos sÃ©lectionnÃ©s"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Select all visible memos"
 msgstr "SÃ©lectionne tous les mÃ©mos visibles"
 
@@ -5969,93 +5744,58 @@ msgstr "SÃ©lectionne tous les mÃ©mos visibles"
 msgid "Click to add a memo"
 msgstr "Cliquez ici pour ajouter un mÃ©mo"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %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:538
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%dÂ %%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
+#: ../calendar/gui/e-task-table.c:628 ../calendar/gui/print.c:2043
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#: ../modules/calendar/e-cal-shell-content.c:423
 #: ../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:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "TÃ¢ches"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:932
 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:934
+#: ../calendar/gui/e-task-table.c:938
 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:940
+#: ../calendar/gui/e-task-table.c:944
 msgid "Paste tasks from the clipboard"
 msgstr "Colle les tÃ¢ches depuis le presse-papiers"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "Delete selected tasks"
 msgstr "Supprime les tÃ¢ches sÃ©lectionnÃ©es"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:956
 msgid "Select all visible tasks"
 msgstr "SÃ©lectionne toutes les tÃ¢ches visibles"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1716
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -6084,7 +5824,7 @@ msgstr "Ã?vÃ¨nement du calendrierÂ : il n'a pas de rÃ©sumÃ©."
 msgid "calendar view event"
 msgstr "vue des Ã©vÃ¨nements du calendrier"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:541
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
@@ -6113,7 +5853,7 @@ msgstr "Aller Ã  la date"
 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:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -6122,14 +5862,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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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:164
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vue hebdomadaire de travailÂ : %s. %s"
@@ -6137,16 +5877,16 @@ 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:170
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vue journaliÃ¨reÂ : %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "vue du calendrier pour une semaine de travail"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
@@ -6157,16 +5897,16 @@ msgid "Gnome Calendar"
 msgstr "Calendrier de GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:909
 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:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:916
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:925
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
@@ -6174,10 +5914,10 @@ msgstr "%a %d %b %Y"
 #: ../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:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../modules/calendar/e-cal-shell-view-private.c:942
+#: ../modules/calendar/e-cal-shell-view-private.c:953
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:963
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -6189,25 +5929,25 @@ msgstr "Bouton du saut"
 msgid "Click here, you can find more events."
 msgstr "Cliquez ici, vous pourrez trouver plus d'Ã©vÃ¨nements."
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vue mensuelleÂ : %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vue hebdomadaireÂ : %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:188
 msgid "calendar view for a month"
 msgstr "vue du calendrier pour un mois"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:190
 msgid "calendar view for one or more weeks"
 msgstr "vue du calendrier pour une ou plusieurs semaines"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2242
 msgid "Purging"
 msgstr "Nettoyage"
 
@@ -6260,39 +6000,40 @@ msgid "Select Date"
 msgstr "SÃ©lectionnez une date"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Septembre"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "Select _Today"
+msgstr "SÃ©lectionner au_jourd'hui"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_SÃ©lectionner aujourd'hui"
+msgid "September"
+msgstr "Septembre"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Un organisateur doit Ãªtre dÃ©fini."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nÃ©cessaire"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Informations de l'Ã©vÃ¨nement"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Informations de la tÃ¢che"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Informations du mÃ©mo"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Information Libre/OccupÃ©"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Informations du calendrier"
 
@@ -6300,7 +6041,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:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "AcceptÃ©e"
@@ -6309,7 +6050,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:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "AcceptÃ©e provisoirement"
@@ -6321,7 +6062,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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "RefusÃ©e"
@@ -6330,7 +6071,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:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "DÃ©lÃ©guÃ©e"
@@ -6338,7 +6079,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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Mise Ã  jour"
@@ -6346,7 +6087,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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "AnnulÃ©e"
@@ -6354,7 +6095,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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ActualisÃ©e"
@@ -6362,31 +6103,31 @@ 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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Information Libre/OccupÃ© (%s Ã  %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Information iCalendar"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 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:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Impossible de rÃ©server une ressource, l'erreur estÂ : "
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Vous devez Ãªtre inscrit comme participant Ã  l'Ã©vÃ¨nement."
 
@@ -6542,49 +6283,74 @@ msgstr "Ve"
 msgid "Sa"
 msgstr "Sa"
 
-#: ../calendar/gui/print.c:2564
+#. Translators: This is part of "START to END" text, where START and END are date/times
+#: ../calendar/gui/print.c:2419
+msgid " to "
+msgstr " Ã? "
+
+#. Translators: This is part of "START to END (Completed COMPLETED)", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2425
+msgid " (Completed "
+msgstr " (terminÃ© "
+
+#. Translators: This is part of "Completed COMPLETED", where COMPLETED is a completed date/time
+#: ../calendar/gui/print.c:2428
+msgid "Completed "
+msgstr "TerminÃ© "
+
+#. Translators: This is part of "START (Due DUE)", where START and DUE are dates/times
+#: ../calendar/gui/print.c:2435
+msgid " (Due "
+msgstr " (date d'Ã©chÃ©ance "
+
+#. Translators: This is part of "Due DUE", where DUE is a date/time due the event should be finished
+#: ../calendar/gui/print.c:2438
+msgid "Due "
+msgstr "Date d'Ã©chÃ©ance "
+
+#: ../calendar/gui/print.c:2572
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: ../calendar/gui/print.c:2566
+#: ../calendar/gui/print.c:2574 ../widgets/misc/e-send-options.c:502
 msgid "Task"
 msgstr "TÃ¢che"
 
-#: ../calendar/gui/print.c:2591
+#: ../calendar/gui/print.c:2599
 #, c-format
 msgid "Summary: %s"
 msgstr "RÃ©sumÃ©Â : %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2623
 msgid "Attendees: "
 msgstr "ParticipantsÂ : "
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "Status: %s"
 msgstr "Ã?tatÂ : %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2681
 #, c-format
 msgid "Priority: %s"
 msgstr "PrioritÃ©Â : %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2699
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Pourcentage effectuÃ©Â : %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2710
 #, c-format
 msgid "URL: %s"
 msgstr "URLÂ : %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2723
 #, c-format
 msgid "Categories: %s"
 msgstr "CatÃ©goriesÂ : %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2734
 msgid "Contacts: "
 msgstr "ContactsÂ : "
 
@@ -6615,7 +6381,7 @@ msgstr "Rendez-vous et rÃ©unions"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Opening calendar"
 msgstr "Ouverture du calendrier"
 
@@ -8196,157 +7962,157 @@ msgstr "Pacifique/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacifique/Yap"
 
-#: ../composer/e-composer-actions.c:79
+#: ../composer/e-composer-actions.c:81
 msgid "Untitled Message"
 msgstr "Message sans sujet"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:204
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:283
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:288
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:290
 msgid "Close the current file"
 msgstr "Ferme le fichier actuel"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:295
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:302
 msgid "Print Pre_view"
 msgstr "_AperÃ§u avant impression"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:311
 msgid "Save the current file"
 msgstr "Enregistre le fichier actuel"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:316
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file with a different name"
 msgstr "Enregistre le fichier actuel avec un nom diffÃ©rent"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:323
 msgid "Save as _Draft"
 msgstr "Enregistrer comme _brouillon"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:325
 msgid "Save as draft"
 msgstr "Enregistre comme brouillon"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:330 ../composer/e-composer-private.c:281
 msgid "S_end"
 msgstr "E_nvoyer"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:332
 msgid "Send this message"
 msgstr "Envoie ce message"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:337
 msgid "New _Message"
 msgstr "Nouveau _message"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:339
 msgid "Open New Message window"
 msgstr "Ouvre la fenÃªtre Nouveau message"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:346
 msgid "Character _Encoding"
 msgstr "_Codage des caractÃ¨res"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:363
 msgid "PGP _Encrypt"
 msgstr "_Chiffrer avec PGP"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:365
 msgid "Encrypt this message with PGP"
 msgstr "Chiffre ce message avec PGP"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:371
 msgid "PGP _Sign"
 msgstr "_Signer avec PGP"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:373
 msgid "Sign this message with your PGP key"
 msgstr "Signe ce message avec votre clÃ© PGP"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:379
 msgid "_Prioritize Message"
 msgstr "_Prioriser le message"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:381
 msgid "Set the message priority to high"
 msgstr "Affecte une prioritÃ© Ã©levÃ©e au message"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:387
 msgid "Re_quest Read Receipt"
 msgstr "D_emander un accusÃ© de lecture"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:389
 msgid "Get delivery notification when your message is read"
 msgstr "Obtenir un avertissement quand votre message est lu"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:395
 msgid "S/MIME En_crypt"
 msgstr "C_hiffrer avec S/MIME"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:397
 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:401
+#: ../composer/e-composer-actions.c:403
 msgid "S/MIME Sig_n"
 msgstr "S_igner avec S/MIME"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:405
 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:409
+#: ../composer/e-composer-actions.c:411
 msgid "_Bcc Field"
 msgstr "Champ Cc_i"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:413
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Indique si le champ Cci est affichÃ©"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:419
 msgid "_Cc Field"
 msgstr "Champ _Cc"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:421
 msgid "Toggles whether the CC field is displayed"
 msgstr "Indique si le champ Cc est affichÃ©"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:427
 msgid "_From Field"
 msgstr "Champ _De"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:429
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Indique si le champ De est affichÃ©"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:435
 msgid "_Reply-To Field"
 msgstr "Champ _RÃ©pondre Ã "
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Indique si le champ RÃ©pondre Ã  est affichÃ©"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:480
 msgid "Save Draft"
 msgstr "Enregistrer le brouillon"
 
@@ -8358,15 +8124,15 @@ msgstr "Afficher"
 msgid "Hide"
 msgstr "Masquer"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 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:47
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -8374,50 +8140,50 @@ 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:959
+#: ../composer/e-composer-header-table.c:958
 msgid "Fr_om:"
 msgstr "_DeÂ :"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
+#: ../composer/e-composer-header-table.c:958
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
+#: ../modules/mail/em-mailer-prefs.c:76
 msgid "From"
 msgstr "De"
 
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:967
 msgid "_Reply-To:"
 msgstr "_RÃ©pondre Ã Â :"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:972
 msgid "_To:"
 msgstr "_Ã?Â :"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:978
 msgid "_Cc:"
 msgstr "_CcÂ :"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+#: ../composer/e-composer-header-table.c:978 ../mail/em-filter-i18n.h:8
 msgid "CC"
 msgstr "Cc"
 
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:984
 msgid "_Bcc:"
 msgstr "Cc_iÂ :"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+#: ../composer/e-composer-header-table.c:984 ../mail/em-filter-i18n.h:6
 msgid "BCC"
 msgstr "Cci"
 
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:989
 msgid "_Post To:"
 msgstr "_Poster Ã Â :"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:993
 msgid "S_ubject:"
 msgstr "_SujetÂ :"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1002
 msgid "Si_gnature:"
 msgstr "Si_gnatureÂ :"
 
@@ -8450,19 +8216,19 @@ msgid "Save draft"
 msgstr "Enregistrer le brouillon"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:188 ../mail/em-utils.c:152
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Ne plus afficher ce message."
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossible de signer le message sortantÂ : aucun certificat de signature "
 "dÃ©fini pour ce compte"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8470,17 +8236,17 @@ msgstr ""
 "Impossible de chiffrer le message sortantÂ : aucun certificat de chiffrement "
 "dÃ©fini pour ce compte"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1386
 msgid "Unable to reconstruct message from autosave file"
 msgstr ""
 "Impossible de reconstruire le message Ã  partir du fichier de sauvegarde "
 "automatique"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1452 ../composer/e-msg-composer.c:1648
 msgid "Compose Message"
 msgstr "RÃ©daction d'un message"
 
-#: ../composer/e-msg-composer.c:3310
+#: ../composer/e-msg-composer.c:3313
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8573,7 +8339,7 @@ msgstr ""
 "Ã©tiez arrÃªtÃ©."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Le fichier Â«Â {0}Â Â» n'est pas un fichier rÃ©gulier et ne peut pas Ãªtre envoyÃ© "
 "dans un message."
@@ -8594,7 +8360,7 @@ msgid "Unable to activate the address selector control."
 msgstr "Impossible d'activer le composant de sÃ©lection d'adresses."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Vous ne pouvez pas joindre le fichier Â«Â {0}Â Â» Ã  ce message."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8617,31 +8383,27 @@ msgstr "_RÃ©cupÃ©rer"
 msgid "_Save Draft"
 msgstr "Enregistrer le _brouillon"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Lancer Anjal dans une fenÃªtre"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 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:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "Identifiant du socket dans lequel s'intÃ©grer"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Client de messagerie Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "Nouvel onglet"
-
 #: ../capplet/settings/mail-account-view.c:56
 msgid "Please enter your full name."
 msgstr "Saisissez votre nom complet."
@@ -8654,52 +8416,52 @@ msgstr "Saisissez votre adresse Ã©lectronique."
 msgid "The email address you have entered is invalid."
 msgstr "L'adresse Ã©lectronique saisie n'est pas valable."
 
-#: ../capplet/settings/mail-account-view.c:224
+#: ../capplet/settings/mail-account-view.c:181
 msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">DÃ©tails personnelsÂ :</span>"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:186
 msgid "Name:"
 msgstr "NomÂ :"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:195
 msgid "Email address:"
 msgstr "Adresse Ã©lectroniqueÂ :"
 
-#: ../capplet/settings/mail-account-view.c:248
+#: ../capplet/settings/mail-account-view.c:205
 msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">DÃ©tails de rÃ©ceptionÂ :</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:210
+#: ../capplet/settings/mail-account-view.c:258
 msgid "Server type:"
 msgstr "Type de serveurÂ :"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:219
+#: ../capplet/settings/mail-account-view.c:267
 msgid "Server address:"
 msgstr "Adresse du serveurÂ :"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:228
+#: ../capplet/settings/mail-account-view.c:276
 msgid "Username:"
 msgstr "Nom d'utilisateurÂ :"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:237
+#: ../capplet/settings/mail-account-view.c:285
 msgid "Use encryption:"
 msgstr "Utiliser le chiffrementÂ :"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:242
+#: ../capplet/settings/mail-account-view.c:290
 msgid "never"
 msgstr "jamais"
 
-#: ../capplet/settings/mail-account-view.c:298
+#: ../capplet/settings/mail-account-view.c:253
 msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
 msgstr "<span size=\"large\" weight=\"bold\">DÃ©tails d'envoiÂ :</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:309
 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. "
@@ -8711,7 +8473,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:357
+#: ../capplet/settings/mail-account-view.c:311
 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 "
@@ -8722,12 +8484,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:359
+#: ../capplet/settings/mail-account-view.c:313
 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:361
+#: ../capplet/settings/mail-account-view.c:315
 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."
@@ -8736,11 +8498,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:362
+#: ../capplet/settings/mail-account-view.c:316
 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:363
+#: ../capplet/settings/mail-account-view.c:317
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
@@ -8748,134 +8510,125 @@ 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:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:332
+#: ../mail/em-account-editor.c:2059 ../mail/em-account-editor.c:2191
+#: ../mail/mail-config.ui.h:59
 msgid "Identity"
 msgstr "IdentitÃ©"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:332
 msgid "Next - Receiving mail"
 msgstr "Suite - RÃ©ception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Receiving mail"
 msgstr "RÃ©ception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:333
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Next - Sending mail"
 msgstr "Suite - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Back - Identity"
 msgstr "Retour - IdentitÃ©"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:333
 msgid "Next - Receiving options"
 msgstr "Suite - Options de rÃ©ception"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:334
 msgid "Receiving options"
 msgstr "Options de rÃ©ception"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:334
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving mail"
 msgstr "Retour - RÃ©ception du courriel"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Sending mail"
 msgstr "Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Next - Review account"
 msgstr "Suite - VÃ©rification des paramÃ¨tres"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Next - Defaults"
 msgstr "Suite - Valeurs par dÃ©faut"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:336
 msgid "Back - Receiving options"
 msgstr "Retour - Options de rÃ©ception"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:337
+#: ../mail/em-account-editor.c:2770 ../mail/mail-config.ui.h:32
 msgid "Defaults"
 msgstr "Valeurs par dÃ©faut"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:337
 msgid "Back - Sending mail"
 msgstr "Retour - Envoi du courriel"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Review account"
 msgstr "VÃ©rification des paramÃ¨tres du compte"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Finish"
 msgstr "Terminer"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:339
 msgid "Back - Sending"
 msgstr "Retour - Envoi"
 
-#: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+#: ../capplet/settings/mail-account-view.c:673
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Close Tab"
 msgstr "Fermer l'onglet"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:683
 msgid "Account Wizard"
 msgstr "Assistant de compte"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "ParamÃ¨tres de messagerie"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-msgid "Quit"
-msgstr "Quitter"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../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:215
-#: ../mail/message-list.c:1617
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:675
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:145
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:151
+#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:162 ../mail/mail-vfolder.c:212
+#: ../mail/message-list.c:1605
 #: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/addressbook/e-book-shell-migrate.c:126
 #: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-cal-shell-migrate.c:141
 #: ../modules/calendar/e-memo-shell-backend.c:108
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:109
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:146
 #: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Ajouter un nouveau compte"
 
-#: ../capplet/settings/mail-settings-view.c:185
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
 msgstr "<span size=\"large\" weight=\"bold\">Gestion de compte</span>"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:274
 msgid "Settings"
 msgstr "ParamÃ¨tres"
 
@@ -8887,7 +8640,7 @@ 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:800
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:821
 #: ../shell/e-shell-window-private.c:251
 msgid "Evolution"
 msgstr "Evolution"
@@ -8909,6 +8662,10 @@ msgstr "GÃ©rer vos courriels, contacts et agendas"
 msgid "Configure email accounts"
 msgstr "Configurer les comptes de messagerie"
 
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "ParamÃ¨tres de messagerie"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "carte de visite"
@@ -9010,56 +8767,66 @@ msgstr "EuropÃ©en de l'ouest"
 msgid "Western European, New"
 msgstr "EuropÃ©en de l'ouest, Nouveau"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Traditionnel"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "SimplifiÃ©"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Visuel"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1756
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Aujourd'hui"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Demain"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Hier"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "Dans %d jours"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Dans %d jour"
+msgstr[1] "Dans %d jours"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "Il y a %d jours"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Il y a %d jour"
+msgstr[1] "Il y a %d jours"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Utiliser les rÃ©glages locaux par dÃ©faut"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "FormatÂ :"
 
@@ -9080,18 +8847,6 @@ msgstr "Ã?criture de Â«Â %sÂ Â»"
 msgid "Writing \"%s\" to %s"
 msgstr "Ã?criture de Â«Â %sÂ Â» vers %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Nom du composant de journalisation"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Nom de fichier"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Le nom de fichier du module"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Journaux de dÃ©bogage"
@@ -9114,13 +8869,13 @@ msgstr "Journal des messagesÂ :"
 msgid "Log Level"
 msgstr "Niveau du journal"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2677
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Messages"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1450
 msgid "Close this window"
 msgstr "Ferme cette fenÃªtre"
 
@@ -9144,18 +8899,7 @@ msgstr "DÃ©bogage"
 msgid "Error, Warnings and Debug messages"
 msgstr "Messages d'erreur, d'avertissement et de dÃ©bogage"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "ActivÃ©"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Indique si le greffon est activÃ©"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -9182,7 +8926,7 @@ msgstr ""
 msgid "Autogenerated"
 msgstr "GÃ©nÃ©rÃ©e automatiquement"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "Ã? cause de Â«Â {1}Â Â»."
 
@@ -9202,235 +8946,235 @@ 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:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
 msgid "_Overwrite"
 msgstr "Ã?_craser"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:169
 msgid "Could not open the link."
 msgstr "Impossible d'ouvrir le lien."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:219
 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:1303
 #, c-format
 msgid "GConf error: %s"
 msgstr "Erreur GConfÂ : %s"
 
-#: ../e-util/gconf-bridge.c:1292
+#: ../e-util/gconf-bridge.c:1314
 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:223 ../em-format/em-format.c:959
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "RÃ©pondre Ã "
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2305
+#: ../mail/em-format-html.c:2328 ../modules/mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2244 ../mail/em-format-html.c:2309
+#: ../mail/em-format-html.c:2331 ../modules/mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "Cci"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:81
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Sujet"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2425
+#: ../modules/mail/em-mailer-prefs.c:1137
 msgid "Mailer"
 msgstr "Client de messagerie"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1220
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transfÃ©rÃ© --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:82 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Date"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Groupes de discussion"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:84
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Portrait"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1302
 #, c-format
 msgid "%s attachment"
 msgstr "piÃ¨ce jointe %s"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1361
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message S/MIMEÂ : erreur inconnue"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1515 ../em-format/em-format.c:1685
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1523
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Type de chiffrement non pris en charge pour multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message"
 msgstr "Impossible d'analyser le message PGP/MIME"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1535
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Impossible d'analyser le message PGP/MIMEÂ : erreur inconnue"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1709
 msgid "Unsupported signature format"
 msgstr "Format de signature non pris en charge"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1867
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vÃ©rification de la signature"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1717 ../em-format/em-format.c:1856
+#: ../em-format/em-format.c:1867
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue lors de la vÃ©rification de la signature"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message"
 msgstr "Impossible d'analyser le message PGP"
 
-#: ../em-format/em-format.c:1924
+#: ../em-format/em-format.c:1946
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Impossible d'analyser le message PGPÂ : erreur inconnue"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Il y a une seconde"
 msgstr[1] "Il y a %dÂ secondes"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "Dans 1 seconde"
 msgstr[1] "Dans %dÂ secondes"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Il y a une minute"
 msgstr[1] "Il y a %d minutes"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "Dans 1 minute"
 msgstr[1] "Dans %d minutes"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Il y a 1 heure"
 msgstr[1] "Il y a %d heures"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "Dans 1 heure"
 msgstr[1] "Dans %d heures"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Il y a 1 jour"
 msgstr[1] "Il y a %d jours"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "Dans 1 jour"
 msgstr[1] "Dans %d jours"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Il y a une semaine"
 msgstr[1] "Il y a %d semaines"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "Dans 1 semaine"
 msgstr[1] "Dans %d semaines"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Il y a 1 mois"
 msgstr[1] "Il y a %d mois"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "Dans 1 mois"
 msgstr[1] "Dans %d mois"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Il y a 1 an"
 msgstr[1] "Il y a %d ans"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "Dans 1 an"
 msgstr[1] "Dans %d ans"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour sÃ©lectionner une date>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "maintenant"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "SÃ©lectionnez une heure pour la comparaison"
 
@@ -9483,11 +9227,11 @@ msgid "I_nclude threads"
 msgstr "I_nclure les fils de discussion"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Entrant"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Sortant"
 
@@ -9519,7 +9263,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -9596,7 +9340,7 @@ msgstr "dans le futur"
 msgid "months"
 msgstr "mois"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:171
 msgid "seconds"
 msgstr "secondes"
 
@@ -9613,7 +9357,7 @@ msgid "years"
 msgstr "annÃ©es"
 
 #: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
+#: ../mail/em-format-html-display.c:1020 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
 #: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
@@ -9621,35 +9365,19 @@ msgid_plural "Attachments"
 msgstr[0] "PiÃ¨ce jointe"
 msgstr[1] "PiÃ¨ces jointes"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:617
 #: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "Vue en icÃ´nes"
 
-#: ../mail/e-mail-attachment-bar.c:622
+#: ../mail/e-mail-attachment-bar.c:618
 #: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "Vue en liste"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Suivi du focus"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Module shell"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Le moteur shell de courriels"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Afficher les suppressions"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Affiche les messages supprimÃ©s"
+#: ../mail/e-mail-browser.c:262
+msgid "(No Subject)"
+msgstr "(Pas de sujet)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9696,7 +9424,7 @@ msgid "_Later"
 msgstr "Plus _tard"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:472
 msgid "Add Label"
 msgstr "Ajouter une Ã©tiquette"
 
@@ -9716,121 +9444,57 @@ msgstr ""
 msgid "Color"
 msgstr "Couleur"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1158
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Nom"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:363
+#: ../mail/em-folder-tree-model.c:675 ../mail/em-folder-tree.c:2585
+#: ../modules/mail/e-mail-shell-view-private.c:952
 msgid "Inbox"
 msgstr "BoÃ®te de rÃ©ception"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:668
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:678
 msgid "Outbox"
 msgstr "BoÃ®te d'envoi"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:680
 msgid "Sent"
 msgstr "EnvoyÃ©s"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:671
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:570
 msgid "Templates"
 msgstr "ModÃ¨les"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Important"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Ã? faire"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Plus tard"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:147
 msgid "Migrating..."
 msgstr "Migration..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:180
 msgid "Migration"
 msgstr "Migration"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:220
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Migration de Â«Â %sÂ Â»Â :"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Impossible de crÃ©er le nouveau dossier Â«Â %sÂ Â»Â : %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Impossible de copier le dossierÂ Â«Â %sÂ Â» vers Â«Â %sÂ Â»Â : %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Impossible de rechercher les boÃ®tes Ã  lettres existant dans Â«Â %sÂ Â»Â : %s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:659
 msgid "Migrating Folders"
 msgstr "Migration des dossiers"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"L'emplacement et la hiÃ©rarchie des dossiers des boÃ®tes Ã  lettres ont changÃ© "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr ""
-"Impossible d'ouvrir les anciennes donnÃ©es POP conservÃ©es sur le serveur Â«Â %"
-"sÂ Â»Â : %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Impossible de crÃ©er un dossier pour les donnÃ©es POP3 restÃ©es sur le serveur "
-"Â«Â %sÂ Â»Â : %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
-"Impossible de copier les donnÃ©es POP3 restÃ©es sur le serveur Â«Â %sÂ Â»Â Â : %s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr ""
-"La crÃ©ation du dossier de stockage de courriel local Â«Â %sÂ Â» a Ã©chouÃ©Â : %s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:660
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9842,26 +9506,17 @@ msgstr ""
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:756
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+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-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"Impossible de lire les paramÃ¨tres de l'installation d'Evolution prÃ©cÃ©dente, "
-"Â«Â evolution/config.xmldbÂ Â» n'existe pas ou est corrompu."
-
 #. 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:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:103
+#: ../modules/calendar/e-task-shell-view-actions.c:561
 msgid "Do not ask me again"
 msgstr "Ne plus poser la question"
 
@@ -9869,7 +9524,7 @@ msgstr "Ne plus poser la question"
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:378
 msgid "C_opy"
 msgstr "C_opier"
 
@@ -9877,7 +9532,7 @@ msgstr "C_opier"
 msgid "Move to Folder"
 msgstr "DÃ©placer vers le dossier"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:378
 msgid "_Move"
 msgstr "_DÃ©placer"
 
@@ -9894,7 +9549,6 @@ msgstr[1] "Enregistrer les messages..."
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
 #: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Message"
@@ -10203,8 +9857,8 @@ msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige le message sÃ©lectionnÃ© Ã  un correspondant"
 
 #: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "RÃ©pondre Ã  _tous"
 
@@ -10221,7 +9875,7 @@ 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:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_RÃ©pondre Ã  l'expÃ©diteur"
 
@@ -10381,19 +10035,19 @@ msgstr "Tous les en-_tÃªtes du message"
 msgid "Show messages with all email headers"
 msgstr "Affiche les messages avec tous les en-tÃªtes"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1878
 msgid "Unable to retrieve message"
 msgstr "Impossible de rÃ©cupÃ©rer le message"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1939
+#: ../mail/mail-ops.c:1838
 #, 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:2467
+#: ../mail/e-mail-reader.c:2453
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:534
 #: ../plugins/google-account-setup/google-source.c:656
@@ -10401,33 +10055,33 @@ msgstr "RÃ©cupÃ©ration du message Â«Â %sÂ Â»"
 msgid "Default"
 msgstr "Par dÃ©faut"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2574
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2575
 msgid "Forward the selected message to someone"
 msgstr "Fait suivre le message sÃ©lectionnÃ© Ã  un correspondant"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:2619 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Suivant"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "PrÃ©cÃ©dent"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2631 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "RÃ©pondre"
 
@@ -10437,24 +10091,24 @@ 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:73
+#: ../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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:121
+#: ../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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:94
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Chiffrement SSL"
 
@@ -10477,34 +10131,34 @@ msgstr ""
 "et cochez la case pour l'accepter\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:876 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Aucune"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:960
 msgid "Never"
 msgstr "Jamais"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:961
 msgid "Always"
 msgstr "Toujours"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:962
 msgid "Ask for each message"
 msgstr "Demander Ã  chaque message"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Aucun"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2056
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2057
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10514,7 +10168,7 @@ msgstr ""
 "\n"
 "Cliquez sur Â«Â SuivantÂ Â» pour commencer."
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2060
 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 "
@@ -10524,20 +10178,20 @@ msgstr ""
 "Â«Â 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:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2062 ../mail/em-account-editor.c:2228
+#: ../mail/mail-config.ui.h:91
 msgid "Receiving Email"
 msgstr "RÃ©ception du courriel"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2063
 msgid "Please configure the following account settings."
 msgstr "Configurez les paramÃ¨tres de compte suivants."
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2065 ../mail/em-account-editor.c:2706
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2066
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10546,11 +10200,11 @@ msgstr ""
 "doute, adressez-vous Ã  votre administrateur systÃ¨me ou Ã  votre fournisseur "
 "d'accÃ¨s Internet."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2068
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2069
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10558,11 +10212,11 @@ msgstr ""
 "Saisissez un nom descriptif pour ce compte dans l'espace ci-dessous.\n"
 "Ce nom sera seulement utilisÃ© Ã  des fins d'affichage."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2073
 msgid "Done"
 msgstr "TerminÃ©"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2074
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10577,57 +10231,57 @@ msgstr ""
 "Cliquez sur Â«Â AppliquerÂ Â» pour enregistrer les paramÃ¨tres."
 
 # Toutes les n minutes (StÃ©phane)
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2515
 msgid "Check for _new messages every"
 msgstr "VÃ©rifier les _nouveaux messages toutes les"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2523
 msgid "minu_tes"
 msgstr "minu_tes"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2832 ../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:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:2877 ../mail/em-account-editor.c:2945
 msgid "Receiving Options"
 msgstr "Options de rÃ©ception"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:2878 ../mail/em-account-editor.c:2946
 msgid "Checking for New Messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Account Editor"
 msgstr "Ã?diteur de comptes"
 
-#: ../mail/em-account-editor.c:3418
+#: ../mail/em-account-editor.c:3414
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
 # 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:1578
+#: ../mail/em-composer-utils.c:1570
 #, 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."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1618
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Notification de distribution pourÂ : Â«Â %sÂ Â»"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1942
 msgid "an unknown sender"
 msgstr "un expÃ©diteur inconnu"
 
 #. 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 em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1989
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10635,19 +10289,19 @@ msgstr ""
 "Le ${WeekdayName} ${Day} ${MonthName} ${Year} Ã  ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} a Ã©critÂ :"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2133
 msgid "-----Original Message-----"
 msgstr "-------- Message initial --------"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2314
 msgid "Posting destination"
 msgstr "Destination d'envoi"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2315
 msgid "Choose folders to post the message to."
 msgstr "Choisissez les dossiers auxquels envoyer ce message."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "SÃ©lectionnez un dossier"
 
@@ -10729,6 +10383,10 @@ msgstr "Donner suite"
 msgid "Forward to"
 msgstr "Faire suivre Ã "
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Important"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "est aprÃ¨s"
@@ -10753,7 +10411,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:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:62
 msgid "Junk"
 msgstr "Pourriel"
 
@@ -10803,7 +10461,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:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Lu"
 
@@ -10884,16 +10542,16 @@ msgid "Unset Status"
 msgstr "Retirer l'Ã©tat"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Alors"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 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:174
+#: ../mail/em-folder-properties.c:169
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messages non lusÂ :"
@@ -10901,23 +10559,23 @@ 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:178
+#: ../mail/em-folder-properties.c:173
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total des messagesÂ :"
 msgstr[1] "Total des messagesÂ :"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:191
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Utilisation de votre quota (%s)Â :"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:193
 #, c-format
 msgid "Quota usage"
 msgstr "Utilisation de votre quota"
 
-#: ../mail/em-folder-properties.c:399
+#: ../mail/em-folder-properties.c:395
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "PropriÃ©tÃ©s du dossier"
@@ -10926,37 +10584,37 @@ msgstr "PropriÃ©tÃ©s du dossier"
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sÃ©lectionner un dossier>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "C_rÃ©er"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Nom du dossierÂ :"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:146 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
+#: ../mail/em-folder-tree-model.c:164 ../mail/em-folder-tree-model.c:166
+#: ../mail/mail-vfolder.c:1073 ../mail/mail-vfolder.c:1138
 msgid "Search Folders"
 msgstr "Dossiers de recherche"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:171 ../mail/em-folder-tree-model.c:173
 msgid "UNMATCHED"
 msgstr "CORRESPONDPAS"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:743 ../mail/em-folder-tree-model.c:1080
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:179
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans Â«Â %sÂ Â»"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:592
 msgid "Folder names cannot contain '/'"
 msgstr "Les noms des dossiers ne peuvent pas contenir le caractÃ¨re Â«Â /Â Â»"
 
@@ -10978,75 +10636,75 @@ msgstr "Les noms des dossiers ne peuvent pas contenir le caractÃ¨re Â«Â /Â Â»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1074
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1280
 msgid "Mail Folder Tree"
 msgstr "Arborescence des courriels"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1486 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "DÃ©placement du dossier %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1488 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1495 ../mail/message-list.c:2098
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "DÃ©placement des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1497 ../mail/message-list.c:2100
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers le dossier %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1512
 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:386
+#: ../mail/em-folder-utils.c:379
 msgid "Move Folder To"
 msgstr "DÃ©placer le dossier vers"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:379
 msgid "Copy Folder To"
 msgstr "Copier le dossier vers"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:500
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "CrÃ©ation du dossier Â«Â %sÂ Â»"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:663
 msgid "Create Folder"
 msgstr "CrÃ©ation d'un dossier"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:664
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Specify where to create the folder:"
 msgstr "PrÃ©cisez l'emplacement de crÃ©ation du dossierÂ :"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:680
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "DÃ©sabonnement au dossierÂ Â«Â %sÂ Â»"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1533
 msgid "Unsigned"
 msgstr "Non signÃ©"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11054,11 +10712,11 @@ msgstr ""
 "Ce message n'est pas signÃ©. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1534
 msgid "Valid signature"
 msgstr "Signature valide"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11066,11 +10724,11 @@ msgstr ""
 "Ce message est signÃ© et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1535
 msgid "Invalid signature"
 msgstr "Signature non valide"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11078,11 +10736,11 @@ 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:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1536
 msgid "Valid signature, but cannot verify sender"
 msgstr "Signature valide, mais impossible de vÃ©rifier l'expÃ©diteur"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11090,22 +10748,22 @@ 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1537
 msgid "Signature exists, but need public key"
 msgstr "La signature existe, mais elle requiert une clÃ© publique"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 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:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1543
 msgid "Unencrypted"
 msgstr "Non chiffrÃ©"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11113,11 +10771,11 @@ msgstr ""
 "Ce message n'est pas chiffrÃ©. Son contenu peut Ãªtre lu lors de son passage "
 "sur Internet."
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1544
 msgid "Encrypted, weak"
 msgstr "ChiffrÃ©, faiblement"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -11127,11 +10785,11 @@ 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:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1545
 msgid "Encrypted"
 msgstr "ChiffrÃ©"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11139,11 +10797,11 @@ 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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1546
 msgid "Encrypted, strong"
 msgstr "ChiffrÃ©, fortement"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -11153,15 +10811,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:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -11171,28 +10829,28 @@ msgstr ""
 "externe."
 
 # Â«Â TerminÃ© leÂ Â» pourrait poser un pb si Â«Â hierÂ Â» Ã©tait ajoutÃ© par exemple (StÃ©phane)
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:726
 msgid "Completed on"
 msgstr "TerminÃ© "
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:734
 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:750
+#: ../mail/em-format-html-display.c:738
 msgid "by"
 msgstr " "
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:948 ../mail/em-format-html-display.c:992
 msgid "View _Unformatted"
 msgstr "Afficher _sans mise en forme"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:950
 msgid "Hide _Unformatted"
 msgstr "Masquer _non formatÃ©"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1012
 msgid "O_pen With"
 msgstr "_Ouvrir avec"
 
@@ -11201,17 +10859,17 @@ msgstr "_Ouvrir avec"
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:147
 msgid "Formatting message"
 msgstr "Formatage des messages"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:338
 msgid "Formatting Message..."
 msgstr "Formatage du message..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1380 ../mail/em-format-html.c:1389
 #, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "RÃ©cupÃ©ration de Â«Â %sÂ Â»"
 
 #: ../mail/em-format-html.c:1854
@@ -11250,40 +10908,50 @@ 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:2628
+#: ../mail/em-format-html.c:2598
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Ce message a Ã©tÃ© envoyÃ© par <b>%s</b> pour le compte de <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:583
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Soit ce stockage ne prend pas en charge les abonnements, soit ils ne sont "
 "pas activÃ©s."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:616
 msgid "Subscribed"
 msgstr "AbonnÃ©"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:620
 msgid "Folder"
 msgstr "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
 msgid "Please select a server."
 msgstr "SÃ©lectionnez un serveur."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a Ã©tÃ© sÃ©lectionnÃ©"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more 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:106
+#, c-format
+msgid "Are you sure you want to open %d messages 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:314
 msgid "Message Filters"
 msgstr "Filtres de messages"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:852
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -11292,33 +10960,33 @@ msgstr "Messages de %s"
 msgid "Search _Folders"
 msgstr "Dossiers de _recherche"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "Ajouter un dossier"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
-msgstr "Hauteur de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â»"
+msgstr "Hauteur de la fenÃªtre Â«Â Ã?diteur de filtresÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Filter Editor\" window maximize state"
-msgstr "Ã?tat de maximisation de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â»"
+msgstr "Ã?tat de maximisation de la fenÃªtre Â«Â Ã?diteur de filtresÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Filter Editor\" window width"
-msgstr "Largeur de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â»"
+msgstr "Largeur de la fenÃªtre Â«Â Ã?diteur de filtresÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "\"Search Folder Editor\" window height"
-msgstr "Hauteur de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â»"
+msgstr "Hauteur de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Ã?tat de maximisation de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â»"
+msgstr "Ã?tat de maximisation de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Search Folder Editor\" window width"
-msgstr "Largeur de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â»"
+msgstr "Largeur de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
@@ -11333,51 +11001,46 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Largeur de la fenÃªtre Â«Â Envoi et rÃ©ception du courrielÂ Â»"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr ""
-"Permet Ã  Evolution d'afficher des extraits de texte d'une taille limitÃ©e"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Toujours demander un accusÃ© de lecture"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "ReconnaÃ®tre automatiquement les frimousses"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "ReconnaÃ®tre automatiquement les liens"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "VÃ©rifier si les messages entrants sont des pourriels"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Couleur de surbrillance des citations"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Couleur de surbrillance des citations."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Hauteur par dÃ©faut de la fenÃªtre d'Ã©dition"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Largeur par dÃ©faut de la fenÃªtre d'Ã©dition"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "RÃ©pertoire de l'Ã©diteur pour charger/joindre"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Compresser l'affichage des adresses dans Ã?/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -11385,7 +11048,7 @@ msgstr ""
 "Compresser l'affichage des adresses dans Ã?/Cc/Cci au nombre indiquÃ© dans "
 "address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -11393,11 +11056,11 @@ msgstr ""
 "VÃ©rifie Ã  quelle frÃ©quence les modifications locales sont synchronisÃ©es avec "
 "le serveur de messagerie distant. Le dÃ©lai doit Ãªtre d'au moins 30 secondes."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "En-tÃªtes personnalisÃ©s Ã  utiliser pour la dÃ©tection des pourriels."
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -11405,63 +11068,63 @@ msgstr ""
 "En-tÃªtes personnalisÃ©s Ã  utiliser pour la dÃ©tection des pourriels. Les "
 "Ã©lÃ©ments de la liste sont des chaÃ®nes au format Â«Â nom-entÃªte=valeurÂ Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Jeu de caractÃ¨re par dÃ©faut pour la rÃ©daction des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Jeu de caractÃ¨re par dÃ©faut pour la rÃ©daction des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Jeu de caractÃ¨re par dÃ©faut pour l'affichage des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Jeu de caractÃ¨re par dÃ©faut pour l'affichage des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Style de transfert par dÃ©faut"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Hauteur par dÃ©faut de la fenÃªtre d'Ã©dition."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Hauteur par dÃ©faut de la fenÃªtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Hauteur par dÃ©faut du dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Ã?tat maximisÃ© par dÃ©faut de la fenÃªtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Style de rÃ©ponse par dÃ©faut"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Valeur par dÃ©faut pour l'Ã©tat d'expansion des fils de discussion"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Largeur par dÃ©faut de la fenÃªtre d'Ã©dition."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Largeur par dÃ©faut de la fenÃªtre de navigation des courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Largeur par dÃ©faut de la boÃ®te de dialogue des abonnements."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -11469,13 +11132,13 @@ 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:41
+#: ../mail/evolution-mail.schemas.in.h:40
 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:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11488,13 +11151,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:43
+#: ../mail/evolution-mail.schemas.in.h:42
 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:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11504,7 +11167,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:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -11512,20 +11175,25 @@ 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:46
+#: ../mail/evolution-mail.schemas.in.h:45
 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:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "RÃ©pertoire pour enregistrer les fichiers joints aux courriels."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 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:48
+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:49
 msgid "Do not add signature delimiter"
 msgstr "Ne pas ajouter de sÃ©parateur de signature"
@@ -11602,14 +11270,18 @@ msgstr ""
 "les listes de messages et les dossiers."
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Activer l'affichage partiel du texte selon une limite de taille."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+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:65
 msgid "Enable/disable caret mode"
 msgstr "Activer/dÃ©sactiver la lecture au curseur"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:46
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Coder les noms de fichiers Ã  la maniÃ¨re Outlook/GMail"
 
@@ -11662,7 +11334,7 @@ msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr ""
-"Hauteur initiale de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â». La valeur est mise Ã  "
+"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:74
@@ -11670,7 +11342,7 @@ msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"Hauteur initiale de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â». La "
+"Hauteur initiale de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â». La "
 "valeur est mise Ã  jour si l'utilisateur redimensionne la fenÃªtre "
 "verticalement."
 
@@ -11689,10 +11361,10 @@ msgid ""
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
-"Ã?tat maximisÃ© initial de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â». La valeur est "
+"Ã?tat maximisÃ© initial de la fenÃªtre Â«Â Ã?diteur de filtresÂ Â». La valeur est "
 "mise Ã  jour si l'utilisateur maximise ou dÃ©maximise la fenÃªtre. Notez que "
 "cette valeur particuliÃ¨re n'est pas utilisÃ©e par Evolution puisque la "
-"fenÃªtre Â«Â Ã©diteur de filtresÂ Â» ne peut pas Ãªtre maximisÃ©e. Cette clÃ© n'est "
+"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:77
@@ -11702,10 +11374,10 @@ msgid ""
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"Ã?tat maximisÃ© initial de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â». La "
+"Ã?tat maximisÃ© initial de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â». La "
 "valeur est mise Ã  jour si l'utilisateur maximise ou dÃ©maximise la fenÃªtre. "
 "Notez que cette valeur particuliÃ¨re n'est pas utilisÃ©e par Evolution puisque "
-"la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â» ne peut pas Ãªtre maximisÃ©e. "
+"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:78
@@ -11727,7 +11399,7 @@ msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr ""
-"Largeur initiale de la fenÃªtre Â«Â Ã©diteur de filtresÂ Â». La valeur est mise Ã  "
+"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:80
@@ -11735,7 +11407,7 @@ msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"Largeur initiale de la fenÃªtre Â«Â Ã©diteur de dossiers de rechercheÂ Â». La "
+"Largeur initiale de la fenÃªtre Â«Â Ã?diteur de dossiers de rechercheÂ Â». La "
 "valeur est mise Ã  jour si l'utilisateur redimensionne la fenÃªtre "
 "horizontalement."
 
@@ -11758,11 +11430,11 @@ msgstr ""
 "messages, et ne les supprime pas simplement des rÃ©sultats de recherche."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
 msgstr "DerniÃ¨re fois oÃ¹ les pourriels ont Ã©tÃ© vidÃ©s"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
 msgstr "DerniÃ¨re fois oÃ¹ la corbeille a Ã©tÃ© vidÃ©e"
 
 #: ../mail/evolution-mail.schemas.in.h:85
@@ -11878,64 +11550,68 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message Â«Â PreviewÂ Â»."
 
 #: ../mail/evolution-mail.schemas.in.h:109
+msgid "Message text limit for display"
+msgstr "Taille limite du texte des messages Ã  l'affichage"
+
+#: ../mail/evolution-mail.schemas.in.h:110
 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:110
+#: ../mail/evolution-mail.schemas.in.h:111
 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:111
+#: ../mail/evolution-mail.schemas.in.h:112
 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:112
+#: ../mail/evolution-mail.schemas.in.h:113
 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:113
+#: ../mail/evolution-mail.schemas.in.h:114
 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:114
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Nombre d'adresses Ã  afficher pour Ã?/Cc/Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt on empty subject"
 msgstr "Demander pour les sujets vides"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:117
 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:117
+#: ../mail/evolution-mail.schemas.in.h:118
 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:118
+#: ../mail/evolution-mail.schemas.in.h:119
 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:119
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user expunges"
 msgstr "Demander quand l'utilisateur nettoie"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Cci"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:122
 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:122
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -11943,67 +11619,67 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML Ã  des contacts qui n'en veulent "
 "pas."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:124
 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:124
+#: ../mail/evolution-mail.schemas.in.h:125
 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:125
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt while marking multiple messages"
 msgstr "Demander lors du marquage de messages multiples"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:127
 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:127
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Put the cursor at the bottom of replies"
 msgstr "Positionner le curseur en bas des rÃ©ponses"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:129
 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:129
+#: ../mail/evolution-mail.schemas.in.h:130
 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:130
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Run junk test on incoming mail."
 msgstr "Lancer le test de pourriel sur les messages entrants."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Save directory"
 msgstr "RÃ©pertoire de sauvegarde"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:133
 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:133
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default"
 msgstr "Envoyer par dÃ©faut le courriel au format HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Send HTML mail by default."
 msgstr "Envoyer par dÃ©faut le courriel au format HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:136
 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:136
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Server synchronization interval"
 msgstr "DÃ©lai de synchronisation avec le serveur"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -12011,72 +11687,72 @@ 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:138
+#: ../mail/evolution-mail.schemas.in.h:139
 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:139
+#: ../mail/evolution-mail.schemas.in.h:140
 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:140
+#: ../mail/evolution-mail.schemas.in.h:141
 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:141
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Show \"From\" field when sending a mail message"
 msgstr "Afficher le champ Â«Â DeÂ Â» lors de l'envoi d'un message"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:143
 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:143
+#: ../mail/evolution-mail.schemas.in.h:144
 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:144
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show Animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Show all message headers"
 msgstr "Afficher tous les en-tÃªtes des messages"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:147
 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:147
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show animated images as animations."
 msgstr "Afficher les images animÃ©es comme une animation."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:149
 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:149
+#: ../mail/evolution-mail.schemas.in.h:150
 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:150
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show image animations"
 msgstr "Afficher les animations"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show original \"Date\" header value."
 msgstr "Afficher la valeur d'origine de l'en-tÃªte Â«Â DateÂ Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show photo of the sender"
 msgstr "Afficher la photo de l'expÃ©diteur"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12084,7 +11760,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:154
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12092,7 +11768,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:155
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -12101,7 +11777,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:156
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid ""
 "Show the \"From\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -12109,7 +11785,7 @@ msgstr ""
 "Afficher le champ Â«Â DeÂ Â» 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:157
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -12118,7 +11794,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:158
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -12127,7 +11803,7 @@ msgstr ""
 "est contrÃ´lÃ©e par le menu Affichage lorsqu'un compte de messagerie est "
 "choisi."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -12135,7 +11811,7 @@ msgstr ""
 "Afficher le courriel de l'expÃ©diteur dans une colonne Ã  part dans la liste "
 "des messages."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:161
 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 "
@@ -12146,50 +11822,49 @@ 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:161
+#: ../mail/evolution-mail.schemas.in.h:162
 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:162
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell check inline"
 msgstr "Correction orthographique en ligne"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking color"
 msgstr "Couleur du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking languages"
 msgstr "Langues du correcteur orthographique"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default height"
 msgstr "Hauteur par dÃ©faut de la fenÃªtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default width"
 msgstr "Largeur par dÃ©faut de la fenÃªtre d'abonnements"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Terminal font"
 msgstr "Police du terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Limite de la partie texte du message"
-
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "Le greffon par dÃ©faut pour le traitement du pourriel"
 
 #: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "Dernier vidage des pourriels, en jours depuis le 1/1/1970."
+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:171
-msgid "The last time empty trash was run, in days since the epoch."
+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."
+"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:172
 msgid ""
@@ -12221,12 +11896,14 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"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 "
+"is used only when 'force_message_limit' key is activated."
 msgstr ""
-"Indique la taille maximale de la portion de texte qui peut Ãªtre formatÃ©e "
-"sous Evolution. La taille par dÃ©faut est 4Â 096Â Kio (4Â Mio) et est renseignÃ©e "
-"en Kio."
+"Indique la taille maximale du texte du message qui peut Ãªtre affichÃ©e sous "
+"Evolution, renseignÃ©e en Kio. La taille par dÃ©faut est 4Â 096Â Kio (4Â Mio). "
+"Cette valeur n'est utilisÃ©e que lorsque la clÃ© Â«Â force_message_limitÂ Â» est "
+"activÃ©e."
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
@@ -12403,359 +12080,385 @@ msgstr "Largeur du panneau de la liste des messages"
 msgid "Width of the message-list pane."
 msgstr "Largeur du panneau de la liste des messages."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Importation des donnÃ©es Elm"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:372
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Courriel"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:365
 msgid "Evolution Elm importer"
 msgstr "Assistant d'importation Elm d'Evolution"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:366
 msgid "Import mail from Elm."
 msgstr "Importation des boÃ®tes Ã  lettres de Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "Dossier de destinationÂ :"
+#: ../mail/importers/evolution-mbox-importer.c:114
+msgid "_Destination folder:"
+msgstr "_Dossier de destinationÂ :"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder"
 msgstr "SÃ©lectionnez un dossier"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:120
+#: ../plugins/pst-import/pst-importer.c:301
 msgid "Select folder to import into"
 msgstr "SÃ©lectionnez un dossier pour l'importation"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#: ../mail/importers/evolution-mbox-importer.c:262
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "BoÃ®te Ã  lettres Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:263
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importe les dossiers au format de boÃ®te Ã  lettres Berkeley"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../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:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:148
+#: ../plugins/pst-import/pst-importer.c:453
+#: ../plugins/pst-import/pst-importer.c:559
 #, c-format
-msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "Importation de Â«Â %sÂ Â»"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:291
 #, c-format
 msgid "Scanning %s"
 msgstr "Examen de %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:219
 msgid "Importing Pine data"
 msgstr "Importation des donnÃ©es de Pine"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:377
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:418
 msgid "Evolution Pine importer"
 msgstr "Assistant d'importation Pine d'Evolution"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:419
 msgid "Import mail from Pine."
 msgstr "Importation des boÃ®tes Ã  lettres de Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Courriel Ã  %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Courriel de %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Le sujet est %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "Liste de diffusion %s"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Ajouter une rÃ¨gle de filtre"
 
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed 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:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Le rÃ¨gle de filtre Â«Â %sÂ Â» a Ã©tÃ© mise Ã  jour parce qu'elle utilisait le "
+"dossier qui vient d'Ãªtre supprimÃ©\n"
+"Â«Â %sÂ Â»."
+msgstr[1] ""
+"Les rÃ¨gles de filtre suivantes\n"
+"%s ont Ã©tÃ© mises Ã  jour parce qu'elles utilisaient le dossier qui vient "
+"d'Ãªtre supprimÃ©\n"
+"Â«Â %sÂ Â»."
+
 #: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(noteÂ : requiert le redÃ©marrage de l'application)"
 
-#: ../mail/mail-config.ui.h:2
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:3
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Option de rÃ©ponse en tÃªte de message</b> (non recommandÃ©)"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Informations sur le compte"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Ajouter une _nouvelle signature..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 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:7
+#: ../mail/mail-config.ui.h:8
 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:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Toujours envoyer une copie (_Cc) Ã Â :"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Toujours envoyer une copie cachÃ©e (Cc_i) Ã Â :"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 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:11
+#: ../mail/mail-config.ui.h:12
 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:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Toujours demander un accusÃ© de _lecture"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:15
+#: ../modules/addressbook/addressbook-config.c:1013
 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 incoming _messages for junk"
 msgstr "DÃ©tecter les pourriels dans les _messages entrants"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Check spelling while I _type"
 msgstr "VÃ©rifier l'or_thographe pendant la frappe"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Checks incoming mail messages to be Junk"
 msgstr "VÃ©rifier si les messages entrants sont du pourriel"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Cle_ar"
 msgstr "_Effacer"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "E_ffacer"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "Couleur pour les _mots mal orthographiÃ©sÂ :"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "RÃ©daction de messages"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Configuration"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 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 "Default Behavior"
 msgstr "Comportement par dÃ©faut"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "_Codage des caractÃ¨res par dÃ©fautÂ :"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Delete Mail"
 msgstr "Supprimer le courriel"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "Delete junk messages on e_xit"
 msgstr "Supprimer les pourriels en q_uittant"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Signer numÃ©riquement les messages _sortants (par dÃ©faut)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "Afficher les _en-tÃªtes des messages"
-
 #: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "Ne pas mettre en forme le contenu du message quand leur taille e_xcÃ¨de"
+msgid "Displayed Message Headers"
+msgstr "Afficher les en-tÃªtes des messages"
 
 #: ../mail/mail-config.ui.h:38
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "Ne pas afficher le contenu du message quand leur taille e_xcÃ¨de"
+
+#: ../mail/mail-config.ui.h:39
 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:39
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "Ne pas citer"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "Dossier des _brouillonsÂ :"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "_Adresse Ã©lectroniqueÂ :"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "Vider les dossiers corbeille en qui_ttant"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Magic S_pacebar"
 msgstr "Activer la barre d'es_pace magique"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:45
 msgid "Enable Sea_rch Folders"
 msgstr "Activer les dossiers de _recherche"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:47
 msgid "Encry_ption certificate:"
 msgstr "Certificat de _chiffrementÂ :"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Chiffrer les messages sortants (par dÃ©faut)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:49
 msgid "Fi_xed-width:"
 msgstr "Largeur fi_xeÂ :"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Fix_ed width Font:"
 msgstr "Police Ã  largeur fi_xeÂ :"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:51
 msgid "Font Properties"
 msgstr "PropriÃ©tÃ©s de la police"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Format messages in _HTML"
 msgstr "Formater les messages en _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Full Nam_e:"
 msgstr "Nom compl_etÂ :"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:55
 msgid "HTML Messages"
 msgstr "Messages HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "H_TTP Proxy:"
 msgstr "Serveur mandataire H_TTPÂ :"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Headers"
 msgstr "En-tÃªtes"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "Highlight _quotations with"
 msgstr "Mettre les citations en _surbrillance avec"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Inline"
 msgstr "Dans le corps"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Inline (Outlook style)"
 msgstr "Dans le corps (style Outlook)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:63
 msgid "KB"
 msgstr "Kio"
 
-#: ../mail/mail-config.ui.h:63 ../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:64
+#: ../mail/mail-config.ui.h:65
 msgid "Languages Table"
 msgstr "Langues"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "Mail Headers Table"
 msgstr "En-tÃªtes des messages"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Mailbox location"
 msgstr "Emplacement de la boÃ®te Ã  lettres"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "Affichage des messages"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid "Message Fonts"
 msgstr "Police des messages"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "Message Receipts"
 msgstr "AccusÃ©s de rÃ©ception des messages"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "No _Proxy for:"
 msgstr "Pas de serveur mandataire _pourÂ :"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:74
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -12763,178 +12466,178 @@ msgstr ""
 "NoteÂ : vous n'aurez pas Ã  fournir de mot de passe avant votre premiÃ¨re "
 "connexion"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:75
 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:75
+#: ../mail/mail-config.ui.h:76
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Or_ganization:"
 msgstr "Or_ganisationÂ :"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de la _clÃ© PGP/GPGÂ :"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Pass_word:"
 msgstr "_Mot de passeÂ :"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Port:"
 msgstr "PortÂ :"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "_Demander lors de l'envoi de messages oÃ¹ seuls des destinataires Cci sont "
 "dÃ©finis"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Printed Fonts"
 msgstr "Polices d'impression"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Proxy Settings"
 msgstr "RÃ©glages du serveur mandataire"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Quoted"
 msgstr "CitÃ©"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "Re_member password"
 msgstr "_MÃ©moriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Re_ply-To:"
 msgstr "RÃ©_pondre Ã Â :"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "Remember _password"
 msgstr "_MÃ©moriser le mot de passe"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: ../mail/mail-config.ui.h:94
+#: ../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:95
+#: ../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:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_elect..."
 msgstr "S_Ã©lectionner..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../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:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_tandard Font:"
 msgstr "Police par _dÃ©fautÂ :"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Select Drafts Folder"
 msgstr "SÃ©lectionner le dossier des brouillons"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "SÃ©lection d'une police HTML Ã  largeur fixe"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "SÃ©lection d'une police HTML Ã  largeur fixe pour l'impression"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font"
 msgstr "SÃ©lection d'une police HTML Ã  largeur variable"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "SÃ©lection d'une police HTML Ã  largeur variable pour l'impression"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Select Sent Folder"
 msgstr "SÃ©lectionner le dossier des messages envoyÃ©s"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Photo de l'expÃ©diteur"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending Mail"
 msgstr "Envoi de courriels"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "Dossier des _messages envoyÃ©sÂ :"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyÃ©s et brouillons"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Le _serveur requiert une authentification"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:114
 msgid "Server _Type:"
 msgstr "_Type de serveurÂ :"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "Sig_natures"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "Certificat de _signatureÂ :"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "Signat_ureÂ :"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "Signatures"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "_Commencer la rÃ©daction en bas lors des rÃ©ponses"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "T_ypeÂ :"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12942,7 +12645,7 @@ msgstr ""
 "La liste des langues ne contient que les langues pour lesquelles un "
 "dictionnaire a Ã©tÃ© installÃ©."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12952,7 +12655,7 @@ msgstr ""
 "signature. Le nom indiquÃ© ne sera utilisÃ© que\n"
 "pour l'affichage."
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12960,247 +12663,245 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez dÃ©signer ce compte.\n"
 "Par exempleÂ : Â«Â TravailÂ Â» ou Â«Â PersonnelÂ Â»"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Us_ername:"
 msgstr "_Nom d'utilisateurÂ :"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Use Authe_ntication"
 msgstr "Utiliser l'_authentification"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
+#: ../mail/mail-config.ui.h:131 ../plugins/caldav/caldav-source.c:222
 #: ../plugins/google-account-setup/google-contacts-source.c:283
 #: ../plugins/google-account-setup/google-source.c:620
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "_Nom d'utilisateurÂ :"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "V_ariable-width:"
 msgstr "_Largeur variableÂ :"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "A_jouter une signature"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "_Toujours charger les images Ã  partir d'Internet"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "Type d'_authentification"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "_Greffon pourriel par dÃ©fautÂ :"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "Connexion _directe Ã  Internet"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne pas signer les de_mandes de rÃ©union (compatibilitÃ© Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "Style de _transfertÂ :"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 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:140
+#: ../mail/mail-config.ui.h:141
 msgid "_Languages"
 msgstr "_Langues"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "_Load images in messages from contacts"
 msgstr "_Afficher les images dans les messages des contacts"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Lookup in local address book only"
 msgstr "Rechercher seulement dans le carnet d'adresses _local"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Make this my default account"
 msgstr "En faire _mon compte par dÃ©faut"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Manual proxy configuration:"
 msgstr "Configuration _manuelle du serveur mandataireÂ :"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Mark messages as read after"
 msgstr "_Marquer les messages comme lus aprÃ¨s"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "_Ne jamais charger les images Ã  partir d'Internet"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "_CheminÂ :"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 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:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "De_mander lors de l'envoi de messages dÃ©pourvus de sujet"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Reply style:"
 msgstr "Style de _rÃ©ponse Â :"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Script:"
 msgstr "_ScriptÂ :"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Secure HTTP Proxy:"
 msgstr "_Serveur mandataire HTTP sÃ©curisÃ©Â :"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:156 ../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:157
+#: ../mail/mail-config.ui.h:158
 msgid "_Show image animations"
 msgstr "_Afficher les animations"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 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:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:161
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_RÃ©duire les en-tÃªtes Ã? / Cc / Cci Ã "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:162
 msgid "_Use Secure Connection:"
 msgstr "_Utiliser une connexion sÃ©curisÃ©eÂ :"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:163
 msgid "_Use system defaults"
 msgstr "_Utiliser les rÃ©glages par dÃ©faut du systÃ¨me"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:164
 msgid "_Use the same fonts as other applications"
 msgstr "_Utiliser les mÃªmes polices que dans les autres applications"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:167
 msgid "addresses"
 msgstr "adresses"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:169
 msgid "color"
 msgstr "couleur"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:170
 msgid "description"
 msgstr "description"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Tous les dossiers actifs distants"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Tous les dossiers locaux et actifs distants"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Tous les dossiers locaux"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Appel"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "_AchevÃ©e"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Digital Signature"
 msgstr "Signature numÃ©rique"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Folder Subscriptions"
 msgstr "GÃ©rer les abonnements"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Accord de licence"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Aucune rÃ©ponse nÃ©cessaire"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "RÃ©pondre Ã  tous"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "Revoir"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:20
 msgid "S_erver:"
 msgstr "_ServeurÂ :"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Search Folder Sources"
 msgstr "Sources de dossier de recherche"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Informations de sÃ©curitÃ©"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Specific folders"
 msgstr "Dossiers spÃ©cifiques"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:24
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13208,170 +12909,170 @@ 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:27
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Accept License"
 msgstr "_Accepter la licence"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Due By:"
 msgstr "_Date d'Ã©chÃ©anceÂ :"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Flag:"
 msgstr "_MarqueurÂ :"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Tick this to accept the license agreement"
 msgstr "Cochez ici pour accepter les _termes de la licence"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:891
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtrage des messages sÃ©lectionnÃ©s"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:243
 msgid "Fetching Mail"
 msgstr "RÃ©cupÃ©ration du courriel"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:574
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a Ã©chouÃ©Â : %s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:586 ../mail/mail-ops.c:613
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "L'ajout Ã  %s a Ã©chouÃ©Â : %s\n"
 "AjoutÃ© au dossier local Â«Â EnvoyÃ©sÂ Â» Ã  la place."
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:630
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "L'ajout au dossier local Â«Â EnvoyÃ©sÂ Â» a Ã©chouÃ©Â : %s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:741 ../mail/mail-ops.c:822
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:751
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:778
 #, 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:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:780 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "AnnulÃ©."
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:782 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "TerminÃ©."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:894
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Enregistrement du message dans le dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "DÃ©placement des messages vers Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:971
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copie des messages vers Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1080
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Examen des dossiers dans Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1188
 msgid "Forwarded messages"
 msgstr "Messages transfÃ©rÃ©s"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1229
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ouverture du dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1306
+#: ../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:1378
+#: ../mail/mail-ops.c:1367
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Ouverture du stockage Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1438
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Suppression du dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1556
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1619
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1620
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1674
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualisation du dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1714
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Nettoyage du dossier Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1759
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1760
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:1956
 #, 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:2056
+#: ../mail/mail-ops.c:2045
 #, 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:2136
+#: ../mail/mail-ops.c:2126
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13380,11 +13081,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages versÂ : %sÂ :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2198
 msgid "Saving attachment"
 msgstr "Enregistrement de la piÃ¨ce jointe"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2216 ../mail/mail-ops.c:2224
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13393,35 +13094,35 @@ msgstr ""
 "Impossible de crÃ©er le fichier de sortieÂ : %sÂ :\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2239
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'Ã©crire les donnÃ©esÂ : %s"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "DÃ©connexion de Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2384
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconnexion Ã  Â«Â %sÂ Â»"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2480
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "PrÃ©paration du compte Â«Â %sÂ Â» pour utilisation hors ligne"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2566
 msgid "Checking Service"
 msgstr "Service de vÃ©rification"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Annulation..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:427
 msgid "Send & Receive Mail"
 msgstr "Envoi et rÃ©ception du courriel"
 
@@ -13429,110 +13130,146 @@ msgstr "Envoi et rÃ©ception du courriel"
 msgid "Cancel _All"
 msgstr "_Tout annuler"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "Mise Ã  jour..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courriel"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:217
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Saisissez la phrase de passe pour %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:219
 msgid "Enter Passphrase"
 msgstr "Saisissez la phrase de passe"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:222
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:224
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:266
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulÃ© l'opÃ©ration."
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:660
 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/mail-session.c:669
+#: ../mail/mail-session.c:666
 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/mail-tools.c:123
+#: ../mail/mail-tools.c:119
 #, c-format
-msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Impossible de crÃ©er le dossier spool Â«Â %sÂ Â»Â : %s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:149
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Tentative de movemail d'une source non mbox Â«Â %sÂ Â»"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:255
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message transfÃ©rÃ© - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:257
 msgid "Forwarded message"
 msgstr "Message transfÃ©rÃ©"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:297
 #, c-format
-msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Dossier non valideÂ : Â«Â %sÂ Â»"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:84
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Mise en place du dossier de rechercheÂ : %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:229
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Mise Ã  jour des dossiers de recherche pour Â«Â %s:%sÂ Â»"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:236
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Mise Ã  jour des dossiers de recherche pour Â«Â %sÂ Â»"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is 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:679
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"Le dossier de recherche Â«Â %sÂ Â» a Ã©tÃ© mise Ã  jour parce qu'il utilisait le "
+"dossier qui vient d'Ãªtre supprimÃ©\n"
+"Â«Â %sÂ Â»."
+msgstr[1] ""
+"Les dossiers de recherche suivants\n"
+"%s ont Ã©tÃ© mis Ã  jour parce qu'ils utilisaient le dossier qui vient d'Ãªtre "
+"supprimÃ©\n"
+"Â«Â %sÂ Â»."
+
+#: ../mail/mail-vfolder.c:1191
 msgid "Edit Search Folder"
 msgstr "Ã?diter un dossier de recherche"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1296
 msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "Ã?chec de la dÃ©tection des pourriels"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "Ã?chec du signalement de pourriel"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "Ã?chec du signalement de non pourriel"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommÃ© Â«Â {0}Â Â» existe dÃ©jÃ . Veuillez utiliser un nom diffÃ©rent."
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 "Un dossier nommÃ© Â«Â {1}Â Â» existe dÃ©jÃ . Veuillez utiliser un nom diffÃ©rent."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13544,7 +13281,7 @@ msgstr ""
 "Vous pouvez choisir d'ignorer ce dossier, d'Ã©craser ou ajouter son contenu, "
 "ou de quitter."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
@@ -13552,14 +13289,14 @@ msgstr ""
 "Un accusÃ© de rÃ©ception a Ã©tÃ© demandÃ© pour la lecture de Â«Â {1}Â Â». Voulez-vous "
 "envoyer l'accusÃ© de rÃ©ception Ã  {0}Â ?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "Une signature nommÃ©e Â«Â {0}Â Â» existe dÃ©jÃ . Veuillez indiquer un nom diffÃ©rent."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13567,24 +13304,20 @@ msgstr ""
 "Ajouter un sujet comprÃ©hensible Ã  vos messages permet de donner Ã  vos "
 "destinataires une idÃ©e du propos du courriel."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Voulez-vous vraiment supprimer ce compte et tous ses mandatairesÂ ?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Voulez-vous vraiment supprimer ce compteÂ ?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Voulez-vous vraiment supprimer ce compte et tous ses mandatairesÂ ?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Voulez-vous vraiment ouvrir {0} messages en une foisÂ ?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13592,7 +13325,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer dÃ©finitivement tous les messages effacÃ©s dans "
 "tous les dossiersÂ ?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -13600,91 +13333,83 @@ msgstr ""
 "Voulez-vous vraiment supprimer dÃ©finitivement tous les messages effacÃ©s dans "
 "le dossier Â«Â {0}Â Â»Â ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Voulez-vous vraiment envoyer un message au format HTMLÂ ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Voulez-vous vraiment envoyer un message avec une adresse non valideÂ ?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr ""
 "Voulez-vous vraiment envoyer un message avec des adresses non validesÂ ?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Voulez-vous vraiment envoyer un message avec des destinataires Cci "
 "seulementÂ ?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Voulez-vous vraiment envoyer un message sans sujetÂ ?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Ã? cause de Â«Â {0}Â Â»."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Ã? cause de Â«Â {2}Â Â»."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Signature vide"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Impossible d'ajouter le dossier de recherche Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de copier le dossier Â«Â {0}Â Â» vers Â«Â {1}Â Â»."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Impossible de crÃ©er le dossier Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de crÃ©er de dossier de sauvegarde temporaire."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Impossible de crÃ©er le dossier de sauvegarde parce que Â«Â {1}Â Â»"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier systÃ¨me Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr ""
 "Impossible de modifier le dossier de recherche Â«Â {0}Â Â» puisqu'il n'existe pas."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Impossible de dÃ©placer le dossier Â«Â {0}Â Â» vers Â«Â {1}Â Â»."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "Impossible d'ouvrir la source Â«Â {1}Â Â»"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "Impossible d'ouvrir la source Â«Â {1}Â Â»."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Impossible d'ouvrir la source Â«Â {2}Â Â»."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Impossible d'ouvrir la cible Â«Â {2}Â Â»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -13693,35 +13418,31 @@ msgstr ""
 "d'installation. Vous ne serez pas capable d'utiliser ce fournisseur jusqu'Ã  "
 "ce que vous acceptiez sa licence."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Impossible de renommer Â«Â {0}Â Â» en Â«Â {1}Â Â»."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Impossible de renommer ou dÃ©placer le dossier systÃ¨me Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Impossible d'enregistrer les modifications au compte."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossible d'enregistrer dans le dossier Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Impossible d'enregistrer dans le fichier Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Impossible de dÃ©finir le script de signature Â«Â {0}Â Â»."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Ã?chec de la dÃ©tection des pourriels"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -13730,27 +13451,27 @@ msgstr ""
 "que beaucoup de mots de passe sont sensibles Ã  la casseÂ ; le verrouillage "
 "majuscules est peut-Ãªtre actif."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 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:45
 msgid "Do not d_elete"
 msgstr "Ne pas s_upprimer"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Ne pas supprimer"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Ne pas dÃ©sactiver"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -13758,63 +13479,66 @@ 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:49
 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:50
 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:51
 msgid "Enter password."
 msgstr "Saisissez le mot de passe."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 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:53
 msgid "Error while performing operation."
 msgstr "Erreur durant l'exÃ©cution de l'opÃ©ration."
 
-#: ../mail/mail.error.xml.h:56
+#. 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:57
 msgid "Error while {0}."
 msgstr "Erreur durant {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Le fichier existe mais ne peut pas Ãªtre Ã©crasÃ©."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Le fichier existe mais n'est pas un fichier rÃ©gulier."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 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:60
+#: ../mail/mail.error.xml.h:61
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 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:61
+#: ../mail/mail.error.xml.h:62
 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:62
+#: ../mail/mail.error.xml.h:63
 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:63
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13822,13 +13546,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:65
+#: ../mail/mail.error.xml.h:66
 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:66
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13836,23 +13560,23 @@ msgstr ""
 "Si vous quittez, ces messages ne seront pas envoyÃ©s avant qu'Evolution soit "
 "Ã  nouveau dÃ©marrÃ©."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "Authentification non valide"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Impossible de supprimer le courriel"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "Filtres du courriel automatiquement mis Ã  jour."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 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 "
@@ -13864,28 +13588,28 @@ 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:72
+#: ../mail/mail.error.xml.h:73
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "No sources selected."
 msgstr "Aucune source n'a Ã©tÃ© sÃ©lectionnÃ©e."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 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:77
+#: ../mail/mail.error.xml.h:78
 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:78
+#: ../mail/mail.error.xml.h:79
 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."
@@ -13894,7 +13618,7 @@ msgstr ""
 "rechercher des adresses Ã©lectroniques en cliquant sur le bouton Â«Â Ã?Â :Â Â» Ã  "
 "cÃ´tÃ© de la boÃ®te de saisie."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13904,67 +13628,59 @@ msgstr ""
 "courriel HTMLÂ :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Please provide an unique name to identify this signature."
 msgstr "Saisissez un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 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:84
+#: ../mail/mail.error.xml.h:85
 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:85
+#: ../mail/mail.error.xml.h:86
 msgid "Read receipt requested."
 msgstr "AccusÃ© de rÃ©ception demandÃ©."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 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:87
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\"?"
 msgstr "Voulez-vous vraiment supprimer le dossier Â«Â {0}Â Â»Â ?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Ã?chec du signalement de pourriel"
-
 #: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Ã?chec du signalement de non pourriel"
-
-#: ../mail/mail.error.xml.h:90
 msgid "Search Folders automatically updated."
 msgstr "Dossiers de recherche automatiquement mis Ã  jour."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid "Send Receipt"
 msgstr "Envoyer un accusÃ© de rÃ©ception"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid "Signature Already Exists"
 msgstr "Signature dÃ©jÃ  existante"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize"
 msgstr "Synchroniser"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid "Synchronize folders locally for offline usage?"
 msgstr ""
 "Faut-il synchroniser localement les dossiers pour une utilisation hors "
 "ligneÂ ?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13972,7 +13688,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:96
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13989,35 +13705,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:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les dossiers de recherche suivantsÂ :\n"
-"{0}\n"
-"utilisaient le dossier maintenant supprimÃ©Â :\n"
-"    Â«Â {1}Â Â»\n"
-"Ils ont Ã©tÃ© mis Ã  jour."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Les rÃ¨gles de filtrage suivantesÂ :\n"
-"{0}\n"
-"utilisaient le dossier maintenant supprimÃ©Â :\n"
-"    Â«Â {1}Â Â»\n"
-"Elles ont Ã©tÃ© mises Ã  jour."
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -14026,7 +13714,7 @@ msgstr ""
 "valideÂ :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:100
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -14035,11 +13723,11 @@ msgstr ""
 "validesÂ :\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:102
 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:114
+#: ../mail/mail.error.xml.h:103
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14048,7 +13736,7 @@ msgstr ""
 "si nÃ©cessaire, allez dans l'Ã©diteur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14056,13 +13744,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:117
+#: ../mail/mail.error.xml.h:106
 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:118
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14070,11 +13758,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:119
+#: ../mail/mail.error.xml.h:108
 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:120
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14082,11 +13770,11 @@ msgstr ""
 "Marque tous les messages dans le dossier sÃ©lectionnÃ©, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:110
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14094,19 +13782,19 @@ 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:123
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
 msgid "Use _Default"
 msgstr "Utiliser le _dÃ©faut"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par dÃ©fautÂ ?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -14116,34 +13804,34 @@ msgstr ""
 "le message d'un de vos dossiers local ou distant.\n"
 "Est-ce vraiment ce que vous souhaitezÂ ?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
 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:129
+#: ../mail/mail.error.xml.h:118
 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:130
+#: ../mail/mail.error.xml.h:119
 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:131
+#: ../mail/mail.error.xml.h:120
 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:132
+#: ../mail/mail.error.xml.h:121
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14153,116 +13841,112 @@ 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:136
+#: ../mail/mail.error.xml.h:125
 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:137
+#: ../mail/mail.error.xml.h:126
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:128
 msgid "_Do not Synchronize"
 msgstr "_Ne pas synchroniser"
 
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:821
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1110
 msgid "Unseen"
 msgstr "Non vu"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1111
 msgid "Seen"
 msgstr "Vu"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1112
 msgid "Answered"
 msgstr "RÃ©pondu"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1113
 msgid "Forwarded"
 msgstr "TransfÃ©rÃ©"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1114
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1115
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1119
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1120
 msgid "Lower"
 msgstr "Plus bas"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1124
 msgid "Higher"
 msgstr "Plus haut"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1125
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1735 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1742 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1751
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1763
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1771
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1773
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2518
 msgid "Select all visible messages"
 msgstr "SÃ©lectionne tous les messages visibles"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Moteur du shell"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4199 ../mail/message-list.c:4595
 msgid "Generating message list"
 msgstr "GÃ©nÃ©ration de la liste des messages"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4432
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -14270,15 +13954,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:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-"Ce dossier ne contient que des messages cachÃ©s. Choisissez Â«Â Affichage-"
-">Afficher tous les messages masquÃ©sÂ Â» pour les afficher."
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4434
 msgid "There are no messages in this folder."
 msgstr "Il n'y a aucun message dans ce dossier."
 
@@ -14316,27 +13992,27 @@ msgid "Subject - Trimmed"
 msgstr "Sujet - TronquÃ©"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Body contains"
 msgstr "Le corps contient"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Message contains"
 msgstr "Le message contient"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
 msgid "Recipients contain"
 msgstr "Les destinataires contiennent"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "Sender contains"
 msgstr "L'expÃ©diteur contient"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1240
 msgid "Subject contains"
 msgstr "Le sujet contient"
 
@@ -14370,15 +14046,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:592
-msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Utiliser dans le calendrier _Anniversaires"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 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:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -14388,7 +14064,7 @@ msgstr ""
 "connecter. Une liste de ports standard est fournie. Demandez Ã  votre "
 "administrateur systÃ¨me le port Ã  utiliser."
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -14398,7 +14074,7 @@ msgstr ""
 "Notez qu'indiquer Â«Â Adresse Ã©lectroniqueÂ Â» implique l'accÃ¨s anonyme Ã  votre "
 "serveur LDAP."
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -14410,29 +14086,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:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Informations sur le serveur"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "DÃ©tails"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Recherche"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "TÃ©lÃ©chargement"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "PropriÃ©tÃ©s du carnet d'adresses"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
@@ -14520,9 +14196,11 @@ msgstr ""
 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:159
-msgid "Table column:"
-msgstr "Colonne de tableauÂ :"
+#: ../modules/mail/em-mailer-prefs.c:1158
+msgid "_Table column:"
+msgstr "Colonne de _tableauÂ :"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -14534,7 +14212,7 @@ msgstr "Toujours _afficher l'adresse du contact autocomplÃ©tÃ©"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-migrate.c:144
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
@@ -14544,7 +14222,7 @@ msgid "_Contact"
 msgstr "_Contact"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "CrÃ©e un nouveau contact"
 
@@ -14554,7 +14232,7 @@ msgid "Contact _List"
 msgstr "_Liste de contacts"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "CrÃ©e une nouvelle liste de contacts"
 
@@ -14564,7 +14242,7 @@ msgid "Address _Book"
 msgstr "Carnet d'_adresses"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "CrÃ©e un nouveau carnet d'adresses"
 
@@ -14572,336 +14250,232 @@ msgstr "CrÃ©e un nouveau carnet d'adresses"
 #: ../modules/addressbook/e-book-shell-backend.c:376
 #: ../modules/addressbook/e-book-shell-view.c:394
 #: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Liste de source"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Le registre des carnets d'adresses"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Vue active"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "La vue actuellement sÃ©lectionnÃ©e du carnet d'adresses"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Contact prÃ©visualisÃ©"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Le contact actuellement affichÃ© dans le panneau d'aperÃ§u"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "L'aperÃ§u est visible"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Indique si le panneau d'aperÃ§u est visible"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "Serveurs LDAP"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "ParamÃ¨tres de complÃ©tion automatique"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"L'emplacement et la hiÃ©rarchie des dossiers des contacts ont changÃ© depuis "
-"Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Le format des contacts de listes de diffusion a changÃ©.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"La maniÃ¨re dont Evolution stocke certains numÃ©ros de tÃ©lÃ©phone a changÃ©.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Les fichiers de donnÃ©es de synchronisation des Palms d'Evolution ont "
-"changÃ©.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Composant graphique sÃ©lecteur de source"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Ce composant graphique affiche les groupes de carnets d'adresses"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Enregistrer comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Co_pier tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 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:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "_Supprimer le carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Supprime le carnet d'adresses sÃ©lectionnÃ©"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "DÃ©pla_cer tous les contacts vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 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:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Nouveau carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "PropriÃ©tÃ©s du _carnet d'adresses"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 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:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 #: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../modules/mail/e-mail-shell-view-actions.c:905
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Renomme le carnet d'adresses sÃ©lectionnÃ©"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "_Enregistrer le carnet d'adresses comme vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 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:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "ArrÃªte le chargement"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Copier le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 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:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Supprimer le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Rechercher dans le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Recherche du texte dans le contact affichÃ©"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Faire suivre le contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 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:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_DÃ©placer le contact vers..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 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:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "_Nouveau contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "_Nouvelle liste de contacts..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Ouvrir le contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Affiche le contact actuel"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "Envoyer un _message au contact..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 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:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "_Actions"
 msgstr "A_ctions"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 #: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "_Preview"
 msgstr "_AperÃ§u"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 #: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "_PropriÃ©tÃ©s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Enregistrer comme vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "_AperÃ§u du contact"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Affiche la fenÃªtre de prÃ©visualisation des contacts"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 #: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/calendar/e-task-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "_Classic View"
 msgstr "Affichage _classique"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 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:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/calendar/e-task-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Vertical View"
 msgstr "Affichage _vertical"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 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:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Any Category"
 msgstr "Toutes les catÃ©gories"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 #: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-task-shell-view-actions.c:941
 msgid "Unmatched"
 msgstr "DiffÃ©rent"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1646
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../shell/e-shell-content.c:441
 msgid "Advanced Search"
 msgstr "Recherche avancÃ©e"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Imprime tous les contacts visibles"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "PrÃ©visualise les contacts Ã  imprimer"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Imprime les contacts sÃ©lectionnÃ©s"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Enregistrer comme vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Enregistre les contacts sÃ©lectionnÃ©s comme vCard"
 
@@ -14945,58 +14519,48 @@ msgstr "Informations sur le contact"
 msgid "Contact information for %s"
 msgstr "Informations sur le contact %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonyme"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Pa_rcourir ce carnet d'adresses jusqu'Ã  ce que la limite soit atteinte"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Co_nnexionÂ :"
 
 # LDAP search scope
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Un niveau"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Filtre de recherche"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Ba_se de rechercheÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "_Filtre de rechercheÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -15007,55 +14571,56 @@ msgstr ""
 
 # LDAP search scope
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Arborescence"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Bases de recherche prises en charge"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "En utilisant l'adresse Ã©lectronique"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Limite de _tÃ©lÃ©chargementÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Trouver les bases de recherche possibles"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "_MÃ©thode d'identificationÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_PortÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Domain_e de rechercheÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_DÃ©laiÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sÃ©curisÃ©eÂ :"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "cartes"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "I_mporter"
 
@@ -15077,11 +14642,11 @@ msgstr "I_mporter dans les tÃ¢ches"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-migrate.c:176
 #: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:143
 msgid "On The Web"
 msgstr "Sur le Web"
 
@@ -15091,7 +14656,7 @@ msgid "Weather"
 msgstr "MÃ©tÃ©o"
 
 #: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Anniversaires"
 
@@ -15101,7 +14666,7 @@ msgid "_Appointment"
 msgstr "_Rendez-vous"
 
 #: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Create a new appointment"
 msgstr "CrÃ©e un nouveau rendez-vous"
 
@@ -15129,49 +14694,18 @@ msgid "Cale_ndar"
 msgstr "_Calendrier"
 
 #: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Create a new calendar"
 msgstr "CrÃ©e un nouveau calendrier"
 
 #: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../plugins/itip-formatter/itip-formatter.c:2651
 msgid "Calendar and Tasks"
 msgstr "Calendrier et tÃ¢ches"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Le registre des calendriers"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"L'emplacement et la hiÃ©rarchie des dossiers des calendriers ont changÃ© "
-"depuis Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Impossible de migrer les anciens paramÃ¨tres Ã  partir de evolution/config."
-"xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Impossible de migrer le calendrier Â«Â %sÂ Â»"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -15180,36 +14714,16 @@ msgstr ""
 "Erreur sur %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:227
 msgid "Loading calendars"
 msgstr "Chargement des calendriers"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:617
 msgid "Calendar Selector"
 msgstr "SÃ©lecteur de calendrier"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Composant graphique navigateur de date"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Ce composant graphique affiche un calendrier miniature"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Client de calendrier par dÃ©faut"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Client par dÃ©faut pour les opÃ©rations de calendrier"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Ce composant graphique affiche les groupes de calendriers"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:952
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier Ã  %s"
@@ -15253,244 +14767,244 @@ msgstr "Ã©vÃ¨nement"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:209
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
 #: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-task-shell-view-actions.c:612
 msgid "Save as iCalendar"
 msgstr "Enregistrer comme iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
 #: ../modules/calendar/e-memo-shell-view-actions.c:575
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "D_elete Calendar"
 msgstr "Supprim_er le calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Delete the selected calendar"
 msgstr "Supprime le calendrier sÃ©lectionnÃ©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
 msgid "Go Back"
 msgstr "En arriÃ¨re"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Go Forward"
 msgstr "En avant"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "SÃ©lectionner au_jourd'hui"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
 msgid "Select today"
 msgstr "SÃ©lectionne le jour d'aujourd'hui"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
 msgid "Select _Date"
 msgstr "SÃ©lectionner une _date"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Select a specific date"
 msgstr "SÃ©lectionne une date prÃ©cise"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
 msgid "_New Calendar"
 msgstr "_Nouveau calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Purg_e"
 msgstr "Nettoy_er"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 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:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 #: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Re_fresh"
 msgstr "Ac_tualiser"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Refresh the selected calendar"
 msgstr "Actualise le calendrier sÃ©lectionnÃ©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Rename the selected calendar"
 msgstr "Renomme le calendrier sÃ©lectionnÃ©"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Show _Only This Calendar"
 msgstr "Afficher _uniquement ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le c_alendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Delegate Meeting..."
 msgstr "DÃ©lÃ©guer une _rÃ©union..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delete Appointment"
 msgstr "Su_pprimer le rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Delete selected appointments"
 msgstr "Supprime les rendez-vous sÃ©lectionnÃ©s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "Delete This _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete this occurrence"
 msgstr "Supprime cette occurrence"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete All Occ_urrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete all occurrences"
 msgstr "Supprime toutes les occurrences"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "New All Day _Event..."
 msgstr "Nouvel Ã©vÃ©n_ement toute la journÃ©e..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 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:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 #: ../modules/calendar/e-cal-shell-view-memopad.c:243
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
 #: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
 msgid "New _Meeting..."
 msgstr "Nouvelle _rÃ©union..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Create a new meeting"
 msgstr "CrÃ©e une nouvelle rÃ©union"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Mo_ve to Calendar..."
 msgstr "DÃ©placer _vers le calendrier..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "New _Appointment..."
 msgstr "Nouveau re_ndez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurrence _dÃ©plaÃ§able"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "_Open Appointment"
 msgstr "_Ouvrir un rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
 msgid "View the current appointment"
 msgstr "Affiche le rendez-vous actuel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Reply"
 msgstr "_RÃ©pondre"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "Enregistrer comme iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _rÃ©union..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Convertit un rendez-vous en rÃ©union"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_ertir en rendez-vous..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Convertit une rÃ©union en rendez-vous"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
 msgid "Day"
 msgstr "Jour"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1579
 msgid "Show one day"
 msgstr "Affiche une journÃ©e"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1584
 msgid "List"
 msgstr "Liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "Show as list"
 msgstr "Affiche comme une liste"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
 msgid "Month"
 msgstr "Mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Show one month"
 msgstr "Affiche un mois"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
 msgid "Week"
 msgstr "Semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Show one week"
 msgstr "Affiche une semaine"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1607
 msgid "Show one work week"
 msgstr "Affiche une semaine de travail"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Active Appointments"
 msgstr "Rendez-vous actuels"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Next 7 Days' Appointments"
 msgstr "Rendez-vous des 7 prochains jours"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 #: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Description contains"
 msgstr "La description contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 #: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Summary contains"
 msgstr "Le rÃ©sumÃ© contient"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Print this calendar"
 msgstr "Imprime ce calendrier"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1686
 msgid "Preview the calendar to be printed"
 msgstr "PrÃ©visualise le calendrier Ã  imprimer"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Go To"
 msgstr "Aller Ã "
 
@@ -15525,7 +15039,7 @@ msgstr "Affiche le mÃ©mo sÃ©lectionnÃ©"
 #: ../modules/calendar/e-cal-shell-view-memopad.c:264
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
 #: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site Web"
 
@@ -15539,22 +15053,22 @@ msgstr "Imprime le mÃ©mo sÃ©lectionnÃ©"
 #. 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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:610
 msgid "task"
 msgstr "tÃ¢che"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:672
 msgid "_Assign Task"
 msgstr "_Attribuer une tÃ¢che"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminÃ©"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Mark selected tasks as complete"
 msgstr "Marque les tÃ¢ches sÃ©lectionnÃ©es comme terminÃ©es"
 
@@ -15563,39 +15077,39 @@ msgid "_Mark as Incomplete"
 msgstr "_Marquer comme incomplet"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 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:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:763
 msgid "New _Task"
 msgstr "Nouvelle _tÃ¢che"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 #: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Create a new task"
 msgstr "CrÃ©e une nouvelle tÃ¢che"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "_Open Task"
 msgstr "_Ouvrir une tÃ¢che"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "View the selected task"
 msgstr "Affiche les tÃ¢ches sÃ©lectionnÃ©es"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
 #: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "_Save as iCalendar..."
 msgstr "_Enregistrer comme iCalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:998
 msgid "Print the selected task"
 msgstr "Imprime la tÃ¢che sÃ©lectionnÃ©e"
 
@@ -15623,36 +15137,16 @@ msgstr "Li_ste de mÃ©mos"
 msgid "Create a new memo list"
 msgstr "CrÃ©e une nouvelle liste de mÃ©mos"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Le registre des listes de mÃ©mos"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Le modÃ¨le de tableau des mÃ©mos"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:222
 msgid "Loading memos"
 msgstr "Chargement des mÃ©mos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:571
 msgid "Memo List Selector"
 msgstr "SÃ©lecteur de liste de mÃ©mos"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Client de mÃ©mo par dÃ©faut"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Client par dÃ©faut pour les opÃ©rations de mÃ©mo"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Ce composant graphique affiche les groupes de listes de mÃ©mos"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:870
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ouverture des mÃ©mos de %s"
@@ -15763,58 +15257,20 @@ msgid "Tas_k List"
 msgstr "Liste de _tÃ¢ches"
 
 #: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "Create a new task list"
 msgstr "CrÃ©e une nouvelle liste de tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Le registre des listes de tÃ¢ches"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Le modÃ¨le de tableau des tÃ¢ches"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"L'emplacement et la hiÃ©rarchie des dossiers des tÃ¢ches ont changÃ© depuis "
-"Evolution 1.x.\n"
-"\n"
-"Veuillez patienter pendant qu'Evolution migre vos dossiers..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Impossible de migrer les tÃ¢ches Â«Â %sÂ Â»"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:222
 msgid "Loading tasks"
 msgstr "Chargement des tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:571
 msgid "Task List Selector"
 msgstr "SÃ©lecteur de liste de tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Client de tÃ¢che par dÃ©faut"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Client par dÃ©faut pour les opÃ©rations sur les tÃ¢ches"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Ce composant graphique affiche les groupes de listes de tÃ¢ches"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:870
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tÃ¢ches Ã  %s"
@@ -15824,7 +15280,7 @@ msgstr "Ouverture des tÃ¢ches Ã  %s"
 msgid "Print Tasks"
 msgstr "Imprimer les tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:554
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15836,95 +15292,95 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tÃ¢chesÂ ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:679
 msgid "_Delete Task"
 msgstr "_Supprimer la tÃ¢che"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "_Find in Task..."
 msgstr "_Rechercher dans la tÃ¢che..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 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:699
+#: ../modules/calendar/e-task-shell-view-actions.c:700
 msgid "Copy..."
 msgstr "Copier..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:707
 msgid "D_elete Task List"
 msgstr "S_upprimer la liste des tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Delete the selected task list"
 msgstr "Supprime la liste de tÃ¢ches sÃ©lectionnÃ©e"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "_New Task List"
 msgstr "_Nouvelle liste de tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Refresh the selected task list"
 msgstr "Actualise la liste de tÃ¢ches sÃ©lectionnÃ©e"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Rename the selected task list"
 msgstr "Renomme la liste de tÃ¢ches sÃ©lectionnÃ©e"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Show _Only This Task List"
 msgstr "Afficher _uniquement cette liste de tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:756
 msgid "Mar_k as Incomplete"
 msgstr "_Marquer comme incomplet"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Delete completed tasks"
 msgstr "Supprime les tÃ¢ches terminÃ©es"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:861
 msgid "Task _Preview"
 msgstr "A_perÃ§u de la tÃ¢che"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:863
 msgid "Show task preview pane"
 msgstr "Afficher le panneau d'aperÃ§u des tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:884
 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:890
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 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:898
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Active Tasks"
 msgstr "TÃ¢ches actuelles"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Completed Tasks"
 msgstr "TÃ¢ches terminÃ©es"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Next 7 Days' Tasks"
 msgstr "TÃ¢ches des 7 prochains jours"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:927
 msgid "Overdue Tasks"
 msgstr "TÃ¢ches en retard"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:934
 msgid "Tasks with Attachments"
 msgstr "TÃ¢ches avec des piÃ¨ces jointes"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:984
 msgid "Print the list of tasks"
 msgstr "Imprime la liste de tÃ¢ches"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:991
 msgid "Preview the list of tasks to be printed"
 msgstr "PrÃ©visualise la liste de tÃ¢ches Ã  imprimer"
 
@@ -15948,406 +15404,373 @@ msgid "Delete Task"
 msgstr "Supprimer la tÃ¢che"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, 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
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Aucun"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:164
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:166
 msgid "Compose a new mail message"
 msgstr "RÃ©diger un nouveau courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:174
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Dossier de courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:176
 msgid "Create a new mail folder"
 msgstr "CrÃ©e un nouveau dossier pour le courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Mail Accounts"
 msgstr "Comptes de messagerie"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:203
 msgid "Mail Preferences"
 msgstr "PrÃ©fÃ©rences du courriel"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:211
 msgid "Composer Preferences"
 msgstr "PrÃ©fÃ©rences de l'Ã©diteur"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:219
 msgid "Network Preferences"
 msgstr "PrÃ©fÃ©rences rÃ©seau"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Grouper par fils de discussion"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Indique s'il faut grouper les messages par fils de discussion"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:814
 #: ../modules/mail/e-mail-shell-view.c:875
 msgid "_Disable Account"
 msgstr "_DÃ©sactiver le compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:816
 msgid "Disable this account"
 msgstr "DÃ©sactiver ce compte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:823
 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:869
+#: ../modules/mail/e-mail-shell-view-actions.c:828
 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:876
+#: ../modules/mail/e-mail-shell-view-actions.c:835
 msgid "_Download Messages for Offline Usage"
 msgstr "_TÃ©lÃ©charger les messages pour utilisation hors ligne"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:837
 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:883
+#: ../modules/mail/e-mail-shell-view-actions.c:842
 msgid "Fl_ush Outbox"
 msgstr "Vi_der la boÃ®te d'envoi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:849
 msgid "_Copy Folder To..."
 msgstr "_Copier le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:851
 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:899
+#: ../modules/mail/e-mail-shell-view-actions.c:858
 msgid "Permanently remove this folder"
 msgstr "Supprime dÃ©finitivement ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:863
 msgid "E_xpunge"
 msgstr "Nettoy_er"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:865
 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:911
+#: ../modules/mail/e-mail-shell-view-actions.c:870
 msgid "Mar_k All Messages as Read"
 msgstr "Mar_quer tous les messages comme lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:872
 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:918
+#: ../modules/mail/e-mail-shell-view-actions.c:877
 msgid "_Move Folder To..."
 msgstr "_DÃ©placer le dossier vers..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:879
 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:925
+#: ../modules/mail/e-mail-shell-view-actions.c:884
 msgid "_New..."
 msgstr "_Nouveau..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:886
 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:934
+#: ../modules/mail/e-mail-shell-view-actions.c:893
 msgid "Change the properties of this folder"
 msgstr "Modifie les propriÃ©tÃ©s de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:900
 msgid "Refresh the folder"
 msgstr "Actualise le contenu du dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:907
 msgid "Change the name of this folder"
 msgstr "Modifie le nom de ce dossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:912
 msgid "Select Message _Thread"
 msgstr "SÃ©lectionner le _fil de discussion de ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:914
 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:960
+#: ../modules/mail/e-mail-shell-view-actions.c:919
 msgid "Select Message S_ubthread"
 msgstr "SÃ©lectionner les rÃ©_ponses Ã  ce message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:921
 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:967
+#: ../modules/mail/e-mail-shell-view-actions.c:926
 msgid "_Unsubscribe"
 msgstr "Se _dÃ©sabonner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:928
 msgid "Unsubscribe from the selected folder"
 msgstr "DÃ©sabonne le dossier sÃ©lectionnÃ©"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:933
 msgid "Empty _Trash"
 msgstr "_Vider la corbeille"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:935
 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:981
+#: ../modules/mail/e-mail-shell-view-actions.c:940
 msgid "_New Label"
 msgstr "_Nouvelle Ã©tiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:949
 msgid "N_one"
 msgstr "_Aucun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Masquer les messages _lus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Masque temporairement tous les messages dÃ©jÃ  lus"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Masquer les messages _sÃ©lectionnÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Masque temporairement les messages sÃ©lectionnÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Afficher tous les messages _masquÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Affiche les messages qui ont Ã©tÃ© temporairement masquÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "Cancel the current mail operation"
 msgstr "Annule l'opÃ©ration de messagerie en cours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:977
 msgid "Collapse All _Threads"
 msgstr "Grouper tous les _fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Collapse all message threads"
 msgstr "Groupe tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:984
 msgid "E_xpand All Threads"
 msgstr "DÃ©_plier tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "Expand all message threads"
 msgstr "DÃ©plie tous les fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:991
 msgid "_Message Filters"
 msgstr "Filtres de _message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 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:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:998
 msgid "Search F_olders"
 msgstr "D_ossiers de recherche"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
 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:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1005
 msgid "_Subscriptions..."
 msgstr "_Abonnements..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
 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:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "_Label"
 msgstr "Ã?_tiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Masquer les messages _supprimÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Masque les messages supprimÃ©s plutÃ´t que de les afficher barrÃ©s"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "Show Message _Preview"
 msgstr "Afficher l'a_perÃ§u du message"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Show message preview pane"
 msgstr "Affiche le panneau de prÃ©visualisation des messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Show _Deleted Messages"
+msgstr "Affiche les messages _supprimÃ©s"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1095
+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:1101
 msgid "_Group By Threads"
 msgstr "_Grouper par fils de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Threaded message list"
 msgstr "Liste les messages par fil de discussion"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 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:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 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:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1139
 msgid "All Messages"
 msgstr "Tous les messages"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1146
 msgid "Important Messages"
 msgstr "Messages importants"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1153
 msgid "Last 5 Days' Messages"
 msgstr "Messages des 5 derniers jours"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1160
 msgid "Messages Not Junk"
 msgstr "Messages non pourriels"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1167
 msgid "Messages with Attachments"
 msgstr "Messages avec une piÃ¨ce jointe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1174
 msgid "No Label"
 msgstr "Aucune Ã©tiquette"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1181
 msgid "Read Messages"
 msgstr "Messages lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1188
 msgid "Recent Messages"
 msgstr "Messages rÃ©cents"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1195
 msgid "Unread Messages"
 msgstr "Messages non lus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Subject or Addresses contain"
 msgstr "Le sujet ou les adresses contiennent"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Current Account"
 msgstr "Compte actuel"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Current Folder"
 msgstr "Dossier actuel"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:880
 #, 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:902
+#: ../modules/mail/e-mail-shell-view-private.c:891
 #, 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:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:897
+#: ../modules/mail/e-mail-shell-view-private.c:904
 #, 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:921
+#: ../modules/mail/e-mail-shell-view-private.c:910
 #, 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:927
+#: ../modules/mail/e-mail-shell-view-private.c:916
 #, 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:933
+#: ../modules/mail/e-mail-shell-view-private.c:922
 #, 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:945
+#: ../modules/mail/e-mail-shell-view-private.c:934
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d non lu,"
 msgstr[1] "%d non lus,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:937
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16366,77 +15789,77 @@ msgstr "Rechercher dans un compte"
 msgid "Proxy _Logout"
 msgstr "_DÃ©connecter le mandataire"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-composer-prefs.c:472
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "ActivÃ©"
+
+#: ../modules/mail/em-composer-prefs.c:476
 msgid "Language(s)"
 msgstr "Langues"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Ã? chaque fois"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Une fois par jour"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Une fois par semaine"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:223
 msgid "Add Custom Junk Header"
 msgstr "Ajouter des en-tÃªtes de pourriels personnalisÃ©s"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:231
 msgid "Header Name:"
 msgstr "Nom de l'en-tÃªteÂ :"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:232
 msgid "Header Value Contains:"
 msgstr "La valeur de l'en-tÃªte contientÂ :"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:332
 msgid "Header"
 msgstr "En-tÃªte"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:336
 msgid "Contains Value"
 msgstr "Contient la valeur"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:729 ../modules/mail/em-mailer-prefs.c:800
 #, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:737 ../modules/mail/em-mailer-prefs.c:809
 #, 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:766
+#: ../modules/mail/em-mailer-prefs.c:773
 msgid "No junk plugin available"
 msgstr "Aucun greffon de pourriel disponible"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Colonne de _tableauÂ :"
-
 #. 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:1153
+#: ../modules/mail/em-mailer-prefs.c:1160
 msgid "_Date header:"
 msgstr "En-tÃªte de _dateÂ :"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1161
 msgid "Show _original header value"
 msgstr "Afficher la valeur d'en-tÃªte d'_origine"
 
@@ -16472,16 +15895,8 @@ msgstr ""
 "Liste d'indices que le greffon d'oubli des piÃ¨ces jointes doit rechercher "
 "dans le corps d'un message"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr ""
-"Liste d'indices que le greffon d'oubli des piÃ¨ces jointes doit rechercher "
-"dans le corps d'un message."
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:509
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Mots-clÃ©s"
 
@@ -16565,8 +15980,8 @@ msgid "Restore from backup"
 msgstr "Restaurer Ã  partir de l'archive"
 
 #: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "_Archiver les paramÃ¨tres..."
+msgid "_Backup Evolution Settings..."
+msgstr "_Archiver les paramÃ¨tres d'Evolution..."
 
 #: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
@@ -16574,8 +15989,8 @@ msgstr ""
 "Archive les donnÃ©es et les paramÃ¨tres d'Evolution dans un fichier archive"
 
 #: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "Res_taurer les paramÃ¨tres..."
+msgid "R_estore Evolution Settings..."
+msgstr "Res_taurer les paramÃ¨tres d'Evolution..."
 
 #: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
@@ -16629,7 +16044,7 @@ msgid "Restarting Evolution"
 msgstr "RedÃ©marrage d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Archiver les donnÃ©es actuelles d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16660,31 +16075,31 @@ msgstr "Restauration depuis le dossier %s"
 
 # Titre
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Archivage d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Restauration d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Archivage des donnÃ©es d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 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:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Restauration des donnÃ©es d'Evolution"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 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:510
+#: ../plugins/backup-restore/backup.c:516
 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 "
@@ -16752,38 +16167,38 @@ msgstr ""
 "ouvertes. Si vous dÃ©sirez qu'Evolution redÃ©marre automatiquement aprÃ¨s la "
 "restauration, activez l'option correspondante."
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contacts automatiques"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 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:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "SÃ©lectionnez un carnet d'adresses pour les contacts automatiques"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Contacts de messagerie instantanÃ©e"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
-"Synchroniser les informations et les images des contacts depuis la liste de "
+"_Synchroniser les informations et les images des contacts depuis la liste de "
 "contacts Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 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:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Synchroniser maintenant avec la liste de _contacts"
 
@@ -16805,34 +16220,34 @@ 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:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:153
 #, 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:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:157
 #, 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:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, 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:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, 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:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:210
 #, 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:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:394
 msgid "Convert message text to _Unicode"
 msgstr "Convertir le texte du message en _Unicode"
 
@@ -16860,17 +16275,17 @@ msgstr "Options de Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtre les pourriels en utilisant Bogofilter."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 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:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "L'URL indiquÃ© est introuvable."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16879,71 +16294,71 @@ msgstr ""
 "Le serveur a renvoyÃ© des donnÃ©es inattendues.\n"
 "%dÂ -Â %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Ã?chec de l'analyse de la rÃ©ponse du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Ã?vÃ¨nements"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Calendriers de l'utilisateur"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Impossible d'obtenir l'URL du serveur."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
 #: ../plugins/caldav/caldav-browse-server.c:1272
 msgid "Searching for user's calendars..."
 msgstr "Recherche des calendriers de l'utilisateur..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Impossible de trouver un calendrier pour l'utilisateur."
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:793
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Ã?chec de la tentative prÃ©cÃ©denteÂ : %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:795
 #, 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:799
+#: ../plugins/caldav/caldav-browse-server.c:798
 #, c-format
 msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
 msgstr ""
 "Saisissez le mot de passe pour l'utilisateur <b>%s</b> sur le serveur <b>%s</"
 "b>"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:855
 #, 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:1091
+#: ../plugins/caldav/caldav-browse-server.c:1090
 msgid "Searching folder content..."
 msgstr "Recherche dans le contenu du dossier..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1133
 msgid "List of available calendars:"
 msgstr "Liste des calendriers disponiblesÂ :"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1170
 msgid "Supports"
 msgstr "Prises en charge"
 
@@ -16965,24 +16380,24 @@ msgstr "Recherche d'un calendrier CalDAV"
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/caldav/caldav-source.c:216
 #: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URLÂ :"
 
-#: ../plugins/caldav/caldav-source.c:219
+#: ../plugins/caldav/caldav-source.c:220
 #: ../plugins/google-account-setup/google-contacts-source.c:305
 msgid "Use _SSL"
 msgstr "Utiliser _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:229
 msgid "Brows_e server for a calendar"
 msgstr "_Rechercher un calendrier sur le serveur"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-file/calendar-file.c:182
 #: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
+#: ../plugins/calendar-weather/calendar-weather.c:395
 #: ../plugins/google-account-setup/google-contacts-source.c:323
 #: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
@@ -16996,31 +16411,31 @@ msgstr "Ajoute la prise en charge de CalDAV Ã  Evolution."
 msgid "CalDAV Support"
 msgstr "Support CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:116
 msgid "_Customize options"
 msgstr "Options de _personnalisation"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:135
 msgid "File _name:"
 msgstr "_Nom du fichierÂ :"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:139
 msgid "Choose calendar file"
 msgstr "Choisissez un fichier de calendrier"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:187
 msgid "On open"
 msgstr "Ã? l'ouverture"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:188
 msgid "On file change"
 msgstr "Ã? la modification du fichier"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:189
 msgid "Periodically"
 msgstr "PÃ©riodiquement"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:204
 msgid "Force read _only"
 msgstr "_Forcer la lecture seule"
 
@@ -17084,26 +16499,26 @@ msgstr "MÃ©tÃ©oÂ : nuit claire"
 msgid "Weather: Thunderstorms"
 msgstr "MÃ©tÃ©oÂ : orages "
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "SÃ©lectionnez un emplacement"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_UnitÃ©sÂ :"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MÃ©trique (Celsius, cm, etc)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Anglo-saxon (Farenheit, pouces, etc)"
 
@@ -17229,12 +16644,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Aucun"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_En-tÃªte personnalisÃ©"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:896
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17242,12 +16657,12 @@ msgstr ""
 "Le format de dÃ©finition d'une valeur de clÃ© d'en-tÃªte personnalisÃ© estÂ :\n"
 "Nom de l'en-tÃªte personnalisÃ© puis clÃ© et valeurs, sÃ©parÃ©es par Â«Â ;Â Â»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:950
 msgid "Key"
 msgstr "ClÃ©"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:961
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Valeurs"
 
@@ -17271,7 +16686,7 @@ msgstr ""
 "de courriel"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Automatically launch when a new mail is edited"
 msgstr "Lancer automatiquement lorsqu'un nouveau courriel est Ã©ditÃ©"
 
@@ -17283,11 +16698,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:108
+#: ../plugins/external-editor/external-editor.c:107
 msgid "Command to be executed to launch the editor: "
 msgstr "Commande Ã  exÃ©cuter pour lancer l'Ã©diteurÂ : "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:108
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -17295,8 +16710,8 @@ msgstr ""
 "Pour Emacs, saisissez Â«Â xemacsÂ Â»\n"
 "pour VI, saisissez Â«Â gvim -fÂ Â»"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:374
+#: ../plugins/external-editor/external-editor.c:376
 msgid "Compose in External Editor"
 msgstr "Ã?dition dans un Ã©diteur externe"
 
@@ -17436,8 +16851,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:718
+#: ../plugins/mail-to-task/mail-to-task.c:934
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
@@ -17457,7 +16872,7 @@ msgstr "Ajoute des calendriers Google Ã  Evolution."
 msgid "Google Calendars"
 msgstr "Calendriers Google"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Liste de contrÃ´le"
 
@@ -17489,12 +16904,12 @@ msgstr "Accepter provisoirement"
 msgid "Rese_nd Meeting..."
 msgstr "Re_nvoyer la rÃ©union..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:167
+#: ../plugins/groupwise-features/share-folder-common.c:347
 msgid "Create folder"
 msgstr "CrÃ©ation d'un dossier"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -17519,19 +16934,19 @@ msgstr ""
 "Cliquez sur Â«Â AppliquerÂ Â» pour installer le dossier partagÃ©\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:231
 msgid "Install the shared folder"
 msgstr "Installer le dossier partagÃ©"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:235
 msgid "Shared Folder Installation"
 msgstr "Installation du dossier partagÃ©"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "ParamÃ¨tres du pourriel"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../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"
@@ -17567,7 +16982,7 @@ msgstr "_Enlever"
 msgid "Message Retract"
 msgstr "RÃ©tractation du message"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../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?"
@@ -17575,7 +16990,7 @@ 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:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Message rÃ©tractÃ© avec succÃ¨s"
 
@@ -17786,47 +17201,53 @@ msgstr "<b>Nom du compte</b>"
 msgid "Proxy Login"
 msgstr "Nom de connexion du mandataire"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../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:692
+#: ../plugins/groupwise-features/proxy.c:690
 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:698
+#: ../plugins/groupwise-features/proxy.c:696
 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."
 
-#: ../plugins/groupwise-features/proxy.c:931
+#. 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:701
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Mandataire"
+
+#: ../plugins/groupwise-features/proxy.c:929
 #: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "Ajouter un utilisateur"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Options d'envoi avancÃ©es"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder-common.c:313
 #: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:314
 msgid "Enter the users and set permissions"
 msgstr "Saisissez les utilisateurs et rÃ©glez les permissions"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:412
 msgid "Sharing"
 msgstr "Partage"
 
@@ -17838,63 +17259,55 @@ msgstr "Notification personnalisÃ©e"
 msgid "Add   "
 msgstr "Ajouter"
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Ã?tat du message"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "SujetÂ :"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "DeÂ :"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Date de crÃ©ationÂ :"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "DestinataireÂ : "
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "DistribuÃ©Â : "
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "OuvertÂ : "
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "AcceptÃ©Â : "
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "SupprimÃ©Â : "
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "RefusÃ©Â : "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "TerminÃ©Â : "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Non distribuÃ©Â : "
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Ajoute la prise en charge de Hula Ã  Evolution."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Support Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "IntÃ©gration des images"
@@ -17903,12 +17316,12 @@ msgstr "IntÃ©gration des images"
 msgid "View image attachments directly in mail messages."
 msgstr "Affiche les images en piÃ¨ces jointes directement dans les courriels."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:325
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "En-tÃªtes personnalisÃ©s"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:338
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "En-tÃªtes IMAP"
@@ -17956,144 +17369,144 @@ msgstr "Ajuste vos comptes IMAP."
 msgid "IMAP Features"
 msgstr "FonctionnalitÃ©s IMAP"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#: ../plugins/itip-formatter/itip-formatter.c:475
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Impossible de charger le calendrier Â«Â %sÂ Â»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:641
 #, 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:688
+#: ../plugins/itip-formatter/itip-formatter.c:677
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Rendez-vous trouvÃ© dans le calendrier Â«Â %sÂ Â»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:776
 msgid "Unable to find any calendars"
 msgstr "Impossible de trouver un calendrier"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:783
 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:798
+#: ../plugins/itip-formatter/itip-formatter.c:787
 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:802
+#: ../plugins/itip-formatter/itip-formatter.c:791
 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:873
+#: ../plugins/itip-formatter/itip-formatter.c:862
 msgid "Opening the calendar. Please wait.."
 msgstr "Ouverture du calendrier. Veuillez patienter..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:865
 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:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1046
 msgid "Unable to parse item"
 msgstr "Impossible d'analyser le contenu de l'Ã©lÃ©ment"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1133
 #, 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:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1145
 #, 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:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1149
 #, 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:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1154
 #, 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:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1159
 #, 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:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1253
 #, 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:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Envoie un avis d'annulation Ã  la dÃ©lÃ©gation"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1262
 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:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1373
 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:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1402
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Impossible de mettre Ã  jour le participant. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1406
 msgid "Attendee status updated"
 msgstr "Ã?tat du participant mis Ã  jour"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "Meeting information sent"
 msgstr "Les informations de la rÃ©union ont Ã©tÃ© envoyÃ©es"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1435
 msgid "Task information sent"
 msgstr "Les informations de la tÃ¢che ont Ã©tÃ© envoyÃ©es"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1438
 msgid "Memo information sent"
 msgstr "Les informations du mÃ©mo ont Ã©tÃ© envoyÃ©es"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1447
 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:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1450
 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:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 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:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1518
 msgid "calendar.ics"
 msgstr "calendrier.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1523
 msgid "Save Calendar"
 msgstr "Enregistrer le calendrier"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1576
 #: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
 msgid "The calendar attached is not valid"
 msgstr "Le calendrier joint n'est pas valide"
 
+#: ../plugins/itip-formatter/itip-formatter.c:1577
 #: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18101,15 +17514,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:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 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:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1657
+#: ../plugins/itip-formatter/itip-formatter.c:1763
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18117,11 +17530,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:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid "The calendar attached contains multiple items"
 msgstr "Le calendrier joint contient des Ã©lÃ©ments multiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1671
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18129,222 +17542,222 @@ msgstr ""
 "Pour traiter tous ces Ã©lÃ©ments, le fichier devra Ãªtre enregistrÃ© et le "
 "calendrier importÃ©"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2436
 msgid "This meeting recurs"
 msgstr "Cette rÃ©union est rÃ©currente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2439
 msgid "This task recurs"
 msgstr "Cette tÃ¢che est rÃ©currente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2442
 msgid "This memo recurs"
 msgstr "Ce mÃ©mo est rÃ©current"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 msgid "_Delete message after acting"
 msgstr "_Supprimer le message aprÃ¨s intervention"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2686
+#: ../plugins/itip-formatter/itip-formatter.c:2719
 msgid "Conflict Search"
 msgstr "Recherche de conflit"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2701
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "SÃ©lectionnez les calendriers oÃ¹ chercher les conflits de rÃ©unions"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Aujourd'hui %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Aujourd'hui %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Aujourd'hui %I:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Demain %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Demain %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Demain %I:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Demain %I:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %I:%M %p"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %I:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A %e %B"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A %e %B, %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A %e %B, %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A %e %B, %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A %e %B, %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A %e %B %Y"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A %e %B %Y, %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A %e %B %Y, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A %e %B %Y, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A %e %B %Y, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "Veuillez rÃ©pondre par dÃ©lÃ©gation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:353
+#: ../plugins/itip-formatter/itip-view.c:441
+#: ../plugins/itip-formatter/itip-view.c:528
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "ReÃ§u par dÃ©lÃ©gation de <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a publiÃ© les informations de la rÃ©union "
 "suivantesÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> a publiÃ© les informations de la rÃ©union suivantesÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:365
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> vous a dÃ©lÃ©guÃ© la rÃ©union suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s demande votre prÃ©sence Ã  la rÃ©union "
 "suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> demande votre prÃ©sence Ã  la rÃ©union suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s souhaite Ãªtre intÃ©grÃ© Ã  une rÃ©union "
 "existanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> souhaite Ãªtre intÃ©grÃ© Ã  une rÃ©union existanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18353,7 +17766,7 @@ msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s souhaite recevoir les derniÃ¨res "
 "informations pour la rÃ©union suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -18361,90 +17774,90 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les derniÃ¨res informations pour la rÃ©union "
 "suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a envoyÃ© la rÃ©ponse Ã  une rÃ©union "
 "suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:390
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> a envoyÃ© la rÃ©ponse Ã  une rÃ©union suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> par l'intermÃ©diaire de %s a annulÃ© la rÃ©union suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> a annulÃ© la rÃ©union suivante."
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a proposÃ© les changements suivants Ã  la "
 "rÃ©union."
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> a proposÃ© les changements suivants Ã  la rÃ©union."
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a refusÃ© les changements suivants Ã  la "
 "rÃ©unionÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> a refusÃ© les changements suivants de la rÃ©union."
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> par l'intermÃ©diaire de %s a publiÃ© les tÃ¢ches suivantesÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> a publiÃ© la tÃ¢che suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> demande l'attribution Ã  %s de la tÃ¢che suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> par l'intermÃ©diaire de %s vous a attribuÃ© une tÃ¢cheÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:458
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> vous a attribuÃ© une tÃ¢cheÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s souhaite Ãªtre intÃ©grÃ© Ã  une tÃ¢che "
 "existanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> souhaite Ãªtre intÃ©grÃ© Ã  une tÃ¢che existanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
@@ -18453,7 +17866,7 @@ msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s souhaite recevoir les derniÃ¨res "
 "informations pour l'attribution de tÃ¢che suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
@@ -18462,7 +17875,7 @@ msgstr ""
 "<b>%s</b> souhaite recevoir les derniÃ¨res informations pour l'attribution de "
 "tÃ¢che suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
@@ -18470,23 +17883,23 @@ msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a renvoyÃ© une rÃ©ponse Ã  la tÃ¢che "
 "attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:478
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> a renvoyÃ© une rÃ©ponse Ã  la tÃ¢che attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a annulÃ© la tÃ¢che attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> a annulÃ© la tÃ¢che attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
@@ -18494,168 +17907,168 @@ msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a proposÃ© les changements suivants Ã  "
 "l'attribution de tÃ¢cheÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 "<b>%s</b> a proposÃ© les changements suivants Ã  l'attribution de tÃ¢cheÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s a refusÃ© la tÃ¢che attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> a refusÃ© la tÃ¢che attribuÃ©e suivanteÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:533
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> par l'intermÃ©diaire de %s a publiÃ© le mÃ©mo suivantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> a publiÃ© le mÃ©mo suivantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:540
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr ""
 "<b>%s</b> par l'intermÃ©diaire de %s souhaite Ãªtre intÃ©grÃ© Ã  mÃ©mo existantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> souhaite Ãªtre intÃ©grÃ© Ã  un mÃ©mo existantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> par l'intermÃ©diaire de %s a annulÃ© le mÃ©mo partagÃ© suivantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> a annulÃ© le mÃ©mo partagÃ© suivantÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:672
 msgid "All day:"
 msgstr "JournÃ©e entiÃ¨reÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "Jour de dÃ©partÂ :"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:682
+#: ../plugins/itip-formatter/itip-view.c:1037
 msgid "Start time:"
 msgstr "Heure de dÃ©butÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:694
 msgid "End day:"
 msgstr "Jour de finÂ :"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:694
+#: ../plugins/itip-formatter/itip-view.c:1048
 msgid "End time:"
 msgstr "Heure de finÂ :"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:827
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
+#: ../plugins/itip-formatter/itip-view.c:833
 #: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:865
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "_Accepter"
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:867
+msgid "A_ccept"
+msgstr "A_ccepter"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:837
 msgid "_Decline all"
 msgstr "Tout _refuser"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:838
 msgid "_Tentative all"
 msgstr "Tout _provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Tentative"
 msgstr "_Provisoire"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:839
+msgid "A_ccept all"
 msgstr "Tout _accepter"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Send Information"
 msgstr "_Envoyer l'information"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Update Attendee Status"
 msgstr "Mettre Ã  jo_ur l'Ã©tat du participant"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:857
 msgid "_Update"
 msgstr "_Mettre Ã  jour"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1068
+#: ../plugins/itip-formatter/itip-view.c:1122
 msgid "Comment:"
 msgstr "CommentaireÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1107
 msgid "Send _reply to sender"
 msgstr "RÃ©_pondre Ã  l'expÃ©diteur"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1137
 msgid "Send _updates to attendees"
 msgstr "Envoyer des _mises Ã  jour aux participants"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1146
 msgid "_Apply to all instances"
 msgstr "_Appliquer Ã  toutes les occurrences"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1155
 msgid "Show time as _free"
 msgstr "Afficher la pÃ©riode comme _libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1158
 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:1172
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "_Inherit reminder"
 msgstr "Rappel hÃ©r_itÃ©"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1907
 msgid "_Tasks:"
 msgstr "_TÃ¢chesÂ :"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Memos:"
 msgstr "_MÃ©mosÂ :"
 
@@ -18774,16 +18187,16 @@ 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:344
+#: ../plugins/mail-notification/mail-notification.c:343
 msgid "Evolution's Mail Notification"
 msgstr "Notification de courriel d'Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:365
 msgid "Mail Notification Properties"
 msgstr "PropriÃ©tÃ©s des notifications de courriel"
 
 #. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:496
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18799,66 +18212,66 @@ msgstr[1] ""
 "dans %s."
 
 #. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:507
 #, c-format
 msgid "From: %s"
 msgstr "DeÂ : %s"
 
 #. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#: ../plugins/mail-notification/mail-notification.c:519
 #, c-format
 msgid "Subject: %s"
 msgstr "SujetÂ : %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:528
 #, 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."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:546
+#: ../plugins/mail-notification/mail-notification.c:551
 msgid "New email"
 msgstr "Nouveau courriel"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:605
 msgid "Show icon in _notification area"
 msgstr "Afficher une icÃ´ne dans la zone de _notification"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:633
 msgid "B_link icon in notification area"
 msgstr "IcÃ´ne c_lignotante dans la zone de notification"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:643
 msgid "Popup _message together with the icon"
 msgstr "_Message contextuel avec l'icÃ´ne"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:828
 msgid "_Play sound when new messages arrive"
 msgstr "_Jouer un son Ã  la rÃ©ception d'un nouveau message"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:857
 msgid "_Beep"
 msgstr "_Bip"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:870
 msgid "Use sound _theme"
 msgstr "Utiliser le _thÃ¨me sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:889
 msgid "Play _file:"
 msgstr "Jouer le f_ichierÂ :"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:900
 msgid "Select sound file"
 msgstr "SÃ©lection d'un fichier sonore"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:958
 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:966
+#: ../plugins/mail-notification/mail-notification.c:967
 msgid "Generate a _D-Bus message"
 msgstr "GÃ©nÃ©rer un message _D-Bus"
 
@@ -18871,12 +18284,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:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, 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:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18885,7 +18298,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:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18894,7 +18307,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:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18903,7 +18316,7 @@ msgstr ""
 "La liste de mÃ©mos sÃ©lectionnÃ©e contient dÃ©jÃ  le mÃ©mo Â«Â %sÂ Â». Voulez-vous "
 "modifier le mÃ©mo existantÂ ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#: ../plugins/mail-to-task/mail-to-task.c:512
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18911,7 +18324,7 @@ 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Â ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#: ../plugins/mail-to-task/mail-to-task.c:515
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18919,7 +18332,7 @@ 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Â ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#: ../plugins/mail-to-task/mail-to-task.c:518
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18927,7 +18340,7 @@ 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Â ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#: ../plugins/mail-to-task/mail-to-task.c:536
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18941,7 +18354,7 @@ 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Â ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#: ../plugins/mail-to-task/mail-to-task.c:542
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18955,7 +18368,7 @@ 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Â ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#: ../plugins/mail-to-task/mail-to-task.c:548
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18969,25 +18382,25 @@ 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:614
+#: ../plugins/mail-to-task/mail-to-task.c:607
 msgid "[No Summary]"
 msgstr "[Aucun rÃ©sumÃ©]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:618
 msgid "Invalid object returned from a server"
 msgstr "Objet non valide renvoyÃ© par un serveur"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:689
 #, 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:725
+#: ../plugins/mail-to-task/mail-to-task.c:718
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Impossible d'ouvrir le calendrier. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:725
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18995,7 +18408,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:735
+#: ../plugins/mail-to-task/mail-to-task.c:728
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19003,7 +18416,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:738
+#: ../plugins/mail-to-task/mail-to-task.c:731
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19011,40 +18424,40 @@ 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:941
+#: ../plugins/mail-to-task/mail-to-task.c:934
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Impossible d'obtenir la liste source. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1053
 msgid "Create an _Event"
 msgstr "CrÃ©er un Ã©_vÃ©nement"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1055
 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:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create a Mem_o"
 msgstr "CrÃ©er un mÃ©m_o"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 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:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a _Task"
 msgstr "CrÃ©er une _tÃ¢che"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 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:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a _Meeting"
 msgstr "CrÃ©er une _rÃ©union"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1079
 msgid "Create a new meeting from the selected message"
 msgstr "CrÃ©e une nouvelle rÃ©union Ã  partir du message sÃ©lectionnÃ©"
 
@@ -19052,61 +18465,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:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
 msgid "Get List _Archive"
 msgstr "RÃ©cupÃ©rer l'_archive de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:281
 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:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Usage Information"
 msgstr "RÃ©cupÃ©rer les informations d'_utilisation de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 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:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Contact List _Owner"
 msgstr "_PropriÃ©taire de la liste de contacts"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 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:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "_Post Message to List"
 msgstr "_Envoyer un message Ã  la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 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:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Subscribe to List"
 msgstr "S'_abonner Ã  la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 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:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Unsubscribe from List"
 msgstr "Se _dÃ©sabonner de la liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 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:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Mailing _List"
 msgstr "_Liste de diffusion"
 
@@ -19201,11 +18614,11 @@ msgstr "Ã?_diter le message"
 msgid "_Send message"
 msgstr "_Envoyer le message"
 
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:41
 msgid "Also mark messages in subfolders?"
 msgstr "Marquer aussi les messages dans les sous-dossiersÂ ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -19282,19 +18695,19 @@ msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 "Afficher les messages en texte simple, mÃªme s'ils contiennent de l'HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Afficher au format HTML si prÃ©sent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Laisser Evolution choisir la meilleure partie Ã  afficher."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Afficher au format texte si prÃ©sent"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19302,11 +18715,11 @@ msgstr ""
 "Afficher le contenu en texte simple, s'il existe, sinon laisser Evolution "
 "choisir la meilleure partie Ã  afficher."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Toujours afficher au format texte simple"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19314,11 +18727,11 @@ msgstr ""
 "Toujours afficher le texte simple et transformer les autres parties en "
 "piÃ¨ces jointes, si souhaitÃ©."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Afficher les parties HTML s_upprimÃ©es comme piÃ¨ces jointes"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "_Mode HTML"
 
@@ -19344,31 +18757,35 @@ msgstr "Importation Outlook PST"
 msgid "Outlook personal folders (.pst)"
 msgstr "Dossiers personnels Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:296
 msgid "_Mail"
 msgstr "_Courriel"
 
+#: ../plugins/pst-import/pst-importer.c:308
+msgid "Destination folder:"
+msgstr "Dossier de destinationÂ :"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:314
 msgid "_Address Book"
 msgstr "C_arnet d'adresses"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:321
 msgid "A_ppointments"
 msgstr "Ren_dez-vous"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:327 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_TÃ¢ches"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:333
 msgid "_Journal entries"
 msgstr "EntrÃ©es de _journal"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "Importing Outlook data"
 msgstr "Importation des donnÃ©es Outlook"
 
@@ -19527,55 +18944,55 @@ 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:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Nouvel emplacement"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Modifier l'emplacement"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:120
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin non trouvÃ©, codeÂ : %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
 #, 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:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:175
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Erreur aprÃ¨s le clonageÂ : %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:230
 #, 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:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, 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:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, 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:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:504
 #, 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:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:924
 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:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:932
 msgid "I_nclude remote tests"
 msgstr "I_nclure les tests distants"
 
@@ -19756,11 +19173,11 @@ msgstr "De %sÂ :"
 msgid "Importing files"
 msgstr "Importation de fichiers"
 
-#: ../plugins/startup-wizard/startup-wizard.c:248
+#: ../plugins/startup-wizard/startup-wizard.c:251
 msgid "Importing data."
 msgstr "Importation des donnÃ©es."
 
-#: ../plugins/startup-wizard/startup-wizard.c:250
+#: ../plugins/startup-wizard/startup-wizard.c:257
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -19793,15 +19210,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Greffon de modÃ¨les basÃ©s sur des brouillons"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:613
 msgid "No Title"
 msgstr "Sans titre"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:684
 msgid "Save as _Template"
 msgstr "Enregistrer comme _modÃ¨le"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:686
 msgid "Save as Template"
 msgstr "Enregistre comme modÃ¨le"
 
@@ -19821,27 +19238,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:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:157
+#: ../plugins/vcard-inline/vcard-inline.c:242
 msgid "Show Full vCard"
 msgstr "Afficher tous les champs de la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:160
 msgid "Show Compact vCard"
 msgstr "Afficher partiellement la vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:221
 msgid "There is one other contact."
 msgstr "Il existe un autre contact."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:230
 #, 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:254
+#: ../plugins/vcard-inline/vcard-inline.c:251
 msgid "Save in Address Book"
 msgstr "Enregistrer dans le carnet d'adresses"
 
@@ -20031,7 +19448,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:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:305
 msgid "Start in offline mode"
 msgstr "DÃ©marrer en mode hors ligne"
 
@@ -20194,149 +19611,46 @@ 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:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:502 ../shell/e-shell-content.c:503
 msgid "Searches"
 msgstr "Recherches"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:545
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld Kio"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * 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:883
+#: ../shell/e-shell-searchbar.c:918
 msgid "Sho_w:"
 msgstr "_AfficherÂ :"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:949
 msgid "Sear_ch:"
 msgstr "_RechercherÂ :"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1010
 msgid "i_n"
 msgstr "_dans "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Style de la barre d'outils"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Le style de la barre d'outils du sÃ©lecteur"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Barre d'outils visible"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Indique si le sÃ©lecteur est visible"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Tous les fichiers (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Action du sÃ©lecteur"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "L'action du sÃ©lecteur pour cette vue du shell"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "NumÃ©ro de page"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Le numÃ©ro de page de l'onglet de la vue shell"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "RÃ¨gle de recherche"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "CritÃ¨res pour les rÃ©sultats de la recherche actuelle"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "Le EShellBackend pour cette vue shell"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Composant graphique de contenu du shell"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-"Le composant graphique de contenu apparaÃ®t dans le panneau de droite d'une "
-"fenÃªtre de shell"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Composant graphique du panneau latÃ©ral du shell"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-"Le composant graphique du panneau latÃ©ral apparaÃ®t dans le panneau de gauche "
-"d'une fenÃªtre de shell"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Composant graphique barre des tÃ¢ches du shell"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-"Le composant graphique barre des tÃ¢ches apparaÃ®t en bas d'une fenÃªtre de "
-"shell"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "FenÃªtre du shell"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "La fenÃªtre Ã  laquelle la vue shell appartient"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "Le fichier clÃ© contenant les donnÃ©es d'Ã©tat du widget"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Le titre de la vue shell"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ID de la vue actuelle"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "L'ID de la vue GAL actuelle"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -20367,407 +19681,319 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Site Web d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy n'est pas installÃ©."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Bug Buddy could not be run."
 msgstr "Bug Buddy ne peut pas Ãªtre exÃ©cutÃ©."
 
-#: ../shell/e-shell-window-actions.c:1343
+#: ../shell/e-shell-window-actions.c:1347
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot n'est pas installÃ©."
 
-#: ../shell/e-shell-window-actions.c:1345
+#: ../shell/e-shell-window-actions.c:1349
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot ne peut pas Ãªtre exÃ©cutÃ©."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1443
 msgid "Show information about Evolution"
 msgstr "Affiche les informations concernant Evolution"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1448
 msgid "_Close Window"
 msgstr "_Fermer la fenÃªtre"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1455
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1457
 msgid "Open the Evolution User Guide"
 msgstr "Ouvre le manuel d'utilisation d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Evolution _FAQ"
 msgstr "_FAQ d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ouvre la page Web de la Foire aux questions"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1490
 msgid "_Forget Passwords"
 msgstr "O_ublier les mots de passe"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1492
 msgid "Forget all remembered passwords"
 msgstr "Oublie tous les mots de passe mÃ©morisÃ©s"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1497
 msgid "I_mport..."
 msgstr "I_mporter..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Import data from other programs"
 msgstr "Importe les donnÃ©es d'autres programmes"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1504
 msgid "New _Window"
 msgstr "Nouvelle _fenÃªtre"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1506
 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:1516
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Configure Evolution"
 msgstr "Configurer Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Quick Reference"
 msgstr "_RÃ©fÃ©rence rapide"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Show Evolution's shortcut keys"
 msgstr "Affiche les raccourcis clavier d'Evolution"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Advanced Search..."
 msgstr "Recherche _avancÃ©e..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Construct a more advanced search"
 msgstr "Construit une recherche plus Ã©laborÃ©e"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Clear the current search parameters"
 msgstr "Efface les paramÃ¨tres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1553
 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:1551
+#: ../shell/e-shell-window-actions.c:1555
 msgid "Manage your saved searches"
 msgstr "GÃ©rer vos recherches enregistrÃ©es"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Click here to change the search type"
 msgstr "Cliquez ici pour modifier le type de recherche"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Execute the current search parameters"
 msgstr "Applique les paramÃ¨tres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Save Search..."
 msgstr "Enre_gistrer la recherche..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Save the current search parameters"
 msgstr "Enregistre les paramÃ¨tres de recherche actuels"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Send / _Receive"
 msgstr "Envoyer / _Recevoir"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1590
 msgid "Send queued items and retrieve new items"
 msgstr "Envoie les courriels en attente et rÃ©cupÃ¨re les nouveaux"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit _Bug Report..."
 msgstr "Soumettre un _rapport d'anomalie..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1597
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumet un rapport d'anomalie en utilisant Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1602
 msgid "GNOME Pilot _Synchronization..."
 msgstr "_Synchronisation de GNOME Pilot..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Set up GNOME Pilot configuration"
 msgstr "Configuration de GNOME Pilot"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1611
 msgid "Put Evolution into offline mode"
 msgstr "Bascule Evolution en mode hors ligne"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1618
 msgid "Put Evolution into online mode"
 msgstr "Bascule Evolution en mode en ligne"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Lay_out"
 msgstr "_Agencement"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1653
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1660
 msgid "_Search"
 msgstr "_Recherche"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1667
 msgid "_Switcher Appearance"
 msgstr "A_pparence du sÃ©lecteur"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1681
 msgid "_Window"
 msgstr "_FenÃªtre"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show Side _Bar"
 msgstr "Afficher la barre _latÃ©rale"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1712
 msgid "Show the side bar"
 msgstr "Affiche la barre latÃ©rale"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show _Buttons"
 msgstr "Afficher les b_outons"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1720
 msgid "Show the switcher buttons"
 msgstr "Affiche les boutons du sÃ©lecteur"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1726
 msgid "Show _Status Bar"
 msgstr "Afficher la _barre d'Ã©tat"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Show the status bar"
 msgstr "Affiche la barre d'Ã©tat"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1734
 msgid "Show _Tool Bar"
 msgstr "Afficher la barre d'ou_tils"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1736
 msgid "Show the tool bar"
 msgstr "Affiche la barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1758
 msgid "_Icons Only"
 msgstr "_IcÃ´nes uniquement"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1760
 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:1761
+#: ../shell/e-shell-window-actions.c:1765
 msgid "_Text Only"
 msgstr "_Texte uniquement"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1767
 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:1768
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Icons _and Text"
 msgstr "IcÃ´nes _et texte"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1774
 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:1775
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Tool_bar Style"
 msgstr "Style de la _barre d'outils"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1781
 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:1785
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Define Views..."
 msgstr "DÃ©finir les vues..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1791
 msgid "Create or edit views"
 msgstr "CrÃ©e ou Ã©dite des vues"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1796
 msgid "Save Custom View..."
 msgstr "Enregistrer la vue personnalisÃ©e..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Save current custom view"
 msgstr "Enregistrer la vue personnalisÃ©e actuelle"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1805
 msgid "C_urrent View"
 msgstr "Vue co_urante"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1815
 msgid "Custom View"
 msgstr "Vue personnalisÃ©e"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1817
 msgid "Current view is a customized view"
 msgstr "La vue actuelle est une vue personnalisÃ©e"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1827
 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:2200
+#: ../shell/e-shell-window-actions.c:2204
 #, c-format
 msgid "Switch to %s"
 msgstr "Change pour %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2417
 msgid "Execute these search parameters"
 msgstr "ExÃ©cuter ces paramÃ¨tres de recherche"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:573
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:382
 msgid "New"
 msgstr "Nouveau"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Vue active du shell"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Nom de la vue active du shell"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "Le EFocusTracker de la fenÃªtre shell"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "GÃ©omÃ©trie"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "ChaÃ®ne de la gÃ©omÃ©trie initiale de la fenÃªtre"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Mode sÃ©curisÃ©"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Indique si la fenÃªtre du shell est en mode sÃ©curisÃ©"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Le panneau latÃ©ral est visible"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Indique si le panneau latÃ©ral de la fenÃªtre du shell est visible"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Le sÃ©lecteur est visible"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Indique si les boutons du sÃ©lecteur de fenÃªtre shell sont visibles"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Barre des tÃ¢ches visible"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Indique si la barre des tÃ¢ches de la fenÃªtre de shell est visible"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Indique si la barre d'outils de la fenÃªtre shell est visible"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Gestionnaire d'interface"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "Le GtkUIManager de la fenÃªtre shell"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:218
 msgid "Preparing to go offline..."
 msgstr "PrÃ©paration Ã  la mise hors ligne..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:268
 msgid "Preparing to go online..."
 msgstr "PrÃ©paration Ã  la mise en ligne..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:336
 msgid "Preparing to quit..."
 msgstr "PrÃ©paration de l'arrÃªt..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "RÃ©pertoire du module"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Le rÃ©pertoire permettant de charger EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "RÃ©seau disponible"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Indique si le rÃ©seau est disponible"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "En ligne"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Indique si le shell est en ligne"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:164
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20806,7 +20032,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:192
+#: ../shell/main.c:188
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20814,60 +20040,56 @@ msgstr ""
 "Merci,\n"
 "L'Ã©quipe d'Evolution\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:301
 msgid "Start Evolution activating the specified component"
 msgstr "DÃ©marre Evolution en activant le composant indiquÃ©"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:303
 msgid "Apply the given geometry to the main window"
 msgstr "Applique la gÃ©omÃ©trie indiquÃ©e Ã  la fenÃªtre principale"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:307
 msgid "Start in online mode"
 msgstr "DÃ©marre en mode connectÃ©"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:309
 msgid "Start in \"express\" mode"
 msgstr "DÃ©marre en mode Â«Â expressÂ Â»"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:312
 msgid "Forcibly shut down Evolution"
 msgstr "Force l'arrÃªt d'Evolution"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Force la remigration depuis Evolution 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:315
 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:342
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "DÃ©sactive le chargement des greffons."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "DÃ©sactive l'aperÃ§u des courriels, contacts et tÃ¢ches."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:323
 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:350
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Demande Ã  un processus d'Evolution en cours d'exÃ©cution de quitter"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:440
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Le client de messagerie et l'agenda Evolution"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:466
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20881,99 +20103,44 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Voulez-vous vraiment oublier tous les mots de passe mÃ©morisÃ©sÂ ?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Continuer"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Impossible de mettre Ã  jour directement depuis la version {0}"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Supprimer les anciennes donnÃ©es de la version {0}Â ?"
+msgid "Continue Anyway"
+msgstr "Continuer quand mÃªme"
 
 #: ../shell/shell.error.xml.h:4
 msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+"Evolution ne prend plus en charge la mise Ã  jour directe depuis la version "
+"{0}. Vous pouvez cependant tenter de faire d'abord une mise Ã  jour vers "
+"Evolution 2, puis une mise Ã  jour vers Evolution 3."
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr ""
 "Oublier vos mots de passe effacera tous les mots de passe mÃ©morisÃ©s. Il vous "
 "sera demandÃ© de les ressaisir au besoin."
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Espace disque insuffisant pour la mise Ã  jour."
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Voulez-vous vraiment supprimer ces anciennes donnÃ©esÂ ?"
+msgid "Quit Now"
+msgstr "Quitter maintenant"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"Le contenu intÃ©gral du dossier Â«Â evolutionÂ Â» est sur le point d'Ãªtre "
-"dÃ©finitivement supprimÃ©.\n"
-"\n"
-"Il est conseillÃ© de vÃ©rifier manuellement que tous vos courriels, contacts "
-"et donnÃ©es de calendrier sont prÃ©sents, et que cette version d'Evolution "
-"fonctionne correctement avant de supprimer ces anciennes donnÃ©es.\n"
-"\n"
-"Une fois supprimÃ©s, vous ne pourrez pas revenir Ã  une version prÃ©cÃ©dente "
-"d'Evolution sans intervention manuelle.\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"La version prÃ©cÃ©dente d'Evolution stockait les donnÃ©es Ã  un emplacement "
-"diffÃ©rent.\n"
-"\n"
-"Si vous choisissez de supprimer ces donnÃ©es, le contenu intÃ©gral du dossier "
-"Â«Â evolutionÂ Â» sera dÃ©finitivement supprimÃ©. Si vous choisissez de conserver "
-"ces donnÃ©es, alors vous pourrez supprimer manuellement le contenu "
-"d'Â«Â evolutionÂ Â» Ã  votre convenance.\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "La mise Ã  jour depuis la version prÃ©cÃ©dente a Ã©chouÃ©Â :"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"Mettre Ã  jour vos donnÃ©es et vos paramÃ¨tres nÃ©cessite jusqu'Ã  {0} d'espace "
-"disque, mais vous disposez actuellement de seulement {1} disponibles.\n"
-"\n"
-"Vous devez libÃ©rer d'avantage d'espace dans votre dossier personnel avant de "
-"pouvoir continuer."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "_Oublier"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Conserver les donnÃ©es"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "Me _rappeler plus tard"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -21068,7 +20235,7 @@ msgstr "Options de gestion de sessionsÂ :"
 msgid "Show session management options"
 msgstr "Afficher les options de gestion de sessions"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21126,7 +20293,7 @@ msgstr "Nom de certificat"
 msgid "Purposes"
 msgstr "Sujets"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "NumÃ©ro de sÃ©rie"
@@ -21147,18 +20314,18 @@ msgstr "Adresse Ã©lectronique"
 msgid "All CA certificate files"
 msgstr "Tous les fichiers de certification CA"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:1052
 msgid "Certificates"
 msgstr "Certificats"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visionneur de certificatÂ : %s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Saisissez le mot de passe pour Â«Â %sÂ Â»"
 
 #. we're setting the password initially
@@ -21189,7 +20356,7 @@ msgstr ""
 "Ã?mis parÂ :\n"
 "   SujetÂ : %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "SÃ©lectionnez le certificat"
 
@@ -21202,14 +20369,10 @@ msgid "Authorities"
 msgstr "AutoritÃ©s"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Archiver"
+msgid "Backup _All"
+msgstr "Tout _archiver"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "Tout archiver"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21218,164 +20381,156 @@ 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:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "Certificat"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Approbation d'autoritÃ© de certification"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Champs du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "HiÃ©rarchie du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "DÃ©tails du certificat"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Table de certificats"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Nom commun (NC)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Certificats des contacts"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne pas faire confiance en l'authenticitÃ© de ce certificat"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Ã?diter"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "ParamÃ¨tres d'approbation du certificat de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Certificat de destinataire de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Certificat de signataire de courriel"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Expire le"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Valeur du champ"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Empreintes numÃ©riques"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Importer"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Ã?mis par"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Fourni le"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Ã?mis pour"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "Empreinte numÃ©rique MD5"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organisation (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "UnitÃ© d'organisation (UO)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "Empreinte numÃ©rique SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "Certificat de client SSL"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "Certificat de serveur SSL"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Ce certificat a Ã©tÃ© vÃ©rifiÃ© pour les usages suivantsÂ :"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Faire confiance en l'authenticitÃ© de ce certificat"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Faire confiance Ã  cette AC pour identifier les utilisateurs de courriel."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr ""
 "Faire confiance Ã  cette AC pour identifier les dÃ©veloppeurs de logiciel."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "Faire confiance Ã  cette AC pour identifier les sites Web."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "ValiditÃ©"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Affichage"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 "Vous possÃ©dez des certificats vous identifiant auprÃ¨s des organisations "
 "suivantesÂ :"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Vous possÃ©dez des fichiers certificats qui identifient les autoritÃ©s de "
 "certification suivantesÂ :"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 "Vous possÃ©dez des fichiers de certificats qui identifient les personnes "
 "suivantesÂ :"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Vos certificats"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "A_rchiver"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "M_odifier l'approbation CA"
 
@@ -21522,28 +20677,34 @@ msgstr "Non critique"
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../smime/lib/e-cert.c:1030
+#. 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:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithme de signature de certificat"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Ã?metteur"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "ID unique de l'Ã©metteur"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "ID unique du sujet"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1220
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
@@ -21633,11 +20794,11 @@ msgid "With _Status"
 msgstr "Avec l'Ã©_tat"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../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
 msgid "UTC"
 msgstr "UTC"
 
@@ -21667,19 +20828,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_SÃ©lection"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Collection"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:339
 #: ../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:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../widgets/menus/gal-define-views-dialog.c:349
 msgid "Define Views"
 msgstr "DÃ©finir les vues"
 
@@ -21692,11 +20848,7 @@ msgstr "DÃ©finir les vues pour Â«Â %sÂ Â»"
 msgid "Table"
 msgstr "Tableau"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Instance"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Enregistrement de la vue actuelle"
 
@@ -21708,12 +20860,7 @@ msgstr "_CrÃ©er une nouvelle vue"
 msgid "_Replace existing view"
 msgstr "_Remplacer la vue existante"
 
-# Usine ???
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Fabrique"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "DÃ©finir une nouvelle vue"
 
@@ -21741,14 +20888,6 @@ msgstr "Nom du compte"
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Action"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Une GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "PropriÃ©tÃ©s de la piÃ¨ce jointe"
@@ -21766,11 +20905,11 @@ msgstr "Type MIMEÂ :"
 msgid "_Suggest automatic display of attachment"
 msgstr "_SuggÃ©rer l'affichage automatique de la piÃ¨ce jointe"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Impossible de dÃ©finir comme arriÃ¨re-plan"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "DÃ©finir comme _arriÃ¨re-plan"
 
@@ -21803,13 +20942,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Masquer la barre des piÃ¨ces _jointes"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:636
 msgid "Show Attachment _Bar"
 msgstr "Afficher la barre des piÃ¨ces _jointes"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Afficher la barre des piÃ¨ces _jointes"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Ajouter une piÃ¨ce jointe"
@@ -21826,32 +20962,32 @@ msgstr[1] "Enregistrer les piÃ¨ces jointes"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
 msgid "attachment.dat"
 msgstr "piÃ¨cejointe.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:299
 msgid "S_ave All"
 msgstr "_Tout enregistrer"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:325
 msgid "A_dd Attachment..."
 msgstr "A_jouter une piÃ¨ce jointe..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:349
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:356
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:638
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Ouvrir dans Â«Â %sÂ Â»"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:641
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ouvrir cette piÃ¨ce jointe dans %s"
@@ -21860,59 +20996,59 @@ 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:1002
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Message joint"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2615
 msgid "A load operation is already in progress"
 msgstr "Un chargement est dÃ©jÃ  en cours"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2623
 msgid "A save operation is already in progress"
 msgstr "Un enregistrement est dÃ©jÃ  en cours"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1914
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Impossible de charger Â«Â %sÂ Â»"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1917
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Impossible de charger la piÃ¨ce jointe"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2193
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Impossible d'ouvrir Â«Â %sÂ Â»"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2196
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Impossible d'ouvrir la piÃ¨ce jointe"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2631
 msgid "Attachment contents not loaded"
 msgstr "Le contenu de la piÃ¨ce jointe n'est pas chargÃ©"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2707
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Impossible d'enregistrer Â«Â %sÂ Â»"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2710
 #, 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:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 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:1249
+#: ../widgets/misc/e-calendar-item.c:1254
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21920,66 +21056,6 @@ msgstr "%B %Y"
 msgid "Month Calendar"
 msgstr "Calendrier mensuel"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Couleur de remplissage"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "Couleur de remplissage GDK"
-
-# ??? stipple : mot inconnu
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Remplir le stipple"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Largeur minimale"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Largeur minimale"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Espacement"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Codage des caractÃ¨res"
@@ -21992,48 +21068,48 @@ msgstr "Saisissez le jeu de caractÃ¨res Ã  utiliser"
 msgid "Other..."
 msgstr "Autre..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Zone de saisie pour fixer la date"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Cliquez sur ce bouton pour afficher un calendrier"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Zone de liste dÃ©roulante de sÃ©lection de la date"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Maintenant"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "A_ujourd'hui"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Aucun"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Aucune"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Date non valide"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Heure non valide"
 
@@ -22132,11 +21208,11 @@ msgstr ""
 msgid "Import Data"
 msgstr "Importer les donnÃ©es"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Carte du monde"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22163,42 +21239,6 @@ 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-online-button.c:135
-msgid "The button state is online"
-msgstr "L'Ã©tat du bouton est en ligne"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Position horizontale"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Position du panneau lorsqu'il est disposÃ© horizontalement."
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Position verticale"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Position du panneau lorsqu'il est disposÃ© verticalement."
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Proportion"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Proportion de la taille du second panneau"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Redimensionnement fixe"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Conserver la taille du second panneau pendant un redimensionnement"
-
 #: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "Synchroniser avecÂ :"
@@ -22220,69 +21260,47 @@ msgstr "PrÃ©fÃ©rences d'Evolution"
 msgid "Matches: %d"
 msgstr "CorrespondÂ : %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Ferme la barre de recherche"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "_RechercherÂ :"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Efface la recherche"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_PrÃ©cÃ©dent"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Recherche l'occurrence prÃ©cÃ©dente de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Recherche la prochaine occurrence de la phrase"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Respecter la _casse"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 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:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Le dÃ©but de la page a Ã©tÃ© atteint, la recherche continue depuis la fin"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "RangÃ©e de curseurs"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Colonne de curseurs"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Trieur"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Mode de sÃ©lection"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Mode du curseur"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Si s_upprimÃ©Â :"
@@ -22355,43 +21373,46 @@ msgstr "Quand t_erminÃ©Â :"
 msgid "When decli_ned:"
 msgstr "Quand _refusÃ©Â :"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "_Dans"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_AprÃ¨sÂ :"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "_AprÃ¨s"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Toutes les informations"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_ClassificationÂ :"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Retarder la distribution du message"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_DistribuÃ©"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_DÃ©finir une date d'expiration"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Jusqu'auÂ :"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "_Jusqu'au"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "Quand cela vous _convient"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Quand ouvertÂ :"
 
@@ -22447,41 +21468,41 @@ 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:348
+#: ../widgets/misc/e-web-view.c:359
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:361
 msgid "Copy the link to the clipboard"
 msgstr "Copie le lien dans le presse-papiers"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:371
 msgid "Open the link in a web browser"
 msgstr "Ouvre le lien dans un navigateur Web"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Copy Email Address"
 msgstr "Copier l'_adresse Ã©lectronique"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1063
 msgid "Select all text and images"
 msgstr "SÃ©lectionne tout le texte et les images"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:840 ../widgets/misc/e-web-view.c:842
+#: ../widgets/misc/e-web-view.c:844
 #, c-format
 msgid "Click to call %s"
 msgstr "Cliquer pour appeler %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:846
 msgid "Click to hide/unhide addresses"
 msgstr "Cliquer pour masquer/afficher les adresses"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
@@ -22500,7 +21521,7 @@ msgstr "CalendrierÂ : du %s au %s"
 msgid "evolution calendar item"
 msgstr "Ã©lÃ©ment du calendrier d'Evolution"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "liste des popups"
 
@@ -22518,7 +21539,7 @@ msgstr "Aucune"
 msgid "OK"
 msgstr "Valider"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "La date doit Ãªtre dans le formatÂ : %s"
@@ -22527,48 +21548,12 @@ 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-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Colonne sÃ©lectionnÃ©e"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Colonne ayant le focus"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Colonne non sÃ©lectionnÃ©e"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Colonne barrÃ©e"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Colonne soulignÃ©e"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Colonne en gras"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Colonne en couleur"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Colonne de couleur d'arriÃ¨re-plan"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "cliquez pour ajouter"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Ã?tat"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Croissant)"
@@ -22585,12 +21570,12 @@ msgstr "Non triÃ©"
 msgid "No grouping"
 msgstr "Aucun groupement"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Afficher les champs"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Champs disponibles"
 
@@ -22599,7 +21584,7 @@ msgid "A_vailable Fields:"
 msgstr "Champs _disponiblesÂ :"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -22612,7 +21597,7 @@ msgid "Clear _All"
 msgstr "_Tout effacer"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1697
 msgid "Descending"
 msgstr "DÃ©croissant"
 
@@ -22672,7 +21657,7 @@ msgstr "_Afficher ces champs dans l'ordreÂ :"
 msgid "_Sort..."
 msgstr "_Trier..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Ajouter une colonne"
 
@@ -22684,248 +21669,112 @@ msgstr ""
 "Pour ajouter une colonne Ã  votre table, glissez-la\n"
 "Ã  l'emplacement oÃ¹ elle doit apparaÃ®tre."
 
-#: ../widgets/table/e-table-group-container.c:342
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. 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
 #, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%sÂ : %s (%d Ã©lÃ©ment)"
 msgstr[1] "%sÂ : %s (%d Ã©lÃ©ments)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, 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-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Couleurs de rangÃ©es alternatives"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Grille de dessin horizontal"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Grille de dessin vertical"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Dessiner le focus"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Mode du curseur"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "ModÃ¨le de sÃ©lection"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Longueur du seuil"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Hauteur de rangÃ©e uniforme"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "GelÃ©"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1541
 msgid "Customize Current View"
 msgstr "Personnaliser la vue en cours"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Sort _Ascending"
 msgstr "Tri _croissant"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1565
 msgid "Sort _Descending"
 msgstr "Tri _dÃ©croissant"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1568
 msgid "_Unsort"
 msgstr "_Ne pas trier"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1571
 msgid "Group By This _Field"
 msgstr "Grouper par ce _champ"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Group By _Box"
 msgstr "Grouper par _boÃ®te"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Remove This _Column"
 msgstr "Enlever cette c_olonne"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Add a C_olumn..."
 msgstr "_Ajouter une colonne..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "A_lignment"
 msgstr "A_lignement"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "B_est Fit"
 msgstr "_Meilleur ajustement"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1591
 msgid "Format Column_s..."
 msgstr "Format des colonne_s..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Custo_mize Current View..."
 msgstr "_Personnaliser la vue actuelle..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1654
 msgid "_Sort By"
 msgstr "_Trier par"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1672
 msgid "_Custom"
 msgstr "_Personnaliser"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "En-tÃªte de tableau"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "ModÃ¨le de tableau"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "RangÃ©e de curseurs"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Info de tri"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Toujours rechercher"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Utiliser le clic pour ajouter"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Espacement vertical des lignes"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Espacement vertical entre les lignes (au-dessus et au-dessous)"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "Adaptateur de table ETree"
-
-# ??? je ne comprends pas
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Rechercher en arriÃ¨re"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Dessiner les lignes et les icÃ´nes d'extension +/-."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Taille de l'icÃ´ne d'extension"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Taille de la flÃ¨che de l'icÃ´ne d'extension"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "popup"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "affiche un fils"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "modifier"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "commence la modification de cette cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "basculer"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "bascule la cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "Ã©tendre"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "Ã©tend la rangÃ©e du ETree contenant cette cellule"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "rÃ©duire"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "rÃ©duit la rangÃ©e du ETree contenant cette cellule"
 
@@ -22941,115 +21790,1024 @@ msgstr "clic"
 msgid "sort"
 msgstr "tri"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "Tout sÃ©lectionner"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "MÃ©thodes de saisie"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Processeur d'Ã©vÃ¨nements"
+#~ msgid "_Accept"
+#~ msgstr "_Accepter"
+
+#~ msgid "Edit"
+#~ msgstr "Ã?diter"
+
+#~ msgid "Import"
+#~ msgstr "Importer"
+
+#~ msgid "View"
+#~ msgstr "Affichage"
+
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Web Log:"
+#~ msgstr "Journal en ligneÂ :"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Journal en ligneÂ :"
+
+#~ msgid "Editable"
+#~ msgstr "Modifiable"
+
+#~ msgid "Source Book"
+#~ msgstr "Livre source"
+
+#~ msgid "Target Book"
+#~ msgstr "Livre cible"
+
+#~ msgid "Is New Contact"
+#~ msgstr "Nouveau contact"
+
+#~ msgid "Writable Fields"
+#~ msgstr "Champs modifiables"
+
+#~ msgid "Required Fields"
+#~ msgstr "Champs requis"
+
+#~ msgid "Changed"
+#~ msgstr "ModifiÃ©"
+
+#~ msgid "Shell"
+#~ msgstr "Shell"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "Le singleton EShell"
+
+#~ msgid "Book"
+#~ msgstr "Carnet"
+
+#~ msgid "Is New List"
+#~ msgstr "Est une nouvelle liste"
+
+#~ msgid "Query"
+#~ msgstr "RequÃªte"
+
+#~ msgid "Model"
+#~ msgstr "ModÃ¨le"
+
+#~ msgid "Shell View"
+#~ msgstr "Vue du shell"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "Width"
+#~ msgstr "Largeur"
+
+#~ msgid "Height"
+#~ msgstr "Hauteur"
+
+#~ msgid "Has Focus"
+#~ msgstr "A le focus"
+
+#~ msgid "Field"
+#~ msgstr "Champ"
+
+#~ msgid "Field Name"
+#~ msgstr "Nom du champ"
+
+#~ msgid "Text Model"
+#~ msgstr "ModÃ¨le de texte"
+
+#~ msgid "Max field name length"
+#~ msgstr "Longueur max. du nom du champ"
+
+#~ msgid "Column Width"
+#~ msgstr "Largeur des colonnes"
+
+#~ msgid "Adapter"
+#~ msgstr "Adaptateur"
+
+#~ msgid "Selected"
+#~ msgstr "SÃ©lectionnÃ©"
+
+#~ msgid "Has Cursor"
+#~ msgstr "A le curseur"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "Le dÃ©pÃ´t du calendrier est hors ligne."
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "Erreur sur Â«Â {0}Â Â»"
+
+#~ msgid "No response from the server."
+#~ msgstr "Le serveur ne rÃ©pond pas."
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "Impossible de charger le calendrier"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr ""
+#~ "Cochez cette case pour utiliser le fuseau horaire du systÃ¨me dans "
+#~ "Evolution."
+
+#~ msgid "Attendee_s..."
+#~ msgstr "Participant_s..."
+
+#~ msgid "Default Client"
+#~ msgstr "Client par dÃ©faut"
+
+#~ msgid "Shell Settings"
+#~ msgstr "ParamÃ¨tres du shell"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "ParamÃ¨tres gÃ©nÃ©raux de l'application"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "Par_ticipants..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "_SÃ©lectionner aujourd'hui"
+
+#~ msgid "New Tab"
+#~ msgstr "Nouvel onglet"
+
+#~ msgid "Name of the logger"
+#~ msgstr "Nom du composant de journalisation"
+
+#~ msgid "Filename"
+#~ msgstr "Nom de fichier"
+
+#~ msgid "The filename of the module"
+#~ msgstr "Le nom de fichier du module"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "Indique si le greffon est activÃ©"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "Suivi du focus"
+
+#~ msgid "Shell Module"
+#~ msgstr "Module shell"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "Le moteur shell de courriels"
+
+#~ msgid "Show Deleted"
+#~ msgstr "Afficher les suppressions"
+
+#~ msgid "To Do"
+#~ msgstr "Ã? faire"
+
+#~ msgid "Later"
+#~ msgstr "Plus tard"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "Impossible de crÃ©er le nouveau dossier Â«Â %sÂ Â»Â : %s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "Impossible de copier le dossierÂ Â«Â %sÂ Â» vers Â«Â %sÂ Â»Â : %s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr ""
+#~ "Impossible de rechercher les boÃ®tes Ã  lettres existant dans Â«Â %sÂ Â»Â : %s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "L'emplacement et la hiÃ©rarchie des dossiers des boÃ®tes Ã  lettres ont "
+#~ "changÃ© depuis Evolution 1.x.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr ""
+#~ "Impossible d'ouvrir les anciennes donnÃ©es POP conservÃ©es sur le serveur Â«Â %"
+#~ "sÂ Â»Â : %s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr ""
+#~ "Impossible de crÃ©er un dossier pour les donnÃ©es POP3 restÃ©es sur le "
+#~ "serveur Â«Â %sÂ Â»Â : %s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr ""
+#~ "Impossible de copier les donnÃ©es POP3 restÃ©es sur le serveur Â«Â %sÂ Â»Â Â : %s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr ""
+#~ "La crÃ©ation du dossier de stockage de courriel local Â«Â %sÂ Â» a Ã©chouÃ©Â : %s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "Impossible de lire les paramÃ¨tres de l'installation d'Evolution "
+#~ "prÃ©cÃ©dente, Â«Â evolution/config.xmldbÂ Â» n'existe pas ou est corrompu."
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr ""
+#~ "Permet Ã  Evolution d'afficher des extraits de texte d'une taille limitÃ©e"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "Activer l'affichage partiel du texte selon une limite de taille."
+
+#~ msgid "Text message part limit"
+#~ msgstr "Limite de la partie texte du message"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "Ã? cause de Â«Â {0}Â Â»."
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "Ã? cause de Â«Â {2}Â Â»."
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Les dossiers de recherche suivantsÂ :\n"
+#~ "{0}\n"
+#~ "utilisaient le dossier maintenant supprimÃ©Â :\n"
+#~ "    Â«Â {1}Â Â»\n"
+#~ "Ils ont Ã©tÃ© mis Ã  jour."
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "Les rÃ¨gles de filtrage suivantesÂ :\n"
+#~ "{0}\n"
+#~ "utilisaient le dossier maintenant supprimÃ©Â :\n"
+#~ "    Â«Â {1}Â Â»\n"
+#~ "Elles ont Ã©tÃ© mises Ã  jour."
+
+#~ msgid "Shell Backend"
+#~ msgstr "Moteur du shell"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "Ce dossier ne contient que des messages cachÃ©s. Choisissez Â«Â Affichage-"
+#~ ">Afficher tous les messages masquÃ©sÂ Â» pour les afficher."
+
+#~ msgid "Table column:"
+#~ msgstr "Colonne de tableauÂ :"
+
+#~ msgid "Source List"
+#~ msgstr "Liste de source"
+
+#~ msgid "The registry of address books"
+#~ msgstr "Le registre des carnets d'adresses"
+
+#~ msgid "Current View"
+#~ msgstr "Vue active"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "La vue actuellement sÃ©lectionnÃ©e du carnet d'adresses"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "Contact prÃ©visualisÃ©"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "Le contact actuellement affichÃ© dans le panneau d'aperÃ§u"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "L'aperÃ§u est visible"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "Indique si le panneau d'aperÃ§u est visible"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "Serveurs LDAP"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "ParamÃ¨tres de complÃ©tion automatique"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "L'emplacement et la hiÃ©rarchie des dossiers des contacts ont changÃ© "
+#~ "depuis Evolution 1.x.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Le format des contacts de listes de diffusion a changÃ©.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "La maniÃ¨re dont Evolution stocke certains numÃ©ros de tÃ©lÃ©phone a changÃ©.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Les fichiers de donnÃ©es de synchronisation des Palms d'Evolution ont "
+#~ "changÃ©.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "Composant graphique sÃ©lecteur de source"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "Ce composant graphique affiche les groupes de carnets d'adresses"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "Enregistrer comme vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "Le registre des calendriers"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "L'emplacement et la hiÃ©rarchie des dossiers des calendriers ont changÃ© "
+#~ "depuis Evolution 1.x.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr ""
+#~ "Impossible de migrer les anciens paramÃ¨tres Ã  partir de evolution/config."
+#~ "xmldb"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "Impossible de migrer le calendrier Â«Â %sÂ Â»"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "Composant graphique navigateur de date"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "Ce composant graphique affiche un calendrier miniature"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "Client de calendrier par dÃ©faut"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "Client par dÃ©faut pour les opÃ©rations de calendrier"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "Ce composant graphique affiche les groupes de calendriers"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "Le registre des listes de mÃ©mos"
+
+#~ msgid "The memo table model"
+#~ msgstr "Le modÃ¨le de tableau des mÃ©mos"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "Client de mÃ©mo par dÃ©faut"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "Client par dÃ©faut pour les opÃ©rations de mÃ©mo"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "Ce composant graphique affiche les groupes de listes de mÃ©mos"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "Le registre des listes de tÃ¢ches"
+
+#~ msgid "The task table model"
+#~ msgstr "Le modÃ¨le de tableau des tÃ¢ches"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "L'emplacement et la hiÃ©rarchie des dossiers des tÃ¢ches ont changÃ© depuis "
+#~ "Evolution 1.x.\n"
+#~ "\n"
+#~ "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "Impossible de migrer les tÃ¢ches Â«Â %sÂ Â»"
+
+#~ msgid "Default Task Client"
+#~ msgstr "Client de tÃ¢che par dÃ©faut"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "Client par dÃ©faut pour les opÃ©rations sur les tÃ¢ches"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "Ce composant graphique affiche les groupes de listes de tÃ¢ches"
+
+#~ msgid "Group by Threads"
+#~ msgstr "Grouper par fils de discussion"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "Indique s'il faut grouper les messages par fils de discussion"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "Masquer les messages _lus"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "Masque temporairement tous les messages dÃ©jÃ  lus"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "Masquer les messages _sÃ©lectionnÃ©s"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "Masque temporairement les messages sÃ©lectionnÃ©s"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "Afficher tous les messages _masquÃ©s"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "Affiche les messages qui ont Ã©tÃ© temporairement masquÃ©s"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "Masquer les messages _supprimÃ©s"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "Masque les messages supprimÃ©s plutÃ´t que de les afficher barrÃ©s"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr ""
+#~ "Liste d'indices que le greffon d'oubli des piÃ¨ces jointes doit rechercher "
+#~ "dans le corps d'un message."
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "Ajoute la prise en charge de Hula Ã  Evolution."
+
+#~ msgid "Hula Support"
+#~ msgstr "Support Hula"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld Kio"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "Style de la barre d'outils"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "Le style de la barre d'outils du sÃ©lecteur"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "Barre d'outils visible"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "Indique si le sÃ©lecteur est visible"
+
+#~ msgid "Switcher Action"
+#~ msgstr "Action du sÃ©lecteur"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "L'action du sÃ©lecteur pour cette vue du shell"
+
+#~ msgid "Page Number"
+#~ msgstr "NumÃ©ro de page"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "Le numÃ©ro de page de l'onglet de la vue shell"
+
+#~ msgid "Search Rule"
+#~ msgstr "RÃ¨gle de recherche"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "CritÃ¨res pour les rÃ©sultats de la recherche actuelle"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "Le EShellBackend pour cette vue shell"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Composant graphique de contenu du shell"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr ""
+#~ "Le composant graphique de contenu apparaÃ®t dans le panneau de droite "
+#~ "d'une fenÃªtre de shell"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Composant graphique du panneau latÃ©ral du shell"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr ""
+#~ "Le composant graphique du panneau latÃ©ral apparaÃ®t dans le panneau de "
+#~ "gauche d'une fenÃªtre de shell"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Composant graphique barre des tÃ¢ches du shell"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr ""
+#~ "Le composant graphique barre des tÃ¢ches apparaÃ®t en bas d'une fenÃªtre de "
+#~ "shell"
+
+#~ msgid "Shell Window"
+#~ msgstr "FenÃªtre du shell"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "La fenÃªtre Ã  laquelle la vue shell appartient"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "Le fichier clÃ© contenant les donnÃ©es d'Ã©tat du widget"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "Le titre de la vue shell"
+
+#~ msgid "Current View ID"
+#~ msgstr "ID de la vue actuelle"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "L'ID de la vue GAL actuelle"
+
+#~ msgid "Active Shell View"
+#~ msgstr "Vue active du shell"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "Nom de la vue active du shell"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "Le EFocusTracker de la fenÃªtre shell"
+
+#~ msgid "Geometry"
+#~ msgstr "GÃ©omÃ©trie"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "ChaÃ®ne de la gÃ©omÃ©trie initiale de la fenÃªtre"
+
+#~ msgid "Safe Mode"
+#~ msgstr "Mode sÃ©curisÃ©"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "Indique si la fenÃªtre du shell est en mode sÃ©curisÃ©"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "Le panneau latÃ©ral est visible"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "Indique si le panneau latÃ©ral de la fenÃªtre du shell est visible"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "Le sÃ©lecteur est visible"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "Indique si les boutons du sÃ©lecteur de fenÃªtre shell sont visibles"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "Barre des tÃ¢ches visible"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "Indique si la barre des tÃ¢ches de la fenÃªtre de shell est visible"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "Indique si la barre d'outils de la fenÃªtre shell est visible"
+
+#~ msgid "UI Manager"
+#~ msgstr "Gestionnaire d'interface"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "Le GtkUIManager de la fenÃªtre shell"
+
+#~ msgid "Module Directory"
+#~ msgstr "RÃ©pertoire du module"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "Le rÃ©pertoire permettant de charger EModules"
+
+#~ msgid "Network Available"
+#~ msgstr "RÃ©seau disponible"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "Indique si le rÃ©seau est disponible"
+
+#~ msgid "Online"
+#~ msgstr "En ligne"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "Indique si le shell est en ligne"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "Force la remigration depuis Evolution 1.4"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "Espace disque insuffisant pour la mise Ã  jour."
+
+#~ msgid "Really delete old data?"
+#~ msgstr "Voulez-vous vraiment supprimer ces anciennes donnÃ©esÂ ?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "Le contenu intÃ©gral du dossier Â«Â evolutionÂ Â» est sur le point d'Ãªtre "
+#~ "dÃ©finitivement supprimÃ©.\n"
+#~ "\n"
+#~ "Il est conseillÃ© de vÃ©rifier manuellement que tous vos courriels, "
+#~ "contacts et donnÃ©es de calendrier sont prÃ©sents, et que cette version "
+#~ "d'Evolution fonctionne correctement avant de supprimer ces anciennes "
+#~ "donnÃ©es.\n"
+#~ "\n"
+#~ "Une fois supprimÃ©s, vous ne pourrez pas revenir Ã  une version prÃ©cÃ©dente "
+#~ "d'Evolution sans intervention manuelle.\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "La version prÃ©cÃ©dente d'Evolution stockait les donnÃ©es Ã  un emplacement "
+#~ "diffÃ©rent.\n"
+#~ "\n"
+#~ "Si vous choisissez de supprimer ces donnÃ©es, le contenu intÃ©gral du "
+#~ "dossier Â«Â evolutionÂ Â» sera dÃ©finitivement supprimÃ©. Si vous choisissez de "
+#~ "conserver ces donnÃ©es, alors vous pourrez supprimer manuellement le "
+#~ "contenu d'Â«Â evolutionÂ Â» Ã  votre convenance.\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "Mettre Ã  jour vos donnÃ©es et vos paramÃ¨tres nÃ©cessite jusqu'Ã  {0} "
+#~ "d'espace disque, mais vous disposez actuellement de seulement {1} "
+#~ "disponibles.\n"
+#~ "\n"
+#~ "Vous devez libÃ©rer d'avantage d'espace dans votre dossier personnel avant "
+#~ "de pouvoir continuer."
+
+#~ msgid "_Keep Data"
+#~ msgstr "_Conserver les donnÃ©es"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "Me _rappeler plus tard"
+
+#~ msgid "Collection"
+#~ msgstr "Collection"
+
+#~ msgid "Instance"
+#~ msgstr "Instance"
+
+# Usine ???
+#~ msgid "Factory"
+#~ msgstr "Fabrique"
+
+#~ msgid "Action"
+#~ msgstr "Action"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "Une GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "Afficher la barre des piÃ¨ces _jointes"
+
+#~ msgid "Fill color"
+#~ msgstr "Couleur de remplissage"
+
+#~ msgid "GDK fill color"
+#~ msgstr "Couleur de remplissage GDK"
+
+# ??? stipple : mot inconnu
+#~ msgid "Fill stipple"
+#~ msgstr "Remplir le stipple"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "Largeur minimale"
+
+#~ msgid "Minimum Width"
+#~ msgstr "Largeur minimale"
+
+#~ msgid "Spacing"
+#~ msgstr "Espacement"
+
+#~ msgid "The button state is online"
+#~ msgstr "L'Ã©tat du bouton est en ligne"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "Position horizontale"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "Position du panneau lorsqu'il est disposÃ© horizontalement."
+
+#~ msgid "Vertical Position"
+#~ msgstr "Position verticale"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "Position du panneau lorsqu'il est disposÃ© verticalement."
+
+#~ msgid "Proportion"
+#~ msgstr "Proportion"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "Proportion de la taille du second panneau"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "Redimensionnement fixe"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "Conserver la taille du second panneau pendant un redimensionnement"
+
+#~ msgid "Cursor Row"
+#~ msgstr "RangÃ©e de curseurs"
+
+#~ msgid "Cursor Column"
+#~ msgstr "Colonne de curseurs"
+
+#~ msgid "Sorter"
+#~ msgstr "Trieur"
+
+#~ msgid "Selection Mode"
+#~ msgstr "Mode de sÃ©lection"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "Mode du curseur"
+
+#~ msgid "Selected Column"
+#~ msgstr "Colonne sÃ©lectionnÃ©e"
+
+#~ msgid "Focused Column"
+#~ msgstr "Colonne ayant le focus"
+
+#~ msgid "Unselected Column"
+#~ msgstr "Colonne non sÃ©lectionnÃ©e"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "Colonne barrÃ©e"
+
+#~ msgid "Underline Column"
+#~ msgstr "Colonne soulignÃ©e"
+
+#~ msgid "Bold Column"
+#~ msgstr "Colonne en gras"
+
+#~ msgid "Color Column"
+#~ msgstr "Colonne en couleur"
+
+#~ msgid "BG Color Column"
+#~ msgstr "Colonne de couleur d'arriÃ¨re-plan"
+
+#~ msgid "State"
+#~ msgstr "Ã?tat"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "Couleurs de rangÃ©es alternatives"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "Grille de dessin horizontal"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "Grille de dessin vertical"
+
+#~ msgid "Draw focus"
+#~ msgstr "Dessiner le focus"
+
+#~ msgid "Cursor mode"
+#~ msgstr "Mode du curseur"
+
+#~ msgid "Selection model"
+#~ msgstr "ModÃ¨le de sÃ©lection"
+
+#~ msgid "Length Threshold"
+#~ msgstr "Longueur du seuil"
+
+#~ msgid "Uniform row height"
+#~ msgstr "Hauteur de rangÃ©e uniforme"
+
+#~ msgid "Frozen"
+#~ msgstr "GelÃ©"
+
+#~ msgid "Table header"
+#~ msgstr "En-tÃªte de tableau"
+
+#~ msgid "Table model"
+#~ msgstr "ModÃ¨le de tableau"
+
+#~ msgid "Cursor row"
+#~ msgstr "RangÃ©e de curseurs"
+
+#~ msgid "Sort Info"
+#~ msgstr "Info de tri"
+
+#~ msgid "Always search"
+#~ msgstr "Toujours rechercher"
+
+#~ msgid "Use click to add"
+#~ msgstr "Utiliser le clic pour ajouter"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "Espacement vertical des lignes"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "Espacement vertical entre les lignes (au-dessus et au-dessous)"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "Adaptateur de table ETree"
+
+# ??? je ne comprends pas
+#~ msgid "Retro Look"
+#~ msgstr "Rechercher en arriÃ¨re"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "Dessiner les lignes et les icÃ´nes d'extension +/-."
+
+#~ msgid "Expander Size"
+#~ msgstr "Taille de l'icÃ´ne d'extension"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Taille de la flÃ¨che de l'icÃ´ne d'extension"
+
+#~ msgid "popup"
+#~ msgstr "popup"
+
+#~ msgid "edit"
+#~ msgstr "modifier"
+
+#~ msgid "toggle"
+#~ msgstr "basculer"
+
+#~ msgid "expand"
+#~ msgstr "Ã©tendre"
+
+#~ msgid "collapse"
+#~ msgstr "rÃ©duire"
+
+#~ msgid "Event Processor"
+#~ msgstr "Processeur d'Ã©vÃ¨nements"
+
+#~ msgid "Text"
+#~ msgstr "Texte"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Texte"
+#~ msgid "Bold"
+#~ msgstr "Gras"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Gras"
+#~ msgid "Strikeout"
+#~ msgstr "BarrÃ©"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "BarrÃ©"
+#~ msgid "Anchor"
+#~ msgstr "Ancre"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ancre"
+#~ msgid "Justification"
+#~ msgstr "Justification"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Justification"
+#~ msgid "Clip Width"
+#~ msgstr "Largeur du masque"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Largeur du masque"
+#~ msgid "Clip Height"
+#~ msgstr "Hauteur du masque"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Hauteur du masque"
+#~ msgid "Clip"
+#~ msgstr "Masque"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Masque"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "Remplir le masque rectangulaire"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Remplir le masque rectangulaire"
+#~ msgid "X Offset"
+#~ msgstr "DÃ©calage en X"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "DÃ©calage en X"
+#~ msgid "Y Offset"
+#~ msgstr "DÃ©calage en Y"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "DÃ©calage en Y"
+#~ msgid "Text width"
+#~ msgstr "Largeur du texte"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Largeur du texte"
+#~ msgid "Text height"
+#~ msgstr "Hauteur du texte"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Hauteur du texte"
+#~ msgid "Use ellipsis"
+#~ msgstr "Utiliser des points de suspension"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Utiliser des points de suspension"
+#~ msgid "Ellipsis"
+#~ msgstr "Points de suspension"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Points de suspension"
+#~ msgid "Line wrap"
+#~ msgstr "Coupure des lignes"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Coupure des lignes"
+#~ msgid "Break characters"
+#~ msgstr "CaractÃ¨res de coupure"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "CaractÃ¨res de coupure"
+#~ msgid "Max lines"
+#~ msgstr "Lignes maximum"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Lignes maximum"
+#~ msgid "Draw borders"
+#~ msgstr "Dessiner les bordures"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Dessiner les bordures"
+#~ msgid "Allow newlines"
+#~ msgstr "Autoriser les nouvelles lignes"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Autoriser les nouvelles lignes"
+#~ msgid "Draw background"
+#~ msgstr "Dessiner l'arriÃ¨re-plan"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Dessiner l'arriÃ¨re-plan"
+#~ msgid "Draw button"
+#~ msgstr "Dessiner le bouton"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Dessiner le bouton"
+#~ msgid "Cursor position"
+#~ msgstr "Position du curseur"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Position du curseur"
+#~ msgid "IM Context"
+#~ msgstr "Contexte des mÃ©thodes de saisie"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Contexte des mÃ©thodes de saisie"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "PoignÃ©e du menu contextuel"
+#~ msgid "Handle Popup"
+#~ msgstr "PoignÃ©e du menu contextuel"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]