[evolution-data-server] Updated French translation

From: Claude Paroz <claudep src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Updated French translation
Date: Wed, 18 Aug 2010 20:06:01 +0000 (UTC)
commit 7722360be3de3691c7c916f7efb17a56ce6cfea3
Author: Claude Paroz <claude 2xlibre net>
Date:   Wed Aug 18 22:05:34 2010 +0200

    Updated French translation
    
    Contributed by Claude Paroz and Bruno Brouard

 po/fr.po | 2761 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1513 insertions(+), 1248 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index 42edece..ab4bbc9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,6 @@
 # Copyright (C) 2003-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution-data-server package.
 #
-#
 # Christophe Merlet <redfox redfoxcenter org>, 2000-2006.
 # Christophe Fergeau <teuf users sourceforge net>, 2003.
 # Brigitte Le Grand <brigitte le grand sun com> pour Sun Microsystems(tm), 2003.
@@ -13,85 +12,99 @@
 # Laurent Richard <laurent richard ael be>, 2006.
 # Jonathan Ernst <jonathan ernstfamily ch>, 2006.
 # Robert-AndrÃ© Mauchin <zebob m pengzone org>, 2006-2008.
-# Claude Paroz <claude 2xlibre net>, 2007-2009.
+# Claude Paroz <claude 2xlibre net>, 2007-2010.
 # Bruno Brouard <annoa b gmail com>, 2008.
 # Yannick Tailliez <ytdispatch-libre yahoo com>, 2008.
 # Laurent Coudeur <laurentc iol ie>, 2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution-data-server&component=general\n"
-"POT-Creation-Date: 2010-04-18 19:57+0000\n"
-"PO-Revision-Date: 2010-04-19 10:00+0100\n"
-"Last-Translator: Laurent Coudeur <laurentc iol ie>\n"
-"Language-Team: FranÃ§ais <gnomefr traduc org>\n"
+"product=evolution-data-server&component=Misc.\n"
+"POT-Creation-Date: 2010-08-18 13:42+0000\n"
+"PO-Revision-Date: 2010-08-18 22:05+0200\n"
+"Last-Translator: Claude Paroz <claude 2xlibre net>\n"
+"Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4482
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2698
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4641
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "TÃ©lÃ©chargement des contacts (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2846
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Mise Ã  jour du cache des contacts (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:172
+msgid "Not connected"
+msgstr "Non connectÃ©"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:753
 msgid "Using Distinguished Name (DN)"
 msgstr "En utilisant le Nom Distinctif (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:756
 msgid "Using Email Address"
 msgstr "En utilisant l'adresse Ã©lectronique"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1022
 msgid "Reconnecting to LDAP server..."
 msgstr "Reconnexion au serveur LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1147
+msgid "Invalid DN syntax"
+msgstr "Syntaxe DN non valide"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1663
 msgid "Adding contact to LDAP server..."
 msgstr "Ajout du contact sur le serveur LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1795
 msgid "Removing contact from LDAP server..."
 msgstr "Suppression du contact du serveur LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2229
 msgid "Modifying contact from LDAP server..."
 msgstr "Modification du contact sur le serveur LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4332
 msgid "Receiving LDAP search results..."
 msgstr "RÃ©ception des rÃ©sultats de la recherche LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4504
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
-#: ../addressbook/libebook/e-book.c:2152
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:329
+#, c-format
+msgid "Create resource '%s' failed with http status: %d"
+msgstr "La crÃ©ation de la ressource Â«Â %sÂ Â» a Ã©chouÃ© avec l'Ã©tat httpÂ : %d"
+
+#: ../addressbook/libebook/e-book.c:2940
 #, c-format
 msgid "%s: there was no source for UID '%s' stored in GConf."
 msgstr "%sÂ : il n'y avait pas de source pour l'UID Â«Â %sÂ Â» stockÃ©e dans GConf."
@@ -282,7 +295,7 @@ msgstr "URL du weblog"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:667
 msgid "Categories"
 msgstr "CatÃ©gories"
 
@@ -548,8 +561,8 @@ msgid "Birth Date"
 msgstr "Date de naissance"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
+#: ../libedataserver/e-categories.c:44
 msgid "Anniversary"
 msgstr "Anniversaire"
 
@@ -627,205 +640,351 @@ msgstr "Liste des noms d'utilisateur Skype"
 msgid "SIP address"
 msgstr "Adresse SIP"
 
-#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-contact.c:1517
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Liste de contacts sans nom"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:287
 #, c-format
 msgid "Empty URI"
 msgstr "URI vide"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:306
+#: ../addressbook/libedata-book/e-data-book-factory.c:344
+#: ../calendar/libedata-cal/e-data-cal-factory.c:331
+#: ../calendar/libedata-cal/e-data-cal-factory.c:343
 #, c-format
 msgid "Invalid source"
 msgstr "Source non valide"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-msgid "Cannot open book"
-msgstr "Impossible d'ouvrir le carnet"
+#: ../addressbook/libedata-book/e-data-book.c:166
+#: ../calendar/libedata-cal/e-data-cal.c:104
+msgid "Success"
+msgstr "SuccÃ¨s"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Impossible de supprimer le carnet"
+#: ../addressbook/libedata-book/e-data-book.c:167
+#: ../calendar/libedata-cal/e-data-cal.c:105
+msgid "Repository offline"
+msgstr "DÃ©pÃ´t hors ligne"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-msgid "Cannot get contact"
-msgstr "Impossible d'obtenir le contact"
+#: ../addressbook/libedata-book/e-data-book.c:168
+#: ../calendar/libecal/e-cal.c:3945 ../calendar/libedata-cal/e-data-cal.c:106
+msgid "Permission denied"
+msgstr "Permission refusÃ©e"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "RequÃªte vide"
+#: ../addressbook/libedata-book/e-data-book.c:169
+msgid "Contact not found"
+msgstr "Contact non trouvÃ©"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-msgid "Cannot authenticate user"
-msgstr "Impossible d'authentifier l'utilisateur"
+#: ../addressbook/libedata-book/e-data-book.c:170
+msgid "Contact ID already exists"
+msgstr "L'ID du contact existe dÃ©jÃ "
 
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-msgid "Cannot add contact"
-msgstr "Impossible d'ajouter un contact"
+#: ../addressbook/libedata-book/e-data-book.c:171
+#: ../calendar/libedata-cal/e-data-cal.c:111
+msgid "Authentication Failed"
+msgstr "L'authentification a Ã©chouÃ©"
 
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-msgid "Cannot modify contact"
-msgstr "Impossible de modifier le contact"
+#: ../addressbook/libedata-book/e-data-book.c:172
+#: ../calendar/libedata-cal/e-data-cal.c:112
+msgid "Authentication Required"
+msgstr "Authentification requise"
 
-#: ../addressbook/libedata-book/e-data-book.c:494
-msgid "Cannot remove contacts"
-msgstr "Impossible de supprimer les contacts"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:113
+msgid "Unsupported field"
+msgstr "Champ non pris en charge"
 
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Unsupported authentication method"
+msgstr "MÃ©thode d'authentification non prise en charge"
+
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "TLS not available"
+msgstr "TLS non disponible"
+
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Address Book does not exist"
+msgstr "Le carnet d'adresses n'existe pas"
+
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Book removed"
+msgstr "Carnet supprimÃ©"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Not available in offline mode"
+msgstr "Non disponible en mode hors ligne"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "Search size limit exceeded"
+msgstr "Taille limite de recherche dÃ©passÃ©e"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Search time limit exceeded"
+msgstr "Temps limite de recherche dÃ©passÃ©"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:122
 msgid "Invalid query"
 msgstr "RequÃªte non valide"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-msgid "Cannot get changes"
-msgstr "Impossible d'obtenir les modifications"
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Query refused"
+msgstr "RequÃªte refusÃ©e"
+
+#: ../addressbook/libedata-book/e-data-book.c:183
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Could not cancel"
+msgstr "Impossible d'annuler"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:126
+msgid "Invalid server version"
+msgstr "Version de serveur non valide"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-msgid "Cannot complete operation"
-msgstr "Impossible de terminer l'opÃ©ration"
+#: ../addressbook/libedata-book/e-data-book.c:186
+msgid "No space"
+msgstr "Pas d'espace"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libecal/e-cal.c:3929 ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Invalid argument"
+msgstr "Argument non valide"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libecal/e-cal.c:3967 ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Not supported"
+msgstr "Non pris en charge"
+
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libedata-cal/e-data-cal.c:136
+msgid "Other error"
+msgstr "Autre erreur"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:307
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Impossible d'ouvrir le carnetÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:329
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Impossible de supprimer le carnetÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:346
+#: ../addressbook/libedata-book/e-data-book.c:365
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Impossible d'obtenir le contactÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:380
+#, c-format
+msgid "Empty query: %s"
+msgstr "RequÃªte videÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:396
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Impossible d'obtenir la liste de contactsÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:433
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Impossible d'authentifier l'utilisateurÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:448
+#: ../addressbook/libedata-book/e-data-book.c:467
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Impossible d'ajouter un contactÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:485
+#: ../addressbook/libedata-book/e-data-book.c:504
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Impossible de modifier le contactÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:543
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Impossible de supprimer les contactsÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:580
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Impossible d'obtenir les champs pris en chargeÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:595
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Impossible d'obtenir les champs obligatoiresÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported auth methods: %s"
+msgstr ""
+"Impossible d'obtenir les mÃ©thodes d'authentification prises en chargeÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:636
+#: ../addressbook/libedata-book/e-data-book.c:647
+#, c-format
+msgid "Invalid query: %s"
+msgstr "RequÃªte non valideÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:683
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Impossible d'obtenir les modificationsÂ : %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:722
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "L'annulation a Ã©chouÃ©Â : %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:498
+#, c-format
+msgid "Unexpected HTTP status code %d returned"
+msgstr "Le code d'Ã©tat HTTP renvoyÃ© (%d) est inattendu"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4094
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Le calendrier ne prend pas en charge les informations Libre/OccupÃ©"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:719
+#: ../libedataserver/e-categories.c:45
 msgid "Birthday"
 msgstr "Date de naissance"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:748
 #, c-format
 msgid "Birthday: %s"
 msgstr "Date de naissanceÂ : %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:772
 #, c-format
 msgid "Anniversary: %s"
 msgstr "AnniversaireÂ : %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:239
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Impossible d'enregistrer les donnÃ©es du calendrierÂ : URI erronÃ©."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:246
+#: ../calendar/backends/file/e-cal-backend-file.c:252
 msgid "Cannot save calendar data"
 msgstr "Impossible d'enregistrer les donnÃ©es du calendrier"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Impossible de crÃ©er le thread pour obtenir les diffÃ©rences"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1088
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Impossible de crÃ©er le fichier cache"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1101
-msgid "Could not create thread for populating cache"
-msgstr "Impossible de crÃ©er la liste pour remplir le fichier cache"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1121
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2224
 msgid "Reply Requested: by "
 msgstr "RÃ©ponse requiseÂ : par"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1126
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2229
 msgid "Reply Requested: When convenient"
 msgstr "RÃ©ponse requiseÂ : si nÃ©cessaire"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:293
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:295
 #, c-format
 msgid "Loading %s items"
 msgstr "Chargement de %s Ã©lÃ©ments"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:926
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:985
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:989
 msgid "Invalid server URI"
 msgstr "URI de serveur non valide"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1013
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1106
-#: ../calendar/libecal/e-cal.c:4019
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1378
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1393
-#: ../camel/providers/groupwise/camel-groupwise-store.c:587
-#: ../camel/providers/groupwise/camel-groupwise-store.c:762
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:145
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:172
-msgid "Authentication failed"
-msgstr "L'authentification a Ã©chouÃ©"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1082
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1343
+#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/weather/e-cal-backend-weather.c:487
+msgid "Could not create cache file"
+msgstr "Impossible de crÃ©er le fichier cache"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1095
+msgid "Could not create thread for populating cache"
+msgstr "Impossible de crÃ©er la liste pour remplir le fichier cache"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:327
 msgid "Redirected to Invalid URI"
 msgstr "RedirigÃ© vers un URI non valide"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:350
 msgid "Bad file format."
 msgstr "Mauvais format de fichier."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:357
 msgid "Not a calendar."
 msgstr "Ce n'est pas un calendrier."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:154
 msgid "Could not retrieve weather data"
 msgstr "Impossible de rÃ©cupÃ©rer les informations mÃ©tÃ©o"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Fog"
 msgstr "MÃ©tÃ©oÂ : brume"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Cloudy Night"
 msgstr "MÃ©tÃ©oÂ : nuit nuageuse"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Cloudy"
 msgstr "MÃ©tÃ©oÂ : nuageux"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Overcast"
 msgstr "MÃ©tÃ©oÂ : couvert"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Showers"
 msgstr "MÃ©tÃ©oÂ : averses"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Snow"
 msgstr "MÃ©tÃ©oÂ : neige"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Clear Night"
 msgstr "MÃ©tÃ©oÂ : nuit claire"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:260
 msgid "Weather: Sunny"
 msgstr "MÃ©tÃ©oÂ : ensoleillÃ©"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:261
 msgid "Weather: Thunderstorms"
 msgstr "MÃ©tÃ©oÂ : orages"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:407
 msgid "Forecast"
 msgstr "PrÃ©visions"
 
@@ -975,7 +1134,7 @@ msgstr "Basse"
 msgid "Undefined"
 msgstr "IndÃ©finie"
 
-#: ../calendar/libecal/e-cal.c:1172 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1128 ../libedataserverui/e-book-auth-util.c:206
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
@@ -984,102 +1143,92 @@ msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1186
+#: ../calendar/libecal/e-cal.c:1142
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr ""
 "Saisissez le mot de passe de %s afin d'activer le proxy pour l'utilisateur %s"
 
-#: ../calendar/libecal/e-cal.c:3991
-msgid "Invalid argument"
-msgstr "Argument non valide"
-
-#: ../calendar/libecal/e-cal.c:3993
+#: ../calendar/libecal/e-cal.c:3931
 msgid "Backend is busy"
 msgstr "Le moteur de traitement est occupÃ©"
 
-#: ../calendar/libecal/e-cal.c:3995
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:3933
 msgid "Repository is offline"
 msgstr "Le dÃ©pÃ´t est hors ligne"
 
-#: ../calendar/libecal/e-cal.c:3997
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
+#: ../calendar/libecal/e-cal.c:3935
 msgid "No such calendar"
 msgstr "Calendrier inexistant"
 
-#: ../calendar/libecal/e-cal.c:3999
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:3937 ../calendar/libedata-cal/e-data-cal.c:108
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objet non trouvÃ©"
 
-#: ../calendar/libecal/e-cal.c:4001
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:3939 ../calendar/libedata-cal/e-data-cal.c:109
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Objet non valide"
 
-#: ../calendar/libecal/e-cal.c:4003
+#: ../calendar/libecal/e-cal.c:3941
 msgid "URI not loaded"
 msgstr "URI non chargÃ©"
 
-#: ../calendar/libecal/e-cal.c:4005
+#: ../calendar/libecal/e-cal.c:3943
 msgid "URI already loaded"
 msgstr "URI dÃ©jÃ  chargÃ©"
 
-#: ../calendar/libecal/e-cal.c:4007
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
-msgid "Permission denied"
-msgstr "Permission refusÃ©e"
-
-#: ../calendar/libecal/e-cal.c:4009
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:3947 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Utilisateur inconnu"
 
-#: ../calendar/libecal/e-cal.c:4011
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
+#: ../calendar/libecal/e-cal.c:3949 ../calendar/libedata-cal/e-data-cal.c:110
 msgid "Object ID already exists"
 msgstr "L'ID de l'objet existe dÃ©jÃ "
 
-#: ../calendar/libecal/e-cal.c:4013
+#: ../calendar/libecal/e-cal.c:3951
 msgid "Protocol not supported"
 msgstr "Protocole non pris en charge"
 
-#: ../calendar/libecal/e-cal.c:4015
+#: ../calendar/libecal/e-cal.c:3953
 msgid "Operation has been canceled"
 msgstr "L'opÃ©ration a Ã©tÃ© annulÃ©e"
 
-#: ../calendar/libecal/e-cal.c:4017
-#: ../calendar/libedata-cal/e-cal-backend-util.c:145
+#: ../calendar/libecal/e-cal.c:3955
 msgid "Could not cancel operation"
 msgstr "Impossible d'annuler l'opÃ©ration"
 
-#: ../calendar/libecal/e-cal.c:4021
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-#: ../camel/providers/smtp/camel-smtp-transport.c:204
+#: ../calendar/libecal/e-cal.c:3957
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1434
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1452
+#: ../camel/providers/groupwise/camel-groupwise-store.c:618
+#: ../camel/providers/groupwise/camel-groupwise-store.c:793
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:85
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:118
+#, c-format
+msgid "Authentication failed"
+msgstr "L'authentification a Ã©chouÃ©"
+
+#: ../calendar/libecal/e-cal.c:3959
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Authentication required"
 msgstr "Authentification requise"
 
-#: ../calendar/libecal/e-cal.c:4023
-msgid "A CORBA exception has occurred"
-msgstr "Une exception CORBA s'est produite"
-
-#: ../calendar/libecal/e-cal.c:4025
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-#: ../camel/camel-net-utils.c:534
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
-#: ../camel/providers/imap/camel-imap-command.c:428
-#: ../camel/providers/imap/camel-imap-store.c:729
-#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../calendar/libecal/e-cal.c:3961
+msgid "A DBUS exception has occurred"
+msgstr "Une exception DBUS s'est produite"
+
+#: ../calendar/libecal/e-cal.c:3963
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:158
+#: ../camel/providers/imap/camel-imap-command.c:457
+#: ../camel/providers/imap/camel-imap-store.c:627
+#: ../camel/providers/pop3/camel-pop3-store.c:474
 #: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../calendar/libecal/e-cal.c:4027
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:3965
 msgid "No error"
 msgstr "Aucune erreur"
 
@@ -1179,232 +1328,245 @@ msgstr ""
 "Â«Â %sÂ Â» requiert tous les arguments comme chaÃ®ne ou seulement un argument "
 "comme boolÃ©en faux (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libedata-cal/e-data-cal.c:107
 msgid "Invalid range"
 msgstr "Plage non valide"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
-msgid "Unsupported field"
-msgstr "Champ non pris en charge"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Unsupported method"
 msgstr "MÃ©thode non prise en charge"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "Unsupported authentication method"
-msgstr "MÃ©thode d'authentification non prise en charge"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
-msgid "TLS not available"
-msgstr "TLS non disponible"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Offline mode unavailable"
-msgstr "Mode hors ligne non disponible"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search size limit exceeded"
-msgstr "Taille limite de recherche dÃ©passÃ©e"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Search time limit exceeded"
-msgstr "Temps limite de recherche dÃ©passÃ©"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
-msgid "Query refused"
-msgstr "RequÃªte refusÃ©e"
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Calendar does not exist"
+msgstr "Le calendrier n'existe pas"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:150
-msgid "Invalid server version"
-msgstr "Version de serveur non valide"
+#: ../calendar/libedata-cal/e-data-cal.c:118
+msgid "UnknownUser"
+msgstr "UtilisateurInconnu"
 
-#: ../calendar/libedata-cal/e-data-cal.c:501
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:589
 #, c-format
-msgid "Cannot retrieve calendar address"
-msgstr "Impossible de rÃ©cupÃ©rer l'adresse du calendrier"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Impossible de rÃ©cupÃ©rer l'adresse du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:519
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:609
 #, c-format
-msgid "Cannot retrieve calendar alarm e-mail address"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
 msgstr ""
-"Impossible de rÃ©cupÃ©rer l'adresse Ã©lectronique de l'alarme de calendrier"
+"Impossible de rÃ©cupÃ©rer l'adresse Ã©lectronique de l'alarme de calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:537
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:629
 #, c-format
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Impossible de rÃ©cupÃ©rer l'attribut LDAP du calendrier"
+msgid "Cannot retrieve calendar's ldap attribute: %s"
+msgstr "Impossible de rÃ©cupÃ©rer l'attribut LDAP du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:555
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
-msgid "Cannot retrieve calendar scheduling information"
+msgid "Cannot retrieve calendar scheduling information: %s"
 msgstr ""
-"Impossible de rÃ©cupÃ©rer les informations d'emploi du temps du calendrier"
+"Impossible de rÃ©cupÃ©rer les informations d'emploi du temps du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:572
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:668
 #, c-format
-msgid "Cannot open calendar"
-msgstr "Impossible d'ouvrir le calendrier"
+msgid "Cannot open calendar: %s"
+msgstr "Impossible d'ouvrir le calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:591
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:689
 #, c-format
-msgid "Cannot refresh calendar"
-msgstr "Impossible d'actualiser le calendrier"
+msgid "Cannot refresh calendar: %s"
+msgstr "Impossible d'actualiser le calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:608
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:708
 #, c-format
-msgid "Cannot remove calendar"
-msgstr "Impossible de supprimer le calendrier"
+msgid "Cannot remove calendar: %s"
+msgstr "Impossible de supprimer le calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:627
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:729
 #, c-format
-msgid "Cannot create calendar object"
-msgstr "Impossible de crÃ©er l'objet calendrier"
+msgid "Cannot create calendar object: %s"
+msgstr "Impossible de crÃ©er l'objet calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:649
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:753
 #, c-format
-msgid "Cannot modify calendar object"
-msgstr "Impossible de modifier l'objet calendrier"
+msgid "Cannot modify calendar object: %s"
+msgstr "Impossible de modifier l'objet calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:673
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:779
 #, c-format
-msgid "Cannot remove calendar object"
-msgstr "Impossible de supprimer l'objet calendrier"
+msgid "Cannot remove calendar object: %s"
+msgstr "Impossible de supprimer l'objet calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:692
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:800
 #, c-format
-msgid "Cannot receive calendar objects"
-msgstr "Impossible de recevoir les objets du calendrier"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Impossible de recevoir les objets du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:709
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:819
 #, c-format
-msgid "Cannot discard calendar alarm"
-msgstr "Impossible d'annuler l'alarme de calendrier"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Impossible d'annuler l'alarme de calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:728
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:840
 #, c-format
-msgid "Cannot send calendar objects"
-msgstr "Impossible d'envoyer les objets du calendrier"
+msgid "Cannot send calendar objects: %s"
+msgstr "Impossible d'envoyer les objets du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:763
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:865
 #, c-format
-msgid "Cannot retrieve default calendar object path"
-msgstr "Impossible de rÃ©cupÃ©rer le chemin de l'objet calendrier par dÃ©faut"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr ""
+"Impossible de rÃ©cupÃ©rer le chemin de l'objet calendrier par dÃ©fautÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:781
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:885
 #, c-format
-msgid "Cannot retrieve calendar object path"
-msgstr "Impossible de rÃ©cupÃ©rer le chemin de l'objet calendrier"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Impossible de rÃ©cupÃ©rer le chemin de l'objet calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:799
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:905
 #, c-format
-msgid "Cannot retrieve calendar object list"
-msgstr "Impossible de rÃ©cupÃ©rer la liste d'objets calendrier"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Impossible de rÃ©cupÃ©rer la liste d'objets calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:837
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
-msgid "Could not retrieve attachment list"
-msgstr "Impossible de rÃ©cupÃ©rer la liste des piÃ¨ces jointes"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Impossible de rÃ©cupÃ©rer la liste des piÃ¨ces jointesÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:859
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:959
 #, c-format
-msgid "Could not complete calendar query"
-msgstr "Impossible de terminer la requÃªte de calendrier"
+msgid "Could not complete calendar query: %s"
+msgstr "Impossible de terminer la requÃªte de calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:877
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:979
 #, c-format
-msgid "Could not retrieve calendar time zone"
-msgstr "Impossible de rÃ©cupÃ©rer le fuseau horaire du calendrier"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Impossible de rÃ©cupÃ©rer le fuseau horaire du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:895
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:999
 #, c-format
-msgid "Could not add calendar time zone"
-msgstr "Impossible d'ajouter le fuseau horaire du calendrier"
+msgid "Could not add calendar time zone: %s"
+msgstr "Impossible d'ajouter le fuseau horaire du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:912
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1018
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Impossible de dÃ©finir le fuseau horaire par dÃ©faut du calendrier"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Impossible de dÃ©finir le fuseau horaire par dÃ©faut du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:933
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1041
 #, c-format
-msgid "Cannot retrieve calendar changes"
-msgstr "Impossible de rÃ©cupÃ©rer les changements du calendrier"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Impossible de rÃ©cupÃ©rer les modifications du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:983
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1072
 #, c-format
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Impossible de rÃ©cupÃ©rer la liste des disponibilitÃ©s du calendrier"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Impossible de rÃ©cupÃ©rer la liste des disponibilitÃ©s du calendrierÂ : %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:353
 #, c-format
 msgid "Invalid URI"
 msgstr "URI non valide"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:371
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Aucune usine de moteurs de traitement pour Â«Â %sÂ Â» of Â«Â %sÂ Â»"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:421
 #, c-format
 msgid "Could not instantiate backend"
 msgstr "Impossible d'instancier le moteur de traitement"
 
-#: ../camel/camel-cipher-context.c:65
+#: ../camel/camel-cipher-context.c:75
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "La signature n'est pas prise en charge par ce chiffrement"
 
-#: ../camel/camel-cipher-context.c:100
+#: ../camel/camel-cipher-context.c:110
 msgid "Signing message"
 msgstr "Signature du message"
 
-#: ../camel/camel-cipher-context.c:120
+#: ../camel/camel-cipher-context.c:131
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "La vÃ©rification n'est pas prise en charge par ce chiffrement"
 
-#: ../camel/camel-cipher-context.c:153
+#: ../camel/camel-cipher-context.c:164
 msgid "Verifying message"
 msgstr "VÃ©rification du message"
 
-#: ../camel/camel-cipher-context.c:176
+#: ../camel/camel-cipher-context.c:188
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Le codage n'est pas pris en charge par ce chiffrement"
 
-#: ../camel/camel-cipher-context.c:211
+#: ../camel/camel-cipher-context.c:223
 msgid "Encrypting message"
 msgstr "Chiffrement du message"
 
-#: ../camel/camel-cipher-context.c:233
+#: ../camel/camel-cipher-context.c:246
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Le dÃ©chiffrement n'est pas pris en charge par ce chiffrement"
 
-#: ../camel/camel-cipher-context.c:263
+#: ../camel/camel-cipher-context.c:276
 msgid "Decrypting message"
 msgstr "DÃ©chiffrement du message"
 
-#: ../camel/camel-cipher-context.c:283
+#: ../camel/camel-cipher-context.c:297
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Vous ne pouvez pas importer de clÃ© avec ce chiffrement"
 
-#: ../camel/camel-cipher-context.c:323
+#: ../camel/camel-cipher-context.c:341
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Vous ne pouvez pas exporter de clÃ© avec ce chiffrement"
 
-#: ../camel/camel-data-cache.c:137
+#: ../camel/camel-data-cache.c:181
+#, c-format
 msgid "Unable to create cache path"
 msgstr "Impossible de crÃ©er le rÃ©pertoire de cache"
 
-#: ../camel/camel-data-cache.c:427
+#: ../camel/camel-data-cache.c:494
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Impossible de supprimer l'entrÃ©e du cacheÂ : %sÂ : %s"
 
-#: ../camel/camel-db.c:458
+#: ../camel/camel-data-wrapper.c:89
+#, c-format
+msgid "No stream available"
+msgstr "Aucun flux disponible"
+
+#: ../camel/camel-db.c:464
+#, c-format
 msgid "Insufficient memory"
 msgstr "MÃ©moire insuffisante"
 
-#: ../camel/camel-disco-diary.c:196
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1415,8 +1577,8 @@ msgstr ""
 "Des informations de ce serveur ne seront pas rejouÃ©es\n"
 "quand vous vous reconnecterez au rÃ©seau."
 
-#: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:313
+#: ../camel/camel-disco-diary.c:258
+#: ../camel/providers/imap/camel-imap-journal.c:298
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1427,123 +1589,142 @@ msgstr ""
 "%s\n"
 "Les modifications apportÃ©es Ã  ce dossier ne seront pas resynchronisÃ©es."
 
-#: ../camel/camel-disco-diary.c:300
+#: ../camel/camel-disco-diary.c:299
 msgid "Resynchronizing with server"
 msgstr "Resynchronisation avec le serveur"
 
-#: ../camel/camel-disco-folder.c:39 ../camel/camel-offline-folder.c:39
-msgid "Copy folder content locally for offline operation"
-msgstr "Copier le contenu du dossier en local pour les opÃ©rations hors ligne"
-
-#: ../camel/camel-disco-folder.c:58 ../camel/camel-offline-folder.c:56
+#: ../camel/camel-disco-folder.c:68 ../camel/camel-offline-folder.c:66
 msgid "Downloading new messages for offline mode"
 msgstr "TÃ©lÃ©charger les nouveaux messages pour le mode hors ligne"
 
-#: ../camel/camel-disco-folder.c:368
+#: ../camel/camel-disco-folder.c:379
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "PrÃ©paration du dossier Â«Â %sÂ Â» pour le hors ligne"
 
-#: ../camel/camel-disco-store.c:386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:214
-#: ../camel/providers/imap/camel-imap-store.c:989
-#: ../camel/providers/imap/camel-imap-store.c:1831
-#: ../camel/providers/imap/camel-imap-store.c:2267
-#: ../camel/providers/imap/camel-imap-store.c:3075
-#: ../camel/providers/imapx/camel-imapx-store.c:150
-#: ../camel/providers/imapx/camel-imapx-store.c:603
-#: ../camel/providers/imapx/camel-imapx-store.c:663
-#: ../camel/providers/imapx/camel-imapx-store.c:712
+#: ../camel/camel-disco-folder.c:445 ../camel/camel-offline-folder.c:224
+msgid "Copy folder content locally for offline operation"
+msgstr "Copier le contenu du dossier en local pour les opÃ©rations hors ligne"
+
+#: ../camel/camel-disco-store.c:395
+#: ../camel/providers/groupwise/camel-groupwise-store.c:230
+#: ../camel/providers/imap/camel-imap-store.c:876
+#: ../camel/providers/imap/camel-imap-store.c:1720
+#: ../camel/providers/imap/camel-imap-store.c:2178
+#: ../camel/providers/imap/camel-imap-store.c:3022
+#: ../camel/providers/imapx/camel-imapx-store.c:185
+#: ../camel/providers/imapx/camel-imapx-store.c:709
+#: ../camel/providers/imapx/camel-imapx-store.c:772
+#: ../camel/providers/imapx/camel-imapx-store.c:831
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Vous devez travailler en ligne pour terminer cette opÃ©ration"
 
-#: ../camel/camel-exception.c:259
-msgid "No description available"
-msgstr "Aucune description disponible"
+#: ../camel/camel-file-utils.c:430 ../camel/camel-file-utils.c:489
+#: ../camel/camel-file-utils.c:529 ../camel/camel-file-utils.c:599
+#: ../camel/camel-file-utils.c:691 ../camel/camel-gpg-context.c:887
+#: ../camel/camel-gpg-context.c:1175 ../camel/camel-net-utils.c:512
+#: ../camel/camel-net-utils.c:689 ../camel/camel-net-utils.c:838
+#: ../camel/camel-tcp-stream-raw.c:250
+#: ../camel/providers/imapx/camel-imapx-server.c:4639
+#: ../camel/providers/imapx/camel-imapx-server.c:4656
+#: ../camel/providers/nntp/camel-nntp-summary.c:396
+#: ../camel/providers/pop3/camel-pop3-folder.c:269
+#: ../camel/providers/pop3/camel-pop3-folder.c:625
+#: ../camel/providers/pop3/camel-pop3-folder.c:690
+#: ../camel/providers/pop3/camel-pop3-store.c:466
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "AnnulÃ©"
+
+#: ../camel/camel-file-utils.c:643 ../camel/camel-file-utils.c:734
+#: ../camel/camel-file-utils.c:791
+#, c-format
+msgid "Canceled"
+msgstr "AnnulÃ©"
 
-#: ../camel/camel-filter-driver.c:788 ../camel/camel-filter-search.c:583
+#: ../camel/camel-filter-driver.c:808 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "La crÃ©ation d'un processus fils Â«Â %sÂ Â» a Ã©chouÃ©Â : %s"
 
-#: ../camel/camel-filter-driver.c:831
+#: ../camel/camel-filter-driver.c:853
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flux de messages non valide en provenance de %sÂ : %s"
 
-#: ../camel/camel-filter-driver.c:1020 ../camel/camel-filter-driver.c:1029
+#: ../camel/camel-filter-driver.c:1037 ../camel/camel-filter-driver.c:1046
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: ../camel/camel-filter-driver.c:1117 ../camel/camel-filter-driver.c:1544
+#: ../camel/camel-filter-driver.c:1134 ../camel/camel-filter-driver.c:1569
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'analyse du filtreÂ : %sÂ : %s"
 
-#: ../camel/camel-filter-driver.c:1127 ../camel/camel-filter-driver.c:1554
+#: ../camel/camel-filter-driver.c:1145 ../camel/camel-filter-driver.c:1580
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'exÃ©cution du filtreÂ : %sÂ : %s"
 
-#: ../camel/camel-filter-driver.c:1219
+#: ../camel/camel-filter-driver.c:1240
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier spool"
 
-#: ../camel/camel-filter-driver.c:1230
+#: ../camel/camel-filter-driver.c:1251
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Impossible de traiter le dossier spool"
 
-#: ../camel/camel-filter-driver.c:1247
+#: ../camel/camel-filter-driver.c:1269
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "RÃ©cupÃ©ration du message %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1253
-msgid "Cannot open message"
-msgstr "Impossible d'ouvrir le message"
-
-#: ../camel/camel-filter-driver.c:1254 ../camel/camel-filter-driver.c:1275
+#: ../camel/camel-filter-driver.c:1275 ../camel/camel-filter-driver.c:1297
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie au message %d"
 
-#: ../camel/camel-filter-driver.c:1289 ../camel/camel-filter-driver.c:1386
+#: ../camel/camel-filter-driver.c:1312 ../camel/camel-filter-driver.c:1411
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: ../camel/camel-filter-driver.c:1293 ../camel/camel-filter-driver.c:1391
+#: ../camel/camel-filter-driver.c:1316 ../camel/camel-filter-driver.c:1416
 msgid "Complete"
 msgstr "TerminÃ©"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1377
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "RÃ©cupÃ©ration du message %d sur %d"
 
-#: ../camel/camel-filter-driver.c:1371
+#: ../camel/camel-filter-driver.c:1395
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie au message %d sur %d"
 
-#: ../camel/camel-filter-search.c:136
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "La rÃ©cupÃ©ration du message a Ã©chouÃ©"
 
-#: ../camel/camel-filter-search.c:402
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Arguments non valides (system-flag)"
 
-#: ../camel/camel-filter-search.c:417
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "Arguments non valides (user-tag)"
 
-#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrÃ©eÂ : %sÂ : %s"
 
-#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:460
-#: ../camel/camel-folder-search.c:624
+#: ../camel/camel-folder-search.c:345 ../camel/camel-folder-search.c:456
+#: ../camel/camel-folder-search.c:627
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1552,8 +1733,8 @@ msgstr ""
 "Impossible d'analyser l'expression de rechercheÂ : %sÂ :\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:473
-#: ../camel/camel-folder-search.c:637
+#: ../camel/camel-folder-search.c:357 ../camel/camel-folder-search.c:468
+#: ../camel/camel-folder-search.c:639
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1562,65 +1743,74 @@ msgstr ""
 "Erreur lors de l'exÃ©cution de l'expression de rechercheÂ : %sÂ :\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:831 ../camel/camel-folder-search.c:873
+#: ../camel/camel-folder-search.c:843 ../camel/camel-folder-search.c:885
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) requiert un unique rÃ©sultat boolÃ©en"
 
-#: ../camel/camel-folder-search.c:926
+#: ../camel/camel-folder-search.c:938
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) n'est pas autorisÃ© dans %s"
 
-#: ../camel/camel-folder-search.c:932 ../camel/camel-folder-search.c:939
+#: ../camel/camel-folder-search.c:944 ../camel/camel-folder-search.c:951
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) requiert un type de chaÃ®ne Ã  comparer"
 
-#: ../camel/camel-folder-search.c:966
+#: ../camel/camel-folder-search.c:978
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) attend un tableau en rÃ©sultat"
 
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:987
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) requiert un ensemble de dossiers"
 
-#: ../camel/camel-folder.c:602
-#: ../camel/providers/local/camel-maildir-folder.c:378
-msgid "Moving messages"
-msgstr "DÃ©placement des messages"
-
-#: ../camel/camel-folder.c:604
-msgid "Copying messages"
-msgstr "Copie des messages"
-
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2076
+#: ../camel/camel-folder.c:125
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Apprentissage du nouveau pourriel dans Â«Â %sÂ Â»"
 msgstr[1] "Apprentissage des nouveaux pourriels dans Â«Â %sÂ Â»"
 
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2095
+#: ../camel/camel-folder.c:147
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Apprentissage du nouveau courriel dÃ©sirable dans Â«Â %sÂ Â»"
 msgstr[1] "Apprentissage des nouveaux courriels dÃ©sirables dans Â«Â %sÂ Â»"
 
-#. Translators: The %s is replaced with a folder name where the operation is running.
-#: ../camel/camel-folder.c:2116
+#: ../camel/camel-folder.c:171
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Filtrage du nouveau message dans Â«Â %sÂ Â»"
 msgstr[1] "Filtrage des nouveaux messages dans Â«Â %sÂ Â»"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-folder.c:688
+#: ../camel/providers/local/camel-maildir-folder.c:366
+msgid "Moving messages"
+msgstr "DÃ©placement des messages"
+
+#: ../camel/camel-folder.c:690
+msgid "Copying messages"
+msgstr "Copie des messages"
+
+#: ../camel/camel-gpg-context.c:701 ../camel/camel-gpg-context.c:706
+#: ../camel/camel-gpg-context.c:1330
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Le lancement de GPG a Ã©chouÃ©Â : %s"
+
+#: ../camel/camel-gpg-context.c:706
+#: ../camel/providers/smtp/camel-smtp-transport.c:114
+#: ../camel/providers/smtp/camel-smtp-transport.c:169
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../camel/camel-gpg-context.c:770
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1631,15 +1821,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:750
+#: ../camel/camel-gpg-context.c:787
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "L'analyse de l'indication ID d'utilisateur de GPG a Ã©chouÃ©."
 
-#: ../camel/camel-gpg-context.c:775 ../camel/camel-gpg-context.c:790
+#: ../camel/camel-gpg-context.c:812 ../camel/camel-gpg-context.c:827
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "L'analyse de la requÃªte de mot de passe de GPG a Ã©chouÃ©."
 
-#: ../camel/camel-gpg-context.c:810
+#: ../camel/camel-gpg-context.c:848
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1648,7 +1840,7 @@ msgstr ""
 "Vous avez besoin d'un numÃ©ro d'identification personnel (PIN) pour\n"
 "dÃ©bloquer la clÃ© pour votre SmartCardÂ : Â«Â %sÂ Â»"
 
-#: ../camel/camel-gpg-context.c:814
+#: ../camel/camel-gpg-context.c:852
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1657,133 +1849,111 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour\n"
 "dÃ©bloquer la clÃ© de l'utilisateurÂ : Â«Â %sÂ Â»"
 
-#: ../camel/camel-gpg-context.c:820
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "RequÃªte inattendue de GnuPG pour Â«Â %sÂ Â»"
 
-#: ../camel/camel-gpg-context.c:848 ../camel/camel-gpg-context.c:1100
-msgid "Canceled."
-msgstr "AnnulÃ©."
-
-#: ../camel/camel-gpg-context.c:863
+#: ../camel/camel-gpg-context.c:905
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Le dÃ©blocage de la clÃ© secrÃ¨te a Ã©chouÃ©Â : 3 mots de passe incorrects ont Ã©tÃ© "
 "saisis."
 
-#: ../camel/camel-gpg-context.c:875
+#: ../camel/camel-gpg-context.c:917
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "RÃ©ponse inattendue de GnuPGÂ : %s"
 
-#: ../camel/camel-gpg-context.c:975
+#: ../camel/camel-gpg-context.c:1048
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Le chiffrement a Ã©chouÃ©Â : aucun destinataire valide renseignÃ©."
 
-#: ../camel/camel-gpg-context.c:1254 ../camel/camel-gpg-context.c:1393
-#: ../camel/camel-gpg-context.c:2015 ../camel/camel-gpg-context.c:2067
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Le lancement de GPG a Ã©chouÃ©Â : %s"
-
-#: ../camel/camel-gpg-context.c:1359 ../camel/camel-smime-context.c:758
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Impossible de gÃ©nÃ©rer les donnÃ©es signÃ©esÂ : %s."
+#: ../camel/camel-gpg-context.c:1434 ../camel/camel-smime-context.c:821
+msgid "Could not generate signing data: "
+msgstr "Impossible de gÃ©nÃ©rer les donnÃ©es signÃ©esÂ : "
 
-#: ../camel/camel-gpg-context.c:1412 ../camel/camel-gpg-context.c:1658
-#: ../camel/camel-gpg-context.c:1677 ../camel/camel-gpg-context.c:1770
-#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1913
-#: ../camel/camel-gpg-context.c:1931 ../camel/camel-gpg-context.c:2034
-#: ../camel/camel-gpg-context.c:2086
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1740
+#: ../camel/camel-gpg-context.c:1848 ../camel/camel-gpg-context.c:1987
+#: ../camel/camel-gpg-context.c:2081 ../camel/camel-gpg-context.c:2128
 msgid "Failed to execute gpg."
 msgstr "Le lancement de GPG a Ã©chouÃ©."
 
-#: ../camel/camel-gpg-context.c:1552 ../camel/camel-gpg-context.c:1560
-#: ../camel/camel-gpg-context.c:1568 ../camel/camel-gpg-context.c:1585
-#: ../camel/camel-smime-context.c:880 ../camel/camel-smime-context.c:893
-#: ../camel/camel-smime-context.c:901
+#: ../camel/camel-gpg-context.c:1622 ../camel/camel-gpg-context.c:1630
+#: ../camel/camel-gpg-context.c:1638 ../camel/camel-gpg-context.c:1655
+#: ../camel/camel-smime-context.c:943 ../camel/camel-smime-context.c:957
+#: ../camel/camel-smime-context.c:966
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Impossible de vÃ©rifier la signature de ce messageÂ : format de message "
 "incorrect"
 
-#: ../camel/camel-gpg-context.c:1626
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr ""
-"Impossible de vÃ©rifier la signature de ce messageÂ : impossible de crÃ©er le "
-"fichier temporaireÂ : %s"
+#: ../camel/camel-gpg-context.c:1695
+msgid "Cannot verify message signature: "
+msgstr "Impossible de vÃ©rifier la signature du messageÂ : "
 
-#: ../camel/camel-gpg-context.c:1751
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Impossible de gÃ©nÃ©rer des donnÃ©es chiffrÃ©esÂ : %s"
+#: ../camel/camel-gpg-context.c:1814
+msgid "Could not generate encrypting data: "
+msgstr "Impossible de gÃ©nÃ©rer des donnÃ©es chiffrÃ©esÂ : "
 
-#: ../camel/camel-gpg-context.c:1807
+#: ../camel/camel-gpg-context.c:1866
 msgid "This is a digitally encrypted message part"
 msgstr "Ceci est une partie de message numÃ©riquement signÃ©e"
 
-#: ../camel/camel-gpg-context.c:1863 ../camel/camel-gpg-context.c:1872
-#: ../camel/camel-gpg-context.c:1894
+#: ../camel/camel-gpg-context.c:1922 ../camel/camel-gpg-context.c:1931
+#: ../camel/camel-gpg-context.c:1954
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr ""
 "Impossible de dÃ©chiffrer le messageÂ : le format du message est incorrect"
 
-#: ../camel/camel-gpg-context.c:1883
+#: ../camel/camel-gpg-context.c:1942
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Le dÃ©chiffrement de la partie MIME a Ã©chouÃ©Â : erreur de protocole"
 
-#: ../camel/camel-gpg-context.c:1967 ../camel/camel-smime-context.c:1174
+#: ../camel/camel-gpg-context.c:2023 ../camel/camel-smime-context.c:1241
 msgid "Encrypted content"
 msgstr "Contenu chiffrÃ©"
 
-#: ../camel/camel-gpg-context.c:1989
-msgid "Unable to parse message content"
-msgstr "Impossible d'analyser le contenu du message"
-
-#: ../camel/camel-gpg-context.c:2016 ../camel/camel-gpg-context.c:2068
-#: ../camel/providers/smtp/camel-smtp-transport.c:152
-#: ../camel/providers/smtp/camel-smtp-transport.c:207
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: ../camel/camel-lock-client.c:105
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Impossible de crÃ©er le tube de l'aide de verrouillageÂ : %s"
 
-#: ../camel/camel-lock-client.c:128
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Impossible de cloner l'aide de verrouillageÂ : %s"
 
-#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Impossible de verrouiller Â«Â %sÂ Â»Â : erreur de protocole avec l'aide de "
 "verrouillage"
 
-#: ../camel/camel-lock-client.c:223
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Impossible de verrouiller Â«Â %sÂ Â»"
 
-#: ../camel/camel-lock.c:104
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Impossible de crÃ©er le fichier de verrouillage pour %sÂ : %s"
 
-#: ../camel/camel-lock.c:147
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
 "DÃ©lai dÃ©passÃ© pour obtenir le fichier de verrouillage sur %s. RÃ©essayez plus "
 "tard."
 
-#: ../camel/camel-lock.c:206
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "L'obtention du verrou avec fcntl(2) a Ã©chouÃ©Â : %s"
@@ -1793,17 +1963,17 @@ msgstr "L'obtention du verrou avec fcntl(2) a Ã©chouÃ©Â : %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "L'obtention du verrou avec flock(2) a Ã©chouÃ©Â : %s"
 
-#: ../camel/camel-movemail.c:108
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Impossible de vÃ©rifier le fichier de courriels %sÂ : %s"
 
-#: ../camel/camel-movemail.c:121
+#: ../camel/camel-movemail.c:119
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Impossible d'ouvrir le fichier de courriels %sÂ : %s"
 
-#: ../camel/camel-movemail.c:130
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Impossible d'ouvrir le fichier temporaire de courriels %sÂ : %s"
@@ -1813,119 +1983,119 @@ msgstr "Impossible d'ouvrir le fichier temporaire de courriels %sÂ : %s"
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Le stockage du courriel dans le fichier temporaire %s a Ã©chouÃ©Â : %s"
 
-#: ../camel/camel-movemail.c:192
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Impossible de crÃ©er le tubeÂ : %s"
 
-#: ../camel/camel-movemail.c:205
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Impossible de clonerÂ : %s"
 
-#: ../camel/camel-movemail.c:243
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Le programme Movemail a Ã©chouÃ©Â : %s"
 
-#: ../camel/camel-movemail.c:244
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
-#: ../camel/camel-movemail.c:270
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erreur de lecture du fichier de courrielsÂ : %s"
 
-#: ../camel/camel-movemail.c:282
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erreur d'Ã©criture du fichier temporaire de courrielsÂ : %s"
 
-#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur de copie du fichier temporaire de courrielsÂ : %s"
 
-#: ../camel/camel-multipart-signed.c:582
-msgid "parse error"
-msgstr "erreur d'analyse"
+#: ../camel/camel-multipart-signed.c:285
+#, c-format
+msgid "No content available"
+msgstr "Aucun contenu disponible"
 
-#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
-#: ../camel/camel-net-utils.c:842
-#: ../camel/providers/pop3/camel-pop3-store.c:468
-#: ../camel/providers/pop3/camel-pop3-store.c:568
-msgid "Canceled"
-msgstr "AnnulÃ©"
+#: ../camel/camel-multipart-signed.c:293
+#, c-format
+msgid "No signature available"
+msgstr "Aucune signature disponible"
 
-#: ../camel/camel-net-utils.c:533
-msgid "cannot create thread"
-msgstr "impossible de crÃ©er le thread"
+#: ../camel/camel-multipart-signed.c:612
+#, c-format
+msgid "parse error"
+msgstr "erreur d'analyse"
 
-#: ../camel/camel-net-utils.c:698
+#: ../camel/camel-net-utils.c:693
 #, c-format
 msgid "Resolving: %s"
 msgstr "RÃ©solution deÂ : %s"
 
-#: ../camel/camel-net-utils.c:720
+#: ../camel/camel-net-utils.c:715
 msgid "Host lookup failed"
 msgstr "La rÃ©solution de l'hÃ´te a Ã©chouÃ©"
 
-#: ../camel/camel-net-utils.c:724
+#: ../camel/camel-net-utils.c:719
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "La rÃ©solution de l'hÃ´te a Ã©chouÃ©Â : %sÂ : %s"
 
-#: ../camel/camel-net-utils.c:846
+#: ../camel/camel-net-utils.c:842
 msgid "Resolving address"
 msgstr "RÃ©solution de l'adresse"
 
-#: ../camel/camel-net-utils.c:866
+#: ../camel/camel-net-utils.c:862
 msgid "Name lookup failed"
 msgstr "La rÃ©solution du nom a Ã©chouÃ©"
 
-#: ../camel/camel-net-utils.c:871
+#: ../camel/camel-net-utils.c:867
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "La rÃ©solution du nom a Ã©chouÃ©Â : %s"
 
-#: ../camel/camel-offline-folder.c:191
+#: ../camel/camel-offline-folder.c:169
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Synchronisation des messages du dossier Â«Â %sÂ Â» sur le disque"
 
-#: ../camel/camel-offline-journal.c:155 ../camel/camel-offline-journal.c:179
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:170
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Impossible d'Ã©crire le journal hors ligne pour le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/camel-provider.c:59
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "Fournisseur de dossier virtuel de courriels"
 
-#: ../camel/camel-provider.c:61
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture du courriel comme requÃªte sur un autre ensemble de dossiers"
 
-#: ../camel/camel-provider.c:187
+#: ../camel/camel-provider.c:188
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Impossible de charger %sÂ : le chargement de modules n'est pas pris en charge "
 "sur ce systÃ¨me."
 
-#: ../camel/camel-provider.c:196
+#: ../camel/camel-provider.c:197
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Impossible de charger %sÂ : %s"
 
-#: ../camel/camel-provider.c:205
+#: ../camel/camel-provider.c:206
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossible de charger %sÂ : aucun code d'initialisation dans le module."
 
-#: ../camel/camel-provider.c:385 ../camel/camel-session.c:128
+#: ../camel/camel-provider.c:388 ../camel/camel-session.c:207
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Aucun fournisseur disponible pour le protocole Â«Â %sÂ Â»"
@@ -1940,11 +2110,12 @@ msgstr ""
 "Cette option utilisera une identification anonyme pour se connecter au "
 "serveur."
 
-#: ../camel/camel-sasl-anonymous.c:65
+#: ../camel/camel-sasl-anonymous.c:69
+#, c-format
 msgid "Authentication failed."
 msgstr "L'authentification a Ã©chouÃ©."
 
-#: ../camel/camel-sasl-anonymous.c:75
+#: ../camel/camel-sasl-anonymous.c:80
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1953,7 +2124,7 @@ msgstr ""
 "Trace d'une adresse Ã©lectronique non valideÂ :\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:88
+#: ../camel/camel-sasl-anonymous.c:94
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1962,7 +2133,7 @@ msgstr ""
 "Information de trace opaque non valideÂ :\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:101
+#: ../camel/camel-sasl-anonymous.c:108
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1971,11 +2142,11 @@ msgstr ""
 "Information de trace non valideÂ :\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:41
+#: ../camel/camel-sasl-cram-md5.c:45
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:43
+#: ../camel/camel-sasl-cram-md5.c:47
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1983,11 +2154,11 @@ msgstr ""
 "Cette option utilisera un mot de passe sÃ©curisÃ© CRAM-MD5 pour se connecter "
 "au serveur si le serveur le supporte."
 
-#: ../camel/camel-sasl-digest-md5.c:52
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:54
+#: ../camel/camel-sasl-digest-md5.c:58
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -1995,42 +2166,48 @@ msgstr ""
 "Cette option utilisera un mot de passe sÃ©curisÃ© DIGEST-MD5 pour se connecter "
 "au serveur si le serveur le supporte."
 
-#: ../camel/camel-sasl-digest-md5.c:812
+#: ../camel/camel-sasl-digest-md5.c:818
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Serveur Challenge trop long (>2048 octets)"
 
-#: ../camel/camel-sasl-digest-md5.c:822
+#: ../camel/camel-sasl-digest-md5.c:829
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Serveur Challenge non valide\n"
 
-#: ../camel/camel-sasl-digest-md5.c:829
+#: ../camel/camel-sasl-digest-md5.c:837
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "Le serveur Challenge contient un jeton Â«Â Quality of ProtectionÂ Â» non valide"
 
-#: ../camel/camel-sasl-digest-md5.c:860
+#: ../camel/camel-sasl-digest-md5.c:869
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "La rÃ©ponse du serveur ne contenait pas de donnÃ©es d'autorisation"
 
-#: ../camel/camel-sasl-digest-md5.c:880
+#: ../camel/camel-sasl-digest-md5.c:890
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "La rÃ©ponse du serveur contenait des donnÃ©es d'autorisation incomplÃ¨tes"
 
-#: ../camel/camel-sasl-digest-md5.c:892
+#: ../camel/camel-sasl-digest-md5.c:903
+#, c-format
 msgid "Server response does not match"
 msgstr "La rÃ©ponse du serveur ne correspond pas"
 
-#: ../camel/camel-sasl-gssapi.c:78
+#: ../camel/camel-sasl-gssapi.c:80
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:80
+#: ../camel/camel-sasl-gssapi.c:82
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Cette option utilisera une authentification Kerberos 5 pour se connecter au "
 "serveur."
 
-#: ../camel/camel-sasl-gssapi.c:117
+#: ../camel/camel-sasl-gssapi.c:119
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2038,11 +2215,11 @@ msgstr ""
 "Le mÃ©canisme indiquÃ© n'est pas pris en charge par la rÃ©fÃ©rence fournie, ou "
 "il n'est pas reconnu par l'implÃ©mentation."
 
-#: ../camel/camel-sasl-gssapi.c:122
+#: ../camel/camel-sasl-gssapi.c:124
 msgid "The provided target_name parameter was ill-formed."
 msgstr "Le paramÃ¨tre target_name fourni est erronÃ©."
 
-#: ../camel/camel-sasl-gssapi.c:125
+#: ../camel/camel-sasl-gssapi.c:127
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2050,7 +2227,7 @@ msgstr ""
 "Le paramÃ¨tre target_name fourni contient un type de nom non valide ou non "
 "pris en charge."
 
-#: ../camel/camel-sasl-gssapi.c:129
+#: ../camel/camel-sasl-gssapi.c:131
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2058,7 +2235,7 @@ msgstr ""
 "Le paramÃ¨tre input_token contient des liaisons de canal diffÃ©rentes de "
 "celles indiquÃ©es via le paramÃ¨tre input_chan_bindings."
 
-#: ../camel/camel-sasl-gssapi.c:134
+#: ../camel/camel-sasl-gssapi.c:136
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2066,7 +2243,7 @@ msgstr ""
 "Le paramÃ¨tre input_token contient une signature non valide, ou une signature "
 "qui n'a pas pu Ãªtre vÃ©rifiÃ©e."
 
-#: ../camel/camel-sasl-gssapi.c:138
+#: ../camel/camel-sasl-gssapi.c:140
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2075,52 +2252,55 @@ msgstr ""
 "l'initiation contextuelle ou l'identificateur n'a rÃ©fÃ©rencÃ© aucune "
 "information d'identification."
 
-#: ../camel/camel-sasl-gssapi.c:143
+#: ../camel/camel-sasl-gssapi.c:145
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "L'identificateur contextuel fourni n'est liÃ© Ã  aucun contexte valide."
 
-#: ../camel/camel-sasl-gssapi.c:146
+#: ../camel/camel-sasl-gssapi.c:148
 msgid "The consistency checks performed on the input_token failed."
 msgstr "Les tests de cohÃ©rence appliquÃ©s au paramÃ¨tre input_token ont Ã©chouÃ©."
 
-#: ../camel/camel-sasl-gssapi.c:149
+#: ../camel/camel-sasl-gssapi.c:151
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 "Les tests de cohÃ©rence appliquÃ©s aux informations d'identification ont "
 "Ã©chouÃ©."
 
-#: ../camel/camel-sasl-gssapi.c:152
+#: ../camel/camel-sasl-gssapi.c:154
 msgid "The referenced credentials have expired."
 msgstr "Les informations d'identification ont expirÃ©."
 
-#: ../camel/camel-sasl-gssapi.c:158 ../camel/camel-sasl-gssapi.c:289
-#: ../camel/camel-sasl-gssapi.c:332 ../camel/camel-sasl-gssapi.c:348
-#: ../camel/providers/imap/camel-imap-store.c:1260
+#: ../camel/camel-sasl-gssapi.c:160 ../camel/camel-sasl-gssapi.c:296
+#: ../camel/camel-sasl-gssapi.c:340 ../camel/camel-sasl-gssapi.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:1171
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Mauvaise rÃ©ponse d'authentification en provenance du serveur."
 
-#: ../camel/camel-sasl-gssapi.c:359
+#: ../camel/camel-sasl-gssapi.c:369
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Couche de sÃ©curitÃ© non prise en charge."
 
-#: ../camel/camel-sasl-login.c:35
+#: ../camel/camel-sasl-login.c:39
 msgid "Login"
 msgstr "Connexion"
 
-#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
+#: ../camel/camel-sasl-login.c:41 ../camel/camel-sasl-plain.c:45
 msgid "This option will connect to the server using a simple password."
 msgstr ""
 "Cette option utilisera un simple mot de passe pour se connecter au serveur."
 
-#: ../camel/camel-sasl-login.c:96
+#: ../camel/camel-sasl-login.c:94
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Ã?tat d'authentification inconnu."
 
-#: ../camel/camel-sasl-ntlm.c:37
+#: ../camel/camel-sasl-ntlm.c:41
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:39
+#: ../camel/camel-sasl-ntlm.c:43
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2128,51 +2308,53 @@ msgstr ""
 "Cette option se connectera Ã  un serveur Windows via la mÃ©thode NTLM / Secure "
 "Password Authentification."
 
-#: ../camel/camel-sasl-plain.c:39
+#: ../camel/camel-sasl-plain.c:43
 msgid "PLAIN"
 msgstr "CLAIR"
 
-#: ../camel/camel-sasl-popb4smtp.c:42
+#: ../camel/camel-sasl-popb4smtp.c:46
 msgid "POP before SMTP"
 msgstr "POP avant SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:44
+#: ../camel/camel-sasl-popb4smtp.c:48
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Cette option autorisera une connexion POP avant d'essayer SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:78
+#: ../camel/camel-sasl-popb4smtp.c:82
 msgid "POP Source URI"
 msgstr "URI source POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:84
+#: ../camel/camel-sasl-popb4smtp.c:89
+#, c-format
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP avant authentification SMTP utilisant un transport inconnu"
 
-#: ../camel/camel-sasl-popb4smtp.c:91
+#: ../camel/camel-sasl-popb4smtp.c:97
+#, c-format
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP avant authentification SMTP utilisant une source non-pop"
 
-#: ../camel/camel-search-private.c:113
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "La compilation de l'expression rÃ©guliÃ¨re a Ã©chouÃ©Â : %sÂ : %s"
 
-#: ../camel/camel-service.c:210
+#: ../camel/camel-service.c:88
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL Â«Â %sÂ Â» nÃ©cessite un composant Â«Â nom d'utilisateurÂ Â»"
 
-#: ../camel/camel-service.c:214
+#: ../camel/camel-service.c:92
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL Â«Â %sÂ Â» nÃ©cessite un composant Â«Â hÃ´teÂ Â»"
 
-#: ../camel/camel-service.c:218
+#: ../camel/camel-service.c:96
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL Â«Â %sÂ Â» nÃ©cessite un composant Â«Â cheminÂ Â»"
 
-#: ../camel/camel-session.c:186
+#: ../camel/camel-session.c:261
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2182,237 +2364,305 @@ msgstr ""
 "%s"
 
 # Le premier argument est le type.
-#: ../camel/camel-session.c:652
+#: ../camel/camel-session.c:758
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Saisissez le mot de passe %s pour %s sur l'hÃ´te %s."
 
-#: ../camel/camel-smime-context.c:340 ../camel/camel-smime-context.c:975
+#: ../camel/camel-smime-context.c:348 ../camel/camel-smime-context.c:1041
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Impossible de trouver de certificat pour Â«Â %sÂ Â»"
 
-#: ../camel/camel-smime-context.c:346
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot create CMS message"
 msgstr "Impossible de crÃ©er le message CMS"
 
-#: ../camel/camel-smime-context.c:351
+#: ../camel/camel-smime-context.c:381
 msgid "Cannot create CMS signed data"
 msgstr "Impossible de crÃ©er la donnÃ©e signÃ©e CMS"
 
-#: ../camel/camel-smime-context.c:357
+#: ../camel/camel-smime-context.c:387
 msgid "Cannot attach CMS signed data"
 msgstr "Impossible de joindre la donnÃ©e signÃ©e CMS"
 
-#: ../camel/camel-smime-context.c:364
+#: ../camel/camel-smime-context.c:394
 msgid "Cannot attach CMS data"
 msgstr "Impossible de joindre la donnÃ©e CMS"
 
-#: ../camel/camel-smime-context.c:370
+#: ../camel/camel-smime-context.c:400
 msgid "Cannot create CMS Signer information"
 msgstr "Impossible de crÃ©er les informations sur le signataire CMS"
 
-#: ../camel/camel-smime-context.c:376
+#: ../camel/camel-smime-context.c:406
 msgid "Cannot find certificate chain"
 msgstr "Impossible de trouver la chaÃ®ne de certification"
 
-#: ../camel/camel-smime-context.c:382
+#: ../camel/camel-smime-context.c:412
 msgid "Cannot add CMS Signing time"
 msgstr "Impossible d'ajouter l'heure de signature CMS"
 
-#: ../camel/camel-smime-context.c:406 ../camel/camel-smime-context.c:421
+#: ../camel/camel-smime-context.c:436 ../camel/camel-smime-context.c:451
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Le certificat de chiffrement pour Â«Â %sÂ Â» n'existe pas"
 
-#: ../camel/camel-smime-context.c:428
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Impossible d'ajouter l'attribut SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:433
+#: ../camel/camel-smime-context.c:463
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Impossible d'ajouter l'attribut MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:438
+#: ../camel/camel-smime-context.c:468
 msgid "Cannot add encryption certificate"
 msgstr "Impossible d'ajouter le certificat de chiffrement"
 
-#: ../camel/camel-smime-context.c:444
+#: ../camel/camel-smime-context.c:474
 msgid "Cannot add CMS Signer information"
 msgstr "Impossible d'ajouter les informations de signataire CMS"
 
-#: ../camel/camel-smime-context.c:476
+#: ../camel/camel-smime-context.c:506
 msgid "Unverified"
 msgstr "Non vÃ©rifiÃ©e"
 
-#: ../camel/camel-smime-context.c:478
+#: ../camel/camel-smime-context.c:508
 msgid "Good signature"
 msgstr "Bonne signature"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:510
 msgid "Bad signature"
 msgstr "Mauvaise signature"
 
-#: ../camel/camel-smime-context.c:482
+#: ../camel/camel-smime-context.c:512
 msgid "Content tampered with or altered in transit"
 msgstr "Contenu modifiÃ© avec ou pendant le transport"
 
-#: ../camel/camel-smime-context.c:484
+#: ../camel/camel-smime-context.c:514
 msgid "Signing certificate not found"
 msgstr "Certificat de signature non trouvÃ©"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:516
 msgid "Signing certificate not trusted"
 msgstr "Certificat de signature non Ã©prouvÃ©"
 
-#: ../camel/camel-smime-context.c:488
+#: ../camel/camel-smime-context.c:518
 msgid "Signature algorithm unknown"
 msgstr "Algorithme de signature inconnu"
 
-#: ../camel/camel-smime-context.c:490
+#: ../camel/camel-smime-context.c:520
 msgid "Signature algorithm unsupported"
 msgstr "Algorithme de signature non pris en charge"
 
-#: ../camel/camel-smime-context.c:492
+#: ../camel/camel-smime-context.c:522
 msgid "Malformed signature"
 msgstr "Signature erronÃ©e"
 
-#: ../camel/camel-smime-context.c:494
+#: ../camel/camel-smime-context.c:524
 msgid "Processing error"
 msgstr "Erreur de traitement"
 
-#: ../camel/camel-smime-context.c:536
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Aucune donnÃ©e signÃ©e dans la signature"
 
-#: ../camel/camel-smime-context.c:541
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Digests absents de l'enveloppe de donnÃ©es"
 
-#: ../camel/camel-smime-context.c:554 ../camel/camel-smime-context.c:565
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Impossible de calculer les digests"
 
-#: ../camel/camel-smime-context.c:572 ../camel/camel-smime-context.c:576
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Impossible de dÃ©finir les digests des messages"
 
-#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:591
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "L'importation du certificat a Ã©chouÃ©"
 
-#: ../camel/camel-smime-context.c:601
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "Message contenant uniquement un certificat, impossible de vÃ©rifier les "
 "certificats"
 
-#: ../camel/camel-smime-context.c:604
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "Message contenant uniquement un certificat, certificats importÃ©s et vÃ©rifiÃ©s"
 
-#: ../camel/camel-smime-context.c:608
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Digests de signatures introuvables"
 
-#: ../camel/camel-smime-context.c:624
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "SignataireÂ : %s <%s>Â : %s\n"
 
-#: ../camel/camel-smime-context.c:769 ../camel/camel-smime-context.c:1047
+#: ../camel/camel-smime-context.c:832 ../camel/camel-smime-context.c:1114
 msgid "Cannot create encoder context"
 msgstr "Impossible de crÃ©er le contexte de chiffrement"
 
-#: ../camel/camel-smime-context.c:775
+#: ../camel/camel-smime-context.c:838
 msgid "Failed to add data to CMS encoder"
 msgstr "Impossible d'ajouter les donnÃ©es au chiffrement CMS"
 
-#: ../camel/camel-smime-context.c:780 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:843 ../camel/camel-smime-context.c:1131
 msgid "Failed to encode data"
 msgstr "Le chiffrement de donnÃ©es a Ã©chouÃ©"
 
-#: ../camel/camel-smime-context.c:915 ../camel/camel-smime-context.c:1153
+#: ../camel/camel-smime-context.c:981 ../camel/camel-smime-context.c:1220
 msgid "Decoder failed"
 msgstr "Le dÃ©chiffrement a Ã©chouÃ©"
 
-#: ../camel/camel-smime-context.c:982
+#: ../camel/camel-smime-context.c:1049
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Impossible de trouver un algorithme de chiffrement par bloc commun"
 
 # encryption bulk key -> bulk encryption key ?
-#: ../camel/camel-smime-context.c:990
+#: ../camel/camel-smime-context.c:1057
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Impossible d'allouer un emplacement Ã  la clÃ© de chiffrement par bloc"
 
-#: ../camel/camel-smime-context.c:1001
+#: ../camel/camel-smime-context.c:1068
 msgid "Cannot create CMS Message"
 msgstr "Impossible de crÃ©er le message CMS"
 
-#: ../camel/camel-smime-context.c:1007
+#: ../camel/camel-smime-context.c:1074
 msgid "Cannot create CMS Enveloped data"
 msgstr "Impossible de crÃ©er les donnÃ©es encapsulÃ©es CMS"
 
-#: ../camel/camel-smime-context.c:1013
+#: ../camel/camel-smime-context.c:1080
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Impossible d'attacher les donnÃ©es encapsulÃ©es CMS"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1086
 msgid "Cannot attach CMS data object"
 msgstr "Impossible d'attacher l'objet de donnÃ©es CMS"
 
-#: ../camel/camel-smime-context.c:1028
+#: ../camel/camel-smime-context.c:1095
 msgid "Cannot create CMS Recipient information"
 msgstr "Impossible de crÃ©er les informations de destinataire CMS"
 
-#: ../camel/camel-smime-context.c:1033
+#: ../camel/camel-smime-context.c:1100
 msgid "Cannot add CMS Recipient information"
 msgstr "Impossible d'ajouter les informations de destinataire CMS"
 
-#: ../camel/camel-smime-context.c:1059
+#: ../camel/camel-smime-context.c:1125
 msgid "Failed to add data to encoder"
 msgstr "L'ajout des donnÃ©es Ã  chiffrer a Ã©chouÃ©"
 
-#: ../camel/camel-smime-context.c:1160
+#: ../camel/camel-smime-context.c:1227
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "DÃ©chiffrement S/MIMEÂ : aucun contenu chiffrÃ© trouvÃ©"
 
-#: ../camel/camel-store.c:354
+#: ../camel/camel-store.c:444
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Impossible de crÃ©er le dossier Â«Â %sÂ Â»Â : le dossier existe"
 
-#: ../camel/camel-store.c:458
+#: ../camel/camel-store.c:543
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Impossible de crÃ©er le dossierÂ : %sÂ : le dossier existe"
 
-#: ../camel/camel-store.c:526 ../camel/camel-vee-store.c:232
-#: ../camel/providers/local/camel-maildir-store.c:214
+#: ../camel/camel-store.c:616 ../camel/camel-vee-store.c:263
+#: ../camel/providers/local/camel-maildir-store.c:224
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossierÂ : %sÂ : opÃ©ration non valide"
 
-#: ../camel/camel-store.c:585 ../camel/camel-vee-store.c:186
-#: ../camel/providers/local/camel-maildir-store.c:286
+#: ../camel/camel-store.c:680 ../camel/camel-vee-store.c:213
+#: ../camel/providers/local/camel-maildir-store.c:314
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossierÂ : %sÂ : opÃ©ration non valide"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:898 ../camel/camel-vtrash-folder.c:49
+#: ../camel/camel-store.c:1128 ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Corbeille"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:901 ../camel/camel-vtrash-folder.c:51
+#: ../camel/camel-store.c:1131 ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Pourriels"
 
-#: ../camel/camel-tcp-stream-ssl.c:711
+#: ../camel/camel-tcp-stream-raw.c:809
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "L'hÃ´te serveur mandataire ne prend pas en charge SOCKS5"
+
+#: ../camel/camel-tcp-stream-raw.c:815
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Impossible de trouver un type d'authentification adÃ©quatÂ : code 0x%x"
+
+#: ../camel/camel-tcp-stream-raw.c:827
+msgid "General SOCKS server failure"
+msgstr "Erreur gÃ©nÃ©rale de serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:828
+msgid "SOCKS server's rules do not allow connection"
+msgstr "Les rÃ¨gles du serveur SOCKS ne permettent pas la connexion"
+
+#: ../camel/camel-tcp-stream-raw.c:829
+msgid "Network is unreachable from SOCKS server"
+msgstr "Le rÃ©seau n'est pas atteignable depuis le serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:830
+msgid "Host is unreachable from SOCKS server"
+msgstr "L'hÃ´te n'est pas atteignable depuis le serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:831
+msgid "Connection refused"
+msgstr "Connexion refusÃ©e"
+
+#: ../camel/camel-tcp-stream-raw.c:832
+msgid "Time-to-live expired"
+msgstr "Expiration TTL (Time-to-live)"
+
+#: ../camel/camel-tcp-stream-raw.c:833
+msgid "Command not supported by SOCKS server"
+msgstr "La commande n'est pas prise en charge par le serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:834
+msgid "Address type not supported by SOCKS server"
+msgstr "Le type d'adresse n'est pas pris en charge par le serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:835
+msgid "Unknown error from SOCKS server"
+msgstr "Erreur inconnueÂ en provenance du serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:865
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Une adresse de type inconnu a Ã©tÃ© obtenue du serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:882
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "RÃ©ponse incomplÃ¨te en provenance du serveur SOCKS"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Le nom d'hÃ´te est trop long (maximum 255 caractÃ¨res)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:929 ../camel/camel-tcp-stream-raw.c:939
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "RÃ©ponse du serveur mandataire non valide"
+
+#: ../camel/camel-tcp-stream-ssl.c:457
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2425,16 +2675,16 @@ msgstr ""
 "EmpreinteÂ :        %s\n"
 "SignatureÂ :        %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:717
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "GOOD"
 msgstr "BON"
 
-#: ../camel/camel-tcp-stream-ssl.c:717
+#: ../camel/camel-tcp-stream-ssl.c:463
 msgid "BAD"
 msgstr "MAUVAIS"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:721
+#: ../camel/camel-tcp-stream-ssl.c:467
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2449,7 +2699,7 @@ msgstr ""
 "\n"
 "DÃ©sirez-vous accepterÂ ?"
 
-#: ../camel/camel-tcp-stream-ssl.c:765
+#: ../camel/camel-tcp-stream-ssl.c:511
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2458,7 +2708,7 @@ msgstr ""
 "ProblÃ¨me de certificatÂ : %s\n"
 "Ã?metteurÂ : %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:817
+#: ../camel/camel-tcp-stream-ssl.c:563
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2467,7 +2717,7 @@ msgstr ""
 "Mauvais domaine de certificatÂ : %s\n"
 "Ã?metteurÂ : %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:835
+#: ../camel/camel-tcp-stream-ssl.c:581
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2476,7 +2726,7 @@ msgstr ""
 "Certificat expirÃ©Â : %s\n"
 "Ã?metteurÂ : %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:852
+#: ../camel/camel-tcp-stream-ssl.c:598
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2485,50 +2735,51 @@ msgstr ""
 "Liste de rÃ©vocations de certificat expirÃ©eÂ : %s\n"
 "Ã?metteurÂ : %s"
 
-#: ../camel/camel-url.c:315
+#: ../camel/camel-url.c:314
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Impossible d'analyser l'URL Â«Â %sÂ Â»"
 
-#: ../camel/camel-vee-folder.c:586
+#: ../camel/camel-vee-folder.c:1044
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Erreur lors du stockage de Â«Â %sÂ Â»Â : %s"
+msgid "Error storing '%s': "
+msgstr "Erreur lors du stockage de Â«Â %sÂ Â»Â : "
 
-#: ../camel/camel-vee-folder.c:663
+#: ../camel/camel-vee-folder.c:1117
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Aucun message de type %s dans %s"
 
-#: ../camel/camel-vee-folder.c:822 ../camel/camel-vee-folder.c:828
+#: ../camel/camel-vee-folder.c:1133 ../camel/camel-vee-folder.c:1148
+#, c-format
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Impossible de copier ou dÃ©placer des messages vers des dossiers virtuels"
 
-#: ../camel/camel-vee-store.c:122 ../camel/camel-vee-store.c:123
-#: ../camel/camel-vee-store.c:378
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:417
 msgid "Unmatched"
 msgstr "Autres courriels"
 
-#: ../camel/camel-vee-store.c:195
+#: ../camel/camel-vee-store.c:223
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossierÂ : %sÂ : dossier inexistant"
 
-#: ../camel/camel-vee-store.c:257
+#: ../camel/camel-vee-store.c:289
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossierÂ : %sÂ : dossier inexistant"
 
-#: ../camel/camel-vtrash-folder.c:50
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Impossible de copier des messages vers le dossier Corbeille"
 
-#: ../camel/camel-vtrash-folder.c:52
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Impossible de copier des messages dans le dossier de pourriel"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2537,239 +2788,234 @@ msgstr ""
 "Impossible d'obtenir le messageÂ : %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
-#: ../camel/providers/local/camel-maildir-folder.c:258
-#: ../camel/providers/local/camel-maildir-folder.c:286
-#: ../camel/providers/local/camel-maildir-folder.c:391
-#: ../camel/providers/local/camel-mbox-folder.c:354
-#: ../camel/providers/local/camel-mbox-folder.c:404
-#: ../camel/providers/local/camel-mh-folder.c:221
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:139
+#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:268
+#: ../camel/providers/local/camel-maildir-folder.c:380
+#: ../camel/providers/local/camel-mbox-folder.c:329
+#: ../camel/providers/local/camel-mbox-folder.c:380
+#: ../camel/providers/local/camel-mh-folder.c:215
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:140
-#: ../camel/providers/pop3/camel-pop3-folder.c:262
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:641
-#: ../camel/providers/pop3/camel-pop3-folder.c:659
-msgid "User canceled"
-msgstr "OpÃ©ration annulÃ©e"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:147
-#: ../camel/providers/nntp/camel-nntp-folder.c:149
-#: ../camel/providers/nntp/camel-nntp-folder.c:158
-#: ../camel/providers/nntp/camel-nntp-folder.c:233
-#: ../camel/providers/pop3/camel-pop3-folder.c:382
-#: ../camel/providers/pop3/camel-pop3-folder.c:584
-#: ../camel/providers/pop3/camel-pop3-folder.c:644
-#: ../camel/providers/pop3/camel-pop3-folder.c:651
-#: ../camel/providers/pop3/camel-pop3-folder.c:662
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:244
+#: ../camel/providers/nntp/camel-nntp-folder.c:337
+#: ../camel/providers/pop3/camel-pop3-folder.c:714
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Impossible d'obtenir le messageÂ : %sÂ : %s"
+msgid "Cannot get message %s: "
+msgstr "Impossible d'obtenir le message %sÂ : "
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:164
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2522
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:176
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2645
+#, c-format
 msgid "This message is not available in offline mode."
 msgstr "Ce message n'est pas disponible en mode hors ligne."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:193
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2024
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2075
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:203
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:213
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2109
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2163
+#, c-format
 msgid "Could not get message"
 msgstr "Impossible d'obtenir le message"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:991
-#: ../camel/providers/imap/camel-imap-folder.c:272
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1038
+#: ../camel/providers/imap/camel-imap-folder.c:376
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossible de charger le rÃ©sumÃ© pour %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1064
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1112
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Recherche des messages supprimÃ©s %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1338
-msgid "Trash Folder Full. Please Empty."
-msgstr "Le dossier de la corbeille est plein. Veuillez le vider."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1570
-#: ../camel/providers/groupwise/camel-groupwise-store.c:622
-#: ../camel/providers/groupwise/camel-groupwise-store.c:752
-#: ../camel/providers/imap/camel-imap-folder.c:3407
-#: ../camel/providers/imap/camel-imap-folder.c:3483
-#: ../camel/providers/imapx/camel-imapx-server.c:2969
-#: ../camel/providers/imapx/camel-imapx-server.c:3055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1637
+#: ../camel/providers/groupwise/camel-groupwise-store.c:654
+#: ../camel/providers/groupwise/camel-groupwise-store.c:779
+#: ../camel/providers/imap/camel-imap-folder.c:3814
+#: ../camel/providers/imap/camel-imap-folder.c:3892
+#: ../camel/providers/imapx/camel-imapx-server.c:3704
+#: ../camel/providers/imapx/camel-imapx-server.c:3828
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "RÃ©cupÃ©ration des informations de rÃ©sumÃ© des nouveaux messages dans %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2376
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2419
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2475
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2525
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Impossible d'ajouter le message au dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2407
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2511
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Impossible de crÃ©er le messageÂ : %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:275
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:240
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Impossible d'obtenir le dossier %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:337
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:303
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "Impossible d'ajouter le message en mode hors ligneÂ : cache indisponible"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:353
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Impossible d'ajouter le message en mode hors ligneÂ : %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:320
+msgid "Cannot append message in offline mode: "
+msgstr "Impossible d'ajouter le message en mode hors ligneÂ : "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:49
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "Recherche de nouveaux courriels"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
 #: ../camel/providers/imap/camel-imap-provider.c:42
-#: ../camel/providers/imapx/camel-imapx-provider.c:45
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "C_heck for new messages in all folders"
 msgstr "_VÃ©rifier les nouveaux messages dans tous les dossiers"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
 #: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
 #: ../camel/providers/local/camel-local-provider.c:42
 #: ../camel/providers/local/camel-local-provider.c:82
 #: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Options"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Appliquer les filtres aux nouveaux messages dans la boÃ®te de rÃ©ception sur "
 "ce serveur"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "VÃ©rifier si les nouveaux messages contiennent des _pourriels"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
 #: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imapx/camel-imapx-provider.c:77
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "VÃ©rifier la prÃ©sence de pourriels dans la _boÃ®te de rÃ©ception"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "S_ynchroniser automatiquement les comptes localement"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "ParamÃ¨tres SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:70
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Port SOAP de l'agent de bureau de posteÂ :"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:82
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:81
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:84
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "For accessing Novell GroupWise servers"
 msgstr "Pour accÃ©der aux serveurs Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:99
-#: ../camel/providers/imap/camel-imap-provider.c:96
-#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:98
+#: ../camel/providers/imap/camel-imap-provider.c:97
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
 #: ../camel/providers/nntp/camel-nntp-provider.c:72
 #: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:101
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:100
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "Cette option va se connecter au serveur GroupWise en utilisant un mot de "
 "passe en clair."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:100
+#: ../camel/providers/groupwise/camel-groupwise-store.c:107
+#, c-format
 msgid "Host or user not available in url"
 msgstr "L'hÃ´te ou l'utilisateur n'est pas disponible dans l'URL"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:195
-#: ../camel/providers/imap/camel-imap-store.c:1344
-#: ../camel/providers/imapx/camel-imapx-server.c:2299
+#: ../camel/providers/groupwise/camel-groupwise-store.c:207
+#: ../camel/providers/imap/camel-imap-store.c:1188
+#: ../camel/providers/imapx/camel-imapx-server.c:2958
+#, c-format
 msgid "You did not enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:308
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "Certaines fonctionnalitÃ©s peuvent ne pas fonctionner correctement avec la "
 "version actuelle de votre serveur"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:529
-#: ../camel/providers/imap/camel-imap-store.c:1867
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imapx/camel-imapx-store.c:314
+#: ../camel/providers/groupwise/camel-groupwise-store.c:550
+#: ../camel/providers/imap/camel-imap-store.c:1757
+#: ../camel/providers/imap/camel-imap-store.c:1952
+#: ../camel/providers/imapx/camel-imapx-store.c:410
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de dossier Â«Â %sÂ Â»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1197
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1187
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Impossible de crÃ©er des dossiers GroupWise en mode hors ligne."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1211
-#: ../camel/providers/imap/camel-imap-store.c:1942
-#: ../camel/providers/imap/camel-imap-store.c:2342
-#: ../camel/providers/imapx/camel-imapx-store.c:749
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1196
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Impossible de crÃ©er un dossier systÃ¨me spÃ©cial"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1206
+#: ../camel/providers/imap/camel-imap-store.c:1835
+#: ../camel/providers/imap/camel-imap-store.c:2257
+#: ../camel/providers/imapx/camel-imapx-store.c:873
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisÃ© Ã  contenir des sous-dossiers"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1290
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1313
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1289
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1314
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Impossible de renommer le dossier GroupWise Â«Â %sÂ Â» en Â«Â %sÂ Â»"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1345
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:111
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1348
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:54
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Serveur GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1347
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1350
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Service GroupWise pour %s sur %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:113
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:58
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "Distribution du courriel GroupWise via %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:155
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:95
 msgid "Sending Message"
 msgstr "Envoi du message"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:162
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:105
+#, c-format
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Impossible d'obtenir le dossierÂ : opÃ©ration non valide sur ce stockage"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:203
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:152
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2779,38 +3025,36 @@ msgstr ""
 "ajoutÃ©s Ã  votre boÃ®te d'envoi. RÃ©-expÃ©diez-les en appuyant sur Envoyer/"
 "Recevoir aprÃ¨s avoir supprimÃ©/archivÃ© quelques uns de vos courriels.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:201
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:157
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossible d'envoyer le messageÂ : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:177
-#: ../camel/providers/imap/camel-imap-command.c:261
+#: ../camel/providers/imap/camel-imap-command.c:190
+#: ../camel/providers/imap/camel-imap-command.c:288
+#, c-format
 msgid "No output stream"
 msgstr "Pas de flux de sortie"
 
-#: ../camel/providers/imap/camel-imap-command.c:182
-#: ../camel/providers/imap/camel-imap-command.c:266
+#: ../camel/providers/imap/camel-imap-command.c:198
+#: ../camel/providers/imap/camel-imap-command.c:296
+#, c-format
 msgid "No input stream"
 msgstr "Pas de flux d'entrÃ©e"
 
-#: ../camel/providers/imap/camel-imap-command.c:225
-#: ../camel/providers/imap/camel-imap-command.c:274
-#: ../camel/providers/imap/camel-imap-command.c:488
-#: ../camel/providers/imap/camel-imap-store.c:3112
+#: ../camel/providers/imap/camel-imap-command.c:245
+#, c-format
 msgid "Operation cancelled"
 msgstr "OpÃ©ration annulÃ©e"
 
-#: ../camel/providers/imap/camel-imap-command.c:327
-#: ../camel/providers/imap/camel-imap-store.c:3117
+#: ../camel/providers/imap/camel-imap-command.c:353
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "DÃ©connectÃ© du serveur de maniÃ¨re inattendueÂ : %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:348
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2819,114 +3063,103 @@ msgstr ""
 "Alerte du serveur IMAP %s %sÂ : \n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:417
+#: ../camel/providers/imap/camel-imap-command.c:444
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RÃ©ponse inattendue du serveur IMAPÂ : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:427
+#: ../camel/providers/imap/camel-imap-command.c:456
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "La commande IMAP a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:502
+#: ../camel/providers/imap/camel-imap-command.c:532
+#, c-format
 msgid "Server response ended too soon."
 msgstr "La rÃ©ponse du serveur s'est terminÃ©e trop tÃ´t."
 
-#: ../camel/providers/imap/camel-imap-command.c:708
+#: ../camel/providers/imap/camel-imap-command.c:740
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La rÃ©ponse du serveur IMAP ne contient pas l'information %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:744
+#: ../camel/providers/imap/camel-imap-command.c:778
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "RÃ©ponse OK inattendue du serveur IMAPÂ : %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:67
+#: ../camel/providers/imap/camel-imap-folder.c:281
 msgid "Always check for new mail in this folder"
 msgstr "Toujours vÃ©rifier la prÃ©sence de nouveaux messages dans ce dossier"
 
-#: ../camel/providers/imap/camel-imap-folder.c:253
+#: ../camel/providers/imap/camel-imap-folder.c:353
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossible de crÃ©er le rÃ©pertoire %sÂ : %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:895
-#: ../camel/providers/imapx/camel-imapx-server.c:2998
+#: ../camel/providers/imap/camel-imap-folder.c:960
+#: ../camel/providers/imapx/camel-imapx-server.c:3743
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Examen des messages modifiÃ©s dans %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1964
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Ã?tat de rÃ©ponse inattendu Â«Â %sÂ Â» aprÃ¨s la commande APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:1979
-msgid "No response on continuation after APPEND command"
-msgstr "Pas de rÃ©ponse sur la suite, aprÃ¨s la commande APPEND"
+#: ../camel/providers/imap/camel-imap-folder.c:3231
+msgid "Unable to retrieve message: "
+msgstr "Impossible de rÃ©cupÃ©rer le messageÂ : "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2024
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Une erreur inconnue est survenue durant la commande APPEND"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2855
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Impossible de rÃ©cupÃ©rer le messageÂ : %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2890
-#: ../camel/providers/imapx/camel-imapx-server.c:3979
+#: ../camel/providers/imap/camel-imap-folder.c:3266
+#: ../camel/providers/imapx/camel-imapx-server.c:4918
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Impossible d'obtenir le message qui a pour identificateur Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2891
-#: ../camel/providers/imapx/camel-imapx-server.c:3980
+#: ../camel/providers/imap/camel-imap-folder.c:3267
+#: ../camel/providers/imapx/camel-imapx-server.c:4919
 msgid "No such message available."
 msgstr "Aucun message correspondant."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2952
-#: ../camel/providers/imap/camel-imap-folder.c:3797
-#: ../camel/providers/nntp/camel-nntp-folder.c:219
+#: ../camel/providers/imap/camel-imap-folder.c:3341
+#: ../camel/providers/imap/camel-imap-folder.c:4211
+#: ../camel/providers/nntp/camel-nntp-folder.c:326
+#, c-format
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3610
+#: ../camel/providers/imap/camel-imap-folder.c:4021
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 "RÃ©ponse du serveur incomplÃ¨teÂ : pas d'information fournie pour le message %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3618
+#: ../camel/providers/imap/camel-imap-folder.c:4031
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "RÃ©ponse du serveur incomplÃ¨teÂ : aucun UID fourni pour le message %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3835
+#: ../camel/providers/imap/camel-imap-folder.c:4251
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Impossible de trouver le corps du message dans la rÃ©ponse FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:176
-#: ../camel/providers/imap/camel-imap-message-cache.c:239
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Impossible d'ouvrir le rÃ©pertoire de cacheÂ : %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Impossible d'ouvrir le rÃ©pertoire de cacheÂ : "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:325
-#: ../camel/providers/imap/camel-imap-message-cache.c:382
-#: ../camel/providers/imap/camel-imap-message-cache.c:413
-#: ../camel/providers/imap/camel-imap-message-cache.c:445
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "La mise en cache du message %s a Ã©chouÃ©Â : %s"
 
+#: ../camel/providers/imap/camel-imap-message-cache.c:388
+#, c-format
+msgid "Failed to cache message %s: "
+msgstr "La mise en cache du message %s a Ã©chouÃ©Â : "
+
 #: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "La mise en cache de %s a Ã©chouÃ©Â : %s"
+msgid "Failed to cache %s: "
+msgstr "La mise en cache de %s a Ã©chouÃ©Â : "
 
 #: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:41
@@ -2934,17 +3167,17 @@ msgid "Checking for New Mail"
 msgstr "Recherche de nouveaux courriels"
 
 #: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:49
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_VÃ©rifier les nouveaux messages dans les dossiers abonnÃ©s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
 msgid "Connection to Server"
 msgstr "Connexion au serveur"
 
 #: ../camel/providers/imap/camel-imap-provider.c:50
-#: ../camel/providers/imapx/camel-imapx-provider.c:53
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
 msgid "_Use custom command to connect to server"
 msgstr "_Utiliser une commande personnalisÃ©e pour se connecteur au serveur"
 
@@ -2953,18 +3186,18 @@ msgid "Co_mmand:"
 msgstr "Co_mmandeÂ :"
 
 #: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
 #: ../camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "Dossiers"
 
 #: ../camel/providers/imap/camel-imap-provider.c:58
-#: ../camel/providers/imapx/camel-imapx-provider.c:63
+#: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "_Show only subscribed folders"
 msgstr "_Afficher uniquement les dossiers abonnÃ©s"
 
 #: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "O_verride server-supplied folder namespace"
 msgstr "_Outrepasser l'espace de noms fourni par le serveur"
 
@@ -2973,19 +3206,19 @@ msgid "Names_pace:"
 msgstr "Es_pace de nomsÂ :"
 
 #: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imapx/camel-imapx-provider.c:73
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 "A_ppliquer les filtres aux nouveaux messages dans la boÃ®te de rÃ©ception sur "
 "ce serveur"
 
 #: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 msgid "Check new messages for Jun_k contents"
 msgstr "VÃ©rifier si les nouveaux messages contiennent des _pourriels"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:81
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "S_ynchroniser automatiquement localement les courriels distants"
 
@@ -2994,113 +3227,118 @@ msgid "IMAP"
 msgstr "IMAP"
 
 #: ../camel/providers/imap/camel-imap-provider.c:81
-#: ../camel/providers/imapx/camel-imapx-provider.c:89
+#: ../camel/providers/imapx/camel-imapx-provider.c:91
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pour lire et stocker les courriels sur des serveurs IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/imapx/camel-imapx-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:99
+#: ../camel/providers/imapx/camel-imapx-provider.c:107
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Cette option utilisera un mot de passe en clair pour se connecter au serveur "
 "IMAP."
 
-#: ../camel/providers/imap/camel-imap-store.c:423
-#: ../camel/providers/imapx/camel-imapx-store.c:184
+#: ../camel/providers/imap/camel-imap-store.c:310
+#: ../camel/providers/imapx/camel-imapx-store.c:220
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serveur IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:425
-#: ../camel/providers/imapx/camel-imapx-store.c:186
+#: ../camel/providers/imap/camel-imap-store.c:312
+#: ../camel/providers/imapx/camel-imapx-store.c:222
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Service IMAP pour %s sur %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:554
-#: ../camel/providers/imap/camel-imap-store.c:569
-#: ../camel/providers/nntp/camel-nntp-store.c:174
-#: ../camel/providers/nntp/camel-nntp-store.c:189
-#: ../camel/providers/pop3/camel-pop3-store.c:182
-#: ../camel/providers/pop3/camel-pop3-store.c:196
-#: ../camel/providers/smtp/camel-smtp-transport.c:246
-#: ../camel/providers/smtp/camel-smtp-transport.c:261
+#: ../camel/providers/imap/camel-imap-store.c:447
+#: ../camel/providers/nntp/camel-nntp-store.c:234
+#: ../camel/providers/pop3/camel-pop3-store.c:132
+#: ../camel/providers/smtp/camel-smtp-transport.c:215
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Impossible de se connecter Ã  %sÂ : %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:555
-#: ../camel/providers/nntp/camel-nntp-store.c:175
-#: ../camel/providers/pop3/camel-pop3-store.c:183
-#: ../camel/providers/smtp/camel-smtp-transport.c:247
+#: ../camel/providers/imap/camel-imap-store.c:448
+#: ../camel/providers/nntp/camel-nntp-store.c:235
+#: ../camel/providers/pop3/camel-pop3-store.c:133
+#: ../camel/providers/smtp/camel-smtp-transport.c:216
 msgid "SSL unavailable"
 msgstr "SSL non disponible"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:848
-#: ../camel/providers/imapx/camel-imapx-server.c:2161
-msgid "Connection cancelled"
-msgstr "Connexion annulÃ©e"
+#: ../camel/providers/imap/camel-imap-store.c:466
+#: ../camel/providers/nntp/camel-nntp-store.c:252
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Impossible de se connecter Ã  %sÂ : "
 
-#: ../camel/providers/imap/camel-imap-store.c:677
-#: ../camel/providers/imap/camel-imap-store.c:696
-#: ../camel/providers/imap/camel-imap-store.c:702
-#: ../camel/providers/imap/camel-imap-store.c:728
-#: ../camel/providers/imapx/camel-imapx-server.c:2206
-#: ../camel/providers/imapx/camel-imapx-server.c:2228
+#: ../camel/providers/imap/camel-imap-store.c:572
+#: ../camel/providers/imap/camel-imap-store.c:592
+#: ../camel/providers/imap/camel-imap-store.c:599
+#: ../camel/providers/imap/camel-imap-store.c:626
+#: ../camel/providers/imapx/camel-imapx-server.c:2811
+#: ../camel/providers/imapx/camel-imapx-server.c:2847
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "La connexion au serveur IMAP %s en mode sÃ©curisÃ© a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:678
-#: ../camel/providers/imapx/camel-imapx-server.c:2207
-#: ../camel/providers/smtp/camel-smtp-transport.c:319
+#: ../camel/providers/imap/camel-imap-store.c:573
+#: ../camel/providers/imapx/camel-imapx-server.c:2812
+#: ../camel/providers/smtp/camel-smtp-transport.c:295
 msgid "STARTTLS not supported"
 msgstr "STARTTLS non pris en charge"
 
-#: ../camel/providers/imap/camel-imap-store.c:697
-#: ../camel/providers/imapx/camel-imapx-server.c:2229
+#: ../camel/providers/imap/camel-imap-store.c:593
+#: ../camel/providers/imapx/camel-imapx-server.c:2848
 msgid "SSL negotiations failed"
 msgstr "Les nÃ©gociations SSL ont Ã©chouÃ©"
 
-#: ../camel/providers/imap/camel-imap-store.c:703
-#: ../camel/providers/smtp/camel-smtp-transport.c:358
+#: ../camel/providers/imap/camel-imap-store.c:600
+#: ../camel/providers/smtp/camel-smtp-transport.c:339
 msgid "SSL is not available in this build"
 msgstr "SSL n'est pas disponible dans ce binaire"
 
-#: ../camel/providers/imap/camel-imap-store.c:851
+#: ../camel/providers/imap/camel-imap-store.c:748
+#: ../camel/providers/imapx/camel-imapx-server.c:2648
+#, c-format
+msgid "Connection cancelled"
+msgstr "Connexion annulÃ©e"
+
+#: ../camel/providers/imap/camel-imap-store.c:753
+#: ../camel/providers/imapx/camel-imapx-server.c:2653
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossible de se connecter avec la commande Â«Â %sÂ Â»Â : %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1039
-#: ../camel/providers/imap/camel-imap-store.c:2438
-#: ../camel/providers/imapx/camel-imapx-store.c:366
-#: ../camel/providers/imapx/camel-imapx-store.c:918
-#: ../camel/providers/local/camel-maildir-folder.c:76
-#: ../camel/providers/local/camel-maildir-store.c:214
-#: ../camel/providers/local/camel-maildir-store.c:286
-#: ../camel/providers/local/camel-maildir-store.c:512
-#: ../camel/providers/local/camel-maildir-store.c:525
-#: ../camel/providers/local/camel-spool-store.c:455
+#: ../camel/providers/imap/camel-imap-store.c:926
+#: ../camel/providers/imap/camel-imap-store.c:2350
+#: ../camel/providers/imapx/camel-imapx-store.c:457
+#: ../camel/providers/imapx/camel-imapx-store.c:1054
+#: ../camel/providers/local/camel-maildir-folder.c:90
+#: ../camel/providers/local/camel-maildir-store.c:225
+#: ../camel/providers/local/camel-maildir-store.c:315
+#: ../camel/providers/local/camel-maildir-store.c:562
+#: ../camel/providers/local/camel-maildir-store.c:575
+#: ../camel/providers/local/camel-spool-store.c:508
 msgid "Inbox"
 msgstr "BoÃ®te de rÃ©ception"
 
-#: ../camel/providers/imap/camel-imap-store.c:1291
+#: ../camel/providers/imap/camel-imap-store.c:1129
+#: ../camel/providers/imapx/camel-imapx-server.c:2914
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mÃ©canisme d'authentification de type %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1301
-#: ../camel/providers/smtp/camel-smtp-transport.c:493
+#: ../camel/providers/imap/camel-imap-store.c:1141
+#: ../camel/providers/imapx/camel-imapx-server.c:2926
+#: ../camel/providers/smtp/camel-smtp-transport.c:462
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucun support pour les authentifications de type %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1375
-#: ../camel/providers/imapx/camel-imapx-server.c:2327
+#: ../camel/providers/imap/camel-imap-store.c:1220
+#: ../camel/providers/imapx/camel-imapx-server.c:2996
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3111,104 +3349,136 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2280
-#: ../camel/providers/imapx/camel-imapx-store.c:734
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2193
+#: ../camel/providers/imapx/camel-imapx-store.c:852
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "Le nom de dossier Â«Â %sÂ Â» n'est pas valide car il contient le caractÃ¨re Â«Â %cÂ Â»"
 
-#: ../camel/providers/imap/camel-imap-store.c:1996
-#: ../camel/providers/local/camel-maildir-store.c:187
-#: ../camel/providers/local/camel-mbox-store.c:196
-#: ../camel/providers/local/camel-mh-store.c:243
+#: ../camel/providers/imap/camel-imap-store.c:1887
+#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-mbox-store.c:193
+#: ../camel/providers/local/camel-mh-store.c:255
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Impossible de crÃ©er le dossier Â«Â %sÂ Â»Â : le dossier existe."
 
-#: ../camel/providers/imap/camel-imap-store.c:2291
-#: ../camel/providers/imapx/camel-imapx-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:2206
+#: ../camel/providers/imapx/camel-imapx-store.c:863
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnuÂ : %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3114
+#: ../camel/providers/imap/camel-imap-store.c:3062
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "DÃ©connectÃ© du serveur de maniÃ¨re inattendue"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:73
+#: ../camel/providers/imap/camel-imap-store.c:3065
+msgid "Server unexpectedly disconnected: "
+msgstr "DÃ©connectÃ© du serveur de maniÃ¨re inattendueÂ : "
+
+#: ../camel/providers/imapx/camel-imapx-folder.c:75
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Impossible de crÃ©er le dossier de rÃ©sumÃ© pour %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:81
+#: ../camel/providers/imapx/camel-imapx-folder.c:83
 #, c-format
-msgid "Could not create cache for %s"
-msgstr "Impossible de crÃ©er le cache pour %s"
+msgid "Could not create cache for %s: "
+msgstr "Impossible de crÃ©er le cache pour %sÂ : "
 
 #: ../camel/providers/imapx/camel-imapx-provider.c:43
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Utiliser Â«Â _Quick ResyncÂ Â» si le serveur le prend en charge"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "Use I_dle if the server supports it"
 msgstr "Utiliser I_DLE si le serveur le prend en charge"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:55
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Command:"
 msgstr "CommandeÂ :"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:57
+#: ../camel/providers/imapx/camel-imapx-provider.c:59
 msgid "Numbe_r of cached connections to use"
 msgstr "Nomb_re de connexions Ã  mettre en cache"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:70
 msgid "Namespace:"
 msgstr "Espace de nomsÂ :"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2164
+#: ../camel/providers/imapx/camel-imapx-server.c:1365
+msgid "Error writing to cache stream: "
+msgstr "Erreur d'Ã©criture dans le flux du cacheÂ : "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:2008
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Impossible de se connecter Ã  %s (port %s)Â : %s"
+msgid "Not authenticated"
+msgstr "Non authentifiÃ©"
 
-#: ../camel/providers/local/camel-local-folder.c:169
-msgid "Index message body data"
-msgstr "Indexer les donnÃ©es du corps des messages"
+#: ../camel/providers/imapx/camel-imapx-server.c:2739
+#, c-format
+msgid "Could not connect to %s (port %s): "
+msgstr "Impossible de se connecter Ã  %s (port %s)Â : "
+
+#: ../camel/providers/imapx/camel-imapx-server.c:3168
+msgid "Closing tmp stream failed: "
+msgstr "La fermeture du flux temporaire a Ã©chouÃ©Â : "
 
-#. Translators: This is used for a folder description, for folders being under $HOME.
-#. The first %s is replaced with a relative path under $HOME,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:388
+#: ../camel/providers/imapx/camel-imapx-server.c:5042
+#, c-format
+msgid "Cannot create spool file: %s"
+msgstr "Impossible de crÃ©er le fichier tamponÂ : %s"
+
+#: ../camel/providers/imapx/camel-imapx-server.c:5057
+msgid "Cannot create spool file: "
+msgstr "Impossible de crÃ©er le fichier tamponÂ : "
+
+#: ../camel/providers/imapx/camel-imapx-store.c:426
+#: ../camel/providers/nntp/camel-nntp-store.c:1510
+#, c-format
+msgid "No such folder: %s"
+msgstr "Dossier non trouvÃ©Â : %s"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:71
+#, c-format
+msgid "Source stream returned no data"
+msgstr "Le flux source n'a renvoyÃ© aucune donnÃ©e"
+
+#: ../camel/providers/imapx/camel-imapx-stream.c:80
+#, c-format
+msgid "Source stream unavailable"
+msgstr "Flux source non disponible"
+
+#: ../camel/providers/local/camel-local-folder.c:199
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
-#. The first %s is replaced with a relative path under /var/spool/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#. Translators: This is used for a folder description, for folders being under /var/mail.
-#. The first %s is replaced with a relative path under /var/mail,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:394
-#: ../camel/providers/local/camel-local-folder.c:400
+#: ../camel/providers/local/camel-local-folder.c:209
+#: ../camel/providers/local/camel-local-folder.c:218
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "boÃ®te aux lettresÂ : %s (%s)"
 
-#. Translators: This is used for a folder description.
-#. The first %s is replaced with a folder's full path,
-#. the second %s is replaced with a protocol name, like mbox/maldir/...
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:227
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. Translators: The first %s is replaced with a message ID,
-#. the second %s is replaced with the folder path,
-#. the third %s is replaced with a detailed error string
-#: ../camel/providers/local/camel-local-folder.c:662
+#: ../camel/providers/local/camel-local-folder.c:272
+msgid "Index message body data"
+msgstr "Indexer les donnÃ©es du corps des messages"
+
+#: ../camel/providers/local/camel-local-folder.c:686
 #, c-format
 msgid ""
 "Cannot get message %s from folder %s\n"
@@ -3278,96 +3548,101 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "RÃ©pertoire Unix standard de spool mbox"
 
-#: ../camel/providers/local/camel-local-store.c:156
-#: ../camel/providers/local/camel-local-store.c:267
-#: ../camel/providers/local/camel-mbox-store.c:351
-#: ../camel/providers/local/camel-spool-store.c:120
+#: ../camel/providers/local/camel-local-store.c:149
+#: ../camel/providers/local/camel-local-store.c:284
+#: ../camel/providers/local/camel-mbox-store.c:371
+#: ../camel/providers/local/camel-spool-store.c:109
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu"
 
-#: ../camel/providers/local/camel-local-store.c:163
+#: ../camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un rÃ©pertoire normal"
 
-#: ../camel/providers/local/camel-local-store.c:172
-#: ../camel/providers/local/camel-local-store.c:180
-#: ../camel/providers/local/camel-local-store.c:278
+#: ../camel/providers/local/camel-local-store.c:169
+#: ../camel/providers/local/camel-local-store.c:179
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossible d'obtenir le dossierÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-local-store.c:192
+#: ../camel/providers/local/camel-local-store.c:193
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Les stockages locaux n'ont pas de boÃ®te de rÃ©ception"
 
-#: ../camel/providers/local/camel-local-store.c:238
+#: ../camel/providers/local/camel-local-store.c:250
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courriel local %s"
 
-#: ../camel/providers/local/camel-local-store.c:333
+#: ../camel/providers/local/camel-local-store.c:358
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %sÂ : %s"
 
-#: ../camel/providers/local/camel-local-store.c:401
+#: ../camel/providers/local/camel-local-store.c:431
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-local-store.c:426
-#: ../camel/providers/local/camel-mbox-store.c:292
+#: ../camel/providers/local/camel-local-store.c:461
+#: ../camel/providers/local/camel-mbox-store.c:304
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Impossible de supprimer le fichier d'index du dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-local-store.c:449
-#: ../camel/providers/local/camel-mbox-store.c:316
+#: ../camel/providers/local/camel-local-store.c:489
+#: ../camel/providers/local/camel-mbox-store.c:333
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Impossible de supprimer le mÃ©ta fichier du dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-local-summary.c:508
+#: ../camel/providers/local/camel-local-summary.c:537
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au rÃ©sumÃ©Â : raison inconnue"
 
-#: ../camel/providers/local/camel-maildir-folder.c:225
-msgid "Maildir append message canceled"
-msgstr "Ajout du message Ã  Maildir annulÃ©"
-
-#: ../camel/providers/local/camel-maildir-folder.c:228
+#: ../camel/providers/local/camel-maildir-folder.c:195
 #, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Impossible d'ajouter le message au dossier MaildirÂ : %sÂ : %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Impossible d'ajouter le message au dossier MaildirÂ : %sÂ : "
 
-#: ../camel/providers/local/camel-maildir-folder.c:306
-msgid "Invalid message contents"
-msgstr "Contenu de message non valide"
+#: ../camel/providers/local/camel-maildir-folder.c:283
+#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-mbox-folder.c:440
+#: ../camel/providers/local/camel-mh-folder.c:227
+#: ../camel/providers/local/camel-mh-folder.c:235
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Impossible d'obtenir le message %s du dossier %sÂ : "
 
-#: ../camel/providers/local/camel-maildir-folder.c:408
-msgid "Cannot transfer message to destination folder"
-msgstr "Impossible de transfÃ©rer le message dans le dossier de destination"
+#: ../camel/providers/local/camel-maildir-folder.c:399
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr ""
+"Impossible de transfÃ©rer le message dans le dossier de destinationÂ : %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:143
-#: ../camel/providers/local/camel-maildir-store.c:168
-#: ../camel/providers/local/camel-mbox-store.c:168
-#: ../camel/providers/local/camel-mbox-store.c:180
+#: ../camel/providers/local/camel-maildir-store.c:136
+#: ../camel/providers/local/camel-maildir-store.c:167
+#: ../camel/providers/local/camel-mbox-store.c:161
+#: ../camel/providers/local/camel-mbox-store.c:175
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Impossible de crÃ©er le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:156
-#: ../camel/providers/local/camel-mbox-store.c:139
-#: ../camel/providers/local/camel-mh-store.c:211
+#: ../camel/providers/local/camel-maildir-store.c:151
+#: ../camel/providers/local/camel-mbox-store.c:127
+#: ../camel/providers/local/camel-mh-store.c:215
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Impossible d'obtenir le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:160
-#: ../camel/providers/local/camel-mbox-store.c:147
-#: ../camel/providers/local/camel-mh-store.c:218
+#: ../camel/providers/local/camel-maildir-store.c:157
+#: ../camel/providers/local/camel-mbox-store.c:137
+#: ../camel/providers/local/camel-mh-store.c:224
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Impossible d'obtenir le dossier Â«Â %sÂ Â»Â : le dossier n'existe pas."
@@ -3378,89 +3653,81 @@ msgid "Cannot get folder '%s': not a maildir directory."
 msgstr ""
 "Impossible d'obtenir le dossier Â«Â %sÂ Â»Â : ce n'est pas un rÃ©pertoire Maildir."
 
-#: ../camel/providers/local/camel-maildir-store.c:229
-#: ../camel/providers/local/camel-maildir-store.c:267
-#: ../camel/providers/local/camel-mh-store.c:267
+#: ../camel/providers/local/camel-maildir-store.c:242
+#: ../camel/providers/local/camel-maildir-store.c:282
+#: ../camel/providers/local/camel-mh-store.c:287
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Impossible de supprimer le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:231
+#: ../camel/providers/local/camel-maildir-store.c:244
 msgid "not a maildir directory"
 msgstr "n'est pas un rÃ©pertoire Maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:435
-#: ../camel/providers/local/camel-spool-store.c:322
-#: ../camel/providers/local/camel-spool-store.c:336
+#: ../camel/providers/local/camel-maildir-store.c:482
+#: ../camel/providers/local/camel-spool-store.c:364
+#: ../camel/providers/local/camel-spool-store.c:380
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Impossible d'examiner le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:422
-#: ../camel/providers/local/camel-maildir-summary.c:541
+#: ../camel/providers/local/camel-maildir-summary.c:435
+#: ../camel/providers/local/camel-maildir-summary.c:558
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Impossible d'ouvrir le rÃ©pertoire MaildirÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:534
+#: ../camel/providers/local/camel-maildir-summary.c:549
 msgid "Checking folder consistency"
 msgstr "VÃ©rification de la cohÃ©rence du dossier"
 
-#: ../camel/providers/local/camel-maildir-summary.c:627
+#: ../camel/providers/local/camel-maildir-summary.c:641
 msgid "Checking for new messages"
 msgstr "Recherche de nouveaux messages"
 
-#: ../camel/providers/local/camel-maildir-summary.c:714
-#: ../camel/providers/local/camel-mbox-summary.c:516
-#: ../camel/providers/local/camel-mbox-summary.c:712
-#: ../camel/providers/local/camel-mbox-summary.c:832
-#: ../camel/providers/local/camel-spool-summary.c:145
+#: ../camel/providers/local/camel-maildir-summary.c:732
+#: ../camel/providers/local/camel-mbox-summary.c:465
+#: ../camel/providers/local/camel-mbox-summary.c:679
+#: ../camel/providers/local/camel-mbox-summary.c:809
+#: ../camel/providers/local/camel-spool-summary.c:130
 msgid "Storing folder"
 msgstr "Stockage du dossier"
 
-#: ../camel/providers/local/camel-mbox-folder.c:155
-#: ../camel/providers/local/camel-spool-folder.c:139
+#: ../camel/providers/local/camel-mbox-folder.c:124
+#: ../camel/providers/local/camel-spool-folder.c:125
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Impossible de crÃ©er le verrou sur le dossier %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:219
+#: ../camel/providers/local/camel-mbox-folder.c:194
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Impossible d'ouvrir la boÃ®te aux lettresÂ : %sÂ : %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "Impossible d'ouvrir la boÃ®te aux lettresÂ : %sÂ : "
 
-#: ../camel/providers/local/camel-mbox-folder.c:285
-msgid "Mail append canceled"
-msgstr "Ajout au message annulÃ©"
-
-#: ../camel/providers/local/camel-mbox-folder.c:288
+#: ../camel/providers/local/camel-mbox-folder.c:260
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Impossible d'ajouter le message au fichier mboxÂ : %sÂ : %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Impossible d'ajouter le message au fichier mboxÂ : %sÂ : "
 
-#: ../camel/providers/local/camel-mbox-folder.c:454
+#: ../camel/providers/local/camel-mbox-folder.c:433
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Le dossier semble irrÃ©mÃ©diablement corrompu."
 
-#: ../camel/providers/local/camel-mbox-folder.c:461
-#: ../camel/providers/local/camel-mh-folder.c:238
-msgid "Message construction failed."
-msgstr "La construction du message a Ã©chouÃ©."
-
-#: ../camel/providers/local/camel-mbox-store.c:158
-#: ../camel/providers/local/camel-mbox-store.c:357
+#: ../camel/providers/local/camel-mbox-store.c:149
+#: ../camel/providers/local/camel-mbox-store.c:379
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Impossible de crÃ©er un dossier avec ce nom."
 
-#: ../camel/providers/local/camel-mbox-store.c:190
+#: ../camel/providers/local/camel-mbox-store.c:186
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr ""
 "Impossible d'obtenir le dossier Â«Â %sÂ Â»Â : il ne s'agit pas d'un fichier normal."
 
-#: ../camel/providers/local/camel-mbox-store.c:220
+#: ../camel/providers/local/camel-mbox-store.c:218
 #: ../camel/providers/local/camel-mbox-store.c:231
-#: ../camel/providers/local/camel-mbox-store.c:254
+#: ../camel/providers/local/camel-mbox-store.c:260
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3469,167 +3736,164 @@ msgstr ""
 "Impossible de supprimer le dossier Â«Â %sÂ Â»Â :\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:239
+#: ../camel/providers/local/camel-mbox-store.c:241
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "Â«Â %sÂ Â» n'est pas un fichier normal."
 
-#: ../camel/providers/local/camel-mbox-store.c:246
+#: ../camel/providers/local/camel-mbox-store.c:250
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "Le dossier Â«Â %sÂ Â» n'est pas vide. Non supprimÃ©."
 
-#: ../camel/providers/local/camel-mbox-store.c:268
-#: ../camel/providers/local/camel-mbox-store.c:280
+#: ../camel/providers/local/camel-mbox-store.c:276
+#: ../camel/providers/local/camel-mbox-store.c:290
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Impossible de supprimer le fichier de rÃ©sumÃ© du dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:370
+#: ../camel/providers/local/camel-mbox-store.c:395
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Impossible de crÃ©er le rÃ©pertoire Â«Â %sÂ Â»Â : %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:384
+#: ../camel/providers/local/camel-mbox-store.c:411
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Impossible de crÃ©er le dossierÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:386
+#: ../camel/providers/local/camel-mbox-store.c:413
 msgid "Folder already exists"
 msgstr "Le dossier existe dÃ©jÃ "
 
-#: ../camel/providers/local/camel-mbox-store.c:477
+#: ../camel/providers/local/camel-mbox-store.c:507
+#, c-format
 msgid "The new folder name is illegal."
 msgstr "Le nouveau nom du dossier n'est pas valide."
 
-#: ../camel/providers/local/camel-mbox-store.c:490
+#: ../camel/providers/local/camel-mbox-store.c:522
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Impossible de renommer Â«Â %sÂ Â»Â : Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:571
+#: ../camel/providers/local/camel-mbox-store.c:605
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Impossible de renommer Â«Â %sÂ Â» en %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:522
+#: ../camel/providers/local/camel-mbox-summary.c:473
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Impossible d'ouvrir le dossierÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:572
+#: ../camel/providers/local/camel-mbox-summary.c:533
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
+msgid "Fatal mail parser error near position %s in folder %s"
 msgstr ""
-"Erreur fatale d'analyse du courriel prÃ¨s de la position %ld dans le dossier %"
-"s"
+"Erreur fatale d'analyse du courriel prÃ¨s de la position %s dans le dossier %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:649
+#: ../camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de vÃ©rifier le dossierÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:717
-#: ../camel/providers/local/camel-mbox-summary.c:837
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-mbox-summary.c:686
+#: ../camel/providers/local/camel-mbox-summary.c:816
+#: ../camel/providers/local/camel-spool-summary.c:137
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichierÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:729
-#: ../camel/providers/local/camel-spool-summary.c:163
+#: ../camel/providers/local/camel-mbox-summary.c:700
+#: ../camel/providers/local/camel-spool-summary.c:152
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossible d'ouvrir la boÃ®te aux lettres temporaireÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:742
-#: ../camel/providers/local/camel-mbox-summary.c:947
+#: ../camel/providers/local/camel-mbox-summary.c:715
+#: ../camel/providers/local/camel-mbox-summary.c:933
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %sÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:751
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Impossible de fermer le dossier temporaireÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:766
+#: ../camel/providers/local/camel-mbox-summary.c:743
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossierÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:848
-#: ../camel/providers/local/camel-mbox-summary.c:1074
+#: ../camel/providers/local/camel-mbox-summary.c:829
+#: ../camel/providers/local/camel-mbox-summary.c:1071
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossible de stocker le dossierÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:887
-#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:879
 #: ../camel/providers/local/camel-mbox-summary.c:1104
-#: ../camel/providers/local/camel-mbox-summary.c:1112
+#: ../camel/providers/local/camel-mbox-summary.c:1113
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Le rÃ©sumÃ© et le dossier ne correspondent pas, mÃªme aprÃ¨s une synchronisation"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1037
-#: ../camel/providers/local/camel-spool-summary.c:329
+#: ../camel/providers/local/camel-mbox-summary.c:1030
+#: ../camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnueÂ : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1180
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1183
+#: ../camel/providers/local/camel-mbox-summary.c:1213
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "L'Ã©criture dans la boÃ®te aux lettres temporaire a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1197
+#: ../camel/providers/local/camel-mbox-summary.c:1202
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "L'Ã©criture dans la boÃ®te aux lettres temporaire a Ã©chouÃ©Â : %sÂ : %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:176
-msgid "MH append message canceled"
-msgstr "Ajout du message Ã  MH annulÃ©"
-
-#: ../camel/providers/local/camel-mh-folder.c:179
+#: ../camel/providers/local/camel-mh-folder.c:165
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Impossible d'ajouter le message au dossier mhÂ : %sÂ : %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Impossible d'ajouter le message au dossier mhÂ : %sÂ : "
 
-#: ../camel/providers/local/camel-mh-store.c:226
+#: ../camel/providers/local/camel-mh-store.c:234
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Impossible de crÃ©er le dossier Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-mh-store.c:238
+#: ../camel/providers/local/camel-mh-store.c:248
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Impossible d'obtenir le dossier Â«Â %sÂ Â»Â : ce n'est pas un rÃ©pertoire."
 
-#: ../camel/providers/local/camel-mh-summary.c:235
+#: ../camel/providers/local/camel-mh-summary.c:228
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Impossible d'ouvrir le rÃ©pertoire format MHÂ : %sÂ : %s"
 
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-spool-store.c:118
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Impossible d'ouvrir le spool Â«Â %sÂ Â»Â : %s"
 
-#: ../camel/providers/local/camel-spool-store.c:138
+#: ../camel/providers/local/camel-spool-store.c:132
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "Le spool Â«Â %sÂ Â» n'est pas un fichier ou un rÃ©pertoire normal"
 
-#: ../camel/providers/local/camel-spool-store.c:157
+#: ../camel/providers/local/camel-spool-store.c:158
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Le dossier Â«Â %s/%sÂ Â» n'existe pas."
 
-#: ../camel/providers/local/camel-spool-store.c:167
+#: ../camel/providers/local/camel-spool-store.c:170
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3638,12 +3902,12 @@ msgstr ""
 "Impossible d'ouvrir le dossier Â«Â %sÂ Â»Â :\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:171
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "Le dossier Â«Â %sÂ Â» n'existe pas."
 
-#: ../camel/providers/local/camel-spool-store.c:176
+#: ../camel/providers/local/camel-spool-store.c:183
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3652,86 +3916,96 @@ msgstr ""
 "Impossible de crÃ©er le dossier Â«Â %sÂ Â»Â :\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:184
+#: ../camel/providers/local/camel-spool-store.c:193
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â«Â %sÂ Â» n'est pas un fichier de boÃ®te aux lettres."
 
-#: ../camel/providers/local/camel-spool-store.c:201
+#: ../camel/providers/local/camel-spool-store.c:213
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Le stockage ne prend pas en charge de boÃ®te de rÃ©ception"
 
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Fichier de spool de courriels %s"
 
-#: ../camel/providers/local/camel-spool-store.c:213
+#: ../camel/providers/local/camel-spool-store.c:226
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Arborescence de dossiers spool %s"
 
-#: ../camel/providers/local/camel-spool-store.c:221
+#: ../camel/providers/local/camel-spool-store.c:238
+#, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Les dossiers spool ne peuvent Ãªtre renommÃ©s"
 
-#: ../camel/providers/local/camel-spool-store.c:229
+#: ../camel/providers/local/camel-spool-store.c:251
+#, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Les dossiers spool ne peuvent Ãªtre supprimÃ©s"
 
-#: ../camel/providers/local/camel-spool-summary.c:175
-#: ../camel/providers/local/camel-spool-summary.c:185
-#: ../camel/providers/local/camel-spool-summary.c:195
+#: ../camel/providers/local/camel-spool-summary.c:166
+#: ../camel/providers/local/camel-spool-summary.c:178
+#: ../camel/providers/local/camel-spool-summary.c:190
 #, c-format
-msgid "Could not synchronize temporary folder %s: %s"
+msgid "Could not sync temporary folder %s: %s"
 msgstr "Impossible de synchroniser le dossier temporaire %sÂ : %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:211
+#: ../camel/providers/local/camel-spool-summary.c:208
 #, c-format
-msgid "Could not synchronize spool folder %s: %s"
-msgstr "Impossible de synchroniser le dossier spool %sÂ : %s"
+msgid "Could not sync spool folder %s: %s"
+msgstr "Impossible de synchroniser le dossier tampon %sÂ : %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:241
-#: ../camel/providers/local/camel-spool-summary.c:258
-#: ../camel/providers/local/camel-spool-summary.c:269
+#: ../camel/providers/local/camel-spool-summary.c:240
+#: ../camel/providers/local/camel-spool-summary.c:259
+#: ../camel/providers/local/camel-spool-summary.c:272
 #, c-format
 msgid ""
-"Could not synchronize spool folder %s: %s\n"
-"Folder may be corrupt; copy saved in '%s'"
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in '%s'"
 msgstr ""
-"Impossible de synchroniser le dossier spool %sÂ : %s\n"
+"Impossible de synchroniser le dossier tampon %sÂ : %s\n"
 "Le dossier est peut-Ãªtre corrompuÂ ; une copie a Ã©tÃ© enregistrÃ©e dans Â«Â %sÂ Â»"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:119
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:207
+#: ../camel/providers/nntp/camel-nntp-folder.c:197
+#: ../camel/providers/nntp/camel-nntp-folder.c:271
+#: ../camel/providers/nntp/camel-nntp-folder.c:312
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Erreur interneÂ : format d'UID non valideÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:156
-#: ../camel/providers/nntp/camel-nntp-folder.c:231
-#: ../camel/providers/nntp/camel-nntp-folder.c:392
-#: ../camel/providers/nntp/camel-nntp-store.c:1307
-#: ../camel/providers/nntp/camel-nntp-summary.c:412
-msgid "User cancelled the operation"
-msgstr "L'utilisateur a annulÃ© l'opÃ©ration"
+#: ../camel/providers/nntp/camel-nntp-folder.c:234
+#: ../camel/providers/nntp/camel-nntp-folder.c:238
+#: ../camel/providers/pop3/camel-pop3-folder.c:402
+#: ../camel/providers/pop3/camel-pop3-folder.c:630
+#: ../camel/providers/pop3/camel-pop3-folder.c:695
+#: ../camel/providers/pop3/camel-pop3-folder.c:706
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Impossible d'obtenir le messageÂ : %sÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:348
-#: ../camel/providers/nntp/camel-nntp-folder.c:351
-#: ../camel/providers/nntp/camel-nntp-folder.c:394
-#: ../camel/providers/nntp/camel-nntp-folder.c:396
+#: ../camel/providers/nntp/camel-nntp-folder.c:465
+#: ../camel/providers/nntp/camel-nntp-folder.c:471
+#: ../camel/providers/nntp/camel-nntp-folder.c:518
 #, c-format
 msgid "Posting failed: %s"
 msgstr "L'envoi a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:414
+#: ../camel/providers/nntp/camel-nntp-folder.c:513
+msgid "Posting failed: "
+msgstr "L'envoi a Ã©chouÃ©Â : "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:541
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 "Vous ne pouvez pas envoyer des messages NNTP pendant que vous Ãªtes hors-"
 "ligneÂ !"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:425
+#: ../camel/providers/nntp/camel-nntp-folder.c:560
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Vous ne pouvez pas copier de messages Ã  partir d'un dossier NNTPÂ !"
 
@@ -3765,29 +4039,22 @@ msgstr ""
 "Cette option utilisera un mot de passe en clair pour l'authentification au "
 "serveur NNTP."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:186
-#: ../camel/providers/nntp/camel-nntp-store.c:205
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:258
-msgid "Connection canceled"
-msgstr "Connexion annulÃ©e"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:208
+#: ../camel/providers/nntp/camel-nntp-store.c:265
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Impossible de lire les salutations de %sÂ : %s"
+msgid "Could not read greeting from %s: "
+msgstr "Impossible de lire les salutations de %sÂ : "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:220
+#: ../camel/providers/nntp/camel-nntp-store.c:278
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Le serveur NNTP %s a retournÃ© un code d'erreur %dÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:402
+#: ../camel/providers/nntp/camel-nntp-store.c:434
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:811
+#: ../camel/providers/nntp/camel-nntp-store.c:927
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -3798,7 +4065,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:905
+#: ../camel/providers/nntp/camel-nntp-store.c:1024
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -3809,7 +4077,8 @@ msgstr ""
 "Le groupe de discussion n'a pas Ã©tÃ© trouvÃ©. L'Ã©lÃ©ment sÃ©lectionnÃ© est "
 "probablement un dossier parent."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:937
+#: ../camel/providers/nntp/camel-nntp-store.c:1064
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -3819,97 +4088,96 @@ msgstr ""
 "\n"
 "le groupe de discussion n'existe pasÂ !"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:962
+#: ../camel/providers/nntp/camel-nntp-store.c:1094
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Impossible de crÃ©er un dossier dans un emplacement de nouvellesÂ : abonnez-"
 "vous Ã  la place."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1106
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Impossible de renommer un dossier dans un emplacement de nouvelles."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Impossible de supprimer un dossier dans un emplacement de nouvellesÂ : "
 "dÃ©sabonnez-vous Ã  la place."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1172
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid "Authentication requested but no username provided"
 msgstr "Authentification requise mais aucun nom d'utilisateur n'a Ã©tÃ© fourni"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1184
+#: ../camel/providers/nntp/camel-nntp-store.c:1269
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Impossible de s'authentifier sur le serveurÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1309
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "La commande NNTP a Ã©chouÃ©Â : %s"
+#: ../camel/providers/nntp/camel-nntp-store.c:1395
+msgid "NNTP Command failed: "
+msgstr "La commande NNTP a Ã©chouÃ©Â : "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1363
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
+#, c-format
 msgid "Not connected."
 msgstr "Non connectÃ©."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1416
-#, c-format
-msgid "No such folder: %s"
-msgstr "Dossier non trouvÃ©Â : %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:261
-#: ../camel/providers/nntp/camel-nntp-summary.c:362
+#: ../camel/providers/nntp/camel-nntp-summary.c:238
+#: ../camel/providers/nntp/camel-nntp-summary.c:340
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%sÂ : examen des nouveaux messages"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:271
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "RÃ©ponse du serveur inattendue de xoverÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:376
+#: ../camel/providers/nntp/camel-nntp-summary.c:356
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "RÃ©ponse du serveur inattendue de headÂ : %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:414
+#: ../camel/providers/nntp/camel-nntp-summary.c:401
 #, c-format
 msgid "Operation failed: %s"
 msgstr "L'opÃ©ration a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:247
+#: ../camel/providers/pop3/camel-pop3-folder.c:251
 msgid "Retrieving POP summary"
 msgstr "RÃ©cupÃ©ration du rÃ©sumÃ© POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:265
+#: ../camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Impossible d'obtenir le rÃ©sumÃ© POPÂ : %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:308
+#: ../camel/providers/pop3/camel-pop3-folder.c:324
 msgid "Expunging old messages"
 msgstr "Purger les anciens messages"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:316
+#: ../camel/providers/pop3/camel-pop3-folder.c:332
 msgid "Expunging deleted messages"
 msgstr "Purger les messages supprimÃ©s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:533
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
+#: ../camel/providers/pop3/camel-pop3-folder.c:566
+#: ../camel/providers/pop3/camel-pop3-folder.c:596
 #, c-format
 msgid "No message with UID %s"
 msgstr "Aucun message avec l'UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:562
+#: ../camel/providers/pop3/camel-pop3-folder.c:603
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "RÃ©cupÃ©ration du message POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:651
+#: ../camel/providers/pop3/camel-pop3-folder.c:707
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -3959,47 +4227,42 @@ msgstr ""
 
 # added leading non breaking space
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:156
+#: ../camel/providers/pop3/camel-pop3-store.c:98
 msgid ": "
 msgstr "Â : "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:219
+#: ../camel/providers/pop3/camel-pop3-store.c:168
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "La lecture de salutations valides du serveur POP %s a Ã©chouÃ©"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:236
-#: ../camel/providers/pop3/camel-pop3-store.c:265
-#: ../camel/providers/pop3/camel-pop3-store.c:271
+#: ../camel/providers/pop3/camel-pop3-store.c:186
+#: ../camel/providers/pop3/camel-pop3-store.c:217
+#: ../camel/providers/pop3/camel-pop3-store.c:224
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "La connexion au serveur POP %s en mode sÃ©curisÃ© a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:237
+#: ../camel/providers/pop3/camel-pop3-store.c:187
 msgid "STLS not supported by server"
 msgstr "STLS non pris en charge par le serveur"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:253
+#: ../camel/providers/pop3/camel-pop3-store.c:205
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "La connexion au serveur POP %s en mode sÃ©curisÃ© a Ã©chouÃ©Â %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 msgid "TLS negotiations failed"
 msgstr "Les nÃ©gociations TLS ont Ã©chouÃ©"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:272
+#: ../camel/providers/pop3/camel-pop3-store.c:225
 msgid "TLS is not available in this build"
 msgstr "TLS n'est pas disponible dans ce binaire"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:378
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Impossible de se connecter au serveur POP %s"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:419
-#: ../camel/providers/pop3/camel-pop3-store.c:557
+#: ../camel/providers/pop3/camel-pop3-store.c:300
+#: ../camel/providers/pop3/camel-pop3-store.c:452
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4009,23 +4272,23 @@ msgstr ""
 "mÃ©canisme d'authentification demandÃ©."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:438
+#: ../camel/providers/pop3/camel-pop3-store.c:323
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "L'identification SASL Â«Â %sÂ Â» a Ã©chouÃ© pour le serveur POP %sÂ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:452
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Identification sur le serveur POP %s impossibleÂ : erreur de protocole SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:471
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "L'authentification sur le serveur POP %s a Ã©chouÃ©Â : %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "L'authentification sur le serveur POP %s a Ã©chouÃ©Â : "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:530
+#: ../camel/providers/pop3/camel-pop3-store.c:421
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4035,7 +4298,7 @@ msgstr ""
 "valide. Ce peut Ãªtre un indice d'une attaque par usurpation d'identitÃ©. "
 "Contactez votre administrateur."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:571
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4045,7 +4308,7 @@ msgstr ""
 "Erreur lors de l'envoi du mot de passeÂ : %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:581
+#: ../camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4055,7 +4318,7 @@ msgstr ""
 "Erreur lors de l'envoi du nom d'utilisateurÂ %s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:591
+#: ../camel/providers/pop3/camel-pop3-store.c:497
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4064,11 +4327,31 @@ msgstr ""
 "Impossible de se connecter au serveur POP %s.\n"
 "Erreur lors de l'envoi du mot de passeÂ %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:697
+#: ../camel/providers/pop3/camel-pop3-store.c:653
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Impossible de se connecter au serveur POP %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:666
+#, c-format
+msgid "POP3 server %s"
+msgstr "Serveur POP3 %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:670
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "Serveur POP3 pour %s sur %s"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:685
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Aucun dossier nommÃ© Â«Â %sÂ Â»."
 
+#: ../camel/providers/pop3/camel-pop3-store.c:709
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "Le stockage POP3 n'a pas de hiÃ©rarchie de dossiers"
+
 #: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
@@ -4080,40 +4363,45 @@ msgid ""
 msgstr ""
 "Pour distribuer le courriel via le programme Â«Â sendmailÂ Â» du systÃ¨me local."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:98
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Impossible d'analyser la liste des destinataires"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:131
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Impossible de crÃ©er un tube vers sendmailÂ : %sÂ : courriel non envoyÃ©"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:159
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:153
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Impossible de cloner sendmailÂ : %sÂ : courriel non envoyÃ©"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:194
+msgid "Could not send message: "
+msgstr "Impossible d'envoyer le messageÂ : "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail s'est terminÃ© avec le signal %sÂ : courriel non envoyÃ©."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:236
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Impossible d'exÃ©cuter %sÂ : courriel non envoyÃ©."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail s'est terminÃ© avec le statut %dÂ : courriel non envoyÃ©."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:248
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:257
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:250
 msgid "Mail delivery via the sendmail program"
 msgstr "Distribution du courriel via le programme sendmail"
 
@@ -4127,134 +4415,132 @@ msgstr ""
 "Pour la distribution du courriel via un serveur de courriel distant "
 "utilisant SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:154
+#: ../camel/providers/smtp/camel-smtp-transport.c:116
 msgid "Syntax error, command unrecognized"
 msgstr "Erreur de syntaxe, commande non reconnue"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:156
+#: ../camel/providers/smtp/camel-smtp-transport.c:118
 msgid "Syntax error in parameters or arguments"
 msgstr "Erreur de syntaxe dans les paramÃ¨tres ou les arguments"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:158
+#: ../camel/providers/smtp/camel-smtp-transport.c:120
 msgid "Command not implemented"
 msgstr "Commande non implÃ©mentÃ©e"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:160
+#: ../camel/providers/smtp/camel-smtp-transport.c:122
 msgid "Command parameter not implemented"
 msgstr "ParamÃ¨tre de commande non implÃ©mentÃ©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:124
 msgid "System status, or system help reply"
 msgstr "Ã?tat du systÃ¨me ou rÃ©ponse Ã  une aide systÃ¨me"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:164
+#: ../camel/providers/smtp/camel-smtp-transport.c:126
 msgid "Help message"
 msgstr "Message d'aide"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:166
+#: ../camel/providers/smtp/camel-smtp-transport.c:128
 msgid "Service ready"
 msgstr "Service prÃªt"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:168
+#: ../camel/providers/smtp/camel-smtp-transport.c:130
 msgid "Service closing transmission channel"
 msgstr "Service de fermeture du canal de transmission"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:170
+#: ../camel/providers/smtp/camel-smtp-transport.c:132
 msgid "Service not available, closing transmission channel"
 msgstr "Service non disponible, fermeture du canal de transmission"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:172
+#: ../camel/providers/smtp/camel-smtp-transport.c:134
 msgid "Requested mail action okay, completed"
 msgstr "Action courriel demandÃ©e OK, terminÃ©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:174
+#: ../camel/providers/smtp/camel-smtp-transport.c:136
 msgid "User not local; will forward to <forward-path>"
 msgstr "Utilisateur non localÂ ; transfert vers <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:176
+#: ../camel/providers/smtp/camel-smtp-transport.c:138
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "OpÃ©ration courriel demandÃ©e non effectuÃ©eÂ : boÃ®te aux lettres non disponible"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:178
+#: ../camel/providers/smtp/camel-smtp-transport.c:140
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "OpÃ©ration demandÃ©e non effectuÃ©eÂ : boÃ®te aux lettres non disponible"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:180
+#: ../camel/providers/smtp/camel-smtp-transport.c:142
 msgid "Requested action aborted: error in processing"
 msgstr "OpÃ©ration demandÃ©e abandonnÃ©eÂ : erreur de traitement"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:182
+#: ../camel/providers/smtp/camel-smtp-transport.c:144
 msgid "User not local; please try <forward-path>"
 msgstr "Utilisateur non localÂ ; veuillez essayer <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:184
+#: ../camel/providers/smtp/camel-smtp-transport.c:146
 msgid "Requested action not taken: insufficient system storage"
 msgstr "OpÃ©ration demandÃ©e non effectuÃ©eÂ : stockage systÃ¨me insuffisant"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:186
+#: ../camel/providers/smtp/camel-smtp-transport.c:148
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "OpÃ©ration courriel demandÃ©e abandonnÃ©eÂ : dÃ©passement de l'allocation de "
 "stockage"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:188
+#: ../camel/providers/smtp/camel-smtp-transport.c:150
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "OpÃ©ration demandÃ©e non effectuÃ©eÂ : nom de boÃ®te aux lettres non autorisÃ©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:190
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "DÃ©marrer la saisie du courrielÂ ; fin avec <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:192
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Transaction failed"
 msgstr "La transaction a Ã©chouÃ©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "A password transition is needed"
 msgstr "Aucun mot de passe fourni"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Authentication mechanism is too weak"
 msgstr "Le mÃ©canisme d'authentification est trop faible"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Chiffrement requis pour le mÃ©canisme d'authentification demandÃ©"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:202
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Temporary authentication failure"
 msgstr "Anomalie d'authentification temporaire"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:283
-msgid "Welcome response error"
-msgstr "Erreur lors de la rÃ©ponse de bienvenue"
+#: ../camel/providers/smtp/camel-smtp-transport.c:252
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Welcome response error: "
+msgstr "Erreur lors de la rÃ©ponse de bienvenueÂ : "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:318
-#: ../camel/providers/smtp/camel-smtp-transport.c:351
-#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#: ../camel/providers/smtp/camel-smtp-transport.c:294
+#: ../camel/providers/smtp/camel-smtp-transport.c:331
+#: ../camel/providers/smtp/camel-smtp-transport.c:338
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "La connexion au serveur SMTP %s en mode sÃ©curisÃ© a Ã©chouÃ©Â : %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:327
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "La commande STARTTLS a Ã©chouÃ©Â : %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:342
-msgid "STARTTLS command failed"
-msgstr "La commande STARTTLS a Ã©chouÃ©"
+#: ../camel/providers/smtp/camel-smtp-transport.c:302
+#: ../camel/providers/smtp/camel-smtp-transport.c:314
+#: ../camel/providers/smtp/camel-smtp-transport.c:320
+msgid "STARTTLS command failed: "
+msgstr "La commande STARTTLS a Ã©chouÃ©Â : "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:483
+#: ../camel/providers/smtp/camel-smtp-transport.c:450
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "Le serveur SMTP %s ne prend pas en charge le type d'authentification "
 "demandÃ©e %s."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:554
+#: ../camel/providers/smtp/camel-smtp-transport.c:526
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4265,205 +4551,185 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:687
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:689
+#: ../camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Distribution du courriel en SMTP via %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:707
+#: ../camel/providers/smtp/camel-smtp-transport.c:686
+#, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Impossible d'envoyer le messageÂ : service non connectÃ©."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#: ../camel/providers/smtp/camel-smtp-transport.c:693
+#, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Impossible d'envoyer le messageÂ : l'adresse de l'expÃ©diteur n'est pas valide."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:717
+#: ../camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:732
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
+#, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossible d'envoyer le messageÂ : aucun destinataire n'est dÃ©fini."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:743
+#: ../camel/providers/smtp/camel-smtp-transport.c:725
+#, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Impossible d'envoyer le messageÂ : un ou plusieurs destinataires sont non "
 "valides"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:972
+#: ../camel/providers/smtp/camel-smtp-transport.c:961
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:997
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "La commande HELO a Ã©chouÃ©Â : %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1014
-msgid "HELO command failed"
-msgstr "La commande HELO a Ã©chouÃ©"
+#: ../camel/providers/smtp/camel-smtp-transport.c:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1000
+#: ../camel/providers/smtp/camel-smtp-transport.c:1007
+msgid "HELO command failed: "
+msgstr "La commande HELO a Ã©chouÃ©Â : "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1080
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
 msgid "SMTP Authentication"
 msgstr "Authentification SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1086
+#: ../camel/providers/smtp/camel-smtp-transport.c:1081
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Erreur lors de la crÃ©ation de l'objet d'authentification SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1103
-#: ../camel/providers/smtp/camel-smtp-transport.c:1114
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "La commande AUTH a Ã©chouÃ©Â : %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1120
-msgid "AUTH command failed"
-msgstr "La commande AUTH a Ã©chouÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1190
-msgid "Bad authentication response from server.\n"
-msgstr "Mauvaise rÃ©ponse d'authentification du serveur.\n"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1097
+#: ../camel/providers/smtp/camel-smtp-transport.c:1107
+#: ../camel/providers/smtp/camel-smtp-transport.c:1115
+msgid "AUTH command failed: "
+msgstr "La commande AUTH a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1212
+#: ../camel/providers/smtp/camel-smtp-transport.c:1224
+#: ../camel/providers/smtp/camel-smtp-transport.c:1231
+msgid "MAIL FROM command failed: "
+msgstr "La commande MAIL FROM a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+msgid "RCPT TO command failed: "
+msgstr "La commande RCPT TO a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1268
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1314
+#: ../camel/providers/smtp/camel-smtp-transport.c:1323
+#: ../camel/providers/smtp/camel-smtp-transport.c:1333
+#: ../camel/providers/smtp/camel-smtp-transport.c:1390
+#: ../camel/providers/smtp/camel-smtp-transport.c:1406
+#: ../camel/providers/smtp/camel-smtp-transport.c:1417
+#: ../camel/providers/smtp/camel-smtp-transport.c:1424
+msgid "DATA command failed: "
+msgstr "La commande DATA a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1446
+#: ../camel/providers/smtp/camel-smtp-transport.c:1458
+#: ../camel/providers/smtp/camel-smtp-transport.c:1465
+msgid "RSET command failed: "
+msgstr "La commande RSET a Ã©chouÃ©Â : "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1487
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1506
+msgid "QUIT command failed: "
+msgstr "La commande QUIT a Ã©chouÃ©Â : "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1217
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "La commande MAIL FROM a Ã©chouÃ©Â : %sÂ : courriel non envoyÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1234
-msgid "MAIL FROM command failed"
-msgstr "La commande MAIL FROM a Ã©chouÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1258
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "La commande RCPT TO a Ã©chouÃ©Â : %sÂ : courriel non envoyÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1277
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> a Ã©chouÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1317
-#: ../camel/providers/smtp/camel-smtp-transport.c:1386
-#: ../camel/providers/smtp/camel-smtp-transport.c:1405
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "La commande DATA a Ã©chouÃ©Â : %sÂ : courriel non envoyÃ©"
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1334
-#: ../camel/providers/smtp/camel-smtp-transport.c:1421
-msgid "DATA command failed"
-msgstr "La commande DATA a Ã©chouÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1444
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "La commande RSET a Ã©chouÃ©Â : %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1460
-msgid "RSET command failed"
-msgstr "La commande RSET a Ã©chouÃ©"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1483
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "La commande QUIT a Ã©chouÃ©Â : %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1497
-msgid "QUIT command failed"
-msgstr "La commande QUIT a Ã©chouÃ©"
-
-#: ../libedataserver/e-categories.c:47
+#: ../libedataserver/e-categories.c:46
 msgid "Business"
 msgstr "Bureau"
 
-#: ../libedataserver/e-categories.c:48
+#: ../libedataserver/e-categories.c:47
 msgid "Competition"
 msgstr "CompÃ©tition"
 
-#: ../libedataserver/e-categories.c:49
+#: ../libedataserver/e-categories.c:48
 msgid "Favorites"
 msgstr "Favoris"
 
-#: ../libedataserver/e-categories.c:50
+#: ../libedataserver/e-categories.c:49
 msgid "Gifts"
 msgstr "Cadeaux"
 
-#: ../libedataserver/e-categories.c:51
+#: ../libedataserver/e-categories.c:50
 msgid "Goals/Objectives"
 msgstr "Buts/Objectifs"
 
-#: ../libedataserver/e-categories.c:52
+#: ../libedataserver/e-categories.c:51
 msgid "Holiday"
 msgstr "Vacances"
 
-#: ../libedataserver/e-categories.c:53
+#: ../libedataserver/e-categories.c:52
 msgid "Holiday Cards"
 msgstr "Cartes postales"
 
 #. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
+#: ../libedataserver/e-categories.c:54
 msgid "Hot Contacts"
 msgstr "Contacts frÃ©quents"
 
-#: ../libedataserver/e-categories.c:56
+#: ../libedataserver/e-categories.c:55
 msgid "Ideas"
 msgstr "IdÃ©es"
 
-#: ../libedataserver/e-categories.c:57
+#: ../libedataserver/e-categories.c:56
 msgid "International"
 msgstr "International"
 
-#: ../libedataserver/e-categories.c:58
+#: ../libedataserver/e-categories.c:57
 msgid "Key Customer"
 msgstr "Client clÃ©"
 
-#: ../libedataserver/e-categories.c:59
+#: ../libedataserver/e-categories.c:58
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../libedataserver/e-categories.c:60
+#: ../libedataserver/e-categories.c:59
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../libedataserver/e-categories.c:61
+#: ../libedataserver/e-categories.c:60
 msgid "Phone Calls"
 msgstr "Appels tÃ©lÃ©phoniques"
 
 #. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
+#: ../libedataserver/e-categories.c:62
 msgid "Status"
 msgstr "Statut"
 
-#: ../libedataserver/e-categories.c:64
+#: ../libedataserver/e-categories.c:63
 msgid "Strategies"
 msgstr "StratÃ©gies"
 
-#: ../libedataserver/e-categories.c:65
+#: ../libedataserver/e-categories.c:64
 msgid "Suppliers"
 msgstr "Fournisseurs"
 
-#: ../libedataserver/e-categories.c:66
+#: ../libedataserver/e-categories.c:65
 msgid "Time & Expenses"
 msgstr "Temps et dÃ©penses"
 
-#: ../libedataserver/e-categories.c:67
+#: ../libedataserver/e-categories.c:66
 msgid "VIP"
 msgstr "VIP"
 
-#: ../libedataserver/e-categories.c:68
+#: ../libedataserver/e-categories.c:67
 msgid "Waiting"
 msgstr "En attente"
 
@@ -4595,11 +4861,11 @@ msgstr "%H%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
 msgid "Accessing LDAP Server anonymously"
 msgstr "Connexion anonyme au serveur LDAP"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a Ã©chouÃ©.\n"
 
@@ -4611,7 +4877,7 @@ msgstr "IcÃ´ne de catÃ©gorie"
 msgid "_No Image"
 msgstr "_Aucune image"
 
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:368
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -4620,11 +4886,11 @@ msgstr ""
 "Il y a dÃ©jÃ  une catÃ©gorie Â«Â %sÂ Â» dans la configuration. Veuillez utiliser un "
 "nom diffÃ©rent"
 
-#: ../libedataserverui/e-categories-dialog.c:680
+#: ../libedataserverui/e-categories-dialog.c:676
 msgid "Icon"
 msgstr "IcÃ´ne"
 
-#: ../libedataserverui/e-categories-dialog.c:685
+#: ../libedataserverui/e-categories-dialog.c:681
 msgid "Category"
 msgstr "CatÃ©gorie"
 
@@ -4661,19 +4927,19 @@ msgstr "catÃ©gories"
 msgid "Create category \"%s\""
 msgstr "CrÃ©er la catÃ©gorie Â«Â %sÂ Â»"
 
-#: ../libedataserverui/e-name-selector-dialog.c:292
+#: ../libedataserverui/e-name-selector-dialog.c:319
 msgid "Select Contacts from Address Book"
 msgstr "SÃ©lectionnez les contacts dans le carnet d'adresses"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
+#: ../libedataserverui/e-name-selector-dialog.c:658
 msgid "_Add"
 msgstr "A_jouter"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
+#: ../libedataserverui/e-name-selector-dialog.c:662
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
+#: ../libedataserverui/e-name-selector-dialog.c:858
 #: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Toute catÃ©gorie"
@@ -4715,30 +4981,30 @@ msgid "_Search:"
 msgstr "_RechercherÂ :"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2511
+#: ../libedataserverui/e-name-selector-entry.c:2586
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "Ã?_tendre %s en ligne"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2526
+#: ../libedataserverui/e-name-selector-entry.c:2601
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Copier %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2611
 #, c-format
 msgid "C_ut %s"
 msgstr "Co_uper %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2553
+#: ../libedataserverui/e-name-selector-entry.c:2628
 #, c-format
 msgid "_Edit %s"
 msgstr "Ã?_diter %s"
 
-#: ../libedataserverui/e-name-selector-list.c:479
+#: ../libedataserverui/e-name-selector-list.c:517
 #, c-format
 msgid "_Delete %s"
 msgstr "_Supprimer %s"
@@ -4793,4 +5059,3 @@ msgstr "Aucune rÃ©ponse du serveur"
 #: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "ParamÃ¨tre erronÃ©"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]