[geary] Update French translation

[Translations User D-L <translations src gnome org>]

commit 843dd1f829c0a7d8f44d18626831192ce3857d7d
Author: Charles Monzat <charles monzat free fr>
Date:   Mon Aug 15 15:31:28 2022 +0000

    Update French translation
    
    (cherry picked from commit b9e80703b479b31bf87e53e11e844dcd1fbdf8a0)

 po/fr.po | 1961 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 1008 insertions(+), 953 deletions(-)
---
diff --git a/po/fr.po b/po/fr.po
index c77b4de91..3fb97c831 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,21 +22,22 @@
 # Alexandre Franke <afranke gnome org>, 2019-2020.
 # Maxime Hardy <maxime bonneau hardy gmail com>, 2019.
 # Thibault Martin <thibaultamartin gnome org>, 2020.
+# Charles Monzat <charles monzat free fr>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\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"
+"POT-Creation-Date: 2021-07-26 12:32+0000\n"
+"PO-Revision-Date: 2021-12-15 19:42+0100\n"
+"Last-Translator: Charles Monzat <charles monzat free fr>\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"
-"X-Generator: Gtranslator 3.36.0\n"
+"X-Generator: Gtranslator 40.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -50,8 +51,8 @@ msgstr "Envoyer des fichiers avec Geary"
 #: desktop/geary-autostart.desktop.in.in:3
 #: 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:560
-#: src/client/application/application-main-window.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/application/application-main-window.vala:704
 msgid "Geary"
 msgstr "Geary"
 
@@ -126,12 +127,12 @@ msgstr ""
 "Compatible avec GMail, Yahoo! Mail, Outlook.com et autres serveurs IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:50
 msgid "Geary displaying a conversation"
 msgstr "Geary affichant une conversation"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in.in:58
+#: desktop/org.gnome.Geary.appdata.xml.in.in:55
 msgid "Geary showing the rich text composer"
 msgstr "Geary montrant l’éditeur de texte enrichi"
 
@@ -174,86 +175,36 @@ msgid "The last recorded height of the application window."
 msgstr "La dernière hauteur enregistrée pour la fenêtre de l’application."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Position of folder list pane"
-msgstr "Position du panneau de la liste des dossiers"
-
-# Paned Grabber ?
-#: desktop/org.gnome.Geary.gschema.xml:27
-msgid "Position of the folder list Paned grabber."
-msgstr "Position de l’attache du panneau de la liste des dossiers."
-
-#: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Position of folder list pane when horizontal"
-msgstr "Position du panneau de la liste des dossiers en horizontal"
-
-# Paned Grabber ?
-#: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
-"Position de l’attache du panneau de la liste des dossiers en orientation "
-"horizontale."
-
-#: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane when vertical"
-msgstr "Position du panneau de la liste des dossiers en vertical"
-
-# Paned Grabber ?
-#: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
-"Position de l’attache du panneau de la liste des dossiers en orientation "
-"verticale."
-
-#: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Orientation of the folder list pane"
-msgstr "Orientation du panneau de la liste des dossiers"
-
-#: desktop/org.gnome.Geary.gschema.xml:45
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr ""
-"Vrai si le panneau de la liste des dossiers est en orientation horizontale."
-
-#: desktop/org.gnome.Geary.gschema.xml:50
 msgid "Show/hide formatting toolbar"
 msgstr "Afficher/masquer la barre d’outils de mise en forme"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:27
 msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 "Vrai si la barre d’outils de mise en forme dans l’éditeur est affichée."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Position of message list pane"
-msgstr "Position du panneau de la liste des messages"
-
-# Paned Grabber ?
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "Position of the message list Paned grabber."
-msgstr "Position de l’attache du panneau de la liste des messages."
-
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Autoselect next message"
 msgstr "Sélectionner automatiquement le message suivant"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:33
 msgid "True if we should autoselect the next available conversation."
 msgstr ""
 "Vrai si la conversation suivante doit être sélectionnée automatiquement."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Display message previews"
 msgstr "Afficher les aperçus des messages"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:39
 msgid "True if we should display a short preview of each message."
 msgstr "Vrai si un court aperçu de chaque message doit être affiché."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Use single key shortcuts"
 msgstr "Utiliser les raccourcis clavier d’une seule touche"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -261,11 +212,11 @@ msgstr ""
 "Active les raccourcis pour les actions courriels ne nécessitant pas "
 "l’utilisation de <Ctrl> pour émuler ceux utilisés par Gmail."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
 msgstr "Langues à utiliser pour le vérificateur orthographique"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:53
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -273,13 +224,13 @@ msgstr ""
 "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
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 "Langues à afficher dans la fenêtre contextuelle du vérificateur "
 "orthographique"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -287,63 +238,63 @@ msgstr ""
 "Liste des langues qui sont toujours affichées dans la fenêtre contextuelle "
 "du vérificateur orthographique."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
 msgstr "Notification des nouveaux messages au démarrage"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
 msgstr ""
 "Vrai pour recevoir une notification des nouveaux messages au démarrage."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
 msgstr "Demander lors de l’ouverture d’une pièce jointe"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
 msgstr "Vrai pour demander lors de l’ouverture d’une pièce jointe."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
 msgstr "Composer les courriels en HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Vrai pour composer les messages en HTML, faux pour du texte simple."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
 msgstr "Stratégie consultative pour la recherche de texte intégral"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Les valeurs acceptables sont \"exact\" (« exacte »), \"conservative"
 "\" (« conservatrice »), \"aggressive\" et \"horizon\"."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "Zoom de l’afficheur de conversation"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
 msgstr "Le zoom à appliquer sur la vue de conversation."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
 msgstr "Taille de la fenêtre d’édition détachée"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
 msgstr "La dernière taille enregistrée de la fenêtre d’édition détachée."
 
-#: desktop/org.gnome.Geary.gschema.xml:132
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Undo sending email delay"
 msgstr "Annuler le délai d’envoi"
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -351,11 +302,11 @@ msgstr ""
 "Le nombre de secondes à attendre avant d’envoyer un courriel. Mettre à zéro "
 "ou moins pour désactiver."
 
-#: desktop/org.gnome.Geary.gschema.xml:139
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Temps d’affichage des notifications courtes"
 
-#: desktop/org.gnome.Geary.gschema.xml:140
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
@@ -363,19 +314,19 @@ msgstr ""
 "Durée en secondes pendant laquelle les notifications courtes doivent être "
 "affichées."
 
-#: desktop/org.gnome.Geary.gschema.xml:146
+#: desktop/org.gnome.Geary.gschema.xml:116
 msgid "List of optional plugins"
 msgstr "Liste des greffons facultatifs"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:117
 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
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "Indique si les anciens paramètres ont été migrés"
 
-#: desktop/org.gnome.Geary.gschema.xml:153
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -384,25 +335,25 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:210
+#: src/client/accounts/accounts-editor.vala:208
 msgid "Failed to store certificate"
 msgstr "L’enregistrement du certificat a échoué"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:108
+#: src/client/accounts/accounts-editor-add-pane.vala:98
 msgid "All others"
 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:321
+#: src/client/accounts/accounts-editor-add-pane.vala:185
+#: src/client/accounts/accounts-editor-servers-pane.vala:313
 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:334
+#: src/client/accounts/accounts-editor-add-pane.vala:200
+#: src/client/accounts/accounts-editor-servers-pane.vala:326
 msgid "Check your receiving server details"
 msgstr "Vérifiez les détails du serveur de réception"
 
@@ -411,51 +362,51 @@ msgstr "Vérifiez les détails du serveur de réception"
 #. succeeded, so the user probably needs to
 #. 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:355
+#: src/client/accounts/accounts-editor-add-pane.vala:222
+#: src/client/accounts/accounts-editor-servers-pane.vala:347
 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:368
+#: src/client/accounts/accounts-editor-add-pane.vala:236
+#: src/client/accounts/accounts-editor-servers-pane.vala:360
 msgid "Check your sending server details"
 msgstr "Vérifiez les détails du serveur d’envoi"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:261
+#: src/client/accounts/accounts-editor-add-pane.vala:251
 msgid "Check your email address and password"
 msgstr "Vérifiez votre adresse courriel et votre mot de passe"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:272
+#: src/client/accounts/accounts-editor-add-pane.vala:262
 msgid "Could not connect, check your network"
 msgstr "Connexion impossible, vérifiez votre réseau"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:285
+#: src/client/accounts/accounts-editor-add-pane.vala:275
 msgid "An unexpected problem occurred"
 msgstr "Un problème inattendu s’est produit"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:303
+#: src/client/accounts/accounts-editor-add-pane.vala:293
 #, c-format
 msgid "Account not created: %s"
 msgstr "Le compte n’a pas été créé : %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:558
+#: src/client/accounts/accounts-editor-add-pane.vala:573
 msgid "Your name"
 msgstr "Votre nom"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:575
-#: src/client/accounts/accounts-editor-edit-pane.vala:513
+#: src/client/accounts/accounts-editor-add-pane.vala:590
+#: src/client/accounts/accounts-editor-edit-pane.vala:527
 msgid "Email address"
 msgstr "Adresse courriel"
 
@@ -464,8 +415,8 @@ msgstr "Adresse courriel"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:579
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-add-pane.vala:594
+#: src/client/accounts/accounts-editor-edit-pane.vala:493
 msgid "person example com"
 msgstr "courriel exemple fr"
 
@@ -473,16 +424,16 @@ msgstr "courriel exemple fr"
 #. when adding an account
 #. 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:889
+#: src/client/accounts/accounts-editor-add-pane.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:881
 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:1011
-#: ui/password-dialog.glade:108
+#: src/client/accounts/accounts-editor-add-pane.vala:622
+#: src/client/accounts/accounts-editor-servers-pane.vala:1003
+#: ui/password-dialog.glade:98
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -490,14 +441,14 @@ msgstr "Mot de passe"
 #. adding an account.
 #. 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:733
+#: src/client/accounts/accounts-editor-add-pane.vala:644
+#: src/client/accounts/accounts-editor-servers-pane.vala:725
 msgid "IMAP server"
 msgstr "Serveur IMAP"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:632
+#: src/client/accounts/accounts-editor-add-pane.vala:647
 msgid "imap.example.com"
 msgstr "imap.exemple.fr"
 
@@ -505,21 +456,51 @@ msgstr "imap.exemple.fr"
 #. adding an account.
 #. 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:739
+#: src/client/accounts/accounts-editor-add-pane.vala:653
+#: src/client/accounts/accounts-editor-servers-pane.vala:731
 msgid "SMTP server"
 msgstr "Serveur SMTP"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:641
+#: src/client/accounts/accounts-editor-add-pane.vala:656
 msgid "smtp.example.com"
 msgstr "smtp.exemple.fr"
 
+#. This is the remove account button in the account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:211
+#: ui/accounts_editor_edit_pane.ui:239
+msgid "Remove Account"
+msgstr "Supprimer le compte"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:219
+#, c-format
+#| msgid "Remove Account"
+msgid "Remove Account: %s"
+msgstr "Supprimer le compte : %s"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:221
+#| msgid ""
+#| "Removing an account will remove it from Geary and delete locally cached "
+#| "email data from your computer, but not from your service provider."
+msgid ""
+"This will remove it from Geary and delete locally cached email data from "
+"your computer. Nothing will be deleted from your service provider."
+msgstr ""
+"Cette action enlèvera le compte de Geary et enlèvera les courriels "
+"enregistrés localement sur votre ordinateur. Rien ne sera supprimé de votre "
+"fournisseur de service."
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:223
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:182
+msgid "_Cancel"
+msgstr "A_nnuler"
+
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:277
-#: ui/accounts_editor_remove_pane.ui:123
+#: src/client/accounts/accounts-editor-edit-pane.vala:289
 msgid "Account name"
 msgstr "Nom du compte"
 
@@ -527,46 +508,46 @@ msgstr "Nom du compte"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#: src/client/accounts/accounts-editor-edit-pane.vala:330
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Changer le nom du compte pour « %s »"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:342
+#: src/client/accounts/accounts-editor-edit-pane.vala:354
 msgid "Add a new sender email address"
 msgstr "Ajouter une nouvelle adresse courriel d’envoi"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:423
+#: src/client/accounts/accounts-editor-edit-pane.vala:437
 msgid "Name not set"
 msgstr "Identifiant non défini"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:464
+#: src/client/accounts/accounts-editor-edit-pane.vala:478
 msgid "Sender Name"
 msgstr "Identifiant pour l’envoi"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:491
+#: src/client/accounts/accounts-editor-edit-pane.vala:505
 msgid "Remove"
 msgstr "Supprimer"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:506
+#: src/client/accounts/accounts-editor-edit-pane.vala:520
 msgid "Sender name"
 msgstr "Identifiant pour l’envoi"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:573
+#: src/client/accounts/accounts-editor-edit-pane.vala:587
 #, c-format
 msgid "Remove “%s”"
 msgstr "Supprimer « %s »"
@@ -574,7 +555,7 @@ msgstr "Supprimer « %s »"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:613
+#: src/client/accounts/accounts-editor-edit-pane.vala:627
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Annuler les changements appliqués à « %s »"
@@ -582,7 +563,7 @@ msgstr "Annuler les changements appliqués à « %s »"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:700
+#: src/client/accounts/accounts-editor-edit-pane.vala:714
 #, c-format
 msgid "Add “%s” back"
 msgstr "Ajouter « %s » à nouveau"
@@ -590,14 +571,14 @@ msgstr "Ajouter « %s » à nouveau"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:742
+#: src/client/accounts/accounts-editor-edit-pane.vala:756
 msgid "Undo signature changes"
 msgstr "Annuler les changements appliqués à la signature"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:790
+#: src/client/accounts/accounts-editor-edit-pane.vala:804
 msgid "Download mail"
 msgstr "Télécharger les messages"
 
@@ -606,99 +587,99 @@ msgstr "Télécharger les messages"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:822
+#: src/client/accounts/accounts-editor-edit-pane.vala:836
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Changer la période de téléchargement pour : %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:857
 msgid "Everything"
 msgstr "Tout"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:861
 msgid "2 weeks back"
 msgstr "Des 2 dernières semaines"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 msgid "1 month back"
 msgstr "Du mois dernier"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:869
 msgid "3 months back"
 msgstr "Des 3 derniers mois"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:873
 msgid "6 months back"
 msgstr "Des 6 derniers mois"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:863
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 msgid "1 year back"
 msgstr "De l’année dernière"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:881
 msgid "2 years back"
 msgstr "Des 2 dernières années"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:871
+#: src/client/accounts/accounts-editor-edit-pane.vala:885
 msgid "4 years back"
 msgstr "Des 4 dernières années"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#: src/client/accounts/accounts-editor-edit-pane.vala:891
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 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:2061
+#: src/client/accounts/accounts-editor-list-pane.vala:246
+#: src/client/application/application-main-window.vala:2270
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2044
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2253
 msgid "Redo"
 msgstr "Rétablir"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:445
 #: 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:458
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:449
 #: 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:462
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:453
 #: 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:388
+#: src/client/accounts/accounts-editor-list-pane.vala:379
 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:397
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Ce compte a rencontré un problème et n’est pas disponible"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:466
+#: src/client/accounts/accounts-editor-list-pane.vala:457
 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:572
+#: src/client/accounts/accounts-editor-list-pane.vala:563
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Compte « %s » supprimé"
@@ -706,7 +687,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:579
+#: src/client/accounts/accounts-editor-list-pane.vala:570
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Compte « %s » restauré"
@@ -733,8 +714,8 @@ 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:484
-#: src/client/accounts/accounts-editor-servers-pane.vala:760
-#: src/client/accounts/accounts-editor-servers-pane.vala:975
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:967
 msgid "None"
 msgstr "Aucune"
 
@@ -751,7 +732,7 @@ msgstr "TLS"
 #. account
 #. Translators: An info bar button label
 #: src/client/accounts/accounts-editor-row.vala:539
-#: src/client/application/application-main-window.vala:554
+#: src/client/application/application-main-window.vala:650
 msgid "Login"
 msgstr "Identifiant"
 
@@ -778,7 +759,7 @@ 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:382
+#: src/client/accounts/accounts-editor-servers-pane.vala:374
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Compte non mis à jour : %s"
@@ -786,23 +767,23 @@ 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:545
+#: src/client/accounts/accounts-editor-servers-pane.vala:537
 msgid "Account source"
 msgstr "Source de comptes"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:557
+#: src/client/accounts/accounts-editor-servers-pane.vala:549
 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:616
+#: src/client/accounts/accounts-editor-servers-pane.vala:608
 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:671
+#: src/client/accounts/accounts-editor-servers-pane.vala:663
 msgid "Save sent email on server"
 msgstr "Enregistrer les messages envoyés sur le serveur"
 
@@ -811,12 +792,12 @@ 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:961
+#: src/client/accounts/accounts-editor-servers-pane.vala:953
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s par OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:971
+#: src/client/accounts/accounts-editor-servers-pane.vala:963
 msgid "Use receiving server login"
 msgstr "Utiliser l’identifiant du serveur de réception"
 
@@ -850,143 +831,147 @@ msgid "_Replace"
 msgstr "_Remplacer"
 
 #: src/client/application/application-client.vala:34
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright © 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright © 2016 Software Freedom Conservancy Inc."
 
 #: 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."
+#| msgid "Copyright 2016-2020 Geary Development Team."
+msgid "Copyright © 2016-2021 Geary Development Team."
+msgstr "Copyright © 2016-2021 L’équipe de développement de Geary."
 
 #: 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:97
+#: src/client/application/application-client.vala:102
 msgid "Print debug logging"
 msgstr "Afficher le journal de débogage"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
+#: src/client/application/application-client.vala:105
 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:103
+#: src/client/application/application-client.vala:108
 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:106
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Journaliser la surveillance des conversations"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
+#: src/client/application/application-client.vala:114
 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:113
+#: src/client/application/application-client.vala:118
 msgid "Log folder normalization"
 msgstr "Journaliser la normalisation des dossiers"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
+#: src/client/application/application-client.vala:121
 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
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:121
+#: src/client/application/application-client.vala:126
 msgid "Log IMAP replay queue"
 msgstr "Journaliser la liste des évènements IMAP"
 
 #. / Command line option
-#: src/client/application/application-client.vala:124
+#: src/client/application/application-client.vala:129
 msgid "Log SMTP network activity"
 msgstr "Journaliser l’activité SMTP du réseau"
 
 #. / Command line option
-#: src/client/application/application-client.vala:127
+#: src/client/application/application-client.vala:132
 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:130
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Quitter l’application proprement"
 
-#: src/client/application/application-client.vala:132
+#: src/client/application/application-client.vala:137
 msgid "Open a new window"
 msgstr "Ouvrir une nouvelle fenêtre"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Supprimer tous les certificats TLS ajoutés"
 
 #. / Command line option
-#: src/client/application/application-client.vala:138
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "Afficher la version du programme"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:262
+#: src/client/application/application-client.vala:275
 msgid "Geary version"
 msgstr "Version de Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:277
 msgid "Geary revision"
 msgstr "Révision de Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:279
 msgid "GTK version"
 msgstr "Version de GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:273
+#: src/client/application/application-client.vala:286
 msgid "GLib version"
 msgstr "Version de GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:280
+#: src/client/application/application-client.vala:293
 msgid "WebKitGTK version"
 msgstr "Version de WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:287
+#: src/client/application/application-client.vala:300
 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:289
-#: src/client/components/components-attachment-pane.vala:91
+#: src/client/application/application-client.vala:302
+#: src/client/application/application-client.vala:308
+#: src/client/application/application-client.vala:314
+#: src/client/components/components-attachment-pane.vala:88
 msgid "Unknown"
 msgstr "Inconnu"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:293
+#: src/client/application/application-client.vala:306
 msgid "Distribution name"
 msgstr "Nom de la distribution"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:298
+#: src/client/application/application-client.vala:312
 msgid "Distribution release"
 msgstr "Version de la distribution"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:303
+#: src/client/application/application-client.vala:318
 msgid "Installation prefix"
 msgstr "Préfixe d’installation"
 
-#: src/client/application/application-client.vala:559
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
@@ -994,7 +979,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:563
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "ttoine <ttoine ttoine net>\n"
@@ -1009,41 +994,42 @@ msgstr ""
 "Julien Hardelin <jhardlin orange fr>\n"
 "Kévin Commaille <zecakeh posteo net>\n"
 "Alexandre Franke <afranke gnome org>\n"
-"Maxime Hardy <maxime bonneau hardy gmail com>"
+"Maxime Hardy <maxime bonneau hardy gmail com>\n"
+"Charles Monzat <charles monzat free fr>"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1047
+#: src/client/application/application-client.vala:1101
 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:1080
+#: src/client/application/application-client.vala:1134
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Argument « %s » inconnu"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:479
+#: src/client/application/application-controller.vala:496
 #, 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:483
+#: src/client/application/application-controller.vala:500
 msgid "Email will not be sent until re-connected"
 msgstr "Les messages seront envoyés lors de la connexion"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:582
+#: src/client/application/application-controller.vala:599
 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:588
+#: src/client/application/application-controller.vala:605
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Conversation démarquée"
@@ -1052,8 +1038,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:614
-#: src/client/application/application-controller.vala:698
+#: src/client/application/application-controller.vala:631
+#: src/client/application/application-controller.vala:715
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1065,8 +1051,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:622
-#: src/client/application/application-controller.vala:644
+#: src/client/application/application-controller.vala:639
+#: src/client/application/application-controller.vala:661
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1074,7 +1060,7 @@ 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:665
+#: src/client/application/application-controller.vala:682
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Conversation archivée"
@@ -1082,7 +1068,7 @@ 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:721
+#: src/client/application/application-controller.vala:738
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1090,7 +1076,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:742
+#: src/client/application/application-controller.vala:759
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Message archivé"
@@ -1099,7 +1085,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:777
+#: src/client/application/application-controller.vala:794
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1109,7 +1095,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:805
+#: src/client/application/application-controller.vala:822
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1119,19 +1105,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:813
+#: src/client/application/application-controller.vala:830
 #, 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:1320
+#: src/client/application/application-controller.vala:1337
 #, 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:1321
+#: src/client/application/application-controller.vala:1338
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1157,20 +1143,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:1323
+#: src/client/application/application-controller.vala:1340
 msgid "_Rebuild"
 msgstr "_Reconstruire"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1340
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1350
 #, 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:1334
+#: src/client/application/application-controller.vala:1351
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1183,91 +1169,104 @@ 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:1501
+#: src/client/application/application-controller.vala:1518
 #, 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:2491
+#: src/client/application/application-controller.vala:2512
 #, c-format
 msgid "Email to %s queued for delivery"
 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:2555
+#: src/client/application/application-controller.vala:2576
 #, 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:2570
-#: src/client/application/application-controller.vala:2628
+#: src/client/application/application-controller.vala:2591
+#: src/client/application/application-controller.vala:2649
 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:2613
+#: src/client/application/application-controller.vala:2634
 #, c-format
 msgid "Email to %s discarded"
 msgstr "Courriel pour %s supprimé"
 
+#. / Translators: Label for account database upgrade dialog
+#: src/client/application/application-database-manager.vala:74
+#| msgid "Geary update in progress…"
+msgid "Account update in progress"
+msgstr "Mise à jour du compte en cours"
+
+#. / Translators: Window title for account database upgrade
+#. / dialog
+#: src/client/application/application-database-manager.vala:80
+#| msgid "Account name"
+msgid "Account update"
+msgstr "Mise à jour du compte"
+
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:540
+#: src/client/application/application-main-window.vala:636
 msgid "Working offline"
 msgstr "Travail hors ligne"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:542
+#: src/client/application/application-main-window.vala:638
 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
+#: src/client/application/application-main-window.vala:645
 msgid "Login problem"
 msgstr "Problème d’identification"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:551
+#: src/client/application/application-main-window.vala:647
 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
+#: src/client/application/application-main-window.vala:654
 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
+#: src/client/application/application-main-window.vala:661
 msgid "Security problem"
 msgstr "Problème de sécurité"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:567
+#: src/client/application/application-main-window.vala:663
 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
+#: src/client/application/application-main-window.vala:666
 msgid "Check"
 msgstr "Vérifier"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:574
+#: src/client/application/application-main-window.vala:670
 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:617
+#: src/client/application/application-main-window.vala:713
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1275,49 +1274,49 @@ msgstr "%s — %s"
 #. 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
+#: src/client/application/application-main-window.vala:1103
+#: src/client/folder-list/folder-list-account-branch.vala:46
 msgid "Labels"
 msgstr "Étiquettes"
 
-#: src/client/application/application-main-window.vala:1293
+#: src/client/application/application-main-window.vala:1432
 #, 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:1294
+#: src/client/application/application-main-window.vala:1433
 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:1295
+#: src/client/application/application-main-window.vala:1434
 msgid "This cannot be undone."
 msgstr "L’action ne peut être annulée."
 
-#: src/client/application/application-main-window.vala:1296
+#: src/client/application/application-main-window.vala:1435
 #, c-format
 msgid "Empty %s"
 msgstr "Vider %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1353
+#: src/client/application/application-main-window.vala:1492
 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
+#: src/client/application/application-main-window.vala:1497
+#: src/client/application/application-main-window.vala:1512
 msgid "Delete"
 msgstr "Supprimer"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1368
+#: src/client/application/application-main-window.vala:1507
 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
+#: src/client/application/application-main-window.vala:1804
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1327,17 +1326,17 @@ msgstr "%s (%d)"
 #. be a human-friendly size string. For example:
 #. 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:1784
+#: src/client/components/components-attachment-pane.vala:104
+#: src/client/composer/composer-widget.vala:1870
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/components/components-attachment-pane.vala:379
+#: src/client/components/components-attachment-pane.vala:373
 msgid "Are you sure you want to open these attachments?"
 msgstr "Voulez-vous vraiment ouvrir ces pièces jointes ?"
 
-#: src/client/components/components-attachment-pane.vala:380
+#: src/client/components/components-attachment-pane.vala:374
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -1345,41 +1344,94 @@ msgstr ""
 "L’ouverture de certaines pièces jointes peut endommager votre système. "
 "Veillez à n’ouvrir que les fichiers provenant de sources fiables."
 
-#: src/client/components/components-attachment-pane.vala:381
+#: src/client/components/components-attachment-pane.vala:375
 msgid "Don’t _ask me again"
 msgstr "Ne plus me _demander"
 
-#: src/client/components/components-inspector.vala:78
+#: src/client/components/components-conversation-actions.vala:97
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Marquer la conversation"
+msgstr[1] "Marquer les conversations"
+
+#: src/client/components/components-conversation-actions.vala:102
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Ajouter une étiquette à la conversation"
+msgstr[1] "Ajouter une étiquette aux conversations"
+
+#: src/client/components/components-conversation-actions.vala:107
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Déplacer la conversation"
+msgstr[1] "Déplacer les conversations"
+
+#: src/client/components/components-conversation-actions.vala:112
+#: src/client/conversation-list/conversation-list-view.vala:446
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Archiver la conversation"
+msgstr[1] "Archiver les conversations"
+
+#: src/client/components/components-conversation-actions.vala:123
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Mettre la conversation à la corbeille"
+msgstr[1] "Mettre les conversations à la corbeille"
+
+#: src/client/components/components-conversation-actions.vala:133
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Supprimer la conversation"
+msgstr[1] "Supprimer les conversations"
+
+#: src/client/components/components-info-bar.vala:248
+msgid "Information"
+msgstr "Information"
+
+#: src/client/components/components-info-bar.vala:252
+msgid "Question"
+msgstr "Question"
+
+#: src/client/components/components-info-bar.vala:256
+msgid "Warning"
+msgstr "Avertissement"
+
+#: src/client/components/components-info-bar.vala:260
+msgid "Error"
+msgstr "Erreur"
+
+#: src/client/components/components-inspector.vala:71
 msgid "Inspector"
 msgstr "Inspecteur"
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:93
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
+#: src/client/components/components-inspector.vala:86
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:98
 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:97
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+#: src/client/components/components-inspector.vala:90
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "System"
 msgstr "Système"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:226
-#: src/client/components/components-inspector.vala:229
+#: src/client/components/components-inspector.vala:219
+#: src/client/components/components-inspector.vala:222
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:217
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:220
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
-#: ui/problem-details-dialog.ui:47
+#: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: 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
+#: src/client/components/components-inspector.vala:223
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1395,15 +1447,10 @@ msgstr "A_fficher l’aperçu de la conversation"
 
 #. / Translators: Preferences label
 #: 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: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:156
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1412,23 +1459,23 @@ msgstr ""
 "nécessitent pas d’appuyer sur <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:167
+#: src/client/components/components-preferences-window.vala:157
 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:171
+#: src/client/components/components-preferences-window.vala:161
 msgid "Geary will keep running after all windows are closed"
 msgstr ""
 "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
+#: src/client/components/components-preferences-window.vala:178
 msgid "Preferences"
 msgstr "Préférences"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:250
+#: src/client/components/components-preferences-window.vala:234
 msgid "Plugins"
 msgstr "Greffons"
 
@@ -1547,42 +1594,6 @@ msgstr "Un nom de serveur est nécessaire"
 msgid "Could not look up server name"
 msgstr "Impossible de trouver le nom du serveur"
 
-#: src/client/components/main-toolbar.vala:116
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Marquer la conversation"
-msgstr[1] "Marquer les conversations"
-
-#: src/client/components/main-toolbar.vala:121
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Ajouter une étiquette à la conversation"
-msgstr[1] "Ajouter une étiquette aux conversations"
-
-#: src/client/components/main-toolbar.vala:126
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Déplacer la conversation"
-msgstr[1] "Déplacer les conversations"
-
-#: src/client/components/main-toolbar.vala:131
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Archiver la conversation"
-msgstr[1] "Archiver les conversations"
-
-#: src/client/components/main-toolbar.vala:142
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Mettre la conversation à la corbeille"
-msgstr[1] "Mettre les conversations à la corbeille"
-
-#: src/client/components/main-toolbar.vala:152
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Supprimer la conversation"
-msgstr[1] "Supprimer les conversations"
-
 #. / 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…"
@@ -1603,12 +1614,6 @@ msgstr "Erreur d’enregistrement du message envoyé"
 msgid "_OK"
 msgstr "_Valider"
 
-#: 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"
-
 #: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "À _propos"
@@ -1625,7 +1630,7 @@ msgstr "_Fermer"
 msgid "_Discard"
 msgstr "A_bandonner"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
+#: src/client/components/stock.vala:25 ui/components-main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "Aid_e"
 
@@ -1635,7 +1640,7 @@ msgstr "Aid_e"
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
+#: src/client/components/stock.vala:27 ui/components-main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Préférences"
 
@@ -1661,20 +1666,21 @@ msgstr "_Enregistrer"
 msgid "_Keep"
 msgstr "_Conserver"
 
-#: src/client/composer/composer-editor.vala:675
+#: src/client/composer/composer-editor.vala:680
 msgid "Select Color"
 msgstr "Sélectionner une couleur"
 
-#: src/client/composer/composer-link-popover.vala:139
+#: src/client/composer/composer-link-popover.vala:135
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
-"L’URL du lien n’est pas mis en forme correctement, par ex. http://exemple.com";
+"L’URL du lien n’est pas mise en forme correctement, par ex. http://exemple.";
+"com"
 
-#: src/client/composer/composer-link-popover.vala:146
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid link URL"
 msgstr "URL de lien non valide"
 
-#: src/client/composer/composer-link-popover.vala:146
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid email address"
 msgstr "Adresse électronique non valable"
 
@@ -1683,19 +1689,19 @@ msgstr "Adresse électronique non valable"
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: src/client/composer/composer-widget.vala:167
+#: src/client/composer/composer-widget.vala:233
 msgid "Saved"
 msgstr "Enregistré"
 
-#: src/client/composer/composer-widget.vala:168
+#: src/client/composer/composer-widget.vala:234
 msgid "Saving"
 msgstr "Enregistrement"
 
-#: src/client/composer/composer-widget.vala:169
+#: src/client/composer/composer-widget.vala:235
 msgid "Error saving"
 msgstr "Erreur d’enregistrement"
 
-#: src/client/composer/composer-widget.vala:170
+#: src/client/composer/composer-widget.vala:236
 msgid "Press Backspace to delete quote"
 msgstr "Appuyez sur Retour arrière pour supprimer la citation"
 
@@ -1704,7 +1710,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:186
+#: src/client/composer/composer-widget.vala:252
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1712,95 +1718,126 @@ msgstr ""
 "pièce|pièces|joint|jointe|joindre|joints|jointes|attaché|attachés|attachées|"
 "attachement|attachements|fichier|fichiers"
 
+#. / Translators: Label for composer From address entry
+#: src/client/composer/composer-widget.vala:483
+msgid "_From"
+msgstr "_De"
+
+#. / Translators: Label for composer To address entry
+#: src/client/composer/composer-widget.vala:493
+msgid "_To"
+msgstr "_À"
+
+#. / Translators: Label for composer CC address entry
+#: src/client/composer/composer-widget.vala:502
+msgid "_Cc"
+msgstr "_Cc"
+
+#. / Translators: Label for composer BCC address entry
+#: src/client/composer/composer-widget.vala:510
+msgid "_Bcc"
+msgstr "Cc_i"
+
+#. / Translators: Label for composer Reply-To address entry
+#: src/client/composer/composer-widget.vala:518
+#| msgid "Reply to:"
+msgid "_Reply to"
+msgstr "_Répondre à"
+
+#. / Translators: Label for composer Subject line entry
+#: src/client/composer/composer-widget.vala:526
+msgid "_Subject"
+msgstr "_Objet"
+
 #. 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:862
+#: src/client/composer/composer-widget.vala:904
 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:888
+#: src/client/composer/composer-widget.vala:930
 msgid "Do you want to discard this draft message?"
 msgstr "Voulez-vous abandonner ce brouillon ?"
 
-#: src/client/composer/composer-widget.vala:1440
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "Envoyer le message avec un objet et un contenu vides ?"
 
-#: src/client/composer/composer-widget.vala:1442
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "Envoyer le message avec un objet vide ?"
 
-#: src/client/composer/composer-widget.vala:1444
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "Envoyer le message avec un contenu vide ?"
 
-#: src/client/composer/composer-widget.vala:1453
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "Envoyer le message sans pièce jointe ?"
 
-#: src/client/composer/composer-widget.vala:1772
+#: src/client/composer/composer-widget.vala:1858
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "« %s » a déjà été joint au message."
 
-#: src/client/composer/composer-widget.vala:1804
-#: src/client/composer/composer-widget.vala:1854
+#: src/client/composer/composer-widget.vala:1890
+#: src/client/composer/composer-widget.vala:1940
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "« %s » est un fichier vide."
 
-#: src/client/composer/composer-widget.vala:1842
+#: src/client/composer/composer-widget.vala:1928
 #, c-format
 msgid "“%s” could not be found."
 msgstr "« %s » est introuvable."
 
-#: src/client/composer/composer-widget.vala:1848
+#: src/client/composer/composer-widget.vala:1934
 #, c-format
 msgid "“%s” is a folder."
 msgstr "« %s » est un dossier."
 
-#: src/client/composer/composer-widget.vala:1867
+#: src/client/composer/composer-widget.vala:1953
 #, 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:1875
+#: src/client/composer/composer-widget.vala:1961
 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
+#: src/client/composer/composer-widget.vala:2032
 msgid "Images"
 msgstr "Images"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: 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
+#: src/client/composer/composer-widget.vala:2096
+#: src/client/conversation-viewer/conversation-email.vala:536
+#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283
 msgid "To:"
 msgstr "À :"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: 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
+#: src/client/composer/composer-widget.vala:2102
+#: src/client/conversation-viewer/conversation-email.vala:541
+#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324
 msgid "Cc:"
 msgstr "Cc :"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2022
-#: src/client/conversation-viewer/conversation-email.vala:552
-#: ui/conversation-message.ui:402
+#: src/client/composer/composer-widget.vala:2108
+#: src/client/conversation-viewer/conversation-email.vala:546
+#: ui/conversation-message.ui:365
 msgid "Bcc:"
 msgstr "Cci :"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2028
+#: src/client/composer/composer-widget.vala:2114
 msgid "Reply-To: "
 msgstr "Répondre à : "
 
@@ -1809,7 +1846,7 @@ msgstr "Répondre à : "
 #. 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:2146
+#: src/client/composer/composer-widget.vala:2232
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
@@ -1827,51 +1864,51 @@ msgid "Search for more languages"
 msgstr "Rechercher des langues supplémentaires"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:339
+#: src/client/conversation-list/conversation-list-view.vala:390
 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:351
+#: src/client/conversation-list/conversation-list-view.vala:402
 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:364
-#: ui/main-toolbar-menus.ui:5
+#: src/client/conversation-list/conversation-list-view.vala:415
+#: ui/components-main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Marquer comme _lu"
 
-#: src/client/conversation-list/conversation-list-view.vala:372
-#: ui/main-toolbar-menus.ui:9
+#: src/client/conversation-list/conversation-list-view.vala:423
+#: ui/components-main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non Lu"
 
-#: src/client/conversation-list/conversation-list-view.vala:380
-#: ui/main-toolbar-menus.ui:17
+#: src/client/conversation-list/conversation-list-view.vala:431
+#: ui/components-main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "_Supprimer l’étoile"
 
-#: src/client/conversation-list/conversation-list-view.vala:387
-#: ui/main-toolbar-menus.ui:13
+#: src/client/conversation-list/conversation-list-view.vala:438
+#: ui/components-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:396
+#: src/client/conversation-list/conversation-list-view.vala:455
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: src/client/conversation-list/conversation-list-view.vala:402
+#: src/client/conversation-list/conversation-list-view.vala:461
 msgid "R_eply All"
-msgstr "R_épondre à tous"
+msgstr "Ré_pondre à tous"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:408
+#: src/client/conversation-list/conversation-list-view.vala:467
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Transférer"
@@ -1881,20 +1918,20 @@ msgid "Me"
 msgstr "Moi"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:240
+#: src/client/conversation-viewer/conversation-email.vala:531
+#: src/client/util/util-email.vala:258
 msgid "From:"
 msgstr "De :"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:245
+#: src/client/conversation-viewer/conversation-email.vala:551
+#: src/client/util/util-email.vala:263
 msgid "Date:"
 msgstr "Date :"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:243
+#: src/client/conversation-viewer/conversation-email.vala:561
+#: src/client/util/util-email.vala:261
 msgid "Subject:"
 msgstr "Objet :"
 
@@ -1915,72 +1952,75 @@ msgstr "Afficher moins"
 #. number of extra email to be shown.
 #: src/client/conversation-viewer/conversation-message.vala:260
 #, c-format
+#| msgid "%d more…"
 msgid "%d more…"
-msgstr "%d autres…"
+msgid_plural "%d more…"
+msgstr[0] "%d autre…"
+msgstr[1] "%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:529
+#: src/client/conversation-viewer/conversation-message.vala:533
 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:920
+#: src/client/conversation-viewer/conversation-message.vala:1011
 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:1040
+#: src/client/conversation-viewer/conversation-message.vala:1133
 msgid "Image"
 msgstr "Image"
 
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1305
+#: src/client/conversation-viewer/conversation-message.vala:1396
 msgid "Remote images not shown"
 msgstr "Images distantes non affichées"
 
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1307
+#: src/client/conversation-viewer/conversation-message.vala:1398
 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
+#: src/client/conversation-viewer/conversation-message.vala:1402
 msgid "Show"
 msgstr "Afficher"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1315
+#: src/client/conversation-viewer/conversation-message.vala:1406
 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
+#: src/client/conversation-viewer/conversation-viewer.vala:84
 msgid "No conversations selected"
 msgstr "Aucune conversation sélectionnée"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:87
+#: src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "Selecting a conversation from the list will display it here"
 msgstr ""
 "Lors de la sélection d’une conversation dans la liste, elle s’affichera ici"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:96
+#: src/client/conversation-viewer/conversation-viewer.vala:97
 msgid "Multiple conversations selected"
 msgstr "Plusieurs conversations sélectionnées"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:100
+#: src/client/conversation-viewer/conversation-viewer.vala:101
 msgid "Choosing an action will apply to all selected conversations"
 msgstr ""
 "L’action choisie s’appliquera à l’ensemble des conversations sélectionnées"
@@ -1989,20 +2029,20 @@ msgstr ""
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:109
-#: src/client/conversation-viewer/conversation-viewer.vala:122
+#: src/client/conversation-viewer/conversation-viewer.vala:110
+#: src/client/conversation-viewer/conversation-viewer.vala:123
 msgid "No conversations found"
 msgstr "Aucune conversation trouvée"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:113
+#: src/client/conversation-viewer/conversation-viewer.vala:114
 msgid "This folder does not contain any conversations"
 msgstr "Ce dossier ne contient aucune conversation"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:126
+#: src/client/conversation-viewer/conversation-viewer.vala:127
 msgid "Your search returned no results, try refining your search terms"
 msgstr ""
 "La recherche n’a donné aucun résultat, essayez d’affiner les termes utilisés"
@@ -2096,8 +2136,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:99
-#: ui/problem-details-dialog.ui:17
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:96
+#: ui/problem-details-dialog.ui:15
 msgid "Details"
 msgstr "Détails"
 
@@ -2138,7 +2178,7 @@ msgstr[1] "%d non lus"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: src/client/folder-list/folder-list-inboxes-branch.vala:14
+#: src/client/folder-list/folder-list-inboxes-branch.vala:15
 msgid "Inboxes"
 msgstr "Boîtes de réception"
 
@@ -2154,7 +2194,7 @@ msgstr[1] "%d résultats"
 #. / 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
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:126
 #, c-format
 msgid ""
 "%s\n"
@@ -2173,7 +2213,7 @@ msgstr[1] ""
 #. / 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
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:159
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -2186,7 +2226,7 @@ msgstr[1] "%d nouveaux messages"
 #. / 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
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:169
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -2195,7 +2235,7 @@ 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
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:278
 msgid "New message"
 msgid_plural "New messages"
 msgstr[0] "Nouveau message"
@@ -2436,37 +2476,16 @@ 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: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: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:230
-msgid "%a, %b %-e, %Y at %X"
-msgstr "%a %-e %b %Y à %X"
-
 #. Translators: Label used when an email has a missing or
 #. an empty subject
-#: src/client/util/util-email.vala:50
+#: src/client/util/util-email.vala:52
 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:148
+#: src/client/util/util-email.vala:150
 msgid "(No recipients)"
 msgstr "(Aucun destinataire)"
 
@@ -2475,39 +2494,226 @@ msgstr "(Aucun destinataire)"
 #. / 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:160
+#: src/client/util/util-email.vala:162
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s et un autre"
 msgstr[1] "%s et %d autres"
 
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:194
+#| msgid "%a, %b %-e, %Y at %X"
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%a %-e %b %Y à %X %Z"
+
 #. / 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:193
+#. / %1$s will be substituted for the date, and %2$s
+#. / will be substituted for the original sender.
+#: src/client/util/util-email.vala:200
 #, 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:200
+#. / 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:211
 #, 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:206
+#. / 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:221
 #, c-format
 msgid "On %s:"
 msgstr "Le %s :"
 
-#: src/client/util/util-email.vala:235
+#: src/client/util/util-email.vala:253
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Message transféré ----------"
 
+#. / Translators: Can be typed in the search box like
+#. / "attachment:file.txt" to find messages with attachments
+#. / with a particular name.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:605
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "pièce-jointe"
+
+#. / Translators: Can be typed in the search box like
+#. / "bcc:johndoe example com" to find messages bcc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:618
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "cci"
+
+#. / Translators: Can be typed in the search box like
+#. / "body:word" to find "word" only if it occurs in the body
+#. / of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:630
+msgctxt "Search operator"
+msgid "body"
+msgstr "corps"
+
+#. / Translators: Can be typed in the search box like
+#. / "cc:johndoe example com" to find messages cc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:642
+msgctxt "Search operator"
+msgid "cc"
+msgstr "cc"
+
+#. / Translators: Can be typed in the search box like
+#. / "from:johndoe example com" to find messages from a
+#. / particular sender.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:654
+msgctxt "Search operator"
+msgid "from"
+msgstr "de"
+
+#. / Translators: Can be typed in the search box like
+#. / "subject:word" to find "word" only if it occurs in the
+#. / subject of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:668
+msgctxt "Search operator"
+msgid "subject"
+msgstr "objet"
+
+#. / Translators: Can be typed in the search box like
+#. / "to:johndoe example com" to find messages received by a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:680
+msgctxt "Search operator"
+msgid "to"
+msgstr "à"
+
+#. / Translators: Can be typed in the search box after "to:",
+#. / "cc:" and "bcc:" e.g.: "to:me". Matches conversations that
+#. / are addressed to the user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:691
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "moi"
+
+#. / Translators: Can be typed in the search box after "from:"
+#. / i.e.: "from:me". Matches conversations were sent by the
+#. / user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:704
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "moi"
+
+#. Boolean operators
+#. /////////////////////////////////////////////////////////
+#. / Translators: Can be typed in the search box like
+#. / "is:unread" to find messages that are read, unread, or
+#. / starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:719
+msgctxt "Search operator"
+msgid "is"
+msgstr "est"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:unread". Matches conversations that are flagged
+#. / unread.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:729
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "non-lu"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:read". Matches conversations that are flagged as
+#. / read.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:739
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "lu"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:starred". Matches conversations that are flagged
+#. / as starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:749
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "marqués"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "octets"
@@ -2572,202 +2778,34 @@ msgstr "Boîte d’envoi"
 msgid "Archive"
 msgstr "Archives"
 
-#. Map of possibly translated search operator names and values
-#. to English/internal names and values. We include the
-#. English version anyway so that when translations provide a
-#. localised version of the operator names but have not also
-#. translated the user manual, the English version in the
-#. manual still works.
-#. Can be typed in the search box like "attachment:file.txt"
-#. to find messages with attachments with a particular name.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:130
-msgctxt "Search operator"
-msgid "attachment"
-msgstr "pièce-jointe"
-
-#. Can be typed in the search box like
-#. "bcc:johndoe example com" to find messages bcc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:139
-msgctxt "Search operator"
-msgid "bcc"
-msgstr "cci"
+#. 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:1006
+msgid "Drafts | Draft"
+msgstr "Brouillons | Brouillon"
 
-#. Can be typed in the search box like "body:word" to find
-#. "word" only if it occurs in the body of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:147
-msgctxt "Search operator"
-msgid "body"
-msgstr "corps"
+#. List of general possible folder names to match for the
+#. 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:1015
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr "Envoyés | Messages envoyés | Courriels envoyés | Boîte d’envoi"
 
-#. Can be typed in the search box like
-#. "cc:johndoe example com" to find messages cc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:156
-msgctxt "Search operator"
-msgid "cc"
-msgstr "cc"
-
-#. Can be typed in the search box like
-#. "from:johndoe example com" to find messages from a
-#. particular sender.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:165
-msgctxt "Search operator"
-msgid "from"
-msgstr "de"
-
-#. Can be typed in the search box like "is:unread" to find
-#. messages that are read, unread, or starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:173
-msgctxt "Search operator"
-msgid "is"
-msgstr "est"
-
-#. Can be typed in the search box like "subject:word" to find
-#. "word" only if it occurs in the subject of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary
-#. User Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:181
-msgctxt "Search operator"
-msgid "subject"
-msgstr "objet"
-
-#. Can be typed in the search box like
-#. "to:johndoe example com" to find messages received by a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:190
-msgctxt "Search operator"
-msgid "to"
-msgstr "à"
-
-#. Can be typed in the search box after "to:", "cc:" and
-#. "bcc:" e.g.: "to:me". Matches conversations that are
-#. addressed to the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:211
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-msgstr "moi"
-
-#. Can be typed in the search box after "from:" i.e.:
-#. "from:me". Matches conversations were sent by the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:223
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "moi"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:read". Matches conversations that are flagged as read.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:235
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "lu"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:starred". Matches conversations that are flagged as
-#. starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:246
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "marqués"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:unread". Matches conversations that are flagged unread.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. or similar to combine words into one), should be short, and
-#. also match the translation in "search.page" of the Geary User
-#. Guide.
-#: src/engine/imap-db/imap-db-search-query.vala:256
-msgctxt "'is:' search operator value"
-msgid "unread"
-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:996
-msgid "Drafts | Draft"
-msgstr "Brouillons | Brouillon"
-
-#. List of general possible folder names to match for the
-#. 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:1005
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-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:1010
-msgctxt "Outlook localised name"
-msgid "Sent Items"
-msgstr "Éléments envoyés"
+#. The localised name(s) of the Sent folder name as used
+#. by MS Outlook/Exchange.
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
+msgctxt "Outlook localised name"
+msgid "Sent Items"
+msgstr "Éléments envoyés"
 
 #. List of general possible folder names to match for the
 #. 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
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2777,13 +2815,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:1030
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1040
 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:1035
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Éléments supprimés"
@@ -2792,250 +2830,226 @@ 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:1045
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1055
 msgid "Archive | Archives"
 msgstr "Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:528
+#: src/engine/rfc822/rfc822-message.vala:551
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Impossible de déterminer le type MIME de « %s »."
 
-#: src/engine/rfc822/rfc822-message.vala:539
+#: src/engine/rfc822/rfc822-message.vala:562
 #, 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 »."
 
-#: src/engine/rfc822/rfc822-message.vala:1013
+#: src/engine/rfc822/rfc822-message.vala:1015
 msgid "(no subject)"
 msgstr "(aucun objet)"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+#: ui/accounts_editor_add_pane.ui:7 ui/accounts_editor_list_pane.ui:122
 msgid "Add an account"
 msgstr "Ajouter un compte"
 
-#: ui/accounts_editor_add_pane.ui:53
+#: ui/accounts_editor_add_pane.ui:47
 msgid "_Create"
 msgstr "_Créer"
 
-#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:119 ui/accounts_editor_servers_pane.ui:115
 msgid "Receiving"
 msgstr "Réception"
 
-#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+#: ui/accounts_editor_add_pane.ui:163 ui/accounts_editor_servers_pane.ui:151
 msgid "Sending"
 msgstr "Envoi"
 
-#: ui/accounts_editor_edit_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:7
 msgid "Edit Account"
 msgstr "Modifier le compte"
 
-#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#: ui/accounts_editor_edit_pane.ui:8 ui/accounts_editor_servers_pane.ui:8
 msgid "Account Name"
 msgstr "Nom du compte"
 
-#: ui/accounts_editor_edit_pane.ui:124
+#: ui/accounts_editor_edit_pane.ui:114
 msgid "Email addresses"
 msgstr "Adresse électronique"
 
-#: ui/accounts_editor_edit_pane.ui:164
+#: ui/accounts_editor_edit_pane.ui:151
 msgid "Signature"
 msgstr "Signature"
 
-#: ui/accounts_editor_edit_pane.ui:201
+#: ui/accounts_editor_edit_pane.ui:186
 msgid "Settings"
 msgstr "Paramètres"
 
 #. This is a button in the account settings to show server settings.
-#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+#: ui/accounts_editor_edit_pane.ui:225 ui/accounts_editor_servers_pane.ui:7
 msgid "Server Settings"
 msgstr "Paramètres du serveur"
 
-#. This is the remove account button in the account settings.
-#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
-msgid "Remove Account"
-msgstr "Supprimer le compte"
-
-#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+#: ui/accounts_editor_edit_pane.ui:242
 msgid "Remove this account from Geary"
 msgstr "Supprimer le compte de Geary"
 
-#: ui/accounts_editor_list_pane.ui:8
+#: ui/accounts_editor_list_pane.ui:7
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ui/accounts_editor_list_pane.ui:62
+#: ui/accounts_editor_list_pane.ui:59
 msgid "To get started, select an email provider below."
 msgstr "Pour commencer, sélectionnez un fournisseur courriel ci-dessous."
 
-#: ui/accounts_editor_list_pane.ui:75
+#: ui/accounts_editor_list_pane.ui:73
 msgid "Welcome to 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
-#, c-format
-msgid "Confirm removing: %s"
-msgstr "Confirmation de la suppression : %s"
-
-#: ui/accounts_editor_remove_pane.ui:91
-msgid ""
-"Removing an account will remove it from Geary and delete locally cached "
-"email data from your computer, but not from your service provider."
-msgstr ""
-"Supprimer un compte l’enlèvera de Geary et enlèvera les courriels "
-"enregistrés localement sur votre ordinateur, mais ne le supprimera pas de "
-"votre fournisseur de service."
-
-#: ui/accounts_editor_remove_pane.ui:122
-msgid "Remove account"
-msgstr "Supprimer le compte"
-
-#: ui/accounts_editor_servers_pane.ui:47
+#: ui/accounts_editor_servers_pane.ui:42
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ui/certificate_warning_dialog.glade:7
+#: ui/certificate_warning_dialog.glade:6
 msgid "Untrusted Connection"
 msgstr "Connexion non certifiée"
 
-#: ui/certificate_warning_dialog.glade:29
+#: ui/certificate_warning_dialog.glade:26
 msgid "_Always Trust This Server"
 msgstr "_Toujours faire confiance à ce serveur"
 
-#: ui/certificate_warning_dialog.glade:43
+#: ui/certificate_warning_dialog.glade:39
 msgid "_Trust This Server"
 msgstr "Faire _confiance à ce serveur"
 
-#: ui/certificate_warning_dialog.glade:57
+#: ui/certificate_warning_dialog.glade:52
 msgid "_Don’t Trust This Server"
 msgstr "Ne _pas faire confiance à ce serveur"
 
-#: ui/composer-editor.ui:100
+#: ui/composer-editor.ui:89
 msgid "Bold text"
 msgstr "Texte en gras"
 
-#: ui/composer-editor.ui:124
+#: ui/composer-editor.ui:111
 msgid "Italic text"
 msgstr "Texte en italique"
 
-#: ui/composer-editor.ui:148
+#: ui/composer-editor.ui:133
 msgid "Underline text"
 msgstr "Texte souligné"
 
-#: ui/composer-editor.ui:172
+#: ui/composer-editor.ui:155
 msgid "Strikethrough text"
 msgstr "Texte barré"
 
-#: ui/composer-editor.ui:205
+#: ui/composer-editor.ui:185
 msgid "Insert bulleted list"
 msgstr "Insérer une liste à puces"
 
-#: ui/composer-editor.ui:229
+#: ui/composer-editor.ui:207
 msgid "Insert numbered list"
 msgstr "Insérer une liste numérotée"
 
-#: ui/composer-editor.ui:262
+#: ui/composer-editor.ui:237
 msgid "Indent or quote text"
 msgstr "Indenter ou citer le texte"
 
-#: ui/composer-editor.ui:286
+#: ui/composer-editor.ui:259
 msgid "Un-indent or unquote text"
 msgstr "Supprimer la citation"
 
-#: ui/composer-editor.ui:315
+#: ui/composer-editor.ui:286
 msgid "Remove text formatting"
 msgstr "Effacer la mise en forme"
 
-#: ui/composer-editor.ui:334
+#: ui/composer-editor.ui:303
 msgid "Change font type"
 msgstr "Changer le type de police"
 
-#: ui/composer-editor.ui:349
+#: ui/composer-editor.ui:315
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-editor.ui:360
+#: ui/composer-editor.ui:325
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-editor.ui:371
+#: ui/composer-editor.ui:335
 msgid "Fixed Width"
 msgstr "Largeur fixe"
 
-#: ui/composer-editor.ui:397
+#: ui/composer-editor.ui:359
 msgid "Change font color"
 msgstr "Changer la couleur de la police"
 
-#: ui/composer-editor.ui:412
+#: ui/composer-editor.ui:372
 msgid "Change font size"
 msgstr "Changer la taille de la police"
 
-#: ui/composer-editor.ui:447
+#: ui/composer-editor.ui:402
 msgid "Insert or update text link"
 msgstr "Insérer ou mettre à jour le lien textuel"
 
-#: ui/composer-editor.ui:471
+#: ui/composer-editor.ui:424
 msgid "Insert an image"
 msgstr "Insérer une image"
 
-#: ui/composer-editor.ui:513
+#: ui/composer-editor.ui:463
 msgid "Undo last edit"
 msgstr "Annuler la dernière modification"
 
-#: ui/composer-editor.ui:537
+#: ui/composer-editor.ui:485
 msgid "Redo last edit"
 msgstr "Rétablir la dernière modification"
 
-#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+#: ui/composer-editor.ui:512 ui/composer-editor.ui:534
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: ui/composer-editor.ui:615
+#: ui/composer-editor.ui:556
 msgid "Add original attachments"
 msgstr "Ajouter les pièces jointes d’origine"
 
-#: ui/composer-editor.ui:660
+#: ui/composer-editor.ui:598
 msgid "More options"
 msgstr "Plus d’options"
 
-#: ui/composer-editor.ui:680
+#: ui/composer-editor.ui:617
 msgid "Show formatting toolbar"
 msgstr "Afficher la barre d’outils de mise en forme"
 
-#: ui/composer-editor.ui:698
+#: ui/composer-editor.ui:634
 msgid "Select spell checking languages"
 msgstr "Choisir les langues de vérification orthographique"
 
-#: ui/composer-editor.ui:723
+#: ui/composer-editor.ui:658
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-editor.ui:728
+#: ui/composer-editor.ui:663
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-editor.ui:733
+#: ui/composer-editor.ui:668
 msgid "_Fixed Width"
 msgstr "_Largeur fixe"
 
-#: ui/composer-editor.ui:743
+#: ui/composer-editor.ui:678
 msgid "_Small"
-msgstr "_Petit"
+msgstr "_Petite"
 
-#: ui/composer-editor.ui:748
+#: ui/composer-editor.ui:683
 msgid "_Medium"
-msgstr "_Moyen"
+msgstr "_Moyenne"
 
-#: ui/composer-editor.ui:753
+#: ui/composer-editor.ui:688
 msgid "Lar_ge"
-msgstr "_Grand"
+msgstr "_Grande"
 
-#: ui/composer-editor.ui:763
+#: ui/composer-editor.ui:698
 msgid "_Rich Text"
 msgstr "Texte _riche"
 
-#: ui/composer-editor.ui:768
+#: ui/composer-editor.ui:703
 msgid "_Plain Text"
 msgstr "Texte sim_ple"
 
@@ -3073,95 +3087,69 @@ msgstr "T_out sélectionner"
 msgid "_Inspect…"
 msgstr "_Inspecter…"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#: ui/composer-headerbar.ui:20 ui/composer-headerbar.ui:96
 msgid "Detach the composer from the window"
 msgstr "Détacher la fenêtre d’édition"
 
-#: ui/composer-headerbar.ui:135
+#: ui/composer-headerbar.ui:123
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ui/composer-headerbar.ui:162
+#: ui/composer-headerbar.ui:147
 msgid "Discard and Close"
 msgstr "Abandonner et fermer"
 
-#: ui/composer-headerbar.ui:186
+#: ui/composer-headerbar.ui:169
 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
+#: ui/composer-link-popover.ui:38
 msgid "Insert the new link with this URL"
-msgstr "Insérer le nouveau lien avec cet URL"
+msgstr "Insérer le nouveau lien avec cette URL"
 
-#: ui/composer-link-popover.ui:43
+#: ui/composer-link-popover.ui:39
 msgid "Add"
 msgstr "Ajouter"
 
-#: ui/composer-link-popover.ui:47
+#: ui/composer-link-popover.ui:43
 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
+#: ui/composer-link-popover.ui:56
 msgid "Update this link’s URL"
 msgstr "Mettre à jour l’URL de ce lien"
 
-#: ui/composer-link-popover.ui:62
+#: ui/composer-link-popover.ui:57
 msgid "Update"
 msgstr "Mise à jour"
 
-#: ui/composer-link-popover.ui:75
+#: ui/composer-link-popover.ui:69
 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
+#: ui/composer-widget.ui:119
 msgid "Drop files here"
 msgstr "Déposer des fichiers ici"
 
-#: ui/composer-widget.ui:462
+#: ui/composer-widget.ui:134
 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
+#: ui/composer-widget.ui:217
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Afficher les champs Cc, Cci et Répondre à"
+
+#: ui/components-attachment-pane.ui:25 ui/components-attachment-pane.ui:41
 msgid "Select all attachments"
 msgstr "Sélectionner toutes les pièces jointes"
 
-#: ui/components-attachment-pane.ui:66
+#: ui/components-attachment-pane.ui:58
 msgid "Save selected attachments"
 msgstr "Enregistrer les pièces jointes sélectionnées"
 
-#: ui/components-attachment-pane.ui:85
+#: ui/components-attachment-pane.ui:75
 msgid "Open selected attachments"
 msgstr "Ouvrir les pièces jointes sélectionnées"
 
@@ -3169,7 +3157,23 @@ msgstr "Ouvrir les pièces jointes sélectionnées"
 msgid "Save _All"
 msgstr "_Tout enregistrer"
 
-#: ui/components-inspector-error-view.ui:31
+#: ui/components-conversation-actions.ui:17
+msgid "Reply"
+msgstr "Répondre"
+
+#: ui/components-conversation-actions.ui:38
+msgid "Reply All"
+msgstr "Répondre à tous"
+
+#: ui/components-conversation-actions.ui:59
+msgid "Forward"
+msgstr "Transférer"
+
+#: ui/components-conversation-actions.ui:156
+msgid "_Archive"
+msgstr "_Archiver"
+
+#: ui/components-inspector-error-view.ui:27
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
@@ -3181,98 +3185,131 @@ msgstr ""
 "ajoutez-les à un <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
 "\">nouveau rapport d’anomalie</a>."
 
-#: ui/components-inspector-error-view.ui:47
+#: ui/components-inspector-error-view.ui:42
 msgid "Details:"
 msgstr "Détails :"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
+#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21
 msgid "Search for matching log entries"
 msgstr "Rechercher dans les journaux système"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:35
+#: ui/components-inspector.ui:30
 msgid "Toggle appending new log entries"
 msgstr "Activer l’ajout de nouvelles entrées dans les journaux système"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:55
+#: ui/components-inspector.ui:48
 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:81 ui/problem-details-dialog.ui:51
+#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45
 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:101 ui/problem-details-dialog.ui:67
+#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papiers"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:121
+#: ui/components-inspector.ui:107
 msgid "Clears all log entries"
 msgstr "Effacer toutes les entrées des journaux système"
 
-#: ui/conversation-contact-popover.ui:146
+#: ui/components-main-toolbar.ui:72 ui/components-main-toolbar.ui:158
+msgid "Back"
+msgstr "Retour"
+
+#: ui/components-main-toolbar.ui:89
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Rédiger un message"
+
+#: ui/components-main-toolbar.ui:105
+msgid "Toggle search bar"
+msgstr "Afficher la barre de recherche"
+
+#: ui/components-main-toolbar.ui:195
+msgid "Toggle find bar"
+msgstr "Afficher la barre de recherche"
+
+#: ui/components-main-toolbar-menus.ui:21
+msgid "Toggle as _Junk"
+msgstr "Marquer comme _pourriel"
+
+#: ui/components-main-toolbar-menus.ui:28
+msgid "_Accounts"
+msgstr "_Comptes"
+
+#: ui/components-main-toolbar-menus.ui:36
+msgid "_Keyboard Shortcuts"
+msgstr "_Raccourcis clavier"
+
+#: ui/components-main-toolbar-menus.ui:47
+msgid "_About Geary"
+msgstr "À _propos de Geary"
+
+#: ui/conversation-contact-popover.ui:134
 msgid "New Conversation…"
 msgstr "Nouvelle conversation…"
 
-#: ui/conversation-contact-popover.ui:159
+#: ui/conversation-contact-popover.ui:146
 msgid "Copy Email Address"
 msgstr "Copier l’adresse électronique"
 
-#: ui/conversation-contact-popover.ui:182
+#: ui/conversation-contact-popover.ui:167
 msgid "Save in Contacts…"
 msgstr "Enregistrer dans Contacts…"
 
-#: ui/conversation-contact-popover.ui:195
+#: ui/conversation-contact-popover.ui:179
 msgid "Show Conversations"
 msgstr "Montrer les conversations"
 
-#: ui/conversation-contact-popover.ui:208
+#: ui/conversation-contact-popover.ui:191
 msgid "Open in Contacts"
 msgstr "Ouvrir dans Contacts"
 
-#: ui/conversation-contact-popover.ui:221
+#: ui/conversation-contact-popover.ui:203
 msgid "Always Load Remote Images"
 msgstr "Toujours télécharger les images distantes"
 
 #. Title label on contact popover
-#: ui/conversation-contact-popover.ui:264
+#: ui/conversation-contact-popover.ui:242
 msgid "Deceptive email address"
 msgstr "Adresse courriel non valable"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:294
+#: ui/conversation-contact-popover.ui:270
 msgid "This email address is:"
 msgstr "Cette adresse courriel est :"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:319
+#: ui/conversation-contact-popover.ui:293
 msgid "But was forged as:"
 msgstr "Mais se fait passer pour :"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:344
+#: ui/conversation-contact-popover.ui:316
 msgid "The sender may not be trustworthy"
 msgstr "L’expéditeur n’est peut-être pas digne de confiance"
 
-#: ui/conversation-email.ui:27
+#: ui/conversation-email.ui:24
 msgid "Save all attachments"
 msgstr "Enregistrer toutes les pièces jointes"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
-#: ui/conversation-email.ui:50
+#: ui/conversation-email.ui:45
 msgid "Mark this message as starred"
 msgstr "Marquer ce message d’une étoile"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
-#: ui/conversation-email.ui:72
+#: ui/conversation-email.ui:65
 msgid "Mark this message as not starred"
 msgstr "Ne pas marquer ce message d’une étoile"
 
@@ -3313,25 +3350,25 @@ msgstr "_Supprimer le message…"
 msgid "_View Source"
 msgstr "_Voir la source"
 
-#: ui/conversation-message-link-popover.ui:54
+#: ui/conversation-message-link-popover.ui:49
 msgid "But actually goes to:"
 msgstr "Mais pointe en réalité vers :"
 
-#: ui/conversation-message-link-popover.ui:84
+#: ui/conversation-message-link-popover.ui:77
 msgid "The link appears to go to:"
 msgstr "Le lien semble pointer vers :"
 
-#: ui/conversation-message-link-popover.ui:96
+#: ui/conversation-message-link-popover.ui:88
 msgid "Deceptive link found"
 msgstr "Lien trompeur découvert"
 
-#: ui/conversation-message-link-popover.ui:111
+#: ui/conversation-message-link-popover.ui:102
 msgid "The email sender may be leading you to the wrong web site."
 msgstr ""
 "Il est possible que l’expéditeur du message essaye de vous diriger vers le "
 "mauvais site Web."
 
-#: ui/conversation-message-link-popover.ui:124
+#: ui/conversation-message-link-popover.ui:114
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr ""
 "Si vous avez un doute, contactez l’expéditeur et demandez avant de continuer."
@@ -3358,423 +3395,445 @@ msgstr "_Enregistrer l’image sous…"
 
 #: ui/conversation-message-menus.ui:33
 msgid "_Select All"
-msgstr "T_out sélectionner"
+msgstr "_Tout sélectionner"
 
-#: ui/conversation-message.ui:63
+#: ui/conversation-message.ui:54
 msgid "From <email>"
 msgstr "De <email>"
 
-#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+#: ui/conversation-message.ui:69 ui/conversation-message.ui:160
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ui/conversation-message.ui:102
+#: ui/conversation-message.ui:91
 msgid "Preview body text."
 msgstr "Prévisualiser le corps du message."
 
-#: ui/conversation-message.ui:202
+#: ui/conversation-message.ui:182
 msgid "Sent by:"
 msgstr "Envoyé par :"
 
-#: ui/conversation-message.ui:247
+#: ui/conversation-message.ui:223
 msgid "Reply to:"
 msgstr "Répondre à :"
 
-#: ui/conversation-message.ui:291
+#: ui/conversation-message.ui:264
 msgid "Subject"
 msgstr "Objet"
 
-#: ui/conversation-viewer.ui:60
+#: ui/conversation-viewer.ui:53
 msgid "Find in conversation"
 msgstr "Rechercher dans la conversation"
 
-#: ui/conversation-viewer.ui:75
+#: ui/conversation-viewer.ui:67
 msgid "Find the previous occurrence of the search string."
 msgstr "Rechercher l’occurrence précédente de la chaîne recherchée."
 
-#: ui/conversation-viewer.ui:96
+#: ui/conversation-viewer.ui:86
 msgid "Find the next occurrence of the search string."
 msgstr "Rechercher l’occurrence suivante de la chaîne recherchée."
 
-#: ui/find_bar.glade:66
+#: ui/find_bar.glade:58
 msgid "Find:"
 msgstr "Chercher :"
 
-#: ui/find_bar.glade:89
+#: ui/find_bar.glade:80
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ui/find_bar.glade:107
+#: ui/find_bar.glade:97
 msgid "_Next"
 msgstr "_Suivant"
 
-#: ui/find_bar.glade:125
+#: ui/find_bar.glade:114
 msgid "_Case sensitive"
 msgstr "Sensible à la _casse"
 
-#: ui/find_bar.glade:145
+#: ui/find_bar.glade:132
 msgid "label"
 msgstr "étiquette"
 
-#: ui/gtk/help-overlay.ui:9
+#: ui/gtk/help-overlay.ui:8
 msgid "Conversation Shortcuts"
 msgstr "Raccourcis de conversation"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
+#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Actions"
 
-#: ui/gtk/help-overlay.ui:17
+#: ui/gtk/help-overlay.ui:16
 msgctxt "shortcut window"
 msgid "New conversation"
 msgstr "Nouvelle conversation"
 
-#: ui/gtk/help-overlay.ui:24
+#: ui/gtk/help-overlay.ui:23
 msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Répondre à l’expéditeur"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
+#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Répondre à tous"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
+#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Transférer"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464
 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:302
+#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471
 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:309
+#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "Archiver les conversations"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
+#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "Déplacer les conversations"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "Étiqueter les conversations"
 
-#: ui/gtk/help-overlay.ui:80
+#: ui/gtk/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "Mettre les conversations à la corbeille"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
+#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "Conversations indésirables"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516
 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
+#: ui/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Recherche"
 
-#: ui/gtk/help-overlay.ui:108
+#: ui/gtk/help-overlay.ui:107
 msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "Rechercher des conversations"
 
-#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
+#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523
 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
+#: ui/gtk/help-overlay.ui:140
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "Annulation"
 
-#: ui/gtk/help-overlay.ui:145
+#: ui/gtk/help-overlay.ui:144
 msgctxt "shortcut window"
 msgid "Undo the last action"
 msgstr "Annuler la dernière action"
 
-#: ui/gtk/help-overlay.ui:152
+#: ui/gtk/help-overlay.ui:151
 msgctxt "shortcut window"
 msgid "Redo the last action"
 msgstr "Rétablir la dernière action"
 
-#: ui/gtk/help-overlay.ui:161
+#: ui/gtk/help-overlay.ui:160
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Affichage"
 
-#: ui/gtk/help-overlay.ui:165
+#: ui/gtk/help-overlay.ui:164
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "Zoom avant"
 
-#: ui/gtk/help-overlay.ui:172
+#: ui/gtk/help-overlay.ui:171
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "Zoom arrière"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:178
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Réinitialiser le zoom"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
-msgctxt "shortcut window"
-msgid "General"
-msgstr "Général"
-
-#: ui/gtk/help-overlay.ui:192
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Afficher l’aide"
-
-#: ui/gtk/help-overlay.ui:199
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Afficher les raccourcis clavier"
-
-#: ui/gtk/help-overlay.ui:206
-msgctxt "shortcut window"
-msgid "Open a new window"
-msgstr "Ouvrir une nouvelle fenêtre"
-
-#: ui/gtk/help-overlay.ui:213
-msgctxt "shortcut window"
-msgid "Close the current window"
-msgstr "Fermer la fenêtre actuelle"
-
-#: ui/gtk/help-overlay.ui:220
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Quitter l’application"
-
-#: ui/gtk/help-overlay.ui:229
-msgctxt "shortcut window"
-msgid "Keyboard navigation"
-msgstr "Navigation au clavier"
-
-#: ui/gtk/help-overlay.ui:233
-msgctxt "shortcut window"
-msgid "Go to next/previous pane"
-msgstr "Aller au volet suivant/précédent"
-
-#: ui/gtk/help-overlay.ui:241
-msgctxt "shortcut window"
-msgid "Select next/previous conversation"
-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:260
-msgid "Single-key Shortcuts"
-msgstr "Raccourcis clavier d’une seule touche"
-
-#: ui/gtk/help-overlay.ui:265
-msgctxt "shortcut window"
-msgid "Single-key shortcuts (if enabled)"
-msgstr "Raccourcis clavier d’une seule touche (si activé)"
-
-#: ui/gtk/help-overlay.ui:274
-msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Répondre à l’expéditeur"
-
-#: ui/gtk/help-overlay.ui:361
-msgctxt "shortcut window"
-msgid "Select next/previous conversations"
-msgstr "Sélectionner les conversations suivantes/précédentes"
-
-#: ui/gtk/help-overlay.ui:373
+#: ui/gtk/help-overlay.ui:190
 msgid "Composer Shortcuts"
 msgstr "Raccourcis de l’éditeur"
 
-# Je pense qu’il s’agit du titre de la section, à vérifier  (Charles).
-#: ui/gtk/help-overlay.ui:381
+#: ui/gtk/help-overlay.ui:198
 msgctxt "shortcut window"
 msgid "Send"
-msgstr "Envoi"
+msgstr "Envoyer"
 
-#: ui/gtk/help-overlay.ui:388
+#: ui/gtk/help-overlay.ui:205
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Ajouter une pièce jointe"
 
-#: ui/gtk/help-overlay.ui:395
+#: ui/gtk/help-overlay.ui:212
 msgctxt "shortcut window"
 msgid "Detach the composer"
 msgstr "Détacher la fenêtre d’édition"
 
-#: ui/gtk/help-overlay.ui:408
+#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Général"
+
+#: ui/gtk/help-overlay.ui:225
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Fermer la fenêtre d’édition"
 
-#: ui/gtk/help-overlay.ui:415
+#: ui/gtk/help-overlay.ui:232
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Détacher la fenêtre d’édition"
 
-#: ui/gtk/help-overlay.ui:422
+#: ui/gtk/help-overlay.ui:239
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Édition"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:244
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Déplacer la sélection dans le presse-papiers"
 
-#: ui/gtk/help-overlay.ui:434
+#: ui/gtk/help-overlay.ui:251
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Copier la sélection vers le presse-papiers"
 
-#: ui/gtk/help-overlay.ui:441
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Coller à partir du presse-papiers"
 
-#: ui/gtk/help-overlay.ui:448
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Mettre en citation"
 
-#: ui/gtk/help-overlay.ui:455
+#: ui/gtk/help-overlay.ui:272
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Supprimer la citation"
 
-#: ui/gtk/help-overlay.ui:464
+#: ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Mode d’édition en texte enrichi"
 
-#: ui/gtk/help-overlay.ui:468
+#: ui/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Coller sans la mise en forme"
 
-#: ui/gtk/help-overlay.ui:475
+#: ui/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Texte en gras"
 
-#: ui/gtk/help-overlay.ui:482
+#: ui/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Texte en italique"
 
-#: ui/gtk/help-overlay.ui:489
+#: ui/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Texte souligné"
 
-#: ui/gtk/help-overlay.ui:496
+#: ui/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Texte barré"
 
-#: ui/gtk/help-overlay.ui:503
+#: ui/gtk/help-overlay.ui:320
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Effacer la mise en forme"
 
-#: ui/gtk/help-overlay.ui:510
+#: ui/gtk/help-overlay.ui:327
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Insérer une image"
 
-#: ui/gtk/help-overlay.ui:517
+#: ui/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Insérer un lien"
 
-#: ui/main-toolbar.ui:24
-msgctxt "tooltip"
-msgid "Compose Message"
-msgstr "Rédiger un message"
+#: ui/gtk/help-overlay.ui:346
+#| msgctxt "shortcut window"
+#| msgid "Additional Shortcuts"
+msgid "Application Shortcuts"
+msgstr "Raccourcis de l’application"
 
-#: ui/main-toolbar.ui:62
-msgid "Toggle search bar"
-msgstr "Afficher la barre de recherche"
+#: ui/gtk/help-overlay.ui:354
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Afficher l’aide"
 
-#: ui/main-toolbar.ui:114
-msgid "Reply"
-msgstr "Répondre"
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "Afficher les raccourcis clavier"
 
-#: ui/main-toolbar.ui:137
-msgid "Reply All"
-msgstr "Répondre à tous"
+#: ui/gtk/help-overlay.ui:368
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Ouvrir une nouvelle fenêtre"
 
-#: ui/main-toolbar.ui:160
-msgid "Forward"
-msgstr "Transférer"
+#: ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Fermer la fenêtre actuelle"
 
-#: ui/main-toolbar.ui:265
-msgid "Toggle find bar"
-msgstr "Afficher la barre de recherche"
+#: ui/gtk/help-overlay.ui:382
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Quitter l’application"
 
-#: ui/main-toolbar.ui:286
-msgid "_Archive"
-msgstr "_Archiver"
+#: ui/gtk/help-overlay.ui:391
+msgctxt "shortcut window"
+msgid "Keyboard navigation"
+msgstr "Navigation au clavier"
 
-#: ui/main-toolbar-menus.ui:21
-msgid "Toggle as _Junk"
-msgstr "Marquer comme _pourriel"
+#: ui/gtk/help-overlay.ui:395
+#| msgid "Select Color"
+msgctxt "shortcut window"
+msgid "Select Inbox"
+msgstr "Sélectionner une boîte de réception"
 
-#: ui/main-toolbar-menus.ui:28
-msgid "_Accounts"
-msgstr "_Comptes"
+#: ui/gtk/help-overlay.ui:402
+msgctxt "shortcut window"
+msgid "Go to next/previous pane"
+msgstr "Aller au volet suivant/précédent"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "_Keyboard Shortcuts"
-msgstr "_Raccourcis clavier"
+#: ui/gtk/help-overlay.ui:410
+msgctxt "shortcut window"
+msgid "Select next/previous conversation"
+msgstr "Sélectionner la conversation suivante/précédente"
 
-#: ui/main-toolbar-menus.ui:47
-msgid "_About Geary"
-msgstr "À _propos de Geary"
+#: ui/gtk/help-overlay.ui:417
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "Déplacer le focus au message suivant/précédent"
 
-#: ui/password-dialog.glade:74
+#: ui/gtk/help-overlay.ui:429
+msgid "Single-key Shortcuts"
+msgstr "Raccourcis clavier d’une seule touche"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Raccourcis clavier d’une seule touche (si activé)"
+
+#: ui/gtk/help-overlay.ui:443
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "Répondre à l’expéditeur"
+
+#: ui/gtk/help-overlay.ui:530
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Sélectionner les conversations suivantes/précédentes"
+
+#: ui/password-dialog.glade:66
 msgid "SMTP Credentials"
 msgstr "Identifiants SMTP"
 
-#: ui/password-dialog.glade:91
+#: ui/password-dialog.glade:82
 msgid "Username"
 msgstr "Identifiant"
 
-#: ui/password-dialog.glade:152
+#: ui/password-dialog.glade:140
 msgid "_Remember password"
 msgstr "_Se souvenir du mot de passe"
 
-#: ui/password-dialog.glade:210
+#: ui/password-dialog.glade:195
 msgid "_Authenticate"
-msgstr "_Authentifier"
+msgstr "_Authentification"
+
+#~ msgid "Position of folder list pane"
+#~ msgstr "Position du panneau de la liste des dossiers"
+
+# Paned Grabber ?
+#~ msgid "Position of the folder list Paned grabber."
+#~ msgstr "Position de l’attache du panneau de la liste des dossiers."
+
+#~ msgid "Position of folder list pane when horizontal"
+#~ msgstr "Position du panneau de la liste des dossiers en horizontal"
+
+# Paned Grabber ?
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the horizontal orientation."
+#~ msgstr ""
+#~ "Position de l’attache du panneau de la liste des dossiers en orientation "
+#~ "horizontale."
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Mise à jour de Geary en cours…"
+#~ msgid "Position of folder list pane when vertical"
+#~ msgstr "Position du panneau de la liste des dossiers en vertical"
+
+# Paned Grabber ?
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the vertical orientation."
+#~ msgstr ""
+#~ "Position de l’attache du panneau de la liste des dossiers en orientation "
+#~ "verticale."
+
+#~ msgid "Orientation of the folder list pane"
+#~ msgstr "Orientation du panneau de la liste des dossiers"
+
+#~ msgid "True if the folder list Paned is in the horizontal orientation."
+#~ msgstr ""
+#~ "Vrai si le panneau de la liste des dossiers est en orientation "
+#~ "horizontale."
+
+#~ msgid "Position of message list pane"
+#~ msgstr "Position du panneau de la liste des messages"
+
+# Paned Grabber ?
+#~ msgid "Position of the message list Paned grabber."
+#~ msgstr "Position de l’attache du panneau de la liste des messages."
+
+#~ msgid "Use _three pane view"
+#~ msgstr "Utiliser la vue à _trois panneaux"
+
+#~ msgid "%a, %b %-e, %Y at %l:%M %P"
+#~ msgstr "%a %-e %b %Y à %l:%M %P"
+
+#~ msgid "%a, %b %-e, %Y at %H:%M"
+#~ msgstr "%a %-e %b %Y à %-H:%M"
+
+#~ msgid "Confirm removing: %s"
+#~ msgstr "Confirmation de la suppression : %s"
+
+#~ msgid "Remove account"
+#~ msgstr "Supprimer le compte"
+
+#~ msgid "_Reply-To"
+#~ msgstr "_Répondre à"
 
 #~ msgid "Log periodic activity"
 #~ msgstr "Journaliser l’activité périodique"
@@ -4193,10 +4252,6 @@ msgstr "Mise à jour de Geary en cours…"
 #~ msgid "Mark unread"
 #~ msgstr "Marquer comme non lu"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Additional Shortcuts"
-#~ msgstr "Raccourcis supplémentaires"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Supprimer l’étoile"