[geary] Update French translation



commit 801fa710ccc4cb6b50ba92223b7d5d881bf86971
Author: Thibault Martin <mail thibaultmart in>
Date:   Fri Sep 4 12:27:23 2020 +0000

    Update French translation

 po/fr.po | 1793 +++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 1008 insertions(+), 785 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index a7b611ab4..c77b4de91 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,21 +21,21 @@
 # Kévin Commaille <zecakeh posteo net>, 2018.
 # Alexandre Franke <afranke gnome org>, 2019-2020.
 # Maxime Hardy <maxime bonneau hardy gmail com>, 2019.
-# Thibault Martin <mail thibaultmart in>, 2020.
+# Thibault Martin <thibaultamartin gnome org>, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-03-31 15:10+0000\n"
-"PO-Revision-Date: 2020-06-19 17:30+0200\n"
-"Last-Translator: Thibault Martin <mail thibaultmart in>\n"
-"Language-Team: French <gnomefr traduc org>\n"
+"POT-Creation-Date: 2020-09-02 04:02+0000\n"
+"PO-Revision-Date: 2020-09-03 17:05+0200\n"
+"Last-Translator: Thibault Martin <thibaultamartin gnome org>\n"
+"Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "Language: fr\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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Gtranslator 3.36.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
@@ -48,10 +48,10 @@ msgstr "Envoyer des fichiers avec Geary"
 
 #. Translators: The application name
 #: desktop/geary-autostart.desktop.in.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:555
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -62,9 +62,9 @@ msgstr "Courriel"
 
 #. Translators: The application's summary / tagline
 #: desktop/geary-autostart.desktop.in.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/application-client.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Envoyer et recevoir des courriels"
 
@@ -74,21 +74,21 @@ msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Messagerie;Courriels;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
 msgid "Geary Development Team"
 msgstr "Équipe de développement de Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
 "modern interface."
 msgstr ""
 "Geary est une application de messagerie construite autour de conversations, "
-"pour le bureau GNOME 3. Elle permet de lire, rechercher et envoyer des "
+"pour le bureau GNOME 3. Elle permet de lire, rechercher et envoyer des "
 "courriels de façon simple, avec une interface élégante."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -96,42 +96,42 @@ msgstr ""
 "Les conversations permettent de lire les échanges sans avoir à naviguer d’un "
 "message à un autre."
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
 msgid "Geary’s features include:"
 msgstr "Geary intègre les fonctionnalités suivantes :"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
 msgid "Quick email account setup"
 msgstr "Configuration rapide du compte de messagerie"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Shows related messages together in conversations"
 msgstr "Affichage des messages liés sous forme de conversation"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Fast, full text and keyword search"
 msgstr "Recherche rapide, par mot-clé ou par texte"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Édition de courriel en texte simple ou enrichi en HTML"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Desktop notification of new mail"
 msgstr "Notification de nouveaux messages"
 
-#: desktop/org.gnome.Geary.appdata.xml.in.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Compatible avec GMail, Yahoo! Mail, Outlook.com et autres serveurs IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:47
 msgid "Geary displaying a conversation"
 msgstr "Geary affichant une conversation"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
 msgid "Geary showing the rich text composer"
 msgstr "Geary montrant l’éditeur de texte enrichi"
 
@@ -270,7 +270,7 @@ msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
 msgstr ""
-"Liste des langues POSIX; la liste vide désactive la correction automatique "
+"Liste des langues POSIX ; la liste vide désactive la correction automatique "
 "et la liste nulle permet d’utiliser les langues par défaut du bureau."
 
 #: desktop/org.gnome.Geary.gschema.xml:90
@@ -364,10 +364,18 @@ msgstr ""
 "affichées."
 
 #: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Liste des greffons facultatifs"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Les greffons listés ici seront chargés au démarrage."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr "Indique si les anciens paramètres ont été migrés"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -388,13 +396,13 @@ msgstr "Tous les autres"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Vérifier votre nom d’utilisateur et mot de passe pour la réception"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Vérifiez les détails du serveur de réception"
 
@@ -404,13 +412,13 @@ msgstr "Vérifiez les détails du serveur de réception"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Vérifiez votre nom d’utilisateur et mot de passe pour l’envoi"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Vérifiez les détails du serveur d’envoi"
 
@@ -466,14 +474,14 @@ msgstr "courriel exemple fr"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Identifiant"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Mot de passe"
@@ -483,7 +491,7 @@ msgstr "Mot de passe"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "Serveur IMAP"
 
@@ -498,7 +506,7 @@ msgstr "imap.exemple.fr"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "Serveur SMTP"
 
@@ -643,55 +651,54 @@ msgstr[0] "D’il y a %d jour"
 msgstr[1] "Des %d derniers jours"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2053
+#: src/client/application/application-main-window.vala:2061
 msgid "Undo"
 msgstr "Annuler"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2036
+#: src/client/application/application-main-window.vala:2044
 msgid "Redo"
 msgstr "Rétablir"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Ce compte a été désactivé"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Ce compte a rencontré un problème et n’est pas disponible"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Autres fournisseurs de courriel"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Compte « %s » supprimé"
@@ -699,7 +706,7 @@ msgstr "Compte « %s » supprimé"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Compte « %s » restauré"
@@ -707,96 +714,95 @@ msgstr "Compte « %s » restauré"
 #. Translators: Tooltip for dragging list items
 #: src/client/accounts/accounts-editor-row.vala:50
 msgid "Drag to move this item"
-msgstr "Glissez et déplacez cet objet"
+msgstr "Faire glisser pour déplacer cet objet"
 
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
 msgid "Service provider"
 msgstr "Fournisseur de service"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:468
+#: src/client/accounts/accounts-editor-row.vala:473
 msgid "Connection security"
 msgstr "Sécurité de la connexion"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Aucune"
 
-#: src/client/accounts/accounts-editor-row.vala:486
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:493
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
 #. Translators: Label for source of SMTP authentication
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534
-#: ui/application-main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Identifiant"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:541
+#: src/client/accounts/accounts-editor-row.vala:546
 msgid "No login needed"
-msgstr "Pas d’identifiant nécessaire"
+msgstr "Aucun identifiant nécessaire"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:549
+#: src/client/accounts/accounts-editor-row.vala:554
 msgid "Use same login as receiving"
 msgstr "Utiliser le même identifiant que pour la réception"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:557
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Utiliser un identifiant différent"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
-msgstr "Compte non mis-à-jour : %s"
+msgstr "Compte non mis à jour : %s"
 
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Source de comptes"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "Comptes en ligne de GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Enregistrer les brouillons sur le serveur"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Enregistrer les messages envoyés sur le serveur"
 
@@ -805,14 +811,14 @@ msgstr "Enregistrer les messages envoyés sur le serveur"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s par OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
-msgstr "Utiliser le même identifiant que pour la réception"
+msgstr "Utiliser l’identifiant du serveur de réception"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
@@ -843,58 +849,53 @@ msgstr ""
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/application-client.vala:34
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2018 L’équipe de développement de Geary."
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 L’équipe de développement de Geary."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Visiter le site Web de Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:94
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Afficher le journal de débogage"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:100
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Démarrer Geary en mode caché (obsolète)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Autoriser l’inspecteur WebKitGTK dans les vues Web"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Journaliser la surveillance des conversations"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
 msgstr "Journaliser la désérialisation du réseau IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:110
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Journaliser la normalisation des dossiers"
 
-#. / Command line option
-#: src/client/application/application-client.vala:113
-msgid "Log network activity"
-msgstr "Journaliser l’activité du réseau"
-
 #. / Command line option
 #: src/client/application/application-client.vala:116
-msgid "Log periodic activity"
-msgstr "Journaliser l’activité périodique"
+msgid "Log IMAP network activity"
+msgstr "Journaliser l’activité IMAP du réseau"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
@@ -903,91 +904,89 @@ msgstr "Journaliser l’activité périodique"
 msgid "Log IMAP replay queue"
 msgstr "Journaliser la liste des évènements IMAP"
 
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/application-client.vala:126
-msgid "Log IMAP network serialization"
-msgstr "Journaliser la sérialisation du réseau IMAP"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+msgid "Log SMTP network activity"
+msgstr "Journaliser l’activité SMTP du réseau"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 "Journaliser les requêtes de la base de données (génère beaucoup de messages)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Quitter l’application proprement"
 
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Ouvrir une nouvelle fenêtre"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:135
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Supprimer tous les certificats TLS ajoutés"
 
 #. / Command line option
-#: src/client/application/application-client.vala:140
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Afficher la version du programme"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Version de Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Révision de Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:268
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "Version de GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:275
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "Version de GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:282
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "Version de WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:289
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr "Environnement de bureau"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:291
+#: src/client/application/application-client.vala:289
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Inconnu"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:321
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Nom de la distribution"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:326
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Version de la distribution"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:334
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Préfixe d’installation"
 
-#: src/client/application/application-client.vala:587
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
@@ -995,7 +994,7 @@ msgstr "À propos de %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada taro example com>
-#: src/client/application/application-client.vala:591
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr ""
 "ttoine <ttoine ttoine net>\n"
@@ -1014,37 +1013,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:937
+#: src/client/application/application-client.vala:1047
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "L’option « --hidden » est obsolète et sera supprimée dans le futur."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:970
+#: src/client/application/application-client.vala:1080
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argument « %s » inconnu"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:458
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Un problème est survenu lors de l’envoi de courriels pour %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:462
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
-msgstr "Les messages seront envoyés lorsque connecté"
+msgstr "Les messages seront envoyés lors de la connexion"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:568
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Conversation marquée"
 msgstr[1] "Conversations marquées"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:574
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversation démarquée"
@@ -1053,8 +1052,8 @@ msgstr[1] "Conversations démarquées"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:600
-#: src/client/application/application-controller.vala:684
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1066,8 +1065,8 @@ msgstr[1] "Conversations déplacées vers %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:608
-#: src/client/application/application-controller.vala:630
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1075,15 +1074,15 @@ msgstr[0] "Conversation restaurée vers %s"
 msgstr[1] "Conversations restaurées vers %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:651
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
-msgstr[0] "Raccourcis de conversation"
-msgstr[1] "Raccourcis de conversation"
+msgstr[0] "Conversation archivée"
+msgstr[1] "Conversations archivées"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:707
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1091,7 +1090,7 @@ msgstr[0] "Message restauré vers %s"
 msgstr[1] "Messages restaurés vers %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:728
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Message archivé"
@@ -1100,7 +1099,7 @@ msgstr[1] "Messages archivés"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:763
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1110,7 +1109,7 @@ msgstr[1] "Messages déplacés vers %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:791
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1120,19 +1119,19 @@ msgstr[1] "Conversations étiquetées comme %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:799
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Conversation désétiquetée de %s"
 msgstr[1] "Conversations désétiquetées de %s"
 
-#: src/client/application/application-controller.vala:1223
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Ouverture de la base de données de %s impossible"
 
-#: src/client/application/application-controller.vala:1224
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1158,20 +1157,20 @@ msgstr ""
 "jointes associées. <b>Les courriels présents sur le serveur ne seront pas "
 "affectés.</b>"
 
-#: src/client/application/application-controller.vala:1226
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "_Reconstruire"
 
-#: src/client/application/application-controller.vala:1226
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/client/application/application-controller.vala:1236
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Reconstruction de la base de données de « %s » impossible"
 
-#: src/client/application/application-controller.vala:1237
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1184,88 +1183,141 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1561
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "Courriel envoyé à %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2656
+#: src/client/application/application-controller.vala:2491
 #, c-format
 msgid "Email to %s queued for delivery"
-msgstr "Courriel pour %s placé dans la boîte d’envois"
+msgstr "Courriel pour %s placé dans la boîte d’envoi"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2720
+#: src/client/application/application-controller.vala:2555
 #, c-format
 msgid "Email to %s saved"
 msgstr "Courriel pour %s enregistré"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2735
-#: src/client/application/application-controller.vala:2793
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 msgstr "L’éditeur n’a pas pu être restauré"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2778
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Courriel pour %s supprimé"
 
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "Travail hors ligne"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+msgid "You will not be able to send or receive email until re-connected."
+msgstr ""
+"Vous ne pourrez pas envoyer ou recevoir de courriels jusqu’à ce que vous "
+"soyez reconnecté."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:549
+msgid "Login problem"
+msgstr "Problème d’identification"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+msgid "An account has reported an incorrect login or password."
+msgstr "Un compte indique que l’identifiant ou le mot de passe est incorrect."
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:558
+msgid "Retry login, you will be prompted for your password"
+msgstr ""
+"Effectuez une nouvelle tentative de connexion, le mot de passe vous sera "
+"demandé"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:565
+msgid "Security problem"
+msgstr "Problème de sécurité"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "Un compte indique un serveur non digne de confiance."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "Vérifier"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+msgid "Check the security details for the connection"
+msgstr "Vérifier les détails de sécurité pour la connexion"
+
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:560
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: src/client/application/application-main-window.vala:967
+#. Translators: The name of the folder group containing
+#. folders created by people (as opposed to special-use
+#. folders)
+#: src/client/application/application-main-window.vala:996
+#: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Étiquettes"
 
-#. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1306
-msgid "Do you want to permanently delete this conversation?"
-msgid_plural "Do you want to permanently delete these conversations?"
-msgstr[0] "Voulez-vous supprimer définitivement cette conversation ?"
-msgstr[1] "Voulez-vous supprimer définitivement ces conversations ?"
-
-#: src/client/application/application-main-window.vala:1311
-#: src/client/application/application-main-window.vala:1326
-msgid "Delete"
-msgstr "Supprimer"
-
-#. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1321
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Voulez-vous supprimer définitivement ce message ?"
-msgstr[1] "Voulez-vous supprimer définitivement ces messages ?"
-
-#: src/client/application/application-main-window.vala:1334
+#: src/client/application/application-main-window.vala:1293
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Supprimer tous les courriels du dossier %s ?"
 
-#: src/client/application/application-main-window.vala:1337
+#: src/client/application/application-main-window.vala:1294
 msgid "This removes the email from Geary and your email server."
 msgstr "Supprime le courriel de Geary et du serveur de messagerie."
 
-#: src/client/application/application-main-window.vala:1338
+#: src/client/application/application-main-window.vala:1295
 msgid "This cannot be undone."
 msgstr "L’action ne peut être annulée."
 
-#: src/client/application/application-main-window.vala:1339
+#: src/client/application/application-main-window.vala:1296
 #, c-format
 msgid "Empty %s"
 msgstr "Vider %s"
 
-#: src/client/application/application-main-window.vala:1669
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1353
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Voulez-vous supprimer définitivement cette conversation ?"
+msgstr[1] "Voulez-vous supprimer définitivement ces conversations ?"
+
+#: src/client/application/application-main-window.vala:1358
+#: src/client/application/application-main-window.vala:1373
+msgid "Delete"
+msgstr "Supprimer"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1368
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Voulez-vous supprimer définitivement ce message ?"
+msgstr[1] "Voulez-vous supprimer définitivement ces messages ?"
+
+#: src/client/application/application-main-window.vala:1691
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1276,7 +1328,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1839
+#: src/client/composer/composer-widget.vala:1784
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1297,90 +1349,169 @@ msgstr ""
 msgid "Don’t _ask me again"
 msgstr "Ne plus me _demander"
 
-#: src/client/components/components-inspector.vala:72
+#: src/client/components/components-inspector.vala:78
 msgid "Inspector"
 msgstr "Inspecteur"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:87
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+#: src/client/components/components-inspector.vala:93
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "Logs"
 msgstr "Journaux"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:91
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+#: src/client/components/components-inspector.vala:97
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
 msgid "System"
 msgstr "Système"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:208
-#: src/client/components/components-inspector.vala:211
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/problem-details-dialog.ui:42
+#: src/client/components/components-inspector.vala:226
+#: src/client/components/components-inspector.vala:229
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: src/client/components/components-inspector.vala:212
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
-#: ui/accounts_editor_servers_pane.ui:17
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
 msgid "Cancel"
 msgstr "Annuler"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:43
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "Sélectionner _automatiquement le message suivant"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:53
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "A_fficher l’aperçu de la conversation"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:63
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Utiliser la vue à _trois panneaux"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:73
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Utiliser les raccourcis clavier d’une _seule touche pour le courriel"
 
-#: src/client/components/components-preferences-window.vala:75
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
 msgstr ""
 "Activer les raccourcis clavier pour les actions de messagerie qui ne "
-"nécessitent pas d’appuyer sur<Ctrl>"
+"nécessitent pas d’appuyer sur <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:86
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Vérifier s’il y a de nouveaux messages après la fermeture"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:90
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr ""
-"Geary continuera à fonctionner après la fermeture de toutes les fenêtres"
+"Geary continuera de fonctionner après la fermeture de toutes les fenêtres"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "Préférences"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+msgid "Plugins"
+msgstr "Greffons"
+
+#. Translators: Info bar title for a generic account
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:36
+msgid "Account problem"
+msgstr "Problème avec le compte"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
+#, c-format
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary a rencontré un problème avec %s."
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
+#, c-format
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "Geary a rencontré un problème en vérifiant les courriels pour %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "Essayer de se reconnecter"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "Geary a rencontré un problème en envoyant un courriel pour %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "Réessayer d’envoyer les messages en attente"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "Geary a rencontré un problème"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "Veuillez rapporter les détails s’il persiste."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_Détails"
+
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "Voir les détails techniques à propos de l’erreur"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_Réessayer"
 
 #. / Translators: Search entry placeholder text
 #: src/client/components/components-search-bar.vala:12
 #: src/client/folder-list/folder-list-search-branch.vala:53
-#: src/engine/api/geary-special-folder-type.vala:51
+#: src/client/util/util-i18n.vala:298
 msgid "Search"
 msgstr "Recherche"
 
 #. / Translators: Search entry tooltip
 #: src/client/components/components-search-bar.vala:32
 msgid "Search all mail in account for keywords"
-msgstr "Rechercher les mots clés dans tous les courriels du compte"
+msgstr "Rechercher les mots-clés dans tous les courriels du compte"
 
 #. / Translators: Search entry placeholder, string
 #. / replacement is the name of an account
@@ -1392,29 +1523,29 @@ msgstr "Recherche dans le compte %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "Une adresse électronique est nécessaire"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Adresse électronique non valable"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Un nom de serveur est nécessaire"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
-msgstr "Ne peut trouver le nom du serveur"
+msgstr "Impossible de trouver le nom du serveur"
 
 #: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
@@ -1452,75 +1583,6 @@ msgid_plural "Delete conversations"
 msgstr[0] "Supprimer la conversation"
 msgstr[1] "Supprimer les conversations"
 
-#. Translators: Info bar title for a generic account
-#. problem.
-#: src/client/components/main-window-info-bar.vala:44
-msgid "Account problem"
-msgstr "Problème avec le compte"
-
-#. Translators: Info bar sub-title for a generic account
-#. problem. String substitution is the account name.
-#: src/client/components/main-window-info-bar.vala:48
-#, c-format
-msgid "Geary has encountered a problem with %s."
-msgstr "Geary a rencontré un problème avec %s."
-
-#. Translators: Info bar sub-title for a generic
-#. account problem. String substitution is the
-#. account name.
-#: src/client/components/main-window-info-bar.vala:61
-#, c-format
-msgid "Geary encountered a problem checking mail for %s."
-msgstr "Geary a rencontré un problème en vérifiant les courriels pour %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting"
-msgstr "Essayer de se reconnecter"
-
-#. Translators: Info bar title for an outgoing
-#. account problem. String substitution is the
-#. account name
-#: src/client/components/main-window-info-bar.vala:73
-#, c-format
-msgid "Geary encountered a problem sending email for %s."
-msgstr "Geary a rencontré un problème en envoyant un courriel pour %s."
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
-msgid "Retry sending queued messages"
-msgstr "Réessayer d’envoyer les messages en attente"
-
-#. Translators: Info bar title for a generic application
-#. problem.
-#: src/client/components/main-window-info-bar.vala:84
-msgid "Geary has encountered a problem"
-msgstr "Geary a rencontré un problème"
-
-#. Translators: Info bar sub-title for a generic
-#. application problem.
-#: src/client/components/main-window-info-bar.vala:88
-msgid "Please report the details if it persists."
-msgstr "Veuillez rapporter les détails s’il persiste."
-
-#. Translators: Button label for viewing technical details
-#. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
-msgid "_Details"
-msgstr "_Détails"
-
-#. Translators: Tooltip for viewing technical details for
-#. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
-msgid "View technical details about the error"
-msgstr "Voir les détails techniques à propos de l’erreur"
-
-#. Translators: Button label for retrying a server
-#. connection
-#: src/client/components/main-window-info-bar.vala:108
-msgid "_Retry"
-msgstr "_Réessayer"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
 msgid "Sending…"
@@ -1541,7 +1603,9 @@ msgstr "Erreur d’enregistrement du message envoyé"
 msgid "_OK"
 msgstr "_Valider"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "A_nnuler"
 
@@ -1561,15 +1625,17 @@ msgstr "_Fermer"
 msgid "_Discard"
 msgstr "A_bandonner"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "Aid_e"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Préférences"
 
@@ -1593,7 +1659,11 @@ msgstr "_Enregistrer"
 
 #: src/client/components/stock.vala:32
 msgid "_Keep"
-msgstr "_Garder"
+msgstr "_Conserver"
+
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Sélectionner une couleur"
 
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
@@ -1609,23 +1679,23 @@ msgid "Invalid email address"
 msgstr "Adresse électronique non valable"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:30
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: src/client/composer/composer-widget.vala:217
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Enregistré"
 
-#: src/client/composer/composer-widget.vala:218
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Enregistrement"
 
-#: src/client/composer/composer-widget.vala:219
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Erreur d’enregistrement"
 
-#: src/client/composer/composer-widget.vala:220
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Appuyez sur Retour arrière pour supprimer la citation"
 
@@ -1634,7 +1704,7 @@ msgstr "Appuyez sur Retour arrière pour supprimer la citation"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:236
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1645,115 +1715,105 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:843
+#: src/client/composer/composer-widget.vala:862
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Voulez-vous conserver ou abandonner ce brouillon ?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:869
+#: src/client/composer/composer-widget.vala:888
 msgid "Do you want to discard this draft message?"
 msgstr "Voulez-vous abandonner ce brouillon ?"
 
-#: src/client/composer/composer-widget.vala:1508
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
-msgstr "Envoyer le message avec un objet et un contenu vide ?"
+msgstr "Envoyer le message avec un objet et un contenu vides ?"
 
-#: src/client/composer/composer-widget.vala:1510
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "Envoyer le message avec un objet vide ?"
 
-#: src/client/composer/composer-widget.vala:1512
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "Envoyer le message avec un contenu vide ?"
 
-#: src/client/composer/composer-widget.vala:1521
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "Envoyer le message sans pièce jointe ?"
 
-#: src/client/composer/composer-widget.vala:1825
+#: src/client/composer/composer-widget.vala:1772
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "« %s » a déjà été joint au message."
 
-#: src/client/composer/composer-widget.vala:1861
-#: src/client/composer/composer-widget.vala:1911
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "« %s » est un fichier vide."
 
-#: src/client/composer/composer-widget.vala:1899
+#: src/client/composer/composer-widget.vala:1842
 #, c-format
 msgid "“%s” could not be found."
 msgstr "« %s » est introuvable."
 
-#: src/client/composer/composer-widget.vala:1905
+#: src/client/composer/composer-widget.vala:1848
 #, c-format
 msgid "“%s” is a folder."
 msgstr "« %s » est un dossier."
 
-#: src/client/composer/composer-widget.vala:1924
+#: src/client/composer/composer-widget.vala:1867
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "« %s » n’a pas pu être ouvert pour lecture."
 
-#: src/client/composer/composer-widget.vala:1932
+#: src/client/composer/composer-widget.vala:1875
 msgid "Cannot add attachment"
 msgstr "Impossible d’ajouter la pièce jointe"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1946
+msgid "Images"
+msgstr "Images"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1989
-#: src/client/conversation-viewer/conversation-email.vala:559
-#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2010
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "À :"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1995
-#: src/client/conversation-viewer/conversation-email.vala:564
-#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2016
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc :"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2001
-#: src/client/conversation-viewer/conversation-email.vala:569
+#: src/client/composer/composer-widget.vala:2022
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Cci :"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2007
+#: src/client/composer/composer-widget.vala:2028
 msgid "Reply-To: "
 msgstr "Répondre à : "
 
-#: src/client/composer/composer-widget.vala:2259
-msgid "Select Color"
-msgstr "Sélectionner une couleur"
-
 #. Displayed in the From dropdown to indicate an
 #. "alternate email address" for an account.  The first
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2445
+#: src/client/composer/composer-widget.vala:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2501
-msgid "_From:"
-msgstr "_De :"
-
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2806
-msgid "Images"
-msgstr "Images"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Enlever cette langue de la liste des favorites"
@@ -1767,51 +1827,51 @@ msgid "Search for more languages"
 msgstr "Rechercher des langues supplémentaires"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Déplacer la conversation vers la _Corbeille"
 msgstr[1] "Déplacer les conversations vers la _Corbeille"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Supprimer la conversation"
 msgstr[1] "_Supprimer les conversations"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marquer comme _lu"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non Lu"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Supprimer l’étoile"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "Ma_rquer d’une étoile"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "R_épondre à tous"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Transférer"
@@ -1821,20 +1881,20 @@ msgid "Me"
 msgstr "Moi"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:554
-#: src/client/util/util-email.vala:226
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "De :"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:574
-#: src/client/util/util-email.vala:231
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Date :"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:584
-#: src/client/util/util-email.vala:229
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Objet :"
 
@@ -1842,27 +1902,63 @@ msgstr "Objet :"
 msgid "This email address may have been forged"
 msgstr "Cette adresse électronique a peut-être été falsifiée"
 
+#. Translators: Label text displayed when there are too
+#. many email addresses to be shown by default in an
+#. email's header, but they are all being shown anyway.
+#: src/client/conversation-viewer/conversation-message.vala:234
+msgid "Show less"
+msgstr "Afficher moins"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
+#, c-format
+msgid "%d more…"
+msgstr "%d autres…"
+
 #. Compact headers. These are partially done here and partially
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:439
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Aucun expéditeur"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:831
+#: src/client/conversation-viewer/conversation-message.vala:920
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:951
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Image"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "Images distantes non affichées"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "N’afficher les images distantes que pour les expéditeurs de confiance."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "Afficher"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+msgid "Always show from sender"
+msgstr "Toujours afficher pour cet expéditeur"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
 #: src/client/conversation-viewer/conversation-viewer.vala:83
@@ -1909,8 +2005,7 @@ msgstr "Ce dossier ne contient aucune conversation"
 #: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
-"La recherche n’a pas donné de résultats, essayez d’affiner les termes "
-"utilisés"
+"La recherche n’a donné aucun résultat, essayez d’affiner les termes utilisés"
 
 #: src/client/dialogs/attachment-dialog.vala:25
 msgid "Choose a file"
@@ -2001,8 +2096,8 @@ msgstr ""
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Détails"
 
@@ -2013,26 +2108,32 @@ msgstr "Détails"
 msgid "Geary requires your email password to continue"
 msgstr "Geary a besoin de votre mot de passe de messagerie pour continuer"
 
-#. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d message"
 msgstr[1] "%d messages"
 
-#. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d non lu"
 msgstr[1] "%d non lus"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -2048,45 +2149,225 @@ msgid_plural "%d results"
 msgstr[0] "%d résultat"
 msgstr[1] "%d résultats"
 
-#. / Notification body text for new email when no other
-#. / new messages are already awaiting.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d nouveau message"
-msgstr[1] "%d nouveaux messages"
-
-#. / Notification body text for new email when
-#. / other new messages have already been notified
-#. / about
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] "%s, %d nouveau message au total"
-msgstr[1] "%s, %d nouveaux messages au total"
-
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
 msgid ""
 "%s\n"
-"(%d other new message for %s)"
+"(%d other new message)"
 msgid_plural ""
 "%s\n"
-"(%d other new messages for %s)"
+"(%d other new messages)"
 msgstr[0] ""
 "%s\n"
-"(%d nouveau message restant pour %s)"
+"(%d autre nouveau message)"
 msgstr[1] ""
 "%s\n"
-"(%d nouveaux messages restants pour %s)"
+"(%d autres nouveaux messages)"
+
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d nouveau message"
+msgstr[1] "%d nouveaux messages"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] "%s, %d nouveau message au total"
+msgstr[1] "%s, %d nouveaux messages au total"
+
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Nouveau message"
+msgstr[1] "Nouveaux messages"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+msgid "Email Templates"
+msgstr "Modèles de courriel"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "Créer des modèles réutilisables pour envoyer des courriels"
+
+#. Translators: Templates folder name alternatives. Separate names
+#. using a vertical bar and put the most common localized name to
+#. the front for the default. English names do not need to be
+#. included.
+#: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
+msgid "Templates | Template Mail | Template Email | Template E-Mail"
+msgstr ""
+"Modèles | Modèle de courrier | Modèle de courriel | Modèle de courrier "
+"électronique"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+msgstr "Modèles"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:282
+msgid "New"
+msgstr "Nouveau"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "Modèle de message"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "Envoyer"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "Éditer"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Publipostage"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Remplir et envoyer des courriels à partir d’un tableur"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Commencer"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Mettre en pause"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
+#, c-format
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "%u sur %u envoyé"
+msgstr[1] "%u sur %u envoyés"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Modèle de publipostage"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Publipostage"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Insérer un champ"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Valeurs séparées par des virgules (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Menu de messagerie"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr ""
+"Afficher les notifications du menu de messagerie de Unity pour les nouveaux "
+"messages"
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Nouveaux messages"
 
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Son d’envoi"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "Joue le son d’envoi d’un courriel lorsque celui-ci est envoyé"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "Vider"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:179
+msgid "Draft message"
+msgstr "Brouillon"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:182
+msgid "This message has not yet been sent."
+msgstr "Ce message n’a pas été envoyé pour le moment."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+msgstr "Message non enregistré"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:201
+msgid "This message was sent, but has not been saved to your account."
+msgstr ""
+"Ce message a été envoyé, mais n’a pas été enregistré dans votre compte."
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -2134,15 +2415,15 @@ msgstr "Maintenant"
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
-msgstr[0] "il y a %d min."
-msgstr[1] "il y a %d min."
+msgstr[0] "il y a %d min"
+msgstr[1] "il y a %d min"
 
 #: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
-msgstr[0] "il y a %d h."
-msgstr[1] "il y a %d h."
+msgstr[0] "il y a %d h"
+msgstr[1] "il y a %d h"
 
 #: src/client/util/util-date.vala:173
 msgid "Yesterday"
@@ -2155,42 +2436,46 @@ msgstr "Hier"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:216
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a %-e %b %Y à %l:%M %P"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a %-e %b %Y à %-H:%M"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a %-e %b %Y à %X"
 
-#: src/client/util/util-email.vala:38
-#: src/engine/rfc822/rfc822-message.vala:1003
-msgid "(no subject)"
-msgstr "(pas d’objet)"
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
+msgid "(No subject)"
+msgstr "(Aucun objet)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:134
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
-msgstr "(Pas de destinataire)"
+msgstr "(Aucun destinataire)"
 
 #. / Translators: This is used for displaying a short
 #. / list of email recipients lists with two or more
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:146
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2200,26 +2485,26 @@ msgstr[1] "%s et %d autres"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:179
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "Le %1$s, %2$s a écrit :"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:186
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s a écrit :"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:192
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "Le %s :"
 
-#: src/client/util/util-email.vala:221
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Message transféré ----------"
 
@@ -2247,43 +2532,43 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "Ko"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Messages envoyés"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
+msgstr "Envoyés"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Marqués d’une étoile"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Importants"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Tous les messages"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
 msgstr "Pourriel"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Boîte d’envoi"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Archives"
 
@@ -2303,7 +2588,7 @@ msgstr "Archives"
 #: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
-msgstr "piècejointe"
+msgstr "pièce-jointe"
 
 #. Can be typed in the search box like
 #. "bcc:johndoe example com" to find messages bcc'd to a
@@ -2453,13 +2738,13 @@ msgstr "marqués"
 #: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
-msgstr "nonlu"
+msgstr "non-lu"
 
 #. List of general possible folder names to match for the
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:882
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Drafts | Draft"
 msgstr "Brouillons | Brouillon"
 
@@ -2467,22 +2752,22 @@ msgstr "Brouillons | Brouillon"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:891
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1005
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "Envoyés | Messages envoyés | Boîte d’envoi"
+msgstr "Envoyés | Messages envoyés | Courriels envoyés | Boîte d’envoi"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:896
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1010
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Éléments envoyés"
 
 #. List of general possible folder names to match for the
-#. Spam mailbox. Separate names using a vertical bar and
-#. put the most common localized name to the front for the
-#. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:906
+#. Junk/Spam mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2492,13 +2777,13 @@ msgstr "Pourriel | Pourriels | Indésirables | Messages indésirables"
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:916
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Corbeille | Poubelle"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:921
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1035
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Éléments supprimés"
@@ -2507,33 +2792,37 @@ msgstr "Éléments supprimés"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:931
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgid "Archive | Archives"
 msgstr "Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:461
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
-msgstr "Impossible de déterminer le type MIME de « %s »"
+msgstr "Impossible de déterminer le type MIME de « %s »."
 
-#: src/engine/rfc822/rfc822-message.vala:472
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
-msgstr "Impossible de déterminer le type MIME « %s » sur « %s »"
+msgstr "Impossible de déterminer le type MIME « %s » sur « %s »."
+
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(aucun objet)"
 
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Ajouter un compte"
 
 #: ui/accounts_editor_add_pane.ui:53
-msgid "Create"
-msgstr "Créer"
+msgid "_Create"
+msgstr "_Créer"
 
-#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
 msgid "Receiving"
 msgstr "Réception"
 
-#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
 msgid "Sending"
 msgstr "Envoi"
 
@@ -2581,7 +2870,7 @@ msgstr "Pour commencer, sélectionnez un fournisseur courriel ci-dessous."
 
 #: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
-msgstr "Bienvenue dans Geary."
+msgstr "Bienvenue dans Geary"
 
 #. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
 #: ui/accounts_editor_remove_pane.ui:73
@@ -2606,83 +2895,6 @@ msgstr "Supprimer le compte"
 msgid "Apply"
 msgstr "Appliquer"
 
-#. Infobar title when one or more accounts are offline
-#: ui/application-main-window.ui:185
-msgid "Working offline"
-msgstr "Travail hors ligne"
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"Votre ordinateur ne semble pas être connecté à Internet.\n"
-"Vous ne pourrez pas envoyer ou recevoir de courriel jusqu’à ce que vous "
-"soyez reconnecté."
-
-#. Label and tooltip for offline infobar
-#: ui/application-main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr ""
-"Vous ne pourrez pas envoyer ou recevoir de courriels jusqu’à ce que vous "
-"soyez reconnecté."
-
-#. Button label for retrying TLS cert validation
-#: ui/application-main-window.ui:249
-msgid "Check"
-msgstr "Vérifier"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/application-main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "Vérifiez les détails de sécurité pour la connexion"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/application-main-window.ui:282
-msgid "Security problem"
-msgstr "Problème de sécurité"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"Un compte indique un serveur non digne de confiance.\n"
-"Veuillez vérifier la configuration du serveur et réessayez."
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/application-main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Un compte indique un serveur non digne de confiance."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/application-main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr ""
-"Effectuez une nouvelle tentative de connexion, le mot de passe vous sera "
-"demandé"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/application-main-window.ui:379
-msgid "Login problem"
-msgstr "Problème d’identification"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"Un compte indique que l’identifiant ou le mot de passe est incorrect.\n"
-"Veuillez vérifier votre identifiant et réessayez."
-
-#. Label and tooltip for authentication problem infobar
-#: ui/application-main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "Un compte indique que l’identifiant ou le mot de passe est incorrect."
-
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "Connexion non certifiée"
@@ -2699,248 +2911,248 @@ msgstr "Faire _confiance à ce serveur"
 msgid "_Don’t Trust This Server"
 msgstr "Ne _pas faire confiance à ce serveur"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
-msgid "Detach the composer from the window"
-msgstr "Détacher la fenêtre d’édition"
-
-#: ui/composer-headerbar.ui:135
-msgid "_Send"
-msgstr "_Envoyer"
-
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Abandonner et fermer"
-
-#: ui/composer-headerbar.ui:186
-msgid "Save and Close"
-msgstr "Enregistrer et fermer"
-
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:42
-msgid "Insert the new link with this URL"
-msgstr "Insérer le nouveau lien avec cet URL"
-
-#: ui/composer-link-popover.ui:43
-msgid "Add"
-msgstr "Ajouter"
-
-#: ui/composer-link-popover.ui:47
-msgid "Link URL"
-msgstr "URL du lien"
-
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:61
-msgid "Update this link’s URL"
-msgstr "Mettre à jour l’URL de ce lien"
-
-#: ui/composer-link-popover.ui:62
-msgid "Update"
-msgstr "Mise à jour"
-
-#: ui/composer-link-popover.ui:75
-msgid "Delete this link"
-msgstr "Supprimer ce lien"
-
-#: ui/composer-menus.ui:8
-msgid "_Undo"
-msgstr "Ann_uler"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "_Rétablir"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "Co_uper"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Copier"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "Co_ller"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Coller sans la _mise en forme"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "T_out sélectionner"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Inspecter…"
-
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "From"
-msgstr "De"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
-msgid "_To"
-msgstr "_À"
-
-#: ui/composer-widget.ui:158
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "Afficher les champs Cc, Cci et Répondre à"
-
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "_Cci"
-
-#: ui/composer-widget.ui:315
-msgid "_Reply-To"
-msgstr "_Répondre à"
-
-#: ui/composer-widget.ui:372
-msgid "_Subject"
-msgstr "_Objet"
-
-#: ui/composer-widget.ui:445
-msgid "Drop files here"
-msgstr "Déposer des fichiers ici"
-
-#: ui/composer-widget.ui:461
-msgid "To add them as attachments"
-msgstr "Pour les ajouter en tant que pièces jointes"
-
-#: ui/composer-widget.ui:602
+#: ui/composer-editor.ui:100
 msgid "Bold text"
 msgstr "Texte en gras"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-editor.ui:124
 msgid "Italic text"
 msgstr "Texte en italique"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-editor.ui:148
 msgid "Underline text"
 msgstr "Texte souligné"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-editor.ui:172
 msgid "Strikethrough text"
 msgstr "Texte barré"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-editor.ui:205
 msgid "Insert bulleted list"
 msgstr "Insérer une liste à puces"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-editor.ui:229
 msgid "Insert numbered list"
 msgstr "Insérer une liste numérotée"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-editor.ui:262
 msgid "Indent or quote text"
 msgstr "Indenter ou citer le texte"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-editor.ui:286
 msgid "Un-indent or unquote text"
 msgstr "Supprimer la citation"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-editor.ui:315
 msgid "Remove text formatting"
 msgstr "Effacer la mise en forme"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-editor.ui:334
 msgid "Change font type"
 msgstr "Changer le type de police"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-editor.ui:349
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-editor.ui:360
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-editor.ui:371
 msgid "Fixed Width"
 msgstr "Largeur fixe"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-editor.ui:397
 msgid "Change font color"
 msgstr "Changer la couleur de la police"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-editor.ui:412
 msgid "Change font size"
 msgstr "Changer la taille de la police"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-editor.ui:447
 msgid "Insert or update text link"
 msgstr "Insérer ou mettre à jour le lien textuel"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-editor.ui:471
 msgid "Insert an image"
 msgstr "Insérer une image"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-editor.ui:513
 msgid "Undo last edit"
 msgstr "Annuler la dernière modification"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-editor.ui:537
 msgid "Redo last edit"
-msgstr "Refaire la dernière modification"
+msgstr "Rétablir la dernière modification"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-editor.ui:615
 msgid "Add original attachments"
 msgstr "Ajouter les pièces jointes d’origine"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-editor.ui:660
 msgid "More options"
 msgstr "Plus d’options"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-editor.ui:680
 msgid "Show formatting toolbar"
 msgstr "Afficher la barre d’outils de mise en forme"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-editor.ui:698
 msgid "Select spell checking languages"
 msgstr "Choisir les langues de vérification orthographique"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Largeur fixe"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Petit"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Moyen"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Grand"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "Texte _riche"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-editor.ui:768
 msgid "_Plain Text"
 msgstr "Texte sim_ple"
 
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "Ann_uler"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "_Rétablir"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "Co_uper"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Copier"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "Co_ller"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Coller sans la _mise en forme"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "T_out sélectionner"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Inspecter…"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Détacher la fenêtre d’édition"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Envoyer"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Abandonner et fermer"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Enregistrer et fermer"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Insérer le nouveau lien avec cet URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Ajouter"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "URL du lien"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Mettre à jour l’URL de ce lien"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Mise à jour"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Supprimer ce lien"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_De"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:131
+msgid "_To"
+msgstr "_À"
+
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Afficher les champs Cc, Cci et Répondre à"
+
+#: ui/composer-widget.ui:220
+msgid "_Cc"
+msgstr "_Cc"
+
+#: ui/composer-widget.ui:268
+msgid "_Bcc"
+msgstr "Cc_i"
+
+#: ui/composer-widget.ui:316
+msgid "_Reply-To"
+msgstr "_Répondre à"
+
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Objet"
+
+#: ui/composer-widget.ui:446
+msgid "Drop files here"
+msgstr "Déposer des fichiers ici"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "Pour les ajouter en tant que pièces jointes"
+
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Sélectionner toutes les pièces jointes"
@@ -2957,45 +3169,55 @@ msgstr "Ouvrir les pièces jointes sélectionnées"
 msgid "Save _All"
 msgstr "_Tout enregistrer"
 
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-inspector-error-view.ui:31
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
-"\">new bug report</a>."
+"one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+"ReportingABug\">new bug report</a>."
 msgstr ""
 "Si le problème est grave ou persiste, copiez et envoyez ces détails à la <a "
-"href=\"https://wiki.gnome.org/Apps/Geary/-Contact\";>liste de diffusion</a> "
-"ou ajoutez-les à un <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
+"href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>liste de diffusion</a> ou "
+"ajoutez-les à un <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
 "\">nouveau rapport d’anomalie</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Détails :"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:20
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+msgid "Search for matching log entries"
+msgstr "Rechercher dans les journaux système"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
 msgid "Toggle appending new log entries"
 msgstr "Activer l’ajout de nouvelles entrées dans les journaux système"
 
 #. Tooltip for inspector button
-#. Tooltip for problem report button
-#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-msgid "Search for matching log entries"
-msgstr "Rechercher dans les journaux système"
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr "Ajouter un marqueur au journal"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
 msgid "Save logs entries and details"
 msgstr "Enregistrer les détails et entrées dans les journaux système"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papiers"
 
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "Effacer toutes les entrées des journaux système"
+
 #: ui/conversation-contact-popover.ui:146
 msgid "New Conversation…"
 msgstr "Nouvelle conversation…"
@@ -3006,7 +3228,7 @@ msgstr "Copier l’adresse électronique"
 
 #: ui/conversation-contact-popover.ui:182
 msgid "Save in Contacts…"
-msgstr "Enregistrer dans les Contacts…"
+msgstr "Enregistrer dans Contacts…"
 
 #: ui/conversation-contact-popover.ui:195
 msgid "Show Conversations"
@@ -3014,7 +3236,7 @@ msgstr "Montrer les conversations"
 
 #: ui/conversation-contact-popover.ui:208
 msgid "Open in Contacts"
-msgstr "Ouvrir dans les Contacts"
+msgstr "Ouvrir dans Contacts"
 
 #: ui/conversation-contact-popover.ui:221
 msgid "Always Load Remote Images"
@@ -3054,27 +3276,6 @@ msgstr "Marquer ce message d’une étoile"
 msgid "Mark this message as not starred"
 msgstr "Ne pas marquer ce message d’une étoile"
 
-#: ui/conversation-email.ui:124
-msgid "Edit Draft"
-msgstr "Modifier le brouillon"
-
-#: ui/conversation-email.ui:151
-msgid "Draft message"
-msgstr "Brouillon"
-
-#: ui/conversation-email.ui:167
-msgid "This message has not yet been sent."
-msgstr "Ce message n’a pas été envoyé pour le moment."
-
-#: ui/conversation-email.ui:213
-msgid "Message not saved"
-msgstr "Message non enregistré"
-
-#: ui/conversation-email.ui:229
-msgid "This message was sent, but has not been saved to your account."
-msgstr ""
-"Ce message a été envoyé, mais n’a pas été enregistré dans votre compte."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -3088,7 +3289,7 @@ msgstr "Marquer comme l_u"
 
 #: ui/conversation-email-menus.ui:36
 msgid "_Mark Unread"
-msgstr "Marquer comme non l_u"
+msgstr "Marquer comme _non lu"
 
 #. Translators: Menu item to mark all messages in a
 #. conversation from this one as unread.
@@ -3133,8 +3334,7 @@ msgstr ""
 #: ui/conversation-message-link-popover.ui:124
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr ""
-"Si vous n’êtes pas sûr, contactez l’expéditeur et demandez avant de "
-"continuer."
+"Si vous avez un doute, contactez l’expéditeur et demandez avant de continuer."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -3150,7 +3350,7 @@ msgstr "_Nouvelle conversation…"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
-msgstr "Copier l’_adresse électronique"
+msgstr "Copier l’a_dresse électronique"
 
 #: ui/conversation-message-menus.ui:27
 msgid "Save _Image As…"
@@ -3184,22 +3384,6 @@ msgstr "Répondre à :"
 msgid "Subject"
 msgstr "Objet"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Afficher les images"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Toujours afficher pour cet expéditeur"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Images distantes non affichées"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "N’afficher les images distantes que pour les expéditeurs de confiance."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Rechercher dans la conversation"
@@ -3226,7 +3410,7 @@ msgstr "_Suivant"
 
 #: ui/find_bar.glade:125
 msgid "_Case sensitive"
-msgstr "_Sensible à la casse"
+msgstr "Sensible à la _casse"
 
 #: ui/find_bar.glade:145
 msgid "label"
@@ -3236,7 +3420,7 @@ msgstr "étiquette"
 msgid "Conversation Shortcuts"
 msgstr "Raccourcis de conversation"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Actions"
@@ -3251,37 +3435,37 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Répondre à l’expéditeur"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Transférer"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "Marquer ou démarquer comme lu"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "Marquer ou démarquer d’une étoile"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Archiver les conversations"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Déplacer les conversations"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Étiqueter les conversations"
@@ -3291,35 +3475,37 @@ msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Mettre les conversations à la corbeille"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Conversations indésirables"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "Supprimer les conversations"
 
+# Il s’agit du titre de la section (Charles).
 #: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
-msgstr "Rechercher"
+msgstr "Recherche"
 
 #: ui/gtk/help-overlay.ui:108
 msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Rechercher des conversations"
 
-#: ui/gtk/help-overlay.ui:115
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Trouver dans la conversation actuelle"
 
+# Il s’agit du titre de la section (Charles).
 #: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
 msgid "Undo"
-msgstr "Annuler"
+msgstr "Annulation"
 
 #: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
@@ -3351,7 +3537,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Réinitialiser le zoom"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Général"
@@ -3384,7 +3570,7 @@ msgstr "Quitter l’application"
 #: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
-msgstr "Navigation clavier"
+msgstr "Navigation au clavier"
 
 #: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
@@ -3394,128 +3580,133 @@ msgstr "Aller au volet suivant/précédent"
 #: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
 msgid "Select next/previous conversation"
-msgstr "Sélectionnez la conversation suivante/précédente"
+msgstr "Sélectionner la conversation suivante/précédente"
 
 #: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Déplacer le focus au message suivant/précédent"
 
-#: ui/gtk/help-overlay.ui:258
-msgctxt "shortcut window"
-msgid "Single-key shortcuts"
+#: ui/gtk/help-overlay.ui:260
+msgid "Single-key Shortcuts"
 msgstr "Raccourcis clavier d’une seule touche"
 
-#: ui/gtk/help-overlay.ui:262
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Répondre à l’expéditeur "
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Raccourcis clavier d’une seule touche (si activé)"
 
-#: ui/gtk/help-overlay.ui:332
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
-msgid "Find in current conversations"
-msgstr "Rechercher dans les conversations en cours"
+msgid "Reply to sender "
+msgstr "Répondre à l’expéditeur"
 
-#: ui/gtk/help-overlay.ui:339
+#: ui/gtk/help-overlay.ui:361
 msgctxt "shortcut window"
 msgid "Select next/previous conversations"
-msgstr "Sélectionnez les conversations suivantes/précédentes"
+msgstr "Sélectionner les conversations suivantes/précédentes"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:373
 msgid "Composer Shortcuts"
 msgstr "Raccourcis de l’éditeur"
 
-#: ui/gtk/help-overlay.ui:359
+# Je pense qu’il s’agit du titre de la section, à vérifier  (Charles).
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
 msgid "Send"
-msgstr "Envoyer"
+msgstr "Envoi"
 
-#: ui/gtk/help-overlay.ui:366
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Ajouter une pièce jointe"
 
-#: ui/gtk/help-overlay.ui:379
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "Détacher la fenêtre d’édition"
+
+#: ui/gtk/help-overlay.ui:408
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Fermer la fenêtre d’édition"
 
-#: ui/gtk/help-overlay.ui:386
+#: ui/gtk/help-overlay.ui:415
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Détacher la fenêtre d’édition"
 
-#: ui/gtk/help-overlay.ui:393
+#: ui/gtk/help-overlay.ui:422
 msgctxt "shortcut window"
 msgid "Editing"
-msgstr "Éditer"
+msgstr "Édition"
 
-#: ui/gtk/help-overlay.ui:398
+#: ui/gtk/help-overlay.ui:427
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Déplacer la sélection dans le presse-papiers"
 
-#: ui/gtk/help-overlay.ui:405
+#: ui/gtk/help-overlay.ui:434
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Copier la sélection vers le presse-papiers"
 
-#: ui/gtk/help-overlay.ui:412
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Coller à partir du presse-papiers"
 
-#: ui/gtk/help-overlay.ui:419
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Mettre en citation"
 
-#: ui/gtk/help-overlay.ui:426
+#: ui/gtk/help-overlay.ui:455
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Supprimer la citation"
 
-#: ui/gtk/help-overlay.ui:435
+#: ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Mode d’édition en texte enrichi"
 
-#: ui/gtk/help-overlay.ui:439
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Coller sans la mise en forme"
 
-#: ui/gtk/help-overlay.ui:446
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Texte en gras"
 
-#: ui/gtk/help-overlay.ui:453
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Texte en italique"
 
-#: ui/gtk/help-overlay.ui:460
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Texte souligné"
 
-#: ui/gtk/help-overlay.ui:467
+#: ui/gtk/help-overlay.ui:496
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Texte barré"
 
-#: ui/gtk/help-overlay.ui:474
+#: ui/gtk/help-overlay.ui:503
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Effacer la mise en forme"
 
-#: ui/gtk/help-overlay.ui:481
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Insérer une image"
 
-#: ui/gtk/help-overlay.ui:488
+#: ui/gtk/help-overlay.ui:517
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Insérer un lien"
@@ -3550,26 +3741,18 @@ msgid "_Archive"
 msgstr "_Archiver"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Toggle as S_pam"
+msgid "Toggle as _Junk"
 msgstr "Marquer comme _pourriel"
 
 #: ui/main-toolbar-menus.ui:28
-msgid "Empty _Spam…"
-msgstr "Vider les pourriel_s…"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Trash…"
-msgstr "Vider la _corbeille…"
-
-#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ui/main-toolbar-menus.ui:46
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "_Raccourcis clavier"
 
-#: ui/main-toolbar-menus.ui:57
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "À _propos de Geary"
 
@@ -3593,15 +3776,62 @@ msgstr "_Authentifier"
 msgid "Geary update in progress…"
 msgstr "Mise à jour de Geary en cours…"
 
+#~ msgid "Log periodic activity"
+#~ msgstr "Journaliser l’activité périodique"
+
+#~ msgid "Log IMAP network serialization"
+#~ msgstr "Journaliser la sérialisation du réseau IMAP"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Messages envoyés"
+
+#~ msgid "Spam"
+#~ msgstr "Pourriel"
+
+#~ msgid ""
+#~ "Your computer does not appear to be connected to the Internet.\n"
+#~ "You will not be able to send or receive email until it is re-connected."
+#~ msgstr ""
+#~ "Votre ordinateur ne semble pas être connecté à Internet.\n"
+#~ "Vous ne pourrez pas envoyer ou recevoir de courriel jusqu’à ce que vous "
+#~ "soyez reconnecté."
+
+#~ msgid ""
+#~ "An account has reported an untrusted server.\n"
+#~ "Please check the server configuration and try again."
+#~ msgstr ""
+#~ "Un compte indique un serveur non digne de confiance.\n"
+#~ "Veuillez vérifier la configuration du serveur et réessayez."
+
+#~ msgid ""
+#~ "An account has reported an incorrect login or password.\n"
+#~ "Please check your login name and try again."
+#~ msgstr ""
+#~ "Un compte indique que l’identifiant ou le mot de passe est incorrect.\n"
+#~ "Veuillez vérifier votre identifiant et réessayez."
+
+#~ msgid "From"
+#~ msgstr "De"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Modifier le brouillon"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find in current conversations"
+#~ msgstr "Rechercher dans les conversations en cours"
+
+#~ msgid "Empty _Spam…"
+#~ msgstr "Vider les pourriel_s…"
+
+#~ msgid "Empty _Trash…"
+#~ msgstr "Vider la _corbeille…"
+
 #~ msgid "Enable notification sounds"
 #~ msgstr "Activer les sons de notification"
 
 #~ msgid "True to play sounds for notifications and sending."
 #~ msgstr "Vrai pour jouer les sons des notifications et lors de l’envoi."
 
-#~ msgid "Show notifications for new mail"
-#~ msgstr "Afficher les notifications de nouveaux messages"
-
 #~ msgid "True to show notification bubbles."
 #~ msgstr "Vrai pour afficher les bulles de notification."
 
@@ -3729,9 +3959,6 @@ msgstr "Mise à jour de Geary en cours…"
 #~ msgid "Show _notifications for new mail"
 #~ msgstr "Afficher les _notifications de nouveaux messages"
 
-#~ msgid "Preferences"
-#~ msgstr "Préférences"
-
 #~ msgid "mail-send"
 #~ msgstr "mail-send"
 
@@ -3970,10 +4197,6 @@ msgstr "Mise à jour de Geary en cours…"
 #~ msgid "Additional Shortcuts"
 #~ msgstr "Raccourcis supplémentaires"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Marquer d’une étoile"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Supprimer l’étoile"


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