[evolution] Revert "Updated French translation" due to build break



commit f2f50ebd209cf5d62d7a0f8dd7e77f6908ba5da8
Author: Milan Crha <mcrha redhat com>
Date:   Mon Mar 14 08:38:22 2016 +0100

    Revert "Updated French translation" due to build break
    
    This reverts commit 27195bb1f10293e414c5cee2f7e8270ea7e8488e.

 help/fr/fr.po | 9771 ++++++++++++++++++++++++---------------------------------
 1 files changed, 4066 insertions(+), 5705 deletions(-)
---
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 9ef9985..b851c1a 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -2,7 +2,6 @@
 # Copyright (C) 2006-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
-#
 # Novell, 2004.
 # Marc Lorber <Linux-Lorber club-internet fr>, 2006.
 # Jonathan Ernst <jonathan ernstfamily ch>, 2007.
@@ -11,23 +10,22 @@
 # Nicolas Repentin <nicolas shivaserv fr>, 2009.
 # Bruno Brouard <annoa b gmail com>, 2010-2012.
 # Alexandre Daubois <alex daubois gmail com>, 2011.
-# Julien Hardelin <jhardlin orange fr>, 2012, 2015.
-# Alain Lojewski <allomervan gmail com>, 2013-2016.
-
+# Julien Hardelin <jhardlin orange fr>, 2012.
+# Alain Lojewski <allomervan gmail com>, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution doc fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-29 04:33+0000\n"
-"PO-Revision-Date: 2016-03-08 09:41+0100\n"
+"POT-Creation-Date: 2013-08-13 19:59+0000\n"
+"PO-Revision-Date: 2013-08-24 04:45+0200\n"
 "Last-Translator: Alain Lojewski <allomervan gmail com>\n"
-"Language-Team: French <GNOME French Team <gnomefr traduc org>>\n"
-"Language: fr\n"
+"Language-Team: français <GNOME French Team<gnomefr traduc org>>\n"
+"Language: \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: Lokalize 1.5\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -38,46 +36,166 @@ msgstr ""
 "Claude Paroz <claude 2xlibre net>, 2007-2009\n"
 "Alexandre Franke <alexandre franke gmail com>, 2009\n"
 "Bruno Brouard <annoa b gmail com>, 2012 \n"
-"Julien Hardelin <jhardlin orange fr, 2012, 2015\n"
-"Alain Lojewski <allomervan gmail com>, 2013-2016"
+"Julien Hardelin <jhardlin orange fr, 2012\n"
+"Alain Lojewski <allomervan gmail com>, 2013"
 
-#. (itstool) path: info/desc
-#: C/backup-restore.page:18
-msgid "Back up and restore your <app>Evolution</app> data and settings."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:6(media) C/index.page:24(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/evolutionlogo.png' "
+"md5='4bf469aaba7c368937309e931ba9bdcc'"
 msgstr ""
-"\"Archiver et restaurer vos données et paramètres d'<app>Evolution</app>.\""
+"external ref='figures/evolutionlogo.png' "
+"md5='4bf469aaba7c368937309e931ba9bdcc'"
+
+#: C/index.page:5(info/desc)
+msgid "Evolution"
+msgstr "Evolution"
+
+#: C/index.page:7(info/title)
+msgctxt "text"
+msgid "Evolution Mail and Calendar"
+msgstr "Messagerie et agenda d'Evolution"
+
+#: C/index.page:25(media/span)
+#, fuzzy
+#| msgid "Evolution"
+msgid "Evolution logo"
+msgstr "Evolution"
+
+#: C/index.page:23(page/title)
+#, fuzzy
+#| msgctxt "text"
+#| msgid "Evolution Mail and Calendar"
+msgid "<_:media-1/> Evolution Mail and Calendar"
+msgstr "Messagerie et agenda d'Evolution"
+
+#: C/index.page:31(section/title) C/intro-application.page:24(page/title)
+msgid "Getting Started"
+msgstr "Premiers pas"
+
+#: C/index.page:35(section/title)
+msgid "Mail Management"
+msgstr "Gestion des courriels"
+
+#: C/index.page:37(section/title)
+msgid "Advanced Mail Management"
+msgstr "Gestion avancée des courriels"
+
+#: C/index.page:40(info/title)
+#, fuzzy
+#| msgid "Advanced Mail Management"
+msgctxt "link"
+msgid "Advanced Mail Management (IMAP+ accounts)"
+msgstr "Gestion avancée des courriels"
+
+#: C/index.page:42(section/title) C/intro-first-run.page:54(section/title)
+#, fuzzy
+#| msgid "IMAP"
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: C/index.page:48(section/title)
+msgid "Mail Composing"
+msgstr "Édition de courriel"
+
+#: C/index.page:50(section/title)
+msgid "Advanced Mail Composing"
+msgstr "Édition avancée de courriel"
+
+#: C/index.page:55(section/title)
+msgid "Calendar Management"
+msgstr "Gestion d'agenda"
+
+#: C/index.page:57(section/title)
+msgid "Advanced Calendar Management"
+msgstr "Gestion avancée d'agenda"
+
+#: C/index.page:62(section/title)
+msgid "Contacts Management"
+msgstr "Gestion des contacts"
+
+#: C/index.page:66(section/title)
+msgid "Memos and Tasks Management"
+msgstr "Gestion des mémos et des tâches"
+
+#: C/index.page:70(section/title)
+msgid "Data Migration and Synchronization"
+msgstr "Synchronisation et migration des données"
+
+#: C/index.page:74(section/title)
+msgid "Corporate Environments"
+msgstr "Environnement appartenant à une société"
 
-#. (itstool) path: page/title
-#: C/backup-restore.page:22
+#: C/index.page:76(section/title)
+msgid "Microsoft Exchange"
+msgstr "Microsoft Exchange"
+
+#: C/index.page:81(section/title)
+msgid "Tracking down Problems"
+msgstr "Dépistage des problèmes"
+
+#: C/index.page:85(section/title)
+msgid "Common Mail Questions and Problems"
+msgstr "Problèmes et questions courants à propos des courriels"
+
+#: C/index.page:89(section/title)
+msgid "Common Other Questions and Problems"
+msgstr "Autres questions et problèmes courants"
+
+#: C/index.page:93(section/title)
+msgid "Further reading"
+msgstr "Lecture complémentaire"
+
+#: C/backup-restore.page:5(info/desc)
+msgid "Back up and restore your Evolution data and settings."
+msgstr "Archiver et restaurer vos données et paramètres d'Evolution."
+
+#: C/backup-restore.page:21(page/title)
 msgid "Back up and restore"
 msgstr "Archivage et restauration"
 
-#. (itstool) path: page/p
-#: C/backup-restore.page:24
+#: C/backup-restore.page:23(page/p)
 msgid ""
-"You can back up your <app>Evolution</app> data. The backup saves your "
-"settings, mail, contacts, tasks, memos and calendars. It will be stored in a "
-"gzip-compressed tar archive file."
+"You can back up your Evolution data. The backup saves your settings, mail, "
+"contacts, tasks, memos and calendars. It will be stored in a gzip-compressed "
+"tar archive file."
 msgstr ""
-"Vous pouvez archiver vos données d'<app>Evolution</app>. La sauvegarde "
-"enregistre vos paramètres, courriels, contacts, mémos et agendas. Elle sera "
-"stockée dans un fichier archive tar compressé au format gzip."
+"Vous pouvez archiver vos données d'Evolution. La sauvegarde enregistre vos "
+"paramètres, courriels, contacts, mémos et agendas. Elle sera stockée dans un "
+"fichier archive tar compressé au format gzip."
 
-#. (itstool) path: section/title
-#: C/backup-restore.page:29
+#: C/backup-restore.page:26(section/title)
 msgid "Backing up"
 msgstr "Archivage"
 
-#. (itstool) path: item/p
-#: C/backup-restore.page:33
+#: C/backup-restore.page:28(item/p)
 msgid ""
-"Select <guiseq><gui>File</gui> <gui>Back up Evolution Data…</gui></guiseq>."
+"Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>."
 msgstr ""
-"Choisissez <guiseq><gui>Fichier</gui><gui>Archiver les données "
-"d'<app>Evolution</app></gui></guiseq>."
+"Choisissez <guiseq><gui>Fichier</gui><gui>Archiver les données d'Evolution</"
+"gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/backup-restore.page:37
+#: C/backup-restore.page:29(item/p)
 msgid ""
 "Choose a filename and the folder where you want to save the backup file, and "
 "click <gui style=\"button\">Save</gui>."
@@ -86,81 +204,72 @@ msgstr ""
 "enregistrer le fichier d'archive et cliquez sur <gui style=\"button"
 "\">Enregistrer</gui>."
 
-#. (itstool) path: item/p
-#: C/backup-restore.page:41 C/backup-restore.page:69
+#: C/backup-restore.page:30(item/p) C/backup-restore.page:40(item/p)
 msgid ""
-"You will be asked to close <app>Evolution</app>. Answer with <gui style="
-"\"button\">Yes</gui>."
+"You will be asked to close Evolution. Answer with <gui style=\"button\">Yes</"
+"gui>."
 msgstr ""
-"Il vous sera demandé de fermer <app>Evolution</app>. Répondez par <gui style="
-"\"button\">Oui</gui>."
+"Il vous sera demandé de fermer Evolution. Répondez par <gui style=\"button"
+"\">Oui</gui>."
 
-#. (itstool) path: note/p
-#: C/backup-restore.page:47
+#: C/backup-restore.page:32(note/p)
 msgid ""
 "Note that your <link xref=\"mail-spam\">spam filtering</link> settings are "
 "not included in the backup file, as these settings are not controlled by "
-"<app>Evolution</app> and as developers of spam filtering tools might change "
-"implementation details. If you use Bogofilter you will need to back up the "
-"hidden folder <file>~/.bogofilter/</file>. If you use SpamAssassin you will "
-"need to back up the hidden folder <file>~/.spamassassin/</file>."
+"Evolution and as developers of spam filtering tools might change "
+"implementation details. If you use Bogofilter you will need to back up "
+"<file>~/.bogofilter/</file>. If you use SpamAssassin you will need to back "
+"up <file>~/.spamassassin/</file>."
 msgstr ""
 "Notez que vos paramètres de <link xref=\"mail-spam\">filtre de pourriels</"
 "link> ne sont pas inclus dans le fichier archive parce que ces paramètres ne "
-"sont pas contrôlés par <app>Evolution</app> et que les développeurs de "
-"filtres de pourriels pourraient modifier des détails de leur application. Si "
-"vous utilisez Bogofilter, vous devez archiver le fichier <file>~/.bogofilter/"
-"</file>. Si vous utilisez SpamAssassin, vous devez archiver le fichier "
+"sont pas contrôlés par Evolution et que les développeurs de filtres de "
+"pourriels pourraient modifier des détails de leur application. Si vous "
+"utilisez Bogofilter, vous devez archiver le fichier <file>~/.bogofilter/</"
+"file>. Si vous utilisez SpamAssassin, vous devez archiver le fichier "
 "<file>~/.spamassassin/</file>."
 
-#. (itstool) path: section/title
-#: C/backup-restore.page:58 C/intro-first-run.page:39
+#: C/backup-restore.page:36(section/title)
+#: C/intro-first-run.page:39(section/title)
 msgid "Restoring"
 msgstr "Restauration"
 
-#. (itstool) path: item/p
-#: C/backup-restore.page:62
+#: C/backup-restore.page:38(item/p)
 msgid ""
-"Select <guiseq><gui>File</gui> <gui>Restore Evolution Data…</gui></guiseq>."
+"Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
 msgstr ""
 "Choisissez <guiseq><gui>Fichier</gui><gui>Restaurer les données "
-"d'<app>Evolution</app>...</gui></guiseq>."
+"d'Evolution...</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/backup-restore.page:66
+#: C/backup-restore.page:39(item/p)
 msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr ""
 "Choisissez le fichier et cliquez sur <gui style=\"button\">Ouvrir</gui>."
 
-#. (itstool) path: note/p
-#: C/backup-restore.page:75
+#: C/backup-restore.page:42(note/p)
 msgid ""
 "In the <link xref=\"intro-first-run\">first-run assistant</link>, you can "
-"restore <app>Evolution</app> data from a backup file."
+"restore Evolution data from a backup file."
 msgstr ""
 "Dans l'<link xref=\"intro-first-run\">assistant de premier démarrage</link>, "
-"vous pouvez restaurer les données d'<app>Evolution</app> à partir d'un "
-"fichier de sauvegarde."
+"vous pouvez restaurer les données d'Evolution à partir d'un fichier de "
+"sauvegarde."
 
-#. (itstool) path: info/desc
-#: C/calendar-alarms-and-reminders.page:23
+#: C/calendar-alarms-and-reminders.page:5(info/desc)
 msgid "Setting up reminder notifications for appointments."
 msgstr "Paramétrer les notifications de rappel pour les rendez-vous."
 
-#. (itstool) path: page/title
-#: C/calendar-alarms-and-reminders.page:26
+#: C/calendar-alarms-and-reminders.page:23(page/title)
 msgid "Reminders for appointments"
 msgstr "Rappels de rendez-vous"
 
-#. (itstool) path: section/title
-#: C/calendar-alarms-and-reminders.page:29
+#: C/calendar-alarms-and-reminders.page:26(section/title)
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#. (itstool) path: section/p
-#: C/calendar-alarms-and-reminders.page:31
+#: C/calendar-alarms-and-reminders.page:28(section/p)
 msgid ""
-"Under <guiseq><gui>Edit</gui><gui>Preferences</gui> <gui>Calendar and Tasks</"
+"Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
 "gui><gui>Reminders</gui></guiseq> you can select those calendars for which "
 "you want to receive reminder notifications. If you do not select a calendar, "
 "you will not receive reminders for any events in this calendar. You can also "
@@ -174,24 +283,11 @@ msgstr ""
 "événements de cet agenda. Vous pouvez choisir d'afficher un rappel pour tous "
 "les rendez-vous et pour toutes les dates de naissance et les anniversaires."
 
-#. (itstool) path: when/p
-#: C/calendar-alarms-and-reminders.page:40
-msgid ""
-"For general information on displaying reminders, please see <link xref="
-"\"help:gnome-help/shell-notifications\" href=\"https://help.gnome.org/users/";
-"gnome-help/stable/shell-notifications\"> the GNOME Desktop Help</link>."
-msgstr ""
-"Pour des informations générales sur les rappels, reportez-vous à l'<link "
-"xref=\"help:gnome-help/shell-notifications\" href=\"https://help.gnome.org/";
-"users/gnome-help/stable/shell-notifications\">aide du bureau GNOME</link>."
-
-#. (itstool) path: section/title
-#: C/calendar-alarms-and-reminders.page:50
+#: C/calendar-alarms-and-reminders.page:33(section/title)
 msgid "Manual Reminders"
 msgstr "Rappels manuels"
 
-#. (itstool) path: section/p
-#: C/calendar-alarms-and-reminders.page:52
+#: C/calendar-alarms-and-reminders.page:35(section/p)
 msgid ""
 "Apart from the general settings you can also set up reminders in the "
 "appointment editor for certain appointments only:"
@@ -199,8 +295,7 @@ msgstr ""
 "En plus des paramètres généraux, vous pouvez aussi configurer des rappels "
 "dans l'éditeur de rendez-vous pour certains rendez-vous seulement :"
 
-#. (itstool) path: item/p
-#: C/calendar-alarms-and-reminders.page:57
+#: C/calendar-alarms-and-reminders.page:37(item/p)
 msgid ""
 "Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the "
 "Reminder button in the toolbar."
@@ -208,8 +303,7 @@ msgstr ""
 "Cliquez sur <guiseq><gui>Options</gui><gui>Rappels</gui></guiseq> ou cliquez "
 "sur le bouton Rappel dans la barre d'outils."
 
-#. (itstool) path: item/p
-#: C/calendar-alarms-and-reminders.page:61
+#: C/calendar-alarms-and-reminders.page:38(item/p)
 msgid ""
 "From the dropdown menu, choose either one of the available default options "
 "when to show a notification reminder, or choose <gui>Customize</gui>."
@@ -218,8 +312,7 @@ msgstr ""
 "défaut concernant l'affichage d'un rappel de notification ou choisissez "
 "<gui>Personnaliser</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-alarms-and-reminders.page:66
+#: C/calendar-alarms-and-reminders.page:40(item/p)
 msgid ""
 "In case of <gui>Customize</gui>, the reminder can be a popup, a sound "
 "played, or a program ran. You can also define whether the reminder should be "
@@ -229,120 +322,102 @@ msgstr ""
 "l'apparition d'une fenêtre, la lecture d'un son ou le lancement d'un "
 "programme. Vous pouvez aussi définir si le rappel doit être répété."
 
-#. (itstool) path: info/desc
-#: C/calendar-caldav.page:23
+#: C/calendar-caldav.page:5(info/desc)
 msgid "Using an online CalDAV calendar."
 msgstr "Utiliser un agenda CalDAV en ligne."
 
-#. (itstool) path: page/title
-#: C/calendar-caldav.page:26
+#: C/calendar-caldav.page:23(page/title)
 msgid "Using a CalDAV calendar"
 msgstr "Utilisation d'un agenda CalDAV"
 
-#. (itstool) path: page/p
-#: C/calendar-caldav.page:28 C/calendar-google.page:29
-#: C/calendar-weather.page:24 C/calendar-webdav.page:23
-msgid ""
-"To add such a calendar to <app>Evolution</app>, perform the following steps:"
+#: C/calendar-caldav.page:25(page/p) C/calendar-google.page:26(page/p)
+#: C/calendar-weather.page:24(page/p) C/calendar-webdav.page:24(page/p)
+msgid "To add such a calendar to Evolution, perform the following steps:"
 msgstr ""
-"Pour ajouter de tels agendas à <app>Evolution</app>, suivez les étapes "
-"suivantes :"
+"Pour ajouter de tels agendas à Evolution, suivez les étapes suivantes :"
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:32 C/calendar-google.page:34
-#: C/calendar-local.page:27 C/calendar-weather.page:29
-#: C/calendar-webdav.page:28
+#: C/calendar-caldav.page:27(item/p) C/calendar-google.page:28(item/p)
+#: C/calendar-local.page:24(item/p) C/calendar-weather.page:26(item/p)
+#: C/calendar-webdav.page:26(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Fichier</gui><gui>Nouveau</gui><gui>Agenda</gui></"
 "guiseq>."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:36
+#: C/calendar-caldav.page:28(item/p)
 msgid "Select the type <gui>CalDAV</gui>."
 msgstr "Sélectionnez le type <gui>CalDAV</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:39 C/calendar-google.page:40
-#: C/calendar-local.page:34 C/calendar-weather.page:36
-#: C/calendar-webdav.page:35 C/contacts-google.page:35 C/contacts-ldap.page:48
-#: C/contacts-local.page:34 C/contacts-using-contact-lists.page:48
-#: C/tasks-caldav.page:26 C/tasks-local.page:26 C/tasks-webdav.page:28
+#: C/calendar-caldav.page:29(item/p) C/calendar-google.page:30(item/p)
+#: C/calendar-local.page:26(item/p) C/calendar-weather.page:28(item/p)
+#: C/calendar-webdav.page:28(item/p) C/contacts-google.page:27(item/p)
+#: C/contacts-ldap.page:33(item/p) C/contacts-local.page:26(item/p)
+#: C/contacts-using-contact-lists.page:33(item/p)
+#: C/tasks-caldav.page:26(item/p) C/tasks-local.page:26(item/p)
+#: C/tasks-webdav.page:28(item/p)
 msgid "Enter a name that you prefer."
 msgstr "Saisissez le nom que vous voulez."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:42 C/calendar-google.page:43
-#: C/calendar-local.page:37 C/calendar-weather.page:39
-#: C/calendar-webdav.page:38 C/tasks-caldav.page:27 C/tasks-local.page:27
-#: C/tasks-webdav.page:29
+#: C/calendar-caldav.page:30(item/p) C/calendar-google.page:31(item/p)
+#: C/calendar-local.page:27(item/p) C/calendar-weather.page:29(item/p)
+#: C/calendar-webdav.page:29(item/p) C/tasks-caldav.page:27(item/p)
+#: C/tasks-local.page:27(item/p) C/tasks-webdav.page:29(item/p)
 msgid "Optionally choose a color that you prefer."
 msgstr "Choisissez éventuellement votre couleur préférée."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:45 C/calendar-google.page:46
-#: C/calendar-weather.page:42 C/calendar-webdav.page:41
-#: C/contacts-google.page:38
+#: C/calendar-caldav.page:31(item/p) C/calendar-google.page:32(item/p)
+#: C/calendar-weather.page:30(item/p) C/calendar-webdav.page:30(item/p)
+#: C/contacts-google.page:28(item/p)
 msgid ""
 "Choose if you want to be able to view the content also when being offline."
 msgstr ""
 "Choisissez si vous souhaitez aussi voir le contenu quand vous êtes hors-"
 "ligne."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:49 C/calendar-webdav.page:45
-#: C/mail-composer-html-link.page:28 C/tasks-caldav.page:29
-#: C/tasks-webdav.page:31
-msgid "Enter the address in the <gui>URL</gui> field."
-msgstr "Saisissez l'adresse dans le champ <gui>URL</gui>."
+#: C/calendar-caldav.page:32(item/p) C/calendar-webdav.page:31(item/p)
+msgid "Enter the address of the calendar in the <gui>URL</gui> field."
+msgstr "Saisissez l'adresse de l'agenda dans le champ <gui>URL</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:52 C/calendar-weather.page:49
-#: C/calendar-webdav.page:48 C/contacts-google.page:45
-#: C/mail-sending-options-smtp.page:38 C/tasks-caldav.page:30
-#: C/tasks-webdav.page:32
+#: C/calendar-caldav.page:33(item/p) C/calendar-weather.page:32(item/p)
+#: C/calendar-webdav.page:32(item/p) C/contacts-google.page:30(item/p)
+#: C/mail-sending-options-smtp.page:38(item/p) C/tasks-caldav.page:30(item/p)
+#: C/tasks-webdav.page:32(item/p)
 msgid ""
 "Choose <gui>Use secure connection</gui> if you want to connect securely."
 msgstr ""
 "Choisissez <gui>Utiliser une connexion sécurisée</gui> si vous souhaitez "
 "utiliser une connexion sécurisée."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:56 C/tasks-caldav.page:31
+#: C/calendar-caldav.page:34(item/p) C/tasks-caldav.page:31(item/p)
 msgid "Enter your username and your email address."
 msgstr "Saisissez votre nom d'utilisateur et votre adresse électronique."
 
-#. (itstool) path: item/p
-#: C/calendar-caldav.page:59 C/calendar-google.page:55
-#: C/calendar-local.page:46 C/calendar-weather.page:56
-#: C/calendar-webdav.page:55 C/contacts-google.page:49 C/contacts-ldap.page:58
-#: C/contacts-local.page:37 C/tasks-caldav.page:32 C/tasks-local.page:28
-#: C/tasks-webdav.page:34
+#: C/calendar-caldav.page:35(item/p) C/calendar-google.page:35(item/p)
+#: C/calendar-local.page:28(item/p) C/calendar-weather.page:34(item/p)
+#: C/calendar-webdav.page:34(item/p) C/contacts-google.page:31(item/p)
+#: C/contacts-ldap.page:36(item/p) C/contacts-local.page:27(item/p)
+#: C/tasks-caldav.page:32(item/p) C/tasks-local.page:28(item/p)
+#: C/tasks-webdav.page:34(item/p)
 msgid "Click <gui style=\"button\">Apply</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Valider</gui>."
 
-#. (itstool) path: page/p
-#: C/calendar-caldav.page:63 C/calendar-google.page:59
-#: C/calendar-local.page:50 C/calendar-weather.page:60
-#: C/calendar-webdav.page:59
-msgid ""
-"The calendar will be added to the list of calendars in <app>Evolution</app>."
-msgstr "L'agenda est ajouté à la liste des agendas d'<app>Evolution</app>."
+#: C/calendar-caldav.page:38(page/p) C/calendar-google.page:38(page/p)
+#: C/calendar-local.page:31(page/p) C/calendar-weather.page:37(page/p)
+#: C/calendar-webdav.page:37(page/p)
+msgid "The calendar will be added to the list of calendars in Evolution."
+msgstr "L'agenda est ajouté à la liste des agendas d'Evolution."
 
-#. (itstool) path: info/desc
-#: C/calendar-classifications.page:23
+#: C/calendar-classifications.page:5(info/desc)
 msgid "Classifying appointments and tasks on groupware servers."
 msgstr ""
 "Classification des rendez-vous et des tâches sur les serveurs collaboratifs."
 
-#. (itstool) path: page/title
-#: C/calendar-classifications.page:26
+#: C/calendar-classifications.page:23(page/title)
 msgid "Using Classifications"
 msgstr "Utilisation des classifications"
 
-#. (itstool) path: page/p
-#: C/calendar-classifications.page:28
+#: C/calendar-classifications.page:25(page/p)
 msgid ""
 "If you are using a calendar on a Novell GroupWise or Microsoft Exchange "
 "server, you can select a classification to determine who can view it."
@@ -351,8 +426,7 @@ msgstr ""
 "Exchange, vous pouvez sélectionner une classification pour déterminer qui "
 "peut le voir."
 
-#. (itstool) path: page/p
-#: C/calendar-classifications.page:31
+#: C/calendar-classifications.page:26(page/p)
 msgid ""
 "To set a classification for an appointment or a task, click "
 "<guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a "
@@ -368,30 +442,26 @@ msgstr ""
 "sur le réseau de partage d'agenda. <gui>Privé</gui> dénote un certain niveau "
 "de sécurité et <gui>Confidentiel</gui> un niveau encore plus haut."
 
-#. (itstool) path: page/p
-#: C/calendar-classifications.page:38
+#: C/calendar-classifications.page:27(page/p)
 msgid ""
 "The different levels vary depending on your server settings; check with your "
 "system administrator or adjust your delegation settings."
 msgstr ""
 "Les différents niveaux changent en fonction des paramètres du serveur : "
-"vérifiez auprès de votre administrateur système ou ajusterz vos paramètres "
-"de délégation."
+"vérifiez auprès de votre administrateur système ou ajuster vos paramètres de "
+"délégation."
 
-#. (itstool) path: info/desc
-#: C/calendar-free-busy.page:24
+#: C/calendar-free-busy.page:5(info/desc)
 msgid "Using the Free/Busy view on a groupware server to set up meetings."
 msgstr ""
 "Utiliser l'affichage libre/occupé pour paramétrer vos réunions sur un "
 "serveur collaboratif."
 
-#. (itstool) path: page/title
-#: C/calendar-free-busy.page:29
+#: C/calendar-free-busy.page:23(page/title)
 msgid "Free/Busy information"
 msgstr "Information Libre/Occupé"
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:31
+#: C/calendar-free-busy.page:25(page/p)
 msgid ""
 "You can use the Free/Busy search for meetings to determine the availability "
 "of invitees."
@@ -399,8 +469,7 @@ msgstr ""
 "Vous pouvez utiliser la recherche Libre/Occupé pour les rendez-vous pour "
 "déterminer la disponibilité de vos invités."
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:34
+#: C/calendar-free-busy.page:27(page/p)
 msgid ""
 "In addition to the standard meeting scheduling tools, you can use the Free/"
 "Busy view to check whether people are available in advance. The Free/Busy "
@@ -423,20 +492,19 @@ msgstr ""
 "à des événements</link> pour coordonner la planification d'événements avec "
 "d'autres personnes."
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:44
+#: C/calendar-free-busy.page:29(page/p)
 msgid "To access the free/busy view:"
 msgstr "Pour accéder à l'affichage Libre/Occupé :"
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:48 C/calendar-meetings-sending-invitation.page:44
+#: C/calendar-free-busy.page:31(item/p)
+#: C/calendar-meetings-sending-invitation.page:31(item/p)
 msgid "Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Fichier</gui><gui>Nouveau</gui><gui>Rendez-vous</"
 "gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:52 C/calendar-meetings-sending-invitation.page:55
+#: C/calendar-free-busy.page:32(item/p)
+#: C/calendar-meetings-sending-invitation.page:34(item/p)
 msgid ""
 "Click <gui style=\"button\">Add</gui> to add the email addresses of people "
 "you want to invite."
@@ -444,8 +512,7 @@ msgstr ""
 "Cliquez sur <gui style=\"button\">Ajouter</gui> pour ajouter les adresses "
 "électroniques des personnes que vous souhaitez inviter."
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:56
+#: C/calendar-free-busy.page:33(item/p)
 msgid ""
 "Click the <gui>Free/Busy</gui> button on the toolbar, or click "
 "<guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>."
@@ -453,8 +520,7 @@ msgstr ""
 "Cliquez sur le bouton <gui>Libre/Occupé</gui> dans la barre d'outils ou "
 "choisissez <guiseq><gui>Options</gui><gui>Libre/Occupé</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:60
+#: C/calendar-free-busy.page:34(item/p)
 msgid ""
 "Adjust the meeting time, either by dragging the meeting borders or by using "
 "the <gui>Autopick</gui> buttons to choose a time automatically, then click "
@@ -469,24 +535,20 @@ msgstr ""
 "automatiquement à jour pour les participants invités ; dans les autres cas, "
 "un courriel de notification de mise à jour est envoyé aux participants."
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:70
+#: C/calendar-free-busy.page:38(item/p)
 msgid "Attendee List:"
 msgstr "Liste des participants :"
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:71
+#: C/calendar-free-busy.page:38(item/p)
 msgid ""
 "The Attendee List shows the people who have been invited to the appointment."
 msgstr "La liste des participants montre les personnes invitées à la réunion."
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:75
+#: C/calendar-free-busy.page:39(item/p)
 msgid "Schedule Grid:"
 msgstr "Grille horaire :"
 
-#. (itstool) path: item/p
-#: C/calendar-free-busy.page:76
+#: C/calendar-free-busy.page:39(item/p)
 msgid ""
 "The Schedule Grid shows the published Free/Busy information for the people "
 "you have invited. This is where you compare schedules to find free time to "
@@ -496,7 +558,7 @@ msgid ""
 "publish free/busy information at a web address (URL) that you can reach and "
 "you have entered that web address for the specific contact in the <link xref="
 "\"contacts-usage-edit-contact\">Contact Editor</link> under "
-"<guiseq><gui>Personal information</gui> <gui>Web Addresses</gui><gui>Free/"
+"<guiseq><gui>Personal information</gui><gui>Web Addresses</gui><gui>Free/"
 "Busy</gui></guiseq>."
 msgstr ""
 "La grille horaire affiche les informations Libre/Occupé des personnes "
@@ -510,8 +572,7 @@ msgstr ""
 "\">l'éditeur de contact</link> sous <guiseq><gui>Informations personnelles</"
 "gui><gui>Adresses Web</gui><gui>Libre/Occupé</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:90 C/calendar-publishing.page:43
+#: C/calendar-free-busy.page:42(page/p) C/calendar-publishing.page:29(page/p)
 msgid ""
 "You can publish Calendar and Free/Busy information to a WebDAV server, FTP "
 "server, a remote machine through SSH or to any other web server with HTTP "
@@ -521,8 +582,7 @@ msgstr ""
 "serveur WebDAV ou FTP, ou sur une machine distante via SSH ou encore sur un "
 "serveur Web prenant en charge HTTP PUT."
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:94
+#: C/calendar-free-busy.page:43(page/p)
 msgid ""
 "In corporate environments you can publish Calendar and Free/Busy information "
 "to an Exchange or Groupwise server. Note that you must use the top-level "
@@ -535,97 +595,82 @@ msgstr ""
 "voulez que les autres soient capables d'accéder à vos informations Libre/"
 "Occupé lorsqu'ils veulent vous inviter à une réunion."
 
-#. (itstool) path: page/p
-#: C/calendar-free-busy.page:97
+#: C/calendar-free-busy.page:44(page/p)
 msgid ""
 "The default server can be defined under <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui> <gui>Calendar and Tasks</gui> <gui>Publishing "
-"Information</gui> <gui>Default Free/Busy Server</gui></guiseq>."
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
+"Information</gui><gui>Default Free/Busy Server</gui></guiseq>."
 msgstr ""
 "Le serveur par défaut peut être défini sous <guiseq><gui>Édition</"
 "gui><gui>Préférences</gui><gui>Agenda et tâches</gui><gui>Publication "
 "d'informations</gui><gui>Serveur Libre/Occupé par défaut</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/calendar-free-busy.page:108
+#: C/calendar-free-busy.page:48(section/title)
 msgid "Accessing Free/Busy Data Without a Groupware Server"
 msgstr "Accès aux données de disponibilité sans serveur collaboratif"
 
-#. (itstool) path: section/p
-#: C/calendar-free-busy.page:110
+#: C/calendar-free-busy.page:50(section/p)
 msgid ""
 "If individuals give you a URL for Free/Busy data or for their web calendar, "
 "you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web "
 "Addresses</gui></guiseq> in the <link xref=\"contacts-usage-edit-contact"
-"\">Contact Editor</link>. Then, when you schedule a meeting with them,"
-"<app>Evolution</app> looks up the schedule and displays it in the Free/Busy "
-"data."
+"\">Contact Editor</link>. Then, when you schedule a meeting with them, "
+"Evolution looks up the schedule and displays it in the Free/Busy data."
 msgstr ""
 "Si une personne vous donne un URL vers ses données de disponibilité ou vers "
 "son agenda Web, vous pouvez ajouter l'URL sous <guiseq><gui>Informations "
 "personnelles</gui><gui>Sites Web</gui></guiseq> dans <link xref=\"contacts-"
 "usage-edit-contact\">l'éditeur des contacts</link>. Dès lors, lorsque vous "
-"planifiez une réunion avec elle, <app>Evolution</app> consulte son agenda et "
-"l'affiche dans les informations de disponibilité."
+"planifiez une réunion avec elle, Evolution consulte son agenda et l'affiche "
+"dans les informations de disponibilité."
 
-#. (itstool) path: info/desc
-#: C/calendar-google.page:24
+#: C/calendar-google.page:5(info/desc)
 msgid "Using the online calendar of your Google account."
 msgstr "Utiliser l'agenda en ligne de votre compte Google."
 
-#. (itstool) path: page/title
-#: C/calendar-google.page:27
+#: C/calendar-google.page:24(page/title)
 msgid "Using a Google calendar"
 msgstr "Utilisation d'un agenda Google"
 
-#. (itstool) path: item/p
-#: C/calendar-google.page:37 C/contacts-google.page:32
+#: C/calendar-google.page:29(item/p) C/contacts-google.page:26(item/p)
 msgid "Select the type <gui>Google</gui>."
 msgstr "Sélectionnez le type <gui>Google</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-google.page:49 C/contacts-google.page:42
+#: C/calendar-google.page:33(item/p) C/contacts-google.page:29(item/p)
 msgid "Enter your Google username."
 msgstr "Saisissez votre nom d'utilisateur Google."
 
-#. (itstool) path: item/p
-#: C/calendar-google.page:52
+#: C/calendar-google.page:34(item/p)
 msgid "If you have more than one Google calendar, define which of them to use."
 msgstr "Si vous avez plus d'un agenda Google, définissez lequel utiliser."
 
-#. (itstool) path: info/desc
-#: C/calendar-layout-appointment-display.page:23
+#: C/calendar-layout-appointment-display.page:5(info/desc)
 msgid "Define the displaying of appointments in the calendar."
 msgstr "Définir l'affichage des rendez-vous dans l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-layout-appointment-display.page:26
+#: C/calendar-layout-appointment-display.page:23(page/title)
 msgid "Appearance of Appointments"
 msgstr "Apparence des rendez-vous"
 
-#. (itstool) path: page/p
-#: C/calendar-layout-appointment-display.page:33
+#: C/calendar-layout-appointment-display.page:29(page/p)
 msgid ""
 "The following calendar-related options are available under "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui> <gui>Calendar and Tasks</"
+"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
 "gui><gui>Display</gui></guiseq>."
 msgstr ""
 "Les options suivantes en relation avec l'agenda sont disponibles sous "
 "<guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Agenda et tâches</"
 "gui><gui>Affichage</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/calendar-layout-appointment-display.page:38
+#: C/calendar-layout-appointment-display.page:32(section/title)
 msgid "General"
 msgstr "Général"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:42
+#: C/calendar-layout-appointment-display.page:34(item/p)
 msgid "Time Divisions:"
 msgstr "Divisions horaires :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:43
+#: C/calendar-layout-appointment-display.page:35(item/p)
 msgid ""
 "Sets the time increments shown as fine lines on the daily view in the "
 "calendar."
@@ -633,29 +678,25 @@ msgstr ""
 "Définit les incréments horaires signalés par de fines lignes dans la vue "
 "journalière de l'agenda."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:47
+#: C/calendar-layout-appointment-display.page:36(item/p)
 msgid "Show appointment end times in week and month views:"
 msgstr ""
 "Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:48
+#: C/calendar-layout-appointment-display.page:37(item/p)
 msgid ""
-"If there is space, <app>Evolution</app> shows the end times in the week and "
-"month views for each appointment."
+"If there is space, Evolution shows the end times in the week and month views "
+"for each appointment."
 msgstr ""
-"Si l'espace le permet, <app>Evolution</app> affiche l'heure de fin de chaque "
-"rendez-vous dans les vues hebdomadaires et mensuelles."
+"Si l'espace le permet, Evolution affiche l'heure de fin de chaque rendez-"
+"vous dans les vues hebdomadaires et mensuelles."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:52
+#: C/calendar-layout-appointment-display.page:38(item/p)
 msgid "Compress weekends in month view:"
 msgstr "Compresser les week-ends dans la vue mensuelle :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:53
+#: C/calendar-layout-appointment-display.page:39(item/p)
 msgid ""
 "Select this option to display weekends in one box instead of two in the "
 "month view."
@@ -663,216 +704,177 @@ msgstr ""
 "Sélectionnez cette option pour afficher les week-ends dans une seule zone au "
 "lieu de deux dans la vue mensuelle."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:57
+#: C/calendar-layout-appointment-display.page:40(item/p)
 msgid "Show week numbers:"
 msgstr "Afficher les numéros de semaine :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:58
+#: C/calendar-layout-appointment-display.page:41(item/p)
 msgid "Shows the week numbers next to the respective weeks in the calendar."
 msgstr "Affiche le numéro de chaque semaine dans l'agenda."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:62
-msgid "Show recurring events in italic in bottom left calendar."
+#: C/calendar-layout-appointment-display.page:42(item/p)
+msgid "Show recurring events in italic in bottom left calendar"
 msgstr ""
-"Afficher les événements récurrents en italique dans l'agenda en bas à gauche."
+"Afficher les événements récurrents en italique dans l'agenda en bas à gauche"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-appointment-display.page:65
+#: C/calendar-layout-appointment-display.page:43(item/p)
 msgid "Scroll Month View by a week"
 msgstr "Faire défiler la vue mensuelle d'une semaine"
 
-#. (itstool) path: section/title
-#: C/calendar-layout-appointment-display.page:72
-msgid "Alerts"
-msgstr "Alertes"
+#: C/calendar-layout-appointment-display.page:48(section/title)
+msgid "Date/Time Format"
+msgstr "Format de date et d'heure"
 
-#. (itstool) path: section/p
-#: C/calendar-layout-appointment-display.page:74
+#: C/calendar-layout-appointment-display.page:49(section/p)
 msgid ""
-"If you want to be warned before you delete any appointment, select this "
-"option."
+"You can change the format of the <gui>Date</gui> column by setting your "
+"preferred format."
 msgstr ""
-"Si vous voulez qu'Evolution vous envoie une alerte avant de supprimer un "
-"rendez-vous, sélectionnez cette option."
+"Vous pouvez modifier le format de la colonne <gui>Date</gui> en définissant "
+"votre format préféré."
+
+#: C/calendar-layout-appointment-display.page:50(section/p)
+#: C/mail-change-time-format.page:21(page/p)
+msgid ""
+"The placeholders in the format expression are strftime formats. For a "
+"complete list of available strftime formats, run <cmd>date --help</cmd> in "
+"the <app>Terminal</app> application."
+msgstr ""
+"Les substituants dans l'expression de format sont au format strftime. Pour "
+"une liste complète des formats disponibles, saisissez <cmd>date --help</cmd> "
+"dans l'application <app>Terminal</app>."
 
-#. (itstool) path: info/desc
-#: C/calendar-layout-general-formatting.page:27
+#: C/calendar-layout-general-formatting.page:5(info/desc)
 msgid "General formatting options for the calendar."
 msgstr "Options générales de formatage pour l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-layout-general-formatting.page:30
+#: C/calendar-layout-general-formatting.page:25(page/title)
 msgid "General formatting options"
 msgstr "Options générales de formatage"
 
-#. (itstool) path: page/p
-#: C/calendar-layout-general-formatting.page:32
+#: C/calendar-layout-general-formatting.page:27(page/p)
 msgid ""
 "The following options are available under <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui> <gui>Calendar and Tasks</gui><gui>General</gui></"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></"
 "guiseq>."
 msgstr ""
 "Les options suivantes sont disponibles sous <guiseq><gui>Édition</"
 "gui><gui>Préférences</gui><gui>Agenda et tâches</gui><gui>Général</gui></"
 "guiseq>."
 
-#. (itstool) path: section/title
-#: C/calendar-layout-general-formatting.page:37
+#: C/calendar-layout-general-formatting.page:29(section/title)
 msgid "Time"
 msgstr "Heure"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:41
+#: C/calendar-layout-general-formatting.page:31(item/p)
 msgid "Time format:"
 msgstr "Format de date :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:42
+#: C/calendar-layout-general-formatting.page:32(item/p)
 msgid "Choose between twelve-hour (AM/PM) and twenty-four-hour time formats."
 msgstr "Choisissez entre les formats 12 heures (AM/PM) et 24 heures."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:46
+#: C/calendar-layout-general-formatting.page:33(item/p)
 msgid "<link xref=\"calendar-timezones\">Time zone</link> and Second zone:"
 msgstr ""
 "<link xref=\"calendar-timezones\">Fuseau horaire</link> et deuxième fuseau :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:47
+#: C/calendar-layout-general-formatting.page:34(item/p)
 msgid "The city you are located in, and optionally a second city."
 msgstr "La ville dans laquelle vous habitez et en option une deuxième ville."
 
-#. (itstool) path: section/title
-#: C/calendar-layout-general-formatting.page:53
+#: C/calendar-layout-general-formatting.page:39(section/title)
 msgid "Work Week"
 msgstr "Semaine de travail"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:57
+#: C/calendar-layout-general-formatting.page:41(item/p)
 msgid "Week starts on:"
 msgstr "La semaine débute un :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:58
+#: C/calendar-layout-general-formatting.page:42(item/p)
 msgid "Select the day to display as the first in each week."
 msgstr "Sélectionnez le premier jour de chaque semaine à afficher."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:61
+#: C/calendar-layout-general-formatting.page:43(item/p)
 msgid "Work days:"
 msgstr "Jours ouvrés :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:62
+#: C/calendar-layout-general-formatting.page:44(item/p)
 msgid "Define which week days are work days."
 msgstr "Définissez les jours ouvrés de la semaine."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:65
+#: C/calendar-layout-general-formatting.page:45(item/p)
 msgid "Day begins:"
 msgstr "La journée débute à :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:66
+#: C/calendar-layout-general-formatting.page:46(item/p)
 msgid "Define at which time your work day begins."
 msgstr "Définissez à quelle heure commence votre journée de travail."
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:69
+#: C/calendar-layout-general-formatting.page:47(item/p)
 msgid "Day ends:"
 msgstr "La journée se termine à :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-general-formatting.page:70
+#: C/calendar-layout-general-formatting.page:48(item/p)
 msgid "Define at which time your work day ends."
 msgstr "Définissez à quelle heure se termine votre journée de travail."
 
-#. (itstool) path: section/title
-#: C/calendar-layout-general-formatting.page:77
-msgid "Date/Time Format"
-msgstr "Format de date et d'heure"
-
-#. (itstool) path: section/p
-#: C/calendar-layout-general-formatting.page:79
-msgid ""
-"You can change the format of the <gui>Date</gui> column by setting your "
-"preferred format."
-msgstr ""
-"Vous pouvez modifier le format de la colonne <gui>Date</gui> en définissant "
-"votre format préféré."
+#: C/calendar-layout-general-formatting.page:53(section/title)
+msgid "Alerts"
+msgstr "Alertes"
 
-#. (itstool) path: section/p
-#. (itstool) path: page/p
-#: C/calendar-layout-general-formatting.page:82
-#: C/mail-change-time-format.page:21
+#: C/calendar-layout-general-formatting.page:54(section/p)
 msgid ""
-"The placeholders in the format expression are strftime formats. For a "
-"complete list of available strftime formats, run <cmd>date --help</cmd> in "
-"the <app>Terminal</app> application."
+"If you want to be warned before you delete any appointment, select this "
+"option."
 msgstr ""
-"Les substituants dans l'expression de format sont au format strftime. Pour "
-"une liste complète des formats disponibles, saisissez <cmd>date --help</cmd> "
-"dans l'application <app>Terminal</app>."
+"Si vous voulez qu'Evolution vous envoie une alerte avant de supprimer un "
+"rendez-vous, sélectionnez cette option."
 
-#. (itstool) path: info/desc
-#: C/calendar-layout.page:17
+#: C/calendar-layout.page:5(info/desc)
 msgid "Adjusting the display and views of the calendar."
 msgstr "Ajuster l'affichage et les vues de l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-layout.page:20
+#: C/calendar-layout.page:20(page/title)
 msgid "Changing the calendar layout"
 msgstr "Modification de l'agencement de l'agenda"
 
-#. (itstool) path: info/desc
-#: C/calendar-layout-views.page:23
+#: C/calendar-layout-views.page:5(info/desc)
 msgid "Using date ranges (day, week, month) to look at the calendar."
 msgstr ""
 "Utiliser des intervalles de date (jour, semaine, mois) pour afficher "
 "l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-layout-views.page:26
+#: C/calendar-layout-views.page:23(page/title)
 msgid "Available views"
 msgstr "Vues disponibles"
 
-#. (itstool) path: page/p
-#: C/calendar-layout-views.page:28
-msgid "<app>Evolution</app> offers five different views of your calendar data:"
+#: C/calendar-layout-views.page:25(page/p)
+msgid "Evolution offers five different views of your calendar data:"
 msgstr ""
-"<app>Evolution</app> propose cinq vues différentes pour les données de vos "
-"agendas :"
+"Evolution propose cinq vues différentes pour les données de vos agendas :"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-views.page:33
+#: C/calendar-layout-views.page:27(item/p)
 msgid "Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
 msgstr "Jour (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-views.page:36
+#: C/calendar-layout-views.page:28(item/p)
 msgid "Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
 msgstr "Sem. de travail (<keyseq><key>Ctrl</key><key>J</key></keyseq>)"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-views.page:39
+#: C/calendar-layout-views.page:29(item/p)
 msgid "Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
 msgstr "Semaine (<keyseq><key>Ctrl</key><key>K</key></keyseq>)"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-views.page:42
+#: C/calendar-layout-views.page:30(item/p)
 msgid "Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
 msgstr "Mois (<keyseq><key>Ctrl</key><key>M</key></keyseq>)"
 
-#. (itstool) path: item/p
-#: C/calendar-layout-views.page:45
+#: C/calendar-layout-views.page:31(item/p)
 msgid "List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
 msgstr "Liste (<keyseq><key>Ctrl</key><key>L</key></keyseq>)"
 
-#. (itstool) path: page/p
-#: C/calendar-layout-views.page:49
+#: C/calendar-layout-views.page:34(page/p)
 msgid ""
 "You can switch the view by either using the buttons in the toolbar, or by "
 "clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>."
@@ -881,8 +883,7 @@ msgstr ""
 "d'outils ou en cliquant sur <guiseq><gui>Affichage</gui><gui>Vue courante</"
 "gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/calendar-layout-views.page:52
+#: C/calendar-layout-views.page:36(page/p)
 msgid ""
 "You can also select an arbitrary range of days in the small calendar in the "
 "side bar. To do this, select the days that you want to view in your calendar."
@@ -891,8 +892,7 @@ msgstr ""
 "petit calendrier dans la barre latérale. Pour cela, sélectionnez les jours "
 "que vous souhaitez voir apparaître dans l'agenda."
 
-#. (itstool) path: page/p
-#: C/calendar-layout-views.page:56
+#: C/calendar-layout-views.page:38(page/p)
 msgid ""
 "The Previous and Next buttons move you forward and back in your calendar "
 "pages. If you are using a week or month view, you can move by week or month. "
@@ -905,8 +905,7 @@ msgstr ""
 "d'aujourd'hui, cliquez sur le bouton <gui>Aujourd'hui</gui> entre les deux "
 "boutons en forme de flèche dans la barre d'outils."
 
-#. (itstool) path: page/p
-#: C/calendar-layout-views.page:61
+#: C/calendar-layout-views.page:40(page/p)
 msgid ""
 "To visit calendar entries for a specific date, click the <gui>Select a "
 "specific date</gui> button in the toolbar."
@@ -914,55 +913,35 @@ msgstr ""
 "Pour consulter des entrées d'agenda à une date particulière, cliquez sur le "
 "bouton <gui>Aller à</gui> dans la barre d'outils."
 
-#. (itstool) path: info/desc
-#: C/calendar-local.page:17
+#: C/calendar-local.page:5(info/desc)
 msgid "Adding another local calendar."
 msgstr "Ajouter un autre agenda local."
 
-#. (itstool) path: page/title
-#: C/calendar-local.page:20
+#: C/calendar-local.page:20(page/title)
 msgid "Adding another local calendar"
 msgstr "Ajout d'un autre agenda local"
 
-#. (itstool) path: page/p
-#: C/calendar-local.page:22
+#: C/calendar-local.page:22(page/p)
 msgid ""
-"To add another local calendar to <app>Evolution</app>, perform the following "
-"steps:"
+"To add another local calendar to Evolution, perform the following steps:"
 msgstr ""
-"Pour ajouter un autre agenda local dans <app>Evolution</app>, réalisez les "
-"étapes suivantes :"
+"Pour ajouter un autre agenda local dans Evolution, réalisez les étapes "
+"suivantes :"
 
-#. (itstool) path: item/p
-#: C/calendar-local.page:31 C/contacts-local.page:31 C/tasks-local.page:25
+#: C/calendar-local.page:25(item/p) C/contacts-local.page:25(item/p)
+#: C/tasks-local.page:25(item/p)
 msgid "Select the type <gui>On This Computer</gui>."
 msgstr "Sélectionnez le type <gui>Sur cet ordinateur</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-local.page:40
-msgid ""
-"If you choose to use an existing calendar file which is already located on "
-"your computer, you need to provide its location and whether <app>Evolution</"
-"app> should only read from the file or if <app>Evolution</app> can also add "
-"and alter items in that file."
-msgstr ""
-"Si vous choisissez d'utiliser un fichier d'agenda existant déjà présent sur "
-"votre ordinateur, vous devez fournir son emplacement et préciser si "
-"<app>Evolution</app> doit simplement lire le fichier ou si <app>Evolution</"
-"app> peut aussi ajouter ou modifier des éléments de ce fichier."
-
-#. (itstool) path: info/desc
-#: C/calendar-marcus-bains-line.page:17
+#: C/calendar-marcus-bains-line.page:5(info/desc)
 msgid "The red \"Marcus Bains\" line displays the current time."
 msgstr "La ligne de « Marcus Bains » rouge affiche l'heure actuelle."
 
-#. (itstool) path: page/title
-#: C/calendar-marcus-bains-line.page:20
+#: C/calendar-marcus-bains-line.page:19(page/title)
 msgid "Time display in the Day view"
 msgstr "Affichage de l'heure actuelle dans la vue jour"
 
-#. (itstool) path: page/p
-#: C/calendar-marcus-bains-line.page:22
+#: C/calendar-marcus-bains-line.page:21(page/p)
 msgid ""
 "The red Marcus Bains Line in the Day view of the calendar is a marker to "
 "show the current date and time."
@@ -970,18 +949,15 @@ msgstr ""
 "La ligne rouge de « Marcus Bains » est un marqueur qui affiche l'heure et "
 "date actuelle dans la vue jour de l'agenda."
 
-#. (itstool) path: info/desc
-#: C/calendar-meetings-delegating.page:22
+#: C/calendar-meetings-delegating.page:5(info/desc)
 msgid "Ask somebody else to run the meeting."
 msgstr "Demander à quelqu'un d'autre d'organiser la réunion."
 
-#. (itstool) path: page/title
-#: C/calendar-meetings-delegating.page:25
+#: C/calendar-meetings-delegating.page:23(page/title)
 msgid "Delegating Meetings"
 msgstr "Délégation de rendez-vous"
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-delegating.page:27
+#: C/calendar-meetings-delegating.page:24(page/p)
 msgid ""
 "Only attendees of a meeting can delegate a meeting, but not the organizer of "
 "a meeting."
@@ -989,61 +965,54 @@ msgstr ""
 "Seuls les participants à une réunion peuvent déléguer une réunion, mais pas "
 "l'organisateur d'une réunion."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-delegating.page:32
+#: C/calendar-meetings-delegating.page:27(item/p)
 msgid "Right-click on the meeting that you want to delegate."
 msgstr "Faites un clic-droit sur la réunion que vous souhaitez déléguer."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-delegating.page:35
+#: C/calendar-meetings-delegating.page:30(item/p)
 msgid "Click <gui>Delegate Meeting</gui>."
 msgstr "Cliquez sur <gui>Déléguer une réunion</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-delegating.page:38
+#: C/calendar-meetings-delegating.page:33(item/p)
 msgid "Select the contacts you want to delegate the meeting to."
 msgstr "Sélectionnez les contacts auxquels vous souhaitez déléguer la réunion."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-delegating.page:41 C/contacts-usage-add-contact.page:43
-#: C/contacts-usage-edit-contact.page:34
-#: C/contacts-using-contact-lists.page:69 C/mail-attachments-sending.page:32
-#: C/mail-composer-custom-header-lines.page:45
-#: C/mail-encryption-gpg-set-up.page:35
-#: C/mail-encryption-gpg-signing-encrypting.page:40
-#: C/mail-encryption-s-mime-signing-encrypting.page:36 C/mail-filters.page:50
-#: C/mail-filters.page:71 C/mail-search-folders-add.page:46
-#: C/using-categories.page:51 C/using-categories.page:53
+#: C/calendar-meetings-delegating.page:36(item/p)
+#: C/contacts-usage-add-contact.page:27(item/p)
+#: C/contacts-usage-edit-contact.page:27(item/p)
+#: C/contacts-using-contact-lists.page:37(item/p)
+#: C/mail-attachments-sending.page:32(item/p)
+#: C/mail-composer-custom-header-lines.page:45(item/p)
+#: C/mail-encryption-gpg-set-up.page:35(item/p)
+#: C/mail-encryption-gpg-signing-encrypting.page:40(item/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:34(item/p)
+#: C/mail-filters.page:50(item/p) C/mail-filters.page:71(item/p)
+#: C/mail-search-folders-add.page:46(item/p)
+#: C/using-categories.page:51(item/p) C/using-categories.page:53(item/p)
 msgid "Click <gui style=\"button\">OK</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Valider</gui>."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-delegating.page:45
+#: C/calendar-meetings-delegating.page:39(page/p)
 msgid "Each contact receives a copy of the meeting invitation."
 msgstr "Chaque contact reçoit une copie de l'invitation à la réunion."
 
-#. (itstool) path: info/desc
-#: C/calendar-meetings.page:17
+#: C/calendar-meetings.page:5(info/desc)
 msgid "Using meetings in the calendar."
 msgstr "Utiliser les réunions dans l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-meetings.page:20
+#: C/calendar-meetings.page:20(page/title)
 msgid "Meetings"
 msgstr "Réunions"
 
-#. (itstool) path: info/desc
-#: C/calendar-meetings-replying-to-invitation.page:5
+#: C/calendar-meetings-replying-to-invitation.page:5(info/desc)
 msgid "Accepting and replying to a meeting invitation."
 msgstr "Accepter et répondre à une invitation à une réunion."
 
-#. (itstool) path: page/title
-#: C/calendar-meetings-replying-to-invitation.page:23
+#: C/calendar-meetings-replying-to-invitation.page:23(page/title)
 msgid "Replying to a Meeting Request"
 msgstr "Réponse à une invitation à une réunion"
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-replying-to-invitation.page:24
+#: C/calendar-meetings-replying-to-invitation.page:24(page/p)
 msgid ""
 "Meeting requests are sent as attachments and displayed as the body of an "
 "email. All the details about the event are shown, including time and dates."
@@ -1052,8 +1021,7 @@ msgstr ""
 "affichées dans le corps d'un courriel. Tous les détails à propos de "
 "l'événement sont affichés, dont les heures et dates."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-replying-to-invitation.page:25
+#: C/calendar-meetings-replying-to-invitation.page:25(page/p)
 msgid ""
 "You can choose whether and how to reply to the invitation and add a personal "
 "comment to your reply. Available options are to <gui>Decline</gui>, "
@@ -1067,8 +1035,7 @@ msgstr ""
 "<gui>Accepter</gui>. Vous pouvez aussi décider si l'heure de la réunion sera "
 "affichée comme libre dans votre agenda."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-replying-to-invitation.page:27
+#: C/calendar-meetings-replying-to-invitation.page:27(page/p)
 msgid ""
 "If the meeting request already includes a <link xref=\"calendar-alarms-and-"
 "reminders\">reminder</link> you can import the reminder to your calendar by "
@@ -1078,8 +1045,7 @@ msgstr ""
 "and-reminders\">rappel</link>, vous pouvez importer le rappel dans votre "
 "agenda en activant <gui>Rappel hérité</gui>."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-replying-to-invitation.page:29
+#: C/calendar-meetings-replying-to-invitation.page:29(page/p)
 msgid ""
 "If you click <gui>Accept</gui> the event is added automatically to the "
 "calendar that you have chosen."
@@ -1087,8 +1053,7 @@ msgstr ""
 "Si vous cliquez sur <gui>Accepter</gui> l'événement est ajouté "
 "automatiquement à l'agenda que vous avez choisi."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-replying-to-invitation.page:30
+#: C/calendar-meetings-replying-to-invitation.page:30(page/p)
 msgid ""
 "After you have added the meeting to your calendar, you can make changes to "
 "the meeting, but if the original organizer sends out an update, your changes "
@@ -1098,8 +1063,7 @@ msgstr ""
 "informations de la réunion, mais si l'organisateur original envoie une mise "
 "à jour, il se peut que vos modifications soient écrasées."
 
-#. (itstool) path: note/p
-#: C/calendar-meetings-replying-to-invitation.page:32
+#: C/calendar-meetings-replying-to-invitation.page:32(note/p)
 msgid ""
 "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
 "gui><gui>Meeting Invitations</gui><gui>Conflict Search</gui></guiseq> you "
@@ -1110,18 +1074,15 @@ msgstr ""
 "guiseq>, vous pouvez définir les agendas utilisés afin de vous prévenir des "
 "conflits de réunions."
 
-#. (itstool) path: info/desc
-#: C/calendar-meetings-sending-invitation.page:23
+#: C/calendar-meetings-sending-invitation.page:5(info/desc)
 msgid "Sending a Meeting Invitation."
 msgstr "Envoyer une invitation de réunion."
 
-#. (itstool) path: page/title
-#: C/calendar-meetings-sending-invitation.page:26
+#: C/calendar-meetings-sending-invitation.page:23(page/title)
 msgid "Sending a Meeting Invitation"
 msgstr "Envoi d'une invitation de réunion"
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-sending-invitation.page:28
+#: C/calendar-meetings-sending-invitation.page:25(page/p)
 msgid ""
 "When you create a meeting (group appointment), you can specify the attendees "
 "in several categories, such as \"chair\" or \"required\". When you save the "
@@ -1134,8 +1095,7 @@ msgstr ""
 "reçoit un courriel avec les informations de la réunion, leur donnant "
 "également la possibilité de répondre."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-sending-invitation.page:33
+#: C/calendar-meetings-sending-invitation.page:26(page/p)
 msgid ""
 "If you do not need to collect attendance information when you're scheduling "
 "an event, and would rather just announce the event, right-click the meeting "
@@ -1153,13 +1113,11 @@ msgstr ""
 "vous enverra pas automatiquement un courriel pour vous signaler s'ils "
 "participeront ou pas."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-sending-invitation.page:40
+#: C/calendar-meetings-sending-invitation.page:28(page/p)
 msgid "To schedule a meeting:"
 msgstr "Pour planifier une réunion :"
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:48
+#: C/calendar-meetings-sending-invitation.page:32(item/p)
 msgid ""
 "If you have multiple email accounts, select the one to use by selecting an "
 "item in the <gui>Organizer</gui> field."
@@ -1168,14 +1126,12 @@ msgstr ""
 "voulez utiliser en sélectionnant un élément dans le champ <gui>Organisateur</"
 "gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:52
-#: C/calendar-usage-add-appointment.page:36
+#: C/calendar-meetings-sending-invitation.page:33(item/p)
+#: C/calendar-usage-add-appointment.page:25(item/p)
 msgid "Select a calendar in the <gui>Calendar</gui> drop-down list."
 msgstr "Sélectionnez un agenda dans la liste déroulante <gui>Agenda</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:59
+#: C/calendar-meetings-sending-invitation.page:35(item/p)
 msgid ""
 "Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, "
 "<gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields."
@@ -1184,22 +1140,19 @@ msgstr ""
 "masquer les champs <gui>Type</gui>, <gui>Rôle</gui>, <gui>État</gui> et "
 "<gui>RSVP</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:64
-#: C/calendar-usage-add-appointment.page:39 C/memos-usage-add-memo.page:47
+#: C/calendar-meetings-sending-invitation.page:36(item/p)
+#: C/calendar-usage-add-appointment.page:26(item/p)
 msgid "Enter a brief summary in the <gui>Summary</gui> field."
 msgstr "Saisissez un bref résumé dans le champ <gui>Résumé</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:67
-#: C/calendar-usage-add-appointment.page:42
+#: C/calendar-meetings-sending-invitation.page:37(item/p)
+#: C/calendar-usage-add-appointment.page:27(item/p)
 msgid "(Optional) Type a location in the <gui>Location</gui> field."
 msgstr ""
 "(facultatif) Saisissez un emplacement dans le champ <gui>Emplacement</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:70
-#: C/calendar-usage-add-appointment.page:45
+#: C/calendar-meetings-sending-invitation.page:38(item/p)
+#: C/calendar-usage-add-appointment.page:28(item/p)
 msgid ""
 "To select this event as an all day event, click <guiseq><gui>Options</"
 "gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> "
@@ -1209,15 +1162,13 @@ msgstr ""
 "sur <guiseq><gui>Options</gui><gui>Toute la journée</gui></guiseq> ou "
 "cliquez sur le bouton <gui>Toute la journée</gui> dans la barre d'outils."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:75
-#: C/calendar-usage-add-appointment.page:50
+#: C/calendar-meetings-sending-invitation.page:39(item/p)
+#: C/calendar-usage-add-appointment.page:29(item/p)
 msgid "Select the date and time."
 msgstr "Choisissez la date et l'heure."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:78
-#: C/calendar-usage-add-appointment.page:53
+#: C/calendar-meetings-sending-invitation.page:40(item/p)
+#: C/calendar-usage-add-appointment.page:30(item/p)
 msgid ""
 "If the event is not an all day event, select either <gui>For</gui> to "
 "specify the duration, or select <gui>Until</gui> to specify the ending time "
@@ -1227,15 +1178,13 @@ msgstr ""
 "gui> pour spécifier la durée ou <gui>jusqu'au</gui> pour spécifier la date "
 "de fin de l'événement."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:83
-#: C/calendar-usage-add-appointment.page:58
+#: C/calendar-meetings-sending-invitation.page:41(item/p)
+#: C/calendar-usage-add-appointment.page:31(item/p)
 msgid "(Optional) Enter a description in the <gui>Description</gui> field."
 msgstr ""
 "(facultatif) Saisissez une description dans le champ <gui>Description</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:87
+#: C/calendar-meetings-sending-invitation.page:42(item/p)
 msgid ""
 "To query <link xref=\"calendar-free-busy\">free/busy</link> information for "
 "the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or "
@@ -1246,21 +1195,18 @@ msgstr ""
 "gui> dans la barre d'outils ou cliquez sur <guiseq><gui>Options</"
 "gui><gui>Libre/Occupé</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/calendar-meetings-sending-invitation.page:92
+#: C/calendar-meetings-sending-invitation.page:43(item/p)
 msgid "Click <gui>Save</gui> to save the meeting."
 msgstr "Cliquez sur <gui>Enregistrer</gui> pour enregistrer la réunion."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-sending-invitation.page:96
+#: C/calendar-meetings-sending-invitation.page:46(page/p)
 msgid ""
 "An email is sent out to all the recipients, inviting them to your event."
 msgstr ""
 "Un courriel est envoyé à tous les participants, les invitant à l'événement."
 
-#. (itstool) path: page/p
-#: C/calendar-meetings-sending-invitation.page:99
-#: C/calendar-usage-add-appointment.page:67
+#: C/calendar-meetings-sending-invitation.page:48(page/p)
+#: C/calendar-usage-add-appointment.page:34(page/p)
 msgid ""
 "You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
 "<link xref=\"using-categories\">category</link>, a <link xref=\"calendar-"
@@ -1275,54 +1221,47 @@ msgstr ""
 "classifications\">classification</link> pour l'événement ou ajouter une "
 "pièce-jointe."
 
-#. (itstool) path: note/p
-#: C/calendar-meetings-sending-invitation.page:107
-msgid ""
-"In <app>Evolution</app>, a meeting can have only one organizer, and only the "
-"organizer can add participants to that meeting. Though it is possible to "
-"change the organizer of a meeting, this is not recommended as a means to "
-"invite additional participants to meetings. If you want to invite additional "
-"people to a meeting and are not that meeting's organizer, it is recommended "
-"that you forward the invitation message you received from the original "
-"meeting organiser to additional participants."
-msgstr ""
-"Dans <app>Evolution</app>, une réunion ne peut avoir qu'un seul "
-"organisateur, et c'est lui seul qui peut ajouter des participants à la "
-"réunion. Bien qu'il soit possible de changer l'organisateur d'une réunion, "
-"ce n'est pas la manière recommandée d'inviter des participants "
-"supplémentaires aux réunions. Si vous souhaitez inviter des personnes "
-"supplémentaires à une réunion et que vous n'en êtes pas l'organisateur, la "
-"meilleure solution est de faire suivre le message d'invitation originel de "
-"l'organisateur à ces personnes."
-
-#. (itstool) path: info/desc
-#: C/calendar-organizing.page:18
+#: C/calendar-meetings-sending-invitation.page:50(note/p)
+msgid ""
+"In Evolution, a meeting can have only one organizer, and only the organizer "
+"can add participants to that meeting. Though it is possible to change the "
+"organizer of a meeting, this is not recommended as a means to invite "
+"additional participants to meetings. If you want to invite additional people "
+"to a meeting and are not that meeting's organizer, it is recommended that "
+"you forward the invitation message you received from the original meeting "
+"organiser to additional participants."
+msgstr ""
+"Dans Evolution, une réunion ne peut avoir qu'un seul organisateur, et c'est "
+"lui seul qui peut ajouter des participants à la réunion. Bien qu'il soit "
+"possible de changer l'organisateur d'une réunion, ce n'est pas la manière "
+"recommandée d'inviter des participants supplémentaires aux réunions. Si vous "
+"souhaitez inviter des personnes supplémentaires à une réunion et que vous "
+"n'en êtes pas l'organisateur, la meilleure solution est de faire suivre le "
+"message d'invitation originel de l'organisateur à ces personnes."
+
+#: C/calendar-organizing.page:5(info/desc)
 msgid "On using several calendars, searching, and categories."
 msgstr ""
 "À propos de l'utilisation de plusieurs agendas, recherches et catégories."
 
-#. (itstool) path: page/title
-#: C/calendar-organizing.page:21
+#: C/calendar-organizing.page:21(page/title)
 msgid "Sorting and organizing calendars"
 msgstr "Tri et organisation des agendas"
 
-#. (itstool) path: info/desc
-#: C/calendar-publishing.page:25
+#: C/calendar-publishing.page:5(info/desc)
 msgid "Post your calendar content in public."
 msgstr "Rendre public le contenu de votre agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-publishing.page:28
+#: C/calendar-publishing.page:23(page/title)
 msgid "Calendar Publishing"
 msgstr "Publication d'agenda"
 
-#. (itstool) path: page/p
-#: C/calendar-publishing.page:30
+#: C/calendar-publishing.page:24(page/p)
 msgid ""
 "In order to make one of your calendars available to the public, you can "
 "define calendars to be uploaded to a web server under <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui> <gui>Calendar and Tasks</gui> <gui>Publishing "
-"Information</gui> <gui>Locations</gui><gui style=\"button\">Add</gui></"
+"gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing "
+"Information</gui><gui>Locations</gui><gui style=\"button\">Add</gui></"
 "guiseq>."
 msgstr ""
 "Afin de rendre public l'un de vos agendas, vous pouvez définir des agendas à "
@@ -1331,8 +1270,7 @@ msgstr ""
 "d'informations</gui><gui>Emplacements</gui><gui style=\"button\">Ajouter</"
 "gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/calendar-publishing.page:40
+#: C/calendar-publishing.page:27(page/p)
 msgid ""
 "You can specify the online location, the frequency of publishing, which "
 "calendar(s) to publish, and authentication information for uploading."
@@ -1341,8 +1279,7 @@ msgstr ""
 "publication, quel(s) agenda(s) publier et les informations "
 "d'authentification pour le téléversement."
 
-#. (itstool) path: page/p
-#: C/calendar-publishing.page:47
+#: C/calendar-publishing.page:31(page/p)
 msgid ""
 "To immediately publish calendar information, click <guiseq><gui>Actions</"
 "gui><gui>Publish Calendar Information</gui></guiseq> in the calendar."
@@ -1351,18 +1288,15 @@ msgstr ""
 "<guiseq><gui>Actions</gui><gui>Publier les informations des agendas</gui></"
 "guiseq> dans la vue agenda."
 
-#. (itstool) path: info/desc
-#: C/calendar-recurrence.page:23
+#: C/calendar-recurrence.page:5(info/desc)
 msgid "Repeating appointments."
 msgstr "Répéter des rendez-vous."
 
-#. (itstool) path: page/title
-#: C/calendar-recurrence.page:26
+#: C/calendar-recurrence.page:23(page/title)
 msgid "Using Recurrence"
 msgstr "Utilisation de la récurrence"
 
-#. (itstool) path: page/p
-#: C/calendar-recurrence.page:28
+#: C/calendar-recurrence.page:25(page/p)
 msgid ""
 "If you have an appointment that takes place regularly, you can define its "
 "recurrence by clicking the <gui>Recurrence</gui> button in the "
@@ -1384,25 +1318,56 @@ msgstr ""
 "lundi et le vendredi jusqu'au 3 janvier 2015 » ou « Tous les mois, le "
 "premier vendredi pour 12 occurrences »."
 
-#. (itstool) path: info/desc
-#: C/calendar-searching.page:27
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/calendar-searching.page:34(media) C/contacts-searching.page:42(media)
+#: C/mail-searching.page:42(media) C/memos-searching.page:43(media)
+#: C/tasks-searching.page:43(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/search-icon.png' md5='cd4b82c84c628bfbbfa39d1e0d1eae89'"
+msgstr ""
+"external ref='figures/search-icon.png' md5='cd4b82c84c628bfbbfa39d1e0d1eae89'"
+
+#: C/calendar-searching.page:5(info/desc)
 msgid "Searching appointments and meetings."
 msgstr "Rechercher des rendez-vous et des réunions."
 
-#. (itstool) path: page/title
-#: C/calendar-searching.page:30
+#: C/calendar-searching.page:28(page/title)
 msgid "Searching for Calendar Items"
 msgstr "Recherche d'éléments d'agenda"
 
-#. (itstool) path: section/title
-#: C/calendar-searching.page:33 C/contacts-searching.page:43
-#: C/mail-searching.page:39 C/memos-searching.page:39
-#: C/tasks-searching.page:39
+#: C/calendar-searching.page:30(section/title)
+#: C/contacts-searching.page:38(section/title)
+#: C/mail-searching.page:39(section/title)
+#: C/memos-searching.page:39(section/title)
+#: C/tasks-searching.page:39(section/title)
 msgid "Quick Search"
 msgstr "Recherche rapide"
 
-#. (itstool) path: section/p
-#: C/calendar-searching.page:35
+#: C/calendar-searching.page:31(section/p)
 msgid ""
 "In the Calendar view, you can quickly search for appointments and meetings "
 "either by summary or by category."
@@ -1410,60 +1375,57 @@ msgstr ""
 "Dans la vue agenda, vous pouvez rechercher rapidement des rendez-vous et des "
 "réunions par résumé ou par catégorie."
 
-#. (itstool) path: section/p
-#: C/calendar-searching.page:38 C/memos-searching.page:41
-#: C/tasks-searching.page:41
+#: C/calendar-searching.page:32(section/p)
+#: C/memos-searching.page:41(section/p) C/tasks-searching.page:41(section/p)
 msgid "Searching by summary:"
 msgstr "Recherche par résumé :"
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:42 C/contacts-searching.page:50
-#: C/memos-searching.page:43 C/tasks-searching.page:43
-msgid "Click the search icon <_:media-1/> to expand the drop-down list."
+#: C/calendar-searching.page:34(item/p) C/contacts-searching.page:42(item/p)
+#: C/memos-searching.page:43(item/p) C/tasks-searching.page:43(item/p)
+msgid ""
+"Click the search icon <media type=\"image\" mime=\"image/png\" src=\"figures/"
+"search-icon.png\"/> to expand the drop-down list."
 msgstr ""
-"Cliquez sur l'icône de recherche <_:media-1/> pour ouvrir la liste "
-"déroulante."
+"Cliquez sur l'icône de recherche <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/search-icon.png\"/> pour ouvrir la liste déroulante."
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:47 C/contacts-searching.page:55
-#: C/mail-searching.page:43 C/memos-searching.page:44
-#: C/tasks-searching.page:44
+#: C/calendar-searching.page:35(item/p) C/contacts-searching.page:43(item/p)
+#: C/mail-searching.page:43(item/p) C/memos-searching.page:44(item/p)
+#: C/tasks-searching.page:44(item/p)
 msgid "Select the search condition from the list."
 msgstr "Sélectionnez le critère de recherche dans la liste."
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:50 C/contacts-searching.page:58
-#: C/mail-searching.page:49 C/memos-searching.page:45
-#: C/tasks-searching.page:45
+#: C/calendar-searching.page:36(item/p) C/contacts-searching.page:44(item/p)
+#: C/mail-searching.page:47(item/p) C/memos-searching.page:45(item/p)
+#: C/tasks-searching.page:45(item/p)
 msgid "Enter the text you want to search for and press <key>Enter</key>."
 msgstr "Saisissez le texte à rechercher et appuyez sur <key>Entrée</key>."
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:53 C/calendar-searching.page:67
-#: C/contacts-searching.page:62 C/contacts-searching.page:76
-msgid "<app>Evolution</app> displays the search results."
-msgstr "<app>Evolution</app> affiche les résultats de la recherche."
+#: C/calendar-searching.page:37(item/p) C/calendar-searching.page:43(item/p)
+#: C/contacts-searching.page:45(item/p) C/contacts-searching.page:51(item/p)
+#: C/mail-searching.page:48(item/p) C/memos-searching.page:46(item/p)
+#: C/memos-searching.page:52(item/p) C/tasks-searching.page:46(item/p)
+#: C/tasks-searching.page:52(item/p)
+msgid "Evolution displays the search results."
+msgstr "Evolution affiche les résultats de la recherche."
 
-#. (itstool) path: section/p
-#: C/calendar-searching.page:57 C/contacts-searching.page:66
-#: C/memos-searching.page:48 C/tasks-searching.page:48
+#: C/calendar-searching.page:39(section/p)
+#: C/contacts-searching.page:47(section/p)
+#: C/memos-searching.page:48(section/p) C/tasks-searching.page:48(section/p)
 msgid "Searching by category:"
 msgstr "Recherche par catégorie :"
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:61 C/contacts-searching.page:70
-#: C/memos-searching.page:50 C/tasks-searching.page:50
+#: C/calendar-searching.page:41(item/p) C/contacts-searching.page:49(item/p)
+#: C/memos-searching.page:50(item/p) C/tasks-searching.page:50(item/p)
 msgid "Click the <gui>Show</gui> drop-down list."
 msgstr "Cliquez sur la liste déroulante <gui>Afficher</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-searching.page:64 C/contacts-searching.page:73
-#: C/memos-searching.page:51 C/tasks-searching.page:51
+#: C/calendar-searching.page:42(item/p) C/contacts-searching.page:50(item/p)
+#: C/memos-searching.page:51(item/p) C/tasks-searching.page:51(item/p)
 msgid "Select the category from the list."
 msgstr "Sélectionnez la catégorie dans la liste."
 
-#. (itstool) path: section/p
-#: C/calendar-searching.page:71
+#: C/calendar-searching.page:46(section/p)
 msgid ""
 "To go through the results you can use the two arrow buttons next to the "
 "search field. This searches in currently enabled calendars. It searches from "
@@ -1475,10 +1437,9 @@ msgstr ""
 "actuellement activés, depuis le jour sélectionné dans le sens donné, dans un "
 "intervalle de 10 ans par défaut. "
 
-#. (itstool) path: section/p
-#: C/calendar-searching.page:76 C/contacts-searching.page:80
-#: C/mail-searching.page:54 C/memos-searching.page:54
-#: C/tasks-searching.page:54
+#: C/calendar-searching.page:48(section/p)
+#: C/contacts-searching.page:53(section/p) C/mail-searching.page:52(section/p)
+#: C/memos-searching.page:54(section/p) C/tasks-searching.page:54(section/p)
 msgid ""
 "If you want to set several search conditions, you should use an Advanced "
 "search, which is described below."
@@ -1486,59 +1447,50 @@ msgstr ""
 "Si vous voulez définir plusieurs critères de recherche, vous devriez faire "
 "une Recherche avancée, telle que décrite ci-dessous."
 
-#. (itstool) path: info/desc
-#: C/calendar-sharing-information.page:17
+#: C/calendar-sharing-information.page:5(info/desc)
 msgid ""
 "Make your information (appointments and free/busy times) available to others."
 msgstr ""
 "Rendre vos informations (rendez-vous ou périodes occupées/libre) disponibles "
 "aux autres."
 
-#. (itstool) path: page/title
-#: C/calendar-sharing-information.page:21
+#: C/calendar-sharing-information.page:20(page/title)
 msgid "Sharing your calendar information"
 msgstr "Partager les informations de votre agenda"
 
-#. (itstool) path: info/desc
-#: C/calendar-timezones.page:22
+#: C/calendar-timezones.page:5(info/desc)
 msgid "Using time zones in the calendar."
 msgstr "Utiliser les fuseaux horaires dans l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-timezones.page:25
+#: C/calendar-timezones.page:23(page/title)
 msgid "Using time zones"
 msgstr "Utilisation des fuseaux horaires"
 
-#. (itstool) path: page/p
-#: C/calendar-timezones.page:27
-msgid "<app>Evolution</app> supports using multiple time zones."
-msgstr "<app>Evolution</app> sait gérer plusieurs fuseaux horaires."
+#: C/calendar-timezones.page:25(page/p)
+msgid "Evolution supports using multiple time zones."
+msgstr "Evolution sait gérer plusieurs fuseaux horaires."
 
-#. (itstool) path: section/title
-#: C/calendar-timezones.page:30
+#: C/calendar-timezones.page:28(section/title)
 msgid "Setting your global timezone(s)"
 msgstr "Paramétrage de vos fuseaux horaires globaux"
 
-#. (itstool) path: section/p
-#: C/calendar-timezones.page:32
+#: C/calendar-timezones.page:30(section/p)
 msgid ""
-"By default <app>Evolution</app> uses the system-wide time zone. This can be "
-"changed under <guiseq><gui>Edit</gui><gui>Preferences</gui> <gui>Calendar "
-"and Tasks</gui><gui>General</gui><gui>Time</gui> <gui>Time zone</gui></"
-"guiseq>."
+"By default Evolution uses the system-wide time zone. This can be changed "
+"under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</"
+"gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>."
 msgstr ""
-"Par défaut, <app>Evolution</app> utilise le fuseau horaire global du "
-"système. Cela peut être modifié sous <guiseq><gui>Édition</"
-"gui><gui>Préférences</gui><gui>Agenda et tâches</gui><gui>Général</"
-"gui><gui>Heure</gui><gui>Fuseau horaire</gui></guiseq>."
+"Par défaut, Evolution utilise le fuseau horaire global du système. Cela peut "
+"être modifié sous <guiseq><gui>Édition</gui><gui>Préférences</"
+"gui><gui>Agenda et tâches</gui><gui>Général</gui><gui>Heure</gui><gui>Fuseau "
+"horaire</gui></guiseq>."
 
-#. (itstool) path: section/p
-#: C/calendar-timezones.page:37
+#: C/calendar-timezones.page:32(section/p)
 msgid ""
 "If you deal a lot with people in another specific time zone you can display "
 "that second time zone in the day view of the calendar. You can set a second "
-"time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui> <gui>Calendar "
-"and Tasks</gui><gui>General</gui><gui>Time</gui> <gui>Second zone</gui></"
+"time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar "
+"and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></"
 "guiseq>."
 msgstr ""
 "Si vous traitez avec beaucoup de personnes sous un autre fuseau horaire "
@@ -1547,13 +1499,11 @@ msgstr ""
 "<guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Agenda et tâches</"
 "gui><gui>Général</gui><gui>Heure</gui><gui>Deuxième fuseau</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/calendar-timezones.page:46
+#: C/calendar-timezones.page:36(section/title)
 msgid "Setting a timezone for an appointment"
 msgstr "Paramétrage d'un fuseau horaire pour un rendez-vous"
 
-#. (itstool) path: section/p
-#: C/calendar-timezones.page:48
+#: C/calendar-timezones.page:38(section/p)
 msgid ""
 "You can also configure time zone information specific to each appointment. "
 "To do that, <link xref=\"calendar-usage\">add a new or edit an existing "
@@ -1572,18 +1522,15 @@ msgstr ""
 "coordonner vos agendas. La définition de fuseaux horaires spécifiques par "
 "rendez-vous aide à éviter les confusions possibles."
 
-#. (itstool) path: info/desc
-#: C/calendar-usage-add-appointment.page:17
+#: C/calendar-usage-add-appointment.page:5(info/desc)
 msgid "Adding an appointment."
 msgstr "Ajouter un rendez-vous."
 
-#. (itstool) path: page/title
-#: C/calendar-usage-add-appointment.page:20
+#: C/calendar-usage-add-appointment.page:20(page/title)
 msgid "Adding an Appointment"
 msgstr "Ajout d'un rendez-vous"
 
-#. (itstool) path: item/p
-#: C/calendar-usage-add-appointment.page:24
+#: C/calendar-usage-add-appointment.page:23(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, "
 "or double-click in a blank space in the calendar to open the Appointment "
@@ -1599,33 +1546,28 @@ msgstr ""
 "rendez-vous. Vous pouvez aussi écrire directement dans l'agenda puis ajuster "
 "la durée en le déplaçant avec la souris."
 
-#. (itstool) path: item/p
-#: C/calendar-usage-add-appointment.page:33
+#: C/calendar-usage-add-appointment.page:24(item/p)
 msgid "If you use the Appointment dialog:"
 msgstr "Si vous utilisez la boîte de dialogue Rendez-vous :"
 
-#. (itstool) path: item/p
-#: C/calendar-usage-add-appointment.page:61
+#: C/calendar-usage-add-appointment.page:32(item/p)
 msgid ""
 "To show the time as <link xref=\"calendar-free-busy\">busy</link> to others, "
-"click <guiseq><gui>Options</gui> <gui>Show Time as Busy</gui></guiseq>."
+"click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>."
 msgstr ""
 "Pour afficher la période comme <link xref=\"calendar-free-busy\">occupée</"
 "link> pour les autres, cliquez sur <guiseq><gui>Options</gui><gui>Afficher "
 "la période comme occupée</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/calendar-usage-delete-appointment.page:17
+#: C/calendar-usage-delete-appointment.page:5(info/desc)
 msgid "Deleting an appointment in your calendar."
 msgstr "Supprimer un rendez-vous dans votre agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-usage-delete-appointment.page:20
+#: C/calendar-usage-delete-appointment.page:20(page/title)
 msgid "Deleting an Appointment"
 msgstr "Suppression d'un rendez-vous"
 
-#. (itstool) path: page/p
-#: C/calendar-usage-delete-appointment.page:22
+#: C/calendar-usage-delete-appointment.page:22(page/p)
 msgid ""
 "If you want to delete an appointment in your calendars, right-click on the "
 "appointment in the calendar and select <gui>Delete Appointment</gui>, or "
@@ -1642,30 +1584,25 @@ msgstr ""
 "views\">vue en liste</link>, vous pouvez également utiliser "
 "<guiseq><gui>Édition</gui><gui>Supprimer le rendez-vous</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/calendar-usage-edit-appointment.page:17
+#: C/calendar-usage-edit-appointment.page:5(info/desc)
 msgid "Editing in appointment in your calendar."
 msgstr "Modifier un rendez-vous dans votre agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-usage-edit-appointment.page:20
+#: C/calendar-usage-edit-appointment.page:20(page/title)
 msgid "Editing an Appointment"
 msgstr "Modification d'un rendez-vous"
 
-#. (itstool) path: page/p
-#: C/calendar-usage-edit-appointment.page:22
+#: C/calendar-usage-edit-appointment.page:22(page/p)
 msgid ""
-"If you want to change an appointment that already exists in your calendars:"
+"If you want to change an appointment that already exists in your calendars,"
 msgstr ""
-"Si vous souhaitez modifier un rendez-vous qui existe déjà dans vos agendas :"
+"Si vous souhaitez modifier un rendez-vous qui existe déjà dans vos agendas,"
 
-#. (itstool) path: item/p
-#: C/calendar-usage-edit-appointment.page:27
+#: C/calendar-usage-edit-appointment.page:25(item/p)
 msgid "Double-click on the appointment that you want to edit in the calendar."
 msgstr "faites un double-clic sur le rendez-vous que vous souhaitez modifier,"
 
-#. (itstool) path: item/p
-#: C/calendar-usage-edit-appointment.page:31
+#: C/calendar-usage-edit-appointment.page:26(item/p)
 msgid ""
 "Edit the appointment (see <link xref=\"calendar-usage-add-appointment"
 "\">Adding an Appointment</link> for the list of available options)."
@@ -1674,39 +1611,36 @@ msgstr ""
 "appointment\">Ajout d'un rendez-vous</link> pour la liste des options "
 "disponibles),"
 
-#. (itstool) path: item/p
-#: C/calendar-usage-edit-appointment.page:36 C/memos-usage-add-memo.page:29
-#: C/memos-usage-add-memo.page:49 C/memos-usage-edit-memo.page:27
-#: C/tasks-usage-add-task.page:29 C/tasks-usage-edit-task.page:27
+#: C/calendar-usage-edit-appointment.page:27(item/p)
+#: C/memos-usage-add-memo.page:29(item/p)
+#: C/memos-usage-add-memo.page:49(item/p)
+#: C/memos-usage-edit-memo.page:27(item/p)
+#: C/tasks-usage-add-task.page:29(item/p)
+#: C/tasks-usage-edit-task.page:27(item/p)
 msgid ""
 "Click the <gui style=\"button\">Save</gui> button, or <guiseq><gui>File</"
 "gui><gui>Save</gui></guiseq>."
 msgstr ""
-"Cliquez sur le bouton <gui style=\"button\">Enregistrer</gui> ou utilisez le "
+"cliquez sur le bouton <gui style=\"button\">Enregistrer</gui> ou utilisez le "
 "menu <guiseq><gui>Fichier</gui><gui>Enregistrer</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/calendar-usage.page:18
+#: C/calendar-usage.page:5(info/desc)
 msgid "On adding, editing, and deleting appointments."
 msgstr "À propos de l'ajout, de l'édition et de la suppression de rendez-vous."
 
-#. (itstool) path: page/title
-#: C/calendar-usage.page:21
+#: C/calendar-usage.page:21(page/title)
 msgid "Add, Edit, and Delete Appointments"
 msgstr "Ajout, modification et suppression de rendez-vous"
 
-#. (itstool) path: info/desc
-#: C/calendar-using-several-calendars.page:25
+#: C/calendar-using-several-calendars.page:5(info/desc)
 msgid "Adding and using more than one calendar and different types."
 msgstr "Ajouter et utiliser plus d'un agenda de types différents."
 
-#. (itstool) path: page/title
-#: C/calendar-using-several-calendars.page:28
+#: C/calendar-using-several-calendars.page:23(page/title)
 msgid "Using several calendars"
 msgstr "Utilisation de plusieurs agendas"
 
-#. (itstool) path: page/p
-#: C/calendar-using-several-calendars.page:30
+#: C/calendar-using-several-calendars.page:25(page/p)
 msgid ""
 "You can have multiple calendars and overlay them one over the other. For "
 "example, you might have a schedule of events for work, one for home, and one "
@@ -1725,14 +1659,12 @@ msgstr ""
 "certain d'éviter des conflits tout en conservant un encombrement minimal à "
 "l'affichage."
 
-#. (itstool) path: page/p
-#: C/calendar-using-several-calendars.page:38
+#: C/calendar-using-several-calendars.page:27(page/p)
 msgid "Appointments for each calendar appear in different color."
 msgstr ""
 "Les rendez-vous de chaque agenda apparaissent dans des couleurs différentes."
 
-#. (itstool) path: page/p
-#: C/calendar-using-several-calendars.page:40
+#: C/calendar-using-several-calendars.page:29(page/p)
 msgid ""
 "You can also use calendars that are not on your computer, such as on the "
 "internet or in a local network."
@@ -1740,8 +1672,7 @@ msgstr ""
 "Vous pouvez aussi utiliser des agendas qui ne sont pas sur votre ordinateur "
 "et se trouvent sur internet ou dans un réseau local."
 
-#. (itstool) path: page/p
-#: C/calendar-using-several-calendars.page:43
+#: C/calendar-using-several-calendars.page:31(page/p)
 msgid ""
 "For example, the <link href=\"http://icalshare.com\";>icalshare.com website</"
 "link> has an extensive list of shared online calendars, including national "
@@ -1753,72 +1684,60 @@ msgstr ""
 "congés nationaux et religieux, des phases lunaires, des événements sportifs "
 "et des événements locaux et régionaux."
 
-#. (itstool) path: info/desc
-#: C/calendar-weather.page:17
+#: C/calendar-weather.page:5(info/desc)
 msgid "Display the weather in the calendar."
 msgstr "Afficher la météo dans l'agenda."
 
-#. (itstool) path: page/title
-#: C/calendar-weather.page:20
+#: C/calendar-weather.page:20(page/title)
 msgid "Using a weather calendar"
 msgstr "Utilisation d'un agenda météorologique"
 
-#. (itstool) path: page/p
-#: C/calendar-weather.page:22 C/calendar-webdav.page:21
+#: C/calendar-weather.page:22(page/p) C/calendar-webdav.page:22(page/p)
 msgid "Calendars of this type are read-only."
 msgstr "Les agendas de ce type sont en lecture seule."
 
-#. (itstool) path: item/p
-#: C/calendar-weather.page:33
+#: C/calendar-weather.page:27(item/p)
 msgid "Select the type <gui>Weather</gui>."
 msgstr "Sélectionnez le type <gui>Météo</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-weather.page:46
+#: C/calendar-weather.page:31(item/p)
 msgid "Choose a location by selecting continent, country and city."
 msgstr ""
 "Choisissez un emplacement en sélectionnant un continent, un pays et une "
 "ville."
 
-#. (itstool) path: item/p
-#: C/calendar-weather.page:53
+#: C/calendar-weather.page:33(item/p)
 msgid "Choose the temperature unit."
 msgstr "Choisissez l'unité de la température."
 
-#. (itstool) path: info/desc
-#: C/calendar-webdav.page:16
+#: C/calendar-webdav.page:5(info/desc)
 msgid "Using an online Webcal/WebDAV calendar."
 msgstr "Utiliser un agenda Webcal/WebDAV en ligne."
 
-#. (itstool) path: page/title
-#: C/calendar-webdav.page:19
+#: C/calendar-webdav.page:20(page/title)
 msgid "Using a WebDAV calendar"
 msgstr "Utilisation d'un agenda Webcal/WebDAV"
 
-#. (itstool) path: item/p
-#: C/calendar-webdav.page:32 C/tasks-caldav.page:25 C/tasks-webdav.page:27
+#: C/calendar-webdav.page:27(item/p) C/tasks-caldav.page:25(item/p)
+#: C/tasks-webdav.page:27(item/p)
 msgid "Select the type <gui>On the Web</gui>."
 msgstr "Choisissez le type <gui>Sur le Web</gui>."
 
-#. (itstool) path: item/p
-#: C/calendar-webdav.page:52 C/mail-sending-options-smtp.page:35
-#: C/tasks-webdav.page:33
+#: C/calendar-webdav.page:33(item/p)
+#: C/mail-sending-options-smtp.page:35(item/p) C/tasks-webdav.page:33(item/p)
 msgid "Enter your username."
 msgstr "Saisissez votre nom d'utilisateur."
 
-#. (itstool) path: info/desc
-#: C/change-switcher-appearance.page:20
+#: C/change-switcher-appearance.page:5(info/desc)
 msgid "Changing the display of the window buttons in the lower left corner."
 msgstr ""
 "Modifier l'affichage des boutons dans le coin inférieur gauche de la fenêtre."
 
-#. (itstool) path: page/title
-#: C/change-switcher-appearance.page:24
+#: C/change-switcher-appearance.page:19(page/title)
 msgid "Changing the Switcher appearance"
 msgstr "Modification de l'apparence du sélecteur"
 
-#. (itstool) path: page/p
-#: C/change-switcher-appearance.page:26
+#: C/change-switcher-appearance.page:21(page/p)
 msgid ""
 "The display of the window buttons in the lower left corner (Mail, Contacts, "
 "Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</"
@@ -1831,57 +1750,48 @@ msgstr ""
 "peut être utile si vous avez un petit écran. Vous pouvez aussi les masquer "
 "complètement."
 
-#. (itstool) path: page/p
-#: C/change-switcher-appearance.page:31
+#: C/change-switcher-appearance.page:22(page/p)
 msgid "The available options are:"
 msgstr "Voici les options disponibles :"
 
-#. (itstool) path: item/p
-#: C/change-switcher-appearance.page:35
+#: C/change-switcher-appearance.page:24(item/p)
 msgid "Icons and Text"
 msgstr "Icônes et texte"
 
-#. (itstool) path: item/p
-#: C/change-switcher-appearance.page:38
+#: C/change-switcher-appearance.page:27(item/p)
 msgid "Icons Only"
 msgstr "Icônes uniquement"
 
-#. (itstool) path: item/p
-#: C/change-switcher-appearance.page:41
+#: C/change-switcher-appearance.page:30(item/p)
 msgid "Text Only"
 msgstr "Texte uniquement"
 
-#. (itstool) path: item/p
-#: C/change-switcher-appearance.page:44
+#: C/change-switcher-appearance.page:33(item/p)
 msgid "Toolbar Style"
 msgstr "Style de la barre d'outils"
 
-#. (itstool) path: item/p
-#: C/change-switcher-appearance.page:47
+#: C/change-switcher-appearance.page:36(item/p)
 msgid "Show Buttons"
 msgstr "Afficher les boutons"
 
-#. (itstool) path: info/desc
-#: C/contacts-add-automatically.page:21
+#: C/contacts-add-automatically.page:5(info/desc)
 msgid ""
 "Automatically add senders of mail that you have received to your contacts."
 msgstr ""
 "Ajouter automatiquement les expéditeurs des courriels que vous avez reçus à "
 "vos contacts."
 
-#. (itstool) path: page/title
-#: C/contacts-add-automatically.page:25
+#: C/contacts-add-automatically.page:24(page/title)
 msgid "Adding people automatically to my contacts"
 msgstr "Ajout automatique de personnes à mes contacts"
 
-#. (itstool) path: page/p
-#: C/contacts-add-automatically.page:27
+#: C/contacts-add-automatically.page:27(page/p)
 msgid ""
 "You can add people automatically to your contacts when you reply to received "
 "email. Enable the plugin <gui>Automatic Contacts</gui> by going to "
 "<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on <gui>Automatic "
 "Contacts</gui> so that it shows a check mark. Then go to <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui><gui>Contacts</gui> <gui>Automatic Contacts</gui></"
+"gui><gui>Preferences</gui><gui>Contacts</gui><gui>Automatic Contacts</gui></"
 "guiseq> and enable the <gui>Create address book entries when sending emails</"
 "gui> option and select an address book in the drop-down field below that "
 "will receive the new contacts."
@@ -1896,8 +1806,7 @@ msgstr ""
 "sélectionnez le carnet d'adresses, dans la liste déroulante en dessous, dans "
 "lequel les nouveaux contacts seront ajoutés."
 
-#. (itstool) path: page/p
-#: C/contacts-add-automatically.page:37
+#: C/contacts-add-automatically.page:28(page/p)
 msgid ""
 "From now on, contacts will be automatically created for senders of received "
 "mail when you reply to that mail."
@@ -1905,45 +1814,39 @@ msgstr ""
 "À partir de maintenant, des contacts seront automatiquement créés pour les "
 "expéditeurs de courriel reçu lorsque vous répondez au courriel."
 
-#. (itstool) path: info/desc
-#: C/contacts-autocompletion.page:27
+#: C/contacts-autocompletion.page:5(info/desc)
 msgid ""
 "Autocompletion of names and email addresses entered in the mail composer."
 msgstr ""
 "Complétion automatique des noms et adresses électroniques saisis dans "
 "l'éditeur de courriels."
 
-#. (itstool) path: page/title
-#: C/contacts-autocompletion.page:30
+#: C/contacts-autocompletion.page:27(page/title)
 msgid "Autocompletion of mail recipients"
 msgstr "Complétion automatique des destinataires de courriel"
 
-#. (itstool) path: page/p
-#: C/contacts-autocompletion.page:32
+#: C/contacts-autocompletion.page:29(page/p)
 msgid ""
 "You can enter the first three letters of names and email addresses in the "
-"recipients text field and <app>Evolution</app> will present you with a list "
-"of matches from your address books."
+"recipients text field and Evolution will present you with a list of matches "
+"from your address books."
 msgstr ""
 "Vous pouvez saisir les trois premières lettres des noms et adresses "
-"électroniques dans le champ des destinataires et <app>Evolution</app> vous "
-"affiche une liste de correspondances à partir de vos carnets d'adresses."
+"électroniques dans le champ des destinataires et Evolution vous affiche une "
+"liste de correspondances à partir de vos carnets d'adresses."
 
-#. (itstool) path: page/p
-#: C/contacts-autocompletion.page:36
+#: C/contacts-autocompletion.page:30(page/p)
 msgid ""
 "To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Contacts</gui> <gui>Autocompletion</gui></guiseq> and choose the "
-"address books from the list that <app>Evolution</app> should look in for "
-"matches."
+"gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the "
+"address books from the list that Evolution should look in for matches."
 msgstr ""
 "Pour activer la complétion automatique, allez dans <guiseq><gui>Édition</"
 "gui><gui>Préférences</gui><gui>Contacts</gui><gui>Complétion automatique</"
 "gui></guiseq> et choisissez les carnets d'adresses dans la liste "
-"qu'<app>Evolution</app> doit parcourir pour trouver des correspondances."
+"qu'Evolution doit parcourir pour trouver des correspondances."
 
-#. (itstool) path: page/p
-#: C/contacts-autocompletion.page:41
+#: C/contacts-autocompletion.page:32(page/p)
 msgid ""
 "Select <gui>Always show address of the autocompleted contact</gui> to also "
 "show the email address along with the name. This can be helpful to "
@@ -1954,8 +1857,7 @@ msgstr ""
 "Cela peut être utile pour distinguer si un contact possède plusieurs "
 "adresses électroniques."
 
-#. (itstool) path: page/p
-#: C/contacts-autocompletion.page:45
+#: C/contacts-autocompletion.page:34(page/p)
 msgid ""
 "Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</"
 "gui> buttons to get a list of the email addresses in your contacts. Select "
@@ -1967,54 +1869,44 @@ msgstr ""
 "électroniques de vos contacts. Sélectionnez les adresses et cliquez sur les "
 "flèches pour les placer dans les cases d'adresses adéquates."
 
-#. (itstool) path: info/desc
-#: C/contacts-google.page:18
+#: C/contacts-google.page:5(info/desc)
 msgid "Use the online address book of your Google account."
 msgstr "Utiliser le carnet d'adresse en ligne de votre compte Google."
 
-#. (itstool) path: page/title
-#: C/contacts-google.page:21
+#: C/contacts-google.page:21(page/title)
 msgid "Using a Google addressbook"
 msgstr "Utilisation d'un carnet d'adresses Google"
 
-#. (itstool) path: page/p
-#: C/contacts-google.page:23
-msgid ""
-"To add such an address book to <app>Evolution</app>, perform the following "
-"steps:"
+#: C/contacts-google.page:23(page/p)
+msgid "To add such an address book to Evolution, perform the following steps:"
 msgstr ""
-"Pour ajouter ce type de carnet d'adresses à <app>Evolution</app>, effectuez "
-"les étapes suivantes :"
+"Pour ajouter ce type de carnet d'adresses à Evolution, effectuez les étapes "
+"suivantes :"
 
-#. (itstool) path: item/p
-#: C/contacts-google.page:28 C/contacts-ldap.page:40 C/contacts-local.page:27
+#: C/contacts-google.page:25(item/p) C/contacts-ldap.page:31(item/p)
+#: C/contacts-local.page:24(item/p)
 msgid ""
-"Click <guiseq><gui>File</gui><gui>New</gui> <gui>Address Book</gui></guiseq>."
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Fichier</gui><gui>Nouveau</gui><gui>Carnet "
 "d'adresses</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/contacts-google.page:53 C/contacts-local.page:41
+#: C/contacts-google.page:34(page/p) C/contacts-local.page:30(page/p)
 msgid ""
-"The address book will be added to the list of address books in "
-"<app>Evolution</app>."
+"The address book will be added to the list of address books in Evolution."
 msgstr ""
 "Le carnet d'adresses sera ajouté à la liste des carnets d'adresses dans "
-"<app>Evolution</app>."
+"Evolution."
 
-#. (itstool) path: info/desc
-#: C/contacts-ldap.page:25
+#: C/contacts-ldap.page:5(info/desc)
 msgid "Use shared address books on a local network."
 msgstr "Utiliser un carnet d'adresses partagé sur un réseau local."
 
-#. (itstool) path: page/title
-#: C/contacts-ldap.page:28
+#: C/contacts-ldap.page:23(page/title)
 msgid "Adding LDAP access"
 msgstr "Ajout d'un accès LDAP"
 
-#. (itstool) path: page/p
-#: C/contacts-ldap.page:30
+#: C/contacts-ldap.page:25(page/p)
 msgid ""
 "The LDAP protocol was created to let users share contact information over a "
 "network by sharing access to a central directory. LDAP allows a company to "
@@ -2027,21 +1919,18 @@ msgstr ""
 "d'informations de contacts. Beaucoup d'organisations conservent un carnet "
 "d'adresses LDAP commun pour tous leurs employés ou pour les contacts clients."
 
-#. (itstool) path: section/title
-#: C/contacts-ldap.page:36
+#: C/contacts-ldap.page:28(section/title)
 msgid "Adding an LDAP address book"
 msgstr "Ajout d'un carnet d'adresses LDAP"
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:44
+#: C/contacts-ldap.page:32(item/p)
 msgid ""
 "In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>."
 msgstr ""
 "Dans l'onglet <gui>Général</gui>, sélectionnez le type <gui>Sur les serveurs "
 "LDAP</gui>."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:51
+#: C/contacts-ldap.page:34(item/p)
 msgid ""
 "Enter the address of the server, the port number (the default number is 389) "
 "and whether you want to connect securely."
@@ -2049,20 +1938,17 @@ msgstr ""
 "Saisissez l'adresse du serveur LDAP, le numéro de port (le numéro par défaut "
 "est 389) et si vous voulez utiliser une connexion sécurisée."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:55
-msgid "Define the login method and your username."
+#: C/contacts-ldap.page:35(item/p)
+msgid "Define the login method and your user name."
 msgstr "Définissez la méthode d'authentification et votre nom d'utilisateur."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:61
+#: C/contacts-ldap.page:37(item/p)
 msgid "In the <gui>Details</gui> tab you can define the following settings:"
 msgstr ""
 "Dans l'onglet <gui>Détails</gui>, vous pouvez définir les paramètres "
 "suivants :"
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:65
+#: C/contacts-ldap.page:39(item/p)
 msgid ""
 "Search Base: The search base is the starting point for a directory search. "
 "Contact your system administrator for information about the correct settings."
@@ -2071,34 +1957,27 @@ msgstr ""
 "recherche d'annuaire. Pour plus d'informations sur les paramètres "
 "appropriés, contactez l'administrateur système."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:70
-msgid "Search Scope: The search scope is the breadth of a given search."
+#: C/contacts-ldap.page:40(item/p)
+msgid ""
+"Search Scope: The search scope is the breadth of a given search. The "
+"following options are available:"
 msgstr ""
 "Domaine de recherche : le domaine de recherche correspond à l'étendue d'une "
-"recherche donnée. "
-
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:71
-msgid "The following options are available:"
-msgstr "Les paramètres suivants sont disponibles :"
+"recherche. Vous disposez des options suivantes :"
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:74
+#: C/contacts-ldap.page:42(item/p)
 msgid "One: Searches the Search Base and one entry below it."
 msgstr ""
 "Un niveau : effectue une recherche dans la base de recherche et dans un "
 "niveau hiérarchique au-dessous."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:77
+#: C/contacts-ldap.page:43(item/p)
 msgid "Sub: Searches the Search Base and all entries below it."
 msgstr ""
 "Arborescence : effectue une recherche dans la base de recherche et dans tous "
 "les niveaux hiérarchiques."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:82
+#: C/contacts-ldap.page:46(item/p)
 msgid ""
 "Search Filter: The search filter can be set here for all the LDAP queries. "
 "For example:"
@@ -2106,19 +1985,16 @@ msgstr ""
 "Filtre de recherche : le filtre de recherche peut être défini ici pour "
 "toutes les requêtes LDAP. Par exemple :"
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:86
+#: C/contacts-ldap.page:48(item/p)
 msgid "<code>ObjectClass=*</code>: Lists all the objects from the server."
 msgstr "<code>ObjectClass=*</code> : énumère tous les objets du serveur."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:90
+#: C/contacts-ldap.page:49(item/p)
 msgid "<code>ObjectClass=User</code>: Lists only the users."
 msgstr ""
 "<code>ObjectClass=User</code> : énumère seulement ceux de l'utilisateur."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:93
+#: C/contacts-ldap.page:50(item/p)
 msgid ""
 "<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: "
 "Retrieves the User and Contact List objects."
@@ -2126,8 +2002,7 @@ msgstr ""
 "<code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code> : "
 "récupère les objets de l'utilisateur et de la liste de contacts."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:97
+#: C/contacts-ldap.page:51(item/p)
 msgid ""
 "<code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated "
 "with the email addresses."
@@ -2135,17 +2010,15 @@ msgstr ""
 "<code>(&amp;(mail=*)(ObjectClass=*))</code> : énumère les objets associés "
 "aux adresses électroniques."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:103
+#: C/contacts-ldap.page:54(item/p)
 msgid ""
-"Timeout (minutes): The maximum time <app>Evolution</app> attempts to "
-"download data from the server before giving up."
+"Timeout (minutes): The maximum time Evolution attempts to download data from "
+"the server before giving up."
 msgstr ""
-"Délai (en minutes) : délai maximum au cours duquel <app>Evolution</app> "
-"tente de télécharger les données du serveur avant d'abandonner."
+"Délai (en minutes) : délai maximum au cours duquel Evolution tente de "
+"télécharger les données du serveur avant d'abandonner."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:107
+#: C/contacts-ldap.page:55(item/p)
 msgid ""
 "Download Limit: The maximum number of results for a given search. Most "
 "servers refuse to send more than 500 contacts, but you can set the number "
@@ -2156,20 +2029,17 @@ msgstr ""
 "mais vous pouvez définir une valeur inférieure pour raccourcir les "
 "téléchargements dans le cas de recherches très larges."
 
-#. (itstool) path: note/p
-#: C/contacts-ldap.page:117
+#: C/contacts-ldap.page:60(note/p)
 msgid "If you are unsure about some settings, ask your system administrator."
 msgstr ""
-"Si vous n'êtes pas sûr de certains réglages, contactez votre administrateur "
-"système."
+"Si vous n'êtes pas certain de certains réglages, contactez votre "
+"administrateur système."
 
-#. (itstool) path: section/title
-#: C/contacts-ldap.page:124
+#: C/contacts-ldap.page:65(section/title)
 msgid "Differences to local address books"
 msgstr "Différences avec les carnets d'adresses locaux"
 
-#. (itstool) path: section/p
-#: C/contacts-ldap.page:126
+#: C/contacts-ldap.page:67(section/p)
 msgid ""
 "LDAP address books work like local address books on your computer, with the "
 "following exceptions:"
@@ -2177,8 +2047,7 @@ msgstr ""
 "Les carnets d'adresses LDAP fonctionnent comme les carnets d'adresses locaux "
 "de votre ordinateur aux exceptions suivantes près :"
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:131
+#: C/contacts-ldap.page:69(item/p)
 msgid ""
 "Network folders are only available when you are connected to the network. If "
 "you use a laptop or have a modem connection, you might want to copy or cache "
@@ -2191,8 +2060,7 @@ msgstr ""
 "mémoire tampon une partie de l'annuaire réseau. Vous pouvez le faire en "
 "faisant glisser les contacts concernés dans les carnets d'adresses locaux."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:137
+#: C/contacts-ldap.page:70(item/p)
 msgid ""
 "You can also mark the network folder for offline usage. To mark the folder, "
 "right-click the folder, click Properties and select Copy Folder Content "
@@ -2203,198 +2071,170 @@ msgstr ""
 "cochez « Copier le contenu du dossier en local pour les opérations hors "
 "ligne »."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:142
+#: C/contacts-ldap.page:71(item/p)
 msgid ""
-"To prevent excess network traffic, <app>Evolution</app> does not normally "
-"load data from the LDAP server upon opening."
+"To prevent excess network traffic, Evolution does not normally load data "
+"from the LDAP server upon opening."
 msgstr ""
-"Pour éviter un trafic réseau trop important, <app>Evolution</app> ne charge "
-"en principe pas les données du serveur LDAP au moment de son ouverture."
+"Pour éviter un trafic réseau trop important, Evolution ne charge en principe "
+"pas les données du serveur LDAP au moment de son ouverture."
 
-#. (itstool) path: item/p
-#: C/contacts-ldap.page:146
+#: C/contacts-ldap.page:72(item/p)
 msgid ""
 "Depending on your server settings, you might not be able to edit all the "
 "fields in a contact stored on an LDAP server. Some servers prohibit some or "
-"all changes, and others use a smaller set of fields than <app>Evolution</"
-"app> allows. Check with your system administrator if you need different "
-"settings."
+"all changes, and others use a smaller set of fields than Evolution allows. "
+"Check with your system administrator if you need different settings."
 msgstr ""
 "Selon les réglages de votre serveur, vous ne pourrez peut-être pas modifier "
 "tous les champs d'un contact stocké sur un serveur LDAP. Certains serveurs "
 "empêchent tout ou partie des modifications, et d'autres utilisent un nombre "
-"de champs plus restreint que ceux d'<app>Evolution</app> Contactez votre "
+"de champs plus restreint que ceux d'Evolution. Contactez votre "
 "administrateur système si vous avez besoin de réglages différents."
 
-#. (itstool) path: info/desc
-#: C/contacts-libreoffice.page:17
-msgid ""
-"Using data from <app>Evolution</app> address books in LibreOffice documents."
+#: C/contacts-libreoffice.page:5(info/desc)
+msgid "Using data from Evolution address books in LibreOffice documents."
 msgstr ""
-"Utiliser les données des carnets d'adresses d'<app>Evolution</app>dans des "
-"documents LibreOffice."
+"Utiliser les données des carnets d'adresses d'Evolution dans des documents "
+"LibreOffice."
 
-#. (itstool) path: page/title
-#: C/contacts-libreoffice.page:21
+#: C/contacts-libreoffice.page:20(page/title)
 msgid "Contacts in LibreOffice"
 msgstr "Contacts dans LibreOffice"
 
-#. (itstool) path: page/p
-#: C/contacts-libreoffice.page:23
+#: C/contacts-libreoffice.page:22(page/p)
 msgid ""
-"You can use your <app>Evolution</app> address books in LibreOffice as a data "
-"source. The following steps refer to LibreOffice version 3.3.3."
+"You can use your Evolution address books in LibreOffice as a data source. "
+"The following steps refer to LibreOffice version 3.3.3."
 msgstr ""
 "Vous pouvez utiliser vos carnets d'adresses Evolution dans LibreOffice comme "
 "source de données. Les étapes suivantes se réfèrent à la version 3.3.3 de "
 "LibreOffice."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:28
+#: C/contacts-libreoffice.page:25(item/p)
 msgid ""
-"Click <guiseq><gui>Edit</gui><gui>Exchange Database…</gui></guiseq> in the "
+"Click <guiseq><gui>Edit</gui><gui>Exchange Database...</gui></guiseq> in the "
 "menu bar. This will bring up the <gui>Exchange databases</gui> dialog box."
 msgstr ""
 "Cliquez sur <guiseq><gui>Édition</gui><gui>Changer de base de données...</"
 "gui></guiseq> dans la barre de menu. La boîte de dialogue <gui>Changer de "
 "base de données...</gui> apparaît."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:33
+#: C/contacts-libreoffice.page:26(item/p)
 msgid ""
 "In the right pane under <gui>Available Databases</gui>, <gui>EvolutionLocal</"
 "gui> is available as a source. Click on the small triangle to get the list "
-"of your <app>Evolution</app> address books."
+"of your Evolution address books."
 msgstr ""
 "Dans le volet de droite sous <gui>Bases de données disponibles</gui>, la "
 "source <gui>EvolutionLocal</gui> est disponible. Cliquez sur le petit "
-"triangle pour obtenir la liste de vos carnets d'adresses <app>Evolution</"
-"app>."
+"triangle pour obtenir la liste de vos carnets d'adresses Evolution."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:38
+#: C/contacts-libreoffice.page:27(item/p)
 msgid "Choose an addressbook and click <gui style=\"button\">Define</gui>."
 msgstr ""
 "Sélectionnez un carnet d'adresses et cliquez sur <gui style=\"button"
 "\">Définir</gui>."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:41
+#: C/contacts-libreoffice.page:28(item/p)
 msgid ""
-"In case it is not listed already, click <gui style=\"button\">Browse…</gui>. "
-"A file chooser dialog opens."
+"In case it is not listed already, click <gui style=\"button\">Browse...</"
+"gui>. A file chooser dialog opens."
 msgstr ""
 "Au cas où il n'apparaît pas déjà, cliquez sur <gui style=\"button"
 "\">Naviguer...</gui>. Une boîte de dialogue de sélection de fichier s'ouvre."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:45
+#: C/contacts-libreoffice.page:29(item/p)
 msgid ""
-"As <app>Evolution</app> stores its data in a hidden directory, press "
-"<keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar "
-"displayed."
+"As Evolution stores its data in a hidden directory, press <keyseq><key>Ctrl</"
+"key><key>L</key></keyseq> to get the location bar displayed."
 msgstr ""
-"Comme <app>Evolution</app> enregistre ses données dans un répertoire caché, "
-"appuyez sur <keyseq><key>Ctrl</key><key>L</key></keyseq> pour que la barre "
-"d'emplacement s'affiche."
+"Comme Evolution enregistre ses données dans un répertoire caché, appuyez sur "
+"<keyseq><key>Ctrl</key><key>L</key></keyseq> pour que la barre d'emplacement "
+"s'affiche."
 
-#. (itstool) path: item/p
-#: C/contacts-libreoffice.page:50
+#: C/contacts-libreoffice.page:30(item/p)
 msgid ""
-"Go to <file>~/.local/share/evolution/addressbook/system/addressbook.db</"
-"file> and click <gui style=\"button\">Open</gui>."
+"Go to <file>/home/username/.local/share/evolution/addressbook/system/"
+"addressbook.db</file> and click <gui style=\"button\">Open</gui>."
 msgstr ""
-"Allez dans <file>~/.local/share/evolution/addressbook/system/addressbook.db</"
-"file> et cliquez sur <gui style=\"button\">Ouvrir</gui>."
+"Allez dans <file>/home/nom_utilisateur/.local/share/evolution/addressbook/"
+"system/addressbook.db</file> et cliquez sur <gui style=\"button\">Ouvrir</"
+"gui>."
 
-#. (itstool) path: page/p
-#: C/contacts-libreoffice.page:56
+#: C/contacts-libreoffice.page:33(page/p)
 msgid ""
-"This makes the <app>Evolution</app> address book the default data source for "
-"LibreOffice. You can now select a field to insert into a LibreOffice "
+"This makes the Evolution address book the default data source for "
+"LibreOffice. You can now select a field to insert into an LibreOffice "
 "document via <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></"
 "guiseq>."
 msgstr ""
-"Le carnet d'adresses d'<app>Evolution</app> est maintenant la source de "
-"données par défaut de LibreOffice. Vous pouvez y sélectionner un champ et "
+"Le carnet d'adresses d'Evolution est maintenant la source de données par "
+"défaut de LibreOffice. Vous pouvez maintenant sélectionner un champ et "
 "l'insérer dans un document LibreOffice via <guiseq><gui>Insertion</"
 "gui><gui>Champs</gui><gui>Autre</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/contacts-local.page:17
+#: C/contacts-local.page:5(info/desc)
 msgid "Adding another local address book."
 msgstr "Ajouter un autre carnet d'adresses local."
 
-#. (itstool) path: page/title
-#: C/contacts-local.page:20
+#: C/contacts-local.page:20(page/title)
 msgid "Adding another local address book"
 msgstr "Ajout d'un autre carnet d'adresses local"
 
-#. (itstool) path: page/p
-#: C/contacts-local.page:22
+#: C/contacts-local.page:22(page/p)
 msgid ""
-"To add another local address book to <app>Evolution</app>, perform the "
-"following steps:"
+"To add another local address book to Evolution, perform the following steps:"
 msgstr ""
-"Pour ajouter un autre carnet d'adresses local à <app>Evolution</app>, suivez "
-"les étapes suivantes :"
+"Pour ajouter un autre carnet d'adresses local à Evolution, suivez les étapes "
+"suivantes :"
 
-#. (itstool) path: info/desc
-#: C/contacts-organizing.page:18
+#: C/contacts-organizing.page:5(info/desc)
 msgid "On address books, searching, contact lists, and categories."
 msgstr ""
 "À propos des carnets d'adresses, de la recherche, des listes de contacts et "
 "des catégories."
 
-#. (itstool) path: page/title
-#: C/contacts-organizing.page:21
+#: C/contacts-organizing.page:21(page/title)
 msgid "Sorting, organizing and grouping contacts"
 msgstr "Tri, organisation et groupement de contacts"
 
-#. (itstool) path: page/p
-#: C/contacts-organizing.page:23
+#: C/contacts-organizing.page:23(page/p)
 msgid ""
 "There are several ways how to organize your contacts. You can use several "
 "addressbooks and categories, and for conveniently sending messages to a "
 "group of people contact lists are available."
 msgstr ""
 "Il y a plusieurs façons d'organiser vos contacts. Vous pouvez utiliser "
-"plusieurs carnets d'adresses et catégories, et, pour envoyer facilement des "
+"plusieurs carnets d'adresses et catégories et pour envoyer facilement des "
 "messages à des groupes de personnes, des listes de contacts sont disponibles."
 
-#. (itstool) path: info/desc
-#: C/contacts-searching.page:25
+#: C/contacts-searching.page:5(info/desc)
 msgid "Searching contacts."
 msgstr "Rechercher des contacts."
 
-#. (itstool) path: page/title
-#: C/contacts-searching.page:28
+#: C/contacts-searching.page:27(page/title)
 msgid "Searching Contacts"
 msgstr "Recherche de contacts"
 
-#. (itstool) path: section/title
-#: C/contacts-searching.page:31
+#: C/contacts-searching.page:30(section/title)
 msgid "Searching in a Single Contact"
 msgstr "Recherche dans un seul contact"
 
-#. (itstool) path: section/p
-#: C/contacts-searching.page:33
+#: C/contacts-searching.page:31(section/p)
 msgid ""
 "To find text in the displayed contact, select <guiseq><gui>Edit</"
-"gui><gui>Find in Contact…</gui></guiseq> from the main menu."
+"gui><gui>Find in Contact...</gui></guiseq> from the main menu."
 msgstr ""
 "Pour trouver un texte dans le contact affiché, sélectionnez "
 "<guiseq><gui>Édition</gui><gui>Rechercher dans le contact...</gui></guiseq> "
 "dans le menu principal."
 
-#. (itstool) path: section/title
-#: C/contacts-searching.page:40
+#: C/contacts-searching.page:35(section/title)
 msgid "Searching Across Contacts"
 msgstr "Recherche parmi les contacts"
 
-#. (itstool) path: section/p
-#: C/contacts-searching.page:44
+#: C/contacts-searching.page:39(section/p)
 msgid ""
 "In the Contacts view, you can quickly search for contacts either by category "
 "or by contact's info."
@@ -2402,27 +2242,23 @@ msgstr ""
 "Dans la vue contacts, vous pouvez rechercher rapidement des contacts soit "
 "par catégorie ou par les informations de contact."
 
-#. (itstool) path: section/p
-#: C/contacts-searching.page:46
+#: C/contacts-searching.page:40(section/p)
 msgid "Searching by contact's info:"
 msgstr "Recherche par les informations des contacts :"
 
-#. (itstool) path: info/desc
-#: C/contacts-usage-add-contact.page:17
+#: C/contacts-usage-add-contact.page:5(info/desc)
 msgid "Adding a contact to your address book."
 msgstr "Ajouter un contact à votre carnet d'adresses."
 
-#. (itstool) path: page/title
-#: C/contacts-usage-add-contact.page:20
+#: C/contacts-usage-add-contact.page:20(page/title)
 msgid "Adding a Contact"
 msgstr "Ajout d'un contact"
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:24
+#: C/contacts-usage-add-contact.page:23(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or "
 "right-click in a blank space in the list of contacts and click <gui>New "
-"Contact…</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
+"Contact...</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
 "key></keyseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Fichier</gui><gui>Nouveau</gui><gui>Contact</gui></"
@@ -2430,22 +2266,20 @@ msgstr ""
 "contacts puis cliquez sur <gui>Nouveau contact...</gui> ou appuyez sur la "
 "touche <keyseq><key>Maj</key><key>Ctrl</key><key>C</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:31 C/contacts-using-contact-lists.page:51
+#: C/contacts-usage-add-contact.page:24(item/p)
+#: C/contacts-using-contact-lists.page:34(item/p)
 msgid ""
 "Select the address book under <gui>Where:</gui> to which it will be added."
 msgstr ""
 "Sélectionnez le carnet d'adresses sous <gui>Où :</gui> dans lequel elle sera "
 "ajoutée."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:35
+#: C/contacts-usage-add-contact.page:25(item/p)
 msgid "Enter the contact information. Note that there are several tabs."
 msgstr ""
 "Saisissez les informations du contact. Remarquez qu'il y a plusieurs onglets."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:38
+#: C/contacts-usage-add-contact.page:26(item/p)
 msgid ""
 "You can add a photograph to the contact by clicking the large field (showing "
 "a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>."
@@ -2454,30 +2288,25 @@ msgstr ""
 "espace (affichant une personne stylisée) à côté de <gui>Nom complet</gui> et "
 "<gui>Catégories</gui>."
 
-#. (itstool) path: section/title
-#: C/contacts-usage-add-contact.page:48
+#: C/contacts-usage-add-contact.page:31(section/title)
 msgid "Contact Quick-Add from the Email Window"
 msgstr "Ajout express de contact à partir de la fenêtre des messages"
 
-#. (itstool) path: section/p
-#: C/contacts-usage-add-contact.page:50
+#: C/contacts-usage-add-contact.page:33(section/p)
 msgid "You can also add a contact directly from an email."
 msgstr ""
 "Vous pouvez aussi ajouter un contact directement à partir d'un courriel."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:54
+#: C/contacts-usage-add-contact.page:35(item/p)
 msgid "Right-click on the email address in the message header."
 msgstr ""
 "Faites un clic-droit sur l'adresse électronique dans les en-têtes du message."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:57
-msgid "Select <gui>Add to Address Book…</gui>."
+#: C/contacts-usage-add-contact.page:36(item/p)
+msgid "Select <gui>Add to Address Book...</gui>."
 msgstr "Choisissez <gui>Ajouter au carnet d'adresse...</gui>."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-add-contact.page:60
+#: C/contacts-usage-add-contact.page:37(item/p)
 msgid ""
 "Either press <gui style=\"button\">Edit Full</gui> to bring up the full "
 "<gui>Contact Editor</gui>, or click <gui style=\"button\">OK</gui> to "
@@ -2488,18 +2317,15 @@ msgstr ""
 "style=\"button\">Valider</gui> pour ajouter directement le contact dans le "
 "carnet d'adresses choisi."
 
-#. (itstool) path: info/desc
-#: C/contacts-usage-delete-contact.page:17
+#: C/contacts-usage-delete-contact.page:5(info/desc)
 msgid "Deleting a contact from your address book."
 msgstr "Supprimer un contact du carnet d'adresses."
 
-#. (itstool) path: page/title
-#: C/contacts-usage-delete-contact.page:20
+#: C/contacts-usage-delete-contact.page:20(page/title)
 msgid "Deleting a Contact"
 msgstr "Suppression d'un contact"
 
-#. (itstool) path: page/p
-#: C/contacts-usage-delete-contact.page:22
+#: C/contacts-usage-delete-contact.page:22(page/p)
 msgid ""
 "If you want to delete a contact in your address books, right-click on the "
 "contact and select <gui>Delete</gui>, or click on the contact and click "
@@ -2514,24 +2340,20 @@ msgstr ""
 "cliquez sur <guiseq><gui>Édition</gui><gui>Supprimer le contact</gui></"
 "guiseq>."
 
-#. (itstool) path: info/desc
-#: C/contacts-usage-edit-contact.page:17
+#: C/contacts-usage-edit-contact.page:5(info/desc)
 msgid "Editing a contact in your address book."
 msgstr "Modification d'un contact dans le carnet d'adresses."
 
-#. (itstool) path: page/title
-#: C/contacts-usage-edit-contact.page:20
+#: C/contacts-usage-edit-contact.page:20(page/title)
 msgid "Editing a Contact"
 msgstr "Modification d'un contact"
 
-#. (itstool) path: page/p
-#: C/contacts-usage-edit-contact.page:22
+#: C/contacts-usage-edit-contact.page:22(page/p)
 msgid ""
 "If you want to change a contact that already exists in your address books,"
 msgstr "Si vous souhaitez modifier un contact existant,"
 
-#. (itstool) path: item/p
-#: C/contacts-usage-edit-contact.page:27
+#: C/contacts-usage-edit-contact.page:25(item/p)
 msgid ""
 "Double-click on the contact that you want to edit in the list of contacts, "
 "or select the contact and press <key>Enter</key>."
@@ -2539,34 +2361,28 @@ msgstr ""
 "double-cliquez sur le contact que vous souhaitez modifier dans la liste des "
 "contacts ou sélectionnez le contact et appuyez sur <key>Entrée</key>."
 
-#. (itstool) path: item/p
-#: C/contacts-usage-edit-contact.page:31
+#: C/contacts-usage-edit-contact.page:26(item/p)
 msgid "Edit the contact information."
 msgstr "Modifiez les informations sur le contact."
 
-#. (itstool) path: info/desc
-#: C/contacts-usage.page:17
+#: C/contacts-usage.page:5(info/desc)
 msgid "On adding, editing, and deleting contacts in address books."
 msgstr ""
 "Ajouter, modifier et supprimer des contacts dans des carnets d'adresses."
 
-#. (itstool) path: page/title
-#: C/contacts-usage.page:20
+#: C/contacts-usage.page:20(page/title)
 msgid "Add, Edit, and Delete Contacts"
 msgstr "Ajout, modification et suppression de contacts"
 
-#. (itstool) path: info/desc
-#: C/contacts-using-contact-lists.page:23
+#: C/contacts-using-contact-lists.page:5(info/desc)
 msgid "Using contact lists for grouping contacts."
 msgstr "Utiliser des listes de contacts pour regrouper des contacts."
 
-#. (itstool) path: page/title
-#: C/contacts-using-contact-lists.page:26
+#: C/contacts-using-contact-lists.page:23(page/title)
 msgid "Using Contact Lists"
 msgstr "Utilisation de listes de contacts"
 
-#. (itstool) path: page/p
-#: C/contacts-using-contact-lists.page:28
+#: C/contacts-using-contact-lists.page:25(page/p)
 msgid ""
 "A contact list is a set of contacts with a single nickname that you create. "
 "When you send mail to this nickname it is actually sent to every member of "
@@ -2582,8 +2398,7 @@ msgstr ""
 "adresse électronique réelle gérée par une application de listes de diffusion "
 "sur un serveur."
 
-#. (itstool) path: page/p
-#: C/contacts-using-contact-lists.page:34
+#: C/contacts-using-contact-lists.page:27(page/p)
 msgid ""
 "For example, you could create one contact for each family member, then add "
 "those contacts to a contact list called \"Family\". Then, instead of "
@@ -2596,26 +2411,23 @@ msgstr ""
 "électronique, vous pouvez envoyer un message à « Famille » et le message "
 "sera distribué à chacun d'eux."
 
-#. (itstool) path: section/title
-#: C/contacts-using-contact-lists.page:40
+#: C/contacts-using-contact-lists.page:30(section/title)
 msgid "Creating a contact list"
 msgstr "Création d'une liste de contacts"
 
-#. (itstool) path: item/p
-#: C/contacts-using-contact-lists.page:44
+#: C/contacts-using-contact-lists.page:32(item/p)
 msgid ""
-"Click <guiseq><gui>File</gui><gui>New</gui> <gui>Contact List</gui></guiseq>."
+"Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Fichier</gui><gui>Nouveau</gui><gui>Liste de "
 "contacts</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/contacts-using-contact-lists.page:55
+#: C/contacts-using-contact-lists.page:35(item/p)
 msgid ""
 "Specify the list members by either entering the names or email addresses of "
 "contacts (the text field supports autocompletion), or by dragging contacts "
 "from the Contacts window into the list, or by using the <gui style=\"button"
-"\">Select…</gui> button."
+"\">Select...</gui> button."
 msgstr ""
 "Spécifiez les membres de la liste en saisissant les noms ou adresses "
 "électroniques des contacts (le champ de texte prend en charge la complétion "
@@ -2623,8 +2435,7 @@ msgstr ""
 "contacts sur la liste ou en utilisant le bouton <gui style=\"button"
 "\">Sélectionner...</gui>."
 
-#. (itstool) path: item/p
-#: C/contacts-using-contact-lists.page:61
+#: C/contacts-using-contact-lists.page:36(item/p)
 msgid ""
 "Choose whether you want to hide the email addresses when you send a message "
 "to the list."
@@ -2632,8 +2443,7 @@ msgstr ""
 "Décidez si vous voulez masquer les adresses électroniques lorsque vous "
 "envoyez un message à la liste."
 
-#. (itstool) path: item/p
-#: C/contacts-using-contact-lists.page:62
+#: C/contacts-using-contact-lists.page:36(item/p)
 msgid ""
 "Unless it is a very small list, it is recommended that you leave the "
 "addresses hidden. This is the same thing as using the “Bcc:” feature "
@@ -2645,22 +2455,17 @@ msgstr ""
 "« Cci : » examinée dans <link xref=\"mail-composer-several-recipients"
 "\">Envoi d'un message à plusieurs destinataires</link>."
 
-#. (itstool) path: section/p
-#: C/contacts-using-contact-lists.page:73
-msgid ""
-"The contact list will be added to the chosen address book in <app>Evolution</"
-"app>."
+#: C/contacts-using-contact-lists.page:40(section/p)
+msgid "The contact list will be added to the chosen address book in Evolution."
 msgstr ""
 "La liste des contacts est ajoutée au carnet d'adresses sélectionné dans "
-"<app>Evolution</app>."
+"Evolution."
 
-#. (itstool) path: section/title
-#: C/contacts-using-contact-lists.page:79
+#: C/contacts-using-contact-lists.page:44(section/title)
 msgid "Sending messages to a contact list"
 msgstr "Envoi de messages à une liste de contacts"
 
-#. (itstool) path: section/p
-#: C/contacts-using-contact-lists.page:81
+#: C/contacts-using-contact-lists.page:45(section/p)
 msgid ""
 "To send a message to the contact list, enter the name that you chose for the "
 "contact list as the recipient in the mail composer. You can also right-click "
@@ -2672,21 +2477,20 @@ msgstr ""
 "pouvez également cliquer avec le bouton droit sur la liste de contacts dans "
 "le carnet d'adresses et choisir <gui>Envoyer un message à la liste</gui>."
 
-#. (itstool) path: info/desc
-#: C/contacts-using-several-addressbooks.page:17
+#: C/contacts-using-several-addressbooks.page:5(info/desc)
+#, fuzzy
+#| msgid "Adding and using more than one address book and different types."
 msgid ""
 "Adding different types of address books and using more than one address book."
-msgstr ""
-"Ajouter différents types de carnets d'adresses et utiliser plus d'un carnet "
-"d'adresses."
+msgstr "Ajouter et utiliser plus d'un carnet d'adresses de différents types."
 
-#. (itstool) path: page/title
-#: C/contacts-using-several-addressbooks.page:21
+#: C/contacts-using-several-addressbooks.page:20(page/title)
+#, fuzzy
+#| msgid "Adding an LDAP address book"
 msgid "Adding and creating address books"
-msgstr "Ajout et création d'un carnet d'adresses"
+msgstr "Ajout d'un carnet d'adresses LDAP"
 
-#. (itstool) path: page/p
-#: C/contacts-using-several-addressbooks.page:23
+#: C/contacts-using-several-addressbooks.page:22(page/p)
 msgid ""
 "You can have multiple address books. For example, you might have one address "
 "book for work related contacts and one for private contacts. The side bar "
@@ -2694,11 +2498,10 @@ msgid ""
 msgstr ""
 "Vous pouvez avoir plusieurs carnets d'adresses. Par exemple, vous pouvez "
 "avoir un carnet d'adresses pour les contacts liés au travail et un pour les "
-"contacts privés. La barre latérale donne la liste de ces carnets d'adresses "
-"et vous pouvez y sélectionner quel carnet d'adresses est affiché."
+"contacts privés. La barre latérale liste ces carnets d'adresses et vous "
+"pouvez sélectionner le carnet d'adresses affiché."
 
-#. (itstool) path: page/p
-#: C/contacts-using-several-addressbooks.page:28
+#: C/contacts-using-several-addressbooks.page:24(page/p)
 msgid ""
 "You can also use address books that are not on your computer, such as on the "
 "internet (e.g. Google) or in a local network (e.g. LDAP)."
@@ -2707,173 +2510,186 @@ msgstr ""
 "votre ordinateur, mais sur internet (par ex. Google) ou sur un réseau local "
 "(par ex. LDAP)."
 
-#. (itstool) path: info/desc
-#: C/credits.page:5
+#: C/credits.page:5(info/desc)
 msgid "Credits and Acknowledgment."
 msgstr "Crédits et remerciements."
 
-#. (itstool) path: page/title
-#: C/credits.page:20
+#: C/credits.page:20(page/title)
 msgid "Credits and Acknowledgment"
 msgstr "Crédits et remerciements"
 
-#. (itstool) path: section/title
-#: C/credits.page:23
+#: C/credits.page:23(section/title)
 msgid "Authors of the <app>Evolution</app> User Documentation"
 msgstr "Auteurs du manuel d'utilisation d'<app>Evolution</app>"
 
-#. (itstool) path: item/p
-#: C/credits.page:25 C/credits.page:55
+#: C/credits.page:25(item/p) C/credits.page:55(item/p)
 msgid "André Klapper"
 msgstr "André Klapper"
 
-#. (itstool) path: item/p
-#: C/credits.page:28
+#: C/credits.page:28(item/p)
 msgid "April Gonzalez"
 msgstr "April Gonzalez"
 
-#. (itstool) path: item/p
-#: C/credits.page:31
+#: C/credits.page:31(item/p)
 msgid "Barbara M. Tobias"
 msgstr "Barbara M. Tobias"
 
-#. (itstool) path: item/p
-#: C/credits.page:34
+#: C/credits.page:34(item/p)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#. (itstool) path: section/title
-#: C/credits.page:41
+#: C/credits.page:41(section/title)
 msgid "Translators of the <app>Evolution</app> User Documentation"
 msgstr "Traducteurs du manuel d'utilisation d'<app>Evolution</app>"
 
-#. (itstool) path: section/p
 #. TO TRANSLATORS: This is shown in the 'Translators of the User
 #. Documentation' section. Please REPLACE this string by adding your own
 #. names here so you get some well-deserved fame on the interwebs! Do NOT
-#. use '\n' for linebreaks or square brackets for potential email
-#. addresses here as this will not work. Thanks for all your hard work!
-#. andre
-#: C/credits.page:43
+#. use '\n' for linebreaks or square brakets for potential email addresses
+#. here as this will not work. Thanks for all your hard work! andre
+#: C/credits.page:43(section/p)
 msgid "(Not applicable to the English version)"
 msgstr ""
 "Novell Inc. (2004), Marc Lorber (2006), Jonathan Ernst (2007), Claude Paroz "
 "(2007-2009), Alexandre Franke (2009), Bruno Brouard (2010-2012), Alexandre "
 "Daubois (2011), Julien Hardelin (2012)"
 
-#. (itstool) path: section/title
-#: C/credits.page:47
+#: C/credits.page:47(section/title)
 msgid "Authors of the previous version"
 msgstr "Auteurs de la version précédente"
 
-#. (itstool) path: section/title
-#: C/credits.page:89
+#: C/credits.page:49(item/p)
+msgid "Aaron Weber"
+msgstr "Aaron Weber"
+
+#: C/credits.page:52(item/p)
+msgid "Akhil Laddha"
+msgstr "Akhil Laddha"
+
+#: C/credits.page:58(item/p)
+msgid "Duncan Mak"
+msgstr "Duncan Mak"
+
+#: C/credits.page:61(item/p)
+msgid "Ettore Perazzoli"
+msgstr "Ettore Perazzoli"
+
+#: C/credits.page:64(item/p)
+msgid "Francisco Javier F. Serrador"
+msgstr "Francisco Javier F. Serrador"
+
+#: C/credits.page:67(item/p)
+msgid "Jessica Prabhakar"
+msgstr "Jessica Prabhakar"
+
+#: C/credits.page:70(item/p)
+msgid "Kevin Breit"
+msgstr "Kevin Breit"
+
+#: C/credits.page:73(item/p)
+msgid "Mark Moulder"
+msgstr "Mark Moulder"
+
+#: C/credits.page:76(item/p)
+msgid "Novell, Inc."
+msgstr "Novell, Inc."
+
+#: C/credits.page:79(item/p)
+msgid "Radhika Nair"
+msgstr "Radhika Nair"
+
+#: C/credits.page:82(item/p)
+msgid "Srinivasa Ragavan"
+msgstr "Srinivasa Ragavan"
+
+#: C/credits.page:89(section/title)
 msgid "Contact information"
 msgstr "Informations sur les contacts"
 
-#. (itstool) path: section/p
-#: C/credits.page:90
+#: C/credits.page:90(section/p)
 msgid "The GNOME Documentation Project:"
 msgstr "Le projet de documentation GNOME :"
 
-#. (itstool) path: item/p
-#: C/credits.page:92
+#: C/credits.page:92(item/p)
 msgid ""
-"<link href=\"https://wiki.gnome.org/DocumentationProject\";>Website</link>"
+"<link href=\"http://live.gnome.org/DocumentationProject\";>Website</link>"
 msgstr ""
-"<link href=\"http://live.gnome.org/DocumentationProject\";>Site Web</link>"
+"<link href=\"http://live.gnome.org/DocumentationProject\";>Website</link>"
 
-#. (itstool) path: item/p
-#: C/credits.page:95
+#: C/credits.page:95(item/p)
 msgid ""
-"<link href=\"https://mail.gnome.org/mailman/listinfo/gnome-doc-list";
-"\">Mailing list</link>"
+"<link href=\"http://mail.gnome.org/mailman/listinfo/gnome-doc-list\";>Mailing "
+"list</link>"
 msgstr ""
-"<link href=\"http://mail.gnome.org/mailman/listinfo/gnome-doc-list\";>Liste "
-"de diffusion</link>"
+"<link href=\"http://mail.gnome.org/mailman/listinfo/gnome-doc-list\";>Mailing "
+"list</link>"
 
-#. (itstool) path: info/desc
-#: C/data-storage.page:5
+#: C/data-storage.page:5(info/desc)
 msgid "Where does Evolution store my data on the harddisk?"
-msgstr ""
-"Où <app>Evolution</app> enregistre-t-il mes données sur le disque dur ?"
+msgstr "Où Evolution enregistre-t-il mes données sur le disque dur ?"
 
-#. (itstool) path: page/title
-#: C/data-storage.page:20
+#: C/data-storage.page:20(page/title)
 msgid "Data storage locations"
 msgstr "Emplacements de stockage des données"
 
-#. (itstool) path: note/p
-#: C/data-storage.page:23
+#: C/data-storage.page:23(note/p)
 msgid "This is only interesting for advanced users who want to debug problems."
 msgstr ""
 "Cette section n'intéresse que les utilisateurs avancés qui veulent résoudre "
 "des problèmes."
 
-#. (itstool) path: page/p
-#: C/data-storage.page:26
+#: C/data-storage.page:26(page/p)
 msgid ""
 "Evolution 3.6 and later stores its data according to the <link href=\"http://";
 "www.freedesktop.org/wiki/Specifications/basedir-spec\">XDG Base Directory "
 "Specification</link>. By default this means:"
 msgstr ""
-"Evolution 3.6 ou ultérieure enregistre ses données selon les <link href="
+"Evolution 3.6 ou plus tard enregistre ses données selon les <link href="
 "\"http://www.freedesktop.org/wiki/Specifications/basedir-spec";
 "\">spécifications de répertoire de base XDG</link>. Par défaut, cela "
 "signifie :"
 
-#. (itstool) path: item/title
-#: C/data-storage.page:30
+#: C/data-storage.page:30(item/title)
 msgid "The user's data files"
 msgstr "Les fichiers des données de l'utilisateur"
 
-#. (itstool) path: item/p
-#: C/data-storage.page:31
+#: C/data-storage.page:31(item/p)
 msgid "<file>$HOME/.local/share/evolution</file>"
 msgstr "<file>$HOME/.local/share/evolution</file>"
 
-#. (itstool) path: item/title
-#: C/data-storage.page:34
+#: C/data-storage.page:34(item/title)
 msgid "Various configuration and state files"
 msgstr "Divers fichiers de configuration et d'état"
 
-#. (itstool) path: item/p
-#: C/data-storage.page:35
+#: C/data-storage.page:35(item/p)
 msgid "<file>$HOME/.config/evolution</file>"
 msgstr "<file>$HOME/.config/evolution</file>"
 
-#. (itstool) path: item/title
-#: C/data-storage.page:38
+#: C/data-storage.page:38(item/title)
 msgid "Account settings"
 msgstr "Paramètres de compte"
 
-#. (itstool) path: item/p
-#: C/data-storage.page:39
+#: C/data-storage.page:39(item/p)
 msgid "<file>$HOME/.config/evolution/sources</file>"
 msgstr "<file>$HOME/.config/evolution/sources</file>"
 
-#. (itstool) path: item/title
-#: C/data-storage.page:42
+#: C/data-storage.page:42(item/title)
 msgid "Disposable data caches"
 msgstr "Caches de données temporaires"
 
-#. (itstool) path: item/p
-#: C/data-storage.page:43
+#: C/data-storage.page:43(item/p)
 msgid "<file>$HOME/.cache/evolution</file>"
 msgstr "<file>$HOME/.cache/evolution</file>"
 
-#. (itstool) path: item/title
-#: C/data-storage.page:46
+#: C/data-storage.page:46(item/title)
 msgid "Configuration settings in GSettings"
 msgstr "Paramétrages de configuration dans GSettings"
 
-#. (itstool) path: item/p
-#: C/data-storage.page:47
+#: C/data-storage.page:47(item/p)
 msgid "<file>$HOME/.config/dconf</file>"
 msgstr "<file>$HOME/.config/dconf</file>"
 
-#. (itstool) path: info/desc
-#: C/default-browser.page:7
+#: C/default-browser.page:7(info/desc)
 msgid ""
 "Opening links from an email in a browser and opening the mail composer from "
 "an email link on a website."
@@ -2881,30 +2697,25 @@ msgstr ""
 "Ouverture de liens contenus dans un courriel dans un navigateur et ouverture "
 "d'un lien sur un site web dans l'éditeur de courriel."
 
-#. (itstool) path: page/title
-#: C/default-browser.page:22
+#: C/default-browser.page:22(page/title)
 msgid "Opening links in and from the web browser"
 msgstr "Ouverture de liens dans et depuis le navigateur Web"
 
-#. (itstool) path: section/title
-#: C/default-browser.page:27
+#: C/default-browser.page:27(section/title)
 msgid "Change which web browser websites are opened in"
 msgstr "Changer de navigateur Web pour ouvrir les sites Web"
 
-#. (itstool) path: when/p
-#: C/default-browser.page:31
+#: C/default-browser.page:31(when/p)
 msgid "In case you use Evolution under a different environment from GNOME,"
 msgstr ""
-"Dans l'éventualité où vous utilisez Evolution sous un environnement "
-"différent de GNOME,"
 
-#. (itstool) path: item/p
-#: C/default-browser.page:34
+#: C/default-browser.page:34(item/p)
+#, fuzzy
+#| msgid "Open the <app>Terminal</app> application."
 msgid "Open a terminal application."
-msgstr "Ouvrez une application dans un terminal."
+msgstr "Ouvrez l'application <app>Terminal</app>."
 
-#. (itstool) path: item/p
-#: C/default-browser.page:37
+#: C/default-browser.page:37(item/p)
 msgid ""
 "Find out the name of the <cmd>.desktop</cmd> file for your preferred "
 "browser. Depending on your browser and distribution, the file might be "
@@ -2913,60 +2724,49 @@ msgid ""
 "<cmd>opera-browser.desktop</cmd>. If you are unsure you can look up most "
 "<cmd>.desktop</cmd> files in the folder <cmd>/usr/share/applications/</cmd>."
 msgstr ""
-"Recherchez le nome du fichier <cmd>.desktop</cmd> de votre navigateur "
-"préféré. Selon votre navigateur et votre distribution, le fichier peut "
-"s'appeler par exemple <cmd>epiphany.desktop</cmd>, <cmd>firefox.desktop</"
-"cmd>, <cmd>google-chrome.desktop</cmd>, <cmd>konqbrowser.desktop</cmd>, ou "
-"<cmd>opera-browser.desktop</cmd>. Si vous n'êtes pas sûr, vous pouvez "
-"consulter davantage de fichiers <cmd>.desktop</cmd> dans le dossier <cmd>/"
-"usr/share/applications/</cmd>."
 
-#. (itstool) path: item/p
-#: C/default-browser.page:40 C/default-browser.page:46
+#: C/default-browser.page:40(item/p) C/default-browser.page:46(item/p)
 msgid ""
 "Type this command, replace <cmd>browser.desktop</cmd> by the actual "
 "filename, and press <key>Enter</key>:"
 msgstr ""
-"Saisissez cette commande, remplacez <cmd>browser.desktop</cmd> par le nom de "
-"fichier actuel et appuyez sur <key>Entrée</key> :"
 
-#. (itstool) path: item/p
-#: C/default-browser.page:52
+#: C/default-browser.page:52(item/p)
 msgid "Evolution may need to be restarted for the settings to take effect."
 msgstr ""
-"Vous devrez sans doute redémarrer Evolution pour que les paramètres soient "
-"pris en compte."
 
-#. (itstool) path: note/p
-#: C/default-browser.page:56
+#: C/default-browser.page:56(note/p)
+#, fuzzy
+#| msgid ""
+#| "If the error message \"Could not open the link: Operation not supported\" "
+#| "is shown, you need to install the package <sys>gvfs</sys>."
 msgid ""
 "If the error message \"xdg-settings: command not found\" is shown, you need "
 "to install the package <sys>xdg-utils</sys>."
 msgstr ""
-"Si le message d'erreur « xdg-settings : commande non trouvée » s'affiche, "
-"vous devez installer le paquet <sys>xdg-utils</sys>."
+"Si le message d'erreur « impossible d'ouvrir le lien : opération non prise "
+"en charge » s'affiche, vous devez installer le paquet <sys>gvfs</sys>."
 
-#. (itstool) path: when/p
-#: C/default-browser.page:59
+#: C/default-browser.page:59(when/p)
+#, fuzzy
+#| msgid ""
+#| "<link action=\"install:bogofilter\" href=\"http://bogofilter.sourceforge.";
+#| "net/\" style=\"button\">Install bogofilter</link>"
 msgid ""
 "<link action=\"install:xdg-utils\" style=\"button\">Install xdg-utils</link>"
 msgstr ""
-"<link action=\"install:xdg-utils\" style=\"button\">Installer xdg-utils</"
-"link>"
+"<link action=\"install:bogofilter\" href=\"http://bogofilter.sourceforge.net/";
+"\" style=\"button\">Installer bogofilter</link>"
 
-#. (itstool) path: choose/p
-#: C/default-browser.page:64
+#: C/default-browser.page:64(choose/p)
 msgid ""
-"Please see <link xref=\"help:gnome-help/net-default-browser\" href=\"https://";
-"help.gnome.org/users/gnome-help/stable/net-default-browser\">the GNOME "
+"Please see <link href=\"help:gnome-help/net-default-browser\">the GNOME "
 "Desktop Help</link>."
 msgstr ""
-"Reportez-vous au <link href=\"help:gnome-help/net-default-browser\" href="
-"\"https://help.gnome.org/users/gnome-help/stable/net-default-browser";
-"\">Manuel du bureau GNOME</link>."
+"Reportez-vous au <link href=\"help:gnome-help/net-default-browser\">Manuel "
+"de GNOME Desktop</link>."
 
-#. (itstool) path: choose/p
-#: C/default-browser.page:66
+#: C/default-browser.page:66(choose/p)
 msgid ""
 "If the preferred browser is set as default application but still does not "
 "work correctly please contact your distribution via their forum or bug "
@@ -2976,8 +2776,7 @@ msgstr ""
 "cela ne fonctionne pas correctement, contactez votre distribution via son "
 "forum ou son système de suivi de bogues."
 
-#. (itstool) path: note/p
-#: C/default-browser.page:69
+#: C/default-browser.page:69(note/p)
 msgid ""
 "If the error message \"Could not open the link: Operation not supported\" is "
 "shown, you need to install the package <sys>gvfs</sys>."
@@ -2985,8 +2784,7 @@ msgstr ""
 "Si le message d'erreur « impossible d'ouvrir le lien : opération non prise "
 "en charge » s'affiche, vous devez installer le paquet <sys>gvfs</sys>."
 
-#. (itstool) path: when/p
-#: C/default-browser.page:72
+#: C/default-browser.page:72(when/p)
 msgid ""
 "<link action=\"install:gvfs\" href=\"http://ftp.gnome.org/pub/gnome/sources/";
 "gvfs/\" style=\"button\">Install gvfs</link>"
@@ -2994,28 +2792,23 @@ msgstr ""
 "<link action=\"install:gvfs\" href=\"http://ftp.gnome.org/pub/gnome/sources/";
 "gvfs/\" style=\"button\">Installer gvfs</link>"
 
-#. (itstool) path: section/title
-#: C/default-browser.page:81
+#: C/default-browser.page:81(section/title)
 msgid "Change which mail application is used to write emails"
 msgstr "Changer d'application courriel pour rédiger les courriels"
 
-#. (itstool) path: section/p
-#: C/default-browser.page:83
+#: C/default-browser.page:83(section/p)
 msgid ""
-"Please see <link xref=\"help:gnome-help/net-default-email\" href=\"https://";
-"help.gnome.org/users/gnome-help/stable/net-default-email\">the GNOME Desktop "
-"Help</link>."
+"Please see <link href=\"help:gnome-help/net-default-email\">the GNOME "
+"Desktop Help</link>."
 msgstr ""
-"Reportez-vous au <link href=\"help:gnome-help/net-default-email\">manuel du "
-"bureau GNOME</link>."
+"Reportez-vous au <link href=\"help:gnome-help/net-default-email\">manuel de  "
+"GNOME Desktop</link>."
 
-#. (itstool) path: section/title
-#: C/default-browser.page:88
+#: C/default-browser.page:88(section/title)
 msgid "Advanced options"
 msgstr "Options avancées"
 
-#. (itstool) path: note/p
-#: C/default-browser.page:89
+#: C/default-browser.page:89(note/p)
 msgid ""
 "If you have a technical background you can also tweak these settings by "
 "defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps."
@@ -3025,20 +2818,17 @@ msgstr ""
 "en définissant des gestionnaires de schéma dans  <file>$HOME/.local/share/"
 "applications/mimeapps.list</file>."
 
-#. (itstool) path: info/desc
-#: C/deleting-appointments.page:5
+#: C/deleting-appointments.page:5(info/desc)
 msgid "Deleting calendar entries to reduce the size of the mailbox."
 msgstr ""
 "Supprimer les entrées d'agenda pour réduire la taille de la boîte aux "
 "lettres."
 
-#. (itstool) path: page/title
-#: C/deleting-appointments.page:20
+#: C/deleting-appointments.page:20(page/title)
 msgid "Deleting old appointments permanently"
 msgstr "Suppression définitive d'anciens rendez-vous"
 
-#. (itstool) path: page/p
-#: C/deleting-appointments.page:22
+#: C/deleting-appointments.page:22(page/p)
 msgid ""
 "To Purge old entries in a calendar, go to <guiseq><gui>Actions</"
 "gui><gui>Purge</gui></guiseq> in the Calendar view. You will be asked how "
@@ -3053,26 +2843,21 @@ msgstr ""
 "actuellement ouvert (sélectionné dans la liste des agendas sur la gauche) ; "
 "les autres agendas restent inchangés."
 
-#. (itstool) path: info/desc
-#: C/deleting-emails.page:5
+#: C/deleting-emails.page:5(info/desc)
 msgid "Deleting emails or attachments to reduce the size of the mailbox."
 msgstr ""
 "Supprimer les courriels ou les pièces jointes pour réduire la taille de la "
 "boîte aux lettres."
 
-#. (itstool) path: page/title
-#: C/deleting-emails.page:26
+#: C/deleting-emails.page:26(page/title)
 msgid "Deleting emails or attachments permanently"
 msgstr "Suppression définitive des courriels ou des pièces jointes"
 
-#. (itstool) path: section/title
-#: C/deleting-emails.page:29 C/import-supported-file-formats.page:28
-#: C/intro-main-window.page:35
-msgid "Mail"
-msgstr "Messagerie"
+#: C/deleting-emails.page:29(section/title)
+msgid "Emails"
+msgstr "Courriels"
 
-#. (itstool) path: section/p
-#: C/deleting-emails.page:30
+#: C/deleting-emails.page:30(section/p)
 msgid ""
 "Evolution deletes emails on IMAP servers by <em>marking</em> the messages "
 "for deletion; space is not freed until you <em>expunge</em> the marked "
@@ -3082,8 +2867,7 @@ msgstr ""
 "les messages pour suppression ; l'espace n'est pas libéré tant que vous ne "
 "<em>nettoyez</em> pas les courriels marqués."
 
-#. (itstool) path: section/p
-#: C/deleting-emails.page:32
+#: C/deleting-emails.page:32(section/p)
 msgid ""
 "To Expunge a specific folder, go to <guiseq><gui>Folder</gui><gui>Expunge</"
 "gui></guiseq> or press <keyseq><key>Ctrl</key><key>E</key></keyseq>. To "
@@ -3096,13 +2880,11 @@ msgstr ""
 "<guiseq><gui>Fichier</gui><gui>Vider la corbeille</gui></guiseq>. Cela "
 "s'applique également aux autres types de compte."
 
-#. (itstool) path: section/title
-#: C/deleting-emails.page:36
+#: C/deleting-emails.page:36(section/title)
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#. (itstool) path: section/p
-#: C/deleting-emails.page:37
+#: C/deleting-emails.page:37(section/p)
 msgid ""
 "To delete the attachments of an email, select the message and click "
 "<guiseq><gui>Message</gui><gui>Remove Attachments</gui></guiseq>."
@@ -3111,8 +2893,7 @@ msgstr ""
 "cliquez sur <guiseq><gui>Message</gui><gui>Supprimer les pièces jointes</"
 "gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/deleting-to-free-disk-space.page:5
+#: C/deleting-to-free-disk-space.page:5(info/desc)
 msgid ""
 "Deleting emails and calendar entries to reduce the size of the files used by "
 "Evolution."
@@ -3120,26 +2901,22 @@ msgstr ""
 "Supprimer les courriels et des entrées d'agenda pour réduire la taille des "
 "fichiers utilisés par Evolution."
 
-#. (itstool) path: page/title
-#: C/deleting-to-free-disk-space.page:20
+#: C/deleting-to-free-disk-space.page:20(page/title)
 msgid "Freeing disk space by deleting items"
 msgstr "Suppression d'éléments pour libérer de l'espace disque"
 
-#. (itstool) path: info/desc
-#: C/exchange-connectors-overview.page:7
+#: C/exchange-connectors-overview.page:7(info/desc)
 msgid ""
 "Which additional package to install in order to connect to an Exchange "
 "server."
 msgstr ""
 "Quel paquet supplémentaire installer pour se connecter à un serveur Exchange."
 
-#. (itstool) path: page/title
-#: C/exchange-connectors-overview.page:22
+#: C/exchange-connectors-overview.page:22(page/title)
 msgid "Choosing the right connector"
 msgstr "Choix du bon connecteur"
 
-#. (itstool) path: page/p
-#: C/exchange-connectors-overview.page:24
+#: C/exchange-connectors-overview.page:24(page/p)
 msgid ""
 "Depending on the version of the Microsoft Exchange server that you would "
 "like to connect to it is required to make sure that an additional package is "
@@ -3149,8 +2926,7 @@ msgstr ""
 "vous connecter, il est nécessaire de s'assurer qu'un paquet supplémentaire "
 "est installé qui fournit cette fonctionnalité."
 
-#. (itstool) path: page/p
-#: C/exchange-connectors-overview.page:26
+#: C/exchange-connectors-overview.page:26(page/p)
 msgid ""
 "For Microsoft Exchange 2007, 2010 and newer it is recommended to use the "
 "package <sys>evolution-ews</sys>."
@@ -3158,19 +2934,16 @@ msgstr ""
 "Pour Microsoft Exchange 2007, 2010 et plus récents, il est recommandé "
 "d'utiliser le paquet <sys>evolution-ews</sys>."
 
-#. (itstool) path: note/p
-#. (itstool) path: when/p
-#: C/exchange-connectors-overview.page:30 C/intro-first-run.page:108
+#: C/exchange-connectors-overview.page:30(note/p)
+#: C/intro-first-run.page:108(when/p)
 msgid ""
-"<link action=\"install:evolution-ews\" href=\"https://wiki.gnome.org/Apps/";
-"Evolution#Get_the_Source_Code\" style=\"button\">Install evolution-ews</link>"
+"<link action=\"install:evolution-ews\" href=\"http://projects.gnome.org/";
+"evolution/download\" style=\"button\">Install evolution-ews</link>"
 msgstr ""
-"<link action=\"install:evolution-ews\" href=\"https://wiki.gnome.org/Apps/";
-"Evolution#Get_the_Source_Code\" style=\"button\">Installer evolution-ews</"
-"link>"
+"<link action=\"install:evolution-ews\" href=\"http://projects.gnome.org/";
+"evolution/download\" style=\"button\">Installer evolution-ews</link>"
 
-#. (itstool) path: page/p
-#: C/exchange-connectors-overview.page:36
+#: C/exchange-connectors-overview.page:36(page/p)
 msgid ""
 "For older versions of Microsoft Exchange, or if <sys>evolution-ews</sys> "
 "does not work well for you, try <sys>evolution-mapi</sys>. It uses "
@@ -3185,20 +2958,16 @@ msgstr ""
 "nécessite l'installation d'<sys>OpenChange</sys> et <sys>Samba 4</sys> et "
 "n'est pas aussi performant que <sys>evolution-ews</sys>."
 
-#. (itstool) path: note/p
-#. (itstool) path: when/p
-#: C/exchange-connectors-overview.page:41 C/intro-first-run.page:132
+#: C/exchange-connectors-overview.page:41(note/p)
+#: C/intro-first-run.page:132(when/p)
 msgid ""
-"<link action=\"install:evolution-mapi\" href=\"https://wiki.gnome.org/Apps/";
-"Evolution#Get_the_Source_Code\" style=\"button\">Install evolution-mapi</"
-"link>"
+"<link action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/";
+"evolution/download\" style=\"button\">Install evolution-mapi</link>"
 msgstr ""
-"<link action=\"install:evolution-mapi\" href=\"https://wiki.gnome.org/Apps/";
-"Evolution#Get_the_Source_Code\" style=\"button\">Installer evolution-mapi</"
-"link>"
+"<link action=\"install:evolution-mapi\" href=\"http://projects.gnome.org/";
+"evolution/download\" style=\"button\">Installer evolution-mapi</link>"
 
-#. (itstool) path: note/p
-#: C/exchange-connectors-overview.page:46
+#: C/exchange-connectors-overview.page:46(note/p)
 msgid ""
 "If you are unsure which Microsoft Exchange server version is used, you may "
 "want to contact your system administrator for more information."
@@ -3206,35 +2975,30 @@ msgstr ""
 "Si vous n'êtes pas certain de la version du serveur Microsoft Exchange "
 "utilisée, contactez votre administrateur système."
 
-#. (itstool) path: info/desc
-#. (itstool) path: page/title
-#: C/exchange-placeholder.page:5 C/exchange-placeholder.page:20
+#: C/exchange-placeholder.page:5(info/desc)
+#: C/exchange-placeholder.page:20(page/title)
 msgid "Connecting to Exchange Servers"
 msgstr "Connexion aux serveurs Exchange"
 
-#. (itstool) path: page/p
-#: C/exchange-placeholder.page:22
+#: C/exchange-placeholder.page:22(page/p)
 msgid ""
-"For topics not covered here please refer to the <link href=\"https://help.";
-"gnome.org/users/evolution/2.32/usage-exchange.html\">old Evolution manual</"
-"link>."
+"For topics not covered here please refer to the <link href=\"http://library.";
+"gnome.org/users/evolution/2.32/usage-exchange.html.en\">old Evolution "
+"manual</link>."
 msgstr ""
 "Pour les sujets non abordés ici, référez-vous à l'<link href=\"http://";
 "library.gnome.org/users/evolution/2.32/usage-exchange.html.en\">ancien "
-"manuel d'<app>Evolution</app></link>."
+"manuel d'Evolution</link>."
 
-#. (itstool) path: info/desc
-#: C/exporting-data-calendar.page:5
+#: C/exporting-data-calendar.page:5(info/desc)
 msgid "How to export calendar data from <app>Evolution</app>."
 msgstr "Comment exporter des données d'agenda à partir d'<app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/exporting-data-calendar.page:20
+#: C/exporting-data-calendar.page:20(page/title)
 msgid "Exporting calendar data"
 msgstr "Exportation d'agendas"
 
-#. (itstool) path: page/p
-#: C/exporting-data-calendar.page:22
+#: C/exporting-data-calendar.page:22(page/p)
 msgid ""
 "To export a complete calendar, right-click on the calendar in the list of "
 "calendars and click <gui>Save as</gui>. Available formats are iCalendar "
@@ -3245,41 +3009,40 @@ msgstr ""
 "disponibles sont le format iCalendar (ICS, recommandé), valeurs séparées par "
 "des virgules (CSV) et format RDF."
 
-#. (itstool) path: page/p
-#: C/exporting-data-calendar.page:23
+#: C/exporting-data-calendar.page:23(page/p)
+#, fuzzy
+#| msgid ""
+#| "If you want to export only one contact, click <guiseq><gui>File</"
+#| "gui><gui>Save as vCard</gui></guiseq> or right-click on the contact and "
+#| "click <gui>Save as vCard</gui>."
 msgid ""
 "If you want to export only one appointment (or task or memo), either select "
-"the appointment and select <guiseq><gui>File</gui><gui>Save as iCalendar…</"
+"the appointment and select <guiseq><gui>File</gui><gui>Save as iCalendar...</"
 "gui></guiseq>, or right-click on the appointment and click <gui>Save as "
-"iCalendar…</gui>."
+"iCalendar...</gui>."
 msgstr ""
-"Si vous voulez exporter seulement un rendez-vous (ou tâche ou mémo), "
-"sélectionnez le rendez-vous et choisissez <guiseq><gui>Fichier</"
-"gui><gui>Enregistrer en tant que iCalendar...</gui></guiseq>, ou sinon "
-"faites un clic droit sur le rendez-vous et choisissez <gui>Enregistrer en "
-"tant que iCalendar...</gui>."
+"Si vous voulez exporter seulement un contact, cliquez sur "
+"<guiseq><gui>Fichier</gui><gui>Enregistrer comme vCard</gui></guiseq> ou "
+"faites un clic-droit sur le contact et cliquez sur <gui>Enregistrer comme "
+"vCard</gui>."
 
-#. (itstool) path: info/desc
-#: C/exporting-data-contacts.page:5
+#: C/exporting-data-contacts.page:5(info/desc)
 msgid "How to export contacts data from <app>Evolution</app>."
 msgstr ""
 "Comment exporter des données de contacts à partir d'<app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/exporting-data-contacts.page:23
+#: C/exporting-data-contacts.page:23(page/title)
 msgid "Exporting contacts data"
 msgstr "Exportation de contacts"
 
-#. (itstool) path: page/p
-#: C/exporting-data-contacts.page:25
+#: C/exporting-data-contacts.page:25(page/p)
 msgid ""
 "Contacts files are stored in a database, but can be saved as a vCard file."
 msgstr ""
 "Les fichiers de contact sont enregistrés dans une base de données mais ils "
 "peuvent être enregistrés comme fichier vCard."
 
-#. (itstool) path: page/p
-#: C/exporting-data-contacts.page:26
+#: C/exporting-data-contacts.page:26(page/p)
 msgid ""
 "To export a complete address book, click <guiseq><gui>File</gui><gui>Save "
 "Address Book As vCard</gui></guiseq>."
@@ -3288,8 +3051,7 @@ msgstr ""
 "<guiseq><gui>Fichier</gui><gui>Enregistrer le carnet d'adresses comme vCard</"
 "gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/exporting-data-contacts.page:27
+#: C/exporting-data-contacts.page:27(page/p)
 msgid ""
 "If you want to export only one contact, click <guiseq><gui>File</"
 "gui><gui>Save as vCard</gui></guiseq> or right-click on the contact and "
@@ -3300,33 +3062,35 @@ msgstr ""
 "faites un clic-droit sur le contact et cliquez sur <gui>Enregistrer comme "
 "vCard</gui>."
 
-#. (itstool) path: info/desc
-#: C/exporting-data-mail.page:5
+#: C/exporting-data-mail.page:5(info/desc)
 msgid "How to export mail data from <app>Evolution</app>."
 msgstr ""
 "Comment exporter des données de courriel à partir d'<app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/exporting-data-mail.page:20
+#: C/exporting-data-mail.page:20(page/title)
 msgid "Exporting mail data"
 msgstr "Exportation de courriels"
 
-#. (itstool) path: page/p
-#: C/exporting-data-mail.page:22
+#: C/exporting-data-mail.page:22(page/p)
+#, fuzzy
+#| msgid ""
+#| "To save an email to a file in <link href=\"https://secure.wikimedia.org/";
+#| "wikipedia/en/wiki/Mbox\">mbox</link> format, select an email and click "
+#| "<guiseq><gui>File</gui><gui>Save as mbox...</gui></guiseq> or right-click "
+#| "on the message and click <gui>Save as mbox...</gui>."
 msgid ""
 "To save an email to a file in <link href=\"https://en.wikipedia.org/wiki/Mbox";
 "\">mbox</link> format, select an email and click <guiseq><gui>File</"
-"gui><gui>Save as mbox…</gui></guiseq> or right-click on the message and "
-"click <gui>Save as mbox…</gui>."
+"gui><gui>Save as mbox...</gui></guiseq> or right-click on the message and "
+"click <gui>Save as mbox...</gui>."
 msgstr ""
 "Pour enregistrer un courriel dans un fichier au format <link href=\"https://";
-"en.wikipedia.org/wiki/Mbox\">mbox</link>, sélectionnez un courriel et "
-"cliquez sur <guiseq><gui>Fichier</gui><gui>Enregistrer comme mbox…</gui></"
-"guiseq> ou faites un clic-droit sur le message et cliquez sur "
-"<gui>Enregistrer comme mbox…</gui>"
+"secure.wikimedia.org/wikipedia/fr/wiki/Mbox\">mbox</link>, sélectionnez un "
+"courriel et cliquez sur <guiseq><gui>Fichier</gui><gui>Enregistrer comme "
+"mbox...</gui></guiseq> ou faites un clic-droit sur le message et cliquez sur "
+"<gui>Enregistrer comme mbox...</gui>."
 
-#. (itstool) path: page/p
-#: C/exporting-data-mail.page:24
+#: C/exporting-data-mail.page:24(page/p)
 msgid ""
 "The same steps apply to save a complete mail folder, but you have to mark "
 "all messages in it first."
@@ -3334,8 +3098,7 @@ msgstr ""
 "Les mêmes étapes s'appliquent pour enregistrer un dossier de courriel "
 "complet mais vous devez sélectionner tous les messages le contenant d'abord."
 
-#. (itstool) path: page/p
-#: C/exporting-data-mail.page:25 C/mail-filters.page:30
+#: C/exporting-data-mail.page:25(page/p) C/mail-filters.page:30(page/p)
 msgid ""
 "You can select all messages in a folder by clicking <guiseq><gui>Edit</"
 "gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</"
@@ -3345,73 +3108,54 @@ msgstr ""
 "<guiseq><gui>Édition</gui><gui>Tout sélectionner</gui></guiseq> ou pressez "
 "<keyseq><key>Ctrl</key><key>A</key></keyseq>."
 
-#. (itstool) path: info/desc
-#: C/exporting-data.page:5
+#: C/exporting-data.page:5(info/desc)
 msgid "How to export data from <app>Evolution</app>."
 msgstr "Comment exporter des données à partir d'<app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/exporting-data.page:20
+#: C/exporting-data.page:20(page/title)
 msgid "Exporting data from <em>Evolution</em>"
 msgstr "Exportation de données à partir d'<app>Evolution</app>"
 
-#. (itstool) path: info/desc
-#: C/google-services.page:5
+#: C/google-services.page:5(info/desc)
 msgid "Using Google services."
 msgstr "Utilisation des services Google."
 
-#. (itstool) path: page/title
-#: C/google-services.page:18
+#: C/google-services.page:18(page/title)
 msgid "Using Google services"
 msgstr "Utilisation des services Google"
 
-#. (itstool) path: info/desc
-#: C/import-apps-mozilla.page:5
+#: C/import-apps-mozilla.page:5(info/desc)
 msgid "Importing data from Mozilla Thunderbird."
 msgstr "Importation de données de Mozilla Thunderbird."
 
-#. (itstool) path: page/title
-#: C/import-apps-mozilla.page:20
+#: C/import-apps-mozilla.page:20(page/title)
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:25 C/import-apps-outlook.page:60
-#: C/import-single-files.page:24
+#: C/import-apps-mozilla.page:25(item/p) C/import-apps-outlook.page:60(item/p)
+#: C/import-single-files.page:24(item/p)
 msgid "Click <guiseq><gui>File</gui><gui>Import</gui></guiseq>."
 msgstr "Cliquez sur <guiseq><gui>Fichier</gui><gui>Importer</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:26 C/import-apps-outlook.page:61
-#: C/import-single-files.page:25
+#: C/import-apps-mozilla.page:26(item/p) C/import-apps-outlook.page:61(item/p)
+#: C/import-single-files.page:25(item/p)
 msgid ""
 "In the <gui>Importer Type</gui> tab, click <gui>Import a single file</gui>."
 msgstr ""
 "Dans l'onglet <gui>Type d'importation</gui>, cliquez sur <gui>Importer un "
 "seul fichier</gui>."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:27
+#: C/import-apps-mozilla.page:27(item/p)
 msgid ""
 "Go to the folder in which Thunderbird stores its data. On a Linux system, "
 "Thunderbird's files are located in the hidden folder <file>$HOME/."
 "thunderbird/12345678</file>. <file>12345678</file> will be a random string. "
 "If you cannot see the <file>.thunderbird</file> folder, make sure to <link "
-"xref=\"help:gnome-help/files-hidden#show-hidden\" href=\"https://help.gnome.";
-"org/users/gnome-help/stable/files-hidden#show-hidden\">show hidden files</"
-"link> in the file selector dialog."
-msgstr ""
-"Allez dans le dossier où Thunderbird stocke ses données. Sous un système "
-"Linux, les fichiers de Thunderbird se trouvent dans le dossier caché <file>"
-"$HOME/.thunderbird/12345678</file>. <file>12345678</file> est une chaîne "
-"aléatoire. Si vous ne trouvez pas le dossier <file>.thunderbird</file>, "
-"vérifiez que <link xref=\"help:gnome-help/files-hidden#show-hidden\" href="
-"\"https://help.gnome.org/users/gnome-help/stable/files-hidden#show-hidden";
-"\">Afficher les fichiers cachés</link> est bien coché dans la boîte de "
-"dialogue du navigateur de fichiers."
-
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:30
+"href=\"help:gnome-help/files-hidden#show-hidden\">show hidden files</link> "
+"in the file selector dialog."
+msgstr ""
+
+#: C/import-apps-mozilla.page:30(item/p)
 msgid ""
 "If you would like to import Thunderbird mail, go to <file>Mail/Local "
 "Folders</file> (for local mail accounts) or <file>ImapMail/servername</file> "
@@ -3419,65 +3163,51 @@ msgid ""
 "your remote mail server. Files without a file ending include your messages "
 "(not the <file>.msf</file> files)."
 msgstr ""
-"Si vous souhaitez importer le courriel de Thunderbird, allez dans "
-"<file>Courriel/Dossiers locaux</file> (pour les comptes courriels locaux) ou "
-"dans <file>Courriel Imap/Nom du serveur</file> (pour les comptes courriels "
-"distants). <file>Nom du serveur</file> est l'adresse de votre fournisseur de "
-"comptes courriels distants. Les fichiers sans extension contiennent vos "
-"messages (pas les fichiers <file>.msf</file>)."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:31
+#: C/import-apps-mozilla.page:31(item/p)
 msgid ""
 "If you would like to import Thunderbird/Lightning calendar data, you may be "
 "able to export your Thunderbird events as an <file>.ical</file>/<file>.ics</"
 "file> file first, and import these files into Evolution. This is required as "
 "Thunderbird stores its calendar data in a non-standard database format."
 msgstr ""
-"Si vous souhaitez importer les données de l'agenda Thunderbird/Lightning, la "
-"bonne méthode consiste à exporter d'abord vos événements Thunderbird sous "
-"forme de fichiers <file>.ical</file>/<file>.ics</file>, puis de les importer "
-"dans Evolution. Cela est indispensable, car Thunderbird ne stocke pas ses "
-"données d'agenda sous forme de base de données standard."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:33 C/import-apps-outlook.page:62
-#: C/import-single-files.page:26
+#: C/import-apps-mozilla.page:33(item/p) C/import-apps-outlook.page:62(item/p)
+#: C/import-single-files.page:26(item/p)
 msgid "The file type will be automatically determined."
 msgstr "Le type de fichier est déterminé automatiquement."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:34
+#: C/import-apps-mozilla.page:34(item/p)
+#, fuzzy
+#| msgid ""
+#| "Choose the destination (e.g. the folder in Evolution) for the imported "
+#| "data."
 msgid ""
 "Choose the destination (e.g. the folder or calendar in Evolution) for the "
 "imported data."
 msgstr ""
-"Choisissez la destination (par ex. le dossier ou l'agenda dans Evolution) "
-"pour les données importées."
+"Choisissez la destination (par ex. de dossier dans Evolution) pour les "
+"données importées."
 
-#. (itstool) path: item/p
-#: C/import-apps-mozilla.page:35 C/import-apps-outlook.page:66
+#: C/import-apps-mozilla.page:35(item/p) C/import-apps-outlook.page:66(item/p)
 msgid "Repeat the import steps until you have imported all your data."
 msgstr ""
 "Effectuez de nouveau les étapes d'importation jusqu'à ce que vous ayez "
 "importé tous les messages."
 
-#. (itstool) path: info/desc
-#: C/import-apps-outlook.page:5
+#: C/import-apps-outlook.page:5(info/desc)
 msgid "Importing data from Microsoft Outlook."
 msgstr "Importer des données de Microsoft Outlook."
 
-#. (itstool) path: page/title
-#: C/import-apps-outlook.page:23
+#: C/import-apps-outlook.page:23(page/title)
 msgid "Outlook"
 msgstr "Outlook"
 
-#. (itstool) path: page/p
-#: C/import-apps-outlook.page:26
+#: C/import-apps-outlook.page:26(page/p)
 msgid ""
 "These steps refer to locally stored data such as POP accounts. For remote "
 "data (like IMAP) this is not necessary, since the data is still on the "
-"server and does not need to be manually transferred. You can set up the "
+"server and does not need to be manually transfered. You can set up the "
 "corresponding account in Evolution and the data will be downloaded."
 msgstr ""
 "Ces étapes de réfèrent à des données enregistrées localement tels que des "
@@ -3486,18 +3216,15 @@ msgstr ""
 "besoin d'être transférées manuellement. Vous pouvez configurer le compte "
 "correspondant dans Evolution et les données seront téléchargées."
 
-#. (itstool) path: section/title
-#: C/import-apps-outlook.page:29
+#: C/import-apps-outlook.page:29(section/title)
 msgid "Prerequisites under Windows"
 msgstr "Pré-requis sous Windows"
 
-#. (itstool) path: section/p
-#: C/import-apps-outlook.page:30
+#: C/import-apps-outlook.page:30(section/p)
 msgid "First, while using Microsoft Windows, prepare your messages for import:"
 msgstr "Tout d'abord, dans Windows, préparez l'importation des messages :"
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:32
+#: C/import-apps-outlook.page:32(item/p)
 msgid ""
 "Find your Outlook files (they normally have the file ending <file>.pst</"
 "file> or <file>.ost</file>):"
@@ -3505,28 +3232,23 @@ msgstr ""
 "Rechercher vos fichiers Outlook (ils possèdent normalement une extension du "
 "type <file>.pst</file> ou <file>.ost</file>) :"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:35
+#: C/import-apps-outlook.page:35(td/p)
 msgid "Windows 7, Windows Vista"
 msgstr "Windows 7, Windows Vista"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:35
+#: C/import-apps-outlook.page:35(td/p)
 msgid "Windows XP"
 msgstr "Windows XP"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:38
+#: C/import-apps-outlook.page:38(td/p)
 msgid "Outlook 2010"
 msgstr "Outlook 2010"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:38
+#: C/import-apps-outlook.page:38(td/p)
 msgid "<file>C:\\Users\\username\\My Documents\\Outlook Files</file>"
 msgstr "<file>C:\\Users\\nom_utilisateur\\My Documents\\Outlook Files</file>"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:38
+#: C/import-apps-outlook.page:38(td/p)
 msgid ""
 "<file>C:\\Documents and Settings\\username\\My Documents\\Outlook Files</"
 "file>"
@@ -3534,20 +3256,17 @@ msgstr ""
 "<file>C:\\Documents and Settings\\nom_utilisateur\\Mes Documents\\Outlook/"
 "file></file>"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:41
+#: C/import-apps-outlook.page:41(td/p)
 msgid "Outlook 2007 and earlier"
 msgstr "Outlook 2007 et antérieurs"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:41
+#: C/import-apps-outlook.page:41(td/p)
 msgid "<file>C:\\Users\\username\\AppData\\Local\\Microsoft\\Outlook</file>"
 msgstr ""
 "<file>C:\\Users\\nom_utilisateur\\Application Data\\Local\\Microsoft"
 "\\Outlook</file>"
 
-#. (itstool) path: td/p
-#: C/import-apps-outlook.page:41
+#: C/import-apps-outlook.page:41(td/p)
 msgid ""
 "<file>C:\\Documents and Settings\\username\\AppData\\Local\\Microsoft"
 "\\Outlook</file>"
@@ -3555,13 +3274,11 @@ msgstr ""
 "<file>C:\\Documents and Settings\\nom_utilisateur\\AppData\\Local\\Microsoft"
 "\\Outlook</file>"
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:44
+#: C/import-apps-outlook.page:44(item/p)
 msgid "(Replace \"username\" by your username.)"
 msgstr "(remplacez « nom_utilisateur » par votre nom d'utilisateur.)"
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:47
+#: C/import-apps-outlook.page:47(item/p)
 msgid ""
 "Copy the Outlook files to the system or partition that Evolution is "
 "installed on."
@@ -3569,8 +3286,7 @@ msgstr ""
 "Copiez les fichiers Outlook sur le système ou la partition où se trouve "
 "Evolution."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:48
+#: C/import-apps-outlook.page:48(item/p)
 msgid ""
 "As your Windows hard drive is probably in the NTFS format, some Linux "
 "systems cannot read it without additional software. You might find it "
@@ -3581,13 +3297,11 @@ msgstr ""
 "être plus simple de copier les dossiers de courrier sur une clé USB ou de "
 "graver un CD."
 
-#. (itstool) path: section/title
-#: C/import-apps-outlook.page:53
+#: C/import-apps-outlook.page:53(section/title)
 msgid "Importing into Evolution"
 msgstr "Importation dans Evolution"
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:55
+#: C/import-apps-outlook.page:55(item/p)
 msgid ""
 "Depending on your last step, either plug in the disk or USB drive with the "
 "data and wait until the file manager window opens, or mount your Windows "
@@ -3597,21 +3311,19 @@ msgstr ""
 "contenant les données et attendez que le gestionnaire de fichiers ouvre et "
 "monte le lecteur Windows."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:56
+#: C/import-apps-outlook.page:56(item/p)
 msgid ""
 "Copy all the mail files into your home directory or another convenient place."
 msgstr ""
 "Copiez tous les fichiers de messages vers votre dossier personnel ou dans un "
 "autre emplacement de votre choix."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:57 C/mail-filters-not-working.page:48
+#: C/import-apps-outlook.page:57(item/p)
+#: C/mail-filters-not-working.page:48(item/p)
 msgid "Start Evolution."
 msgstr "Démarrez Evolution."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:58
+#: C/import-apps-outlook.page:58(item/p)
 msgid ""
 "Optionally select <guiseq><gui>File</gui><gui>New</gui><gui>Mail Folder</"
 "gui></guiseq> to create the <link xref=\"mail-folders\">folders</link> you "
@@ -3621,8 +3333,7 @@ msgstr ""
 "gui><gui>Nouveau</gui><gui>Dossier de courriel</gui></guiseq> pour créer les "
 "<link xref=\"mail-folders\">dossiers</link> nécessaires."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:62
+#: C/import-apps-outlook.page:62(item/p)
 msgid ""
 "Choose the Outlook personal folders (.pst) file that you would like to "
 "import."
@@ -3630,8 +3341,7 @@ msgstr ""
 "Sélectionnez les dossiers personnels Outlook (.pst) que vous désirez "
 "importer."
 
-#. (itstool) path: note/p
-#: C/import-apps-outlook.page:63
+#: C/import-apps-outlook.page:63(note/p)
 msgid ""
 "If the option to import Outlook personal folders (.pst files) is not "
 "available under <guiseq><gui>File</gui><gui>Import</gui><gui>Import single "
@@ -3643,52 +3353,43 @@ msgstr ""
 "gui><gui>Importer un seul fichier</gui><gui>Type de fichier</gui></guiseq>, "
 "il se peut que votre distribution n'ait pas activé cette fonctionnalité."
 
-#. (itstool) path: item/p
-#: C/import-apps-outlook.page:65 C/import-single-files.page:27
+#: C/import-apps-outlook.page:65(item/p) C/import-single-files.page:27(item/p)
 msgid ""
 "Choose the destination (e.g. the folder in Evolution) for the imported data."
 msgstr ""
 "Choisissez la destination (par ex. de dossier dans Evolution) pour les "
 "données importées."
 
-#. (itstool) path: info/desc
-#: C/import-data.page:5
+#: C/import-data.page:5(info/desc)
 msgid "Importing data from another application."
 msgstr "Importer les données d'autres programmes."
 
-#. (itstool) path: page/title
-#: C/import-data.page:20
+#: C/import-data.page:20(page/title)
 msgid "Importing data from another application"
 msgstr "Importation des données d'autres programmes"
 
-#. (itstool) path: section/title
-#: C/import-data.page:23
+#: C/import-data.page:23(section/title)
 msgid "Applications"
 msgstr "Applications"
 
-#. (itstool) path: info/desc
-#: C/import-single-files.page:5
+#: C/import-single-files.page:5(info/desc)
 msgid "Importing single files."
 msgstr "Importer des fichiers isolés."
 
-#. (itstool) path: page/title
-#: C/import-single-files.page:20
+#: C/import-single-files.page:20(page/title)
 msgid "Importing single files"
 msgstr "Importation de fichiers isolés"
 
-#. (itstool) path: page/p
-#: C/import-single-files.page:22
+#: C/import-single-files.page:22(page/p)
 msgid "To import single files (mail, calendar data or contacts):"
 msgstr ""
 "Pour importer des fichiers isolés (courriel, données d'agenda ou contacts) :"
 
-#. (itstool) path: item/p
-#: C/import-single-files.page:26
+#: C/import-single-files.page:26(item/p)
 msgid "Choose the file."
 msgstr "Sélectionnez le fichier."
 
-#. (itstool) path: note/p
-#: C/import-single-files.page:30
+#: C/import-single-files.page:30(note/p)
 msgid ""
 "You can also import contacts that you have received as a vCard attachment of "
 "an email from its attachment menu."
@@ -3696,28 +3397,27 @@ msgstr ""
 "Vous pouvez également importer des contacts que vous avez reçus comme pièce "
 "jointe vCard d'un courriel à partir de son menu des pièces jointes."
 
-#. (itstool) path: info/desc
-#: C/import-supported-file-formats.page:5
+#: C/import-supported-file-formats.page:5(info/desc)
 msgid "Supported file formats for importing data."
 msgstr "Formats de fichier pris en charge pour l'importation de données."
 
-#. (itstool) path: page/title
-#: C/import-supported-file-formats.page:23
+#: C/import-supported-file-formats.page:23(page/title)
 msgid "Supported file formats"
 msgstr "Formats de fichier pris en charge"
 
-#. (itstool) path: page/p
-#: C/import-supported-file-formats.page:25
+#: C/import-supported-file-formats.page:25(page/p)
 msgid "Evolution can import the following types of files:"
 msgstr "Evolution est capable d'importer les types de fichiers suivants :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:30
+#: C/import-supported-file-formats.page:28(section/title)
+msgid "Mail"
+msgstr "Messagerie"
+
+#: C/import-supported-file-formats.page:30(item/p)
 msgid "Berkeley Mailbox (.mbox or no extension):"
 msgstr "Berkeley Mailbox (.mbox ou sans extension) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:32
+#: C/import-supported-file-formats.page:32(item/p)
 msgid ""
 "The email format used by Mozilla, Netscape, Evolution (for local folders "
 "until version 2.32), Eudora, and many other email clients."
@@ -3726,13 +3426,11 @@ msgstr ""
 "dossiers locaux avant la version 2.32), Eudora et bien d'autres logiciels de "
 "messagerie."
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:34
+#: C/import-supported-file-formats.page:34(item/p)
 msgid "Maildir (no extension):"
 msgstr "Maildir (sans extension) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:36
+#: C/import-supported-file-formats.page:36(item/p)
 msgid ""
 "The format used by Evolution (for local folders since version 3.0). There is "
 "no need to import Maildir files as you can <link xref=\"mail-account-manage-"
@@ -3745,13 +3443,11 @@ msgstr ""
 "\">configurer un compte Maildir</link> dans Evolution et pointer vers le "
 "dossier où les fichiers Maildir sont enregistrés."
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:38
+#: C/import-supported-file-formats.page:38(item/p)
 msgid "Outlook Express 5/6 Personal Folders (.dbx):"
 msgstr "Dossiers personnels Outlook Express 5/6 (.dbx) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:40
+#: C/import-supported-file-formats.page:40(item/p)
 msgid ""
 "The email file format used by Microsoft Outlook Express 5/6. For newer "
 "versions PST import is recommended."
@@ -3759,18 +3455,16 @@ msgstr ""
 "Le format de fichier de courriels utilisé par Microsoft Outlook Express 5/6. "
 "Pour les nouvelles versions, l'importation PST est recommandée."
 
-#. (itstool) path: section/title
-#: C/import-supported-file-formats.page:46 C/intro-main-window.page:89
+#: C/import-supported-file-formats.page:46(section/title)
+#: C/intro-main-window.page:89(section/title)
 msgid "Calendar"
 msgstr "Agenda"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:48
+#: C/import-supported-file-formats.page:48(item/p)
 msgid "vCalendar (.vcs):"
 msgstr "vCalendar (.vcs) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:50
+#: C/import-supported-file-formats.page:50(item/p)
 msgid ""
 "A format for storing calendar files, which is generally used by Evolution, "
 "Microsoft Outlook, Sunbird, and Korganizer."
@@ -3778,13 +3472,11 @@ msgstr ""
 "Un format de stockage de fichiers d'agenda, utilisé généralement par "
 "Evolution, MS Outlook, Sunbird et Korganizer."
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:52
+#: C/import-supported-file-formats.page:52(item/p)
 msgid "iCalendar or iCal (.ics):"
 msgstr "iCalendar ou iCal (.ics) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:54
+#: C/import-supported-file-formats.page:54(item/p)
 msgid ""
 "A format for storing calendar files. iCalendar is used by Evolution, "
 "Microsoft Outlook, Palm OS handhelds, and others."
@@ -3792,28 +3484,24 @@ msgstr ""
 "Un format de stockage de fichiers d'agenda. iCalendar est utilisé par "
 "Evolution, Microsoft Outlook, portable Palm OS et d'autres."
 
-#. (itstool) path: section/title
-#: C/import-supported-file-formats.page:60 C/intro-main-window.page:135
+#: C/import-supported-file-formats.page:60(section/title)
+#: C/intro-main-window.page:135(section/title)
 msgid "Contacts"
 msgstr "Contacts"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:62
+#: C/import-supported-file-formats.page:62(item/p)
 msgid "LDAP Data Interchange Format (.ldif):"
 msgstr "LDAP Data Interchange Format (.ldif) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:64
+#: C/import-supported-file-formats.page:64(item/p)
 msgid "A standard data format for contact cards."
 msgstr "Un format de données standard pour les cartes de contacts."
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:66
+#: C/import-supported-file-formats.page:66(item/p)
 msgid "vCard (.vcf, .gcrd):"
 msgstr "vCard (.vcf, .gcrd) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:68
+#: C/import-supported-file-formats.page:68(item/p)
 msgid ""
 "The address book format used by the GNOME, KDE, and many other contact "
 "management applications. You should be able to export to vCard format from "
@@ -3824,18 +3512,15 @@ msgstr ""
 "d'exporter au format vCard depuis n'importe quel programme de carnet "
 "d'adresses."
 
-#. (itstool) path: section/title
-#: C/import-supported-file-formats.page:74
+#: C/import-supported-file-formats.page:74(section/title)
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:76
+#: C/import-supported-file-formats.page:76(item/p)
 msgid "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab):"
 msgstr "Evolution/Mozilla/Outlook CSV/Tab (.csv, .tab) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:78
+#: C/import-supported-file-formats.page:78(item/p)
 msgid ""
 "CSV (Comma-separated values) or Tabulator files saved by using Evolution, "
 "Microsoft Outlook and Mozilla."
@@ -3843,13 +3528,11 @@ msgstr ""
 "Les fichiers Tabulator ou CSV (Comma-separated values : valeurs séparées par "
 "des virgules) enregistrés par Evolution, MS Outlook et Mozilla."
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:80
+#: C/import-supported-file-formats.page:80(item/p)
 msgid "Outlook Personal Folders (.pst):"
 msgstr "Dossiers personnels Outlook (.pst) :"
 
-#. (itstool) path: item/p
-#: C/import-supported-file-formats.page:82
+#: C/import-supported-file-formats.page:82(item/p)
 msgid ""
 "A file format used to store local copies of messages, calendar events, and "
 "other items within Microsoft software such as Microsoft Exchange Client, "
@@ -3862,137 +3545,29 @@ msgstr ""
 "Outlook. Il est aussi appelé « Personal Storage Table » (table "
 "d'enregistrement personnel)."
 
-#. (itstool) path: info/desc
-#: C/index.page:5
-msgid "Manage your email, contacts and schedule"
-msgstr "Gérer courriel, contacts et planification d'événements"
-
-#. (itstool) path: info/title
-#: C/index.page:7
-msgctxt "text"
-msgid "Evolution Mail and Calendar"
-msgstr "Messagerie et agenda d'Evolution"
-
-#. (itstool) path: media/span
-#: C/index.page:25
-msgid "Evolution logo"
-msgstr "Logo d'Evolution"
-
-#. (itstool) path: page/title
-#: C/index.page:23
-msgid "<_:media-1/> Evolution Mail and Calendar"
-msgstr "<_:media-1/> Messagerie et agenda d'Evolution"
-
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/index.page:31 C/intro-application.page:24
-msgid "Getting Started"
-msgstr "Premiers pas"
-
-#. (itstool) path: section/title
-#: C/index.page:35
-msgid "Mail Management"
-msgstr "Gestion des courriels"
-
-#. (itstool) path: section/title
-#: C/index.page:37
-msgid "Advanced Mail Management"
-msgstr "Gestion avancée des courriels"
-
-#. (itstool) path: info/title
-#: C/index.page:40
-msgctxt "link"
-msgid "Advanced Mail Management (IMAP+ accounts)"
-msgstr "Gestion avancée des courriels (comptes IMAP+)"
-
-#. (itstool) path: section/title
-#: C/index.page:42 C/intro-first-run.page:54
-msgid "IMAP+"
-msgstr "IMAP+"
-
-#. (itstool) path: section/title
-#: C/index.page:48
-msgid "Mail Composing"
-msgstr "Édition de courriel"
-
-#. (itstool) path: section/title
-#: C/index.page:50
-msgid "Advanced Mail Composing"
-msgstr "Édition avancée de courriel"
-
-#. (itstool) path: section/title
-#: C/index.page:55
-msgid "Calendar Management"
-msgstr "Gestion d'agenda"
-
-#. (itstool) path: section/title
-#: C/index.page:57
-msgid "Advanced Calendar Management"
-msgstr "Gestion avancée d'agenda"
-
-#. (itstool) path: section/title
-#: C/index.page:62
-msgid "Contacts Management"
-msgstr "Gestion des contacts"
-
-#. (itstool) path: section/title
-#: C/index.page:66
-msgid "Memos and Tasks Management"
-msgstr "Gestion des mémos et des tâches"
-
-#. (itstool) path: section/title
-#: C/index.page:70
-msgid "Data Migration and Synchronization"
-msgstr "Synchronisation et migration des données"
-
-#. (itstool) path: section/title
-#: C/index.page:74
-msgid "Corporate Environments"
-msgstr "Environnement appartenant à une société"
-
-#. (itstool) path: section/title
-#: C/index.page:76
-msgid "Microsoft Exchange"
-msgstr "Microsoft Exchange"
-
-#. (itstool) path: section/title
-#: C/index.page:81
-msgid "Tracking down Problems"
-msgstr "Dépistage des problèmes"
-
-#. (itstool) path: section/title
-#: C/index.page:85
-msgid "Common Mail Questions and Problems"
-msgstr "Problèmes et questions courants à propos des courriels"
-
-#. (itstool) path: section/title
-#: C/index.page:89
-msgid "Common Other Questions and Problems"
-msgstr "Autres questions et problèmes courants"
-
-#. (itstool) path: section/title
-#: C/index.page:93
-msgid "Further reading"
-msgstr "Lecture complémentaire"
-
-#. (itstool) path: info/desc
-#: C/intro-application.page:5
+#: C/intro-application.page:5(info/desc)
 msgid "An introduction to Evolution."
 msgstr "Une introduction à Evolution."
 
-#. (itstool) path: page/p
-#: C/intro-application.page:25
+#: C/intro-application.page:25(page/p)
 msgid ""
-"Evolution allows you to access your personal information like your "
-"calendars, mail, address books and tasks in one place."
+"Evolution is a stable and versatile personal information manager for the "
+"GNOME project. Evolution allows you to keep your calendars, mail, address "
+"books and tasks in one place."
 msgstr ""
-"<app>Evolution</app> est un gestionnaire d'informations personnelles stable "
-"et polyvalent pour le projet GNOME. <app>Evolution</app> vous permet de "
-"conserver vos agendas, courriels, carnet d'adresses et tâches au même "
-"endroit."
+"Evolution est un gestionnaire d'informations personnelles stable et "
+"polyvalent pour le projet GNOME. Evolution vous permet de conserver vos "
+"agendas, courriels, carnet d'adresses et tâches au même endroit."
 
-#. (itstool) path: page/p
-#: C/intro-application.page:27
+#: C/intro-application.page:27(page/p)
+#, fuzzy
+#| msgid ""
+#| "By default Evolution opens the mail view. This is were you can view all "
+#| "your mail. You can change to other views of the application by going to "
+#| "the bottom of the left pane in the window (the so-called \"switcher\") "
+#| "and selecting the desired view. <link type=\"topic\" xref=\"intro-main-"
+#| "window\">Click here</link> for more information on the elements of the "
+#| "window."
 msgid ""
 "By default Evolution opens the mail view. This is were you can view all your "
 "mail. You can change to other views of the application by going to the "
@@ -4003,11 +3578,11 @@ msgstr ""
 "Par défaut, Evolution ouvre la vue des courriels. C'est ici que vous pouvez "
 "consulter tous vos courriels. Vous pouvez basculer vers d'autres vues de "
 "l'application en allant en bas du panneau gauche de la fenêtre (appelé le "
-"sélecteur) et en choisissant la vue désirée. <link xref=\"intro-main-window"
-"\">En savoir plus sur les éléments de la fenêtre principale.</link>"
+"sélecteur) et en choisissant la vue désirée. <link type=\"topic\" xref="
+"\"intro-main-window\">Cliquez ici</link> pour plus d'informations sur les "
+"éléments de la fenêtre."
 
-#. (itstool) path: note/p
-#: C/intro-application.page:29
+#: C/intro-application.page:29(note/p)
 msgid ""
 "When Evolution starts, it remembers the last view that you used. However you "
 "can also explicitly start Evolution in a specific view. For the calendar "
@@ -4019,20 +3594,17 @@ msgstr ""
 "Cependant vous pouvez démarrer explicitement Evolution dans une vue précise. "
 "Pour la vue de l'agenda, utilisez la commande <cmd>evolution --"
 "component=calendar</cmd> dans l'application <app>Terminal</app>. Les autres "
-"options disponibles sont « Courriel », « Contacts », « Tâches » et « Mémos »."
+"options disponibles sont « mail », « contacts », « tasks » et « memos »."
 
-#. (itstool) path: info/desc
-#: C/intro-first-run.page:8
+#: C/intro-first-run.page:8(info/desc)
 msgid "Running Evolution for the very first time."
 msgstr "Tout premier lancement d'Evolution."
 
-#. (itstool) path: page/title
-#: C/intro-first-run.page:23
+#: C/intro-first-run.page:23(page/title)
 msgid "Starting <app>Evolution</app> for the first time"
 msgstr "Lancement d'<app>Evolution</app> pour la première fois"
 
-#. (itstool) path: page/p
-#: C/intro-first-run.page:25
+#: C/intro-first-run.page:25(page/p)
 msgid ""
 "The first time you run Evolution, it opens the First-Run Assistant to help "
 "you set up email accounts and <link xref=\"import-data\">import data from "
@@ -4043,50 +3615,53 @@ msgstr ""
 "xref=\"import-data\">importer des données provenant d'autres applications.</"
 "link>"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:32
+#: C/intro-first-run.page:32(section/title)
 msgid "Restore from backup"
 msgstr "Restauration à partir d'une archive"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:33
+#: C/intro-first-run.page:33(section/p)
+#, fuzzy
+#| msgid ""
+#| "You will be asked whether to restore from a backup of a previous version. "
+#| "If you have such a backup, continue <link xref=\"backup-restore#restore"
+#| "\">here</link>. Otherwise, go to the next page."
 msgid ""
 "You will be asked whether to restore from a backup of a previous version. If "
 "you do not have a backup, go to the next page."
 msgstr ""
 "Il vous sera demandé si vous voulez restaurer une sauvegarde d'une version "
-"précédente. Si vous ne possédez pas de sauvegarde, passez à la page suivante."
+"précédente. Si vous possédez une telle sauvegarde, continuez <link xref="
+"\"backup-restore#restore\">ici</link>. Sinon passez à la page suivante."
 
-#. (itstool) path: info/title
-#: C/intro-first-run.page:37
+#: C/intro-first-run.page:37(info/title)
+#, fuzzy
+#| msgid "Restore from backup"
 msgctxt "ui:collapsed"
 msgid "Show how to restore from a backup"
-msgstr "Affichage de la procédure de restauration à partir d'une archive"
-
-#. (itstool) path: section/title
-#: C/intro-first-run.page:47 C/mail-receiving-options-exchange-ews.page:23
-#: C/mail-receiving-options-exchange-mapi.page:23
-#: C/mail-receiving-options-imap-plus.page:26
-#: C/mail-receiving-options-local-delivery.page:23
-#: C/mail-receiving-options-maildir-format-directories.page:23
-#: C/mail-receiving-options-mh-format-directories.page:23
-#: C/mail-receiving-options-pop.page:30
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:23
-#: C/mail-receiving-options-unix-mbox-spool-file.page:23
-#: C/mail-receiving-options-usenet-news.page:26
+msgstr "Restauration à partir d'une archive"
+
+#: C/intro-first-run.page:47(section/title)
+#: C/mail-receiving-options-exchange-ews.page:23(section/title)
+#: C/mail-receiving-options-exchange-mapi.page:23(section/title)
+#: C/mail-receiving-options-imap-plus.page:26(section/title)
+#: C/mail-receiving-options-local-delivery.page:23(section/title)
+#: C/mail-receiving-options-maildir-format-directories.page:23(section/title)
+#: C/mail-receiving-options-mh-format-directories.page:23(section/title)
+#: C/mail-receiving-options-pop.page:30(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:23(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:23(section/title)
+#: C/mail-receiving-options-usenet-news.page:26(section/title)
 msgid "Receiving Email"
 msgstr "Réception du courriel"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:48
+#: C/intro-first-run.page:48(section/p)
 msgid ""
 "First, choose the server type from the <gui>Server Type</gui> drop-down list."
 msgstr ""
 "Premièrement, choisissez le type de serveur dans la liste déroulante des "
 "<gui>types de serveurs</gui>."
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:49
+#: C/intro-first-run.page:49(section/p)
 msgid ""
 "If you are unsure about the type of server to choose, ask your system "
 "administrator or Internet Service Provider."
@@ -4094,8 +3669,7 @@ msgstr ""
 "En cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#. (itstool) path: note/p
-#: C/intro-first-run.page:51
+#: C/intro-first-run.page:51(note/p)
 msgid ""
 "Later on, if you want to change an account, or if you want to create another "
 "one, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
@@ -4109,125 +3683,137 @@ msgstr ""
 "sur <gui style=\"button\">Modifier</gui>. Vous pouvez également créer un "
 "nouveau compte en cliquant sur <gui style=\"button\">Ajouter</gui>."
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:55
+#: C/intro-first-run.page:55(section/p)
+#, fuzzy
+#| msgid ""
+#| "IMAP: Keeps the mail on the server so you can access your mail from "
+#| "multiple systems."
 msgid ""
 "Keeps the mail on the server so you can access your mail from multiple "
 "systems."
 msgstr ""
-"Conserve les messages sur le serveur afin de pouvoir y accéder depuis "
+"IMAP : conserve les messages sur le serveur afin de pouvoir y accéder depuis "
 "plusieurs endroits."
 
-#. (itstool) path: info/title
-#: C/intro-first-run.page:59 C/intro-first-run.page:75
-#: C/intro-first-run.page:91 C/intro-first-run.page:115
-#: C/intro-first-run.page:139 C/intro-first-run.page:155
-#: C/intro-first-run.page:171 C/intro-first-run.page:187
-#: C/intro-first-run.page:203 C/intro-first-run.page:219
-#: C/intro-first-run.page:246
+#: C/intro-first-run.page:59(info/title) C/intro-first-run.page:75(info/title)
+#: C/intro-first-run.page:91(info/title)
+#: C/intro-first-run.page:115(info/title)
+#: C/intro-first-run.page:139(info/title)
+#: C/intro-first-run.page:155(info/title)
+#: C/intro-first-run.page:171(info/title)
+#: C/intro-first-run.page:187(info/title)
+#: C/intro-first-run.page:203(info/title)
+#: C/intro-first-run.page:219(info/title)
+#: C/intro-first-run.page:246(info/title)
 msgctxt "ui:collapsed"
 msgid "Show how to configure this account type"
-msgstr "Affichage de la procédure pour configurer ce type de compte"
+msgstr ""
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:61 C/mail-receiving-options-imap-plus.page:23
+#: C/intro-first-run.page:61(section/title)
+#: C/mail-receiving-options-imap-plus.page:23(page/title)
 msgid "IMAP+ receiving options"
 msgstr "Options de réception IMAP+"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:70
+#: C/intro-first-run.page:70(section/title)
 msgid "POP"
-msgstr "POP"
+msgstr ""
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:71
+#: C/intro-first-run.page:71(section/p)
+#, fuzzy
+#| msgid "POP: Downloads your email to your hard disk."
 msgid "Downloads your email to your hard disk."
-msgstr "Télécharge vos courriels sur votre disque dur."
+msgstr "POP : télécharge vos courriels sur votre disque dur."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:77 C/mail-receiving-options-pop.page:27
+#: C/intro-first-run.page:77(section/title)
+#: C/mail-receiving-options-pop.page:27(page/title)
 msgid "POP receiving options"
 msgstr "Options de réception POP"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:86
+#: C/intro-first-run.page:86(section/title)
 msgid "USENET News"
-msgstr "Nouvelles sur USENET"
+msgstr ""
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:87
+#: C/intro-first-run.page:87(section/p)
+#, fuzzy
+#| msgid ""
+#| "USENET News: Connects to a news server and downloads a list of available "
+#| "news digests."
 msgid ""
 "Connects to a news server and downloads a list of available news digests."
 msgstr ""
-"Se connecte à un serveur de nouvelles et télécharge une liste des résumés "
-"disponibles."
+"USENET News : se connecte à un serveur de nouvelles et télécharge une liste "
+"des résumés disponibles."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:93 C/mail-receiving-options-usenet-news.page:23
+#: C/intro-first-run.page:93(section/title)
+#: C/mail-receiving-options-usenet-news.page:23(page/title)
 msgid "Usenet news receiving options"
 msgstr "Options de réception des nouvelles Usenet"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:102
+#: C/intro-first-run.page:102(section/title)
+#, fuzzy
+#| msgid "Exchange Settings"
 msgid "Exchange EWS"
-msgstr "Exchange EWS"
+msgstr "Paramètres Exchange"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:103
+#: C/intro-first-run.page:103(section/p)
+#, fuzzy
+#| msgid ""
+#| "Exchange EWS: For connecting to a Microsoft Exchange 2007/2010 or "
+#| "OpenChange server. Note that this is currently under development and will "
+#| "replace the <gui>Exchange MAPI</gui> account type in the future. It might "
+#| "not be available yet for your distribution."
 msgid ""
 "For connecting to a Microsoft Exchange 2007/2010 or OpenChange server. Note "
 "that this is currently under development and will replace the <gui>Exchange "
 "MAPI</gui> account type in the future. It might not be available yet for "
 "your distribution."
 msgstr ""
-"Pour se connecter à un serveur Microsoft Exchange 2007/2010 ou OpenChange. "
-"Notez que ceci est actuellement en cours de développement et remplacera le "
-"type de compte <gui>Exchange MAPI</gui> dans le futur. Il se peut qu'il ne "
-"soit pas encore disponible dans votre distribution."
+"Exchange EWS : pour se connecter à un serveur Microsoft Exchange 2007/2010 "
+"ou OpenChange. Notez que ceci est actuellement en cours de développement et "
+"remplacera le type de compte <gui>Exchange MAPI</gui> dans le futur. Il se "
+"peut qu'il ne soit pas encore disponible dans votre distribution."
 
-#. (itstool) path: note/p
-#: C/intro-first-run.page:105
+#: C/intro-first-run.page:105(note/p)
 msgid "This requires having the <sys>evolution-ews</sys> package installed."
 msgstr "Pour cela, le paquet <sys>evolution-ews</sys> doit être installé."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:117 C/mail-receiving-options-exchange-ews.page:20
+#: C/intro-first-run.page:117(section/title)
+#: C/mail-receiving-options-exchange-ews.page:20(page/title)
 msgid "Exchange Web Services receiving options"
 msgstr "Options de réception Exchange Web Services"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:126
+#: C/intro-first-run.page:126(section/title)
+#, fuzzy
+#| msgid "Exchange MAPI account settings"
 msgid "Exchange MAPI"
-msgstr "Exchange MAPI"
+msgstr "Paramètres de compte Exchange MAPI"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:127
+#: C/intro-first-run.page:127(section/p)
+#, fuzzy
+#| msgid ""
+#| "Exchange MAPI: For connecting to a Microsoft Exchange 2007/2010 or "
+#| "OpenChange server."
 msgid "For connecting to a Microsoft Exchange 2007/2010 or OpenChange server."
 msgstr ""
-"Pour se connecter à un serveur Microsoft Exchange 2007/2010 ou OpenChange."
+"Exchange MAPI : pour se connecter à un serveur Microsoft Exchange 2007/2010 "
+"ou OpenChange."
 
-#. (itstool) path: note/p
-#: C/intro-first-run.page:129
+#: C/intro-first-run.page:129(note/p)
 msgid "This requires having the <sys>evolution-mapi</sys> package installed."
 msgstr "Pour cela, le paquet <sys>evolution-mapi</sys> doit être installé."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:141 C/mail-receiving-options-exchange-mapi.page:20
+#: C/intro-first-run.page:141(section/title)
+#: C/mail-receiving-options-exchange-mapi.page:20(page/title)
 msgid "Exchange MAPI receiving options"
 msgstr "Options de réception Exchange MAPI"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:150
+#: C/intro-first-run.page:150(section/title)
+#, fuzzy
+#| msgid "Local delivery receiving options"
 msgid "Local delivery"
-msgstr "Distribution locale"
+msgstr "Options de réception de la distribution locale des messages"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:151
+#: C/intro-first-run.page:151(section/p)
 msgid ""
 "Local delivery: If you want to move email from the spool (the location where "
 "mail waits for delivery) and store it in your home directory. You need to "
@@ -4243,60 +3829,61 @@ msgstr ""
 "choisissez de préférence l'option <gui>Fichier Unix standard de spool mbox</"
 "gui>."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:157 C/mail-receiving-options-local-delivery.page:20
+#: C/intro-first-run.page:157(section/title)
+#: C/mail-receiving-options-local-delivery.page:20(page/title)
 msgid "Local delivery receiving options"
 msgstr "Options de réception de la distribution locale des messages"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:166
+#: C/intro-first-run.page:166(section/title)
+#, fuzzy
+#| msgid "MH Format Mail Directories account settings"
 msgid "MH-Format Mail Directories"
-msgstr "Répertoires de courriel au format MH"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format MH"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:167
+#: C/intro-first-run.page:167(section/p)
+#, fuzzy
+#| msgid ""
+#| "MH-Format Mail Directories: For downloading email using MH or another MH-"
+#| "style application."
 msgid "For downloading email using MH or another MH-style application."
 msgstr ""
-"Pour télécharger votre courriel avec MH ou une autre application dans le "
-"style de MH."
+"Répertoires de courriel au format MH : pour télécharger votre courriel avec "
+"MH ou une autre application dans le style de MH."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:173
-#: C/mail-receiving-options-mh-format-directories.page:20
+#: C/intro-first-run.page:173(section/title)
+#: C/mail-receiving-options-mh-format-directories.page:20(page/title)
 msgid "MH-format mail directories receiving options"
 msgstr "Options de réception pour les répertoires de courriel au format MH"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:182
+#: C/intro-first-run.page:182(section/title)
+#, fuzzy
+#| msgid "Maildir Format Mail Directories account settings"
 msgid "Maildir-Format Mail Directories"
-msgstr "Répertoires de courriel au format Maildir"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format Maildir"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:183
+#: C/intro-first-run.page:183(section/p)
 msgid ""
 "Maildir-Format Mail Directories: For downloading your email using Qmail or "
 "another Maildir-style application."
 msgstr ""
-"Pour télécharger votre courriel avec Qmail ou une autre application dans le "
-"style de Maildir."
+"Répertoires de courriel au format Maildir : pour télécharger votre courriel "
+"avec Qmail ou une autre application dans le style de Maildir."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:189
-#: C/mail-receiving-options-maildir-format-directories.page:20
+#: C/intro-first-run.page:189(section/title)
+#: C/mail-receiving-options-maildir-format-directories.page:20(page/title)
 msgid "Maildir-format mail directories receiving options"
 msgstr ""
 "Options de réception pour les répertoires de courriel au format Maildir"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:198
+#: C/intro-first-run.page:198(section/title)
+#, fuzzy
+#| msgid "Standard Unix mbox spool file receiving options"
 msgid "Standard Unix mbox spool file"
-msgstr "Fichier Unix standard de spool mbox"
+msgstr "Options de réception utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:199
+#: C/intro-first-run.page:199(section/p)
 msgid ""
 "Standard Unix mbox spool file: For reading and storing email in the mail "
 "spool file on your local system."
@@ -4304,20 +3891,19 @@ msgstr ""
 "Fichier Unix standard de spool mbox : pour lire et enregistrer les courriels "
 "dans le fichier de spool de courriel de votre système local."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:205
-#: C/mail-receiving-options-unix-mbox-spool-file.page:20
+#: C/intro-first-run.page:205(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:20(page/title)
 msgid "Standard Unix mbox spool file receiving options"
 msgstr "Options de réception utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:214
+#: C/intro-first-run.page:214(section/title)
+#, fuzzy
+#| msgid "Standard Unix mbox spool directory receiving options"
 msgid "Standard Unix mbox spool directory"
-msgstr "Répertoire Unix standard de spool mbox"
+msgstr ""
+"Options de réception utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:215
+#: C/intro-first-run.page:215(section/p)
 msgid ""
 "Standard Unix mbox spool directory: For reading and storing email in the "
 "mail spool directory on your local system."
@@ -4325,90 +3911,89 @@ msgstr ""
 "Répertoire Unix standard de spool mbox : pour lire et enregistrer les "
 "courriels dans le répertoire de spool de courriel de votre système local."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:221
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:20
+#: C/intro-first-run.page:221(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:20(page/title)
 msgid "Standard Unix mbox spool directory receiving options"
 msgstr ""
 "Options de réception utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:230
+#: C/intro-first-run.page:230(section/title)
 msgid "None"
-msgstr "Aucun"
+msgstr ""
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:231
+#: C/intro-first-run.page:231(section/p)
+#, fuzzy
+#| msgid "None: If you do not plan to use Evolution for receiving email."
 msgid "If you do not plan to use Evolution for receiving email."
 msgstr ""
-"Si vous n'avez pas l'intention d'utiliser Evolution pour recevoir du "
+"Aucun : si vous n'avez pas l'intention d'utiliser Evolution pour recevoir du "
 "courriel."
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:237 C/mail-displaying-character-encodings.page:32
+#: C/intro-first-run.page:237(section/title)
+#: C/mail-displaying-character-encodings.page:32(section/title)
 msgid "Sending mail"
 msgstr "Envoi du courriel"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:238
+#: C/intro-first-run.page:238(section/p)
 msgid "Available server types are:"
 msgstr "Les types de serveur disponibles sont :"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:241
+#: C/intro-first-run.page:241(section/title)
 msgid "SMTP"
-msgstr "SMTP"
+msgstr ""
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:242
+#: C/intro-first-run.page:242(section/p)
+#, fuzzy
+#| msgid ""
+#| "SMTP: Sends mail using an outbound mail server. This is the most common "
+#| "choice for sending mail."
 msgid ""
 "Sends mail using an outbound mail server. This is the most common choice for "
 "sending mail."
 msgstr ""
-"Envoie le courriel en utilisant un serveur d'expédition de messagerie. C'est "
-"le choix le plus courant pour envoyer du courriel."
+"SMTP : envoie le courriel en utilisant un serveur d'expédition de "
+"messagerie. C'est le choix le plus courant pour envoyer du courriel."
 
-#. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/intro-first-run.page:248 C/mail-sending-options-smtp.page:26
+#: C/intro-first-run.page:248(section/title)
+#: C/mail-sending-options-smtp.page:26(page/title)
 msgid "SMTP sending options"
 msgstr "Options d'envoi SMTP"
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:257
+#: C/intro-first-run.page:257(section/title)
+#, fuzzy
+#| msgid "Sending mail"
 msgid "Sendmail"
-msgstr "Sendmail"
+msgstr "Envoi du courriel"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:258
+#: C/intro-first-run.page:258(section/p)
+#, fuzzy
+#| msgid ""
+#| "Sendmail: Uses the <app>Sendmail</app> application to send mail from your "
+#| "system. It is not easy to configure, so you should select this option "
+#| "only if you know how to set up a Sendmail service."
 msgid ""
 "Uses the <app>Sendmail</app> application to send mail from your system. It "
 "is not easy to configure, so you should select this option only if you know "
 "how to set up a Sendmail service."
 msgstr ""
-"Utilise l'application <app>Sendmail</app> pour envoyer les messages depuis "
-"votre système. Sendmail n'est pas facile à configurer. Cette option ne "
-"devrait donc être choisie que si vous savez comment configurer un service "
-"Sendmail."
+"Sendmail : utilise l'application <app>Sendmail</app> pour envoyer les "
+"messages depuis votre système. Sendmail n'est pas facile à configurer. Cette "
+"option ne devrait donc être choisie que si vous savez comment configurer un "
+"service Sendmail."
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:264
+#: C/intro-first-run.page:264(section/title)
 msgid "Account Information"
 msgstr "Informations sur le compte"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:265
+#: C/intro-first-run.page:265(section/p)
 msgid "Give the account any name you prefer."
 msgstr "Donnez au compte le nom que vous préférez."
 
-#. (itstool) path: section/title
-#: C/intro-first-run.page:269
+#: C/intro-first-run.page:269(section/title)
 msgid "Importing Mail (Optional)"
 msgstr "Importation de courriels (facultatif)"
 
-#. (itstool) path: section/p
-#: C/intro-first-run.page:270
+#: C/intro-first-run.page:270(section/p)
 msgid ""
 "Continue with <link xref=\"import-data\">Importing data from another "
 "application</link>."
@@ -4416,12 +4001,11 @@ msgstr ""
 "Continuer avec <link xref=\"import-data\">Importation de données d'autres "
 "programmes</link>."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/intro-main-window.page:37
+#: C/intro-main-window.page:37(media)
 msgctxt "_"
 msgid ""
 "external ref='./figures/window-overview-layers.png' "
@@ -4430,92 +4014,294 @@ msgstr ""
 "external ref='./figures/window-overview-layers.png' "
 "md5='3156497ff1c51756838f9ddfbce9baee'"
 
-#. (itstool) path: info/desc
-#: C/intro-main-window.page:5
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:44(media) C/intro-main-window.page:93(media)
+#: C/intro-main-window.page:139(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-c4a000.png' "
+"md5='9db17d2d5e9013501aeab2e165c6a6c9'"
+msgstr ""
+"external ref='./figures/color-c4a000.png' "
+"md5='9db17d2d5e9013501aeab2e165c6a6c9'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:47(media) C/intro-main-window.page:96(media)
+#: C/intro-main-window.page:142(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-ce5c00.png' "
+"md5='19dae9650e3936312e09198973372a24'"
+msgstr ""
+"external ref='./figures/color-ce5c00.png' "
+"md5='19dae9650e3936312e09198973372a24'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:50(media) C/intro-main-window.page:99(media)
+#: C/intro-main-window.page:145(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-8f5902.png' "
+"md5='ff5ccb859fe04a004cd67e1c22621dc6'"
+msgstr ""
+"external ref='./figures/color-8f5902.png' "
+"md5='ff5ccb859fe04a004cd67e1c22621dc6'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:51(media) C/intro-main-window.page:100(media)
+#: C/intro-main-window.page:146(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-4e9a06.png' "
+"md5='b2c2e7b66fb470344c804db396b48b98'"
+msgstr ""
+"external ref='./figures/color-4e9a06.png' "
+"md5='b2c2e7b66fb470344c804db396b48b98'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:54(media) C/intro-main-window.page:103(media)
+#: C/intro-main-window.page:149(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-204a87.png' "
+"md5='511497260cc4caab69d67814b1ee3b8b'"
+msgstr ""
+"external ref='./figures/color-204a87.png' "
+"md5='511497260cc4caab69d67814b1ee3b8b'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:57(media) C/intro-main-window.page:111(media)
+#: C/intro-main-window.page:152(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-a40000.png' "
+"md5='19195da020e059dab33aa37788763a97'"
+msgstr ""
+"external ref='./figures/color-a40000.png' "
+"md5='19195da020e059dab33aa37788763a97'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:58(media) C/intro-main-window.page:153(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-5c3566.png' "
+"md5='7c001a57237acc2ff61ee61e05ad3168'"
+msgstr ""
+"external ref='./figures/color-5c3566.png' "
+"md5='7c001a57237acc2ff61ee61e05ad3168'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro-main-window.page:61(media) C/intro-main-window.page:114(media)
+#: C/intro-main-window.page:156(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-2e3436.png' "
+"md5='3c796c7aed3044e59f131bea364e8598'"
+msgstr ""
+"external ref='./figures/color-2e3436.png' "
+"md5='3c796c7aed3044e59f131bea364e8598'"
+
+#: C/intro-main-window.page:5(info/desc)
 msgid "An explanation of the areas shown in the Evolution window."
 msgstr "Description des zones affichées dans la fenêtre d'Evolution."
 
-#. (itstool) path: page/title
-#: C/intro-main-window.page:29
+#: C/intro-main-window.page:29(page/title)
 msgid "The <app>Evolution</app> main window"
 msgstr "La fenêtre principale d'<app>Evolution</app>"
 
-#. (itstool) path: page/p
-#: C/intro-main-window.page:32
+#: C/intro-main-window.page:32(page/p)
 msgid ""
-"Evolution provides functionality for Email, Calendar, Contacts, Tasks, and "
+"Evolution provides functionality for E-Mail, Calendar, Contacts, Tasks, and "
 "Memos. You can switch to another functionality by using the \"Switcher\" "
 "buttons in the lower left corner. Depending on the displayed functionality "
 "also the displayed elements in the window differ."
 msgstr ""
-"<app>Evolution</app> fournit des fonctionnalités pour les courriels, "
-"agendas, contacts, tâches et mémos. Vous pouvez basculer d'une "
-"fonctionnalité à une autre en utilisant les boutons du « sélecteur » situés "
-"dans le coin inférieur gauche. Selon la fonction choisie, les éléments "
-"affichés dans la fenêtre sont différents."
+"Evolution fournit des fonctionnalités pour les courriels, agendas, contacts, "
+"tâches et mémos. Vous pouvez basculer d'une fonctionnalité à une autre en "
+"utilisant les boutons du « sélecteur » situés dans le coin inférieur gauche. "
+"En fonction de la fonction choisie, les éléments affichés dans la fenêtre "
+"sont également modifiés."
+
+#: C/intro-main-window.page:35(section/title)
+msgid "E-Mail"
+msgstr "Courriel"
 
-#. (itstool) path: media/p
-#: C/intro-main-window.page:38
+#: C/intro-main-window.page:38(media/p)
 msgid "The Evolution mail main window"
 msgstr "La fenêtre principale de courriel d'Evolution"
 
-#. (itstool) path: section/p
-#: C/intro-main-window.page:41
+#: C/intro-main-window.page:41(section/p)
 msgid "Corresponding elements in the mail main window:"
-msgstr "Éléments correspondants dans la fenêtre principale du courrier :"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:44 C/intro-main-window.page:93
-#: C/intro-main-window.page:139
-msgid "<_:media-1/> Menu bar"
-msgstr "<_:media-1/> Barre de menu"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:47 C/intro-main-window.page:96
-#: C/intro-main-window.page:142
-msgid "<_:media-1/> Tool bar"
-msgstr "<_:media-1/> Barre d'outils"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:50
-msgid "<_:media-1/> Folder list"
-msgstr "<_:media-1/> Liste des dossiers"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:51 C/intro-main-window.page:100
-#: C/intro-main-window.page:146
-msgid "<_:media-1/> Search bar"
-msgstr "<_:media-1/> Barre de recherche"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:54
-msgid "<_:media-1/> Message list"
-msgstr "<_:media-1/> Liste des messages"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:57 C/intro-main-window.page:111
-#: C/intro-main-window.page:152
-msgid "<_:media-1/> Switcher"
-msgstr "<_:media-1/> Sélecteur"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:58
-msgid "<_:media-1/> Preview pane"
-msgstr "<_:media-1/> Panneau d'aperçu"
-
-#. (itstool) path: td/p
-#: C/intro-main-window.page:61 C/intro-main-window.page:114
-#: C/intro-main-window.page:156
-msgid "<_:media-1/> Status bar"
-msgstr "<_:media-1/> Barre des statuts"
-
-#. (itstool) path: item/title
-#: C/intro-main-window.page:67
+msgstr "Éléments correspondant dans la fenêtre principale du courriel :"
+
+#: C/intro-main-window.page:44(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png\" "
+"width=\"10\"/> Menu bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png\" "
+"width=\"10\"/> Barre de menu"
+
+#: C/intro-main-window.page:47(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png\" "
+"width=\"10\"/> Tool bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png\" "
+"width=\"10\"/> Barre d'outils"
+
+#: C/intro-main-window.page:50(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png\" "
+"width=\"10\"/> Folder list"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png\" "
+"width=\"10\"/> Liste des dossiers"
+
+#: C/intro-main-window.page:51(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png\" "
+"width=\"10\"/> Search bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png\" "
+"width=\"10\"/> Barre de recherche"
+
+#: C/intro-main-window.page:54(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png\" "
+"width=\"10\"/> Message list"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png\" "
+"width=\"10\"/> Liste des messages"
+
+#: C/intro-main-window.page:57(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png\" "
+"width=\"10\"/> Switcher"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png\" "
+"width=\"10\"/> Sélecteur"
+
+#: C/intro-main-window.page:58(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png\" "
+"width=\"10\"/> Preview pane"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png\" "
+"width=\"10\"/> Panneau de prévisualisation"
+
+#: C/intro-main-window.page:61(td/p)
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png\" "
+"width=\"10\"/> Status bar"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png\" "
+"width=\"10\"/> Barre de statut"
+
+#: C/intro-main-window.page:67(item/title)
 msgid "Folder list"
 msgstr "Liste des dossiers"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:68
+#: C/intro-main-window.page:68(item/p)
 msgid ""
 "The folder list gives you a list of the available folders for each account. "
 "To see the contents of a folder, click the folder name and its contents are "
@@ -4525,21 +4311,18 @@ msgstr ""
 "chaque compte. Pour voir le contenu d'un dossier, cliquez sur le nom du "
 "dossier et son contenu s'affichera dans la liste des messages."
 
-#. (itstool) path: note/p
-#: C/intro-main-window.page:69
+#: C/intro-main-window.page:69(note/p)
 msgid ""
 "For more information see <link xref=\"mail-folders\">Using Folders</link>."
 msgstr ""
 "Pour plus d'informations, consultez <link xref=\"mail-folders\">Utilisation "
 "des dossiers</link>."
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:72
+#: C/intro-main-window.page:72(item/title)
 msgid "Message List"
 msgstr "Liste des messages"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:73
+#: C/intro-main-window.page:73(item/p)
 msgid ""
 "The message list displays all the read and unread messages that you have in "
 "the chosen folder. To view an email in the preview pane, click the message "
@@ -4547,25 +4330,21 @@ msgid ""
 msgstr ""
 "La liste des messages affiche les courriels lus et non lus présents dans le "
 "dossier sélectionné. Pour voir un courriel dans le panneau d'aperçu, cliquez "
-"sur le message dans la liste des messages."
+"sur le courriel dans la liste des messages."
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:76
+#: C/intro-main-window.page:76(item/title)
 msgid "Switcher"
 msgstr "Sélecteur"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:77
+#: C/intro-main-window.page:77(item/p)
 msgid ""
 "The switcher at the bottom of the side bar lets you switch between the "
 "Evolution tools: Mail, Contacts, Calendars, Memos and Tasks."
 msgstr ""
 "Le sélecteur au bas de la barre latérale permet de passer d'un composant "
-"d'<app>Evolution</app> à un autre : courrier, contacts, agenda, mémos et "
-"tâches."
+"Evolution à un autre : courriel, contacts, agendas, mémos et tâches."
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:77
+#: C/intro-main-window.page:77(item/p)
 msgid ""
 "For more information see <link xref=\"change-switcher-appearance\">Changing "
 "the Switcher appearance</link>."
@@ -4573,8 +4352,11 @@ msgstr ""
 "Pour plus d'informations, voyez <link linkend=\"change-switcher-appearance"
 "\">Changement de l'apparence du sélecteur</link>."
 
-#. (itstool) path: note/p
-#: C/intro-main-window.page:78
+#: C/intro-main-window.page:78(note/p)
+#, fuzzy
+#| msgid ""
+#| "You can disable the folder list and the switcher side bar by toggling "
+#| "<guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq>."
 msgid ""
 "You can disable the folder list and the switcher side bar by toggling "
 "<guiseq><gui>View</gui><gui>Layout</gui><gui>Show Side Bar</gui></guiseq> or "
@@ -4582,16 +4364,13 @@ msgid ""
 msgstr ""
 "Vous pouvez désactiver la barre latérale contenant la liste des dossiers et "
 "le sélecteur en basculant <guiseq><gui>Affichage</gui><gui>Agencement</"
-"gui><gui>Afficher la barre latérale</gui></guiseq>, ou en appuyant sur "
-"<key>F9</key>."
+"gui><gui>Afficher la barre latérale</gui></guiseq>."
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:81
+#: C/intro-main-window.page:81(item/title)
 msgid "Preview Pane"
 msgstr "Panneau d'aperçu"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:82
+#: C/intro-main-window.page:82(item/p)
 msgid ""
 "The preview pane displays the message that is currently chosen in the "
 "message list."
@@ -4599,8 +4378,7 @@ msgstr ""
 "Le panneau d'aperçu affiche le contenu du courriel sélectionné dans la liste "
 "des messages."
 
-#. (itstool) path: note/p
-#: C/intro-main-window.page:83
+#: C/intro-main-window.page:83(note/p)
 msgid ""
 "You can disable the preview pane by toggling <guiseq><gui>View</"
 "gui><gui>Preview</gui><gui>Show Message Preview</gui></guiseq>."
@@ -4609,43 +4387,83 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Aperçu</gui><gui>Afficher l'aperçu du "
 "message</gui></guiseq>."
 
-#. (itstool) path: section/p
-#: C/intro-main-window.page:90
+#: C/intro-main-window.page:90(section/p)
 msgid "Elements in the calendar main window:"
 msgstr "Éléments de la fenêtre principale de l'agenda :"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:99
-msgid "<_:media-1/> Calendar list"
-msgstr "<_:media-1/> Liste d'Agenda"
+#: C/intro-main-window.page:93(td/p) C/intro-main-window.page:139(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> Menu "
+"bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
+"Barre de menu"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:103
-msgid "<_:media-1/> Appointment list"
-msgstr "<_:media-1/> Liste des rendez-vous"
+#: C/intro-main-window.page:96(td/p) C/intro-main-window.page:142(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> Tool "
+"bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
+"Barre d'outils"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:104
+#: C/intro-main-window.page:99(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Calendar list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Liste des agendas"
+
+#: C/intro-main-window.page:100(td/p) C/intro-main-window.page:146(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Search bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
+"Barre de recherche"
+
+#: C/intro-main-window.page:103(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Appointment list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Liste de rendez-vous"
+
+#: C/intro-main-window.page:104(td/p)
 msgid "Task list"
 msgstr "Liste des tâches"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:107
+#: C/intro-main-window.page:107(td/p)
 msgid "Month pane"
 msgstr "Panneau des mois"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:108
+#: C/intro-main-window.page:108(td/p)
 msgid "Memo list"
 msgstr "Liste des mémos"
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:119
+#: C/intro-main-window.page:111(td/p) C/intro-main-window.page:152(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
+"Switcher"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
+"Sélecteur"
+
+#: C/intro-main-window.page:114(td/p) C/intro-main-window.page:156(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Status bar"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
+"Barre de statut"
+
+#: C/intro-main-window.page:119(item/title)
 msgid "Appointment List"
 msgstr "Liste des rendez-vous"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:120
+#: C/intro-main-window.page:120(item/p)
 msgid ""
 "The appointment list displays all your scheduled appointments in the time "
 "frame selected."
@@ -4653,13 +4471,11 @@ msgstr ""
 "La liste des rendez-vous présente une liste de tous les rendez-vous "
 "planifiés dans la période sélectionnée."
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:123
+#: C/intro-main-window.page:123(item/title)
 msgid "Month Pane"
 msgstr "Panneau des mois"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:124
+#: C/intro-main-window.page:124(item/p)
 msgid ""
 "The month pane is a small view of a calendar month. To display additional "
 "months, drag the column border to the right. You can also select a range of "
@@ -4672,44 +4488,48 @@ msgstr ""
 "panneau des mois pour afficher une sélection personnalisée de jours dans la "
 "liste des rendez-vous."
 
-#. (itstool) path: item/title
-#: C/intro-main-window.page:127
+#: C/intro-main-window.page:127(item/title)
 msgid "Task list and Memo list"
 msgstr "Liste des tâches et liste des mémos"
 
-#. (itstool) path: item/p
-#: C/intro-main-window.page:128
+#: C/intro-main-window.page:128(item/p)
 msgid ""
-"Tasks and memos are just displayed for your convenience and are not "
-"associated to any appointments. Use the <gui>switcher</gui> to go to their "
-"main windows."
+"Tasks and memos are just displayed for your convience and are not associated "
+"to any appointments. Use the <gui>switcher</gui> to go to their main windows."
 msgstr ""
 "Les tâches et les mémos sont affichés à votre convenance et ne sont pas "
 "associés à des rendez-vous. Utilisez le <gui>sélecteur</gui> pour aller dans "
 "leur fenêtre principale."
 
-#. (itstool) path: section/p
-#: C/intro-main-window.page:136
+#: C/intro-main-window.page:136(section/p)
 msgid "Elements in the contacts main window:"
 msgstr "Éléments de la fenêtre principale des contacts :"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:145
-msgid "<_:media-1/> Address book list"
-msgstr "<_:media-1/> Liste du carnet d'adresses"
+#: C/intro-main-window.page:145(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Address book list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
+"Liste des dossiers"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:149
-msgid "<_:media-1/> Contacts list"
-msgstr "<_:media-1/> iste des contacts"
+#: C/intro-main-window.page:149(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Contacts list"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
+"Liste des contacts"
 
-#. (itstool) path: td/p
-#: C/intro-main-window.page:153
-msgid "<_:media-1/> Contact preview"
-msgstr "<_:media-1/> Aperçu du contact"
+#: C/intro-main-window.page:153(td/p)
+msgid ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Contact preview"
+msgstr ""
+"<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
+"Prévisualisation des contacts"
 
-#. (itstool) path: note/p
-#: C/intro-main-window.page:159
+#: C/intro-main-window.page:159(note/p)
 msgid ""
 "You can disable the contact preview by toggling <guiseq><gui>View</"
 "gui><gui>Preview</gui><gui>Contact Preview</gui></guiseq>."
@@ -4718,28 +4538,25 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Aperçu</gui><gui>Aperçu du contact</gui></"
 "guiseq>."
 
-#. (itstool) path: p/link
-#: C/legal.xml:5
+#: C/legal.xml:5(p/link)
+#, fuzzy
+#| msgid "Creative Commons Share Alike 3.0"
 msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
 msgstr "Creative Commons Partage des Conditions Initiales à l'Identique 3.0"
 
-#. (itstool) path: license/p
-#: C/legal.xml:4
+#: C/legal.xml:4(license/p)
 msgid "This work is licensed under a <_:link-1/>."
-msgstr "Cette œuvre est distribuée sous <_:link-1/>."
+msgstr ""
 
-#. (itstool) path: info/desc
-#: C/mail-access-gmail-imap-account.page:5
+#: C/mail-access-gmail-imap-account.page:5(info/desc)
 msgid "How to set up a Gmail IMAP Account."
 msgstr "Comment configurer un compte IMAP Gmail."
 
-#. (itstool) path: page/title
-#: C/mail-access-gmail-imap-account.page:24
+#: C/mail-access-gmail-imap-account.page:24(page/title)
 msgid "Access a Gmail IMAP Account via Evolution"
 msgstr "Accès à un compte IMAP Gmail via Evolution"
 
-#. (itstool) path: page/p
-#: C/mail-access-gmail-imap-account.page:26
+#: C/mail-access-gmail-imap-account.page:26(page/p)
 msgid ""
 "Please refer to the <link xref=\"mail-account-manage-imap-plus\">IMAP+ mail "
 "account settings</link>."
@@ -4747,23 +4564,7 @@ msgstr ""
 "Référez-vous aux <link xref=\"mail-account-manage-imap-plus\">paramètres de "
 "compte de messagerie IMAP+</link>."
 
-#. (itstool) path: page/p
-#: C/mail-access-gmail-imap-account.page:28
-msgid ""
-"For performance reasons it is recommended to <gui>Use a Real Folder for "
-"Trash</gui> by setting it to <gui>[GMail]/Trash</gui> and to <gui>Use a Real "
-"Folder for Junk</gui> by setting it to <gui>[GMail]/Spam</gui> under the "
-"account's <link xref=\"mail-default-folder-locations\"><gui>Defaults</gui></"
-"link>."
-msgstr ""
-"Pour des raisons de performance, il est recommandé d'<gui>Utiliser un vrai "
-"dossier pour la corbeille</gui> en le paramétrant à <gui>[GMail]/Trash</gui> "
-"et d'<gui>Utiliser un vrai dossier pour les pourriels</gui> en le "
-"paramétrant à <gui>[GMail]/Spam</gui> dans les réglages <link xref=\"mail-"
-"default-folder-locations\"><gui>par défaut</gui></link> du compte."
-
-#. (itstool) path: note/p
-#: C/mail-access-gmail-imap-account.page:30
+#: C/mail-access-gmail-imap-account.page:28(note/p)
 msgid ""
 "To access Gmail via IMAP you must turn on IMAP in your Google account. See "
 "the <link href=\"https://mail.google.com/support/bin/answer.py?";
@@ -4773,29 +4574,24 @@ msgstr ""
 "Google. Consultez <link href=\"https://mail.google.com/support/bin/answer.py?";
 "answer=77695&amp;hl=fr\">l'aide Gmail</link> pour plus d'informations."
 
-#. (itstool) path: info/desc
-#: C/mail-access-gmail-pop-account.page:5
+#: C/mail-access-gmail-pop-account.page:5(info/desc)
 msgid "How to set up a Gmail POP Account."
 msgstr "Comment configurer un compte POP Gmail."
 
-#. (itstool) path: page/title
-#: C/mail-access-gmail-pop-account.page:28
+#: C/mail-access-gmail-pop-account.page:24(page/title)
 msgid "Access a Gmail POP Account via Evolution"
 msgstr "Accès à un compte POP Gmail via Evolution"
 
-#. (itstool) path: page/p
-#: C/mail-access-gmail-pop-account.page:30
+#: C/mail-access-gmail-pop-account.page:26(page/p)
 msgid "Follow these steps to set up your Gmail POP Account in Evolution:"
 msgstr ""
 "Suivez ces étapes pour configurer votre compte POP Gmail dans Evolution :"
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:33
+#: C/mail-access-gmail-pop-account.page:29(item/p)
 msgid "Log in to your Gmail account."
 msgstr "Connectez-vous à votre compte Gmail."
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:34
+#: C/mail-access-gmail-pop-account.page:30(item/p)
 msgid ""
 "Go to <guiseq><gui>Settings</gui><gui>Forwarding and POP/IMAP</gui></"
 "guiseq>. Refer to the POP Download section."
@@ -4803,8 +4599,7 @@ msgstr ""
 "Allez dans <guiseq><gui>Paramètres</gui><gui>Transfert et POP/IMAP</gui></"
 "guiseq>. Référez-vous à la section Téléchargement POP."
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:35
+#: C/mail-access-gmail-pop-account.page:31(item/p)
 msgid ""
 "Enable the POP download feature by ticking the radio button that corresponds "
 "to either of these options:"
@@ -4812,39 +4607,33 @@ msgstr ""
 "Activez la fonctionnalité de téléchargement POP en cochant le bouton radio "
 "qui correspond à l'une de ces options :"
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:37
+#: C/mail-access-gmail-pop-account.page:33(item/p)
 msgid "Enable POP for all mail (even mail that's already been downloaded)"
 msgstr ""
 "Activer le protocole POP pour tous les messages (même les courriels qui ont "
 "déjà été téléchargés)"
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:38
+#: C/mail-access-gmail-pop-account.page:34(item/p)
 msgid "Enable POP for mail that arrives from now on"
 msgstr ""
 "Activer le protocole POP pour les messages reçus à partir de maintenant"
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:41
+#: C/mail-access-gmail-pop-account.page:37(item/p)
 msgid "Specify the other required settings for this Gmail feature."
 msgstr ""
 "Spécifiez les autres paramètres nécessaires pour cette fonctionnalité de "
 "Gmail."
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:42
+#: C/mail-access-gmail-pop-account.page:38(item/p)
 msgid ""
-"To know the Gmail Account settings, click on <gui>Configuration "
-"instructions</gui>. Choose <gui>I want to enable POP</gui> and select "
-"<gui>Other</gui> from the list of clients."
+"To know the Gmail Account settings, click on <guiseq><gui>Configuration "
+"instructions</gui><gui>Other</gui><gui>Standard Instructions</gui></guiseq>."
 msgstr ""
-"Pour connaître la configuration du compte Gmail, cliquez sur "
-"<guiseq><gui>Instructions de configuration</gui>. Choisissez <gui>Je désire "
-"activer POP</gui> et sélectionnez <gui>Autres</gui>dans la liste des clients."
+"Pour connaître la configuration de comptes Gmail, cliquez sur "
+"<guiseq><gui>Instructions de configuration</gui><gui>Autres</"
+"gui><gui>Instructions standard</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:43
+#: C/mail-access-gmail-pop-account.page:39(item/p)
 msgid ""
 "On your Evolution client, go to <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Mail Accounts</gui></guiseq>. Click <gui style=\"button\">Add</gui>."
@@ -4853,49 +4642,44 @@ msgstr ""
 "gui><gui>Préférences</gui><gui>Comptes de messagerie</gui></guiseq>. Cliquez "
 "sur <gui style=\"button\">Ajouter</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-access-gmail-pop-account.page:44
+#: C/mail-access-gmail-pop-account.page:40(item/p)
 msgid ""
-"Provide the required information. For the account settings, refer to Step 5."
+"Provide the required information. For the account settings, refer to Step 5"
 msgstr ""
 "Fournissez les informations nécessaires. Pour les paramètres du compte, "
 "référez-vous à l'étape 5."
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-imap-plus.page:5
+#: C/mail-account-manage-imap-plus.page:5(info/desc)
 msgid "Add and edit an IMAP+ mail account in Evolution."
 msgstr "Ajouter et modifier un compte de messagerie IMAP+ dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-imap-plus.page:20
+#: C/mail-account-manage-imap-plus.page:20(page/title)
 msgid "IMAP+ mail account settings"
 msgstr "Paramètres de compte de messagerie IMAP+"
 
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:23
-#: C/mail-account-manage-local-delivery.page:23
-#: C/mail-account-manage-maildir-format-directories.page:23
-#: C/mail-account-manage-mh-format-directories.page:23
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:23
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23
-#: C/mail-account-manage-pop.page:23
-#: C/mail-account-manage-unix-mbox-spool-directory.page:23
-#: C/mail-account-manage-unix-mbox-spool-file.page:23
-#: C/mail-account-manage-usenet-news.page:23
+#: C/mail-account-manage-imap-plus.page:23(section/title)
+#: C/mail-account-manage-local-delivery.page:23(section/title)
+#: C/mail-account-manage-maildir-format-directories.page:23(section/title)
+#: C/mail-account-manage-mh-format-directories.page:23(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:23(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:23(section/title)
+#: C/mail-account-manage-pop.page:23(section/title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:23(section/title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:23(section/title)
+#: C/mail-account-manage-usenet-news.page:23(section/title)
 msgid "Account Editor"
 msgstr "Éditeur de comptes"
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-imap-plus.page:24
-#: C/mail-account-manage-local-delivery.page:24
-#: C/mail-account-manage-maildir-format-directories.page:25
-#: C/mail-account-manage-mh-format-directories.page:24
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:24
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:24
-#: C/mail-account-manage-pop.page:24
-#: C/mail-account-manage-unix-mbox-spool-directory.page:24
-#: C/mail-account-manage-unix-mbox-spool-file.page:24
-#: C/mail-account-manage-usenet-news.page:24
+#: C/mail-account-manage-imap-plus.page:24(section/p)
+#: C/mail-account-manage-local-delivery.page:24(section/p)
+#: C/mail-account-manage-maildir-format-directories.page:24(section/p)
+#: C/mail-account-manage-mh-format-directories.page:24(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:24(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:24(section/p)
+#: C/mail-account-manage-pop.page:24(section/p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:24(section/p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:24(section/p)
+#: C/mail-account-manage-usenet-news.page:24(section/p)
 msgid ""
 "Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</"
 "gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</"
@@ -4913,11 +4697,10 @@ msgstr ""
 "pas demandé d'importer les données d'une autre application ou de faire une "
 "restauration à partir d'un fichier de sauvegarde."
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-imap-plus.page:25
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:25
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25
-#: C/mail-account-manage-usenet-news.page:25
+#: C/mail-account-manage-imap-plus.page:25(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:25(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:25(section/p)
+#: C/mail-account-manage-usenet-news.page:25(section/p)
 msgid ""
 "Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq> or by "
@@ -4930,115 +4713,113 @@ msgstr ""
 "respectifs dans la liste des dossiers et en choisissant <gui>Propriétés</"
 "gui>."
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-imap-plus.page:26
-#: C/mail-account-manage-local-delivery.page:26
-#: C/mail-account-manage-maildir-format-directories.page:27
-#: C/mail-account-manage-mh-format-directories.page:26
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:26
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26
-#: C/mail-account-manage-pop.page:26
-#: C/mail-account-manage-unix-mbox-spool-directory.page:26
-#: C/mail-account-manage-unix-mbox-spool-file.page:26
-#: C/mail-account-manage-usenet-news.page:26
+#: C/mail-account-manage-imap-plus.page:26(section/p)
+#: C/mail-account-manage-local-delivery.page:26(section/p)
+#: C/mail-account-manage-maildir-format-directories.page:26(section/p)
+#: C/mail-account-manage-mh-format-directories.page:26(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:26(section/p)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:26(section/p)
+#: C/mail-account-manage-pop.page:26(section/p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:26(section/p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:26(section/p)
+#: C/mail-account-manage-usenet-news.page:26(section/p)
 msgid "The following settings are available when editing an existing account:"
 msgstr ""
 "Les paramètres suivants sont disponibles lors de la modification d'un compte "
 "existant :"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-imap-plus.page:36
+#: C/mail-account-manage-imap-plus.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving Email and Receiving options"
 msgctxt "link"
 msgid "Receiving Email and Receiving options (IMAP+ accounts)"
-msgstr "Réception des courriels et options de réception (comptes IMAP+)"
-
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:38
-#: C/mail-account-manage-local-delivery.page:38
-#: C/mail-account-manage-maildir-format-directories.page:39
-#: C/mail-account-manage-mh-format-directories.page:38
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:38
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:38
-#: C/mail-account-manage-pop.page:38
-#: C/mail-account-manage-unix-mbox-spool-directory.page:38
-#: C/mail-account-manage-unix-mbox-spool-file.page:38
-#: C/mail-account-manage-usenet-news.page:38
+msgstr "Réception des courriels et options de réception"
+
+#: C/mail-account-manage-imap-plus.page:38(section/title)
+#: C/mail-account-manage-local-delivery.page:38(section/title)
+#: C/mail-account-manage-maildir-format-directories.page:38(section/title)
+#: C/mail-account-manage-mh-format-directories.page:38(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:38(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:38(section/title)
+#: C/mail-account-manage-pop.page:38(section/title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:38(section/title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:38(section/title)
+#: C/mail-account-manage-usenet-news.page:38(section/title)
 msgid "Receiving Email and Receiving options"
 msgstr "Réception des courriels et options de réception"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-imap-plus.page:43
+#: C/mail-account-manage-imap-plus.page:43(info/title)
+#, fuzzy
+#| msgid "Receiving options for IMAP+ accounts."
 msgctxt "link"
 msgid "Sending Email (IMAP+ accounts)"
-msgstr "Envoi des courriels (comptes IMAP+)"
-
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:45
-#: C/mail-account-manage-local-delivery.page:45
-#: C/mail-account-manage-maildir-format-directories.page:46
-#: C/mail-account-manage-mh-format-directories.page:45
-#: C/mail-account-manage-pop.page:45
-#: C/mail-account-manage-unix-mbox-spool-directory.page:45
-#: C/mail-account-manage-unix-mbox-spool-file.page:45
-#: C/mail-account-manage-usenet-news.page:45
+msgstr "Options de réception pour les comptes IMAP+."
+
+#: C/mail-account-manage-imap-plus.page:45(section/title)
+#: C/mail-account-manage-local-delivery.page:45(section/title)
+#: C/mail-account-manage-maildir-format-directories.page:45(section/title)
+#: C/mail-account-manage-mh-format-directories.page:45(section/title)
+#: C/mail-account-manage-pop.page:45(section/title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:45(section/title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:45(section/title)
+#: C/mail-account-manage-usenet-news.page:45(section/title)
 msgid "Sending Email"
 msgstr "Envoi du courriel"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-imap-plus.page:50
+#: C/mail-account-manage-imap-plus.page:50(info/title)
+#, fuzzy
+#| msgid "Select the IMAP account."
 msgctxt "link"
 msgid "Defaults (IMAP+ accounts)"
-msgstr "Par défaut (comptes IMAP+)"
-
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:52
-#: C/mail-account-manage-local-delivery.page:52
-#: C/mail-account-manage-maildir-format-directories.page:53
-#: C/mail-account-manage-mh-format-directories.page:52
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:45
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45
-#: C/mail-account-manage-pop.page:52
-#: C/mail-account-manage-unix-mbox-spool-directory.page:52
-#: C/mail-account-manage-unix-mbox-spool-file.page:52
-#: C/mail-account-manage-usenet-news.page:52
+msgstr "Sélectionnez le compte IMAP."
+
+#: C/mail-account-manage-imap-plus.page:52(section/title)
+#: C/mail-account-manage-local-delivery.page:52(section/title)
+#: C/mail-account-manage-maildir-format-directories.page:52(section/title)
+#: C/mail-account-manage-mh-format-directories.page:52(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:45(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:45(section/title)
+#: C/mail-account-manage-pop.page:52(section/title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:52(section/title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:52(section/title)
+#: C/mail-account-manage-usenet-news.page:52(section/title)
 msgid "Defaults"
 msgstr "Valeurs par défaut"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-imap-plus.page:57
+#: C/mail-account-manage-imap-plus.page:57(info/title)
+#, fuzzy
+#| msgid "Select the IMAP account."
 msgctxt "link"
 msgid "Security (IMAP+ accounts)"
-msgstr "Sécurité (comptes IMAP+)"
-
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:59
-#: C/mail-account-manage-local-delivery.page:59
-#: C/mail-account-manage-maildir-format-directories.page:60
-#: C/mail-account-manage-mh-format-directories.page:59
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:52
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:57
-#: C/mail-account-manage-pop.page:59
-#: C/mail-account-manage-unix-mbox-spool-directory.page:59
-#: C/mail-account-manage-unix-mbox-spool-file.page:59
-#: C/mail-account-manage-usenet-news.page:59
+msgstr "Sélectionnez le compte IMAP."
+
+#: C/mail-account-manage-imap-plus.page:59(section/title)
+#: C/mail-account-manage-local-delivery.page:59(section/title)
+#: C/mail-account-manage-maildir-format-directories.page:59(section/title)
+#: C/mail-account-manage-mh-format-directories.page:59(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:52(section/title)
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:57(section/title)
+#: C/mail-account-manage-pop.page:59(section/title)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:59(section/title)
+#: C/mail-account-manage-unix-mbox-spool-file.page:59(section/title)
+#: C/mail-account-manage-usenet-news.page:59(section/title)
 msgid "Security"
 msgstr "Sécurité"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-imap-plus.page:68
+#: C/mail-account-manage-imap-plus.page:68(info/title)
+#, fuzzy
+#| msgid "Other settings"
 msgctxt "link"
 msgid "Other settings (IMAP+ accounts)"
-msgstr "Autres paramétrages (comptes IMAP+)"
+msgstr "Autres paramétrages"
 
-#. (itstool) path: section/title
-#: C/mail-account-manage-imap-plus.page:70
-#: C/mail-account-manage-usenet-news.page:68
+#: C/mail-account-manage-imap-plus.page:70(section/title)
+#: C/mail-account-manage-usenet-news.page:68(section/title)
 msgid "Other settings"
 msgstr "Autres paramétrages"
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-imap-plus.page:71
-#: C/mail-account-manage-usenet-news.page:69
+#: C/mail-account-manage-imap-plus.page:71(section/p)
+#: C/mail-account-manage-usenet-news.page:69(section/p)
 msgid ""
 "Other account related settings that are not located in the <gui>Account "
 "Editor</gui>:"
@@ -5046,23 +4827,20 @@ msgstr ""
 "Autres paramétrages liés aux comptes qui ne sont pas situés dans "
 "l'<gui>éditeur de comptes</gui> :"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-local-delivery.page:5
+#: C/mail-account-manage-local-delivery.page:5(info/desc)
 msgid "Add and edit a Local Delivery account in Evolution."
 msgstr "Ajouter et modifier un compte de distribution locale dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-local-delivery.page:20
+#: C/mail-account-manage-local-delivery.page:20(page/title)
 msgid "Local Delivery account settings"
 msgstr "Paramètres de compte de distribution locale"
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-local-delivery.page:25
-#: C/mail-account-manage-maildir-format-directories.page:26
-#: C/mail-account-manage-mh-format-directories.page:25
-#: C/mail-account-manage-pop.page:25
-#: C/mail-account-manage-unix-mbox-spool-directory.page:25
-#: C/mail-account-manage-unix-mbox-spool-file.page:25
+#: C/mail-account-manage-local-delivery.page:25(section/p)
+#: C/mail-account-manage-maildir-format-directories.page:25(section/p)
+#: C/mail-account-manage-mh-format-directories.page:25(section/p)
+#: C/mail-account-manage-pop.page:25(section/p)
+#: C/mail-account-manage-unix-mbox-spool-directory.page:25(section/p)
+#: C/mail-account-manage-unix-mbox-spool-file.page:25(section/p)
 msgid ""
 "Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui></guiseq>."
@@ -5071,227 +4849,222 @@ msgstr ""
 "gui><gui>Préférences</gui><gui>Comptes de messagerie</gui><gui style=\"button"
 "\">Modifier</gui></guiseq>."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-local-delivery.page:36
+#: C/mail-account-manage-local-delivery.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving Email and Receiving options"
 msgctxt "link"
 msgid "Receiving Email and Receiving options (Local Delivery accounts)"
-msgstr ""
-"Réception des courriels et options de réception (comptes de distribution "
-"locale)"
+msgstr "Réception des courriels et options de réception"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-local-delivery.page:43
+#: C/mail-account-manage-local-delivery.page:43(info/title)
+#, fuzzy
+#| msgid "Receiving options for Local delivery accounts."
 msgctxt "link"
 msgid "Sending Email (Local Delivery accounts)"
-msgstr "Envoi des courriels (comptes de distribution locale)"
+msgstr "Options de réception des comptes de distribution locale des messages."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-local-delivery.page:50
+#: C/mail-account-manage-local-delivery.page:50(info/title)
+#, fuzzy
+#| msgid "Local Delivery account settings"
 msgctxt "link"
 msgid "Defaults (Local Delivery accounts)"
-msgstr "Par défaut (comptes de distribution locale)"
+msgstr "Paramètres de compte de distribution locale"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-local-delivery.page:57
+#: C/mail-account-manage-local-delivery.page:57(info/title)
+#, fuzzy
+#| msgid "Local Delivery account settings"
 msgctxt "link"
 msgid "Security (Local Delivery accounts)"
-msgstr "Sécurité (comptes de distribution locale)"
+msgstr "Paramètres de compte de distribution locale"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-maildir-format-directories.page:5
+#: C/mail-account-manage-maildir-format-directories.page:5(info/desc)
 msgid "Add and edit a Maildir Format Mail Directories account in Evolution."
 msgstr ""
 "Ajouter et modifier un compte utilisant les répertoires de courriel au "
 "format Maildir dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-maildir-format-directories.page:20
+#: C/mail-account-manage-maildir-format-directories.page:20(page/title)
 msgid "Maildir Format Mail Directories account settings"
 msgstr ""
 "Paramètres de compte utilisant les répertoires de courriel au format Maildir"
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-maildir-format-directories.page:24
-msgid "Evolution supports the Maildir++ specification."
-msgstr "<app>Evolution</app> prend en charge la spécification Maildir++."
-
-#. (itstool) path: info/title
-#: C/mail-account-manage-maildir-format-directories.page:37
+#: C/mail-account-manage-maildir-format-directories.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for Maildir-format mail directories accounts."
 msgctxt "link"
 msgid ""
 "Receiving Email and Receiving options (Maildir Format Mail Directories "
 "accounts)"
 msgstr ""
-"Réception des courriels et options de réception (répertoires de courriel au "
-"format Maildir)"
+"Options de réception pour les comptes de répertoires de courriel au format "
+"Maildir."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-maildir-format-directories.page:44
+#: C/mail-account-manage-maildir-format-directories.page:43(info/title)
+#, fuzzy
+#| msgid "Maildir Format Mail Directories account settings"
 msgctxt "link"
 msgid "Sending Email (Maildir Format Mail Directories accounts)"
 msgstr ""
-"Envoi de courriels (comptes de répertoires de courriel au format Maildir)"
+"Paramètres de compte utilisant les répertoires de courriel au format Maildir"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-maildir-format-directories.page:51
+#: C/mail-account-manage-maildir-format-directories.page:50(info/title)
+#, fuzzy
+#| msgid "Maildir Format Mail Directories account settings"
 msgctxt "link"
 msgid "Defaults (Maildir Format Mail Directories accounts)"
-msgstr "Par défaut (comptes de répertoires de courriel au format Maildir)"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format Maildir"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-maildir-format-directories.page:58
+#: C/mail-account-manage-maildir-format-directories.page:57(info/title)
+#, fuzzy
+#| msgid "Maildir Format Mail Directories account settings"
 msgctxt "link"
 msgid "Security (Maildir Format Mail Directories accounts)"
-msgstr "Sécurité (comptes de répertoires de courriel au format Maildir)"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format Maildir"
 
-#. (itstool) path: info/desc
-#: C/mail-account-management.page:5
+#: C/mail-account-management.page:5(info/desc)
 msgid "Adding, editing and managing mail accounts."
 msgstr "Ajouter, modifier et gérer les comptes de messagerie."
 
-#. (itstool) path: page/title
-#: C/mail-account-management.page:20
+#: C/mail-account-management.page:20(page/title)
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#. (itstool) path: section/title
-#: C/mail-account-management.page:23
+#: C/mail-account-management.page:23(section/title)
 msgid "Common Account Types"
 msgstr "Types de compte courant"
 
-#. (itstool) path: section/title
-#: C/mail-account-management.page:27
+#: C/mail-account-management.page:27(section/title)
 msgid "Local Account Types"
 msgstr "Types de compte local"
 
-#. (itstool) path: section/title
-#: C/mail-account-management.page:31
+#: C/mail-account-management.page:31(section/title)
 msgid "Corporate Account Types"
 msgstr "Types de compte appartenant à une société"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-mh-format-directories.page:5
+#: C/mail-account-manage-mh-format-directories.page:5(info/desc)
 msgid "Add and edit a MH Format Mail Directories account in Evolution."
 msgstr ""
 "Ajouter et modifier un compte utilisant les répertoires de courriel au "
 "format MH dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-mh-format-directories.page:20
+#: C/mail-account-manage-mh-format-directories.page:20(page/title)
 msgid "MH Format Mail Directories account settings"
 msgstr ""
 "Paramètres de compte utilisant les répertoires de courriel au format MH"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-mh-format-directories.page:36
+#: C/mail-account-manage-mh-format-directories.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for MH-format mail directories accounts."
 msgctxt "link"
 msgid ""
 "Receiving Email and Receiving options (MH Format Mail Directories accounts)"
 msgstr ""
-"Réception et options de réception (comptes de répertoires de courriel au "
-"format MH)"
+"Options de réception pour les comptes de répertoires de courriel au format "
+"MH."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-mh-format-directories.page:43
+#: C/mail-account-manage-mh-format-directories.page:43(info/title)
+#, fuzzy
+#| msgid "MH Format Mail Directories account settings"
 msgctxt "link"
 msgid "Sending Email (MH Format Mail Directories accounts)"
-msgstr "Envoi des courriels (comptes de répertoires de courriel au format MH)"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format MH"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-mh-format-directories.page:50
+#: C/mail-account-manage-mh-format-directories.page:50(info/title)
+#, fuzzy
+#| msgid "MH Format Mail Directories account settings"
 msgctxt "link"
 msgid "Defaults (MH Format Mail Directories accounts)"
-msgstr "Par défaut (comptes de répertoires de courriel au format MH)"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format MH"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-mh-format-directories.page:57
+#: C/mail-account-manage-mh-format-directories.page:57(info/title)
+#, fuzzy
+#| msgid "MH Format Mail Directories account settings"
 msgctxt "link"
 msgid "Security (MH Format Mail Directories accounts)"
-msgstr "Sécurité (comptes de répertoires de courriel au format MH)"
+msgstr ""
+"Paramètres de compte utilisant les répertoires de courriel au format MH"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:5
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:5(info/desc)
 msgid "Add and edit a Microsoft Exchange 2007 or 2010 account in Evolution."
 msgstr ""
 "Ajouter et modifier un compte Microsoft Exchange 2007 ou 2010 dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:20
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:20(page/title)
 msgid "Exchange Web Services account settings"
 msgstr "Paramètres de compte Exchange Web Services"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:36
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for Exchange Web Services accounts."
 msgctxt "link"
 msgid "Receiving Email and Receiving options (Exchange Web Services accounts)"
-msgstr ""
-"Réception de courriels et ptions de réception pour les (comptes Exchange Web "
-"Services)"
+msgstr "Options de réception pour les comptes Exchange Web Services."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:43
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:43(info/title)
+#, fuzzy
+#| msgid "Exchange Web Services account settings"
 msgctxt "link"
 msgid "Defaults (Exchange Web Services accounts)"
-msgstr "Par défaut (comptes Exchange Web Services)"
+msgstr "Paramètres de compte Exchange Web Services"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-ews.page:50
+#: C/mail-account-manage-microsoft-exchange-evo-ews.page:50(info/title)
+#, fuzzy
+#| msgid "Exchange Web Services account settings"
 msgctxt "link"
 msgid "Security (Exchange Web Services accounts)"
-msgstr "Sécurité (comptes Exchange Web Services)"
+msgstr "Paramètres de compte Exchange Web Services"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:5(info/desc)
 msgid "Add and edit a Microsoft Exchange MAPI account in Evolution."
 msgstr "Ajouter et modifier un compte Microsoft Exchange MAPI dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:20
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:20(page/title)
 msgid "Exchange MAPI account settings"
 msgstr "Paramètres de compte Exchange MAPI"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:36
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for Exchange MAPI accounts."
 msgctxt "link"
 msgid "Receiving Email and Receiving options (Exchange MAPI accounts)"
-msgstr ""
-"Réception des courriels et options de réception (comptes Exchange MAPI)"
+msgstr "Options de réception des comptes Exchange MAPI."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:43
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:43(info/title)
+#, fuzzy
+#| msgid "Exchange MAPI account settings"
 msgctxt "link"
 msgid "Defaults (Exchange MAPI accounts)"
-msgstr "Par défaut (comptes Exchange MAPI)"
+msgstr "Paramètres de compte Exchange MAPI"
 
-#. (itstool) path: section/title
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:49(section/title)
 msgid "Exchange Settings"
 msgstr "Paramètres Exchange"
 
-#. (itstool) path: section/p
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:50
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:50(section/p)
 msgid "In this section you can view the size of all Exchange folders."
 msgstr ""
 "Dans cette section vous pouvez voir la taille de tous les dossiers Exchange."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:55
+#: C/mail-account-manage-microsoft-exchange-evo-mapi.page:55(info/title)
+#, fuzzy
+#| msgid "Exchange MAPI account settings"
 msgctxt "link"
 msgid "Security (Exchange MAPI accounts)"
-msgstr "Sécurité (comptes Exchange MAPI)"
+msgstr "Paramètres de compte Exchange MAPI"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-microsoft-exchange.page:5
+#: C/mail-account-manage-microsoft-exchange.page:5(info/desc)
 msgid "Add and edit a Microsoft Exchange account in Evolution."
 msgstr "Ajouter et modifier un compte Microsoft Exchange dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-microsoft-exchange.page:21
+#: C/mail-account-manage-microsoft-exchange.page:21(page/title)
 msgid "Microsoft Exchange account settings"
 msgstr "Paramètres de compte Microsoft Exchange"
 
-#. (itstool) path: note/p
-#: C/mail-account-manage-microsoft-exchange.page:23
+#: C/mail-account-manage-microsoft-exchange.page:23(note/p)
 msgid ""
 "Please first read <link xref=\"exchange-connectors-overview\">Choosing the "
 "right connector</link> to find out about the right Exchange account type for "
@@ -5301,184 +5074,188 @@ msgstr ""
 "connecteur</link> pour trouver le bon type de compte Exchange qui vous "
 "convient."
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-pop.page:5
+#: C/mail-account-manage-pop.page:5(info/desc)
 msgid "Add and edit a POP mail account in Evolution."
 msgstr "Ajouter et modifier un compte de messagerie POP dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-pop.page:20
+#: C/mail-account-manage-pop.page:20(page/title)
 msgid "POP mail account settings"
 msgstr "Paramètres de compte de messagerie POP"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-pop.page:36
+#: C/mail-account-manage-pop.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving Email and Receiving options"
 msgctxt "link"
 msgid "Receiving Email and Receiving options (POP accounts)"
-msgstr "Réception des courriels et options de réception (comptes POP)"
+msgstr "Réception des courriels et options de réception"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-pop.page:43
+#: C/mail-account-manage-pop.page:43(info/title)
+#, fuzzy
+#| msgid "Sending Email"
 msgctxt "link"
 msgid "Sending Email (POP accounts)"
-msgstr "Envoi du courriel (comptes POP)"
+msgstr "Envoi du courriel"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-pop.page:50
+#: C/mail-account-manage-pop.page:50(info/title)
+#, fuzzy
+#| msgid "Default account signature"
 msgctxt "link"
 msgid "Defaults (POP accounts)"
-msgstr "Par défaut (comptes POP)"
+msgstr "Signature par défaut du compte"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-pop.page:57
+#: C/mail-account-manage-pop.page:57(info/title)
 msgctxt "link"
 msgid "Security (POP accounts)"
-msgstr "Sécurité (comptes POP)"
+msgstr ""
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-unix-mbox-spool-directory.page:5
+#: C/mail-account-manage-unix-mbox-spool-directory.page:5(info/desc)
 msgid "Add and edit a Standard Unix mbox Spool Directory account in Evolution."
 msgstr ""
 "Ajouter et modifier un compte utilisant le répertoire Unix standard de spool "
 "mbox dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-unix-mbox-spool-directory.page:20
+#: C/mail-account-manage-unix-mbox-spool-directory.page:20(page/title)
 msgid "Standard Unix mbox Spool Directory account settings"
 msgstr ""
 "Paramètres de compte utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-directory.page:36
+#: C/mail-account-manage-unix-mbox-spool-directory.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for standard Unix mbox spool directory accounts."
 msgctxt "link"
 msgid ""
 "Receiving Email and Receiving options (Standard Unix mbox Spool Directory "
 "accounts)"
 msgstr ""
-"Réception de courriels et options de réception (comptes de répertoire Unix "
-"standard de spool mbox)"
+"Options de réception pour les comptes utilisant le répertoire Unix standard "
+"de spool mbox."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-directory.page:43
+#: C/mail-account-manage-unix-mbox-spool-directory.page:43(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool Directory account settings"
 msgctxt "link"
 msgid "Sending Email (Standard Unix mbox Spool Directory accounts)"
-msgstr "Envoi de courriels (comptes de répertoire Unix standard de spool mbox)"
+msgstr ""
+"Paramètres de compte utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-directory.page:50
+#: C/mail-account-manage-unix-mbox-spool-directory.page:50(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool Directory account settings"
 msgctxt "link"
 msgid "Defaults (Standard Unix mbox Spool Directory accounts)"
-msgstr "Par défaut (comptes de répertoire Unix standard de spool mbox)"
+msgstr ""
+"Paramètres de compte utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-directory.page:57
+#: C/mail-account-manage-unix-mbox-spool-directory.page:57(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool Directory account settings"
 msgctxt "link"
 msgid "Security (Standard Unix mbox Spool Directory accounts)"
-msgstr "Sécurité (comptes de répertoire Unix standard de spool mbox)"
+msgstr ""
+"Paramètres de compte utilisant le répertoire Unix standard de spool mbox"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-unix-mbox-spool-file.page:5
+#: C/mail-account-manage-unix-mbox-spool-file.page:5(info/desc)
 msgid "Add and edit a Standard Unix mbox Spool File account in Evolution."
 msgstr ""
 "Ajouter et modifier un compte utilisant le fichier Unix standard de spool "
 "mbox dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-unix-mbox-spool-file.page:20
+#: C/mail-account-manage-unix-mbox-spool-file.page:20(page/title)
 msgid "Standard Unix mbox Spool File account settings"
 msgstr "Paramètres de compte utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-file.page:36
+#: C/mail-account-manage-unix-mbox-spool-file.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving options for standard Unix mbox spool file accounts."
 msgctxt "link"
 msgid ""
 "Receiving Email and Receiving options (Standard Unix mbox Spool File "
 "accounts)"
 msgstr ""
-"Réception de courriels et options de réception (comptes Unix standard de "
-"spool mbox)"
+"Options de réception pour les comptes utilisant le fichier Unix standard de "
+"spool mbox."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-file.page:43
+#: C/mail-account-manage-unix-mbox-spool-file.page:43(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool File account settings"
 msgctxt "link"
 msgid "Sending Email (Standard Unix mbox Spool File accounts)"
-msgstr "Envoi de courriels (comptes Unix standard de spool mbox)"
+msgstr "Paramètres de compte utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-file.page:50
+#: C/mail-account-manage-unix-mbox-spool-file.page:50(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool File account settings"
 msgctxt "link"
 msgid "Defaults (Standard Unix mbox Spool File accounts)"
-msgstr "Par défaut (comptes Unix standard de spool mbox)"
+msgstr "Paramètres de compte utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-unix-mbox-spool-file.page:57
+#: C/mail-account-manage-unix-mbox-spool-file.page:57(info/title)
+#, fuzzy
+#| msgid "Standard Unix mbox Spool File account settings"
 msgctxt "link"
 msgid "Security (Standard Unix mbox Spool File accounts)"
-msgstr "Sécurité (comptes Unix standard de spool mbox)"
+msgstr "Paramètres de compte utilisant le fichier Unix standard de spool mbox"
 
-#. (itstool) path: info/desc
-#: C/mail-account-manage-usenet-news.page:5
+#: C/mail-account-manage-usenet-news.page:5(info/desc)
 msgid "Add and edit a Usenet news account in Evolution."
 msgstr "Ajouter et modifier un compte de nouvelles Usenet dans Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-account-manage-usenet-news.page:20
+#: C/mail-account-manage-usenet-news.page:20(page/title)
 msgid "Usenet news account settings"
 msgstr "Paramétrage d'un compte de nouvelles Usenet"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-usenet-news.page:36
+#: C/mail-account-manage-usenet-news.page:36(info/title)
+#, fuzzy
+#| msgid "Receiving Email and Receiving options"
 msgctxt "link"
 msgid "Receiving Email and Receiving options (Usenet News accounts)"
-msgstr ""
-"Réception des courriels et options de réception (comptes de nouvelles USENET)"
+msgstr "Réception des courriels et options de réception"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-usenet-news.page:43
+#: C/mail-account-manage-usenet-news.page:43(info/title)
+#, fuzzy
+#| msgid "Receiving options for Usenet news accounts."
 msgctxt "link"
 msgid "Sending Email (Usenet News accounts)"
-msgstr "Envoi de courriels (comptes de nouvelles USENET)"
+msgstr "Options de réception pour les comptes de nouvelles Usenet."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-usenet-news.page:50
+#: C/mail-account-manage-usenet-news.page:50(info/title)
+#, fuzzy
+#| msgid "Usenet news account settings"
 msgctxt "link"
 msgid "Defaults (Usenet News accounts)"
-msgstr "Par défaut (comptes de nouvelles USENET)"
+msgstr "Paramétrage d'un compte de nouvelles Usenet"
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-usenet-news.page:57
+#: C/mail-account-manage-usenet-news.page:57(info/title)
+#, fuzzy
+#| msgid "Receiving options for Usenet news accounts."
 msgctxt "link"
 msgid "Security (Usenet News accounts)"
-msgstr "Sécurité (comptes de nouvelles USENET)"
+msgstr "Options de réception pour les comptes de nouvelles Usenet."
 
-#. (itstool) path: info/title
-#: C/mail-account-manage-usenet-news.page:66
+#: C/mail-account-manage-usenet-news.page:66(info/title)
+#, fuzzy
+#| msgid "Receiving options for Usenet news accounts."
 msgctxt "link"
 msgid "Other settings (Usenet News accounts)"
-msgstr "Autres paramètres (comptes de nouvelles USENET)"
+msgstr "Options de réception pour les comptes de nouvelles Usenet."
 
-#. (itstool) path: info/desc
-#: C/mail-attachments.page:5
+#: C/mail-attachments.page:5(info/desc)
 msgid "Handling of file attachments for writing and reading mail"
 msgstr "Gérer les pièces jointes lors de l'écriture et la lecture de courriel"
 
-#. (itstool) path: page/title
-#: C/mail-attachments.page:18
+#: C/mail-attachments.page:18(page/title)
 msgid "Managing attachments"
 msgstr "Gestion des pièces jointes"
 
-#. (itstool) path: info/desc
-#: C/mail-attachments-received.page:5
+#: C/mail-attachments-received.page:5(info/desc)
 msgid "Saving and opening files that are attached to received emails."
 msgstr "Enregistrer et ouvrir les fichiers attachés aux courriels entrants."
 
-#. (itstool) path: page/title
-#: C/mail-attachments-received.page:24
+#: C/mail-attachments-received.page:24(page/title)
 msgid "Handling attachments in received mail"
 msgstr "Gestion des pièces jointes dans les courriels reçus"
 
-#. (itstool) path: page/p
-#: C/mail-attachments-received.page:26
+#: C/mail-attachments-received.page:26(page/p)
 msgid ""
 "If you receive an email message with one or more file attachments, Evolution "
 "displays the number of attachments and a <gui style=\"button\">Save</gui> or "
@@ -5490,8 +5267,7 @@ msgstr ""
 "\">Enregistrer sous</gui> ou <gui style=\"button\">Tout enregistrer</gui> "
 "entre l'en-tête du courriel et son contenu."
 
-#. (itstool) path: note/p
-#: C/mail-attachments-received.page:27
+#: C/mail-attachments-received.page:27(note/p)
 msgid ""
 "Evolution does not support saving all attachments of all messages in one "
 "folder at once."
@@ -5499,14 +5275,12 @@ msgstr ""
 "Evolution ne prend pas en charge l'enregistrement de toutes les pièces-"
 "jointes de tous les messages d'un dossier en une seule fois."
 
-#. (itstool) path: page/p
-#: C/mail-attachments-received.page:29
+#: C/mail-attachments-received.page:29(page/p)
 msgid "A list of attachments is also available at the bottom of the email."
 msgstr ""
 "La liste des pièces jointes est également disponible en bas du courriel."
 
-#. (itstool) path: page/p
-#: C/mail-attachments-received.page:30
+#: C/mail-attachments-received.page:30(page/p)
 msgid ""
 "To save an attachment to disk, click the down-arrow next to the attachment "
 "icon and click <gui>Save As</gui>."
@@ -5515,8 +5289,7 @@ msgstr ""
 "pointant vers le bas à côté de l'icône de pièce jointe et cliquez sur "
 "<gui>Enregistrer sous</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-attachments-received.page:31
+#: C/mail-attachments-received.page:31(page/p)
 msgid ""
 "To open an attachment in another application, click the down-arrow next to "
 "the attachment icon and choose one of the available applications."
@@ -5525,8 +5298,7 @@ msgstr ""
 "flèche vers le bas à côté de l'icône de pièce jointe et choisissez une des "
 "applications disponibles."
 
-#. (itstool) path: page/p
-#: C/mail-attachments-received.page:33
+#: C/mail-attachments-received.page:33(page/p)
 msgid ""
 "The options available for an attachment vary depending on the type of "
 "attachment and the applications that are installed on your system. For "
@@ -5538,51 +5310,43 @@ msgstr ""
 "peuvent être ouverts par l'application <gui>Image Viewer (Visionneur "
 "d'image)</gui> ou par l'éditeur d'image <gui>GIMP</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-attachments-sending.page:5
+#: C/mail-attachments-sending.page:5(info/desc)
 msgid "Attaching files to emails you want to send."
 msgstr "Ajouter des fichiers aux courriels que vous voulez envoyer."
 
-#. (itstool) path: page/title
-#: C/mail-attachments-sending.page:24
+#: C/mail-attachments-sending.page:24(page/title)
 msgid "Adding attachments to an email"
 msgstr "Ajout de pièces jointes à un courriel"
 
-#. (itstool) path: section/title
-#: C/mail-attachments-sending.page:27
+#: C/mail-attachments-sending.page:27(section/title)
 msgid "Attaching files"
 msgstr "Joindre des fichiers"
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:28
+#: C/mail-attachments-sending.page:28(section/p)
 msgid "To attach a file to your email in the composer:"
 msgstr "Pour joindre un fichier à un courriel :"
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:30
+#: C/mail-attachments-sending.page:30(item/p)
 msgid ""
-"Click <gui>Add Attachment…</gui>, or click <guiseq><gui>Insert</"
+"Click <gui>Add Attachment...</gui>, or click <guiseq><gui>Insert</"
 "gui><gui>Attachment</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>M</"
 "key></keyseq>."
 msgstr ""
-"Cliquez sur <gui>Ajouter une pièce jointe…</gui> ou cliquez sur "
-"<guiseq><gui>Insertion</gui><gui>Pièce jointe</gui></guiseq> ou appuyez sur "
+"Cliquez sur <gui>Ajouter une pièce jointe</gui> ou cliquez sur "
+"<guiseq><gui>Insertion</gui><gui>Pièce jointe</gui></guiseq> ou pressez "
 "<keyseq><key>Ctrl</key><key>M</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:31
+#: C/mail-attachments-sending.page:31(item/p)
 msgid "Select the file you want to attach."
 msgstr "Sélectionnez le fichier à joindre."
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:34
+#: C/mail-attachments-sending.page:34(section/p)
 msgid "You can also drag a file to the attachment bar of the composer window."
 msgstr ""
 "Vous pouvez aussi faire glisser un fichier sur la barre des pièces jointes "
 "de la fenêtre de l'éditeur."
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:36
+#: C/mail-attachments-sending.page:36(section/p)
 msgid ""
 "When you send the message, a copy of the attached file goes with it. Be "
 "aware that large attachments can take a long time to send and receive."
@@ -5591,13 +5355,11 @@ msgstr ""
 "envoyée. Il faut être conscient que de gros fichiers joints peuvent prendre "
 "beaucoup de temps à envoyer et à recevoir."
 
-#. (itstool) path: section/title
-#: C/mail-attachments-sending.page:40
+#: C/mail-attachments-sending.page:40(section/title)
 msgid "Attachment Reminder"
 msgstr "Oubli des pièces jointes"
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:42
+#: C/mail-attachments-sending.page:42(section/p)
 msgid ""
 "Evolution has an Attachment Reminder plugin you can use to remind yourself "
 "to attach a file to an email. If it determines that you have not attached "
@@ -5608,32 +5370,27 @@ msgstr ""
 "oublié de joindre un fichier, une fenêtre de rappel s'affiche avant l'envoi "
 "du message."
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:44
+#: C/mail-attachments-sending.page:44(section/p)
 msgid "To enable the Attachment Reminder:"
 msgstr "Pour activer le greffon Oubli des pièces jointes :"
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:46
-#: C/mail-composer-custom-header-lines.page:31
-#: C/mail-composer-message-templates-variables.page:28
+#: C/mail-attachments-sending.page:46(item/p)
+#: C/mail-composer-custom-header-lines.page:31(item/p)
+#: C/mail-composer-message-templates-variables.page:28(item/p)
 msgid "Select <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>."
 msgstr "Sélectionnez <guiseq><gui>Édition</gui><gui>Greffons</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:47
+#: C/mail-attachments-sending.page:47(item/p)
 msgid "Enable <gui>Attachment Reminder</gui>."
 msgstr "Cochez <gui>Oubli des pièces jointes</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:48
-#: C/mail-composer-custom-header-lines.page:33
-#: C/mail-composer-message-templates-variables.page:30
+#: C/mail-attachments-sending.page:48(item/p)
+#: C/mail-composer-custom-header-lines.page:33(item/p)
+#: C/mail-composer-message-templates-variables.page:30(item/p)
 msgid "Click the <gui>Configuration</gui> tab."
 msgstr "Cliquez sur l'onglet <gui>Configuration</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-attachments-sending.page:49
+#: C/mail-attachments-sending.page:49(item/p)
 msgid ""
 "Click <gui style=\"button\">Add</gui>, then enter keywords in your language "
 "such as \"Attach\" or \"enclosed\"."
@@ -5641,8 +5398,7 @@ msgstr ""
 "Cliquez sur <gui style=\"button\">Ajouter</gui> puis saisissez les mots-clés "
 "dans votre langue tels que « attaché » ou « jointe »..."
 
-#. (itstool) path: section/p
-#: C/mail-attachments-sending.page:51
+#: C/mail-attachments-sending.page:51(section/p)
 msgid ""
 "Based on the keywords you have added, Evolution searches the text of every "
 "mail you are going to send. If it finds any of the keywords in your email "
@@ -5653,19 +5409,16 @@ msgstr ""
 "qu'aucune pièce jointe n'a été ajoutée, une fenêtre de rappel vous avertit "
 "que des pièces jointes sont peut-être manquantes."
 
-#. (itstool) path: info/desc
-#: C/mail-calendar-sending-invitations.page:5
+#: C/mail-calendar-sending-invitations.page:5(info/desc)
 msgid "Sending invitations for appointments to contacts via email."
 msgstr ""
 "Envoyer des invitations pour des rendez-vous à des contacts par courriel."
 
-#. (itstool) path: page/title
-#: C/mail-calendar-sending-invitations.page:21
+#: C/mail-calendar-sending-invitations.page:21(page/title)
 msgid "Sending invitations by email"
 msgstr "Envoi d'invitations par courriel"
 
-#. (itstool) path: page/p
-#: C/mail-calendar-sending-invitations.page:23
+#: C/mail-calendar-sending-invitations.page:23(page/p)
 msgid ""
 "If you create an event in the calendar component, you can then send "
 "invitations to the attendee list through the Evolution email tool. The "
@@ -5676,8 +5429,7 @@ msgstr ""
 "d'Evolution. La carte d'invitation est envoyée comme pièce jointe au format "
 "iCal."
 
-#. (itstool) path: page/p
-#: C/mail-calendar-sending-invitations.page:25
+#: C/mail-calendar-sending-invitations.page:25(page/p)
 msgid ""
 "To send an invitation, right-click on the entry in the calendar and choose "
 "<gui>Forward as iCalendar</gui>."
@@ -5685,18 +5437,15 @@ msgstr ""
 "Pour envoyer une invitation, faites un clic-droit sur l'élément d'agenda et  "
 "choisissez <gui>Faire suivre comme iCalendar</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-calendar-sending-invitations.page:27
+#: C/mail-calendar-sending-invitations.page:27(page/p)
 msgid "When you receive an invitation, you have several options:"
 msgstr "Lorsque vous recevez une invitation, vous avez plusieurs options :"
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:30
+#: C/mail-calendar-sending-invitations.page:30(item/p)
 msgid "Accept:"
 msgstr "Accepter :"
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:31
+#: C/mail-calendar-sending-invitations.page:31(item/p)
 msgid ""
 "Indicates you will attend the meeting. When you click the OK button, the "
 "meeting is entered into your calendar."
@@ -5704,13 +5453,11 @@ msgstr ""
 "Indique que vous allez participer à la réunion. Quand vous cliquez sur le "
 "bouton Valider, le rendez-vous est ajouté à votre agenda."
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:33
+#: C/mail-calendar-sending-invitations.page:33(item/p)
 msgid "Tentatively Accept:"
 msgstr "Accepter provisoirement :"
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:34
+#: C/mail-calendar-sending-invitations.page:34(item/p)
 msgid ""
 "Indicates you will probably attend the meeting. When you click the OK "
 "button, the meeting is entered into your calendar, but is marked as "
@@ -5720,13 +5467,11 @@ msgstr ""
 "cliquez sur le bouton Valider, le rendez-vous est ajouté à votre agenda, "
 "mais il reçoit l'attribut Provisoire."
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:36
+#: C/mail-calendar-sending-invitations.page:36(item/p)
 msgid "Decline:"
 msgstr "Refuser :"
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:37
+#: C/mail-calendar-sending-invitations.page:37(item/p)
 msgid ""
 "Indicates you are unable to attend the meeting. The meeting is not entered "
 "into your calendar when you click OK, although your response is sent to the "
@@ -5737,33 +5482,28 @@ msgstr ""
 "que votre réponse soit envoyée au créateur de la réunion si vous avez coché "
 "l'option « Répondre à l'expéditeur »."
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:39
+#: C/mail-calendar-sending-invitations.page:39(item/p)
 msgid "Send reply to sender:"
 msgstr "Répondre à l'expéditeur :"
 
-#. (itstool) path: item/p
-#: C/mail-calendar-sending-invitations.page:40
+#: C/mail-calendar-sending-invitations.page:40(item/p)
 msgid ""
 "Select this option if you want your response sent to the meeting organizers."
 msgstr ""
 "Cochez cette option si vous souhaitez que votre réponse soit envoyée aux "
 "organisateurs de la réunion."
 
-#. (itstool) path: info/desc
-#: C/mail-cannot-see.page:5
+#: C/mail-cannot-see.page:5(info/desc)
 msgid "If you received or sent an email, but you cannot find it anywhere."
 msgstr ""
 "Si vous avez reçu ou envoyé un courriel mais que vous ne le trouvez nulle "
 "part."
 
-#. (itstool) path: page/title
-#: C/mail-cannot-see.page:20
+#: C/mail-cannot-see.page:20(page/title)
 msgid "I cannot see some emails, where are they?"
 msgstr "Je ne peux pas voir certains courriels, où sont-ils ?"
 
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:24
+#: C/mail-cannot-see.page:24(item/p)
 msgid ""
 "Check whether you are using filters on incoming (or outgoing) messages. "
 "These could be automatically moving your messages to another destination."
@@ -5772,8 +5512,7 @@ msgstr ""
 "sortant). Cela pourrait déplacer automatiquement vos messages vers un autre "
 "endroit."
 
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:27
+#: C/mail-cannot-see.page:27(item/p)
 msgid ""
 "Check your search view in the search bar right above the message list. "
 "Perhaps the <gui>Show</gui> dropdown list is set to a filter like <gui>Read "
@@ -5786,8 +5525,7 @@ msgstr ""
 "de saisie de texte contient quelque chose. Cliquez sur l'icône de balai pour "
 "effacer le champ de recherche."
 
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:30
+#: C/mail-cannot-see.page:30(item/p)
 msgid ""
 "If you cannot see any emails at all in a folder, check that you have not "
 "maximized the message preview (so the message list pane is hidden). To do "
@@ -5800,8 +5538,7 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Aperçu</gui><gui>Afficher l'aperçu du "
 "message</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:33
+#: C/mail-cannot-see.page:33(item/p)
 msgid ""
 "Look in the <gui>Junk</gui> folder. Messages that are marked as Junk "
 "disappear from the original folder and are moved to the Junk folder."
@@ -5811,17 +5548,15 @@ msgstr ""
 "dossier Pourriels."
 
 # BRuno : pas de menu de ce type ?
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:38
+#: C/mail-cannot-see.page:38(item/p)
 msgid ""
-"Click <guiseq><gui>View</gui><gui>Show Deleted Messages</gui></guiseq> to "
+"Click <guiseq><gui>Edit</gui><gui>Show Deleted Messages</gui></guiseq> to "
 "make sure all messages are visible."
 msgstr ""
 "Cliquez sur <guiseq><gui>Affichage</gui><gui>Afficher les messages "
 "supprimés</gui></guiseq> pour être sûr que tous les messages sont visibles."
 
-#. (itstool) path: item/p
-#: C/mail-cannot-see.page:41
+#: C/mail-cannot-see.page:41(item/p)
 msgid ""
 "Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. "
@@ -5832,29 +5567,25 @@ msgstr ""
 "gui><gui>Valeurs par défaut</gui></guiseq>. Peut-être avez-vous configuré "
 "d'autres dossiers que ceux que vous croyez."
 
-#. (itstool) path: info/desc
-#: C/mail-change-columns-in-message-list.page:5
+#: C/mail-change-columns-in-message-list.page:5(info/desc)
 msgid "Editing the columns displayed in the list of messages."
 msgstr "Modifier les colonnes affichées dans la liste des messages."
 
-#. (itstool) path: page/title
-#: C/mail-change-columns-in-message-list.page:20
+#: C/mail-change-columns-in-message-list.page:20(page/title)
 msgid "Changing the message list columns"
 msgstr "Modification des colonnes de la liste des messages"
 
-#. (itstool) path: page/p
-#: C/mail-change-columns-in-message-list.page:22
+#: C/mail-change-columns-in-message-list.page:22(page/p)
 msgid ""
 "If you want to change the columns in the mail message list, right-click on "
-"the column headers and choose either <gui>Add a Column…</gui> or <gui>Remove "
-"This Column</gui>."
+"the column headers and choose either <gui>Add a Column...</gui> or "
+"<gui>Remove This Column</gui>."
 msgstr ""
 "Si vous voulez modifier les colonnes dans la liste des messages, faites un "
 "clic-droit sur les en-têtes de colonne et choisissez <gui>Ajouter une "
-"colonne…</gui> ou <gui>Supprimer cette colonne</gui>."
+"colonne</gui> ou <gui>Supprimer cette colonne</gui>."
 
-#. (itstool) path: note/p
-#: C/mail-change-columns-in-message-list.page:23
+#: C/mail-change-columns-in-message-list.page:23(note/p)
 msgid ""
 "If you have a small display, you can replace the <gui>Subject</gui> column "
 "by the <gui>Subject - Trimmed</gui> which will remove prefixes such as \"Re:"
@@ -5868,8 +5599,7 @@ msgstr ""
 "nom et l'adresse électronique de l'expéditeur par la colonne "
 "<gui>Expéditeur</gui> qui n'affiche que le nom de l'expéditeur."
 
-#. (itstool) path: note/p
-#: C/mail-change-columns-in-message-list.page:25
+#: C/mail-change-columns-in-message-list.page:25(note/p)
 msgid ""
 "If you would like to have the same column layout in all mail folders except "
 "for the <gui>Sent</gui> folder, you can enable <guiseq><gui>Edit</"
@@ -5888,18 +5618,15 @@ msgstr ""
 "message-list#email-threads\"><gui>Grouper par fils de discussion</gui></"
 "link> et <gui>Aperçu du message</gui> dans les dossiers."
 
-#. (itstool) path: info/desc
-#: C/mail-change-time-format.page:5
+#: C/mail-change-time-format.page:5(info/desc)
 msgid "Changing the date and time format in the message list."
 msgstr "Modifier le format de date et heure dans la liste des messages."
 
-#. (itstool) path: page/title
-#: C/mail-change-time-format.page:19
+#: C/mail-change-time-format.page:19(page/title)
 msgid "Format of dates and time"
 msgstr "Format de date et heure"
 
-#. (itstool) path: page/p
-#: C/mail-change-time-format.page:20
+#: C/mail-change-time-format.page:20(page/p)
 msgid ""
 "You can change the format of the <gui>Date</gui> column by setting your "
 "preferred format under <guiseq><gui>Edit</gui><gui>Preferences</"
@@ -5911,8 +5638,7 @@ msgstr ""
 "gui><gui>Préférences du courriel</gui><gui>En-têtes</gui><gui>Format de date "
 "et d'heure</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-change-quotation-string.page:7
+#: C/mail-composer-change-quotation-string.page:7(info/desc)
 msgid ""
 "It is not possible to change the quotation introduction added when answering "
 "mail."
@@ -5920,79 +5646,33 @@ msgstr ""
 "Impossible de modifier la citation introductive lors d'une réponse à un "
 "courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-change-quotation-string.page:24
+#: C/mail-composer-change-quotation-string.page:24(page/title)
 msgid "Changing the \"On date, person wrote:\" string when replying"
 msgstr ""
 "Modification de la chaîne « Le &lt;date&gt;, &lt;personne&gt; a écrit » lors "
 "d'une réponse"
 
-#. (itstool) path: page/p
-#: C/mail-composer-change-quotation-string.page:26
+#: C/mail-composer-change-quotation-string.page:26(page/p)
 msgid "Advanced users can change this string."
 msgstr "Les utilisateurs avancés peuvent modifier cette chaîne."
 
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:29
+#: C/mail-composer-change-quotation-string.page:29(item/p)
 msgid "Open the <app>dconf-editor</app> application."
 msgstr "Ouvrez l'application <app>dconf-editor</app>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:30
+#: C/mail-composer-change-quotation-string.page:30(item/p)
 msgid "Navigate to <code>org.gnome.evolution.mail</code>."
 msgstr "Déplacez-vous vers <code>org.gnome.evolution.mail</code>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:31
+#: C/mail-composer-change-quotation-string.page:31(item/p)
 msgid ""
-"Enter the preferred quotation string as the value for the key <code>composer-"
-"message-attribution</code>."
+"Enter the prefered quotation string as the value for the key <gui>composer-"
+"message-attribution</gui>."
 msgstr ""
 "Saisissez votre chaîne de citation favorite comme valeur de la clé "
 "<gui>composer-message-attribution</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-change-quotation-string.page:35
-msgid ""
-"The default string in English is: <code>\"On ${AbbrevWeekdayName}, ${Year}-"
-"${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:\"</code>"
-msgstr ""
-"La chaîne par défaut en anglais est :  <code>\"On ${AbbrevWeekdayName}, "
-"${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-"\"</code>"
-
-#. (itstool) path: page/p
-#: C/mail-composer-change-quotation-string.page:39
-msgid "The following placeholders are available:"
-msgstr "Les espaces réservés suivants sont disponibles :"
-
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:48
-msgid "<_:code-1/> (format: 01-31)"
-msgstr "<_:code-1/> (format: 01-31)"
-
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:49
-msgid "<_:code-1/> (format: 1-31)"
-msgstr "<_:code-1/> (format: 1-31)"
-
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:54
-msgid "<_:code-1/> (format: 1-366)"
-msgstr "<_:code-1/> (format: 1-366)"
-
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:55
-msgid "<_:code-1/> (format: 01-12)"
-msgstr "<_:code-1/> (format: 01-12)"
-
-#. (itstool) path: item/p
-#: C/mail-composer-change-quotation-string.page:58
-msgid "<_:code-1/> (e.g. 15 for the year 2015)"
-msgstr "<_:code-1/> (p.ex. 15 pour l'année 2015)"
-
-#. (itstool) path: note/p
-#: C/mail-composer-change-quotation-string.page:64
+#: C/mail-composer-change-quotation-string.page:35(note/p)
 msgid ""
 "You might need to install the <sys>dconf-editor</sys> package to perform "
 "these steps."
@@ -6000,49 +5680,41 @@ msgstr ""
 "Il se peut que vous ayez à installer le paquet <sys>dconf-editor</sys> pour "
 "suivre ces instructions."
 
-#. (itstool) path: when/p
-#: C/mail-composer-change-quotation-string.page:67
+#: C/mail-composer-change-quotation-string.page:38(when/p)
 msgid ""
 "<link action=\"install:dconf-editor\" href=\"http://ftp.gnome.org/pub/gnome/";
-"sources/dconf/\" style=\"button\">Install dconf-editor</link>"
+"sources/dconf-editor/\" style=\"button\">Install dconf-editor</link>"
 msgstr ""
 "<link action=\"install:dconf-editor\" href=\"http://ftp.gnome.org/pub/gnome/";
-"sources/dconf/\" style=\"button\">Installer dconf-editor</link>"
+"sources/dconf-editor/\" style=\"button\">Installer dconf-editor</link>"
 
-#. (itstool) path: info/desc
-#: C/mail-composer-custom-header-lines.page:5
-msgid "Using custom fields in the header of composed messages."
-msgstr "Utiliser des champs personnalisés dans l'en-tête de messages composés."
+#: C/mail-composer-custom-header-lines.page:5(info/desc)
+msgid "Using custom fields in the header of composed messages"
+msgstr "Utiliser des champs personnalisés dans l'en-tête de messages composés"
 
-#. (itstool) path: page/title
-#: C/mail-composer-custom-header-lines.page:23
+#: C/mail-composer-custom-header-lines.page:23(page/title)
 msgid "Custom Header Lines"
 msgstr "En-têtes personnalisés"
 
-#. (itstool) path: page/p
-#: C/mail-composer-custom-header-lines.page:25
+#: C/mail-composer-custom-header-lines.page:25(page/p)
 msgid "You can add arbitrary header lines to outgoing emails."
 msgstr ""
 "Vous pouvez ajouter les lignes d'en-têtes que vous voulez aux messages "
 "sortants."
 
-#. (itstool) path: section/title
-#: C/mail-composer-custom-header-lines.page:28
+#: C/mail-composer-custom-header-lines.page:28(section/title)
 msgid "Enabling and managing custom headers"
 msgstr "Activation et gestion d'en-têtes personnalisés"
 
-#. (itstool) path: section/p
-#: C/mail-composer-custom-header-lines.page:29
+#: C/mail-composer-custom-header-lines.page:29(section/p)
 msgid "To set up the Custom Header plugin:"
 msgstr "Pour activer le greffon En-tête personnalisé :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:32
+#: C/mail-composer-custom-header-lines.page:32(item/p)
 msgid "Enable <gui>Custom Header</gui>."
 msgstr "Cochez <gui>En-têtes personnalisés</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:34
+#: C/mail-composer-custom-header-lines.page:34(item/p)
 msgid ""
 "You can add, edit, or remove the header fields. For every header field you "
 "add, you can specify the keys and values. The key is used as the title of "
@@ -6055,13 +5727,11 @@ msgstr ""
 "pouvez saisir plusieurs valeurs pour les clés. Vous devez utiliser un point-"
 "virgule pour séparer chaque valeur saisie."
 
-#. (itstool) path: section/title
-#: C/mail-composer-custom-header-lines.page:39
+#: C/mail-composer-custom-header-lines.page:39(section/title)
 msgid "Inserting custom headers in a message"
 msgstr "Ajout d'en-têtes personnalisés dans un message"
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:41
+#: C/mail-composer-custom-header-lines.page:41(item/p)
 msgid ""
 "Click <guiseq><gui>New</gui><gui>Mail Message</gui></guiseq> or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>M</key></keyseq> to open the "
@@ -6071,15 +5741,13 @@ msgstr ""
 "<keyseq><key>Maj</key><key>Ctrl</key><key>M</key></keyseq> pour ouvrir la "
 "fenêtre de l'éditeur de messages."
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:42
+#: C/mail-composer-custom-header-lines.page:42(item/p)
 msgid "Select <guiseq><gui>Insert</gui><gui>Custom Header</gui></guiseq>."
 msgstr ""
 "Sélectionnez <guiseq><gui>Insertion</gui><gui>En-tête personnalisé</gui></"
 "guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:43
+#: C/mail-composer-custom-header-lines.page:43(item/p)
 msgid ""
 "In the <gui>Email Custom Header</gui> window, you can view all the defined "
 "header fields and values."
@@ -6087,24 +5755,20 @@ msgstr ""
 "Dans la fenêtre <gui>En-tête de courriel personnalisé</gui>, vous pouvez "
 "voir tous les champs et valeurs d'en-têtes définis."
 
-#. (itstool) path: item/p
-#: C/mail-composer-custom-header-lines.page:44
+#: C/mail-composer-custom-header-lines.page:44(item/p)
 msgid "Set the values for the header fields by using the dropdown list."
 msgstr ""
 "Définissez les valeurs des champs d'en-tête en utilisant la liste déroulante."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-enable-html-format.page:5
+#: C/mail-composer-enable-html-format.page:5(info/desc)
 msgid "Enable HTML format in the mail composer."
 msgstr "Activer le format HTML dans l'éditeur de courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-enable-html-format.page:21
+#: C/mail-composer-enable-html-format.page:21(page/title)
 msgid "Enabling HTML format"
 msgstr "Activation du format HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-enable-html-format.page:23
+#: C/mail-composer-enable-html-format.page:23(page/p)
 msgid ""
 "You can change the format of an email message from plain text to HTML in the "
 "email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> "
@@ -6114,8 +5778,7 @@ msgstr ""
 "simple au HTML dans l'éditeur de courriel en choisissant "
 "<guiseq><gui>Format</gui><gui>HTML</gui></guiseq> dans la barre de menus."
 
-#. (itstool) path: page/p
-#: C/mail-composer-enable-html-format.page:24
+#: C/mail-composer-enable-html-format.page:24(page/p)
 msgid ""
 "Alternately, you also can change the first dropdown list below the "
 "<gui>Subject</gui> line from <gui>Plain Text</gui> to <gui>HTML</gui>."
@@ -6124,8 +5787,7 @@ msgstr ""
 "la ligne <gui>Sujet</gui>, remplacer <gui>Texte simple </gui> par <gui>HTML</"
 "gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-enable-html-format.page:25
+#: C/mail-composer-enable-html-format.page:25(page/p)
 msgid ""
 "If you choose HTML format, a second tool bar will be displayed below the "
 "<gui>Subject</gui> line with HTML-only options."
@@ -6133,8 +5795,7 @@ msgstr ""
 "Si vous choisissez le format HTML, une seconde barre d'outils s'affiche sous "
 "la ligne <gui>Sujet</gui> avec les options propres à l'HTML."
 
-#. (itstool) path: page/p
-#: C/mail-composer-enable-html-format.page:26
+#: C/mail-composer-enable-html-format.page:26(page/p)
 msgid ""
 "To send all your mail as HTML by default, enable <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default "
@@ -6145,57 +5806,15 @@ msgstr ""
 "l'éditeur</gui><gui>Comportement par défaut</gui><gui>Formater les messages "
 "en HTML</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-external-editor.page:5
-msgid "Using a text editor application instead of the default mail composer."
-msgstr ""
-"Utilisation d'un éditeur de texte au lieu de l'éditeur de courrier par "
-"défaut."
-
-#. (itstool) path: page/title
-#: C/mail-composer-external-editor.page:20
-msgid "Using an external editor"
-msgstr "Utilisation d'un éditeur externe"
-
-#. (itstool) path: page/p
-#: C/mail-composer-external-editor.page:22
-msgid ""
-"You can compose the body of your message externally in your favorite text "
-"editor application so you can use its specific functionality. Enable "
-"<guiseq><gui>Edit</gui><gui>Plugins</gui><gui>External Editor</gui></guiseq> "
-"and set the corresponding <gui>Command</gui> to start the application under "
-"<gui>Configuration</gui>."
-msgstr ""
-"Vous pouvez composer le corps du message dans votre éditeur de texte favori "
-"et ainsi utiliser ses fonctions particulières. Activez  "
-"<guiseq><gui>Édition</gui><gui>Greffons</gui><gui>Éditeur  externe</gui></"
-"guiseq> et définissez la <gui>Commande</gui> pour démarrer l'application "
-"dans <gui>Configuration</gui>."
-
-#. (itstool) path: page/p
-#: C/mail-composer-external-editor.page:23
-msgid ""
-"If <gui>Automatically launch when a new mail is edited</gui> is not set, you "
-"need to select <guiseq><gui>File</gui><gui>Compose in External Editor</gui></"
-"guiseq> in the mail composer."
-msgstr ""
-"Si <gui>Lancer automatiquement lorsqu'un nouveau courriel est édité</gui> "
-"n'est pas défini, vous devez sélectionner <guiseq><gui>Fichier</"
-"gui><gui>Composer dans un éditeur externe</gui></guiseq> dans l'éditeurf de "
-"courrier."
-
-#. (itstool) path: info/desc
-#: C/mail-composer-forward.page:5
+#: C/mail-composer-forward.page:5(info/desc)
 msgid "Forwarding a received email to somebody."
 msgstr "Faire suivre un message reçu à quelqu'un."
 
-#. (itstool) path: page/title
-#: C/mail-composer-forward.page:23
+#: C/mail-composer-forward.page:23(page/title)
 msgid "Forwarding a message"
 msgstr "Faire suivre un message"
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward.page:25
+#: C/mail-composer-forward.page:25(page/p)
 msgid ""
 "When you receive an email, you can forward it to other individuals or groups "
 "that might be interested."
@@ -6203,8 +5822,7 @@ msgstr ""
 "Lorsque vous recevez un courriel, vous pouvez le faire suivre à d'autres "
 "personnes ou groupes qui pourraient être intéressés."
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward.page:26
+#: C/mail-composer-forward.page:26(page/p)
 msgid ""
 "You can forward a message as an attachment to a new message (this is the "
 "default setting, see <link xref=\"#default-settings\">Default settings</"
@@ -6217,8 +5835,7 @@ msgstr ""
 "sans le caractère &gt; devant chaque ligne) ou en citation (avec le "
 "caractère &gt; devant chaque ligne)."
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward.page:27
+#: C/mail-composer-forward.page:27(page/p)
 msgid ""
 "Attachment forwarding is best if you want to send the full, unaltered "
 "message to someone else. Inline or Quoted forwarding is best if you want to "
@@ -6226,18 +5843,16 @@ msgid ""
 "different sections of the message you are forwarding."
 msgstr ""
 "Faire suivre en pièce jointe est mieux si vous voulez envoyer le message "
-"complet et non modifié à quelqu'un d'autre. Faire suivre dans le corps ou "
-"faire suivre en citation est mieux si vous voulez envoyez une partie du "
-"message ou si vous avez beaucoup de commentaires à faire sur différentes "
-"parties du message que vous faites suivre."
+"complet et non modifié à quelqu'un d'autre. Dans le corps ou cité est mieux "
+"si vous voulez envoyez une partie du message ou si vous avez beaucoup de "
+"commentaires à faire sur différentes parties du message que vous faites "
+"suivre."
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward.page:29
+#: C/mail-composer-forward.page:29(page/p)
 msgid "To forward a message that you are reading:"
-msgstr "Pour faire suivre le message que vous êtes en train de lire :"
+msgstr "Pour faire suivre un message que vous êtes en train de lire :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-forward.page:31
+#: C/mail-composer-forward.page:31(item/p)
 msgid ""
 "Click <guiseq><gui>Message</gui><gui>Forward</gui></guiseq>, the "
 "<gui>Forward</gui> button in the toolbar, or press <keyseq><key>Ctrl</"
@@ -6254,8 +5869,7 @@ msgstr ""
 "guiseq> ou sur la petite flèche du menu déroulant à côté du bouton "
 "<gui>Faire suivre</gui> dans la barre d'outils pour sélectionner la méthode."
 
-#. (itstool) path: item/p
-#: C/mail-composer-forward.page:32
+#: C/mail-composer-forward.page:32(item/p)
 msgid ""
 "Select a recipient for the message. The subject is already entered, although "
 "you can alter it if you want."
@@ -6263,13 +5877,11 @@ msgstr ""
 "Sélectionnez un destinataire pour le message. Le sujet est déjà saisi, mais "
 "vous pouvez le modifier si nécessaire."
 
-#. (itstool) path: item/p
-#: C/mail-composer-forward.page:33
+#: C/mail-composer-forward.page:33(item/p)
 msgid "Add your comments on the message in the text field."
 msgstr "Ajoutez vos commentaires sur le message dans la zone d'édition."
 
-#. (itstool) path: item/p
-#: C/mail-composer-forward.page:34
+#: C/mail-composer-forward.page:34(item/p)
 msgid ""
 "Click <gui style=\"button\">Send</gui> or press <keyseq><key>Ctrl</"
 "key><key>Return</key></keyseq>."
@@ -6277,8 +5889,7 @@ msgstr ""
 "Cliquez sur le bouton <gui style=\"button\">Envoyer</gui> ou pressez "
 "<keyseq><key>Ctrl</key><key>Entrée</key></keyseq>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward.page:37
+#: C/mail-composer-forward.page:37(page/p)
 msgid ""
 "Attachments to a message you are forwarding are forwarded only when you send "
 "the original message as an attachment. Inline messages do not forward any "
@@ -6288,13 +5899,12 @@ msgstr ""
 "message original en tant que pièce jointe. Pour les messages intégrés, les "
 "pièces jointes ne sont pas retransmises."
 
-#. (itstool) path: section/title
-#: C/mail-composer-forward.page:40 C/mail-composer-reply.page:53
+#: C/mail-composer-forward.page:40(section/title)
+#: C/mail-composer-reply.page:53(section/title)
 msgid "Default settings"
 msgstr "Paramètres par défaut"
 
-#. (itstool) path: section/p
-#: C/mail-composer-forward.page:41
+#: C/mail-composer-forward.page:41(section/p)
 msgid ""
 "The default settings for replying and forwarding can be changed under "
 "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
@@ -6306,20 +5916,17 @@ msgstr ""
 "l'éditeur</gui><gui>Général</gui><gui>Réponses et transferts</gui><gui>Style "
 "de transfert</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-forward-as-attachment.page:5
+#: C/mail-composer-forward-as-attachment.page:5(info/desc)
 msgid "How to forward a message with its attachments."
 msgstr "Comment faire suivre un message avec ses pièces jointes."
 
-#. (itstool) path: page/title
-#: C/mail-composer-forward-as-attachment.page:21
+#: C/mail-composer-forward-as-attachment.page:21(page/title)
 msgid "Forwarding a message with its attachments"
 msgstr "Faire suivre un message avec ses pièces jointes"
 
-#. (itstool) path: page/p
-#: C/mail-composer-forward-as-attachment.page:23
+#: C/mail-composer-forward-as-attachment.page:23(page/p)
 msgid ""
-"Click <guiseq><gui>Message</gui><gui>Forward as…</gui></guiseq> and choose "
+"Click <guiseq><gui>Message</gui><gui>Forward as...</gui></guiseq> and choose "
 "<gui>Attachment</gui>, so the forwarded email and also its attachments get "
 "attached to the email you want to send."
 msgstr ""
@@ -6327,8 +5934,7 @@ msgstr ""
 "guiseq> et choisissez <gui>Pièce jointe</gui> afin que le courriel transmis "
 "et ses pièces jointes soient attachés au courriel que vous envoyez."
 
-#. (itstool) path: note/p
-#: C/mail-composer-forward-as-attachment.page:26
+#: C/mail-composer-forward-as-attachment.page:26(note/p)
 msgid ""
 "If you want to have this setting by default, set <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Forward Style</"
@@ -6339,71 +5945,28 @@ msgstr ""
 "l'éditeur</gui><gui>Style de transfert</gui></guiseq> à <gui>Pièces jointes</"
 "gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-from-field-override.page:5
-msgid ""
-"Change the sender name and address on the fly by setting arbitrary values."
-msgstr ""
-"Changer le nom et l'adresse de l'expéditeur à la volée en définissant des "
-"valeurs arbitraires."
-
-#. (itstool) path: page/title
-#: C/mail-composer-from-field-override.page:20
-msgid "Overriding the \"From\" field"
-msgstr "Écrasement du champ « De »"
-
-#. (itstool) path: page/p
-#: C/mail-composer-from-field-override.page:22
-msgid ""
-"To set a custom email address and sender name on a message you intend to "
-"send, enable <guiseq><gui>View</gui><gui>From Override Field</gui></guiseq> "
-"and change the default sender name and email address in the corresponding "
-"fields."
-msgstr ""
-"Pour définir un nom et une adresse d'expéditeur personnalisés dans un "
-"message que vous avez l'intention d'envoyer, activez <guiseq><gui>Affichage</"
-"gui><gui>Depuis le champ modifié</gui></guiseq> et changez le nom et "
-"l'adresse expéditeur par défaut dans les champs correspondants."
-
-#. (itstool) path: page/p
-#: C/mail-composer-from-field-override.page:27
-msgid ""
-"This functionality can be useful for <link href=\"https://en.wikipedia.org/";
-"wiki/Qmail#Innovations\">wildcard mailboxes when using qmail</link> and "
-"<link href=\"https://en.wikipedia.org/wiki/Email_address#Address_tags\";>sub-"
-"addressing</link>."
-msgstr ""
-"Cette fonctionnalité pour les <link href=\"https://fr.wikipedia.org/wiki/";
-"Qmail#Innovations\">boîtes aux lettres de remplacement lors de l'utilisation "
-"de gmail</link> et le <link href=\"https://en.wikipedia.org/wiki/";
-"Email_address#Address_tags\">sous-adressage</link>."
-
-#. (itstool) path: note/p
-#: C/mail-composer-from-field-override.page:32
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-composer-html-image.page:30(media)
+msgctxt "_"
 msgid ""
-"Setting an arbitrary address might collide with your email provider's <link "
-"href=\"https://en.wikipedia.org/wiki/Sender_Policy_Framework\";>Sender Policy "
-"Framework</link> and/or <link href=\"https://en.wikipedia.org/wiki/";
-"DomainKeys_Identified_Mail\">DomainKeys Identified Mail</link> restrictions."
+"external ref='./figures/html-composer-insert-image.png' "
+"md5='45e231e87c10b3fc61a1bbb0ad50c3f3'"
 msgstr ""
-"La définition d'une adresse arbitraire risque d'entrer en conflit avec la "
-"norme  <link href=\"https://fr.wikipedia.org/wiki/Sender_Policy_Framework";
-"\">Sender Policy Framework</link> de votre votre serveur de messagerie et/ou "
-"les restrictions de la norme <link href=\"https://fr.wikipedia.org/wiki/";
-"DomainKeys_Identified_Mail\">DomainKeys Identified Mail</link>."
+"external ref='./figures/html-composer-insert-image.png' "
+"md5='45e231e87c10b3fc61a1bbb0ad50c3f3'"
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html-image.page:5
+#: C/mail-composer-html-image.page:5(info/desc)
 msgid "Embed a picture in the mail composer."
 msgstr "Incorporer une image dans l'éditeur de messages."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html-image.page:21
+#: C/mail-composer-html-image.page:21(page/title)
 msgid "Inserting an Image in HTML"
 msgstr "Insertion d'une image en HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-image.page:23
+#: C/mail-composer-html-image.page:23(page/p)
 msgid ""
 "You can insert an image into the email (at the current position of the "
 "cursor):"
@@ -6411,84 +5974,92 @@ msgstr ""
 "Vous pouvez insérer une image dans le courriel (à la position actuelle du "
 "curseur) :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-image.page:25
+#: C/mail-composer-html-image.page:25(item/p)
 msgid ""
-"Click <guiseq><gui>Insert</gui><gui>Image…</gui></guiseq> in the menubar."
+"Click <guiseq><gui>Insert</gui><gui>Image...</gui></guiseq> in the menubar."
 msgstr ""
-"Cliquez sur <guiseq><gui>Insertion</gui><gui>Image…</gui></guiseq> dans la "
+"Cliquez sur <guiseq><gui>Insertion</gui><gui>Image...</gui></guiseq> dans la "
 "barre de menu."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-image.page:26
+#: C/mail-composer-html-image.page:26(item/p)
 msgid "Browse to and select the file."
 msgstr "Recherchez et sélectionnez une image."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-image.page:27
+#: C/mail-composer-html-image.page:27(item/p)
 msgid "Click <gui>Open</gui>."
 msgstr "Cliquez sur <gui>Ouvrir</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-image.page:30
+#: C/mail-composer-html-image.page:30(page/p)
+msgid ""
+"Alternately, you can also use the <media type=\"image\" src=\"./figures/html-"
+"composer-insert-image.png\"/> icon in the second bar below the <gui>Subject</"
+"gui> line, or drag an image into the text area of the message composer."
+msgstr ""
+"Autrement, vous pouvez aussi utiliser l'icône <media type=\"image\" src=\"./"
+"figures/html-composer-insert-image.png\"/> dans la seconde barre d'outils "
+"sous la ligne <gui>Sujet</gui>, ou glisser une image dans la zone de texte "
+"de l'éditeur de messages."
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-composer-html-link.page:32(media)
+msgctxt "_"
 msgid ""
-"Alternately, you can also use the <_:media-1/> icon in the second bar below "
-"the <gui>Subject</gui> line, or drag an image into the text area of the "
-"message composer."
+"external ref='./figures/html-composer-insert-link.png' "
+"md5='f143b5dabdc8af72dd68fe7557928893'"
 msgstr ""
-"Autrement, vous pouvez aussi utiliser l'icône <_:media-1/> dans la seconde "
-"barre d'outils sous la ligne <gui>Sujet</gui>, ou glisser une image dans la "
-"zone de texte de l'éditeur de messages."
+"external ref='./figures/html-composer-insert-link.png' "
+"md5='f143b5dabdc8af72dd68fe7557928893'"
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html-link.page:5
+#: C/mail-composer-html-link.page:5(info/desc)
 msgid "Insert a link to a website in the mail composer."
 msgstr "Insérer un lien vers un site Web dans l'éditeur de messages."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html-link.page:21
+#: C/mail-composer-html-link.page:21(page/title)
 msgid "Inserting a Link in HTML"
 msgstr "Insertion d'un lien en HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-link.page:24
+#: C/mail-composer-html-link.page:24(page/p)
 msgid "You can insert links into the email:"
 msgstr "Vous pouvez insérer un lien dans le courriel :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-link.page:26
+#: C/mail-composer-html-link.page:26(item/p)
 msgid "Select the text that you want to turn into a link."
 msgstr "Sélectionnez le texte que vous voulez transformer en lien."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-link.page:27
+#: C/mail-composer-html-link.page:27(item/p)
 msgid ""
-"Either click <guiseq><gui>Insert</gui><gui>Link…</gui></guiseq> in the "
+"Either click <guiseq><gui>Insert</gui><gui>Link...</gui></guiseq> in the "
 "menubar, or right-click on the selected text and click <gui>Insert Link</"
 "gui>."
 msgstr ""
-"Soit vous cliquez sur <guiseq><gui>Insertion</gui><gui>Lien…</gui></guiseq> "
-"dans la barre de menu, soit vous faites un clic-droit sur le texte "
+"Soit vous cliquez sur <guiseq><gui>Insertion</gui><gui>Lien...</gui></"
+"guiseq> dans la barre de menu, soit vous faites un clic-droit sur le texte "
 "sélectionné et cliquez sur <gui>Insérer un lien</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-link.page:29 C/mail-composer-html-rule.page:28
-#: C/mail-composer-html-table.page:29
+#: C/mail-composer-html-link.page:28(item/p)
+msgid "Enter the address in the <gui>URL</gui> field."
+msgstr "Saisissez l'adresse dans le champ <gui>URL</gui>."
+
+#: C/mail-composer-html-link.page:29(item/p)
+#: C/mail-composer-html-rule.page:28(item/p)
+#: C/mail-composer-html-table.page:29(item/p)
 msgid "Click <gui>Close</gui>."
 msgstr "Cliquez sur <gui>Fermer</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-link.page:32 C/mail-composer-html-rule.page:31
-#: C/mail-composer-html-table.page:32
+#: C/mail-composer-html-link.page:32(page/p)
 msgid ""
-"Alternately, you can also use the <_:media-1/> icon in the second bar below "
-"the <gui>Subject</gui> line."
+"Alternately, you can also use the <media type=\"image\" src=\"./figures/html-"
+"composer-insert-link.png\"/> icon in the second bar below the <gui>Subject</"
+"gui> line."
 msgstr ""
-"Vous pouvez aussi utiliser l'icône <_:media-1/> dans la seconde barre "
-"d'outils sous la ligne <gui>Sujet</gui>."
+"Vous pouvez aussi utiliser l'icône <media type=\"image\" src=\"./figures/"
+"html-composer-insert-link.png\"/> dans la seconde barre d'outils sous la "
+"ligne <gui>Sujet</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-link.page:34
+#: C/mail-composer-html-link.page:34(page/p)
 msgid ""
 "If you do not want a special link text you can just enter the address of the "
 "link directly. It will be automatically recognized as a link."
@@ -6497,33 +6068,29 @@ msgstr ""
 "vous pouvez simplement saisir l'adresse telle quelle et Evolution "
 "reconnaîtra qu'il s'agit d'un lien."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html.page:5
+#: C/mail-composer-html.page:5(info/desc)
 msgid "Changing fonts, using colors, and inserting images, tables and links."
 msgstr ""
 "Changer de police, utiliser les couleurs et insérer des images, des tableaux "
 "et des liens."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html.page:21
+#: C/mail-composer-html.page:21(page/title)
 msgid "Formatting emails (in Plain Text and HTML)"
 msgstr "Formater les messages (en texte simple et en HTML)"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html.page:25
+#: C/mail-composer-html.page:25(page/p)
 msgid ""
 "Text formatting tools for basic alignment and paragraph formatting are "
 "located in the tool bar below the <gui>Subject</gui> line. They also appear "
 "in the <gui>Insert</gui> and <gui>Format</gui> menus."
 msgstr ""
-"Les outils de formatage pour l'alignement de base et le formatage des "
-"paragraphes sont situés dans la barre d'outils en dessous de la ligne "
-"<gui>Sujet</gui>. Ils figurent aussi dans les menus <gui>Insertion</gui> et "
-"<gui>Format</gui>."
+"Les outils de formatage pour le formatage et l'alignement de base sont "
+"situés dans la barre d'outils en dessous de la ligne <gui>Sujet</gui>. Ils "
+"figurent aussi dans les menus <gui>Insertion</gui> et <gui>Format</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-html.page:26 C/mail-composer-html-text.page:24
-#: C/mail-composer-plain-text.page:24
+#: C/mail-composer-html.page:26(page/p)
+#: C/mail-composer-html-text.page:24(page/p)
+#: C/mail-composer-plain-text.page:24(page/p)
 msgid ""
 "The icons in the tool bar are explained in tooltips which appear when you "
 "hold your mouse pointer over the buttons."
@@ -6532,8 +6099,7 @@ msgstr ""
 "apparaissent lorsque vous laissez immobile le pointeur de la souris au-"
 "dessus des boutons. "
 
-#. (itstool) path: page/p
-#: C/mail-composer-html.page:28
+#: C/mail-composer-html.page:28(page/p)
 msgid ""
 "Normally, you cannot set text color or size or embed pictures in messages. "
 "However, most newer email applications can do this by using HTML format, "
@@ -6544,8 +6110,7 @@ msgstr ""
 "logiciels de messagerie récents savent le faire  à l'aide du format HTML à "
 "la manière des pages Web."
 
-#. (itstool) path: page/p
-#: C/mail-composer-html.page:30
+#: C/mail-composer-html.page:30(page/p)
 msgid ""
 "Some people do not have HTML-capable mail clients, or prefer not to receive "
 "HTML-enhanced mail because it is slower to download and display. Because of "
@@ -6558,28 +6123,36 @@ msgstr ""
 "qu'<app>Evolution</app>envoie les messages en texte simple, sauf si vous lui "
 "demandez explicitement d'utiliser le HTML."
 
-#. (itstool) path: section/title
-#: C/mail-composer-html.page:33
+#: C/mail-composer-html.page:33(section/title)
 msgid "Plain Text Formatting Options"
 msgstr "Options du formatage texte simple"
 
-#. (itstool) path: section/title
-#: C/mail-composer-html.page:37
+#: C/mail-composer-html.page:37(section/title)
 msgid "HTML-only Formatting Options"
 msgstr "Options du formatage HTML"
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html-rule.page:5
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-composer-html-rule.page:31(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/html-composer-insert-rule.png' "
+"md5='d3cda5fa4cf0fc2c911fd1aa14908ff3'"
+msgstr ""
+"external ref='./figures/html-composer-insert-rule.png' "
+"md5='d3cda5fa4cf0fc2c911fd1aa14908ff3'"
+
+#: C/mail-composer-html-rule.page:5(info/desc)
 msgid "Insert a horizontal line in the mail composer."
 msgstr "Insérer une ligne horizontale dans l'éditeur de messages."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html-rule.page:21
+#: C/mail-composer-html-rule.page:21(page/title)
 msgid "Inserting a Rule in HTML"
 msgstr "Insertion d'un filet en HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-rule.page:23
+#: C/mail-composer-html-rule.page:23(page/p)
 msgid ""
 "You can insert a horizontal line into the email (at the current position of "
 "the cursor) to help divide two sections:"
@@ -6587,81 +6160,114 @@ msgstr ""
 "Vous pouvez insérer une ligne horizontale dans le courriel (à la position "
 "actuelle du curseur) pour aider à séparer deux sections :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-rule.page:25
+#: C/mail-composer-html-rule.page:25(item/p)
 msgid ""
-"Click <guiseq><gui>Insert</gui><gui>Rule…</gui></guiseq> in the menubar."
+"Click <guiseq><gui>Insert</gui><gui>Rule...</gui></guiseq> in the menubar."
 msgstr ""
-"Cliquez sur <guiseq><gui>Insertion</gui><gui>Trait horizontal…</gui></"
-"guiseq> dans la barre de menu."
+"Cliquez sur <guiseq><gui>Insertion</gui><gui>Filet...</gui></guiseq> dans la "
+"barre de menu."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-rule.page:26
+#: C/mail-composer-html-rule.page:26(item/p)
 msgid "Select width, size, and alignment."
 msgstr "Choisissez la largeur, la taille et l'alignement."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-rule.page:27
+#: C/mail-composer-html-rule.page:27(item/p)
 msgid "Select <gui>Shaded</gui> if wanted."
 msgstr "Cochez <gui>Ombré</gui> si vous voulez."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html-table.page:5
+#: C/mail-composer-html-rule.page:31(page/p)
+msgid ""
+"Alternately, you can also use the <media type=\"image\" src=\"./figures/html-"
+"composer-insert-rule.png\"/> icon in the second bar below the <gui>Subject</"
+"gui> line."
+msgstr ""
+"Vous pouvez aussi recourir à l'icône <media type=\"image\" src=\"./figures/"
+"html-composer-insert-rule.png\"/> dans la seconde barre d'outils sous la "
+"ligne <gui>Sujet</gui>."
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-composer-html-table.page:32(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/html-composer-insert-table.png' "
+"md5='d5b54d183ad37488041005964062e7f6'"
+msgstr ""
+"external ref='./figures/html-composer-insert-table.png' "
+"md5='d5b54d183ad37488041005964062e7f6'"
+
+#: C/mail-composer-html-table.page:5(info/desc)
 msgid "Insert a table in the mail composer."
 msgstr "Insérer un tableau dans l'éditeur de messages."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html-table.page:21
+#: C/mail-composer-html-table.page:21(page/title)
 msgid "Inserting a Table in HTML"
 msgstr "Insertion d'un tableau en HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-table.page:23
+#: C/mail-composer-html-table.page:23(page/p)
 msgid ""
 "You can insert a table into the email (at the current position of the "
 "cursor):"
 msgstr ""
 "Vous pouvez insérer un tableau dans un courriel (à la position du curseur) :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-table.page:25
+#: C/mail-composer-html-table.page:25(item/p)
 msgid ""
-"Click <guiseq><gui>Insert</gui><gui>Table…</gui></guiseq> in the menubar."
+"Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the menubar."
 msgstr ""
-"Cliquez sur <guiseq><gui>Insertion</gui><gui>Tableau…</gui></guiseq> dans la "
-"barre de menu."
+"Cliquez sur <guiseq><gui>Insertion</gui><gui>Tableau...</gui></guiseq> dans "
+"la barre de menu."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-table.page:26
+#: C/mail-composer-html-table.page:26(item/p)
 msgid "Select the number of rows and columns."
 msgstr "Choisissez le nombre de lignes et de colonnes."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-table.page:27
+#: C/mail-composer-html-table.page:27(item/p)
 msgid "Define the type of layout for the table."
 msgstr "Choisissez le type de disposition du tableau."
 
-#. (itstool) path: item/p
-#: C/mail-composer-html-table.page:28
+#: C/mail-composer-html-table.page:28(item/p)
 msgid "Optionally: Select a background color or image for the table."
 msgstr ""
 "En option : choisissez une couleur ou une image d'arrière-plan pour le "
 "tableau."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-html-text.page:5
+#: C/mail-composer-html-table.page:32(page/p)
+msgid ""
+"Alternately, you can also use the <media type=\"image\" src=\"./figures/html-"
+"composer-insert-table.png\"/> icon in the second bar below the <gui>Subject</"
+"gui> line."
+msgstr ""
+"Vous pouvez aussi recourir à l'icône <media type=\"image\" src=\"./figures/"
+"html-composer-insert-table.png\"/> dans la seconde barre d'outils sous la "
+"ligne <gui>Sujet</gui>."
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-composer-html-text.page:40(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/color-000000.png' "
+"md5='2d416af8bfaec805470e5d2980d90a68'"
+msgstr ""
+"external ref='./figures/color-000000.png' "
+"md5='2d416af8bfaec805470e5d2980d90a68'"
+
+#: C/mail-composer-html-text.page:5(info/desc)
 msgid "Change font sizes, styles and colors in the mail composer."
 msgstr ""
 "Changer les tailles de polices, les styles et les couleurs dans l'éditeur de "
 "courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-html-text.page:21
+#: C/mail-composer-html-text.page:21(page/title)
 msgid "Formatting Text in HTML"
 msgstr "Formater les messages en HTML"
 
-#. (itstool) path: page/p
-#: C/mail-composer-html-text.page:23
+#: C/mail-composer-html-text.page:23(page/p)
 msgid ""
 "Text formatting tools that are available in HTML format only are located in "
 "the second tool bar below the <gui>Subject</gui> line after enabling HTML "
@@ -6672,13 +6278,11 @@ msgstr ""
 "dessous de la ligne <gui>Sujet</gui> après avoir activé le format HTML. Ils "
 "figurent également dans les menus <gui>Insérer</gui> et <gui>Format</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-html-text.page:27
+#: C/mail-composer-html-text.page:27(section/title)
 msgid "Text Styles:"
 msgstr "Styles de texte :"
 
-#. (itstool) path: section/p
-#: C/mail-composer-html-text.page:28
+#: C/mail-composer-html-text.page:28(section/p)
 msgid ""
 "Use these buttons in the lower tool bar to determine the way your email "
 "looks. If you have text selected, the style applies to the selected text. If "
@@ -6689,29 +6293,24 @@ msgstr ""
 "s'applique à ce texte. Dans le cas contraire, le style s'applique à tout le "
 "texte que vous allez saisir."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:32
+#: C/mail-composer-html-text.page:32(td/p)
 msgid "Button"
 msgstr "Bouton"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:33
+#: C/mail-composer-html-text.page:33(td/p)
 msgid "Description"
 msgstr "Description"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:36
+#: C/mail-composer-html-text.page:36(td/p)
 msgid "+0"
 msgstr "+0"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:37
+#: C/mail-composer-html-text.page:37(td/p)
 msgid "Font size."
 msgstr "Taille de police."
 
 # Bruno : c'est le menu que j'ai dans ma version
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:41
+#: C/mail-composer-html-text.page:41(td/p)
 msgid ""
 "Color chooser for text. The box displays the current text color. To choose a "
 "new color, click the arrow button to the right. If you have text selected, "
@@ -6728,58 +6327,47 @@ msgstr ""
 "plan en cliquant avec le bouton droit sur l'arrière-plan du message, puis en "
 "choisissant <guiseq><gui>Style</gui><gui>Style de page</gui></guiseq>."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:44
+#: C/mail-composer-html-text.page:44(td/p)
 msgid "TT"
 msgstr "TT"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:45
+#: C/mail-composer-html-text.page:45(td/p)
 msgid "Typewriter text, which is similar to a monospace font."
 msgstr "Texte de machine à écrire, qui correspond à une police à largeur fixe."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:48
+#: C/mail-composer-html-text.page:48(td/p)
 msgid "Bold A"
 msgstr "A gras"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:49
+#: C/mail-composer-html-text.page:49(td/p)
 msgid "Bolds the text."
 msgstr "Met le texte en gras."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:52
+#: C/mail-composer-html-text.page:52(td/p)
 msgid "Italic A"
 msgstr "A italique"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:53
+#: C/mail-composer-html-text.page:53(td/p)
 msgid "Italicizes the text."
 msgstr "Met le texte en italique."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:56
+#: C/mail-composer-html-text.page:56(td/p)
 msgid "Underlined A"
 msgstr "A souligné"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:57
+#: C/mail-composer-html-text.page:57(td/p)
 msgid "Underlines the text."
 msgstr "Souligne le texte."
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:60
+#: C/mail-composer-html-text.page:60(td/p)
 msgid "Strike through A"
 msgstr "A barré"
 
-#. (itstool) path: td/p
-#: C/mail-composer-html-text.page:61
+#: C/mail-composer-html-text.page:61(td/p)
 msgid "Marks a line through the text."
 msgstr "Trace une ligne par-dessus le texte."
 
-#. (itstool) path: section/p
-#: C/mail-composer-html-text.page:65
+#: C/mail-composer-html-text.page:65(section/p)
 msgid ""
 "The other buttons are explained under <link xref=\"mail-composer-"
 "html#formatting-options-html\"/>."
@@ -6787,18 +6375,15 @@ msgstr ""
 "Les autres boutons sont expliqués dans <link xref=\"mail-composer-"
 "html#formatting-options-html\"/>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-mail-signatures-manage.page:5
+#: C/mail-composer-mail-signatures-manage.page:5(info/desc)
 msgid "Add, change, edit or delete email signatures."
 msgstr "Ajouter, changer, modifier ou supprimer les signatures de courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-mail-signatures-manage.page:20
+#: C/mail-composer-mail-signatures-manage.page:20(page/title)
 msgid "Managing signatures"
 msgstr "Gestion des signatures"
 
-#. (itstool) path: page/p
-#: C/mail-composer-mail-signatures-manage.page:22
+#: C/mail-composer-mail-signatures-manage.page:22(page/p)
 msgid ""
 "You can add, edit and delete all your signatures under <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Composer preferences</gui><gui>Signatures</"
@@ -6808,8 +6393,7 @@ msgstr ""
 "<guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Préférences de "
 "l'éditeur</gui><gui>Signatures</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-mail-signatures-manage.page:23
+#: C/mail-composer-mail-signatures-manage.page:23(page/p)
 msgid ""
 "Assigning a default signature to an email account has to be done in the "
 "<link xref=\"mail-composer-mail-signatures-per-account\">account settings</"
@@ -6819,33 +6403,16 @@ msgstr ""
 "faite dans les <link xref=\"mail-composer-mail-signatures-per-account"
 "\">paramètres de compte</link>."
 
-#. (itstool) path: note/p
-#: C/mail-composer-mail-signatures-manage.page:25
-msgid ""
-"Per <link href=\"http://tools.ietf.org/html/rfc3676#section-4.3\";>long-"
-"standing convention</link>, signatures always start with two dashes and a "
-"space in a separate line. This allows many email clients to automatically "
-"strip signatures from quotes when replying."
-msgstr ""
-"Par <link href=\"http://tools.ietf.org/html/rfc3676#section-4.3\";>convention "
-"durable</link>, les signatures débutent toujours par deux tirets et une "
-"espace dans un lien séparé. Cela permet à de nombreux  clients de messagerie "
-"de débarrasser automatiquement les signatures des guillemets lors de la "
-"réponse."
-
-#. (itstool) path: info/desc
-#: C/mail-composer-mail-signatures.page:5
+#: C/mail-composer-mail-signatures.page:5(info/desc)
 msgid "Using email signatures at the bottom of a message you send."
 msgstr ""
 "Utiliser de signatures de courriel en bas des messages que vous envoyez."
 
-#. (itstool) path: page/title
-#: C/mail-composer-mail-signatures.page:21
+#: C/mail-composer-mail-signatures.page:21(page/title)
 msgid "Working with email signatures"
 msgstr "Utilisation des signatures de courriels"
 
-#. (itstool) path: page/p
-#: C/mail-composer-mail-signatures.page:23
+#: C/mail-composer-mail-signatures.page:23(page/p)
 msgid ""
 "A signature consists of one or more lines of text (or even a picture) that "
 "will be added at the end of an email that you send. It can contain contact "
@@ -6857,27 +6424,23 @@ msgstr ""
 "contenir des informations pour vous contacter ou d'autres choses. Une "
 "signature commence toujours par deux tirets et une espace (<code>-- </code>)."
 
-#. (itstool) path: note/p
-#: C/mail-composer-mail-signatures.page:24
+#: C/mail-composer-mail-signatures.page:24(note/p)
 msgid ""
 "The term \"signature\" is also differently used in terms of <link xref="
 "\"mail-encryption\">encryption</link>."
 msgstr ""
-"Le terme « signature » possède également un autre sens pour ce qui concerne "
-"le <link xref=\"mail-encryption\">chiffrement</link>."
+"Le terme « signature » possèdent également un autre sens pour ce qui "
+"concerne le <link xref=\"mail-encryption\">chiffrement</link>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-mail-signatures-per-account.page:5
+#: C/mail-composer-mail-signatures-per-account.page:5(info/desc)
 msgid "Setting a default signature for an email account."
 msgstr "Définir une signature par défaut pour un compte de messagerie."
 
-#. (itstool) path: page/title
-#: C/mail-composer-mail-signatures-per-account.page:29
+#: C/mail-composer-mail-signatures-per-account.page:29(page/title)
 msgid "Default account signature"
 msgstr "Signature par défaut du compte"
 
-#. (itstool) path: page/p
-#: C/mail-composer-mail-signatures-per-account.page:31
+#: C/mail-composer-mail-signatures-per-account.page:31(page/p)
 msgid ""
 "You can define a default <link xref=\"mail-composer-mail-signatures"
 "\">signature</link> for each of your mail accounts. This can be edited under "
@@ -6891,8 +6454,7 @@ msgstr ""
 "gui><gui>Comptes de messagerie</gui><gui style=\"button\">Modifier</"
 "gui><gui>Identité</gui><gui>Informations optionnelles</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-composer-mail-signatures-per-account.page:33
+#: C/mail-composer-mail-signatures-per-account.page:33(page/p)
 msgid ""
 "If you have a signature for your account defined but exceptionally do not "
 "want to use it for one message, or want to use a different signature, you "
@@ -6904,29 +6466,24 @@ msgstr ""
 "utiliser une autre, vous pouvez la modifier grâce au menu déroulant dans le "
 "coin supérieur droit de la fenêtre de l'éditeur de messages."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-message-templates.page:5
+#: C/mail-composer-message-templates.page:5(info/desc)
 msgid "Message templates to reuse in the composer."
 msgstr "Réutiliser un modèle de messages dans l'éditeur."
 
-#. (itstool) path: page/title
-#. (itstool) path: section/title
-#: C/mail-composer-message-templates.page:23
-#: C/mail-composer-message-templates.page:28
+#: C/mail-composer-message-templates.page:23(page/title)
+#: C/mail-composer-message-templates.page:28(section/title)
 msgid "Message Templates"
 msgstr "Modèle de messages"
 
-#. (itstool) path: page/p
-#: C/mail-composer-message-templates.page:24
+#: C/mail-composer-message-templates.page:24(page/p)
 msgid ""
 "A message template is a standard message that you can use at any time to "
 "send mail with the same pattern."
 msgstr ""
-"Un modèle de message est un message standard qui vous permet d'envoyer à "
-"tout moment des messages ayant la même structure."
+"Un modèle de message est un message standard qui vous permet d'envoyer en "
+"tout temps des messages ayant la même structure."
 
-#. (itstool) path: page/p
-#: C/mail-composer-message-templates.page:25
+#: C/mail-composer-message-templates.page:25(page/p)
 msgid ""
 "To enable the Message Template Plugin, click <guiseq><gui>Edit</"
 "gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>."
@@ -6935,34 +6492,29 @@ msgstr ""
 "<guiseq><gui>Édition</gui><gui>Greffons</gui></guiseq> et cochez "
 "<gui>Modèles</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-message-templates-reply.page:5
+#: C/mail-composer-message-templates-reply.page:5(info/desc)
 msgid "Use one of your templates for replying to a message"
 msgstr "Utiliser l'un de vos modèles pour répondre à un message"
 
-#. (itstool) path: page/title
-#: C/mail-composer-message-templates-reply.page:23
+#: C/mail-composer-message-templates-reply.page:23(page/title)
 msgid "Using a Template as a Reply"
 msgstr "Utilisation d'un modèle de message comme réponse"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-reply.page:27
+#: C/mail-composer-message-templates-reply.page:27(item/p)
 msgid ""
 "Right-click the message you are replying to, then click <gui>Templates</gui>."
 msgstr ""
 "Faites un clic-droit sur le message auquel vous souhaitez répondre, puis "
 "choisissez <gui>Modèles</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-reply.page:28
+#: C/mail-composer-message-templates-reply.page:28(item/p)
 msgid ""
 "This option lists all the message templates in the <gui>Templates</gui> "
 "folder."
 msgstr ""
 "Cette option liste tous les modèles de message du dossier <gui>Modèles</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-reply.page:31
+#: C/mail-composer-message-templates-reply.page:31(item/p)
 msgid ""
 "Select the message template of your choice. Make changes if required in the "
 "email composer window that will open."
@@ -6970,13 +6522,11 @@ msgstr ""
 "Sélectionnez le modèle de message de votre choix et modifiez-le si "
 "nécessaire."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-reply.page:34
+#: C/mail-composer-message-templates-reply.page:34(item/p)
 msgid "Click <gui>Send</gui>."
 msgstr "Cliquez sur <gui>Envoyer</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-reply.page:35
+#: C/mail-composer-message-templates-reply.page:35(item/p)
 msgid ""
 "When you select a message template for replying, the subject of the reply is "
 "preserved."
@@ -6984,28 +6534,23 @@ msgstr ""
 "Lorsque vous choisissez un modèle de message comme réponse, le sujet "
 "original de la réponse est conservé."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-message-templates-save.page:5
+#: C/mail-composer-message-templates-save.page:5(info/desc)
 msgid "Store an existing or new message as a template"
 msgstr "Enregistrement d'un message nouveau ou existant comme modèle"
 
-#. (itstool) path: page/title
-#: C/mail-composer-message-templates-save.page:23
+#: C/mail-composer-message-templates-save.page:23(page/title)
 msgid "Saving Messages as Templates"
 msgstr "Enregistrement de messages comme modèles"
 
-#. (itstool) path: section/title
-#: C/mail-composer-message-templates-save.page:26
+#: C/mail-composer-message-templates-save.page:26(section/title)
 msgid "Saving an Existing Message as a Template"
 msgstr "Enregistrement d'un message existant comme modèle"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:28
+#: C/mail-composer-message-templates-save.page:28(item/p)
 msgid "Select the message."
 msgstr "Sélectionnez le message."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:29
+#: C/mail-composer-message-templates-save.page:29(item/p)
 msgid ""
 "Right-click the message and choose <gui>Move to folder</gui> or <gui>Copy to "
 "folder</gui>."
@@ -7013,46 +6558,39 @@ msgstr ""
 "Faites un clic-droit sur le message et choisissez <gui>Déplacer vers le "
 "dossier</gui> ou <gui>Copier vers le dossier</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:30
+#: C/mail-composer-message-templates-save.page:30(item/p)
 msgid ""
 "Select the <gui>Templates</gui> folder under <gui>On This Computer</gui>."
 msgstr ""
 "Sélectionnez le dossier <gui>Modèles</gui> sous <gui>Sur cet ordinateur</"
 "gui>."
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-save.page:32
+#: C/mail-composer-message-templates-save.page:32(section/p)
 msgid "You can also edit an existing message and save it as a template:"
 msgstr ""
 "Vous pouvez aussi modifier un message existant et l'enregistrer comme "
 "modèle :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:34
+#: C/mail-composer-message-templates-save.page:34(item/p)
 msgid "Open the message and click <gui>Reply</gui>."
 msgstr "Ouvrez le message et cliquez sur <gui>Répondre</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:35
+#: C/mail-composer-message-templates-save.page:35(item/p)
 msgid "Edit the message body or the addresses according to your requirements."
 msgstr "Modifiez le corps ou les adresses du message selon vos besoins."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:36
-#: C/mail-composer-message-templates-save.page:47
+#: C/mail-composer-message-templates-save.page:36(item/p)
+#: C/mail-composer-message-templates-save.page:47(item/p)
 msgid "Select <guiseq><gui>File</gui><gui>Save as Template</gui></guiseq>."
 msgstr ""
 "Sélectionnez <guiseq><gui>Fichier</gui><gui>Enregistrer comme modèle</gui></"
 "guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-message-templates-save.page:41
+#: C/mail-composer-message-templates-save.page:41(section/title)
 msgid "Saving a New Message as a Template"
 msgstr "Enregistrement d'un nouveau message comme modèle"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-save.page:44
+#: C/mail-composer-message-templates-save.page:44(item/p)
 msgid ""
 "Click <gui>New</gui> and enter in the composer window what you need for the "
 "template."
@@ -7060,8 +6598,7 @@ msgstr ""
 "Cliquez sur <gui>Nouveau</gui> et saisissez dans la fenêtre de l'éditeur "
 "tout ce dont vous avez besoin pour le modèle."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-message-templates-variables.page:5
+#: C/mail-composer-message-templates-variables.page:5(info/desc)
 msgid ""
 "Configure variables in templates and reuse items from the message you reply "
 "to"
@@ -7069,23 +6606,19 @@ msgstr ""
 "Configuration de variables dans les modèles et réutilisation d'éléments des "
 "messages auxquels vous répondez"
 
-#. (itstool) path: page/title
-#: C/mail-composer-message-templates-variables.page:23
+#: C/mail-composer-message-templates-variables.page:23(page/title)
 msgid "Using Variables in Templates"
 msgstr "Utilisation de variables dans les modèles"
 
-#. (itstool) path: section/title
-#: C/mail-composer-message-templates-variables.page:26
+#: C/mail-composer-message-templates-variables.page:26(section/title)
 msgid "Configuring Variables for Message Templates"
 msgstr "Configuration de variables dans les  modèles de message"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-variables.page:29
+#: C/mail-composer-message-templates-variables.page:29(item/p)
 msgid "Click <gui>Templates</gui>."
 msgstr "Cliquez sur <gui>Modèles</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-variables.page:31
+#: C/mail-composer-message-templates-variables.page:31(item/p)
 msgid ""
 "You can add, edit or remove the key-value pairs. You can specify any number "
 "of key-value pairs."
@@ -7093,8 +6626,7 @@ msgstr ""
 "Vous pouvez ajouter, modifier ou supprimer des paires mot-clé - valeur. Vous "
 "pouvez définir autant de paires mot-clé - valeur que souhaitées."
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-variables.page:33
+#: C/mail-composer-message-templates-variables.page:33(section/p)
 msgid ""
 "In any template, the occurrence of every $key is replaced by the value it "
 "has in the configuration. For example, if you set the key to Manager and the "
@@ -7106,8 +6638,7 @@ msgstr ""
 "« Directeur » et la valeur à « Jean », chaque occurrence de $Directeur est "
 "remplacée par Jean dans le message."
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-variables.page:34
+#: C/mail-composer-message-templates-variables.page:34(section/p)
 msgid ""
 "Assume that you have 1000 message templates with your current manager's name "
 "in them. When the current manager is replaced by a new one, it is not easy "
@@ -7121,8 +6652,7 @@ msgstr ""
 "Si les messages contiennent une clé $Directeur, vous pouvez facilement "
 "modifier la valeur correspondante dans l'onglet Configuration de ce greffon."
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-variables.page:35
+#: C/mail-composer-message-templates-variables.page:35(section/p)
 msgid ""
 "By default, the entire environment variables are used as a key-value pair. "
 "An occurrence of $env_variable is replaced by the value it carries. For "
@@ -7135,13 +6665,11 @@ msgstr ""
 "« $PATH », c'est la valeur de cette variable qui apparaîtra dans le modèle "
 "lorsqu'il sera utilisé."
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-variables.page:36
+#: C/mail-composer-message-templates-variables.page:36(section/p)
 msgid "The replacement process uses the following order of precedence:"
 msgstr "L'algorithme de substitution utilise l'ordre de priorités suivant :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-variables.page:39
+#: C/mail-composer-message-templates-variables.page:39(item/p)
 msgid ""
 "$key is replaced by the value set for it in the Configuration tab of the "
 "Templates plugin."
@@ -7149,8 +6677,7 @@ msgstr ""
 "$clé est remplacée par la valeur correspondante dans l'onglet Configuration "
 "du greffon Modèles."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-variables.page:42
+#: C/mail-composer-message-templates-variables.page:42(item/p)
 msgid ""
 "If the key is not found, it is then replaced with the value of its "
 "environment variable."
@@ -7158,8 +6685,7 @@ msgstr ""
 "Si la clé n'est pas trouvée, elle est alors remplacée par la valeur "
 "correspondant à la variable d'environnement éponyme."
 
-#. (itstool) path: item/p
-#: C/mail-composer-message-templates-variables.page:45
+#: C/mail-composer-message-templates-variables.page:45(item/p)
 msgid ""
 "If key is neither a configuration option nor an environment variable, no "
 "changes are made."
@@ -7167,13 +6693,11 @@ msgstr ""
 "Si la clé n'est ni une option de configuration, ni une variable "
 "d'environnement, aucune substitution n'est effectuée."
 
-#. (itstool) path: section/title
-#: C/mail-composer-message-templates-variables.page:52
+#: C/mail-composer-message-templates-variables.page:52(section/title)
 msgid "Using Elements From a Message in a Template When Replying"
 msgstr "Utilisation d'éléments de message dans un modèle lors d'une réponse"
 
-#. (itstool) path: section/p
-#: C/mail-composer-message-templates-variables.page:53
+#: C/mail-composer-message-templates-variables.page:53(section/p)
 msgid ""
 "Templates can contain more than just the predefined set of <link xref="
 "\"#configure\">key-value pairs</link>. You can also get any message header "
@@ -7185,10 +6709,9 @@ msgstr ""
 "obtenir n'importe quelles valeurs d'en-tête de message à partir du courriel "
 "auquel vous appliquez le modèle, en plus du corps complet du message."
 
-#. (itstool) path: section/p
 #. TO TRANSLATORS: Do NOT translate $ORIG[subject] and $ORIG[body] in this
 #. sentence!
-#: C/mail-composer-message-templates-variables.page:56
+#: C/mail-composer-message-templates-variables.page:56(section/p)
 msgid ""
 "In order to do this, use the format <code>$ORIG[header_name]</code> and "
 "replace the variable <code>header_name</code> by the actual header. For "
@@ -7202,10 +6725,9 @@ msgstr ""
 "répondez, utilisez <code>$ORIG[subject]</code>. Pour insérer le corps "
 "complet, utilisez <code>$ORIG[body]</code>."
 
-#. (itstool) path: section/p
 #. TO TRANSLATORS: Do NOT translate $ORIG[body] and $ORIG[reply-to] in
 #. this sentence!
-#: C/mail-composer-message-templates-variables.page:59
+#: C/mail-composer-message-templates-variables.page:59(section/p)
 msgid ""
 "If no replacement for a variable is found, the variable is not removed "
 "(except for <code>$ORIG[body]</code>) but left in place so that you see that "
@@ -7220,20 +6742,17 @@ msgstr ""
 "disponibles dans le message d'origine (par exemple <code>$ORIG[reply-to]</"
 "code>)."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-plain-text.page:5
+#: C/mail-composer-plain-text.page:5(info/desc)
 msgid "Change font alignment and paragraph formatting in the mail composer."
 msgstr ""
 "Modifier l'alignement de la police et le formatage de paragraphe dans "
 "l'éditeur de courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-plain-text.page:21
+#: C/mail-composer-plain-text.page:21(page/title)
 msgid "Formatting Text in Plain Text Format"
 msgstr "Formatage de texte dans le format texte simple"
 
-#. (itstool) path: page/p
-#: C/mail-composer-plain-text.page:23
+#: C/mail-composer-plain-text.page:23(page/p)
 msgid ""
 "Text formatting tools are located in the tool bar below the <gui>Subject</"
 "gui> line. They also appear in the <gui>Insert</gui> and <gui>Format</gui> "
@@ -7243,13 +6762,11 @@ msgstr ""
 "dessous de la ligne <gui>Sujet</gui>. Ils figurent également dans les menus "
 "<gui>Insertion</gui> et <gui>Format</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-plain-text.page:27
+#: C/mail-composer-plain-text.page:27(section/title)
 msgid "Headers and Lists:"
 msgstr "En-têtes et listes :"
 
-#. (itstool) path: section/p
-#: C/mail-composer-plain-text.page:28
+#: C/mail-composer-plain-text.page:28(section/p)
 msgid ""
 "At the left of the upper tool bar, you can choose <gui>Normal</gui> for a "
 "default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for "
@@ -7264,8 +6781,7 @@ msgstr ""
 "correspond à la balise HTML utilisée pour les blocs de texte préformatés, et "
 "trois types de listes à puces."
 
-#. (itstool) path: section/p
-#: C/mail-composer-plain-text.page:29
+#: C/mail-composer-plain-text.page:29(section/p)
 msgid ""
 "For instance, instead of using asterisks to mark a bulleted list, you can "
 "use the <gui>Bulleted List</gui> style from the style dropdown list. "
@@ -7277,13 +6793,11 @@ msgstr ""
 "déroulant des styles. Evolution propose différents styles de puces et gère "
 "les retours de ligne et plusieurs niveaux d'indentation."
 
-#. (itstool) path: section/title
-#: C/mail-composer-plain-text.page:33
+#: C/mail-composer-plain-text.page:33(section/title)
 msgid "Alignment:"
 msgstr "Alignement :"
 
-#. (itstool) path: section/p
-#: C/mail-composer-plain-text.page:34
+#: C/mail-composer-plain-text.page:34(section/p)
 msgid ""
 "Located next to the Headers and Lists dropdown, the three paragraph icons "
 "should be familiar to users of most word processing software. The left-most "
@@ -7296,13 +6810,11 @@ msgstr ""
 "sur la marge gauche, le bouton du milieu centre le texte et le bouton de "
 "droite aligne le texte sur la marge droite."
 
-#. (itstool) path: section/title
-#: C/mail-composer-plain-text.page:38
+#: C/mail-composer-plain-text.page:38(section/title)
 msgid "Indentation Rules:"
 msgstr "Règles d'indentation :"
 
-#. (itstool) path: section/p
-#: C/mail-composer-plain-text.page:39
+#: C/mail-composer-plain-text.page:39(section/p)
 msgid ""
 "The button with the arrow pointing left decreases a paragraph's indentation, "
 "and the right arrow increases its indentation."
@@ -7310,31 +6822,26 @@ msgstr ""
 "Le bouton comportant une flèche gauche diminue l'indentation d'un "
 "paragraphe, et celui comportant une flèche droite augmente l'indentation."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-priority.page:5
+#: C/mail-composer-priority.page:5(info/desc)
 msgid "Setting a priority for messages to be sent."
 msgstr "Définir une priorité pour les messages à envoyer."
 
-#. (itstool) path: page/title
-#: C/mail-composer-priority.page:23
+#: C/mail-composer-priority.page:23(page/title)
 msgid "Prioritizing outgoing messages"
 msgstr "Priorité des messages sortants"
 
-#. (itstool) path: page/p
-#: C/mail-composer-priority.page:25
+#: C/mail-composer-priority.page:25(page/p)
 msgid ""
 "You can prioritize a message to be sent, so that the recipient sees its "
-"relative importance. To prioritize a message, select <guiseq><gui>Options</"
-"gui><gui>Prioritize Message</gui></guiseq> in the menu of the composer "
-"window or click the corresponding toolbar icon."
+"relative importance. To prioritize a message, click <guiseq><gui>Options</"
+"gui><gui>Prioritize Message</gui></guiseq> in the composer window."
 msgstr ""
-"Vous pouvez donner la priorité à un message que vous envoyez, afin que le "
+"Vous pouvez définir la priorité d'un message que vous envoyez, afin que le "
 "destinataire perçoive son importance relative. Pour indiquer la priorité "
 "d'un message, choisissez <guiseq><gui>Options</gui><gui>Prioriser le "
 "message</gui></guiseq> dans la fenêtre de l'éditeur."
 
-#. (itstool) path: note/p
-#: C/mail-composer-priority.page:27
+#: C/mail-composer-priority.page:27(note/p)
 msgid ""
 "Evolution will ignore the message priority of incoming messages because the "
 "recipient should decide whether the message is important or not. You can set "
@@ -7344,23 +6851,19 @@ msgstr ""
 "c'est au destinataire de décider si le message est important ou non. Vous "
 "pouvez mettre le marqueur « Important » pour tous les messages."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-reply.page:5
+#: C/mail-composer-reply.page:5(info/desc)
 msgid "Answering a received email."
 msgstr "Répondre à un courriel reçu."
 
-#. (itstool) path: page/title
-#: C/mail-composer-reply.page:23
+#: C/mail-composer-reply.page:23(page/title)
 msgid "Replying to a message"
 msgstr "Répondre à un message"
 
-#. (itstool) path: section/title
-#: C/mail-composer-reply.page:26
+#: C/mail-composer-reply.page:26(section/title)
 msgid "Replying to Email Messages"
 msgstr "Réponses aux courriels"
 
-#. (itstool) path: section/p
-#: C/mail-composer-reply.page:27
+#: C/mail-composer-reply.page:27(section/p)
 msgid ""
 "To reply to a message, select the message to reply to in the message list "
 "and click the <gui>Reply</gui> button in the toolbar, or right-click within "
@@ -7383,8 +6886,7 @@ msgstr ""
 "chaque ligne (en mode texte brut), pour indiquer que cela fait partie du "
 "message précédent."
 
-#. (itstool) path: section/p
-#: C/mail-composer-reply.page:28
+#: C/mail-composer-reply.page:28(section/p)
 msgid ""
 "If you are reading a message with several recipients, you can use <gui>Reply "
 "to All</gui> instead of <gui>Reply</gui>. If there are large numbers of "
@@ -7396,13 +6898,11 @@ msgstr ""
 "les champs <gui>À :</gui> et <gui>Cc :</gui> comportent un grand nombre de "
 "personnes, cela peut vous faire gagner un temps non négligeable."
 
-#. (itstool) path: section/title
-#: C/mail-composer-reply.page:32
+#: C/mail-composer-reply.page:32(section/title)
 msgid "Using the Reply To All Feature"
 msgstr "Utilisation de la fonctionnalité Répondre à tous"
 
-#. (itstool) path: section/p
-#: C/mail-composer-reply.page:33
+#: C/mail-composer-reply.page:33(section/p)
 msgid ""
 "Susan sends an email to a client and sends copies to Tim and to an internal "
 "company mailing list of co-workers. If Tim wants to make a comment for all "
@@ -7411,16 +6911,15 @@ msgid ""
 "not reach anyone that Susan put on her Bcc list, because that list is not "
 "shared with anyone."
 msgstr ""
-"Suzanne envoie un courriel à un client et met en copie Tim ainsi qu'une "
+"Susanne envoie un courriel à un client et met en copie Tim ainsi qu'une "
 "liste de diffusion de collaborateurs internes. Si Tim souhaite faire un "
 "commentaire destiné à tous, il utilisera <gui>Répondre à tous</gui>, mais "
-"s'il souhaite uniquement dire à Suzanne qu'il est d'accord avec elle, il "
+"s'il souhaite uniquement dire à Susanne qu'il est d'accord avec elle, il "
 "utilisera <gui>Répondre</gui>. Dans tous les cas, sa réponse ne parviendra à "
-"aucune personne mentionnée dans le champ Cci : du message de Suzanne, car le "
+"aucune personne mentionnée dans le champ Cci : du message de Susanne, car le "
 "contenu de ce champ n'est partagé avec personne."
 
-#. (itstool) path: section/p
-#: C/mail-composer-reply.page:34
+#: C/mail-composer-reply.page:34(section/p)
 msgid ""
 "If you subscribe to a mailing list, and want your reply to go just to the "
 "list rather than to the sender, select <gui>Reply to List</gui> instead of "
@@ -7430,53 +6929,43 @@ msgstr ""
 "qu'à la liste, plutôt qu'à l'expéditeur, cliquez sur <gui>Répondre à la "
 "liste</gui> au lieu de <gui>Répondre</gui> ou <gui>Répondre à tous</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-reply.page:38
+#: C/mail-composer-reply.page:38(section/title)
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:41
+#: C/mail-composer-reply.page:41(td/p)
 msgid "Action"
 msgstr "Action"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:41
+#: C/mail-composer-reply.page:41(td/p)
 msgid "Shortcut keys"
 msgstr "Raccourcis clavier"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:43
+#: C/mail-composer-reply.page:43(td/p)
 msgid "Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:43
+#: C/mail-composer-reply.page:43(td/p)
 msgid "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>R</key></keyseq>"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:45
+#: C/mail-composer-reply.page:45(td/p)
 msgid "Reply to Mailing List"
 msgstr "Répondre à la liste"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:45
+#: C/mail-composer-reply.page:45(td/p)
 msgid "<keyseq><key>Ctrl</key><key>L</key></keyseq>"
 msgstr "<keyseq><key>Ctrl</key><key>L</key></keyseq>"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:47
+#: C/mail-composer-reply.page:47(td/p)
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#. (itstool) path: td/p
-#: C/mail-composer-reply.page:47
+#: C/mail-composer-reply.page:47(td/p)
 msgid "<keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq>"
 msgstr "<keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq>"
 
-#. (itstool) path: section/p
-#: C/mail-composer-reply.page:54
+#: C/mail-composer-reply.page:54(section/p)
 msgid ""
 "The default settings for replying and forwarding can be changed under "
 "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</"
@@ -7488,18 +6977,15 @@ msgstr ""
 "l'éditeur</gui><gui>Général</gui><gui>Réponses et transferts</gui><gui>Style "
 "de réponse</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-search.page:5
+#: C/mail-composer-search.page:5(info/desc)
 msgid "Searching for text in the mail composer."
 msgstr "Rechercher un texte dans l'éditeur de courriel."
 
-#. (itstool) path: page/title
-#: C/mail-composer-search.page:21
+#: C/mail-composer-search.page:21(page/title)
 msgid "Searching in the mail composer"
 msgstr "Recherche dans l'éditeur de courriel"
 
-#. (itstool) path: page/p
-#: C/mail-composer-search.page:23
+#: C/mail-composer-search.page:23(page/p)
 msgid ""
 "Under the <gui>Edit</gui> menu in the message composer there are several "
 "text searching features available."
@@ -7507,41 +6993,34 @@ msgstr ""
 "L'éditeur de messages met à votre disposition plusieurs fonctions de "
 "recherche de texte dans le menu <gui>Édition</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:26
+#: C/mail-composer-search.page:26(item/p)
 msgid "<gui>Find</gui>:"
 msgstr "<gui>Rechercher</gui> :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:27
+#: C/mail-composer-search.page:27(item/p)
 msgid "Enter a word or phrase, and Evolution finds it in your message."
 msgstr ""
 "Saisissez un mot ou une phrase et Evolution le recherche dans votre message."
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:30
+#: C/mail-composer-search.page:30(item/p)
 msgid "<gui>Find Again</gui>:"
 msgstr "<gui>Rechercher de nouveau</gui> :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:31
+#: C/mail-composer-search.page:31(item/p)
 msgid "Select this item to repeat the last search you performed."
 msgstr ""
 "Sélectionnez cet élément pour répéter la recherche que vous venez de faire."
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:34
+#: C/mail-composer-search.page:34(item/p)
 msgid "<gui>Replace</gui>:"
 msgstr "<gui>Remplacer</gui> :"
 
-#. (itstool) path: item/p
-#: C/mail-composer-search.page:35
+#: C/mail-composer-search.page:35(item/p)
 msgid "Find a word or phrase, and replace it with something else."
 msgstr ""
 "Recherche un mot ou une phrase et le remplace par quelque chose d'autre."
 
-#. (itstool) path: page/p
-#: C/mail-composer-search.page:39
+#: C/mail-composer-search.page:39(page/p)
 msgid ""
 "For all of these menu items you can choose whether to search backwards in "
 "the document from the point where your cursor is. You can also determine "
@@ -7552,77 +7031,31 @@ msgstr ""
 "aussi déterminer si la recherche doit tenir compte de la casse dans la "
 "recherche d'une correspondance."
 
-#. (itstool) path: page/p
-#: C/mail-composer-search.page:40
+#: C/mail-composer-search.page:40(page/p)
+#, fuzzy
+#| msgid ""
+#| "If you have a technical background you can also select the option to use "
+#| "<link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/";
+#| "Regular_expression\">Regular expressions</link> for searching."
 msgid ""
 "If you have a technical background you can also select the option to use "
 "<link href=\"https://en.wikipedia.org/wiki/Regular_expression\";>Regular "
 "expressions</link> for searching."
 msgstr ""
 "Si vous avez suffisamment de connaissances techniques, vous pouvez aussi "
-"choisir l'option permettant d'utiliser des <link href=\"https://en.wikipedia.";
-"org/wiki/Regular_expression\">expressions régulières</link> pour la "
-"recherche."
+"choisir l'option permettant d'utiliser des <link href=\"https://secure.";
+"wikimedia.org/wikipedia/fr/wiki/Expression_rationnelle\">expressions "
+"régulières</link> pour la recherche."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-send-account-overrides.page:5
-msgid "Assign your mail accounts to certain folders or recipients."
-msgstr ""
-"Attribuez certains dossiers ou destinataires à vos comptes de courrier."
-
-#. (itstool) path: page/title
-#: C/mail-composer-send-account-overrides.page:21
-msgid "Send Account Overrides"
-msgstr "Changements de compte expéditeur"
-
-#. (itstool) path: page/p
-#: C/mail-composer-send-account-overrides.page:23
-msgid ""
-"If you use more than one email account, you can define which account should "
-"always be used as your sender address:"
-msgstr ""
-"Si vous vous servez de plusieurs comptes de courrier, vous pouvez définir "
-"quel compte doit être utilisé  comme adresse d'expédition."
-
-#. (itstool) path: item/p
-#: C/mail-composer-send-account-overrides.page:25
-msgid ""
-"When replying to mail in specific <link xref=\"mail-folders\">folders</link>."
-msgstr ""
-"Lors de la réponse à du courrier dans des <link xref=\"mail-folders"
-"\">dossiers</link> spécifiques.."
-
-#. (itstool) path: item/p
-#: C/mail-composer-send-account-overrides.page:26
-msgid ""
-"When replying to certain email addresses, names, or parts of email addresses "
-"or names."
-msgstr ""
-"Lors de la réponse à certaines adresses courriel, certains noms, ou des "
-"parties d'adresses ou de noms."
-
-#. (itstool) path: page/p
-#: C/mail-composer-send-account-overrides.page:28
-msgid ""
-"These settings are available under <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui><gui>Composer Preferences</gui><gui>Send Account</gui></guiseq>."
-msgstr ""
-"Les options suivantes sont disponibles sous <guiseq><gui>Édition</"
-"gui><gui>Préférences</gui><gui>Préférences de l'éditeur</gui><gui>Compte "
-"expéditeur</gui></guiseq>."
-
-#. (itstool) path: info/desc
-#: C/mail-composer-several-recipients.page:5
+#: C/mail-composer-several-recipients.page:5(info/desc)
 msgid "Sending to more than one person and using CC or BCC."
 msgstr "Envoyer à plus d'une personne et utiliser CC et Cci."
 
-#. (itstool) path: page/title
-#: C/mail-composer-several-recipients.page:26
+#: C/mail-composer-several-recipients.page:26(page/title)
 msgid "Sending a message to several recipients"
 msgstr "Envoi d'un message à plusieurs destinataires"
 
-#. (itstool) path: page/p
-#: C/mail-composer-several-recipients.page:28
+#: C/mail-composer-several-recipients.page:28(page/p)
 msgid ""
 "To send a message to more than one person, enter the addresses in the "
 "composer by separating them with commas or semicolons."
@@ -7630,8 +7063,7 @@ msgstr ""
 "Pour envoyer un message à plus d'une personne, saisissez les adresses dans "
 "l'éditeur en les séparant par des virgules ou points-virgules."
 
-#. (itstool) path: note/p
-#: C/mail-composer-several-recipients.page:30
+#: C/mail-composer-several-recipients.page:30(note/p)
 msgid ""
 "If you frequently write email to the same groups of people, you can create "
 "<link xref=\"contacts-using-contact-lists\">contact lists</link> to send "
@@ -7642,13 +7074,11 @@ msgstr ""
 "d'adresses</link> pour leur envoyer des courriels comme s'il s'agissait "
 "d'une adresse unique."
 
-#. (itstool) path: section/title
-#: C/mail-composer-several-recipients.page:33
+#: C/mail-composer-several-recipients.page:33(section/title)
 msgid "Recipient types"
 msgstr "Types de destinataire"
 
-#. (itstool) path: section/p
-#: C/mail-composer-several-recipients.page:34
+#: C/mail-composer-several-recipients.page:34(section/p)
 msgid ""
 "Email messages can have three different types of recipients. The simplest "
 "way is to put the email address or addresses in the <gui>To:</gui> text "
@@ -7661,8 +7091,7 @@ msgstr ""
 "les destinataires qui sont censés recevoir une copie de votre message mais "
 "n'en sont pas les principaux destinataires."
 
-#. (itstool) path: section/p
-#: C/mail-composer-several-recipients.page:36
+#: C/mail-composer-several-recipients.page:36(section/p)
 msgid ""
 "Addresses in the <gui>Bcc:</gui> text field are hidden from the other "
 "recipients of the message. It can be used to send mail to large groups of "
@@ -7677,13 +7106,11 @@ msgstr ""
 "<gui>Cci :</gui> n'apparaît pas, choisissez <guiseq><gui>Affichage</"
 "gui><gui>Champ Cci</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-several-recipients.page:40
+#: C/mail-composer-several-recipients.page:40(section/title)
 msgid "Autocompletion"
 msgstr "Complétion automatique"
 
-#. (itstool) path: section/p
-#: C/mail-composer-several-recipients.page:41
+#: C/mail-composer-several-recipients.page:41(section/p)
 msgid ""
 "It is recommended to use the <link xref=\"contacts-autocompletion"
 "\">Autocompletion</link> feature of the Evolution address book for entering "
@@ -7694,13 +7121,11 @@ msgstr ""
 "d'Evolution pour la saisie des adresses. En l'utilisant vous évitez les "
 "erreurs typographiques et gagnez du temps."
 
-#. (itstool) path: section/title
-#: C/mail-composer-several-recipients.page:45
+#: C/mail-composer-several-recipients.page:45(section/title)
 msgid "Using the buttons"
 msgstr "Utilisations des boutons"
 
-#. (itstool) path: section/p
-#: C/mail-composer-several-recipients.page:47
+#: C/mail-composer-several-recipients.page:47(section/p)
 msgid ""
 "Instead of typing the recipients' names you can also click the <gui style="
 "\"button\">To:</gui>, <gui style=\"button\">Cc:</gui>, or <gui style=\"button"
@@ -7715,25 +7140,21 @@ msgstr ""
 "flèches pour les déplacer dans les cases d'adresses adéquates (À :, Cc :, "
 "Cci :)."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-spellcheck.page:7
+#: C/mail-composer-spellcheck.page:7(info/desc)
 msgid "On spell checking your mail in the composer."
 msgstr ""
 "À propos de la vérification orthographique de votre courriel dans l'éditeur "
 "de messages."
 
-#. (itstool) path: page/title
-#: C/mail-composer-spellcheck.page:22
+#: C/mail-composer-spellcheck.page:22(page/title)
 msgid "Spell checking"
 msgstr "Correction orthographique"
 
-#. (itstool) path: section/title
-#: C/mail-composer-spellcheck.page:27
+#: C/mail-composer-spellcheck.page:27(section/title)
 msgid "Prerequirements"
 msgstr "Prérequis"
 
-#. (itstool) path: section/p
-#: C/mail-composer-spellcheck.page:28
+#: C/mail-composer-spellcheck.page:28(section/p)
 msgid ""
 "To use spell checking for the emails that you write you first need to make "
 "sure that the <sys>hunspell</sys> package for your specific language and the "
@@ -7745,8 +7166,7 @@ msgstr ""
 "spécifique à votre langue et le paquet <sys>enchant</sys> sont installés en "
 "utilisant l'outil de gestion de logiciels de votre distribution."
 
-#. (itstool) path: note/p
-#: C/mail-composer-spellcheck.page:31
+#: C/mail-composer-spellcheck.page:31(note/p)
 msgid ""
 "You might need to install <sys>hunspell</sys> and/or <sys>enchant</sys> to "
 "perform these steps."
@@ -7754,8 +7174,7 @@ msgstr ""
 "Il se peut que vous ayez à installer <sys>hunspell</sys> et/ou <sys>enchant</"
 "sys> pour suivre ces instructions."
 
-#. (itstool) path: when/p
-#: C/mail-composer-spellcheck.page:34
+#: C/mail-composer-spellcheck.page:34(when/p)
 msgid ""
 "<link action=\"install:hunspell\" href=\"http://hunspell.sourceforge.net/\"; "
 "style=\"button\">Install hunspell</link>"
@@ -7763,8 +7182,7 @@ msgstr ""
 "<link action=\"install:hunspell\" href=\"http://hunspell.sourceforge.net/\"; "
 "style=\"button\">Installer hunspell</link>"
 
-#. (itstool) path: when/p
-#: C/mail-composer-spellcheck.page:35
+#: C/mail-composer-spellcheck.page:35(when/p)
 msgid ""
 "<link action=\"install:enchant\" href=\"http://www.abisource.com/projects/";
 "enchant/\" style=\"button\">Install enchant</link>"
@@ -7772,13 +7190,11 @@ msgstr ""
 "<link action=\"install:enchant\" href=\"http://www.abisource.com/projects/";
 "enchant/\" style=\"button\">Installer enchant</link>"
 
-#. (itstool) path: section/title
-#: C/mail-composer-spellcheck.page:42
+#: C/mail-composer-spellcheck.page:42(section/title)
 msgid "Global Preferences"
 msgstr "Préférences globales"
 
-#. (itstool) path: section/p
-#: C/mail-composer-spellcheck.page:44
+#: C/mail-composer-spellcheck.page:44(section/p)
 msgid ""
 "Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer "
 "Preferences</gui><gui>Spell Checking</gui><gui>Options</gui></guiseq> you "
@@ -7790,8 +7206,7 @@ msgstr ""
 "guiseq>, vous pouvez définir si la vérification est réalisée pendant la "
 "frappe et quelle est la couleur utilisée pour souligner les mots incorrects."
 
-#. (itstool) path: section/p
-#: C/mail-composer-spellcheck.page:46
+#: C/mail-composer-spellcheck.page:46(section/p)
 msgid ""
 "You can also define which installed languages are used for spell checking in "
 "the list available under <guiseq><gui>Edit</gui><gui>Preferences</"
@@ -7804,13 +7219,11 @@ msgstr ""
 "l'éditeur</gui><gui>Correction orthographique</gui><gui>Langues</gui></"
 "guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-composer-spellcheck.page:50
+#: C/mail-composer-spellcheck.page:50(section/title)
 msgid "Manual spell checking in the composer"
 msgstr "Correction orthographique manuelle dans l'éditeur"
 
-#. (itstool) path: section/p
-#: C/mail-composer-spellcheck.page:51
+#: C/mail-composer-spellcheck.page:51(section/p)
 msgid ""
 "If you do not have <gui>Checking spelling while I type</gui> enabled in the "
 "<link xref=\"#global-preferences\">Composer Preferences</link> you can run a "
@@ -7821,20 +7234,17 @@ msgstr ""
 "gui> dans le <link xref=\"#global-preferences\">Préférences de l'éditeur</"
 "link>, vous pouvez lancer le correcteur orthographique dans l'éditeur de "
 "courriel en cliquant sur <guiseq><gui>Édition</gui><gui>Vérifier "
-"l'orthographe</gui></guiseq> ou en appuyant sur la touche <key>F7</key>."
+"l'orthographe</gui></guiseq> ou en pressant sur la touche <key>F7</key>."
 
-#. (itstool) path: info/desc
-#: C/mail-composer-write-new-message.page:5
+#: C/mail-composer-write-new-message.page:5(info/desc)
 msgid "Writing a new email to send to a recipient."
 msgstr "Écrire un nouveau message à envoyer à un destinataire."
 
-#. (itstool) path: page/title
-#: C/mail-composer-write-new-message.page:23
+#: C/mail-composer-write-new-message.page:23(page/title)
 msgid "Composing a new message"
 msgstr "Rédaction d'un nouveau message"
 
-#. (itstool) path: page/p
-#: C/mail-composer-write-new-message.page:25
+#: C/mail-composer-write-new-message.page:25(page/p)
 msgid ""
 "You can start writing a new email message by clicking <guiseq><gui>File</"
 "gui><gui>New</gui><gui>Mail Message</gui></guiseq>, by pressing "
@@ -7846,8 +7256,7 @@ msgstr ""
 "en appuyant sur <keyseq><key>Maj</key><key>Ctrl</key><key>N</key></keyseq> "
 "ou en cliquant sur <gui>Nouveau</gui> dans la barre d'outils."
 
-#. (itstool) path: page/p
-#: C/mail-composer-write-new-message.page:27
+#: C/mail-composer-write-new-message.page:27(page/p)
 msgid ""
 "Enter an email address in the <gui>To:</gui> field. If you want to enter "
 "multiple addresses, separate them by commas. See <link xref=\"mail-composer-"
@@ -7859,8 +7268,7 @@ msgstr ""
 "<link xref=\"mail-composer-several-recipients\"/> pour plus d'informations "
 "sur l'envoi de messages à plus d'une personne."
 
-#. (itstool) path: page/p
-#: C/mail-composer-write-new-message.page:29
+#: C/mail-composer-write-new-message.page:29(page/p)
 msgid ""
 "After you have written your message, click <gui>Send</gui> or press "
 "<keyseq><key>Ctrl</key><key>Return</key></keyseq>."
@@ -7868,19 +7276,16 @@ msgstr ""
 "Après avoir écrit votre message, cliquez sur <gui>Envoyer</gui> ou pressez "
 "<keyseq><key>Ctrl</key><key>Entrée</key></keyseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-default-CC-and-BCC.page:5
+#: C/mail-default-CC-and-BCC.page:5(info/desc)
 msgid "Make somebody always receive copies of your sent mail."
 msgstr ""
 "Faire en sorte qu'une personne reçoive toujours une copie de vos courriels."
 
-#. (itstool) path: page/title
-#: C/mail-default-CC-and-BCC.page:29
+#: C/mail-default-CC-and-BCC.page:29(page/title)
 msgid "Default CC and BCC"
 msgstr "CC et Cci par défaut"
 
-#. (itstool) path: page/p
-#: C/mail-default-CC-and-BCC.page:31
+#: C/mail-default-CC-and-BCC.page:31(page/p)
 msgid ""
 "You can set email addresses that should always receive copies of your sent "
 "mail (either as CC visible for all recipients, or BCC not visible for other "
@@ -7895,20 +7300,17 @@ msgstr ""
 "gui><gui>Préférences</gui><gui>Comptes de messagerie</gui><gui style=\"button"
 "\">Modifier</gui><gui>Valeurs par défaut</gui></guiseq>)."
 
-#. (itstool) path: info/desc
-#: C/mail-default-folder-locations.page:5
+#: C/mail-default-folder-locations.page:5(info/desc)
 msgid "Changing the location of Draft, Sent, Trash and Junk folders."
 msgstr ""
 "Modifier l'emplacement des dossiers Brouillons, Envoyés, Corbeille et "
 "Pourriels."
 
-#. (itstool) path: page/title
-#: C/mail-default-folder-locations.page:29
+#: C/mail-default-folder-locations.page:29(page/title)
 msgid "Mail folder locations"
 msgstr "Emplacements des dossiers de courriels"
 
-#. (itstool) path: page/p
-#: C/mail-default-folder-locations.page:31
+#: C/mail-default-folder-locations.page:31(page/p)
 msgid ""
 "You can set a different place where to store messages in your Draft folder "
 "and Sent folder in the <gui>Defaults</gui> section of the mail account "
@@ -7921,21 +7323,7 @@ msgstr ""
 "gui><gui>Préférences</gui><gui>Comptes de messagerie</gui><gui style=\"button"
 "\">Modifier</gui><gui>Valeurs par défaut</gui></guiseq>)."
 
-#. (itstool) path: page/p
-#: C/mail-default-folder-locations.page:32
-msgid ""
-"You can define an <gui>Archive Folder</gui>, for example to move older "
-"messages there. Selecting <guiseq><gui>Message</gui><gui>Archive</gui></"
-"guiseq> in the main window moves the selected message to the specified "
-"folder."
-msgstr ""
-"Vous pouvez définir un <gui>Dossier d'archive</gui>, par exemple pour y "
-"placer les messages anciens. Le fait de choisir <guiseq><gui>Message</"
-"gui><gui>Archiver</gui></guiseq> dans la fenêtre principale déplace le "
-"message sélectionné dans le dossier spécifique."
-
-#. (itstool) path: page/p
-#: C/mail-default-folder-locations.page:33
+#: C/mail-default-folder-locations.page:32(page/p)
 msgid ""
 "For remote account types (accounts such as IMAP) you can also use folders on "
 "the mail server for Junk and Trash by selecting the corresponding <gui>Use a "
@@ -7948,23 +7336,19 @@ msgstr ""
 "correspondante. Dans ce cas, les <link xref=\"mail-search-folders\">dossiers "
 "virtuels</link> locaux d'Evolution ne seront pas utilisés."
 
-#. (itstool) path: info/desc
-#: C/mail-delete-and-undelete.page:5
+#: C/mail-delete-and-undelete.page:5(info/desc)
 msgid "Deleting, expunging, and undeleting mail."
 msgstr "Supprimer, nettoyer et récupérer les courriels."
 
-#. (itstool) path: page/title
-#: C/mail-delete-and-undelete.page:25
+#: C/mail-delete-and-undelete.page:25(page/title)
 msgid "Deleting and undeleting messages"
 msgstr "Suppression et récupération de messages"
 
-#. (itstool) path: section/title
-#: C/mail-delete-and-undelete.page:28
+#: C/mail-delete-and-undelete.page:28(section/title)
 msgid "Deleting Messages"
 msgstr "Suppression de messages"
 
-#. (itstool) path: section/p
-#: C/mail-delete-and-undelete.page:30
+#: C/mail-delete-and-undelete.page:30(section/p)
 msgid ""
 "To delete a message, select it and press the <key>Delete</key> key, or click "
 "the <gui style=\"button\">Delete</gui> button in the toolbar, or press "
@@ -7977,8 +7361,7 @@ msgstr ""
 "keyseq> ou faites un clic-droit sur le message et choisissez <gui>Supprimer</"
 "gui>."
 
-#. (itstool) path: section/p
-#: C/mail-delete-and-undelete.page:32
+#: C/mail-delete-and-undelete.page:32(section/p)
 msgid ""
 "When you press Delete or click the Trash folder, your mail is not actually "
 "deleted, but is marked for deletion. You can see all message marked for "
@@ -7993,8 +7376,7 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Afficher les messages supprimés</gui></"
 "guiseq>. Ces messages apparaissent barrés avant d'être supprimés plus tard."
 
-#. (itstool) path: section/p
-#: C/mail-delete-and-undelete.page:34
+#: C/mail-delete-and-undelete.page:34(section/p)
 msgid ""
 "To permanently erase all the deleted messages in a folder, click "
 "<guiseq><gui>Folder</gui><gui>Expunge</gui></guiseq> or press "
@@ -8004,13 +7386,11 @@ msgstr ""
 "cliquez sur <guiseq><gui>Dossier</gui><gui>Nettoyer</gui></guiseq> ou "
 "appuyez sur <keyseq><key>Ctrl</key><key>E</key></keyseq>."
 
-#. (itstool) path: section/title
-#: C/mail-delete-and-undelete.page:38
+#: C/mail-delete-and-undelete.page:38(section/title)
 msgid "Undeleting Messages"
 msgstr "Récupération de messages"
 
-#. (itstool) path: section/p
-#: C/mail-delete-and-undelete.page:40
+#: C/mail-delete-and-undelete.page:40(section/p)
 msgid ""
 "You can undelete a message that has been deleted but not expunged yet. To "
 "undelete a message, select the message, click <guiseq><gui>Edit</"
@@ -8023,34 +7403,29 @@ msgstr ""
 "que <guiseq><gui>Affichage</gui><gui>Afficher les messages supprimés</gui></"
 "guiseq> doit être activé pour que cela fonctionne."
 
-#. (itstool) path: section/p
-#: C/mail-delete-and-undelete.page:42
+#: C/mail-delete-and-undelete.page:42(section/p)
 msgid ""
 "If you have marked a message for deletion, undeleting it unmarks it, and the "
 "message is not shown anymore in the Trash folder."
 msgstr ""
-"Si vous avez marqué un message pour la suppression, sa recupération retire "
-"sa marque et le message n'apparaît plus dans le dossier Corbeille."
+"Si vous avez marqué un message pour la suppression, sa récupération retire "
+"cette marque et le message n'apparaît plus dans le dossier Corbeille."
 
-#. (itstool) path: info/desc
-#: C/mail-displaying-character-encodings.page:5
+#: C/mail-displaying-character-encodings.page:5(info/desc)
 msgid "When letters in an email are not shown correctly or missing."
 msgstr ""
 "Lorsque des lettres dans un courriel ne s'affichent pas correctement ou sont "
 "absentes."
 
-#. (itstool) path: page/title
-#: C/mail-displaying-character-encodings.page:21
+#: C/mail-displaying-character-encodings.page:21(page/title)
 msgid "Character Encodings"
 msgstr "Codages des caractères"
 
-#. (itstool) path: section/title
-#: C/mail-displaying-character-encodings.page:24
+#: C/mail-displaying-character-encodings.page:24(section/title)
 msgid "Received mail"
 msgstr "Courriel reçu"
 
-#. (itstool) path: section/p
-#: C/mail-displaying-character-encodings.page:26
+#: C/mail-displaying-character-encodings.page:26(section/p)
 msgid ""
 "If the email application of the sender is broken or misconfigured, plain "
 "text emails might not include information about the character encoding used. "
@@ -8061,15 +7436,14 @@ msgid ""
 msgstr ""
 "Si l'application de messagerie de l'expéditeur ne fonctionne pas bien ou est "
 "mal configurée, il se peut que les courriels de texte n'incluent pas "
-"d'informations sur le codage de caractères qui est utilisé. Si vous recevez "
-"de tels messages, choisissez <guiseq><gui>Affichage</gui><gui>Codage des "
-"caractères</gui></guiseq> dans le menu principal et changez le codage de "
-"caractères actuellement sélectionné pour un plus approprié qui pourrait être "
-"celui utilisé par l'expéditeur. Vous devez faire cette modification à chaque "
-"fois que vous lisez le message."
+"d'informations sur le codage de caractères utilisé. Si vous recevez de tels "
+"messages, choisissez <guiseq><gui>Affichage</gui><gui>Codage des caractères</"
+"gui></guiseq> dans le menu principal et changez le codage de caractères "
+"actuellement sélectionné pour un plus approprié qui pourrait être celui "
+"utilisé par l'expéditeur. Vous devez faire cette modification à chaque fois "
+"que vous lisez le message."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-character-encodings.page:27
+#: C/mail-displaying-character-encodings.page:27(section/p)
 msgid ""
 "To make this the default setting, go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
@@ -8080,8 +7454,7 @@ msgstr ""
 "courriel</gui><gui>Général</gui><gui>Codage des caractères par défaut</gui></"
 "guiseq>."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-character-encodings.page:34
+#: C/mail-displaying-character-encodings.page:34(section/p)
 msgid ""
 "In the unlikely event that you would like to change the default character "
 "encoding for messages that you send, go to <guiseq><gui>Edit</"
@@ -8093,8 +7466,7 @@ msgstr ""
 "gui><gui>Préférences</gui><gui>Préférences de l'éditeur</"
 "gui><gui>Comportement par défaut</gui><gui>Jeu de caractères</gui></guiseq>."
 
-#. (itstool) path: note/p
-#: C/mail-displaying-character-encodings.page:35
+#: C/mail-displaying-character-encodings.page:35(note/p)
 msgid ""
 "This setting only refers to Plain Text messages as <link xref=\"mail-"
 "composer-html\">HTML messages</link> always use UTF-8 encoding."
@@ -8102,18 +7474,39 @@ msgstr ""
 "Ce paramètre ne s'applique qu'aux messages texte car les <link xref=\"mail-"
 "composer-html\">messages HTML</link> sont toujours codés en UTF-8."
 
-#. (itstool) path: info/desc
-#: C/mail-displaying-collapsible-headers.page:5
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-displaying-collapsible-headers.page:27(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/plus-icon.png' md5='57bf83c4ab8585c30897a6cf89c5949c'"
+msgstr ""
+"external ref='./figures/plus-icon.png' md5='57bf83c4ab8585c30897a6cf89c5949c'"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/mail-displaying-collapsible-headers.page:29(media)
+msgctxt "_"
+msgid ""
+"external ref='./figures/minus-icon.png' "
+"md5='7cef9df0f691c8d6ce67cad29ebceac9'"
+msgstr ""
+"external ref='./figures/minus-icon.png' "
+"md5='7cef9df0f691c8d6ce67cad29ebceac9'"
+
+#: C/mail-displaying-collapsible-headers.page:5(info/desc)
 msgid "Display less email recipients of a specific message."
 msgstr "Afficher moins de destinataires du courriel pour un message donné."
 
-#. (itstool) path: page/title
-#: C/mail-displaying-collapsible-headers.page:23
+#: C/mail-displaying-collapsible-headers.page:23(page/title)
 msgid "Collapsible Message Headers"
 msgstr "En-têtes de message réductibles"
 
-#. (itstool) path: page/p
-#: C/mail-displaying-collapsible-headers.page:25
+#: C/mail-displaying-collapsible-headers.page:25(page/p)
 msgid ""
 "Evolution compresses the To, Cc and Bcc headers of received mail and shows "
 "only five addresses in the message preview."
@@ -8121,40 +7514,38 @@ msgstr ""
 "Evolution réduit les en-têtes À, Cc et Cci des messages reçus et n'affiche "
 "que cinq adresses dans l'aperçu du message."
 
-#. (itstool) path: page/p
-#: C/mail-displaying-collapsible-headers.page:27
+#: C/mail-displaying-collapsible-headers.page:27(page/p)
 msgid ""
-"To see all recipients, click the <_:media-1/> icon next to the <gui>To:</"
-"gui> or <gui>Cc:</gui> line, or click the ellipsis (…) at the end of the "
-"five displayed addresses."
+"To see all recipients, click the <media type=\"image\" src=\"./figures/plus-"
+"icon.png\"/> icon next to the <gui>To:</gui> or <gui>Cc:</gui> line, or "
+"click the ellipsis (...) at the end of the five displayed addresses."
 msgstr ""
-"Pour voir tous les destinataires, cliquez sur l'icône <_:media-1/> à côté de "
-"la ligne <gui>À :</gui> ou <gui>Cc :</gui>, ou cliquez sur les points de "
-"suspension (...) à la fin des cinq adresses affichées."
+"Pour voir tous les destinataires, cliquez sur l'icône <media type=\"image\" "
+"src=\"./figures/plus-icon.png\"/> à côté de la ligne <gui>À :</gui> ou "
+"<gui>Cc :</gui>, ou cliquez sur les points de suspension (...) à la fin des "
+"cinq adresses affichées."
 
-#. (itstool) path: page/p
-#: C/mail-displaying-collapsible-headers.page:29
+#: C/mail-displaying-collapsible-headers.page:29(page/p)
 msgid ""
 "To collapse all of the message headers and just display the subject and "
-"sender in one line, click the icon <_:media-1/> next to the <gui>From:</gui> "
-"line. This is helpful on small screens."
+"sender in one line, click the icon <media type=\"image\" src=\"./figures/"
+"minus-icon.png\"/> next to the <gui>From:</gui> line. This is helpful on "
+"small screens."
 msgstr ""
 "Pour réduire tous les en-têtes de message et n'afficher que le sujet et "
-"l'expéditeur sur une ligne, cliquez sur l'icône <_:media-1/> à côté de la "
-"ligne <gui>De :</gui>. C'est très utile pour les petits écrans."
+"l'expéditeur sur une ligne, cliquez sur l'icône <media type=\"image\" src="
+"\"./figures/minus-icon.png\"/> à côté de la ligne <gui>De :</gui>. C'est "
+"très utile pour les petits écrans."
 
-#. (itstool) path: info/desc
-#: C/mail-displaying-images-in-html.page:5
+#: C/mail-displaying-images-in-html.page:5(info/desc)
 msgid "On embedded pictures in received HTML messages."
 msgstr "À propos des images incorporées dans les messages reçus en HTML."
 
-#. (itstool) path: page/title
-#: C/mail-displaying-images-in-html.page:27
+#: C/mail-displaying-images-in-html.page:27(page/title)
 msgid "Images in HTML messages"
 msgstr "Images dans les courriels HTML"
 
-#. (itstool) path: page/p
-#: C/mail-displaying-images-in-html.page:29
+#: C/mail-displaying-images-in-html.page:29(page/p)
 msgid ""
 "When someone sends you HTML mail that includes an image in the body of the "
 "message (for example, the welcome message in your Inbox), Evolution displays "
@@ -8164,13 +7555,11 @@ msgstr ""
 "le corps du message (par exemple, le message de bienvenue dans votre boîte "
 "de réception), Evolution affiche l'image dans le message."
 
-#. (itstool) path: section/title
-#: C/mail-displaying-images-in-html.page:32
+#: C/mail-displaying-images-in-html.page:32(section/title)
 msgid "Loading images"
 msgstr "Chargement des images"
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:33
+#: C/mail-displaying-images-in-html.page:33(section/p)
 msgid ""
 "Some images are links in a message, rather than being part of the message. "
 "Evolution can download those images from the Internet, but does not do so "
@@ -8186,8 +7575,7 @@ msgstr ""
 "qui lit les messages. Le chargement manuel des images favorise la protection "
 "de votre vie privée."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:35
+#: C/mail-displaying-images-in-html.page:35(section/p)
 msgid ""
 "To load the images for one message, click <guiseq><gui>View</gui><gui>Load "
 "Images</gui></guiseq> or press <keyseq><key>Ctrl</key><key>I</key></keyseq>."
@@ -8196,8 +7584,7 @@ msgstr ""
 "gui><gui>Charger les images</gui></guiseq> ou pressez <keyseq><key>Ctrl</"
 "key><key>I</key></keyseq>."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:37
+#: C/mail-displaying-images-in-html.page:37(section/p)
 msgid ""
 "To set the default action for loading images, go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>HTML Messages</"
@@ -8208,15 +7595,13 @@ msgstr ""
 "courriel</gui><gui>Messages HTML</gui><gui>Chargement des images</gui></"
 "guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-displaying-images-in-html.page:41
+#: C/mail-displaying-images-in-html.page:41(section/title)
 msgid "Automatically download images in emails from people you know"
 msgstr ""
 "Téléchargement automatique des images des courriels venant des personnes que "
 "vous connaissez."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:43
+#: C/mail-displaying-images-in-html.page:43(section/p)
 msgid ""
 "You can download images from emails sent by your contacts. To do this, go to "
 "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</"
@@ -8229,8 +7614,7 @@ msgstr ""
 "gui><gui>Chargement des images</gui></guiseq>. Activer l'option "
 "<gui>Afficher les images seulement dans les messages des contacts</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:45
+#: C/mail-displaying-images-in-html.page:45(section/p)
 msgid ""
 "Next, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</"
 "gui><gui>Autocompletion</gui></guiseq>. Enable autocompletion by ticking the "
@@ -8240,69 +7624,69 @@ msgstr ""
 "gui><gui>Contacts</gui><gui>Complétion automatique</gui></guiseq>. Cochez la "
 "case <gui>Toujours afficher l'adresse du contact auto-complétée</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-displaying-images-in-html.page:49
+#: C/mail-displaying-images-in-html.page:49(section/title)
 msgid "Saving images"
 msgstr "Enregistrement des images"
 
-#. (itstool) path: section/p
-#: C/mail-displaying-images-in-html.page:50
+#: C/mail-displaying-images-in-html.page:50(section/p)
 msgid ""
 "To save an image that is embedded in an HTML email, right-click on the image "
-"and click <gui>Save Image…</gui>."
+"and click <gui>Save Image...</gui>."
 msgstr ""
 "Pour enregistrer une image qui est intégrée dans un courriel HTML, faites un "
-"clic-droit sur l'image et cliquez sur <gui>Enregistrer l'image...</gui>.."
+"clic-droit sur l'image et cliquez sur <gui>Enregistrer l'image...</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-displaying-message.page:5
+#: C/mail-displaying-message.page:5(info/desc)
 msgid "Rendering an email and handling its attachments."
 msgstr "Présenter un courriel et gérer les pièces-jointes."
 
-#. (itstool) path: page/title
-#: C/mail-displaying-message.page:20
+#: C/mail-displaying-message.page:20(page/title)
 msgid "Display of a message"
 msgstr "Affichage d'un message"
 
-#. (itstool) path: section/title
-#: C/mail-displaying-message.page:23
+#: C/mail-displaying-message.page:23(section/title)
 msgid "Advanced"
 msgstr "Avancée"
 
-#. (itstool) path: info/desc
-#: C/mail-displaying-sender-photograph.page:5
+#: C/mail-displaying-sender-photograph.page:5(info/desc)
 msgid "Display a picture of the sender in the message header area."
 msgstr "Afficher un photo de l'expéditeur dans la zone d'en-tête du message."
 
-#. (itstool) path: page/title
-#: C/mail-displaying-sender-photograph.page:23
+#: C/mail-displaying-sender-photograph.page:23(page/title)
 msgid "Photograph Message Headers"
 msgstr "En-tête du message avec photographie"
 
-#. (itstool) path: page/p
-#: C/mail-displaying-sender-photograph.page:26
+#: C/mail-displaying-sender-photograph.page:26(page/p)
+#, fuzzy
+#| msgid ""
+#| "The photograph of the sender of an email can be shown at the right side "
+#| "of the message preview if the sender is in one of your address books and "
+#| "has a photograph."
 msgid ""
 "Evolution automatically displays photographs of the sender of an email at "
 "the right side of the message header if the sender already embedded a "
 "photograph in the message."
 msgstr ""
-"Evolution affiche automatiquement les photos de l'expéditeur d'un courriel à "
-"droite de l'en-tête du message si l'expéditeur a déjà incorporé une photo "
-"dans le corps du message."
+"La photo de l'expéditeur d'une courriel peut être affichée à droite de "
+"l'aperçu du message si l'expéditeur est dans l'un des carnets d'adresses et "
+"possède une photographie."
 
-#. (itstool) path: page/p
-#: C/mail-displaying-sender-photograph.page:29
+#: C/mail-displaying-sender-photograph.page:29(page/p)
+#, fuzzy
+#| msgid ""
+#| "The photograph of the sender of an email can be shown at the right side "
+#| "of the message preview if the sender is in one of your address books and "
+#| "has a photograph."
 msgid ""
 "You can also manually enable displaying the photograph of the sender of an "
 "email if the sender is in one of your address books and has a photograph "
 "stored."
 msgstr ""
-"Vous pouvez également activer manuellement l'affichage d'une photo de "
-"l'expéditeur d'un courriel, si l'expéditeur fait partie d'un de vos carnets "
-"d'adresse et qu'il possède une photographie en réserve."
+"La photo de l'expéditeur d'une courriel peut être affichée à droite de "
+"l'aperçu du message si l'expéditeur est dans l'un des carnets d'adresses et "
+"possède une photographie."
 
-#. (itstool) path: page/p
-#: C/mail-displaying-sender-photograph.page:31
+#: C/mail-displaying-sender-photograph.page:31(page/p)
 msgid ""
 "To enable this functionality, select <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Headers</"
@@ -8313,51 +7697,34 @@ msgstr ""
 "gui><gui>Afficher la photo de l'expéditeur dans l'aperçu du courriel</gui></"
 "guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-displaying-sender-photograph.page:33
+#: C/mail-displaying-sender-photograph.page:33(page/p)
 msgid ""
 "If there are multiple matches for a contact, the first one is always used."
 msgstr ""
 "S'il y a plusieurs résultats pour un contact, le premier sera toujours "
 "utilisé."
 
-#. (itstool) path: note/p
-#: C/mail-displaying-sender-photograph.page:36
-msgid ""
-"You can also embed your own image in messages that you send under "
-"<guiseq><gui>Edit</gui><gui>Plugins</gui><gui>Face</gui></guiseq>. The image "
-"has to have a size of 48 x 48 pixels and be in PNG file format."
-msgstr ""
-"Vous pouvez aussi intégrer votre propre image dans les messages que vous "
-"envoyez en passant par <guiseq><gui>Édition</gui><gui>Greffons</"
-"gui><gui>Portrait</gui></guiseq>. L'image doit faire 48 x 48 pixels et être "
-"au format de fichier PNG."
-
-#. (itstool) path: info/desc
-#: C/mail-display-message-source.page:5
+#: C/mail-display-message-source.page:5(info/desc)
 msgid "Displaying the raw source of a message or all header lines."
 msgstr ""
 "Affichage de la source brute d'un message ou de toutes les lignes d'en-tête."
 
-#. (itstool) path: page/title
-#: C/mail-display-message-source.page:20
+#: C/mail-display-message-source.page:20(page/title)
 msgid "Message Source"
 msgstr "Source du message :"
 
-#. (itstool) path: page/p
-#: C/mail-display-message-source.page:22
+#: C/mail-display-message-source.page:22(page/p)
 msgid ""
 "To view the message data, click on <guiseq><gui>View</gui><gui>Message "
 "Source</gui></guiseq> or press <keyseq><key>Ctrl</key><key>U</key></keyseq>. "
 "This will display the message data in a new window."
 msgstr ""
-"Pour afficher les données du message, cliquez sur  <guiseq><gui>Affichage</"
+"Pour afficher les données du message, cliquez sur  <guiseq><gui>View</"
 "gui><gui>Source du message</gui></guiseq> ou appuyez sur <keyseq><key>Ctrl</"
 "key><key>U</key></keyseq>. Les données du message seront ainsi affichées "
 "dans une nouvelle fenêtre."
 
-#. (itstool) path: page/p
-#: C/mail-display-message-source.page:24
+#: C/mail-display-message-source.page:24(page/p)
 msgid ""
 "To only view the complete headers for a message, click <guiseq><gui>View</"
 "gui><gui>All Message Headers</gui></guiseq>. This will display the complete "
@@ -8367,23 +7734,19 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Tous les en-têtes du message</gui></"
 "guiseq>. L'ensemble des en-têtes s'affichera dans le panneau d'affichage."
 
-#. (itstool) path: info/desc
-#: C/mail-duplicates.page:5
+#: C/mail-duplicates.page:5(info/desc)
 msgid "How to handle duplicated email messages"
 msgstr "Gérer les messages en double."
 
-#. (itstool) path: page/title
-#: C/mail-duplicates.page:24
+#: C/mail-duplicates.page:24(page/title)
 msgid "Duplicate emails get downloaded"
 msgstr "Téléchargement de courriels en double"
 
-#. (itstool) path: section/title
-#: C/mail-duplicates.page:27
+#: C/mail-duplicates.page:27(section/title)
 msgid "Removing duplicate emails"
 msgstr "Suppression des messages en double"
 
-#. (itstool) path: section/p
-#: C/mail-duplicates.page:28
+#: C/mail-duplicates.page:28(section/p)
 msgid ""
 "To remove duplicate emails in a folder, select multiple messages (or select "
 "all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</"
@@ -8398,31 +7761,26 @@ msgstr ""
 "<guiseq><gui>Message</gui><gui>Supprimer les messages en double</gui></"
 "guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-duplicates.page:33
+#: C/mail-duplicates.page:33(section/title)
 msgid "Reasons"
 msgstr "Explications"
 
-#. (itstool) path: section/p
-#: C/mail-duplicates.page:34
+#: C/mail-duplicates.page:34(section/p)
 msgid ""
 "Downloading duplicate emails may be due to one of the following reasons:"
 msgstr ""
 "Le téléchargement de courriels en double peut être dû à l'une des raisons "
 "suivantes :"
 
-#. (itstool) path: item/p
-#: C/mail-duplicates.page:36
+#: C/mail-duplicates.page:36(item/p)
 msgid "There are several copies of the same message in the mailbox"
 msgstr "Il y a plusieurs copies du même message dans la boîte aux lettres."
 
-#. (itstool) path: item/p
-#: C/mail-duplicates.page:37
+#: C/mail-duplicates.page:37(item/p)
 msgid "Evolution is having a problem with the UIDL extension."
 msgstr "Evolution a un problème avec l'extension UIDL."
 
-#. (itstool) path: item/p
-#: C/mail-duplicates.page:38
+#: C/mail-duplicates.page:38(item/p)
 msgid ""
 "The cache files located at <file>$HOME/.local/share/evolution/mail/local/</"
 "file> are not writable."
@@ -8430,54 +7788,169 @@ msgstr ""
 "Les fichiers en cache situés dans <file>$HOME/.local/share/evolution/mail/"
 "local/</file> ne sont pas modifiables."
 
-#. (itstool) path: info/desc
-#: C/mail-encryption-gpg-create-key.page:5
+#: C/mail-encryption-gpg-create-key.page:5(info/desc)
 msgid "Signing or encrypting messages via GPG/OpenPGP that you send."
 msgstr "Signer et chiffrer les messages envoyés via GPG/OpenPGP."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-gpg-create-key.page:20
+#: C/mail-encryption-gpg-create-key.page:23(page/title)
 msgid "Creating a GPG key"
 msgstr "Création d'une clé GPG"
 
-#. (itstool) path: page/p
-#: C/mail-encryption-gpg-create-key.page:24
+#: C/mail-encryption-gpg-create-key.page:25(note/p)
 msgid ""
-"Before you can get or send GPG encrypted mail, you need to <link xref=\"help:"
-"seahorse/pgp-create\" href=\"https://help.gnome.org/users/seahorse/stable/";
-"pgp-create\">generate your public and private keys with GPG</link>. After "
-"doing so and <link xref=\"mail-encryption-gpg-set-up\">setting up Evolution "
-"to use the key</link>, you need to <link xref=\"help:seahorse/pgp-publish\" "
-"href=\"https://help.gnome.org/users/seahorse/stable/pgp-publish\";>share your "
-"public key with your friends to allow them sending you encrypted messages</"
-"link>."
+"These steps are very technical. For average users we recommend using the "
+"<link href=\"help:seahorse/index\"><app>Seahorse</app> application</link> "
+"for managing GPG/OpenPGP keys."
+msgstr ""
+"Ces étapes sont très techniques. Pour les utilisateurs moyens, nous "
+"recommandons d'utiliser l'application <link href=\"help:seahorse/index"
+"\"><app>Seahorse</app></link> pour gérer les clés GPG/OpenPGP."
+
+#: C/mail-encryption-gpg-create-key.page:28(page/p)
+msgid ""
+"Before you can get or send GPG encrypted mail, you need to generate your "
+"public and private keys with GPG."
+msgstr ""
+"Avant de recevoir ou d'envoyer des courriels chiffrés GPG, vous avez besoin "
+"de générer vos clés publique et privée avec GPG."
+
+#: C/mail-encryption-gpg-create-key.page:30(item/p)
+msgid ""
+"Open the <app>Terminal</app> application and enter <cmd>gpg --gen-key</cmd>."
+msgstr ""
+"Ouvrez l'application <app>Terminal</app> et saisissez <cmd>gpg --gen-key</"
+"cmd>."
+
+#: C/mail-encryption-gpg-create-key.page:31(item/p)
+msgid "Select an algorithm, then press Enter."
+msgstr "Choisissez un algorithme, puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:32(item/p)
+msgid "Select a key length, then press Enter."
+msgstr "Choisissez une longueur de clé, puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:33(item/p)
+msgid "Enter how long your key should be valid for."
+msgstr "Saisissez la durée de validité de votre clé."
+
+#: C/mail-encryption-gpg-create-key.page:34(item/p)
+msgid "Type your real name, then press Enter."
+msgstr "Saisissez votre nom réel, puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:35(item/p)
+msgid "Type your email address, then press Enter."
+msgstr "Saisissez votre adresse électronique, puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:36(item/p)
+msgid "(Optional) Type a comment, then press Enter."
+msgstr "Saisissez un commentaire (facultatif), puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:37(item/p)
+msgid "Review your selected user ID. If it is correct, press O."
+msgstr ""
+"Relisez l'identifiant utilisateur sélectionné. S'il est correct, appuyez sur "
+"O."
+
+#: C/mail-encryption-gpg-create-key.page:38(item/p)
+msgid "Type a passphrase, then press Enter."
+msgstr "Saisissez une phrase de passe, puis appuyez sur Entrée."
+
+#: C/mail-encryption-gpg-create-key.page:39(item/p)
+msgid "Move your mouse randomly to generate the keys."
+msgstr "Déplacez votre souris au hasard pour générer les clés."
+
+#: C/mail-encryption-gpg-create-key.page:42(page/p)
+msgid ""
+"After the keys are generated, you can view your key information by entering "
+"<cmd>gpg --list-keys</cmd>. You should see something similar to this: "
+"<code> /home/you/.gnupg/pubring.gpg ---------------------------- pub "
+"1024D/32j38dk2 2001-06-20 you &lt;you example com&gt; sub 1024g/289sklj3 "
+"2011-06-20 [expires: 2012-11-14]</code>"
+msgstr ""
+"Lorsque les clés ont été générées, vous pouvez consulter vos informations de "
+"clé en saisissant <cmd>gpg --list-keys</cmd>. Vous devriez voir apparaître "
+"quelque chose comme ceci : <code> /home/vous/.gnupg/pubring.gpg "
+"---------------------------- pub 1024D/32j38dk2 2001-06-20 vous &lt;"
+"vous exemple com&gt; sub 1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</"
+"code>"
+
+#: C/mail-encryption-gpg-create-key.page:43(page/p)
+msgid ""
+"GPG creates one list, or keyring, for your public keys and one for your "
+"private keys. All the public keys you know are stored in the file <file>~/."
+"gnupg/pubring.gpg</file>. If you want to give other people your key, send "
+"them that file."
+msgstr ""
+"GPG crée une liste (ou trousseau de clés) pour vos clés publiques et une "
+"autre pour vos clés privées. Toutes les clés publiques que vous connaissez "
+"sont stockées dans le fichier <file>~/.gnupg/pubring.gpg</file>. Si vous "
+"voulez donnez vos clés à d'autres personnes, envoyez-leur ce fichier."
+
+#: C/mail-encryption-gpg-create-key.page:44(page/p)
+msgid "If you want, you can upload your keys to a key server:"
+msgstr ""
+"Si vous le souhaitez, vous pouvez placer vos clés sur un serveur de clés :"
+
+#: C/mail-encryption-gpg-create-key.page:46(item/p)
+msgid ""
+"Check your public key ID with <code>gpg --list-keys</code>. It is the string "
+"after <code>1024D</code> on the line beginning with <code>pub</code>. In the "
+"example above, it is <code>32j38dk2</code>."
+msgstr ""
+"Vérifiez votre identifiant de clé publique avec <code>gpg --list-keys</"
+"code>. C'est la chaîne de caractères après <code>1024D</code> dans la ligne "
+"qui commence par <code>pub</code>. Dans l'exemple ci-dessus, c'est "
+"<code>32j38dk2</code>."
+
+#: C/mail-encryption-gpg-create-key.page:47(item/p)
+msgid ""
+"Enter the command <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net 32j38dk2</"
+"cmd>. Substitute your key ID for <code>32j38dk2</code>. You need your "
+"password to do this."
+msgstr ""
+"Saisissez la commande <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net "
+"32j38dk2</cmd>. Remplacez <code>32j38dk2</code> par votre identifiant de "
+"clé. Vous avez besoin de votre mot de passe pour effectuer cela."
+
+#: C/mail-encryption-gpg-create-key.page:50(page/p)
+msgid ""
+"Key servers store your public keys for you so that your friends can decrypt "
+"your messages. If you choose not to use a key server, you can manually send "
+"your public key, include it in your signature file, or put it on your own "
+"Web page. However, it is easier to publish a key once, and then let people "
+"download it from a central place when they want."
 msgstr ""
-"Avant de pouvoir recevoir ou envoyer un message crypté GPG, vous devez <link "
-"xref=\"help:seahorse/pgp-create\" href=\"https://help.gnome.org/users/";
-"seahorse/stable/pgp-create\">générer vos clés publique et privée avec GPG.</"
-"link>. Après cela, et après <link xref=\"mail-encryption-gpg-set-up"
-"\">configuration d'Evolution pour utiliser la clé</link>, vous devez <link "
-"xref=\"help:seahorse/pgp-publish\" href=\"https://help.gnome.org/users/";
-"seahorse/stable/pgp-publish\">partager votre clé publique avec vos amis afin "
-"qu'ils puissent décrypter les messages que vous leur envoyez</link>."
-
-#. (itstool) path: info/desc
-#: C/mail-encryption-gpg-decrypting.page:5
+"Les serveurs de clés stockent vos clés publiques pour vous afin que vos "
+"connaissances puissent déchiffrer vos messages. Si vous préférez ne pas "
+"utiliser de serveur de clés, vous pouvez envoyer manuellement votre clé "
+"publique en l'incluant dans votre fichier de signature ou en la plaçant sur "
+"votre propre page Web. Cependant, il est plus simple de publier une clé une "
+"fois pour toutes, ce qui permet aux autres de la télécharger d'un endroit "
+"centralisé lorsqu'ils en ont besoin."
+
+#: C/mail-encryption-gpg-create-key.page:51(page/p)
+msgid ""
+"If you don't have a key to unlock or encrypt a message, you can set your "
+"encryption tool to look it up automatically. If it cannot find the key, an "
+"error message appears."
+msgstr ""
+"Si vous ne possédez pas la clé pour déverrouiller ou chiffrer un message, "
+"vous pouvez configurer votre outil de déchiffrement afin qu'il la recherche "
+"automatiquement. S'il ne peut trouver la clé, un message d'erreur apparaîtra."
+
+#: C/mail-encryption-gpg-decrypting.page:5(info/desc)
 msgid "Decrypting and checking the signature of received GPG messages."
 msgstr "Déchiffrer et vérifier la signature de messages GPG reçus."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-gpg-decrypting.page:23
+#: C/mail-encryption-gpg-decrypting.page:23(page/title)
 msgid "Receiving messages encrypted or signed via GPG"
 msgstr "Réception de messages chiffrés ou signés via GPG"
 
-#. (itstool) path: section/title
-#: C/mail-encryption-gpg-decrypting.page:26
+#: C/mail-encryption-gpg-decrypting.page:26(section/title)
 msgid "Decrypting a received message"
 msgstr "Déchiffrement d'un message reçu"
 
-#. (itstool) path: section/p
-#: C/mail-encryption-gpg-decrypting.page:27
+#: C/mail-encryption-gpg-decrypting.page:27(section/p)
 msgid ""
 "If you receive an encrypted message, you need to decrypt it before you can "
 "read it."
@@ -8485,8 +7958,7 @@ msgstr ""
 "Si vous recevez un message chiffré, vous devez le déchiffrer avant de "
 "pouvoir le lire."
 
-#. (itstool) path: section/p
-#: C/mail-encryption-gpg-decrypting.page:28
+#: C/mail-encryption-gpg-decrypting.page:28(section/p)
 msgid ""
 "When you view the message, Evolution prompts you for your PGP password. "
 "Enter it, and the unencrypted message is displayed."
@@ -8494,8 +7966,7 @@ msgstr ""
 "Lorsque vous affichez le message, Evolution vous demande votre mot de passe "
 "PGP. Saisissez-le et le message déchiffré apparaîtra."
 
-#. (itstool) path: note/p
-#: C/mail-encryption-gpg-decrypting.page:29
+#: C/mail-encryption-gpg-decrypting.page:29(note/p)
 msgid ""
 "Senders must have your GPG public key before they can send you an encrypted "
 "message."
@@ -8503,13 +7974,11 @@ msgstr ""
 "Les expéditeurs doivent disposer de votre clé publique GPG avant de pouvoir "
 "vous envoyer un message chiffré."
 
-#. (itstool) path: section/title
-#: C/mail-encryption-gpg-decrypting.page:33
+#: C/mail-encryption-gpg-decrypting.page:33(section/title)
 msgid "Checking the signature of a received message"
 msgstr "Vérification de la signature d'un message reçu"
 
-#. (itstool) path: section/p
-#: C/mail-encryption-gpg-decrypting.page:34
+#: C/mail-encryption-gpg-decrypting.page:34(section/p)
 msgid ""
 "To check the sender's signature of a received message, scroll down to the "
 "bottom of the message and click the logo. Evolution will display "
@@ -8519,33 +7988,48 @@ msgstr ""
 "du message et cliquez sur le logo. Evolution affiche alors les "
 "<gui>Informations de sécurité</gui> du message."
 
-#. (itstool) path: info/desc
-#: C/mail-encryption-gpg-getting-keys.page:5
+#: C/mail-encryption-gpg-getting-keys.page:5(info/desc)
 msgid "Getting and Using GPG Public Keys."
 msgstr "Obtenir et utiliser des clés publiques GPG."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-gpg-getting-keys.page:23
+#: C/mail-encryption-gpg-getting-keys.page:23(page/title)
 msgid "Getting and using GPG public keys"
 msgstr "Obtention et utilisation de clés publiques GPG"
 
-#. (itstool) path: page/p
-#: C/mail-encryption-gpg-getting-keys.page:25
+#: C/mail-encryption-gpg-getting-keys.page:26(page/p)
 msgid ""
 "To send an encrypted message, you need to use the recipient's public key in "
 "combination with your private key. Evolution handles the encryption, but you "
-"need to <link xref=\"help:seahorse/pgp-import\" href=\"https://help.gnome.";
-"org/users/seahorse/stable/pgp-import\">get the public key and add it to your "
-"keyring</link>."
+"need to get the public key and add it to your keyring."
 msgstr ""
 "Pour envoyer un message chiffré, vous devez utiliser la clé publique du "
-"destinataire en combinaison avec votre clé privée. <app>Evolution</app> "
-"s'occupe du chiffrement, mais vous devez <link xref=\"help:seahorse/pgp-"
-"import\" href=\"https://help.gnome.org/users/seahorse/stable/pgp-import";
-"\">obtenir la clé publique et l'ajouter à votre trousseau de clés</link>."
+"destinataire en combinaison avec votre clé privée. Evolution s'occupe du "
+"chiffrement, mais vous devez obtenir la clé publique et l'ajouter à votre "
+"trousseau de clés."
 
-#. (itstool) path: info/desc
-#: C/mail-encryption-gpg-set-up.page:5
+#: C/mail-encryption-gpg-getting-keys.page:28(page/p)
+msgid ""
+"To get public keys from a public key server, enter the command <cmd>gpg --"
+"recv-keys --keyserver wwwkeys.pgp.net keyid</cmd>, substituting <code>keyid</"
+"code> by your recipient's ID. You need to enter your password, and the ID is "
+"automatically added to your keyring."
+msgstr ""
+"Pour obtenir des clés publiques d'un serveur de clés, saisissez la commande "
+"<cmd>gpg --recv-keys --keyserver wwwkeys.pgp.net id_clé</cmd>, en remplaçant "
+"<code>id_clé</code> par l'identifiant de votre destinataire. Vous devez "
+"saisir votre mot de passe, puis l'identifiant est automatiquement ajouté à "
+"votre trousseau."
+
+#: C/mail-encryption-gpg-getting-keys.page:30(page/p)
+msgid ""
+"If someone sends you a public key directly, save it as a plain text file and "
+"enter the command <cmd>gpg --import</cmd> to add it to your keyring."
+msgstr ""
+"Si quelqu'un vous envoie directement une clé publique, enregistrez-la dans "
+"un fichier texte et saisissez la commande <cmd>gpg --import</cmd> pour "
+"l'ajouter à votre trousseau."
+
+#: C/mail-encryption-gpg-set-up.page:5(info/desc)
 msgid ""
 "Setting up GPG for your mail account to sign and/or encrypt and decrypt "
 "messages."
@@ -8553,13 +8037,11 @@ msgstr ""
 "Configurer le chiffrement GPG pour votre compte de messagerie pour signer et/"
 "ou chiffrer et déchiffrer les messages."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-gpg-set-up.page:23
+#: C/mail-encryption-gpg-set-up.page:23(page/title)
 msgid "Setting up GPG for your mail account"
 msgstr "Configuration du chiffrement GPG pour votre compte de messagerie"
 
-#. (itstool) path: note/p
-#: C/mail-encryption-gpg-set-up.page:26
+#: C/mail-encryption-gpg-set-up.page:26(note/p)
 msgid ""
 "You need a GPG key to do this. If you do not have one yet, please refer to "
 "<link xref=\"mail-encryption-gpg-create-key\">Creating a GPG key</link>."
@@ -8568,10 +8050,9 @@ msgstr ""
 "encore une, référez-vous à la section <link xref=\"mail-encryption-gpg-"
 "create-key\">Création d'une clé GPG</link>."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-set-up.page:29
-#: C/mail-encryption-gpg-signing-encrypting.page:35
-#: C/mail-encryption-s-mime-signing-encrypting.page:30
+#: C/mail-encryption-gpg-set-up.page:29(item/p)
+#: C/mail-encryption-gpg-signing-encrypting.page:35(item/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:28(item/p)
 msgid ""
 "Select <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
 "gui></guiseq>."
@@ -8579,8 +8060,7 @@ msgstr ""
 "Choisissez <guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Comptes de "
 "messagerie</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-set-up.page:30
+#: C/mail-encryption-gpg-set-up.page:30(item/p)
 msgid ""
 "Select the account you want to use securely, then click <gui style=\"button"
 "\">Edit</gui>."
@@ -8588,22 +8068,19 @@ msgstr ""
 "Sélectionnez le compte que vous voulez utiliser de manière sécurisée, puis "
 "cliquez sur <gui style=\"button\">Modifier</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-set-up.page:31
-#: C/mail-encryption-gpg-signing-encrypting.page:38
-#: C/mail-encryption-s-mime-signing-encrypting.page:33
+#: C/mail-encryption-gpg-set-up.page:31(item/p)
+#: C/mail-encryption-gpg-signing-encrypting.page:38(item/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:31(item/p)
 msgid "Click the <gui>Security</gui> tab."
 msgstr "Cliquez sur l'onglet <gui>Sécurité</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-set-up.page:32
-msgid "Specify your key ID in the <gui>OpenPGP Key ID</gui> field."
+#: C/mail-encryption-gpg-set-up.page:32(item/p)
+msgid "Specify your key ID in the <gui>PGP/GPG Key ID</gui> field."
 msgstr ""
-"Indiquez votre identifiant de clé dans le champ <gui>ID de la clé OpenPGP</"
+"Indiquez votre identifiant de clé dans le champ <gui>ID de la clé PGP/GPG</"
 "gui>."
 
-#. (itstool) path: note/p
-#: C/mail-encryption-gpg-set-up.page:33
+#: C/mail-encryption-gpg-set-up.page:33(note/p)
 msgid ""
 "Below the field you can choose whether to always sign outgoing messages when "
 "using this account, and other options."
@@ -8611,57 +8088,47 @@ msgstr ""
 "En dessous de ce champ, vous pouvez choisir de toujours signer les messages "
 "sortants lors de l'utilisation de ce compte, et d'autres options."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-set-up.page:36
-#: C/mail-encryption-gpg-signing-encrypting.page:41
+#: C/mail-encryption-gpg-set-up.page:36(item/p)
+#: C/mail-encryption-gpg-signing-encrypting.page:41(item/p)
 msgid "Click <gui style=\"button\">Close</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Fermer</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-gpg-set-up.page:38
+#: C/mail-encryption-gpg-set-up.page:38(page/p)
 msgid ""
-"Evolution requires that you know your key ID. If you do not remember it, "
-"start <app>Passwords and Keys</app>, go to <gui>GnuPG Keys</gui>, select the "
-"preferred GPG key, right-click on it, select <gui>Properties</gui> and copy "
-"the <gui>Key ID</gui>. Your key ID is an eight-character string with random "
-"numbers and letters."
+"Evolution requires that you know your key ID. If you do not remember it, you "
+"can find it by typing <cmd>gpg --list-keys</cmd> in the <app>Terminal</app> "
+"application. Your key ID is an eight-character string with random numbers "
+"and letters."
 msgstr ""
 "Evolution exige que vous connaissiez votre identifiant de clé. Si vous ne "
-"vous en souvenez plus, ouvrez <app>Mots de passe et clés</app>, allez à "
-"<gui>Clés GnuPG</gui>, sélectionnez la clé préférée, faites un clic droit "
-"dessus, sélectionnez <gui>Propriétés</gui> et copiez l'<gui>ID de la clé</"
-"gui>. Votre identifiant de clé est une chaîne de huit caractères composée de "
-"nombres et de lettres aléatoires."
-
-#. (itstool) path: info/desc
-#: C/mail-encryption-gpg-signing-encrypting.page:5
+"vous en souvenez plus, vous pouvez le retrouver en tapant <cmd>gpg --list-"
+"keys</cmd> dans l'application <app>Terminal</app>. Votre identifiant de clé "
+"est une chaîne de huit caractères composée de nombres et de lettres "
+"aléatoires."
+
+#: C/mail-encryption-gpg-signing-encrypting.page:5(info/desc)
 msgid "Signing or encrypting messages via GPG that you send."
 msgstr "Signer et chiffrer les messages envoyés via GPG."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-gpg-signing-encrypting.page:23
-#: C/mail-encryption-s-mime-signing-encrypting.page:23
+#: C/mail-encryption-gpg-signing-encrypting.page:23(page/title)
+#: C/mail-encryption-s-mime-signing-encrypting.page:23(page/title)
 msgid "Signing or encrypting messages"
 msgstr "Signature et chiffrement des messages"
 
-#. (itstool) path: page/p
-#: C/mail-encryption-gpg-signing-encrypting.page:30
+#: C/mail-encryption-gpg-signing-encrypting.page:30(page/p)
 msgid ""
 "After you have <link xref=\"mail-encryption-gpg-set-up\">set up your GPG "
-"key</link>, you can sign or encrypt a message by selecting "
+"key</link>, you can sign or encrypt a message by clicking "
 "<guiseq><gui>Options</gui><gui>PGP Sign</gui></guiseq> or <gui>PGP Encrypt</"
-"gui> from the message composer menu or clicking the corresponding toolbar "
-"icon."
+"gui> from the message composer menu."
 msgstr ""
 "Après avoir <link xref=\"mail-encryption-gpg-set-up\">configuré votre clé "
 "GPG</link>, vous pouvez signer ou chiffrer un message en choisissant "
 "<guiseq><gui>Options</gui><gui>Signer avec GPG</gui></guiseq> ou "
-"<gui>Chiffrer avec GPG</gui> dans le menu de l'éditeur de messages ou en "
-"cliquant sur l'icône correspondante dans la barre d'outils."
+"<gui>Chiffrer avec GPG</gui> dans le menu de l'éditeur de messages."
 
-#. (itstool) path: note/p
-#: C/mail-encryption-gpg-signing-encrypting.page:31
-#: C/mail-encryption-s-mime-signing-encrypting.page:26
+#: C/mail-encryption-gpg-signing-encrypting.page:31(note/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:36(note/p)
 msgid ""
 "The Subject line of the message will not be encrypted and should not be used "
 "for sensitive information."
@@ -8669,46 +8136,40 @@ msgstr ""
 "La ligne de sujet du message n'est pas chiffrée et ne doit pas contenir "
 "d'information sensible."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-gpg-signing-encrypting.page:33
-#: C/mail-encryption-s-mime-signing-encrypting.page:28
+#: C/mail-encryption-gpg-signing-encrypting.page:33(page/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:26(page/p)
 msgid "To have every message signed or encrypted:"
 msgstr "Pour que tous les messages soient signés ou chiffrés :"
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-signing-encrypting.page:36
-#: C/mail-encryption-s-mime-signing-encrypting.page:31
+#: C/mail-encryption-gpg-signing-encrypting.page:36(item/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:29(item/p)
 msgid "Select the mail account to encrypt the messages in."
 msgstr ""
 "Sélectionnez le compte de messagerie pour lequel vous souhaitez chiffrer les "
 "messages."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-signing-encrypting.page:37
-#: C/mail-encryption-s-mime-signing-encrypting.page:32 C/mail-filters.page:60
+#: C/mail-encryption-gpg-signing-encrypting.page:37(item/p)
+#: C/mail-encryption-s-mime-signing-encrypting.page:30(item/p)
+#: C/mail-filters.page:60(item/p)
 msgid "Click <gui style=\"button\">Edit</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Édition</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-gpg-signing-encrypting.page:39
+#: C/mail-encryption-gpg-signing-encrypting.page:39(item/p)
 msgid ""
 "Select <gui>Always sign outgoing messages when using this account</gui>."
 msgstr ""
 "Sélectionnez <gui>Toujours signer les messages sortants lors de "
 "l'utilisation de ce compte</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-encryption.page:5
+#: C/mail-encryption.page:5(info/desc)
 msgid "Sending and receiving encrypted mail."
 msgstr "Envoi et réception de courriels chiffrés."
 
-#. (itstool) path: page/title
-#: C/mail-encryption.page:30
+#: C/mail-encryption.page:30(page/title)
 msgid "Mail encryption and certificates"
 msgstr "Certificats et chiffrement de courriel"
 
-#. (itstool) path: page/p
-#: C/mail-encryption.page:32
+#: C/mail-encryption.page:32(page/p)
 msgid ""
 "Evolution offers GPG Encryption and S/MIME Encryption for signing and "
 "encrypting email messages. S/MIME is used most often in corporate "
@@ -8716,30 +8177,25 @@ msgid ""
 msgstr ""
 "Evolution propose le chiffrement GPG et le chiffrement S/MIME pour signer et "
 "chiffrer les messages de courriel. S/MIME est plus souvent utilisé dans les "
-"environnements de sociétés."
+"environnements de société."
 
-#. (itstool) path: section/title
-#: C/mail-encryption.page:35
+#: C/mail-encryption.page:35(section/title)
 msgid "GPG"
 msgstr "GPG"
 
-#. (itstool) path: section/title
-#: C/mail-encryption.page:39
+#: C/mail-encryption.page:39(section/title)
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#. (itstool) path: info/desc
-#: C/mail-encryption-s-mime-manage.page:5
+#: C/mail-encryption-s-mime-manage.page:5(info/desc)
 msgid "Adding, editing, viewing and deleting S/MIME certificates."
 msgstr "Ajouter, modifier, afficher et supprimer des certificats S/MIME."
 
-#. (itstool) path: page/title
-#: C/mail-encryption-s-mime-manage.page:23
+#: C/mail-encryption-s-mime-manage.page:23(page/title)
 msgid "Managing S/MIME certificates"
 msgstr "Gestion des certificats S/MIME"
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-manage.page:25
+#: C/mail-encryption-s-mime-manage.page:25(page/p)
 msgid ""
 "Certificates allow you to communicate with others securely over an encrypted "
 "connection, or sign a message confirming your identity to the contact. These "
@@ -8750,8 +8206,7 @@ msgstr ""
 "pour confirmer votre identité auprès d'un contact. Ces paramètres "
 "s'appliquent uniquement au chiffrement S/MIME."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-manage.page:26
+#: C/mail-encryption-s-mime-manage.page:26(page/p)
 msgid ""
 "You can import, view, edit (except for your own certificates), and delete "
 "your certificates under <guiseq><gui>Edit</gui><gui>Preferences</"
@@ -8761,8 +8216,7 @@ msgstr ""
 "supprimer vos certificats sous <guiseq><gui>Édition</gui><gui>Préférences</"
 "gui><gui>Certificats</gui></guiseq>."
 
-#. (itstool) path: note/p
-#: C/mail-encryption-s-mime-manage.page:28
+#: C/mail-encryption-s-mime-manage.page:28(note/p)
 msgid ""
 "If you get the error \"Peer's certificate issuer has been marked as not "
 "trusted by the user. (-8172) - Cannot add SMIMEEncKeyPrefs attribute\" after "
@@ -8774,8 +8228,7 @@ msgstr ""
 "activez <gui>Faire confiance à ce CA pour identifier les utilisateurs de "
 "courriel</gui> pour ce certificat."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-manage.page:30
+#: C/mail-encryption-s-mime-manage.page:30(page/p)
 msgid ""
 "<gui>Your Certificates</gui> displays a list of certificates that you own. "
 "To add a signing certificate, click <gui style=\"button\">Import</gui>, "
@@ -8787,8 +8240,7 @@ msgstr ""
 "\"button\">Importer</gui>, sélectionnez le fichier à importer puis cliquez "
 "sur <gui style=\"button\">Ouvrir</gui> et saisissez un mot de passe."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-manage.page:31
+#: C/mail-encryption-s-mime-manage.page:31(page/p)
 msgid ""
 "<gui>Contact Certificates</gui> displays a list of certificates that you "
 "have for contacts. These certificates allow you to decrypt messages as well "
@@ -8798,8 +8250,7 @@ msgstr ""
 "vous disposez pour les contacts. Ces certificats vous permettent de "
 "déchiffrer les messages et de vérifier les messages signés."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-manage.page:32
+#: C/mail-encryption-s-mime-manage.page:32(page/p)
 msgid ""
 "<gui>Authorities</gui> displays a list of trusted certificate authorities "
 "that verify that your own certificate is valid."
@@ -8807,28 +8258,23 @@ msgstr ""
 "<gui>Autorités</gui> affiche la liste des autorités de certification "
 "approuvées qui vérifient si votre propre certificat est valide."
 
-#. (itstool) path: info/desc
-#: C/mail-encryption-s-mime-signing-encrypting.page:5
+#: C/mail-encryption-s-mime-signing-encrypting.page:5(info/desc)
 msgid "Signing or encrypting messages via S/MIME that you send."
 msgstr "Signer et chiffrer les messages que vous envoyez via S/MIME."
 
-#. (itstool) path: page/p
-#: C/mail-encryption-s-mime-signing-encrypting.page:25
+#: C/mail-encryption-s-mime-signing-encrypting.page:25(page/p)
 msgid ""
 "After you have <link xref=\"mail-encryption-s-mime-manage\">added your "
-"certificate</link>, you can sign or encrypt a message by selecting "
+"certificate</link>, you can sign or encrypt a message by clicking "
 "<guiseq><gui>Options</gui><gui>S/MIME Sign</gui></guiseq> or <gui>S/MIME "
-"Encrypt</gui> from the message composer menu or clicking the corresponding "
-"toolbar icon."
+"Encrypt</gui> from the message composer menu."
 msgstr ""
 "Après avoir <link xref=\"mail-encryption-s-mime-manage\">ajouté votre "
 "certificat</link>, vous pouvez signer ou chiffrer un message en choisissant "
 "<guiseq><gui>Options</gui><gui>Signer avec S/MIME</gui></guiseq> ou "
-"<gui>Chiffrer avec S/MIME</gui> dans le menu de l'éditeur de messages ou en "
-"cliquant sur l'icône correspondante dans la barre d'outils."
+"<gui>Chiffrer avec S/MIME</gui> dans le menu de l'éditeur de messages."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-s-mime-signing-encrypting.page:34
+#: C/mail-encryption-s-mime-signing-encrypting.page:32(item/p)
 msgid ""
 "In the <gui>Secure MIME (S/MIME)</gui> section, click <gui style=\"button"
 "\">Select</gui> next to <gui>Signing Certificate</gui> and specify the path "
@@ -8842,48 +8288,39 @@ msgstr ""
 "bouton <gui style=\"button\">Sélectionner</gui> à côté du <gui>Certificat de "
 "chiffrement</gui> et spécifiez le chemin de votre certificat de chiffrement."
 
-#. (itstool) path: item/p
-#: C/mail-encryption-s-mime-signing-encrypting.page:35
+#: C/mail-encryption-s-mime-signing-encrypting.page:33(item/p)
 msgid "Select the appropriate options."
 msgstr "Cochez les options adéquates."
 
-#. (itstool) path: info/desc
-#: C/mail-filters-actions.page:5
+#: C/mail-filters-actions.page:5(info/desc)
 msgid "Available actions for setting up filtering."
 msgstr "Actions disponibles pour le paramétrage du filtrage."
 
-#. (itstool) path: page/title
-#: C/mail-filters-actions.page:23
+#: C/mail-filters-actions.page:23(page/title)
 msgid "Available Filter actions"
 msgstr "Actions de filtre disponibles"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:26
+#: C/mail-filters-actions.page:26(item/p)
 msgid "Move to Folder:"
 msgstr "Déplacer vers le dossier :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:27
+#: C/mail-filters-actions.page:27(item/p)
 msgid "Moves the message into a folder you specify."
 msgstr "Déplace le message dans un dossier de votre choix."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:29
+#: C/mail-filters-actions.page:29(item/p)
 msgid "Copy to Folder:"
 msgstr "Copier vers le dossier :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:30
+#: C/mail-filters-actions.page:30(item/p)
 msgid "Puts a copy of the message into a folder you specify."
 msgstr "Place une copie du message dans un dossier de votre choix."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:32
+#: C/mail-filters-actions.page:32(item/p)
 msgid "Delete:"
 msgstr "Supprimer :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:33
+#: C/mail-filters-actions.page:33(item/p)
 msgid ""
 "Marks the message for deletion. The message can be undeleted until you "
 "expunge or empty the trash."
@@ -8891,13 +8328,11 @@ msgstr ""
 "Marque le message pour suppression. Le message peut être récupéré tant que "
 "vous ne nettoyez pas les dossiers ou que vous ne videz pas la corbeille."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:35
+#: C/mail-filters-actions.page:35(item/p)
 msgid "Stop Processing:"
 msgstr "Arrêter le traitement :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:36
+#: C/mail-filters-actions.page:36(item/p)
 msgid ""
 "Select this if you want to all other filters ignore this message. Note that "
 "only filters listed after this particular rule will be ignored."
@@ -8906,53 +8341,43 @@ msgstr ""
 "message. Notez que seuls les filtres apparaissant dans la liste après cette "
 "règle seront ignorés."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:38
+#: C/mail-filters-actions.page:38(item/p)
 msgid "Set Label:"
 msgstr "Mettre l'étiquette :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:39
+#: C/mail-filters-actions.page:39(item/p)
 msgid "Adds a label to a message."
 msgstr "Ajoute une étiquette à un message."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:41
+#: C/mail-filters-actions.page:41(item/p)
 msgid "Assign Color:"
 msgstr "Attribuer la couleur :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:42
+#: C/mail-filters-actions.page:42(item/p)
 msgid "Marks the message with a color of your choice."
 msgstr "Marque le message avec une couleur de votre choix."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:44
+#: C/mail-filters-actions.page:44(item/p)
 msgid "Assign Score:"
 msgstr "Attribuer le score :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:45
+#: C/mail-filters-actions.page:45(item/p)
 msgid "Assigns the message a numeric score."
 msgstr "Attribue un score numérique au message."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:47
+#: C/mail-filters-actions.page:47(item/p)
 msgid "Adjust Score:"
 msgstr "Ajuster le score :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:48
+#: C/mail-filters-actions.page:48(item/p)
 msgid "Changes the numeric score by the amount you set."
 msgstr "Modifie le score numérique selon la quantité indiquée."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:50
+#: C/mail-filters-actions.page:50(item/p)
 msgid "Set Status:"
 msgstr "Définir l'état :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:51
+#: C/mail-filters-actions.page:51(item/p)
 msgid ""
 "Sets the status of the message. The status can be Replied To, Draft, "
 "Important, Read, or Junk."
@@ -8960,13 +8385,11 @@ msgstr ""
 "Définit l'état du message. L'état peut être Répondu à, Supprimé, Brouillon, "
 "Important, Lu ou Pourriel."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:53
+#: C/mail-filters-actions.page:53(item/p)
 msgid "Unset Status:"
 msgstr "Retirer l'état :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:54
+#: C/mail-filters-actions.page:54(item/p)
 msgid ""
 "If the message has a status value, unsets it. If a status value is not set, "
 "it does nothing."
@@ -8974,43 +8397,36 @@ msgstr ""
 "Si le message possède une valeur d'état, celle-ci est supprimée. S'il n'en "
 "avait pas, l'action est neutre."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:56
+#: C/mail-filters-actions.page:56(item/p)
 msgid "Beep:"
 msgstr "Bip :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:57
+#: C/mail-filters-actions.page:57(item/p)
 msgid "Makes the system beep."
 msgstr "Émettre un bip système."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:59
+#: C/mail-filters-actions.page:59(item/p)
 msgid "Play Sound:"
 msgstr "Jouer le son :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:60
+#: C/mail-filters-actions.page:60(item/p)
 msgid "Select a sound file for Evolution to play."
 msgstr "Sélectionne un fichier son joué par Evolution."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:62
+#: C/mail-filters-actions.page:62(item/p)
 msgid "Run Program:"
 msgstr "Lancer le programme :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:63
+#: C/mail-filters-actions.page:63(item/p)
 msgid "Evolution runs an application."
 msgstr "Evolution lance une application."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:65 C/mail-filters-conditions.page:36
+#: C/mail-filters-actions.page:65(item/p)
+#: C/mail-filters-conditions.page:36(item/p)
 msgid "Pipe to Program:"
 msgstr "Transfert vers le programme :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:66
+#: C/mail-filters-actions.page:66(item/p)
 msgid ""
 "Sends the message to an application of your choice. No return value is "
 "expected. This feature can be used to create automatic Web postings from "
@@ -9023,33 +8439,27 @@ msgstr ""
 "effectuer des traitements supplémentaires de message non pris en charge par "
 "Evolution."
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:68
+#: C/mail-filters-actions.page:68(item/p)
 msgid "Forward to:"
 msgstr "Faire suivre à :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-actions.page:69
+#: C/mail-filters-actions.page:69(item/p)
 msgid "Forwards the message to another email address."
 msgstr "Fait suivre le message vers une adresse électronique différente."
 
-#. (itstool) path: info/desc
-#: C/mail-filters-conditions.page:5
+#: C/mail-filters-conditions.page:5(info/desc)
 msgid "Available conditions for setting up filtering."
 msgstr "Conditions disponibles pour le paramétrage du filtrage."
 
-#. (itstool) path: page/title
-#: C/mail-filters-conditions.page:23
+#: C/mail-filters-conditions.page:23(page/title)
 msgid "Available Filter conditions"
 msgstr "Conditions de filtre disponibles"
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:33
+#: C/mail-filters-conditions.page:33(item/p)
 msgid "Source Account:"
 msgstr "Compte source :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:34
+#: C/mail-filters-conditions.page:34(item/p)
 msgid ""
 "Filters messages according the server you got them from. This is most useful "
 "if you use multiple POP mail accounts."
@@ -9057,8 +8467,7 @@ msgstr ""
 "Filtre les messages selon le serveur de provenance. Ce critère est utile si "
 "vous disposez de plusieurs comptes POP."
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:37
+#: C/mail-filters-conditions.page:37(item/p)
 msgid ""
 "Evolution can use an external command to process a message, then process it "
 "based on the return value. Commands used in this way must return an integer. "
@@ -9069,13 +8478,11 @@ msgstr ""
 "cet effet doivent retourner un nombre entier. L'usage le plus courant "
 "consiste à ajouter un filtre de pourriels externe."
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:39
+#: C/mail-filters-conditions.page:39(item/p)
 msgid "Junk Test:"
-msgstr "Test de pourriel :"
+msgstr "Test pourriel :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:40
+#: C/mail-filters-conditions.page:40(item/p)
 msgid ""
 "Filters based on the results of the <link xref=\"mail-spam\">junk mail</"
 "link> test."
@@ -9083,45 +8490,36 @@ msgstr ""
 "Filtre selon les résultats du <link xref=\"mail-spam\">test de pourriel</"
 "link>."
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:42 C/mail-search-folders-conditions.page:36
+#: C/mail-filters-conditions.page:42(item/p)
+#: C/mail-search-folders-conditions.page:36(item/p)
 msgid "Match All:"
 msgstr "Vérifie tout :"
 
-#. (itstool) path: item/p
-#: C/mail-filters-conditions.page:43
+#: C/mail-filters-conditions.page:43(item/p)
 msgid ""
 "Applies an action always to any message, without further conditions. This "
 "could be useful at the end of the list of message filters to cover those "
 "emails that did not match any conditions for the preceding filters in the "
 "list."
 msgstr ""
-"Applique toujours une action à n'importe quel message, sans autre condition. "
-"Cela est utile à la fin de la liste des filtres de messages pour concerner "
-"aussi ces courriels qui ne correspondent à aucun des critères de filtrage "
-"dans la liste des filtres précédents."
 
-#. (itstool) path: info/desc
-#: C/mail-filters-not-working.page:5
+#: C/mail-filters-not-working.page:5(info/desc)
 msgid ""
 "Fix problems with mail filters that do not sort and organize mail as "
 "expected."
 msgstr ""
-"Résoudre les problèmes avec les filtres de courriel qui ne trient pas et "
-"n'organisent pas le courriel comme attendu."
+"Résoudre les problèmes de filtre de courriel qui ne trie pas et n'organise "
+"pas le courriel comme attendu."
 
-#. (itstool) path: page/title
-#: C/mail-filters-not-working.page:25
+#: C/mail-filters-not-working.page:25(page/title)
 msgid "Mail filters are not working"
 msgstr "Les filtres de courriel ne fonctionnent pas"
 
-#. (itstool) path: section/title
-#: C/mail-filters-not-working.page:28
+#: C/mail-filters-not-working.page:28(section/title)
 msgid "Order of Filters"
 msgstr "Ordre des filtres"
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:29
+#: C/mail-filters-not-working.page:29(section/p)
 msgid ""
 "The order of filters is very important. They are applied to the original "
 "message in sequence, like a recipe."
@@ -9129,8 +8527,7 @@ msgstr ""
 "L'ordre des filtres est très important. Ils sont appliqués au message "
 "d'origine dans l'ordre, comme une recette."
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:30
+#: C/mail-filters-not-working.page:30(section/p)
 msgid ""
 "If your first filter has a <gui>Stop Processing</gui> rule, then all "
 "messages that match this filter will ignore all succeeding filters."
@@ -9139,9 +8536,8 @@ msgstr ""
 "alors tous les messages qui correspondent à ce filtre ignoreront tous les "
 "filtres suivants."
 
-#. (itstool) path: section/p
-#. (itstool) path: note/p
-#: C/mail-filters-not-working.page:31 C/mail-filters.page:46
+#: C/mail-filters-not-working.page:31(section/p)
+#: C/mail-filters.page:46(note/p)
 msgid ""
 "When you move a message to another folder, \"moving\" actually means "
 "appending a copy of the message to the destination folder and marking the "
@@ -9157,8 +8553,7 @@ msgstr ""
 "d'un message devrait apparaître en dernier dans une séquence de règles de "
 "filtre."
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:32
+#: C/mail-filters-not-working.page:32(section/p)
 msgid ""
 "To check the rules and their order of an existing filter, review its actions "
 "in the <gui>Then</gui> section by <link xref=\"mail-filters#editing"
@@ -9168,13 +8563,11 @@ msgstr ""
 "ses actions dans la section <gui>Alors</gui> en <link xref=\"mail-"
 "filters#editing\">éditant le filtre</link>."
 
-#. (itstool) path: section/title
-#: C/mail-filters-not-working.page:36
+#: C/mail-filters-not-working.page:36(section/title)
 msgid "Using Several Mail Clients"
 msgstr "Utilisation de plusieurs clients de messagerie"
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:37
+#: C/mail-filters-not-working.page:37(section/p)
 msgid ""
 "Another thing you have to keep in mind is that filters depend on the \"new\" "
 "flag that is set on the server when a particular email message is initially "
@@ -9187,33 +8580,35 @@ msgstr ""
 "utilisez un autre client de messagerie en plus d'Evolution, il se peut que "
 "vos filtres ne fonctionnent pas automatiquement."
 
-#. (itstool) path: section/title
-#: C/mail-filters-not-working.page:41
+#: C/mail-filters-not-working.page:41(section/title)
 msgid "Logging Filter Actions"
 msgstr "Actions de filtres d'identification"
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:42
+#: C/mail-filters-not-working.page:42(section/p)
+#, fuzzy
+#| msgid ""
+#| "<_:title-1/> If it is still unclear why filters do not work as expected, "
+#| "you can enable logging filter actions. <_:list-2/> <_:p-3/> <_:p-4/>"
 msgid ""
 "If it is still unclear why filters do not work as expected, you can enable "
 "logging filter actions."
 msgstr ""
-"Si vous ne savez toujours pas pourquoi les filtres ne fonctionnent pas comme "
-"prévu, vous pouvez activer les actions de journalisation des filtres."
+"<_:title-1/> Si la cause pour laquelle les filtres ne fonctionnent pas comme "
+"prévu reste peu claire, vous pouvez activer les actions du filtre "
+"d'identification. <_:list-2/> <_:p-3/> <_:p-4/>"
 
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:44
+#: C/mail-filters-not-working.page:44(item/p)
 msgid "Close Evolution."
 msgstr "Fermer Evolution."
 
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:45 C/mail-localized-re-subjects.page:24
-#: C/mail-save-as-pdf.page:27 C/mail-sorting-message-list.page:39
+#: C/mail-filters-not-working.page:45(item/p)
+#: C/mail-localized-re-subjects.page:25(item/p)
+#: C/mail-save-as-pdf.page:27(item/p)
+#: C/mail-sorting-message-list.page:39(item/p)
 msgid "Open the <app>Terminal</app> application."
 msgstr "Ouvrez l'application <app>Terminal</app>."
 
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:46
+#: C/mail-filters-not-working.page:46(item/p)
 msgid ""
 "Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-"
 "actions true</cmd>"
@@ -9221,8 +8616,12 @@ msgstr ""
 "Lancez la commande <cmd>gsettings set org.gnome.evolution.mail filters-log-"
 "actions true</cmd>."
 
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:47
+#: C/mail-filters-not-working.page:47(item/p)
+#, fuzzy
+#| msgid ""
+#| "Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-"
+#| "file \"~/my-filter-log\"</cmd>. This will create a text file named "
+#| "<file>my-filter-log</file> in your home directory."
 msgid ""
 "Run the command <cmd>gsettings set org.gnome.evolution.mail filters-log-file "
 "\"/home/myusername/my-filter-log\"</cmd> and replace <cmd>myusername</cmd> "
@@ -9232,20 +8631,14 @@ msgid ""
 "work."
 msgstr ""
 "Exécutez la commande <cmd>gsettings set org.gnome.evolution.mail filters-log-"
-"file \"/home/monnomdutilisateur/mon-filtre-log\"</cmd> et remplacez "
-"<cmd>monnomdutilisateur</cmd> par votre nom d'utilisateur. Ceci créera un "
-"fichier texte nommé <file>mon-filtre-log</file> dans votre répertoire "
-"personnel (/home). Veuillez noter que le chemin absolu vers le nom du "
-"fichier doit être fourni ; une syntaxe du style <sys>~</sys> ou <sys>$HOME</"
-"sys> ne marche pas."
-
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:49
+"file \"~/mon-filtre-log\"</cmd>. Ceci créera un fichier texte nommé "
+"<file>mon-filtre-log</file> dans votre répertoire personnel (/home)."
+
+#: C/mail-filters-not-working.page:49(item/p)
 msgid "Fetch mail to apply filters."
 msgstr "Télécharger un courriel pour appliquer des filtres."
 
-#. (itstool) path: item/p
-#: C/mail-filters-not-working.page:50
+#: C/mail-filters-not-working.page:50(item/p)
 msgid ""
 "Open the file <file>my-filter-log</file> with a text editor to see which "
 "filter actions have been applied."
@@ -9253,8 +8646,7 @@ msgstr ""
 "Ouvrez le fichier <file>mon-filtre-log</file> avec un éditeur de texte pour "
 "voir quelles actions ont été appliquées."
 
-#. (itstool) path: section/p
-#: C/mail-filters-not-working.page:53
+#: C/mail-filters-not-working.page:53(section/p)
 msgid ""
 "Note that you can disable filter logging again by using the command "
 "<cmd>gsettings set org.gnome.evolution.mail filters-log-actions false</cmd>"
@@ -9263,30 +8655,25 @@ msgstr ""
 "nouveau en utilisant la commande <cmd>gsettings set org.gnome.evolution.mail "
 "filters-log-actions false</cmd>."
 
-#. (itstool) path: section/p
-#. (itstool) path: page/p
-#. (itstool) path: note/p
-#: C/mail-filters-not-working.page:55 C/mail-localized-re-subjects.page:27
-#: C/mail-save-as-pdf.page:30
+#: C/mail-filters-not-working.page:55(section/p)
+#: C/mail-localized-re-subjects.page:28(page/p)
+#: C/mail-save-as-pdf.page:30(note/p)
 msgid "You can also use the <app>dconf-editor</app> application to do this."
 msgstr ""
 "Vous pouvez aussi utiliser l'application <gui>dconf-editor</gui> pour faire "
 "cela."
 
-#. (itstool) path: info/desc
-#: C/mail-filters.page:5
+#: C/mail-filters.page:5(info/desc)
 msgid "Use filter rules to sort your mail automatically into folders."
 msgstr ""
 "Utiliser des règles de filtres pour trier vos courriels automatiquement dans "
 "des dossiers."
 
-#. (itstool) path: page/title
-#: C/mail-filters.page:23
+#: C/mail-filters.page:23(page/title)
 msgid "Using Filters"
 msgstr "Utilisation des filtres"
 
-#. (itstool) path: page/p
-#: C/mail-filters.page:25
+#: C/mail-filters.page:25(page/p)
 msgid ""
 "Message filters apply actions on messages based on conditions that you have "
 "defined. You can define filters for both incoming and outgoing emails."
@@ -9295,8 +8682,7 @@ msgstr ""
 "des conditions que vous avez définies. Vous pouvez définir des filtres pour "
 "les courriels entrants et sortants."
 
-#. (itstool) path: page/p
-#: C/mail-filters.page:27
+#: C/mail-filters.page:27(page/p)
 msgid ""
 "Filters will be automatically applied to incoming messages for local "
 "accounts (such as POP). Mail servers for remote accounts (such as IMAP) "
@@ -9317,8 +8703,7 @@ msgstr ""
 "gui><gui>Options</gui><gui>Appliquer les filtres aux nouveaux messages dans "
 "la boîte de réception sur ce serveur</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-filters.page:29
+#: C/mail-filters.page:29(page/p)
 msgid ""
 "To manually apply filters on messages in a folder, select the messages and "
 "click <guiseq><gui>Message</gui><gui>Apply Filters</gui></guiseq> or press "
@@ -9329,13 +8714,11 @@ msgstr ""
 "gui><gui>Appliquer les filtres</gui></guiseq> ou pressez <keyseq><key>Ctrl</"
 "key><key>Y</key></keyseq>."
 
-#. (itstool) path: section/title
-#: C/mail-filters.page:33
+#: C/mail-filters.page:33(section/title)
 msgid "Creating a Filter"
 msgstr "Création d'un filtre"
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:36
+#: C/mail-filters.page:36(item/p)
 msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>, or click "
 "<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
@@ -9343,20 +8726,17 @@ msgid ""
 msgstr ""
 "Cliquez sur <guiseq><gui>Édition</gui><gui>Filtres de message</gui></guiseq> "
 "ou cliquez sur <guiseq><gui>Message</gui><gui>Créer une règle</gui></guiseq> "
-"et sélectionnez le critère sur lequel se basera le filtre."
+"et sélectionnez le critère sur lequel se base le filtre."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:37 C/mail-search-folders-add.page:27
+#: C/mail-filters.page:37(item/p) C/mail-search-folders-add.page:27(item/p)
 msgid "Click <gui style=\"button\">Add</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Ajouter</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:38 C/mail-search-folders-add.page:28
+#: C/mail-filters.page:38(item/p) C/mail-search-folders-add.page:28(item/p)
 msgid "Enter a name in the <gui>Rule name</gui> field."
 msgstr "Saisissez un nom dans le champ <gui>Nom de la règle</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:39 C/mail-search-folders-add.page:29
+#: C/mail-filters.page:39(item/p) C/mail-search-folders-add.page:29(item/p)
 msgid ""
 "Define the conditions for the rule. For each condition, you first select "
 "which part of the message will be checked and then define the comparison."
@@ -9365,8 +8745,7 @@ msgstr ""
 "d'abord la partie du message qui sera contrôlée puis définissez la règle de "
 "comparaison."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:39
+#: C/mail-filters.page:39(item/p)
 msgid ""
 "For more information on the available conditions see <link xref=\"mail-"
 "filters-conditions\">Available Filter conditions</link>."
@@ -9374,25 +8753,22 @@ msgstr ""
 "Pour plus d'informations sur les conditions disponibles, consultez <link "
 "xref=\"mail-filters-actions\">Conditions de filtre disponibles</link>."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:40 C/mail-search-folders-add.page:30
+#: C/mail-filters.page:40(item/p) C/mail-search-folders-add.page:30(item/p)
 msgid ""
 "If you want to define multiple conditions, define under <gui>Find items</"
 "gui> if any or if all conditions have to apply, and click <gui style=\"button"
 "\">Add Condition</gui> and repeat the previous step."
 msgstr ""
 "Si vous voulez définir plusieurs conditions, définissez sous <gui>Trouver "
-"les éléments</gui> si une seule condition ou toutes doivent être remplies et "
+"les éléments</gui> si toutes ou une seule condition doit être remplie et "
 "cliquez sur <gui style=\"button\">Ajouter une condition</gui> et répétez les "
 "étapes précédentes."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:42
+#: C/mail-filters.page:42(item/p)
 msgid "Select the Actions for the Filter in the <gui>Then</gui> section."
 msgstr "Sélectionnez les actions du filtre dans la section <gui>Alors</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:42
+#: C/mail-filters.page:42(item/p)
 msgid ""
 "For more information on the available actions see <link xref=\"mail-filters-"
 "actions\">Available Filter actions</link>."
@@ -9400,8 +8776,7 @@ msgstr ""
 "Pour plus d'informations sur les actions disponibles, consultez <link xref="
 "\"mail-filters-actions\">Actions de filtre disponibles</link>."
 
-#. (itstool) path: note/p
-#: C/mail-filters.page:44
+#: C/mail-filters.page:44(note/p)
 msgid ""
 "The order of filters is important. Filters are applied to the original "
 "message in sequence, like a recipe."
@@ -9409,8 +8784,7 @@ msgstr ""
 "L'ordre des filtres est important. Ils sont appliqués au message d'origine "
 "dans l'ordre, comme une recette."
 
-#. (itstool) path: note/p
-#: C/mail-filters.page:45
+#: C/mail-filters.page:45(note/p)
 msgid ""
 "If your first filter has a <gui>Stop Processing</gui> rule, then all the "
 "email messages that match this filter will ignore all the succeeding filters."
@@ -9419,8 +8793,7 @@ msgstr ""
 "alors tous les messages qui correspondent à ce filtre ignoreront tous les "
 "filtres suivants."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:49
+#: C/mail-filters.page:49(item/p)
 msgid ""
 "If you want to define multiple actions, click <gui style=\"button\">Add "
 "Action</gui> and repeat the previous step. For example, if you want no other "
@@ -9432,24 +8805,20 @@ msgstr ""
 "vous voulez qu'aucun autre filtre existant ne s'applique, choisissez "
 "<gui>Arrêter le traitement</gui> comme deuxième action dans la liste."
 
-#. (itstool) path: section/title
-#: C/mail-filters.page:56
+#: C/mail-filters.page:56(section/title)
 msgid "Editing Filters"
 msgstr "Édition des filtres"
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:58 C/mail-filters.page:68
+#: C/mail-filters.page:58(item/p) C/mail-filters.page:68(item/p)
 msgid "Click <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Édition</gui><gui>Filtres de message</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:59 C/mail-filters.page:69
+#: C/mail-filters.page:59(item/p) C/mail-filters.page:69(item/p)
 msgid "Select the filter."
 msgstr "Sélectionnez le filtre."
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:61
+#: C/mail-filters.page:61(item/p)
 msgid ""
 "Make the desired corrections, then click <gui style=\"button\">OK</gui> "
 "twice."
@@ -9457,28 +8826,23 @@ msgstr ""
 "Effectuez les corrections souhaitées, puis cliquez deux fois sur <gui style="
 "\"button\">Valider</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-filters.page:66
+#: C/mail-filters.page:66(section/title)
 msgid "Deleting Filters"
 msgstr "Suppression de filtres"
 
-#. (itstool) path: item/p
-#: C/mail-filters.page:70
+#: C/mail-filters.page:70(item/p)
 msgid "Click <gui style=\"button\">Remove</gui>."
 msgstr "Cliquez sur <gui style=\"button\">Enlever</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-folders.page:5
+#: C/mail-folders.page:5(info/desc)
 msgid "Use folders to organize your mail."
 msgstr "Utiliser des dossiers pour organiser vos courriels."
 
-#. (itstool) path: page/title
-#: C/mail-folders.page:28
+#: C/mail-folders.page:28(page/title)
 msgid "Using Folders"
 msgstr "Utilisation des dossiers"
 
-#. (itstool) path: page/p
-#: C/mail-folders.page:30
+#: C/mail-folders.page:30(page/p)
 msgid ""
 "Evolution, like most mail systems, uses folders to store email messages. You "
 "start out with a few mail folders such as the Inbox, Outbox, and Drafts. You "
@@ -9489,18 +8853,15 @@ msgstr ""
 "tels que Boîte de réception, Boîte d'envoi et Brouillons, mais vous pouvez "
 "en créer autant que vous le souhaitez."
 
-#. (itstool) path: section/title
-#: C/mail-folders.page:33
+#: C/mail-folders.page:33(section/title)
 msgid "Creating A Folder"
 msgstr "Création d'un dossier"
 
-#. (itstool) path: section/p
-#: C/mail-folders.page:34
+#: C/mail-folders.page:34(section/p)
 msgid "To create a folder:"
 msgstr "Pour créer un dossier :"
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:36
+#: C/mail-folders.page:36(item/p)
 msgid ""
 "Click on <gui>Folder</gui> and select <gui>New</gui>. You can also right-"
 "click anywhere on the folder list and select the <gui>New Folder</gui> "
@@ -9510,18 +8871,15 @@ msgstr ""
 "pouvez aussi faire un clic-droit sur la liste des dossiers et en "
 "sélectionner l'option <gui>Nouveau dossier</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:37
+#: C/mail-folders.page:37(item/p)
 msgid "Specify the name and the location of the folder."
 msgstr "Spécifiez le nom et l'emplacement du dossier."
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:38
+#: C/mail-folders.page:38(item/p)
 msgid "Click on the <gui>Create</gui> button."
 msgstr "Cliquez sur le bouton <gui>Créer</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-folders.page:40
+#: C/mail-folders.page:40(section/p)
 msgid ""
 "The new folder will be shown in the folder view. You can then move messages "
 "into the folder."
@@ -9529,8 +8887,7 @@ msgstr ""
 "Le nouveau dossier s'affiche dans la vue des dossiers. Vous pouvez alors "
 "déplacer des messages dans ce dossier."
 
-#. (itstool) path: note/p
-#: C/mail-folders.page:43
+#: C/mail-folders.page:43(note/p)
 msgid ""
 "The Inbox folders on most IMAP servers cannot contain both messages and "
 "subfolders. When creating additional folders on your IMAP mail server, "
@@ -9547,34 +8904,29 @@ msgstr ""
 "trouvent dans la boîte de réception. Si cela arrive, déplacez les dossiers "
 "vers le compte IMAP."
 
-#. (itstool) path: section/title
-#: C/mail-folders.page:49
+#: C/mail-folders.page:49(section/title)
 msgid "Moving Messages to New Folders"
 msgstr "Déplacement de messages vers les nouveaux dossiers"
 
-#. (itstool) path: section/p
-#: C/mail-folders.page:50
+#: C/mail-folders.page:50(section/p)
 msgid ""
 "You can move messages into folders by using one of the following methods:"
 msgstr ""
 "Vous pouvez déplacer les messages dans les dossiers à l'aide des méthodes "
 "suivantes :"
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:52
+#: C/mail-folders.page:52(item/p)
 msgid "Drag and drop the messages into the folder."
 msgstr "Glissez-déposez les messages dans le dossier."
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:53
+#: C/mail-folders.page:53(item/p)
 msgid ""
 "Right-click on the message and select the <gui>Move to Folder</gui> option."
 msgstr ""
 "Faites un clic-droit sur le message et sélectionnez l'option <gui>Déplacer "
 "vers le dossier</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:54
+#: C/mail-folders.page:54(item/p)
 msgid ""
 "Select a message and press <keyseq><key>Shift</key><key>Ctrl</key><key>V</"
 "key></keyseq>."
@@ -9582,8 +8934,7 @@ msgstr ""
 "Sélectionnez un message et appuyez sur<keyseq><key>Maj</key><key>Ctrl</"
 "key><key>V</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/mail-folders.page:55
+#: C/mail-folders.page:55(item/p)
 msgid ""
 "Select a message and click on <guiseq><gui>Message</gui><gui>Move to Folder</"
 "gui></guiseq>."
@@ -9591,13 +8942,11 @@ msgstr ""
 "Sélectionnez un message et cliquez sur <guiseq><gui>Message</"
 "gui><gui>Déplacer vers le dossier</gui></guiseq>."
 
-#. (itstool) path: section/p
-#: C/mail-folders.page:58
+#: C/mail-folders.page:58(section/p)
 msgid "The steps for copying are similar."
 msgstr "Les étapes pour la copie sont les mêmes."
 
-#. (itstool) path: note/p
-#: C/mail-folders.page:60
+#: C/mail-folders.page:60(note/p)
 msgid ""
 "Moving files can be done automatically by setting up <link xref=\"mail-"
 "filters\">filters</link>."
@@ -9605,18 +8954,15 @@ msgstr ""
 "Le déplacement de fichiers peut être automatisé en configurant des <link "
 "xref=\"mail-filters\">filtres</link>."
 
-#. (itstool) path: info/desc
-#: C/mail-follow-up-flag.page:5
+#: C/mail-follow-up-flag.page:5(info/desc)
 msgid "Using flags to remind you of actions."
 msgstr "Utiliser des marqueurs pour se souvenir des choses à faire."
 
-#. (itstool) path: page/title
-#: C/mail-follow-up-flag.page:23
+#: C/mail-follow-up-flag.page:23(page/title)
 msgid "Follow up flags for emails"
 msgstr "Étiquette « Donner suite » pour les courriels"
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:25
+#: C/mail-follow-up-flag.page:25(page/p)
 msgid ""
 "To make sure you do not forget about a message, you can use the follow-up "
 "feature."
@@ -9624,51 +8970,44 @@ msgstr ""
 "Pour être certain de ne pas oublier de traiter un message, vous pouvez "
 "utiliser la fonctionnalité de suivi."
 
-#. (itstool) path: item/p
-#: C/mail-follow-up-flag.page:27
+#: C/mail-follow-up-flag.page:27(item/p)
 msgid "Select one or more messages."
 msgstr "Sélectionnez un ou plusieurs messages."
 
-#. (itstool) path: item/p
-#: C/mail-follow-up-flag.page:28
+#: C/mail-follow-up-flag.page:28(item/p)
 msgid "Right-click one of the messages."
 msgstr "Faites un clic-droit sur l'un des messages."
 
-#. (itstool) path: item/p
-#: C/mail-follow-up-flag.page:29
-msgid "Click <gui>Mark for Follow Up…</gui>."
-msgstr "Choisissez <gui>Marquer pour donner suite…</gui>."
+#: C/mail-follow-up-flag.page:29(item/p)
+msgid "Click <gui>Mark for Follow Up...</gui>."
+msgstr "Choisissez <gui>Marquer pour donner suite...</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:31
+#: C/mail-follow-up-flag.page:31(page/p)
 msgid ""
 "You can also do this by selecting the message(s) and clicking "
-"<guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up…</gui></guiseq> "
+"<guiseq><gui>Message</gui><gui>Mark as</gui><gui>Follow Up...</gui></guiseq> "
 "or by pressing <keyseq><key>Shift</key><key>Ctrl</key><key>G</key></keyseq>."
 msgstr ""
 "Vous pouvez également faire cela en sélectionnant les messages et en "
-"cliquant sur <guiseq><gui>Message</gui><gui>Marquer comme </gui><gui>Donner "
-"suite…</gui></guiseq> ou en pressant <keyseq><key>Maj</key><key>Ctrl</"
+"cliquant sur <guiseq><gui>Message</gui><gui>Marquer comme</gui><gui>Donner "
+"suite</gui></guiseq> ou en pressant <keyseq><key>Maj</key><key>Ctrl</"
 "key><key>G</key></keyseq>."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:33
+#: C/mail-follow-up-flag.page:33(page/p)
 msgid "A window opens to allow you to set the type of flag and the due date."
 msgstr ""
 "Une fenêtre s'ouvre, vous permettant de saisir le type de marqueur, ainsi "
 "que la date d'échéance."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:35
+#: C/mail-follow-up-flag.page:35(page/p)
 msgid ""
 "The flag itself is the action you want to remind yourself about, such as "
 "Call, Forward and Reply."
 msgstr ""
-"Le marqueur lui-même est l'action dont vous souhaitez vous souvenir, tel que "
+"Le marqueur lui-même est l'action dont vous souhaitez vous rappeler, tel que "
 "Appel, Faire suivre ou Répondre."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:37
+#: C/mail-follow-up-flag.page:37(page/p)
 msgid ""
 "After you have added a flag, you can mark it as complete or remove it "
 "entirely by right-clicking the message and clicking either <gui>Flag "
@@ -9678,8 +9017,7 @@ msgstr ""
 "entièrement en faisant un clic-droit sur le message et en choisissant "
 "<gui>Marqué comme achevé</gui> ou <gui>Effacer le marqueur</gui>."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:39
+#: C/mail-follow-up-flag.page:39(page/p)
 msgid ""
 "When you read a flagged message, its flag status is displayed at the top, "
 "before the message headers. An overdue message might tell you \"Overdue: "
@@ -9690,8 +9028,7 @@ msgstr ""
 "est signalé avec un message du style « Retard : Appel le 7 avril 2003, "
 "17:00 »."
 
-#. (itstool) path: page/p
-#: C/mail-follow-up-flag.page:41
+#: C/mail-follow-up-flag.page:41(page/p)
 msgid ""
 "Flags can help you organize your work in a number of ways. For example, you "
 "might <link xref=\"mail-change-columns-in-message-list\">add a Flag Status "
@@ -9709,32 +9046,28 @@ msgstr ""
 "correspondantes sont achevées, votre dossier de recherche ne contiendra plus "
 "que les messages qui possèdent encore une échéance."
 
-#. (itstool) path: note/p
-#: C/mail-follow-up-flag.page:43
+#: C/mail-follow-up-flag.page:43(note/p)
 msgid ""
 "If you prefer a simpler way to remind yourself about messages, you can mark "
 "them as important by right-clicking the message, then click <gui>Mark as "
 "Important</gui>, or by selecting <guiseq><gui>Message</gui><gui>Mark as</"
 "gui><gui>Important</gui></guiseq> from the menubar."
 msgstr ""
-"Si vous préférez utiliser une méthode plus simple de vous souvenir de "
+"Si vous préférez utiliser une méthode plus simple de vous rappeler de "
 "certains messages, vous pouvez les marquer comme importants en faisant un "
 "clic-droit sur le message, puis en choisissant <gui>Marquer comme important</"
 "gui> ou en choisissant le menu <guiseq><gui>Message</gui><gui>Marquer comme</"
 "gui><gui>Important</gui></guiseq> dans la barre de menus."
 
-#. (itstool) path: info/desc
-#: C/mail-imap-subscriptions.page:5
+#: C/mail-imap-subscriptions.page:5(info/desc)
 msgid "IMAP folder subscriptions."
 msgstr "Abonnements à des dossiers IMAP."
 
-#. (itstool) path: page/title
-#: C/mail-imap-subscriptions.page:25
+#: C/mail-imap-subscriptions.page:25(page/title)
 msgid "IMAP Subscriptions"
 msgstr "Abonnements IMAP"
 
-#. (itstool) path: page/p
-#: C/mail-imap-subscriptions.page:27
+#: C/mail-imap-subscriptions.page:27(page/p)
 msgid ""
 "As opening many IMAP folders on the server takes time you can define which "
 "IMAP folders to check and display in Evolution, and which ones to ignore for "
@@ -9745,8 +9078,7 @@ msgstr ""
 "dans Evolution et ceux qu'il faut ignorer, via le <gui>gestionnaire "
 "d'abonnements IMAP</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:29
+#: C/mail-imap-subscriptions.page:29(item/p)
 msgid ""
 "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-"
 "click on the top level node of an email account in the folder list and click "
@@ -9756,8 +9088,8 @@ msgstr ""
 "faites un clic-droit sur le nœud supérieur d'un compte de messagerie dans la "
 "liste des dossiers et cliquez sur <gui>Gérer les abonnements</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:30 C/mail-usenet-subscriptions.page:30
+#: C/mail-imap-subscriptions.page:30(item/p)
+#: C/mail-usenet-subscriptions.page:30(item/p)
 msgid ""
 "If you have accounts on multiple servers, select the server where you want "
 "to manage your subscriptions."
@@ -9765,21 +9097,18 @@ msgstr ""
 "Si vous possédez des comptes sur plusieurs serveurs, sélectionnez le serveur "
 "dont vous voulez gérer les abonnements."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:31
+#: C/mail-imap-subscriptions.page:31(item/p)
 msgid ""
 "Evolution displays a list of files and folders available on the IMAP server."
 msgstr ""
 "Evolution affiche une liste des fichiers et dossiers disponibles sur le "
 "serveur IMAP."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:32
+#: C/mail-imap-subscriptions.page:32(item/p)
 msgid "Select a file or folder by clicking it."
 msgstr "Sélectionnez un fichier ou un dossier en cliquant dessus."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:33
+#: C/mail-imap-subscriptions.page:33(item/p)
 msgid ""
 "You should select at least the Inbox folder. Depending upon the way your "
 "IMAP server is configured, the list of available files might include non-"
@@ -9790,27 +9119,23 @@ msgstr ""
 "contenir des dossiers sans messages. Si c'est le cas, vous pouvez les "
 "ignorer."
 
-#. (itstool) path: item/p
-#: C/mail-imap-subscriptions.page:34
+#: C/mail-imap-subscriptions.page:34(item/p)
 msgid "Click a folder's checkbox to add a folder to your subscriptions."
 msgstr ""
 "Cochez la case d'un dossier pour ajouter un dossier à la liste des "
 "abonnements."
 
-#. (itstool) path: info/desc
-#: C/mail-labels.page:5
+#: C/mail-labels.page:5(info/desc)
 msgid "Use labels to categorize your mail while keeping it in their folders."
 msgstr ""
 "Utiliser des étiquettes pour classer vos courriels tout en les conservant "
 "dans leur dossier."
 
-#. (itstool) path: page/title
-#: C/mail-labels.page:21
+#: C/mail-labels.page:21(page/title)
 msgid "Using Labels"
 msgstr "Utilisation des étiquettes"
 
-#. (itstool) path: page/p
-#: C/mail-labels.page:23
+#: C/mail-labels.page:23(page/p)
 msgid ""
 "You can add colored labels to emails in order to categorize them. This is "
 "similar to <link xref=\"using-categories\">Categories</link> in the other "
@@ -9820,8 +9145,7 @@ msgstr ""
 "classer. C'est un concept similaire à celui des <link xref=\"using-categories"
 "\">catégories</link> dans les autres fenêtres d'Evolution."
 
-#. (itstool) path: page/p
-#: C/mail-labels.page:25
+#: C/mail-labels.page:25(page/p)
 msgid ""
 "You can search for messages with specific labels by using the <link xref="
 "\"mail-searching\">quick search dropdown</link>. Also, <link xref=\"mail-"
@@ -9832,13 +9156,11 @@ msgstr ""
 "rapide</link>. Des <link xref=\"mail-search-folders\">dossiers de recherche</"
 "link> peuvent également être créés en se basant sur les étiquettes."
 
-#. (itstool) path: section/title
-#: C/mail-labels.page:29
+#: C/mail-labels.page:29(section/title)
 msgid "Adding a label to a message"
 msgstr "Ajout d'une étiquette à un message"
 
-#. (itstool) path: section/p
-#: C/mail-labels.page:30
+#: C/mail-labels.page:30(section/p)
 msgid ""
 "To assign a label to a message, right-click the message, click <gui>Label</"
 "gui>, and choose the label to apply."
@@ -9847,20 +9169,17 @@ msgstr ""
 "message, cliquez sur <gui>Étiquette</gui> et choisissez l'étiquette à "
 "appliquer."
 
-#. (itstool) path: section/p
-#: C/mail-labels.page:31
+#: C/mail-labels.page:31(section/p)
 msgid "You can also quickly add a new label by choosing <gui>New Label</gui>."
 msgstr ""
 "Vous pouvez également attribuer rapidement une nouvelle étiquette en "
 "choisissant <gui>Nouvelle étiquette</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-labels.page:35
+#: C/mail-labels.page:35(section/title)
 msgid "Managing labels"
 msgstr "Gestion des étiquettes"
 
-#. (itstool) path: section/p
-#: C/mail-labels.page:36
+#: C/mail-labels.page:36(section/p)
 msgid ""
 "You can add, edit and delete all labels under <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Labels</gui></"
@@ -9871,8 +9190,7 @@ msgstr ""
 "courriel</gui><gui>Étiquettes</gui></guiseq>. Notez que vous ne pouvez pas "
 "supprimer les étiquettes par défaut."
 
-#. (itstool) path: info/desc
-#: C/mail-layout-changing.page:5
+#: C/mail-layout-changing.page:5(info/desc)
 msgid ""
 "Changing the display of the mail window (message list columns and "
 "widescreen)."
@@ -9880,23 +9198,19 @@ msgstr ""
 "Modifier l'apparence de la fenêtre des messages (colonnes de la liste des "
 "messages et écran large)."
 
-#. (itstool) path: page/title
-#: C/mail-layout-changing.page:20
+#: C/mail-layout-changing.page:20(page/title)
 msgid "Changing the mail window layout"
 msgstr "Modification de l'apparence de la fenêtre des messages"
 
-#. (itstool) path: info/desc
-#: C/mail-localized-re-subjects.page:5
+#: C/mail-localized-re-subjects.page:5(info/desc)
 msgid "Avoid long subject lines due to translated \"Re:\" prefixes."
 msgstr "Éviter les longues lignes sujet dues aux préfixes « Re :  » traduits."
 
-#. (itstool) path: page/title
-#: C/mail-localized-re-subjects.page:19
+#: C/mail-localized-re-subjects.page:20(page/title)
 msgid "Handling localized \"Re:\" in subjects"
 msgstr "Gestion des « Re :  » traduits dans les sujets"
 
-#. (itstool) path: page/p
-#: C/mail-localized-re-subjects.page:21
+#: C/mail-localized-re-subjects.page:22(page/p)
 msgid ""
 "Traditionally a \"Re:\" prefix is added to a subject line when replying to "
 "an email. Some email applications use localized terms for this (like \"SV:\" "
@@ -9909,29 +9223,31 @@ msgstr ""
 "app> peut reconnaître ces termes pour éviter que les lignes sujets ne "
 "deviennent trop longues au fur et à mesure que la conversation se poursuit."
 
-#. (itstool) path: item/p
-#: C/mail-localized-re-subjects.page:25
+#: C/mail-localized-re-subjects.page:26(item/p)
 msgid ""
-"Run the command <cmd>gsettings set org.gnome.evolution.mail composer-"
-"localized-re 'AW,SV'</cmd> (in case that you want \"AW:\" and \"SV:\" to be "
-"recognized)."
+"Run the command <cmd>gsettings set org.gnome.evolution.mail.composer-"
+"localized-re 'AW:,SV:'</cmd> (in case that you want \"AW:\" and \"SV:\" to "
+"be recognized)."
 msgstr ""
 "Utilisez la commande <cmd>gsettings set org.gnome.evolution.mail.composer-"
-"localized-re 'AW:,SV:'</cmd> (au cas où vous désirez que « AW: » et « SV:» "
+"localized-re 'AW:,SV:'</cmd> (au cas où vous désirez que « AW » et « SW » "
 "soient reconnus)."
 
-#. (itstool) path: info/desc
-#: C/mail-moving-emails.page:5
+#: C/mail-moving-emails.page:5(info/desc)
 msgid "Moving emails from one folder to another."
 msgstr "Déplacer des courriels d'un dossier vers un autre."
 
-#. (itstool) path: page/title
-#: C/mail-moving-emails.page:24
+#: C/mail-moving-emails.page:24(page/title)
 msgid "Moved emails are still shown in the original folder"
 msgstr "Les courriels déplacés figurent toujours dans le dossier d'origine"
 
-#. (itstool) path: page/p
-#: C/mail-moving-emails.page:26
+#: C/mail-moving-emails.page:26(page/p)
+#, fuzzy
+#| msgid ""
+#| "IMAP has no \"move\" feature. Evolution \"moves\" messages by copying and "
+#| "deleting emails. Deleting means \"marking messages for deletion\" so all "
+#| "the original messages are retained until you expunge the emails marked "
+#| "for deletion."
 msgid ""
 "If your IMAP mail server does not yet support <link href=\"http://tools.ietf.";
 "org/html/rfc6851\">IMAP's \"move\" feature</link> which was introduced in "
@@ -9939,15 +9255,13 @@ msgid ""
 "Deleting means \"marking messages for deletion\" so all the original "
 "messages are retained until you expunge the emails marked for deletion."
 msgstr ""
-"Si votre serveur de messagerie IMAP ne prend pas en charge la <link href="
-"\"http://tools.ietf.org/html/rfc6851\";>fonction IMAP « déplacer » </link> "
-"introduite en janvier 2013, Evolution « déplace » les messages en copiant et "
-"en supprimant les courriels. La suppression signifie « marquer les messages "
-"pour suppression » donc tous les messages d'origine restent en place jusqu'à "
-"ce que vous nettoyiez les courriels marqués pour suppression."
+"IMAP ne possède pas de fonctionnalité « déplacement ». Evolution « déplace » "
+"les messages en copiant et en supprimant les courriels. La suppression "
+"signifie « marquer les messages pour suppression » donc tous les messages "
+"d'origine restent en place jusqu'à ce que vous nettoyiez les courriels "
+"marqués pour suppression."
 
-#. (itstool) path: page/p
-#: C/mail-moving-emails.page:28
+#: C/mail-moving-emails.page:28(page/p)
 msgid ""
 "See the topic on <link xref=\"mail-delete-and-undelete\">deleting emails</"
 "link> for instructions on how to expunge email messages. Note that this "
@@ -9957,23 +9271,19 @@ msgstr ""
 "\">suppression des courriels</link> pour apprendre comment nettoyer les "
 "messages. Notez que cela s'applique également aux autres types de comptes."
 
-#. (itstool) path: info/desc
-#: C/mail-not-sent.page:5
+#: C/mail-not-sent.page:5(info/desc)
 msgid "Possible reasons why emails are not sent."
 msgstr "Raisons possibles de non envoi des courriels."
 
-#. (itstool) path: page/title
-#: C/mail-not-sent.page:20
+#: C/mail-not-sent.page:20(page/title)
 msgid "Mail is not sent"
 msgstr "Le courriel n'est pas envoyé"
 
-#. (itstool) path: page/p
-#: C/mail-not-sent.page:22
+#: C/mail-not-sent.page:22(page/p)
 msgid "There can be several reasons why emails are not sent:"
-msgstr "Il existe plusieurs raisons de non envoi de courriels :"
+msgstr "Ils existent plusieurs raisons de non envoi de courriels :"
 
-#. (itstool) path: item/p
-#: C/mail-not-sent.page:25
+#: C/mail-not-sent.page:25(item/p)
 msgid ""
 "Invalid email address. Check if all the addresses listed as mail recipients "
 "are correct. If the message contains a wrong or invalid email address, the "
@@ -9983,8 +9293,7 @@ msgstr ""
 "destinataires sont correctes. Si le message contient une adresse "
 "électronique erronée ou non valide, le message n'est pas envoyé."
 
-#. (itstool) path: item/p
-#: C/mail-not-sent.page:26
+#: C/mail-not-sent.page:26(item/p)
 msgid ""
 "Incorrect SMTP settings. Verify if the settings used for outgoing messages "
 "is correct. Using the incorrect server address or authentication method may "
@@ -9995,8 +9304,7 @@ msgstr ""
 "d'une méthode d'authentification incorrectes peut empêcher l'envoi de "
 "courriels."
 
-#. (itstool) path: item/p
-#: C/mail-not-sent.page:27
+#: C/mail-not-sent.page:27(item/p)
 msgid ""
 "Offline status. Evolution may be offline. Check on the <gui style=\"button"
 "\">Send and Receive</gui> button; if it is greyed out, then you are offline. "
@@ -10010,18 +9318,15 @@ msgstr ""
 "gui><gui>Travailler en ligne</gui></guiseq>. Vous devriez maintenant être "
 "capable d'utiliser le bouton <gui style=\"button\">Envoyer et recevoir</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-organizing.page:5
+#: C/mail-organizing.page:5(info/desc)
 msgid "On folders, sorting, searching, filters, search folders, and labels."
 msgstr "Dossiers, tri, filtres, dossiers de recherche et étiquettes."
 
-#. (itstool) path: page/title
-#: C/mail-organizing.page:21
+#: C/mail-organizing.page:21(page/title)
 msgid "Sorting and organizing mail"
 msgstr "Tri et organisation du courriel"
 
-#. (itstool) path: page/p
-#: C/mail-organizing.page:23
+#: C/mail-organizing.page:23(page/p)
 msgid ""
 "Evolution provides several options to organize your mail according to your "
 "needs."
@@ -10029,30 +9334,25 @@ msgstr ""
 "Evolution propose plusieurs options pour organiser votre courriel selon vos "
 "besoins."
 
-#. (itstool) path: section/title
-#: C/mail-organizing.page:26
+#: C/mail-organizing.page:26(section/title)
 msgid "Advanced Options"
 msgstr "Options avancées"
 
-#. (itstool) path: info/desc
-#: C/mail-reading-keyboard-shortcuts.page:5
+#: C/mail-reading-keyboard-shortcuts.page:5(info/desc)
 msgid "Keyboard shortcuts that can save you some time when reading mail."
 msgstr ""
 "Utiliser des raccourcis clavier pour gagner du temps lors de la lecture des "
 "courriels."
 
-#. (itstool) path: page/title
-#: C/mail-reading-keyboard-shortcuts.page:24
+#: C/mail-reading-keyboard-shortcuts.page:24(page/title)
 msgid "Using shortcut keys to read mail"
 msgstr "Utilisation de raccourcis clavier pour lire les courriels"
 
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:27
+#: C/mail-reading-keyboard-shortcuts.page:27(section/title)
 msgid "Viewing an email"
 msgstr "Affichage d'un courriel"
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:28
+#: C/mail-reading-keyboard-shortcuts.page:28(section/p)
 msgid ""
 "In the Mail window you read a message by selecting it in the message list. "
 "If you would like to see the message in its own window, either double-click "
@@ -10064,36 +9364,11 @@ msgstr ""
 "fenêtre indépendante, double-cliquez sur le message ou appuyez sur la touche "
 "<key>Entrée</key> ou sur <keyseq><key>Ctrl</key><key>O</key></keyseq>."
 
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:32
-msgid "Marking a message as read or unread"
-msgstr "Marquage d'un message comme lu ou non lu"
-
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:33
-msgid ""
-"To mark the currently selected message as read, press <keyseq><key>Ctrl</"
-"key><key>K</key></keyseq>."
-msgstr ""
-"Pour marquer le message actuellement sélectionné comme lu,  appuyez sur "
-"<keyseq><key>Maj</key><key>Ctrl</key><key>K</key></keyseq>."
-
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:34
-msgid ""
-"To mark the currently selected message as unread, press <keyseq><key>Ctrl</"
-"key><key>Shift</key><key>K</key></keyseq>."
-msgstr ""
-"Pour marquer le message actuellement sélectionné comme non lu, appuyez "
-"sur<keyseq><key>Maj</key><key>Ctrl</key><key>K</key></keyseq>."
-
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:38
+#: C/mail-reading-keyboard-shortcuts.page:32(section/title)
 msgid "Navigating in a message"
 msgstr "Navigation dans un message"
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:39
+#: C/mail-reading-keyboard-shortcuts.page:33(section/p)
 msgid ""
 "To read mail with the keyboard, you can press the <key>Spacebar</key> to "
 "page down and press <key>Backspace</key> to page up while reading an email. "
@@ -10101,29 +9376,25 @@ msgid ""
 msgstr ""
 "Pour lire le courriel à l'aide du clavier, vous pouvez appuyer sur la "
 "<key>barre espace</key> pour faire défiler vers le bas, et sur la touche "
-"<key>Retour arrière</key> pour faire défiler vers le haut. La liste des "
-"messages doit être active quand vous utilisez ces touches."
+"<key>Retour arrière</key> pour faire défiler vers le haut. Prenez bien soin "
+"d'utiliser ces touches lorsque la liste des messages est active."
 
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:43
+#: C/mail-reading-keyboard-shortcuts.page:37(section/title)
 msgid "Navigating in a folder in the message list"
 msgstr "Navigation dans un dossier dans la liste des courriels"
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:44
+#: C/mail-reading-keyboard-shortcuts.page:38(section/p)
 msgid "Navigate in the message list by using the arrow keys on the keyboard."
 msgstr ""
 "Naviguez dans la liste des messages à l'aide des touches flèches du clavier."
 
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:48
+#: C/mail-reading-keyboard-shortcuts.page:42(section/title)
 msgid "Navigating in a folder's unread mail in the message list"
 msgstr ""
 "Navigation parmi les courriels non lus d'un dossier dans la liste des "
 "courriels"
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:49
+#: C/mail-reading-keyboard-shortcuts.page:43(section/p)
 msgid ""
 "To go to the next or previous unread messages, press the period (<key>.</"
 "key>) or comma (<key>,</key>) keys. On some keyboards, these keys are also "
@@ -10141,13 +9412,11 @@ msgstr ""
 "crochet droit (<key>]</key>) pour le prochain message non lu et le crochet "
 "gauche (<key>[</key>) pour le message non lu précédent."
 
-#. (itstool) path: section/title
-#: C/mail-reading-keyboard-shortcuts.page:53
+#: C/mail-reading-keyboard-shortcuts.page:47(section/title)
 msgid "Navigating in unread mail across folders"
 msgstr "Navigation parmi les courriels non lus à travers les dossiers"
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:55
+#: C/mail-reading-keyboard-shortcuts.page:49(section/p)
 msgid ""
 "You can easily read the unread messages in all the mail folders by using the "
 "<key>Spacebar</key>."
@@ -10155,16 +9424,14 @@ msgstr ""
 "Vous pouvez facilement lire les messages non lus dans tous les dossiers de "
 "courriel en utilisant la <key>barre d'espace</key>."
 
-#. (itstool) path: section/p
-#: C/mail-reading-keyboard-shortcuts.page:57
+#: C/mail-reading-keyboard-shortcuts.page:51(section/p)
 msgid ""
 "When you are in the Mail window, the Spacebar has the following behavior:"
 msgstr ""
 "Lorsque vous vous trouvez dans la fenêtre des courriels, la barre d'espace "
 "présente le comportement suivant :"
 
-#. (itstool) path: item/p
-#: C/mail-reading-keyboard-shortcuts.page:59
+#: C/mail-reading-keyboard-shortcuts.page:53(item/p)
 msgid ""
 "When you press the Spacebar for the first time, it takes you to the next "
 "unread message."
@@ -10172,8 +9439,7 @@ msgstr ""
 "En appuyant sur la barre d'espace pour la première fois, vous arrivez sur le "
 "prochain message non lu."
 
-#. (itstool) path: item/p
-#: C/mail-reading-keyboard-shortcuts.page:60
+#: C/mail-reading-keyboard-shortcuts.page:54(item/p)
 msgid ""
 "If the message is more than one screen long, the Spacebar works as <key>Page "
 "Down</key>."
@@ -10181,8 +9447,7 @@ msgstr ""
 "Si le texte du message dépasse la hauteur d'un écran, la <key>barre "
 "d'espace</key> fonctionne comme la touche <key>Page suivante</key>."
 
-#. (itstool) path: item/p
-#: C/mail-reading-keyboard-shortcuts.page:61
+#: C/mail-reading-keyboard-shortcuts.page:55(item/p)
 msgid ""
 "If you press the Spacebar after you reach the bottom of the page, it takes "
 "you to the next unread message."
@@ -10190,8 +9455,7 @@ msgstr ""
 "Si vous appuyez sur la barre d'espace alors que vous vous trouvez en fin de "
 "message, vous arrivez sur le prochain message non lu."
 
-#. (itstool) path: item/p
-#: C/mail-reading-keyboard-shortcuts.page:62
+#: C/mail-reading-keyboard-shortcuts.page:56(item/p)
 msgid ""
 "If there are no more unread messages in the mailbox, pressing the Spacebar "
 "takes you to the next unread message in the next folder."
@@ -10200,8 +9464,7 @@ msgstr ""
 "appui sur la barre d'espace vous amène au prochain message non lu du dossier "
 "suivant."
 
-#. (itstool) path: item/p
-#: C/mail-reading-keyboard-shortcuts.page:63
+#: C/mail-reading-keyboard-shortcuts.page:57(item/p)
 msgid ""
 "If new messages arrive in a number of folders, the Spacebar toggles between "
 "those folders. This feature allows you to switch to the next unread message "
@@ -10212,18 +9475,15 @@ msgstr ""
 "au prochain message non lu dans un autre dossier sans devoir cliquer sur ce "
 "dossier."
 
-#. (itstool) path: info/desc
-#: C/mail-read-receipts.page:5
+#: C/mail-read-receipts.page:5(info/desc)
 msgid "How to enable requesting read receipts."
 msgstr "Activer les demandes d'accusé de lecture."
 
-#. (itstool) path: page/title
-#: C/mail-read-receipts.page:32
+#: C/mail-read-receipts.page:32(page/title)
 msgid "Read receipts for emails"
 msgstr "Accusé de lecture pour les courriels"
 
-#. (itstool) path: page/p
-#: C/mail-read-receipts.page:34
+#: C/mail-read-receipts.page:34(page/p)
 msgid ""
 "Read receipts are a way for people to acknowledge that they have received "
 "your email. The recipient can normally choose whether to acknowledge the "
@@ -10235,36 +9495,34 @@ msgstr ""
 "réception ou pas, ce n'est donc pas une manière tout à fait sûre de vérifier "
 "que vos courriels ont bien été lus par quelqu'un."
 
-#. (itstool) path: page/p
-#: C/mail-read-receipts.page:36
+#: C/mail-read-receipts.page:36(page/p)
 msgid ""
-"You can request read receipts by selecting <guiseq><gui>Options</"
-"gui><gui>Request Read Receipt</gui></guiseq> in the menu of the composer "
-"window or clicking the corresponding toolbar icon."
+"You can request read receipts by enabling this option in the email "
+"composer's menu. To do so, go to <guiseq><gui>Options</gui><gui>Request Read "
+"Receipt</gui></guiseq>."
 msgstr ""
-"Vous pouvez demander des accusés de lecture en passant par "
-"<guiseq><gui>Options</gui><gui>Demander un accusé de lecture</gui></guiseq> "
-"dans le menu de l'éditeur de courriel, ou en cliquant sur l'icône "
-"correspondante dans la barre à outils. "
+"Vous pouvez demander des accusés de lecture en activant cette option dans le "
+"menu de l'éditeur de courriel. Pour cela allez dans le menu "
+"<guiseq><gui>Options</gui><gui>Demander un accusé de lecture</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-read-receipts.page:38
+#: C/mail-read-receipts.page:38(page/p)
 msgid ""
-"For read receipts that you receive you can define Evolution's behavior under "
-"<gui>Message Receipts</gui> under the account's <link xref=\"mail-default-"
-"folder-locations\"><gui>Defaults</gui></link>."
+"For read receipts that you receive you can define Evolution's behavior by "
+"going to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"gui><gui style=\"button\">Edit</gui><gui>Defaults</gui><gui>Message "
+"Receipts</gui></guiseq>."
 msgstr ""
 "Pour les accusés de lecture que vous recevez, vous pouvez définir le "
-"comportement d'<app>Evolution</app> dans <gui>Accusés de réception des "
-"messages</gui> des <link xref=\"mail-default-folder-locations\"><gui>Valeurs "
-"par défaut</gui> du compte."
+"comportement d'Evolution en allant dans <guiseq><gui>Édition</"
+"gui><gui>Préférences</gui><gui>Comptes de messagerie</gui><gui style=\"button"
+"\">Modifier</gui><gui>Valeurs par défaut</gui><gui>Accusé de réception des "
+"messages</gui></guiseq>."
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/mail-received-notification.page:25
+#: C/mail-received-notification.page:25(media)
 msgctxt "_"
 msgid ""
 "external ref='./figures/new-mail-switcher.png' "
@@ -10273,48 +9531,43 @@ msgstr ""
 "external ref='./figures/new-mail-switcher.png' "
 "md5='be4dbdb5f6e3dcbd5111b87169cae268'"
 
-#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/mail-received-notification.page:31
+#: C/mail-received-notification.page:31(media)
 msgctxt "_"
 msgid ""
 "external ref='./figures/new-mail-notification.png' "
-"md5='0cffd6d89388aefb8c8bca904bcc1c9e'"
+"md5='25a4373da392793406910cd883f0c21c'"
 msgstr ""
 "external ref='./figures/new-mail-notification.png' "
-"md5='0cffd6d89388aefb8c8bca904bcc1c9e'"
+"md5='25a4373da392793406910cd883f0c21c'"
 
-#. (itstool) path: info/desc
-#: C/mail-received-notification.page:5
+#: C/mail-received-notification.page:5(info/desc)
 msgid "Options on notifications of newly received mail."
 msgstr "Options de notifications de l'arrivée d'un nouveau courriel."
 
-#. (itstool) path: page/title
-#: C/mail-received-notification.page:21
+#: C/mail-received-notification.page:21(page/title)
 msgid "Getting notified of new mail"
 msgstr "Être averti lors d'un lors d'un nouveau courriel"
 
-#. (itstool) path: page/p
-#: C/mail-received-notification.page:23
+#: C/mail-received-notification.page:23(page/p)
 msgid ""
 "Evolution always notifies you of new messages by adding a yellow star to the "
 "mailer icon in the window <link xref=\"change-switcher-appearance"
 "\">switcher</link>."
 msgstr ""
 "Evolution vous avertit toujours de l'arrivée d'un nouveau message en "
-"ajoutant une étoile jaune à l'icône Courriel du <link xref=\"change-switcher-"
+"ajoutant une étoile jaune à l'icône de Mail du <link xref=\"change-switcher-"
 "appearance\">sélecteur</link> de fenêtre."
 
-#. (itstool) path: media/p
-#: C/mail-received-notification.page:26 C/mail-received-notification.page:32
+#: C/mail-received-notification.page:26(media/p)
+#: C/mail-received-notification.page:32(media/p)
 msgid "Switcher layout when a new message has arrived"
 msgstr "Apparence du sélecteur lors de l'arrivée d'un nouveau message"
 
-#. (itstool) path: page/p
-#: C/mail-received-notification.page:29
+#: C/mail-received-notification.page:29(page/p)
 msgid ""
 "In order to also be notified of new messages in the GNOME Notification area "
 "at the bottom of the screen, make sure that <guiseq><gui>Edit</"
@@ -10327,22 +9580,20 @@ msgstr ""
 "courriel</gui></guiseq> est cochée et que vous avez défini vos options "
 "préférées dans l'onglet <gui>Configuration</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-exchange-ews.page:5
+#: C/mail-receiving-options-exchange-ews.page:5(info/desc)
 msgid "Receiving options for Exchange Web Services accounts."
 msgstr "Options de réception pour les comptes Exchange Web Services."
 
-#. (itstool) path: section/p
-#: C/mail-receiving-options-exchange-ews.page:25
-#: C/mail-receiving-options-exchange-mapi.page:25
-#: C/mail-receiving-options-imap-plus.page:28
-#: C/mail-receiving-options-local-delivery.page:25
-#: C/mail-receiving-options-maildir-format-directories.page:25
-#: C/mail-receiving-options-mh-format-directories.page:25
-#: C/mail-receiving-options-pop.page:32
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:25
-#: C/mail-receiving-options-unix-mbox-spool-file.page:25
-#: C/mail-receiving-options-usenet-news.page:28
+#: C/mail-receiving-options-exchange-ews.page:25(section/p)
+#: C/mail-receiving-options-exchange-mapi.page:25(section/p)
+#: C/mail-receiving-options-imap-plus.page:28(section/p)
+#: C/mail-receiving-options-local-delivery.page:25(section/p)
+#: C/mail-receiving-options-maildir-format-directories.page:25(section/p)
+#: C/mail-receiving-options-mh-format-directories.page:25(section/p)
+#: C/mail-receiving-options-pop.page:32(section/p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:25(section/p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:25(section/p)
+#: C/mail-receiving-options-usenet-news.page:28(section/p)
 msgid ""
 "On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
@@ -10353,13 +9604,11 @@ msgstr ""
 "gui><gui style=\"button\">Édition</gui><gui>Réception du courriel</gui></"
 "guiseq>) :"
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:28
+#: C/mail-receiving-options-exchange-ews.page:28(item/p)
 msgid "Enter your username for that server."
 msgstr "Saisissez votre nom d'utilisateur pour ce serveur."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:29
+#: C/mail-receiving-options-exchange-ews.page:29(item/p)
 msgid ""
 "Either manually enter the Host URL and OAB URL, or click <gui style=\"button"
 "\">Fetch URL</gui> which will ask you for your password and then try to "
@@ -10369,9 +9618,8 @@ msgstr ""
 "style=\"button\">Récupérer l'URL</gui> ce qui vous demande votre mot de "
 "passe puis essaie de remplir automatiquement les valeurs."
 
-#. (itstool) path: note/p
-#: C/mail-receiving-options-exchange-ews.page:30
-#: C/mail-receiving-options-exchange-mapi.page:30
+#: C/mail-receiving-options-exchange-ews.page:30(note/p)
+#: C/mail-receiving-options-exchange-mapi.page:30(note/p)
 msgid ""
 "If you are in an organizational environment, you may want to contact your "
 "system administrator for more information."
@@ -10379,12 +9627,11 @@ msgstr ""
 "Si vous êtes dans un environnement d'organisation, contactez votre "
 "administrateur système pour obtenir de plus amples informations."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:31
-#: C/mail-receiving-options-exchange-mapi.page:31
-#: C/mail-receiving-options-imap-plus.page:34
-#: C/mail-receiving-options-pop.page:38
-#: C/mail-receiving-options-usenet-news.page:34
+#: C/mail-receiving-options-exchange-ews.page:31(item/p)
+#: C/mail-receiving-options-exchange-mapi.page:31(item/p)
+#: C/mail-receiving-options-imap-plus.page:34(item/p)
+#: C/mail-receiving-options-pop.page:38(item/p)
+#: C/mail-receiving-options-usenet-news.page:34(item/p)
 msgid ""
 "Select your authentication type in the Authentication list, or click <gui "
 "style=\"button\">Check for Supported Types</gui> to have Evolution check for "
@@ -10399,31 +9646,29 @@ msgstr ""
 "prennent en charge, ce qui signifie que cette fonction ne garantit pas que "
 "les mécanismes disponibles fonctionnent réellement."
 
-#. (itstool) path: section/title
-#: C/mail-receiving-options-exchange-ews.page:37
-#: C/mail-receiving-options-exchange-mapi.page:39
-#: C/mail-receiving-options-imap-plus.page:41
-#: C/mail-receiving-options-local-delivery.page:34
-#: C/mail-receiving-options-maildir-format-directories.page:34
-#: C/mail-receiving-options-mh-format-directories.page:34
-#: C/mail-receiving-options-pop.page:45
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:34
-#: C/mail-receiving-options-unix-mbox-spool-file.page:34
-#: C/mail-receiving-options-usenet-news.page:41
+#: C/mail-receiving-options-exchange-ews.page:37(section/title)
+#: C/mail-receiving-options-exchange-mapi.page:39(section/title)
+#: C/mail-receiving-options-imap-plus.page:41(section/title)
+#: C/mail-receiving-options-local-delivery.page:34(section/title)
+#: C/mail-receiving-options-maildir-format-directories.page:34(section/title)
+#: C/mail-receiving-options-mh-format-directories.page:34(section/title)
+#: C/mail-receiving-options-pop.page:45(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:34(section/title)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:34(section/title)
+#: C/mail-receiving-options-usenet-news.page:41(section/title)
 msgid "Receiving Options"
 msgstr "Options de réception"
 
-#. (itstool) path: section/p
-#: C/mail-receiving-options-exchange-ews.page:39
-#: C/mail-receiving-options-exchange-mapi.page:41
-#: C/mail-receiving-options-imap-plus.page:43
-#: C/mail-receiving-options-local-delivery.page:36
-#: C/mail-receiving-options-maildir-format-directories.page:36
-#: C/mail-receiving-options-mh-format-directories.page:36
-#: C/mail-receiving-options-pop.page:47
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:36
-#: C/mail-receiving-options-unix-mbox-spool-file.page:36
-#: C/mail-receiving-options-usenet-news.page:43
+#: C/mail-receiving-options-exchange-ews.page:39(section/p)
+#: C/mail-receiving-options-exchange-mapi.page:41(section/p)
+#: C/mail-receiving-options-imap-plus.page:43(section/p)
+#: C/mail-receiving-options-local-delivery.page:36(section/p)
+#: C/mail-receiving-options-maildir-format-directories.page:36(section/p)
+#: C/mail-receiving-options-mh-format-directories.page:36(section/p)
+#: C/mail-receiving-options-pop.page:47(section/p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:36(section/p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:36(section/p)
+#: C/mail-receiving-options-usenet-news.page:43(section/p)
 msgid ""
 "On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style=\"button"
@@ -10434,36 +9679,33 @@ msgstr ""
 "gui><gui style=\"button\">Édition</gui><gui>Options de réception</gui></"
 "guiseq>) :"
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:42
-#: C/mail-receiving-options-exchange-mapi.page:44
-#: C/mail-receiving-options-imap-plus.page:46
-#: C/mail-receiving-options-local-delivery.page:39
-#: C/mail-receiving-options-maildir-format-directories.page:39
-#: C/mail-receiving-options-mh-format-directories.page:39
-#: C/mail-receiving-options-pop.page:50
-#: C/mail-receiving-options-unix-mbox-spool-file.page:39
-#: C/mail-receiving-options-usenet-news.page:46
+#: C/mail-receiving-options-exchange-ews.page:42(item/p)
+#: C/mail-receiving-options-exchange-mapi.page:44(item/p)
+#: C/mail-receiving-options-imap-plus.page:46(item/p)
+#: C/mail-receiving-options-local-delivery.page:39(item/p)
+#: C/mail-receiving-options-maildir-format-directories.page:39(item/p)
+#: C/mail-receiving-options-mh-format-directories.page:39(item/p)
+#: C/mail-receiving-options-pop.page:50(item/p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:39(item/p)
+#: C/mail-receiving-options-usenet-news.page:46(item/p)
 msgid ""
 "If you want Evolution to check automatically for new messages, click the "
-"<gui>Check for new messages every … minutes</gui> option and select the "
+"<gui>Check for new messages every ... minutes</gui> option and select the "
 "frequency in minutes."
 msgstr ""
-"Si vous voulez qu'<app>Evolutio</app> vérifie automatiquement les nouveaux "
-"messages, activez l'option <gui>Vérifier les nouveaux messages toutes "
-"les ... minutes</gui> et sélectionnez la fréquence en minutes."
+"Si vous voulez qu'Evolution vérifie automatiquement les nouveaux messages, "
+"activez l'option <gui>Vérifier les nouveaux messages toutes les ... minutes</"
+"gui> et sélectionnez la fréquence en minutes."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:43
-#: C/mail-receiving-options-exchange-mapi.page:45
+#: C/mail-receiving-options-exchange-ews.page:43(item/p)
+#: C/mail-receiving-options-exchange-mapi.page:45(item/p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders."
 msgstr ""
 "Choisissez si vous voulez qu'Evolution relève les nouveaux messages dans "
 "tous les dossiers."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:44
+#: C/mail-receiving-options-exchange-ews.page:44(item/p)
 msgid ""
 "If you would like to have a copy of the address book on the server for "
 "offline access to it, enable <gui>Cache offline address book</gui> and click "
@@ -10475,120 +9717,91 @@ msgstr ""
 "ligne</gui> et cliquez sur <gui style=\"button\">Récupérer la liste</gui>. "
 "Ensuite, sélectionnez le carnet d'adresses parmi les options disponibles."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-ews.page:45
-#: C/mail-receiving-options-imap-plus.page:52
-msgid ""
-"Select if you want <link xref=\"mail-filters\">filters</link> to be "
-"automatically applied on mail that you receive, if <link xref=\"mail-spam-"
-"marking\">spam</link> should be automatically filtered, and if <link xref="
-"\"mail-working-offline\">mail on the server should be synchronized with your "
-"local copy for offline access to it</link>."
-msgstr ""
-"Choisissez si vous voulez que les <link xref=\"mail-filters\">filtres</link> "
-"soient automatiquement appliqués au courrier que vous recevez, si les <link "
-"xref=\"mail-spam-marking\">pourriels</link> doivent être automatiquement "
-"filtrés, et si <link xref=\"mail-working-offline\">le courrier sur le "
-"serveur doit être synchronisé avec votre copie locale pour pouvoir y accéder "
-"\"hors-ligne</link>."
-
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-exchange-mapi.page:5
+#: C/mail-receiving-options-exchange-ews.page:45(item/p)
+msgid ""
+"If you want <link xref=\"mail-filters\">Filters</link> to be automatically "
+"used for new messages in your inbox, enable <gui>Apply filters to new "
+"messages in Inbox on this server</gui>."
+msgstr ""
+"Si vous voulez que des <link xref=\"mail-filters\">filtres</link> soient "
+"automatiquement utilisés pour les nouveaux messages dans votre Boîte de "
+"réception, activez <gui>Appliquer les filtres aux nouveaux messages dans la "
+"boîte de réception sur le serveur</gui>."
+
+#: C/mail-receiving-options-exchange-mapi.page:5(info/desc)
 msgid "Receiving options for Exchange MAPI accounts."
 msgstr "Options de réception des comptes Exchange MAPI."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-mapi.page:28
-#: C/mail-receiving-options-imap-plus.page:31
-#: C/mail-receiving-options-pop.page:35
-#: C/mail-receiving-options-usenet-news.page:31
+#: C/mail-receiving-options-exchange-mapi.page:28(item/p)
+#: C/mail-receiving-options-imap-plus.page:31(item/p)
+#: C/mail-receiving-options-pop.page:35(item/p)
+#: C/mail-receiving-options-usenet-news.page:31(item/p)
 msgid ""
 "Enter the address of the email server in the <gui>Server</gui> field and "
 "enter your username for that server."
 msgstr ""
-"Saisissez l'adresse du serveur de messagerie dans le champ <gui>Serveur</"
-"gui> et saisissez votre nom d'utilisateur sur ce serveur."
+"Saisissez l'adresse du serveur de courriel dans le champ <gui>Serveur</gui> "
+"et saisissez votre nom d'utilisateur sur ce serveur."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-mapi.page:29
+#: C/mail-receiving-options-exchange-mapi.page:29(item/p)
 msgid "Enter the Domain name for that server."
 msgstr "Saisissez le nom de domaine pour ce serveur."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-mapi.page:32
-#: C/mail-receiving-options-imap-plus.page:32
-#: C/mail-receiving-options-pop.page:36
-#: C/mail-receiving-options-usenet-news.page:32
+#: C/mail-receiving-options-exchange-mapi.page:32(item/p)
+#: C/mail-receiving-options-imap-plus.page:32(item/p)
+#: C/mail-receiving-options-pop.page:36(item/p)
+#: C/mail-receiving-options-usenet-news.page:32(item/p)
 msgid "Select if you want to use a secure connection (SSL or TLS)."
 msgstr "Cochez si vous voulez utiliser une connexion sécurisée (SSL ou TLS)."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-exchange-mapi.page:33
+#: C/mail-receiving-options-exchange-mapi.page:33(item/p)
 msgid "Click <gui style=\"button\">Authenticate</gui> and enter your password."
 msgstr ""
 "Cliquez sur <gui style=\"button\">S'authentifier</gui> et saisissez votre "
 "mot de passe."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-imap-plus.page:5
+#: C/mail-receiving-options-imap-plus.page:5(info/desc)
 msgid "Receiving options for IMAP+ accounts."
 msgstr "Options de réception pour les comptes IMAP+."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:32
-#: C/mail-receiving-options-pop.page:36
-#: C/mail-receiving-options-usenet-news.page:32
+#: C/mail-receiving-options-imap-plus.page:32(item/p)
+#: C/mail-receiving-options-pop.page:36(item/p)
+#: C/mail-receiving-options-usenet-news.page:32(item/p)
 msgid "You should enable this option if your server supports it."
 msgstr "Vous devriez activer cette option si votre serveur la prend en charge."
 
-#. (itstool) path: note/p
-#: C/mail-receiving-options-imap-plus.page:33
-#: C/mail-receiving-options-pop.page:37
-#: C/mail-receiving-options-usenet-news.page:33
-#: C/mail-sending-options-smtp.page:30
+#: C/mail-receiving-options-imap-plus.page:33(note/p)
+#: C/mail-receiving-options-pop.page:37(note/p)
+#: C/mail-receiving-options-usenet-news.page:33(note/p)
+#: C/mail-sending-options-smtp.page:30(note/p)
 msgid ""
 "Free webmail providers often supply information about which of these options "
 "can be used. If you are in an organizational environment, you may want to "
 "contact your system administrator for more information."
 msgstr ""
-"Les serveurs de messagerie Web gratuite fournissent en général des "
+"Les fournisseurs de messagerie Web gratuite fournissent en général des "
 "informations sur la possibilité d'utiliser ces options. Si vous êtes dans un "
 "environnement d'organisation, contactez votre administrateur système pour "
 "obtenir de plus amples informations."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:35
-#: C/mail-receiving-options-pop.page:39
-#: C/mail-receiving-options-usenet-news.page:35
+#: C/mail-receiving-options-imap-plus.page:35(item/p)
+#: C/mail-receiving-options-pop.page:39(item/p)
+#: C/mail-receiving-options-usenet-news.page:35(item/p)
 msgid "Select if you want Evolution to remember your password."
 msgstr ""
 "Cochez si vous souhaitez qu'Evolution se souvienne de votre mot de passe."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:47
+#: C/mail-receiving-options-imap-plus.page:47(item/p)
 msgid ""
-"Select <gui>Use Quick Resync</gui> if the IMAP server supports <link href="
-"\"http://tools.ietf.org/html/rfc5162\";>IMAP4 Extensions for Quick Mailbox "
+"Select \"Use Quick Resync\" if the IMAP server supports <link href=\"http://";
+"tools.ietf.org/html/rfc5162\">IMAP4 Extensions for Quick Mailbox "
 "Resynchronization</link>."
 msgstr ""
-"Sélectionnez <gui>Utiliser Quick Resync</gui> si le serveur prend en charge "
-"<link href=\"http://tools.ietf.org/html/rfc5162\";>IMAP4 Extensions for Quick "
+"Sélectionnez « Utiliser Quick Resync » si le serveur prend en charge <link "
+"href=\"http://tools.ietf.org/html/rfc5162\";>IMAP4 Extensions for Quick "
 "Mailbox Resynchronization</link>."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:49
-msgid ""
-"If the mail server does not allow multiple connections from Evolution to the "
-"server at the same time (for example when you have more than one account on "
-"that server), set <gui>Number of concurrent connections to use</gui> to 1."
-msgstr ""
-"Si le serveur de courrier n'autorise pas les connexions multiples "
-"simultanées d'<app>Evolution</app> (par exemple si vous avez plus d'un "
-"compte sur ce serveur), mettez <gui>Nombre de connexions simultanées à "
-"utiliser</gui> à 1."
-
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:50
+#: C/mail-receiving-options-imap-plus.page:48(item/p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders, or "
 "only in subscribed folders."
@@ -10596,8 +9809,15 @@ msgstr ""
 "Vous pouvez aussi choisir si Evolution relève les nouveaux messages dans "
 "tous les dossiers ou seulement dans les dossiers abonnés."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-imap-plus.page:51
+#: C/mail-receiving-options-imap-plus.page:49(item/p)
+msgid ""
+"Select if you want Evolution to use custom commands to connect to the IMAP "
+"server."
+msgstr ""
+"Choisissez si vous voulez qu'Evolution utilise une commande personnalisée "
+"pour se connecter au serveur IMAP."
+
+#: C/mail-receiving-options-imap-plus.page:50(item/p)
 msgid ""
 "Select if you want Evolution to show only <link xref=\"mail-imap-"
 "subscriptions\">subscribed folders</link>."
@@ -10605,14 +9825,19 @@ msgstr ""
 "Choisissez si vous voulez qu'Evolution n'affiche que les <link xref=\"mail-"
 "imap-subscriptions\">dossiers abonnés</link>."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-local-delivery.page:5
+#: C/mail-receiving-options-imap-plus.page:51(item/p)
+msgid ""
+"Select if you want Evolution to override server-supplied folder namespaces."
+msgstr ""
+"Choisissez si vous voulez qu'Evolution outrepasse l'espace de noms de "
+"dossiers fourni par le serveur."
+
+#: C/mail-receiving-options-local-delivery.page:5(info/desc)
 msgid "Receiving options for Local delivery accounts."
 msgstr "Options de réception des comptes de distribution locale des messages."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-local-delivery.page:28
-#: C/mail-receiving-options-unix-mbox-spool-file.page:28
+#: C/mail-receiving-options-local-delivery.page:28(item/p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:28(item/p)
 msgid ""
 "Choose the file by clicking on the button next to <gui>File</gui> in the "
 "<gui>Configuration</gui> section. This will open a file chooser window."
@@ -10621,16 +9846,15 @@ msgstr ""
 "dans la section <gui>Configuration</gui> ce qui ouvre une fenêtre de "
 "sélection de fichier."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-maildir-format-directories.page:5
+#: C/mail-receiving-options-maildir-format-directories.page:5(info/desc)
 msgid "Receiving options for Maildir-format mail directories accounts."
 msgstr ""
 "Options de réception pour les comptes de répertoires de courriel au format "
 "Maildir."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-maildir-format-directories.page:28
-#: C/mail-receiving-options-mh-format-directories.page:28
+#: C/mail-receiving-options-maildir-format-directories.page:28(item/p)
+#: C/mail-receiving-options-mh-format-directories.page:28(item/p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:28(item/p)
 msgid ""
 "Choose the directory by clicking on the button next to <gui>Path</gui> in "
 "the <gui>Configuration</gui> section. Some default folders are available in "
@@ -10644,62 +9868,60 @@ msgstr ""
 "option <gui>Autre...</gui> ce qui ouvre une fenêtre de sélection de "
 "répertoire."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-maildir-format-directories.page:40
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:39
-#: C/mail-receiving-options-unix-mbox-spool-file.page:40
+#: C/mail-receiving-options-maildir-format-directories.page:40(item/p)
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:39(item/p)
+#: C/mail-receiving-options-unix-mbox-spool-file.page:40(item/p)
 msgid ""
 "If you want <link xref=\"mail-filters\">Filters</link> to be automatically "
 "used for new messages in your inbox, enable <gui>Apply filters to new "
-"messages in Inbox</gui>."
+"messages in INBOX</gui>."
 msgstr ""
 "Si vous voulez que des <link xref=\"mail-filters\">filtres</link> soient "
 "automatiquement utilisés pour les nouveaux messages dans votre Boîte de "
 "réception, activez <gui>Appliquer les filtres aux nouveaux messages dans la "
 "boîte de réception</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-mh-format-directories.page:5
+#: C/mail-receiving-options-mh-format-directories.page:5(info/desc)
 msgid "Receiving options for MH-format mail directories accounts."
 msgstr ""
 "Options de réception pour les comptes de répertoires de courriel au format "
 "MH."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options.page:5
+#: C/mail-receiving-options.page:5(info/desc)
 msgid "Available mail receiving options for several server types."
 msgstr ""
 "Options de réception de courriel disponibles pour plusieurs types de serveur."
 
-#. (itstool) path: page/title
-#: C/mail-receiving-options.page:18
+#: C/mail-receiving-options.page:18(page/title)
 msgid "Mail Receiving Options"
 msgstr "Options de réception de courriel"
 
-#. (itstool) path: section/title
-#: C/mail-receiving-options.page:21
+#: C/mail-receiving-options.page:21(section/title)
+#, fuzzy
+#| msgid "Available mail receiving options for several server types."
 msgid "Mail receiving options for common server types"
-msgstr "Options de réception de courriel pour les types de serveurs usuels"
+msgstr ""
+"Options de réception de courriel disponibles pour plusieurs types de serveur."
 
-#. (itstool) path: section/title
-#: C/mail-receiving-options.page:24
+#: C/mail-receiving-options.page:24(section/title)
+#, fuzzy
+#| msgid "Available mail receiving options for several server types."
 msgid "Mail receiving options for corporate server types"
 msgstr ""
-"Options de réception de courriel pour les types de serveurs d'entreprises"
+"Options de réception de courriel disponibles pour plusieurs types de serveur."
 
-#. (itstool) path: section/title
-#: C/mail-receiving-options.page:27
+#: C/mail-receiving-options.page:27(section/title)
+#, fuzzy
+#| msgid "Available mail receiving options for several server types."
 msgid "Mail receiving options for local account server types"
 msgstr ""
-"Options de réception de courriel pour les types de serveurs de comptes locaux"
+"Options de réception de courriel disponibles pour plusieurs types de serveur."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-pop.page:5
+#: C/mail-receiving-options-pop.page:5(info/desc)
 msgid "Receiving options for POP accounts."
 msgstr "Options de réception pour les comptes POP."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-pop.page:51
+#: C/mail-receiving-options-pop.page:51(item/p)
 msgid ""
 "If you want the messages to remain on the server for a period of time, click "
 "the <gui>Leave messages on server</gui> option and the <gui>Delete after ... "
@@ -10711,8 +9933,7 @@ msgstr ""
 "gui> et <gui>Supprimer après ... jours</gui> et sélectionnez le nombre de "
 "jours pendant lesquels les messages restent sur le serveur."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-pop.page:52
+#: C/mail-receiving-options-pop.page:52(item/p)
 msgid ""
 "The option <gui>Disable support for all POP3 extensions</gui> is only useful "
 "when accessing old or misconfigured mail servers. <link href=\"https://tools.";
@@ -10727,52 +9948,32 @@ msgstr ""
 "seuls quelques serveurs les prennent en charge. En cas de problèmes de "
 "réception de courriel, activer ce paramètre peut vous aider."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:5
+#: C/mail-receiving-options-unix-mbox-spool-directory.page:5(info/desc)
 msgid "Receiving options for standard Unix mbox spool directory accounts."
 msgstr ""
 "Options de réception pour les comptes utilisant le répertoire Unix standard "
 "de spool mbox."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-unix-mbox-spool-directory.page:28
-msgid ""
-"Choose the directory by clicking on the button next to <gui>Path</gui> in "
-"the <gui>Configuration</gui> section. Some default folders are available in "
-"the list. If the directory is not among those folders, choose the last "
-"option <gui>Other…</gui>. This will open a directory chooser window."
-msgstr ""
-"Choisissez le répertoire en cliquant sur le bouton à côté de <gui>Chemin</"
-"gui> dans la section <gui>Configuration</gui>. Des dossiers par défaut sont "
-"disponibles dans la liste. Si le répertoire n'est pas parmi ces dossiers, "
-"choisissez la dernière option <gui>Autre...</gui> ce qui ouvre une fenêtre "
-"de sélection de répertoire."
-
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-unix-mbox-spool-file.page:5
+#: C/mail-receiving-options-unix-mbox-spool-file.page:5(info/desc)
 msgid "Receiving options for standard Unix mbox spool file accounts."
 msgstr ""
 "Options de réception pour les comptes utilisant le fichier Unix standard de "
 "spool mbox."
 
-#. (itstool) path: info/desc
-#: C/mail-receiving-options-usenet-news.page:5
+#: C/mail-receiving-options-usenet-news.page:5(info/desc)
 msgid "Receiving options for Usenet news accounts."
 msgstr "Options de réception pour les comptes de nouvelles Usenet."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-usenet-news.page:47
+#: C/mail-receiving-options-usenet-news.page:47(item/p)
 msgid "Select if you want to show folders in short notation."
 msgstr ""
 "Choisissez si vous voulez que les dossiers s'affichent en notation abrégée."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-usenet-news.page:48
+#: C/mail-receiving-options-usenet-news.page:48(item/p)
 msgid "For example, comp.os.linux would appear as c.o.linux."
 msgstr "Par exemple, comp.os.linux est affiché sous la forme c.o.linux."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-usenet-news.page:49
+#: C/mail-receiving-options-usenet-news.page:49(item/p)
 msgid ""
 "Select if you want to show relative folder names in the <link xref=\"mail-"
 "imap-subscriptions\">subscriptions window</link>."
@@ -10780,8 +9981,7 @@ msgstr ""
 "Choisissez si vous voulez afficher les noms de dossiers relatifs dans la "
 "<link xref=\"mail-imap-subscriptions\">boîte de dialogue d'abonnement</link>."
 
-#. (itstool) path: item/p
-#: C/mail-receiving-options-usenet-news.page:50
+#: C/mail-receiving-options-usenet-news.page:50(item/p)
 msgid ""
 "If you select to show relative folder names, only the name of the folder is "
 "displayed. For example the folder evolution.mail would appear as evolution."
@@ -10790,36 +9990,30 @@ msgstr ""
 "des dossiers sont affichés. Par exemple, le dossier « evolution.mail » "
 "apparaît sous la forme « evolution »."
 
-#. (itstool) path: info/desc
-#: C/mail-recognized-thread-related-headers.page:5
+#: C/mail-recognized-thread-related-headers.page:5(info/desc)
 msgid "Which thread-related headers are recognized by Evolution."
 msgstr ""
 "Quels sont les en-têtes relatifs aux fils de discussion reconnus par "
 "Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-recognized-thread-related-headers.page:20
+#: C/mail-recognized-thread-related-headers.page:20(page/title)
 msgid "Thread related headers recognized by Evolution"
 msgstr "En-têtes relatifs aux fils de discussion reconnus par Evolution"
 
-#. (itstool) path: page/p
-#: C/mail-recognized-thread-related-headers.page:22
+#: C/mail-recognized-thread-related-headers.page:22(page/p)
 msgid "Evolution supports the following headers:"
 msgstr "Evolution prend en charge les en-têtes suivants :"
 
 # Bruno, ne pas traduire car mot-clés en-tête de courriel
-#. (itstool) path: item/p
-#: C/mail-recognized-thread-related-headers.page:24
+#: C/mail-recognized-thread-related-headers.page:24(item/p)
 msgid "References"
 msgstr "References"
 
-#. (itstool) path: item/p
-#: C/mail-recognized-thread-related-headers.page:25
+#: C/mail-recognized-thread-related-headers.page:25(item/p)
 msgid "In-Reply-To"
 msgstr "In-Reply-To"
 
-#. (itstool) path: page/p
-#: C/mail-recognized-thread-related-headers.page:29
+#: C/mail-recognized-thread-related-headers.page:29(page/p)
 msgid ""
 "<gui>Thread-*</gui> headers are Microsoft's proprietary headers and not "
 "supported."
@@ -10827,18 +10021,15 @@ msgstr ""
 "Les en-têtes <gui>Thread-*</gui> sont des en-têtes propriétaires de "
 "Microsoft et ne sont pas pris en charge."
 
-#. (itstool) path: info/desc
-#: C/mail-refresh-folders.page:5
+#: C/mail-refresh-folders.page:5(info/desc)
 msgid "Ways to update your Evolution folders."
 msgstr "Différentes façons de mettre à jour vos dossiers Evolution."
 
-#. (itstool) path: page/title
-#: C/mail-refresh-folders.page:20
+#: C/mail-refresh-folders.page:20(page/title)
 msgid "Updating/refreshing the folders on the mail server"
-msgstr "Mise à jour/actualisation des dossiers sur le serveur de messagerie"
+msgstr "Mise à jour/actualisation des dossiers sur le serveur de courriel"
 
-#. (itstool) path: page/p
-#: C/mail-refresh-folders.page:22
+#: C/mail-refresh-folders.page:22(page/p)
 msgid ""
 "To make sure that your local email folders are updated, go to "
 "<guiseq><gui>Folder</gui><gui>Refresh</gui></guiseq>. This will ensure that "
@@ -10849,11 +10040,10 @@ msgstr ""
 "Pour être sûr que vos dossiers de courriels locaux sont actualisés, allez "
 "dans <guiseq><gui>Dossier</gui><gui>Actualiser</gui></guiseq>. Cela vous "
 "permet d'être sûr que tous vos courriels ont été téléchargés à partir du "
-"serveur de messagerie sur l'ordinateur afin que vous puissiez les lire tous "
-"et que le statut de lecture soit synchronisé avec le serveur de messagerie."
+"serveur de courriel sur l'ordinateur afin que vous puissiez les lire tous et "
+"que le statut de lecture soit synchronisé avec le serveur de courriel."
 
-#. (itstool) path: page/p
-#: C/mail-refresh-folders.page:24
+#: C/mail-refresh-folders.page:24(page/p)
 msgid ""
 "You can also double-click on the folder name to refresh it, or press "
 "<key>F5</key>."
@@ -10861,33 +10051,28 @@ msgstr ""
 "Vous pouvez faire un double-clic sur le dossier pour le mettre à jour, ou "
 "bien appuyer sur <key>F5</key>."
 
-#. (itstool) path: info/desc
-#: C/mail-save-as-pdf.page:5
+#: C/mail-save-as-pdf.page:5(info/desc)
 msgid "Converting emails into PDF files."
 msgstr "Conversion de courriels en fichiers PDF."
 
-#. (itstool) path: page/title
-#: C/mail-save-as-pdf.page:20
+#: C/mail-save-as-pdf.page:20(page/title)
 msgid "Save messages as PDF"
 msgstr "Enregistrer des messages en PDF"
 
-#. (itstool) path: page/p
-#: C/mail-save-as-pdf.page:22
+#: C/mail-save-as-pdf.page:22(page/p)
 msgid ""
 "In order to save emails in the PDF file format, select <guiseq><gui>File</"
 "gui><gui>Print</gui></guiseq> and then choose <gui>Print to File</gui>. See "
-"<link xref=\"help:gnome-help/printing\" href=\"https://help.gnome.org/users/";
-"gnome-help/stable/printing\">the desktop help</link> for general information "
-"on printing."
+"<link href=\"help:gnome-help/printing\">the desktop help</link> for general "
+"information on printing."
 msgstr ""
 "Pour enregistrer des courriels dans le format de fichier PDF, sélectionnez "
 "<guiseq><gui>Fichier</gui><gui>Imprimer</gui></guiseq> et choisissez "
 "<gui>Imprimer dans le fichier</gui>. Consultez <link href=\"help:gnome-help/"
-"printing\">l'aide du bureau GNOME</link> pour avoir des informations "
-"générales sur l'impression."
+"printing\">l'aide du bureau</link> pour avoir des informations générales sur "
+"l'impression."
 
-#. (itstool) path: note/p
-#: C/mail-save-as-pdf.page:25
+#: C/mail-save-as-pdf.page:25(note/p)
 msgid ""
 "You can also export messages as PDF by dragging and dropping them to the "
 "file manager, instead of dropping them in mbox (text) format by default."
@@ -10896,8 +10081,7 @@ msgstr ""
 "le gestionnaire de fichiers, au lieu de les déposer par défaut dans le "
 "format mbox (texte)."
 
-#. (itstool) path: item/p
-#: C/mail-save-as-pdf.page:28
+#: C/mail-save-as-pdf.page:28(item/p)
 msgid ""
 "Run the command <cmd>gsettings set org.gnome.evolution.mail drag-and-drop-"
 "save-file-format 'pdf'</cmd>"
@@ -10905,24 +10089,21 @@ msgstr ""
 "Lancez la commande <cmd>gsettings set org.gnome.evolution.mail drag-and-drop-"
 "save-file-format 'pdf'</cmd>"
 
-#. (itstool) path: info/desc
-#: C/mail-search-folders-add.page:5
+#: C/mail-search-folders-add.page:5(info/desc)
 msgid "Setting up a search folder."
 msgstr "Paramétrer un dossier de recherche."
 
-#. (itstool) path: page/title
-#: C/mail-search-folders-add.page:23
+#: C/mail-search-folders-add.page:23(page/title)
 msgid "Creating A Search Folder"
 msgstr "Création d'un dossier de recherche"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:26
+#: C/mail-search-folders-add.page:26(item/p)
 msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Search Folders</gui></guiseq>, or click "
 "<guiseq><gui>Message</gui><gui>Create Rule</gui></guiseq> and select the "
 "criterion the search folder will be based on, or if you have run a search, "
-"click <guiseq><gui>Search</gui><gui>Create Search Folder From Search…</gui></"
-"guiseq>."
+"click <guiseq><gui>Search</gui><gui>Create Search Folder From Search...</"
+"gui></guiseq>."
 msgstr ""
 "Cliquez sur <guiseq><gui>Édition</gui><gui>Dossiers de recherche</gui></"
 "guiseq> ou cliquez sur <guiseq><gui>Message</gui><gui>Créer une règle</gui></"
@@ -10931,8 +10112,7 @@ msgstr ""
 "<guiseq><gui>Recherche</gui><gui>Créer un dossier de recherche à partir "
 "d'une recherche</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:29
+#: C/mail-search-folders-add.page:29(item/p)
 msgid ""
 "For more information on the available conditions see <link xref=\"mail-"
 "search-folders-conditions\">Available Search Folder conditions</link>."
@@ -10941,8 +10121,7 @@ msgstr ""
 "xref=\"mail-search-folders-conditions\">Conditions disponibles pour les "
 "dossiers de recherche</link>."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:31
+#: C/mail-search-folders-add.page:31(item/p)
 msgid ""
 "Select which folders will be used for the search folder in the section "
 "<gui>Search Folder Sources</gui>. Options are:"
@@ -10951,13 +10130,11 @@ msgstr ""
 "dans la section <gui>Sources de dossier de recherche</gui>. Les options "
 "sont :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:33
+#: C/mail-search-folders-add.page:33(item/p)
 msgid "All local folders:"
 msgstr "Tous les dossiers locaux :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:34
+#: C/mail-search-folders-add.page:34(item/p)
 msgid ""
 "Uses all local folders for the search folder source in addition to "
 "individual folders that are selected."
@@ -10965,13 +10142,11 @@ msgstr ""
 "Utilise tous les dossiers locaux comme source pour le dossier de recherche, "
 "en plus des dossiers individuels sélectionnés."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:36
+#: C/mail-search-folders-add.page:36(item/p)
 msgid "All active remote folders:"
 msgstr "Tous les dossiers actifs distants :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:37
+#: C/mail-search-folders-add.page:37(item/p)
 msgid ""
 "Remote folders are considered active if you are connected to the server; you "
 "must be connected to your mail server for the search folder to include any "
@@ -10983,13 +10158,11 @@ msgstr ""
 "dossier de recherche inclue tout message de cette source, en plus des "
 "dossiers individuels sélectionnés."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:39
+#: C/mail-search-folders-add.page:39(item/p)
 msgid "All local and active remote folders:"
 msgstr "Tous les dossiers locaux et actifs distants :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:40
+#: C/mail-search-folders-add.page:40(item/p)
 msgid ""
 "Uses all local and active remote folders for the search folder source in "
 "addition to individual folders that are selected."
@@ -10997,13 +10170,11 @@ msgstr ""
 "Utilise tous les dossiers locaux et distants actifs comme source du dossier "
 "de recherche, en plus des dossiers individuels sélectionnés."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:42
+#: C/mail-search-folders-add.page:42(item/p)
 msgid "Specific folders only:"
 msgstr "Uniquement les dossiers spécifiques :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-add.page:43
+#: C/mail-search-folders-add.page:43(item/p)
 msgid ""
 "Uses individual folders for the search folder source. In this case, click "
 "the <gui style=\"button\">Add</gui> to select folders."
@@ -11012,62 +10183,57 @@ msgstr ""
 "ce cas, cliquez sur <gui style=\"button\">Ajouter</gui> pour sélectionner "
 "les dossiers."
 
-#. (itstool) path: info/desc
-#: C/mail-search-folders-conditions.page:5
+#: C/mail-search-folders-conditions.page:5(info/desc)
 msgid "Available conditions for setting up search folders."
 msgstr "Conditions disponibles pour le paramétrage des dossiers de recherche."
 
-#. (itstool) path: page/title
-#: C/mail-search-folders-conditions.page:23
+#: C/mail-search-folders-conditions.page:23(page/title)
 msgid "Available Search folder conditions"
 msgstr "Conditions disponibles pour les dossiers de recherche"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-conditions.page:33
+#: C/mail-search-folders-conditions.page:33(item/p)
 msgid "Message Location:"
 msgstr "Emplacement du message :"
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-conditions.page:34
+#: C/mail-search-folders-conditions.page:34(item/p)
 msgid "Checks whether the message is located in a specific folder."
-msgstr "Vérifie si le message se trouve dans un dossier spécifique."
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-conditions.page:34
+#: C/mail-search-folders-conditions.page:34(item/p)
+#, fuzzy
+#| msgid ""
+#| "By default, Evolution's <gui>Trash</gui> and <gui>Junk</gui> folders are "
+#| "<link xref=\"mail-search-folders\">Search folders</link>. They do not "
+#| "really exist but simply display all the messages that are marked as junk "
+#| "or for deletion in any folders of that account."
 msgid ""
 "Note that by default, Evolution's <gui>Trash</gui> and <gui>Junk</gui> "
 "folders are <link xref=\"mail-search-folders\">Search folders</link> so they "
 "cannot be selected here."
 msgstr ""
-"Notez que par défaut, les dossiers <gui>Corbeille</gui> et <gui>Pourriels</"
-"gui> d'Evolution sont des <link xref=\"mail-search-folders\">dossiers de "
-"recherche</link> et qu'ils ne peuvent donc pas être sélectionnés ici."
+"Par défaut, les dossiers <gui>Corbeille</gui> et <gui>Pourriels</gui> "
+"d'Evolution sont des <link xref=\"mail-search-folders\">dossiers de "
+"recherche</link>. Ils n'existent pas réellement mais affichent simplement "
+"tous les messages qui sont marqués comme pourriels ou supprimés dans tous "
+"les dossiers de ce compte."
 
-#. (itstool) path: item/p
-#: C/mail-search-folders-conditions.page:37
+#: C/mail-search-folders-conditions.page:37(item/p)
 msgid ""
 "Applies an action always to any message, without further conditions. This "
 "could be useful at the end of the list of search folders to cover those "
 "emails that did not match any conditions for the preceding search folders in "
 "the list."
 msgstr ""
-"Applique toujours une action à n'importe quel message, sans autre condition. "
-"Cela est utile à la fin de la liste des dossiers de recherche pour concerner "
-"aussi ces courriels qui ne correspondent à aucun des critères de recherche "
-"dans la liste des dossiers de recherche précédents."
 
-#. (itstool) path: info/desc
-#: C/mail-search-folders-enable.page:5
+#: C/mail-search-folders-enable.page:5(info/desc)
 msgid "Activate search folders."
 msgstr "Activer les dossiers de recherche."
 
-#. (itstool) path: page/title
-#: C/mail-search-folders-enable.page:20
+#: C/mail-search-folders-enable.page:20(page/title)
 msgid "Enable the Search Folders Functionality"
 msgstr "Activer la fonction dossiers de recherche"
 
-#. (itstool) path: page/p
-#: C/mail-search-folders-enable.page:22
+#: C/mail-search-folders-enable.page:22(page/p)
 msgid ""
 "In the unlikely case that there is no <gui>Search folders</gui> top-level "
 "node displayed at the bottom of the <link xref=\"intro-main-window#e-mail"
@@ -11081,8 +10247,7 @@ msgstr ""
 "activer <guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Comptes de "
 "messagerie</gui><gui>Dossiers de recherche</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-search-folders.page:5
+#: C/mail-search-folders.page:5(info/desc)
 msgid ""
 "Use search folders to see messages in one folder while still keeping them in "
 "their original folders."
@@ -11090,13 +10255,11 @@ msgstr ""
 "Utiliser des dossiers de recherche pour voir les messages d'un dossier tout "
 "en les conservant dans leur dossier d'origine."
 
-#. (itstool) path: page/title
-#: C/mail-search-folders.page:22
+#: C/mail-search-folders.page:22(page/title)
 msgid "Using Search folders"
 msgstr "Utilisation des dossiers de recherche"
 
-#. (itstool) path: page/p
-#: C/mail-search-folders.page:24
+#: C/mail-search-folders.page:24(page/p)
 msgid ""
 "If <link xref=\"mail-filters\">filters</link> are not flexible enough, or "
 "you find yourself performing the same <link xref=\"mail-searching\">search</"
@@ -11106,8 +10269,7 @@ msgstr ""
 "ou si vous réalisez encore et encore la même <link xref=\"mail-searching"
 "\">recherche</link>, pensez aux dossiers de recherche."
 
-#. (itstool) path: page/p
-#: C/mail-search-folders.page:26
+#: C/mail-search-folders.page:26(page/p)
 msgid ""
 "A search folder looks like a <link xref=\"mail-folders\">folder</link>, it "
 "acts like a <link xref=\"mail-searching\">search</link>, and you set it up "
@@ -11126,8 +10288,7 @@ msgstr ""
 "par un ensemble de critères choisis lors de la création du dossier de "
 "recherche."
 
-#. (itstool) path: page/p
-#: C/mail-search-folders.page:28
+#: C/mail-search-folders.page:28(page/p)
 msgid ""
 "Evolution automatically updates the search folder contents when new messages "
 "are received or message are deleted."
@@ -11135,8 +10296,7 @@ msgstr ""
 "Evolution met à jour automatiquement le contenu du dossier de recherche "
 "lorsque des nouveaux messages sont reçus ou qu'un message est supprimé."
 
-#. (itstool) path: page/p
-#: C/mail-search-folders.page:30
+#: C/mail-search-folders.page:30(page/p)
 msgid ""
 "The <gui>Unmatched</gui> search folder is the opposite of other search "
 "folders: it displays all messages that do not appear in other search folders."
@@ -11145,8 +10305,7 @@ msgstr ""
 "dossiers de recherche. Il affiche tous les messages qui n'apparaissent dans "
 "aucun autre dossier de recherche."
 
-#. (itstool) path: page/p
-#: C/mail-search-folders.page:32
+#: C/mail-search-folders.page:32(page/p)
 msgid ""
 "If you use remote email storage like IMAP, and have created search folders "
 "to search through them, the <gui>Unmatched</gui> search folder also searches "
@@ -11161,18 +10320,15 @@ msgstr ""
 "distants, le dossier de recherche <gui>Autres courriels</gui> ne les "
 "parcourt pas non plus."
 
-#. (itstool) path: info/desc
-#: C/mail-search-folders-refresh.page:5
+#: C/mail-search-folders-refresh.page:5(info/desc)
 msgid "Ways of updating Search folders."
 msgstr "Les différentes façons de mettre à jour les dossiers de recherche."
 
-#. (itstool) path: page/title
-#: C/mail-search-folders-refresh.page:24
+#: C/mail-search-folders-refresh.page:24(page/title)
 msgid "Updating/refreshing Search folders"
 msgstr "Mise à jour des dossiers de recherche"
 
-#. (itstool) path: page/p
-#: C/mail-search-folders-refresh.page:26
+#: C/mail-search-folders-refresh.page:26(page/p)
 msgid ""
 "It might happen that one of your Search folders has not updated since some "
 "new email arrived or since an email was deleted, for example. This will mean "
@@ -11183,8 +10339,7 @@ msgstr ""
 "courriel par exemple. Cela signifie que la liste des courriels dans le "
 "dossier n'est pas à jour."
 
-#. (itstool) path: page/p
-#: C/mail-search-folders-refresh.page:28
+#: C/mail-search-folders-refresh.page:28(page/p)
 msgid ""
 "You can get an updated view of the search folder either by switching to "
 "another folder and then back again, or by right-clicking on the search "
@@ -11195,18 +10350,15 @@ msgstr ""
 "faisant un clic-droit sur le dossier de recherche et en sélectionnant "
 "<gui>Actualiser</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-searching-attachment-type.page:5
+#: C/mail-searching-attachment-type.page:5(info/desc)
 msgid "Unfortunately this is not possible."
 msgstr "Malheureusement ce n'est pas possible."
 
-#. (itstool) path: page/title
-#: C/mail-searching-attachment-type.page:21
+#: C/mail-searching-attachment-type.page:21(page/title)
 msgid "Searching for emails with a specific attachment type"
 msgstr "Recherche de courriels possédant un type spécifique de pièces-jointes"
 
-#. (itstool) path: page/p
-#: C/mail-searching-attachment-type.page:23
+#: C/mail-searching-attachment-type.page:23(page/p)
 msgid ""
 "There currently is no way to do search for emails with a specific type of "
 "attachment (for example searching for all emails that have a PDF attachment)."
@@ -11215,70 +10367,52 @@ msgstr ""
 "un type spécifique de pièces-jointes (par exemple, rechercher tous les "
 "courriels qui ont des pièces-jointes de type PDF)."
 
-#. (itstool) path: info/desc
-#: C/mail-searching.page:5
+#: C/mail-searching.page:5(info/desc)
 msgid "Searching messages."
 msgstr "Recherche de messages."
 
-#. (itstool) path: page/title
-#: C/mail-searching.page:28
+#: C/mail-searching.page:28(page/title)
 msgid "Searching Mail"
 msgstr "Recherche de courriel"
 
-#. (itstool) path: section/title
-#: C/mail-searching.page:31
+#: C/mail-searching.page:31(section/title)
 msgid "Searching in a Single Message"
 msgstr "Recherche dans un seul message."
 
-#. (itstool) path: section/p
-#: C/mail-searching.page:32
+#: C/mail-searching.page:32(section/p)
 msgid ""
 "To find text in the displayed message, select <guiseq><gui>Edit</"
-"gui><gui>Find in Message…</gui></guiseq> from the main menu."
+"gui><gui>Find in Message...</gui></guiseq> from the main menu."
 msgstr ""
 "Pour trouver un texte dans le message affiché, sélectionnez "
 "<guiseq><gui>Édition</gui><gui>Rechercher dans le message...</gui></guiseq> "
 "dans le menu principal."
 
-#. (itstool) path: section/title
-#: C/mail-searching.page:36
+#: C/mail-searching.page:36(section/title)
 msgid "Searching Across Messages"
 msgstr "Recherche parmi les messages."
 
-#. (itstool) path: section/p
-#: C/mail-searching.page:40
+#: C/mail-searching.page:40(section/p)
 msgid ""
 "In the mail view, you can quickly search for messages by defining conditions."
 msgstr ""
 "Dans la vue des courriels, vous pouvez faire une recherche rapide de "
 "messages en définissant des conditions."
 
-#. (itstool) path: item/p
-#: C/mail-searching.page:42
-msgid "Click on the search icon <_:media-1/> to expand the drop-down list."
-msgstr ""
-"Cliquez sur l'icône de recherche <_:media-1/> pour ouvrir la liste "
-"déroulante."
-
-#. (itstool) path: note/p
-#: C/mail-searching.page:44
+#: C/mail-searching.page:42(item/p)
 msgid ""
-"Advanced users can <link href=\"https://bugzilla.gnome.org/show_bug.cgi?";
-"id=550796#c10\">combine numerous conditions by using the <gui>Free form "
-"expression</gui> syntax</link>."
+"Click on the search icon <media type=\"image\" mime=\"image/png\" src="
+"\"figures/search-icon.png\"/> to expand the drop-down list."
 msgstr ""
-"Les utilisateurs avancés vous pouvez <link href=\"https://bugzilla.gnome.org/";
-"show_bug.cgi?id=550796#c10\">combiner plusieurs conditions en utilisant la "
-"syntaxe <gui>Free form expression</gui></link>."
+"Cliquez sur l'icône de recherche <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/search-icon.png\"/> pour ouvrir la liste déroulante."
 
-#. (itstool) path: item/p
-#: C/mail-searching.page:46
+#: C/mail-searching.page:44(item/p)
 msgid "Select the scope from the drop-down list right to the text box."
 msgstr ""
 "Choisissez la portée dans la liste déroulante à côté de la boîte de texte."
 
-#. (itstool) path: note/p
-#: C/mail-searching.page:47
+#: C/mail-searching.page:45(note/p)
 msgid ""
 "For the <gui>Current Account</gui> scope, the term \"account\" refers to top-"
 "level nodes in the <link xref=\"intro-main-window#e-mail\"> mail folder "
@@ -11289,15 +10423,7 @@ msgstr ""
 "\">liste des dossiers de courriel</link>, tels que « Sur cet ordinateur » ou "
 "les comptes de messagerie distants."
 
-#. (itstool) path: item/p
-#: C/mail-searching.page:50 C/memos-searching.page:46
-#: C/memos-searching.page:52 C/tasks-searching.page:46
-#: C/tasks-searching.page:52
-msgid "Evolution displays the search results."
-msgstr "Evolution affiche les résultats de la recherche."
-
-#. (itstool) path: note/p
-#: C/mail-searching.page:52
+#: C/mail-searching.page:50(note/p)
 msgid ""
 "If you start directly from the fourth step, text will be searched in mail's "
 "subjects and addresses and scope will be \"Current folder\"."
@@ -11306,8 +10432,7 @@ msgstr ""
 "dans les sujets et adresses des courriels et la portée sera le « Dossier "
 "actuel »."
 
-#. (itstool) path: note/p
-#: C/mail-searching.page:53
+#: C/mail-searching.page:51(note/p)
 msgid ""
 "If you search for messages that are not in the same folder rather often you "
 "might want to create a search folder instead; see <link xref=\"mail-search-"
@@ -11318,23 +10443,20 @@ msgstr ""
 "place ; consultez <link xref=\"mail-search-folders\">Utilisation des "
 "dossiers de recherche</link> pour plus de détails."
 
-#. (itstool) path: info/desc
-#: C/mail-send-and-receive-automatically.page:5
+#: C/mail-send-and-receive-automatically.page:5(info/desc)
 msgid "Check automatically and regularly for new received mail."
 msgstr ""
 "Vérifier automatiquement et régulièrement la présence de nouveaux courriels "
 "reçus."
 
-#. (itstool) path: page/title
-#: C/mail-send-and-receive-automatically.page:20
+#: C/mail-send-and-receive-automatically.page:20(page/title)
 msgid "Automatically check for new mail"
 msgstr "Vérification automatique de la présence de nouveaux courriels"
 
-#. (itstool) path: page/p
-#: C/mail-send-and-receive-automatically.page:21
+#: C/mail-send-and-receive-automatically.page:21(page/p)
 msgid ""
 "If you want Evolution to check automatically for new messages, enable the "
-"option <gui>Check for new messages every … minutes</gui> in the "
+"option <gui>Check for new messages every ... minutes</gui> in the "
 "<gui>Receiving Options</gui> page of the mail account settings (accessible "
 "via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
 "gui><gui style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>) "
@@ -11346,48 +10468,38 @@ msgstr ""
 "de messagerie (accessible via <guiseq><gui>Édition</gui><gui>Préférences</"
 "gui><gui>Compte de messagerie</gui><gui style=\"button\">Édition</"
 "gui><gui>Options de réception</gui></guiseq>) et sélectionnez la fréquence "
-"en minutes"
+"en minutes."
 
-#. (itstool) path: note/p
-#: C/mail-send-and-receive-automatically.page:23
-msgid ""
-"Evolution supports <link href=\"https://en.wikipedia.org/wiki/IMAP_IDLE";
-"\">IMAP IDLE</link> on the currently selected folder and partially supports "
-"the <link href=\"http://tools.ietf.org/search/rfc5465\";>IMAP NOTIFY</link> "
-"extension."
-msgstr ""
-"<app<Evolution</app> sait gérer <link href=\"https://en.wikipedia.org/wiki/";
-"IMAP_IDLE\">IMAP IDLE</link> sur le dossier actuellement sélectionné et sait "
-"gérer partiellement l'extension <link href=\"https://en.wikipedia.org/wiki/";
-"IMAP_IDLE\">IMAP IDLE</link>."
-
-#. (itstool) path: info/desc
-#: C/mail-send-and-receive-manual.page:5
+#: C/mail-send-and-receive-manual.page:5(info/desc)
 msgid "Force sending and receiving emails."
 msgstr "Forcer la réception et l'envoi des courriels."
 
-#. (itstool) path: page/title
-#: C/mail-send-and-receive-manual.page:20
+#: C/mail-send-and-receive-manual.page:20(page/title)
 msgid "Manually send and receive messages"
 msgstr "Envoi et réception manuels de messages"
 
-#. (itstool) path: page/p
-#: C/mail-send-and-receive-manual.page:21
+#: C/mail-send-and-receive-manual.page:21(page/p)
+#, fuzzy
+#| msgid ""
+#| "To receive new messages from the mail server and to send messages you "
+#| "have written that are in the local Outbox, click the <gui style=\"button"
+#| "\">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or "
+#| "choose <guiseq><gui>File</gui><gui>Send / Receive</gui></guiseq> from the "
+#| "main menu."
 msgid ""
 "To receive new messages from the mail server and to send messages you have "
 "written that are in the local Outbox, click the <gui style=\"button\">Send / "
 "Receive</gui> button in the toolbar, or press <key>F12</key>, or choose "
 "<guiseq><gui>File</gui><gui>Send / Receive</gui></guiseq> from the main menu."
 msgstr ""
-"Pour recevoir de nouveaux messages à partir d'un serveur de messagerie et "
-"pour envoyer des messages que vous avez rédigés et qui sont dans la boîte "
-"d'envoi locale, cliquez sur le bouton <gui style=\"button"
-"\">Envoyer / Recevoir</gui> dans la barre d'outils ou pressez <key>F12</key> "
-"ou choisissez <guiseq><gui>Fichier</gui><gui>Envoyer / Recevoir</gui></"
-"guiseq> dans le menu principal."
+"Pour recevoir de nouveaux messages à partir d'un serveur de courriel et pour "
+"envoyer des messages que vous avez rédigés et qui sont dans la boîte d'envoi "
+"locale, cliquez sur le bouton <gui style=\"button\">Envoyer / Recevoir</gui> "
+"dans la barre d'outils ou pressez <key>F9</key> ou choisissez "
+"<guiseq><gui>Fichier</gui><gui>Envoyer / Recevoir</gui></guiseq> dans le "
+"menu principal."
 
-#. (itstool) path: page/p
-#: C/mail-send-and-receive-manual.page:22
+#: C/mail-send-and-receive-manual.page:22(page/p)
 msgid ""
 "To send and receive only for one of your mail accounts, or to only send or "
 "only receive, click the small down-arrow next to the <gui style=\"button"
@@ -11398,8 +10510,7 @@ msgstr ""
 "côte du bouton <gui style=\"button\">Envoyer / Recevoir</gui> et choisissez "
 "l'option correspondante."
 
-#. (itstool) path: page/p
-#: C/mail-send-and-receive-manual.page:23
+#: C/mail-send-and-receive-manual.page:23(page/p)
 msgid ""
 "If you just want to send messages which are in your Outbox, you can right-"
 "click on the Outbox and click <gui>Flush Outbox</gui>."
@@ -11408,18 +10519,15 @@ msgstr ""
 "d'envoi, vous pouvez faire un clic-droit sur la boîte d'envoi et cliquez sur "
 "<gui>Vider la boîte d'envoi</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-send-and-receive.page:5
+#: C/mail-send-and-receive.page:5(info/desc)
 msgid "On receiving mail and sending written emails."
 msgstr "À propos de la réception et l'envoi de courriels rédigés."
 
-#. (itstool) path: page/title
-#: C/mail-send-and-receive.page:20
+#: C/mail-send-and-receive.page:20(page/title)
 msgid "Sending and receiving mail"
 msgstr "Réception et envoi de courriels"
 
-#. (itstool) path: page/p
-#: C/mail-send-and-receive.page:22
+#: C/mail-send-and-receive.page:22(page/p)
 msgid ""
 "This section refers to receiving mail and sending written emails. For "
 "writing a new message, please refer to the <link xref=\"index#mail-composing"
@@ -11429,25 +10537,22 @@ msgstr ""
 "rédigés. Pour écrire un nouveau message, consultez la section <link xref="
 "\"index#mail-composing\">Édition de courriel</link>."
 
-#. (itstool) path: info/desc
-#: C/mail-sending-options-smtp.page:5
+#: C/mail-sending-options-smtp.page:5(info/desc)
 msgid "Sending options for SMTP."
 msgstr "Options d'envoi de SMTP."
 
-#. (itstool) path: item/p
-#: C/mail-sending-options-smtp.page:29
+#: C/mail-sending-options-smtp.page:29(item/p)
 msgid ""
 "Enter the address of your mail server for sending mail in the <gui>Server</"
 "gui> field and select if the server requires authentication (entering a "
 "username and a password)."
 msgstr ""
-"Saisissez l'adresse de votre serveur de messagerie pour l'envoi des "
-"courriels dans le champ <gui>Serveur</gui> et choisissez si le serveur "
-"nécessite une authentification (par la saisie d'un nom d'utilisateur et d' "
-"un mot de passe)."
+"Saisissez l'adresse de votre serveur de courriel pour l'envoi des courriels "
+"dans le champ <gui>Serveur</gui> et choisissez si le serveur nécessite une "
+"authentification (par la saisie d'un nom d'utilisateur et d' un mot de "
+"passe)."
 
-#. (itstool) path: item/p
-#: C/mail-sending-options-smtp.page:32
+#: C/mail-sending-options-smtp.page:32(item/p)
 msgid ""
 "If the server requires authentication, you need to provide the following "
 "information:"
@@ -11455,8 +10560,7 @@ msgstr ""
 "Si votre serveur demande une authentification, vous devez fournir les "
 "informations suivantes :"
 
-#. (itstool) path: item/p
-#: C/mail-sending-options-smtp.page:34
+#: C/mail-sending-options-smtp.page:34(item/p)
 msgid ""
 "Select the authentication type in the Authentication list, or click "
 "<gui>Check for Supported Types</gui> to have Evolution check. Some servers "
@@ -11470,20 +10574,17 @@ msgstr ""
 "charge, ce qui signifie que cette fonction ne garantit pas que les "
 "mécanismes disponibles fonctionnent réellement."
 
-#. (itstool) path: info/desc
-#: C/mail-several-pop-accounts.page:5
+#: C/mail-several-pop-accounts.page:5(info/desc)
 msgid "How to split and sort mail when using more than one local account."
 msgstr ""
 "Comment séparer et trier les courriels lorsque vous utilisez plus d'un "
 "compte local."
 
-#. (itstool) path: page/title
-#: C/mail-several-pop-accounts.page:22
+#: C/mail-several-pop-accounts.page:22(page/title)
 msgid "Separating POP mail for more than one account"
 msgstr "Séparation de courriel POP lorsque vous avez plus d'un compte"
 
-#. (itstool) path: page/p
-#: C/mail-several-pop-accounts.page:24
+#: C/mail-several-pop-accounts.page:24(page/p)
 msgid ""
 "It is not possible to have separate accounts in the accounts and folder list "
 "pane. Evolution only has one unique inbox for incoming email."
@@ -11492,15 +10593,14 @@ msgstr ""
 "de comptes et de dossiers. Evolution ne possède qu'une seule Boîte de "
 "réception pour les courriels entrants."
 
-#. (itstool) path: page/p
-#: C/mail-several-pop-accounts.page:25
+#: C/mail-several-pop-accounts.page:25(page/p)
 msgid ""
 "You can either use IMAP instead of POP, or move incoming emails into "
 "different folders by <link xref=\"mail-folders\">creating folders</link> and "
 "<link xref=\"mail-filters\">creating filters</link>: Create a new folder and "
 "create two subfolders (for incoming and for sent mail of that account). Now "
-"set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters…</"
-"gui><gui style=\"button\">Add</gui></guiseq> to move incoming mail to the "
+"set up an incoming filter via <guiseq><gui>Edit</gui><gui>Message Filters..."
+"</gui><gui style=\"button\">Add</gui></guiseq> to move incoming mail to the "
 "incoming folder by filtering on the recipient's address and set up an "
 "outgoing filter to move outgoing mail to the sent folder by filtering on the "
 "sender's address."
@@ -11517,18 +10617,15 @@ msgstr ""
 "courriels sortant dans le dossier des messages envoyés en filtrant sur "
 "l'adresse de l'expéditeur."
 
-#. (itstool) path: info/desc
-#: C/mail-sorting-message-list.page:5
+#: C/mail-sorting-message-list.page:5(info/desc)
 msgid "Sorting the message list of a mail folder."
 msgstr "Trier la liste des messages d'un dossier de courriel."
 
-#. (itstool) path: page/title
-#: C/mail-sorting-message-list.page:28
+#: C/mail-sorting-message-list.page:28(page/title)
 msgid "Sorting the message list"
 msgstr "Tri de la liste des messages"
 
-#. (itstool) path: page/p
-#: C/mail-sorting-message-list.page:30
+#: C/mail-sorting-message-list.page:30(page/p)
 msgid ""
 "Evolution lets you organize your emails by letting you sort messages in the "
 "<link xref=\"intro-main-window#e-mail\">message list</link>."
@@ -11536,13 +10633,11 @@ msgstr ""
 "Evolution vous permet d'organiser vos courriels en triant les messages dans "
 "la <link xref=\"intro-main-window#e-mail\">liste des messages</link>."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:33
+#: C/mail-sorting-message-list.page:33(section/title)
 msgid "Sorting Mail in Email Threads"
 msgstr "Tri des messages par fils de discussion"
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:34
+#: C/mail-sorting-message-list.page:34(section/p)
 msgid ""
 "You can use a threaded message view to sort emails. To enable this feature, "
 "click on <guiseq><gui>View</gui><gui>Group By Threads</gui></guiseq> or "
@@ -11553,8 +10648,7 @@ msgstr ""
 "<guiseq><gui>Affichage</gui><gui>Grouper par fils de discussion</gui></"
 "guiseq> ou pressez <keyseq><key>Ctrl</key><key>T</key></keyseq>."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:35
+#: C/mail-sorting-message-list.page:35(section/p)
 msgid ""
 "This feature, when enabled, groups replies with the original email and "
 "allows you to follow the flow of the conversation from one message to the "
@@ -11564,18 +10658,17 @@ msgstr ""
 "message d'origine et vous permet de suivre le flux de la conversation d'un "
 "message à l'autre."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:36
+#: C/mail-sorting-message-list.page:36(section/p)
 msgid ""
 "When a new message arrives, it will be added below the parent message. "
 "Threads are sorted and displayed based on the date of the most recent "
 "message received."
 msgstr ""
 "Lorsqu'un nouveau message arrive, il est ajouté sous le message parent. Les "
-"fils de discussion sont triés et affichés par ordre chronologique."
+"fils de discussion sont triés et affichés sur la base de la date du message "
+"reçu le plus récemment."
 
-#. (itstool) path: note/p
-#: C/mail-sorting-message-list.page:37
+#: C/mail-sorting-message-list.page:37(note/p)
 msgid ""
 "For Advanced Users: There is a GSettings key that allows you to toggle "
 "between the collapsed and expanded state of the email threads. The collapsed "
@@ -11589,8 +10682,7 @@ msgstr ""
 "<app>terminal</app> et en lançant la commande <cmd>gsettings set org.gnome."
 "evolution.mail thread-expand true</cmd>."
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:40
+#: C/mail-sorting-message-list.page:40(item/p)
 msgid ""
 "Run the command <cmd>gsettings set org.gnome.desktop.interface can-change-"
 "accels true</cmd>"
@@ -11598,13 +10690,11 @@ msgstr ""
 "Lancez la commande <cmd>gsettings set org.gnome.desktop.interface can-change-"
 "accels true</cmd>."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:46
+#: C/mail-sorting-message-list.page:46(section/title)
 msgid "Sorting Mail with Column Headers"
 msgstr "Tri des messages avec les en-têtes de colonne"
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:47
+#: C/mail-sorting-message-list.page:47(section/p)
 msgid ""
 "The message list displays columns that indicate whether a message has been "
 "read, whether it has attachments, how important the message is, the sender, "
@@ -11612,30 +10702,26 @@ msgid ""
 "can do one of the following:"
 msgstr ""
 "La liste des messages comporte normalement des colonnes pour indiquer si un "
-"message a été lu, s'il possède des pièces jointes, ainsi que son importance, "
+"message a été lu, s'il possède des pièces jointes, son importance, "
 "l'expéditeur, la date et le sujet. Pour modifier les colonnes utilisées, "
 "vous pouvez :"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:49
+#: C/mail-sorting-message-list.page:49(item/p)
 msgid "Drag and drop the column header bars"
 msgstr "déplacer les barres d'en-tête de colonne,"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:50
+#: C/mail-sorting-message-list.page:50(item/p)
 msgid "Right-click on the header."
 msgstr "faire un clic-droit sur l'en-tête,"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:51
+#: C/mail-sorting-message-list.page:51(item/p)
 msgid ""
 "Select the <gui>Remove This Column</gui> or <gui>Add a Column</gui> option."
 msgstr ""
 "sélectionner l'option <gui>Enlever cette colonne</gui> ou <gui>Ajouter une "
 "colonne</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:54
+#: C/mail-sorting-message-list.page:54(section/p)
 msgid ""
 "Evolution allows you to sort your messages using these columns. Just click "
 "on the column label to sort the emails. The direction of the arrow next to "
@@ -11645,13 +10731,11 @@ msgstr ""
 "suffit de cliquer sur l'étiquette de la colonne pour trier les courriels. La "
 "direction de la flèche à côté de l'étiquette indique la direction du tri."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:58
+#: C/mail-sorting-message-list.page:58(section/title)
 msgid "Using Other Sorting Options"
 msgstr "Utilisation d'autres options de tri"
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:59
+#: C/mail-sorting-message-list.page:59(section/p)
 msgid ""
 "Evolution provides other ways for sorting email messages. You can use Sort "
 "By, Sort Ascending, Sort Descending, or Unsort."
@@ -11659,173 +10743,142 @@ msgstr ""
 "Evolution fournit d'autres façons de trier les messages de courriel. Vous "
 "pouvez utiliser Trier par, Tri croissant, Tri décroissant ou Ne pas trier."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:61
+#: C/mail-sorting-message-list.page:61(section/title)
 msgid "Sort By"
 msgstr "Trier par"
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:62
+#: C/mail-sorting-message-list.page:62(section/p)
 msgid "You can also sort email messages using the <gui>Sort By</gui> list."
 msgstr ""
 "Vous pouvez également trier les messages de courriel en utilisant la liste "
 "<gui>Trier par</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:64 C/mail-sorting-message-list.page:94
-#: C/mail-sorting-message-list.page:103 C/mail-sorting-message-list.page:112
+#: C/mail-sorting-message-list.page:64(item/p)
+#: C/mail-sorting-message-list.page:94(item/p)
+#: C/mail-sorting-message-list.page:103(item/p)
+#: C/mail-sorting-message-list.page:112(item/p)
 msgid "Right-click on the message list column headers."
 msgstr ""
 "Faites un clic-droit sur l'en-tête de la colonne de la liste des messages."
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:65
+#: C/mail-sorting-message-list.page:65(item/p)
 msgid "Select the <gui>Sort By</gui> option."
 msgstr "Sélectionnez l'option <gui>Trier par</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:65
+#: C/mail-sorting-message-list.page:65(item/p)
 msgid "This brings up this list of criteria for sorting email messages:"
 msgstr "Cela fait apparaître cette liste de critères de tri des messages :"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:67
+#: C/mail-sorting-message-list.page:67(item/p)
 msgid "Subject - Trimmed"
 msgstr "Sujet - Tronqué"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:68
+#: C/mail-sorting-message-list.page:68(item/p)
 msgid "Labels"
 msgstr "Étiquettes"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:69
+#: C/mail-sorting-message-list.page:69(item/p)
 msgid "Recipients"
 msgstr "Destinataires"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:70
+#: C/mail-sorting-message-list.page:70(item/p)
 msgid "Sender"
 msgstr "Expéditeur"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:71
+#: C/mail-sorting-message-list.page:71(item/p)
 msgid "Location"
 msgstr "Emplacement"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:72
+#: C/mail-sorting-message-list.page:72(item/p)
 msgid "Due By"
 msgstr "Date d'échéance"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:73
+#: C/mail-sorting-message-list.page:73(item/p)
 msgid "<link xref=\"mail-follow-up-flag\">Follow Up Flag</link>"
 msgstr "<link xref=\"mail-follow-up-flag\">Marqueur de suivi</link>"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:74
+#: C/mail-sorting-message-list.page:74(item/p)
 msgid "Flag Status"
 msgstr "État des marqueurs"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:75
+#: C/mail-sorting-message-list.page:75(item/p)
 msgid "Size"
 msgstr "Taille"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:76
+#: C/mail-sorting-message-list.page:76(item/p)
 msgid "To"
 msgstr "À"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:77
+#: C/mail-sorting-message-list.page:77(item/p)
 msgid "Received"
 msgstr "Reçu"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:78
+#: C/mail-sorting-message-list.page:78(item/p)
 msgid "Date"
 msgstr "Date"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:79
+#: C/mail-sorting-message-list.page:79(item/p)
 msgid "Subject"
 msgstr "Sujet"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:80
+#: C/mail-sorting-message-list.page:80(item/p)
 msgid "From"
 msgstr "De"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:81
+#: C/mail-sorting-message-list.page:81(item/p)
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:82
+#: C/mail-sorting-message-list.page:82(item/p)
 msgid "Flagged"
 msgstr "Marqué"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:83
+#: C/mail-sorting-message-list.page:83(item/p)
 msgid "Status"
 msgstr "État"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:84
+#: C/mail-sorting-message-list.page:84(item/p)
 msgid "Custom"
 msgstr "Personnalisé"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:87
+#: C/mail-sorting-message-list.page:87(item/p)
 msgid "Select the option you wish to use in sorting email messages."
 msgstr ""
 "Sélectionnez l'option que vous voulez utiliser pour le tri des messages."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:92
+#: C/mail-sorting-message-list.page:92(section/title)
 msgid "Sort Ascending"
 msgstr "Tri croissant"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:95
+#: C/mail-sorting-message-list.page:95(item/p)
 msgid "Select the <gui>Sort Ascending</gui> option."
 msgstr "Sélectionnez l'option <gui>Tri croissant</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:97
+#: C/mail-sorting-message-list.page:97(section/p)
 msgid "The messages will be displayed with the most recent at the bottom."
 msgstr "Les messages les plus récents sont affichés en dernier."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:101
+#: C/mail-sorting-message-list.page:101(section/title)
 msgid "Sort Descending"
 msgstr "Tri décroissant"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:104
+#: C/mail-sorting-message-list.page:104(item/p)
 msgid "Select the <gui>Sort Descending</gui> option."
 msgstr "Sélectionnez l'option <gui>Tri décroissant</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:106
+#: C/mail-sorting-message-list.page:106(section/p)
 msgid "The messages will be displayed with the most recent at the top."
 msgstr "Les messages les plus récents sont affichés en premier."
 
-#. (itstool) path: section/title
-#: C/mail-sorting-message-list.page:110
+#: C/mail-sorting-message-list.page:110(section/title)
 msgid "Unsort"
 msgstr "Ne pas trier"
 
-#. (itstool) path: item/p
-#: C/mail-sorting-message-list.page:113
+#: C/mail-sorting-message-list.page:113(item/p)
 msgid "Select the <gui>Unsort</gui> option."
 msgstr "Sélectionnez l'option <gui>Ne pas trier</gui>."
 
-#. (itstool) path: section/p
-#: C/mail-sorting-message-list.page:115
+#: C/mail-sorting-message-list.page:115(section/p)
 msgid ""
 "This removes sorting from the column, reverting to the order of messages as "
 "they were added to the folder."
@@ -11833,18 +10886,15 @@ msgstr ""
 "Cela enlève le tri selon cette colonne, revenant à l'état de tri des "
 "messages selon leur ordre d'arrivée dans le dossier."
 
-#. (itstool) path: info/desc
-#: C/mail-spam-marking.page:5
+#: C/mail-spam-marking.page:5(info/desc)
 msgid "How to mark unwanted junk and spam mail."
 msgstr "Comment marquer les pourriels."
 
-#. (itstool) path: page/title
-#: C/mail-spam-marking.page:30
+#: C/mail-spam-marking.page:30(page/title)
 msgid "Marking Mail as Junk"
 msgstr "Marquage d'un message comme pourriel"
 
-#. (itstool) path: page/p
-#: C/mail-spam-marking.page:32
+#: C/mail-spam-marking.page:32(page/p)
 msgid ""
 "While SpamAssassin comes with a set of predefined rules, Bogofilter needs to "
 "be taught first before it will automatically filter junk mail. If you only "
@@ -11859,20 +10909,17 @@ msgstr ""
 "Bogofilter a besoin d'être éduqué avant de pouvoir filtrer automatiquement "
 "les pourriels. Si vous entraînez Bogofilter sur de mauvais messages, il "
 "supposera que tous les courriels sont mauvais (parce qu'il ne sait pas faire "
-"la différence), et par conséquent il ne prendra pas de décision tant que la "
-"base de données ne sera pas suffisamment grande pour déterminer ce qui est "
-"ou n'est pas pourriel. Dans tous les cas, lorsque vous commencez à utiliser "
-"le blocage des pourriels, vérifiez le dossier <gui>Pourriels</gui> "
-"fréquemment pour être sûr que des courriels légitimes ne sont marqués comme "
-"pourriels."
-
-#. (itstool) path: section/title
-#: C/mail-spam-marking.page:35
+"la différence) par conséquent il ne prendra pas de décision tant que la base "
+"de données n'est pas suffisamment grande pour déterminer ce qui est ou n'est "
+"pas pourriel. Dans tous les cas, lorsque vous commencez à utiliser le "
+"blocage des pourriels, vérifiez le dossier <gui>Pourriels</gui> fréquemment "
+"pour être sûr que des courriels légitimes ne sont marqués comme pourriels."
+
+#: C/mail-spam-marking.page:35(section/title)
 msgid "Manually Marking Junk Mail"
 msgstr "Marquage manuel des pourriels"
 
-#. (itstool) path: section/p
-#: C/mail-spam-marking.page:36
+#: C/mail-spam-marking.page:36(section/p)
 msgid ""
 "If Evolution misses junk mail, right-click the message, then click <gui>Mark "
 "as Junk</gui>, or mark the message and press <keyseq><key>Ctrl</key><key>J</"
@@ -11887,8 +10934,7 @@ msgstr ""
 "courriel, le filtre pourra reconnaître les messages semblables à l'avenir, "
 "et devenir de plus en plus performant avec le temps."
 
-#. (itstool) path: section/p
-#: C/mail-spam-marking.page:37
+#: C/mail-spam-marking.page:37(section/p)
 msgid ""
 "If legitimate mail is incorrectly flagged, remove it from the <gui>Junk</"
 "gui> folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> "
@@ -11901,37 +10947,31 @@ msgstr ""
 "key><key>Ctrl</key><key>J</key></keyseq> ou sélectionnez le message et "
 "cliquez sur le bouton <gui>Non pourriel</gui>."
 
-#. (itstool) path: info/desc
-#: C/mail-spam.page:5
+#: C/mail-spam.page:5(info/desc)
 msgid "How to automatically handle unwanted mail."
 msgstr "Comment gérer de manière automatique les pourriels."
 
-#. (itstool) path: page/title
-#: C/mail-spam.page:20
+#: C/mail-spam.page:20(page/title)
 msgid "Junk and Spam Mail Handling"
 msgstr "Gestion des pourriels"
 
-#. (itstool) path: info/desc
-#: C/mail-spam-settings.page:7
+#: C/mail-spam-settings.page:7(info/desc)
 msgid "How to set up handling unwanted junk/spam mail."
 msgstr "Comment configurer la gestion des pourriels (spam) non désirés."
 
-#. (itstool) path: page/title
-#: C/mail-spam-settings.page:36
+#: C/mail-spam-settings.page:36(page/title)
 msgid "Junk Mail Settings"
 msgstr "Paramètres de détection des pourriels"
 
-#. (itstool) path: section/title
-#: C/mail-spam-settings.page:39
+#: C/mail-spam-settings.page:39(section/title)
 msgid "Tools"
 msgstr "Outils"
 
-#. (itstool) path: section/p
-#: C/mail-spam-settings.page:40
+#: C/mail-spam-settings.page:40(section/p)
 msgid ""
-"<app>Evolution</app> lets you check for unwanted junk or spam email by using "
-"the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use these "
-"tools, you need to make sure that they are installed via the software "
+"<app>Evolution</app> lets you check for unwanted junk or spam emails by "
+"using the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use "
+"these tools, you need to make sure that they are installed via the software "
 "management tool of your distribution."
 msgstr ""
 "<app>Evolution</app> vous permet de contrôler les pourriels en utilisant les "
@@ -11939,8 +10979,7 @@ msgstr ""
 "outils, vous devez vérifier qu'ils sont installés via l'outil de gestion des "
 "logiciels de votre distribution."
 
-#. (itstool) path: note/p
-#: C/mail-spam-settings.page:43
+#: C/mail-spam-settings.page:43(note/p)
 msgid ""
 "You might need to install <app>Bogofilter</app> or <app>SpamAssassin</app> "
 "to perform these steps."
@@ -11948,8 +10987,7 @@ msgstr ""
 "Il se peut que vous deviez installer <app>Bogofilter</app> ou "
 "<app>SpamAssassin</app> pour réaliser ces étapes."
 
-#. (itstool) path: when/p
-#: C/mail-spam-settings.page:46
+#: C/mail-spam-settings.page:46(when/p)
 msgid ""
 "<link action=\"install:bogofilter\" href=\"http://bogofilter.sourceforge.net/";
 "\" style=\"button\">Install bogofilter</link>"
@@ -11957,8 +10995,7 @@ msgstr ""
 "<link action=\"install:bogofilter\" href=\"http://bogofilter.sourceforge.net/";
 "\" style=\"button\">Installer bogofilter</link>"
 
-#. (itstool) path: when/p
-#: C/mail-spam-settings.page:47
+#: C/mail-spam-settings.page:47(when/p)
 msgid ""
 "<link action=\"install:spamassassin\" href=\"http://spamassassin.apache.org/";
 "\" style=\"button\">Install spamassassin</link>"
@@ -11966,8 +11003,7 @@ msgstr ""
 "<link action=\"install:spamassassin\" href=\"http://spamassassin.apache.org/";
 "\" style=\"button\">Installer spamassassin</link>"
 
-#. (itstool) path: section/p
-#: C/mail-spam-settings.page:52
+#: C/mail-spam-settings.page:52(section/p)
 msgid ""
 "SpamAssassin works through a set of predefined rules, hence it can determine "
 "spam straight away. Bogofilter does not come with a default set of spam "
@@ -11982,13 +11018,11 @@ msgstr ""
 "marking\">l'entraîner</link> d'abord pour qu'il fonctionne. Vous pouvez "
 "modifier les actions de SpamAssassin en l'entraînant également."
 
-#. (itstool) path: section/title
-#: C/mail-spam-settings.page:56
+#: C/mail-spam-settings.page:56(section/title)
 msgid "Junk Mail Folder"
 msgstr "Dossier des pourriels"
 
-#. (itstool) path: section/p
-#: C/mail-spam-settings.page:57
+#: C/mail-spam-settings.page:57(section/p)
 msgid ""
 "Messages that are marked as junk (either manually by the user or "
 "automatically via SpamAssassin or Bogofilter) will be moved to the "
@@ -11998,29 +11032,31 @@ msgstr ""
 "automatiquement via SpamAssassin ou Bogofilter) seront déplacés dans le "
 "dossier de courriel <gui>Pourriels</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-spam-settings.page:61
+#: C/mail-spam-settings.page:61(section/title)
 msgid "Junk Mail Preferences"
 msgstr "Préférences du pourriel"
 
-#. (itstool) path: note/p
-#: C/mail-spam-settings.page:62
+#: C/mail-spam-settings.page:62(note/p)
+#, fuzzy
+#| msgid ""
+#| "The junk mail options discussed in this page refer only to POP and Local "
+#| "Delivery. For handling junk mails on IMAP, see the Evolution settings "
+#| "under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+#| "gui><gui style=\"button\">Edit</gui><gui>Receiving Options</gui></guiseq>."
 msgid ""
 "The junk mail options discussed in this page refer only to POP and Local "
-"Delivery accounts. For handling junk mail on IMAP accounts, see the "
+"Delivery accounts. For handling junk mails on IMAP accounts, see the "
 "Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</"
 "gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</gui><gui>Receiving "
 "Options</gui></guiseq>."
 msgstr ""
-"Les options de pourriels discutées sur cette page ne se réfèrent qu'aux "
-"comptes POP et de distribution locale. Pour la gestion des pourriels des "
-"comptes IMAP, consultez les paramètres d'<app>Evolution</app> sous "
-"<guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Comptes de messagerie</"
-"gui><gui style=\"button\">Modifier</gui><gui>Options de réception</gui></"
-"guiseq>."
+"Les options de pourriels discutées sur cette page ne se réfèrent qu'au "
+"protocoles POP et Local Delivery. Pour la gestion des pourriels avec IMAP, "
+"consultez les paramètres d'Evolution sous <guiseq><gui>Édition</"
+"gui><gui>Préférences</gui><gui>Comptes de messagerie</gui><gui style=\"button"
+"\">Modifier</gui><gui>Options de réception</gui></guiseq>."
 
-#. (itstool) path: section/p
-#: C/mail-spam-settings.page:63
+#: C/mail-spam-settings.page:63(section/p)
 msgid ""
 "You can modify how Evolution handles junk mail by changing the Junk Mail "
 "Preferences:"
@@ -12028,8 +11064,7 @@ msgstr ""
 "Vous pouvez modifier la façon dont Evolution prend en charge le pourriel en "
 "modifiant les préférences des pourriels :"
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:65
+#: C/mail-spam-settings.page:65(item/p)
 msgid ""
 "Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press "
 "<keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>."
@@ -12038,48 +11073,47 @@ msgstr ""
 "utilisez la combinaison <keyseq><key>Maj</key><key>Ctrl</key><key>S</key></"
 "keyseq>."
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:66
+#: C/mail-spam-settings.page:66(item/p)
 msgid "Select <gui>Mail Preferences</gui>."
 msgstr "Sélectionnez <gui>Préférences du courriel</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:67
+#: C/mail-spam-settings.page:67(item/p)
 msgid "Click on the <gui>Junk</gui> tab. Here, you can specify the following:"
 msgstr ""
 "Cliquez sur l'onglet <gui>Pourriel</gui>. Là, vous pouvez paramétrer les "
 "choses suivantes :"
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:69
-msgid "Checking incoming messages for junk."
+#: C/mail-spam-settings.page:69(item/p)
+msgid "Checking incoming mail for junk messages."
 msgstr "Détecter les pourriels dans les messages entrants."
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:70
+#: C/mail-spam-settings.page:70(item/p)
 msgid ""
 "Deleting junk messages upon exit, and how often junk messages are to be "
 "deleted."
 msgstr ""
-"Supprimer les pourriels quand vous quittez en indiquant la fréquence de leur "
+"Supprimer les pourriels en quittant en indiquant la fréquence de leur "
 "suppression."
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:71
+#: C/mail-spam-settings.page:71(item/p)
+msgid "Checking custom headers for junk."
+msgstr "Détecter les pourriels en utilisant des en-têtes personnalisés."
+
+#: C/mail-spam-settings.page:72(item/p)
 msgid "Marking messages as not junk if the sender is in the address book."
 msgstr ""
 "Ne pas marquer les messages comme pourriel si l'expéditeur est présent dans "
 "mon carnet d'adresses."
 
-#. (itstool) path: item/p
-#: C/mail-spam-settings.page:72
-msgid "Checking custom mail headers (added by your mail server) for junk."
-msgstr ""
-"Détecter les pourriels dans les en-têtes de courrier personnel (ajoutés par "
-"votre serveur de courrier)."
+#: C/mail-spam-settings.page:73(item/p)
+msgid "The default junk filter."
+msgstr "Le greffon par défaut pour le traitement des pourriels."
+
+#: C/mail-spam-settings.page:74(item/p)
+msgid "Bogofilter and SpamAssassin options."
+msgstr "Options de Bogofilter et SpamAssassin."
 
-#. (itstool) path: note/p
-#: C/mail-spam-settings.page:77
+#: C/mail-spam-settings.page:79(note/p)
 msgid ""
 "For more information and specific Bogofilter or SpamAssassin configuration "
 "questions it is recommended to check out the Frequently Asked Questions for "
@@ -12093,28 +11127,24 @@ msgstr ""
 "\">Bogofilter</link> ou <link href=\"http://wiki.apache.org/spamassassin/";
 "FrequentlyAskedQuestions\">SpamAssassin</link>."
 
-#. (itstool) path: info/desc
-#: C/mail-two-trash-folders.page:5
+#: C/mail-two-trash-folders.page:5(info/desc)
 msgid "How to have only one trash or junk folder per account."
 msgstr "Comment n'avoir qu'un dossier corbeille ou pourriels par compte."
 
-#. (itstool) path: page/title
-#: C/mail-two-trash-folders.page:25
+#: C/mail-two-trash-folders.page:25(page/title)
 msgid "Two Trash or Junk folders shown for the same account"
 msgstr "Deux dossiers Corbeille ou Pourriels affichés pour le même compte"
 
-#. (itstool) path: page/p
-#: C/mail-two-trash-folders.page:27
+#: C/mail-two-trash-folders.page:27(page/p)
 msgid ""
 "If you use a remote mail account that also has Junk and/or Trash folders on "
 "the server you might face duplicated folders in Evolution."
 msgstr ""
-"Si vous utilisez un compte de messagerie distant qui a aussi des dossiers "
-"Pourriels et/ou Corbeille sur le serveur, vous pourriez rencontrer des "
+"Si vous utilisez un compte de courriel distant qui a aussi des dossiers "
+"Pourriels et/ou Corbeille sur le serveur, you pourriez rencontrer des "
 "dossiers dupliqués dans Evolution."
 
-#. (itstool) path: page/p
-#: C/mail-two-trash-folders.page:28
+#: C/mail-two-trash-folders.page:28(page/p)
 msgid ""
 "You can easily tell the two Trash folders apart by looking at their icons. "
 "The Evolution <gui>Trash</gui> folder has a special icon whereas the other "
@@ -12125,8 +11155,7 @@ msgstr ""
 "alors que l'autre dossier Corbeille physique possède une icône de dossier "
 "classique."
 
-#. (itstool) path: page/p
-#: C/mail-two-trash-folders.page:30
+#: C/mail-two-trash-folders.page:30(page/p)
 msgid ""
 "By default, Evolution's <gui>Trash</gui> and <gui>Junk</gui> folders are "
 "<link xref=\"mail-search-folders\">Search folders</link>. They do not really "
@@ -12139,8 +11168,7 @@ msgstr ""
 "tous les messages qui sont marqués comme pourriels ou supprimés dans tous "
 "les dossiers de ce compte."
 
-#. (itstool) path: page/p
-#: C/mail-two-trash-folders.page:32
+#: C/mail-two-trash-folders.page:32(page/p)
 msgid ""
 "In order to only use the folders for Junk and Trash on the mail server, "
 "select the corresponding <gui>Use a Real Folder</gui> option under "
@@ -12155,18 +11183,15 @@ msgstr ""
 "gui><gui>Valeurs par défaut</gui></guiseq>. Dans ce cas, les dossiers "
 "virtuels locaux d'Evolution ne seront pas utilisés."
 
-#. (itstool) path: info/desc
-#: C/mail-usenet-subscriptions.page:5
+#: C/mail-usenet-subscriptions.page:5(info/desc)
 msgid "Subscribing to Usenet newsgroups."
 msgstr "Inscription aux groupes de nouvelles Usenet."
 
-#. (itstool) path: page/title
-#: C/mail-usenet-subscriptions.page:25
+#: C/mail-usenet-subscriptions.page:25(page/title)
 msgid "Newsgroups Subscriptions"
 msgstr "Inscription aux groupes de nouvelles"
 
-#. (itstool) path: page/p
-#: C/mail-usenet-subscriptions.page:27
+#: C/mail-usenet-subscriptions.page:27(page/p)
 msgid ""
 "When you create a newsgroup account, you are not subscribed to any groups. "
 "To subscribe to a newsgroup:"
@@ -12174,31 +11199,26 @@ msgstr ""
 "Lorsque vous créez un compte de groupe de nouvelles, vous n'êtes inscrit à "
 "aucun groupe. Pour vous inscrire à un groupe de nouvelles :"
 
-#. (itstool) path: item/p
-#: C/mail-usenet-subscriptions.page:29
+#: C/mail-usenet-subscriptions.page:29(item/p)
 msgid "Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>."
 msgstr ""
 "Sélectionnez <guiseq><gui>Dossier</gui><gui>Abonnements</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/mail-usenet-subscriptions.page:31
+#: C/mail-usenet-subscriptions.page:31(item/p)
 msgid "Click a group's checkbox to add a folder to your subscriptions."
 msgstr ""
 "Cochez la case d'un groupe pour ajouter un dossier à la liste des "
 "abonnements."
 
-#. (itstool) path: info/desc
-#: C/mail-vertical-view.page:5
+#: C/mail-vertical-view.page:5(info/desc)
 msgid "Changing the mail view for widescreen displays."
 msgstr "Modifier l'affichage des courriels pour les écrans larges."
 
-#. (itstool) path: page/title
-#: C/mail-vertical-view.page:22
+#: C/mail-vertical-view.page:22(page/title)
 msgid "Vertical view"
 msgstr "Affichage vertical"
 
-#. (itstool) path: page/p
-#: C/mail-vertical-view.page:24
+#: C/mail-vertical-view.page:24(page/p)
 msgid ""
 "Evolution provides a vertical view in addition to the classical view. In the "
 "vertical view, the message preview pane is located at the right side of the "
@@ -12212,8 +11232,7 @@ msgstr ""
 "en-dessous de la liste des messages. L'affichage vertical vous permet "
 "d'exploiter la largeur supplémentaire des écrans au format écran large."
 
-#. (itstool) path: page/p
-#: C/mail-vertical-view.page:26
+#: C/mail-vertical-view.page:26(page/p)
 msgid ""
 "To switch to vertical view, click <guiseq><gui>View</gui><gui>Preview</"
 "gui><gui>Vertical View</gui></guiseq>."
@@ -12221,8 +11240,7 @@ msgstr ""
 "Pour passer à l'affichage vertical, choisissez <guiseq><gui>Affichage</"
 "gui><gui>Aperçu</gui><gui>Affichage vertical</gui></guiseq>."
 
-#. (itstool) path: page/p
-#: C/mail-vertical-view.page:28
+#: C/mail-vertical-view.page:28(page/p)
 msgid ""
 "In vertical view, the message list contains double lines of compressed "
 "headers, which enables you to consume the extra width in the preview column. "
@@ -12235,8 +11253,7 @@ msgstr ""
 "l'expéditeur, l'icône de pièces jointes, la date ainsi que le sujet en "
 "seconde ligne."
 
-#. (itstool) path: page/p
-#: C/mail-vertical-view.page:30
+#: C/mail-vertical-view.page:30(page/p)
 msgid ""
 "To switch back to classical view, click <guiseq><gui>View</gui><gui>Preview</"
 "gui><gui>Classical View</gui></guiseq>."
@@ -12244,18 +11261,15 @@ msgstr ""
 "Pour repasser à l'affichage classique, choisissez <guiseq><gui>Affichage</"
 "gui><gui>Aperçu</gui><gui>Affichage classique</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/mail-word-wrap.page:5
+#: C/mail-word-wrap.page:5(info/desc)
 msgid "Words are wrapped in outgoing mails at 72 characters."
 msgstr "Passage à la ligne dans les courriels sortants au 72e caractère."
 
-#. (itstool) path: page/title
-#: C/mail-word-wrap.page:20
-msgid "Words are wrapped in outgoing mail at 72 characters"
+#: C/mail-word-wrap.page:20(page/title)
+msgid "Words are wrapped in outgoing mails at 72 characters"
 msgstr "Passage à la ligne dans les courriels sortants au 72e caractère"
 
-#. (itstool) path: page/p
-#: C/mail-word-wrap.page:22
+#: C/mail-word-wrap.page:22(page/p)
 msgid ""
 "For better readability lines are wrapped after 72 characters. This value is "
 "hardcoded and cannot be changed."
@@ -12263,8 +11277,7 @@ msgstr ""
 "Pour une meilleure lisibilité, les lignes sont coupées après 72 caractères. "
 "Cette valeur est codée en dur et ne peut pas être modifiée."
 
-#. (itstool) path: page/p
-#: C/mail-word-wrap.page:23
+#: C/mail-word-wrap.page:23(page/p)
 msgid ""
 "To avoid line breaks within a paragraph, mark the paragraph and choose "
 "<guiseq><gui>Format</gui><gui>Paragraph Style</gui><gui>Preformatted</gui></"
@@ -12274,19 +11287,16 @@ msgstr ""
 "paragraphe et sélectionnez <guiseq><gui>Format</gui><gui>Style de "
 "paragraphe</gui><gui>Préformaté</gui></guiseq> dans l'éditeur de courriel."
 
-#. (itstool) path: info/desc
-#: C/mail-working-offline.page:5
+#: C/mail-working-offline.page:5(info/desc)
 msgid "Work with your mail while not being connected to the network."
 msgstr ""
 "Travailler avec vos courriels alors que vous n'êtes pas connecté au réseau."
 
-#. (itstool) path: page/title
-#: C/mail-working-offline.page:23
+#: C/mail-working-offline.page:23(page/title)
 msgid "Working Offline"
 msgstr "Travail hors ligne"
 
-#. (itstool) path: page/p
-#: C/mail-working-offline.page:25
+#: C/mail-working-offline.page:25(page/p)
 msgid ""
 "Forced offline mode helps you communicate with remote mail storage systems "
 "like GroupWise, IMAP or Exchange, in situations where you are not connected "
@@ -12301,8 +11311,7 @@ msgstr ""
 "de composer des messages et de les stocker dans la boîte d'envoi en vue de "
 "leur expédition lors de votre prochaine connexion."
 
-#. (itstool) path: note/p
-#: C/mail-working-offline.page:27 C/offline.page:40
+#: C/mail-working-offline.page:27(note/p) C/offline.page:30(note/p)
 msgid ""
 "Evolution's forced offline mode only refers to mail and does not apply to "
 "contacts and calendars."
@@ -12310,8 +11319,7 @@ msgstr ""
 "Le mode hors ligne forcé d'Evolution fait uniquement référence aux courriels "
 "et ne s'applique pas aux contacts ni aux agendas."
 
-#. (itstool) path: page/p
-#: C/mail-working-offline.page:29
+#: C/mail-working-offline.page:29(page/p)
 msgid ""
 "POP mail downloads all messages to your local system, but other connections "
 "usually download just the headers, and get the rest only when you want to "
@@ -12324,36 +11332,30 @@ msgstr ""
 "de forcer Evolution à se mettre hors ligne, il télécharge les messages non "
 "lus se trouvant dans les dossiers que vous avez choisis de conserver."
 
-#. (itstool) path: section/title
-#: C/mail-working-offline.page:32
+#: C/mail-working-offline.page:32(section/title)
 msgid "Marking folders for offline usage"
 msgstr "Signalement des dossiers pour utilisation hors ligne"
 
-#. (itstool) path: section/p
-#: C/mail-working-offline.page:33
+#: C/mail-working-offline.page:33(section/p)
 msgid "To mark a mail folder for offline use,"
 msgstr "Pour marquer un dossier de courriel pour une utilisation hors ligne,"
 
-#. (itstool) path: item/p
-#: C/mail-working-offline.page:35
+#: C/mail-working-offline.page:35(item/p)
 msgid "Right-click the folder, then click <gui>Properties</gui>."
 msgstr ""
 "Faites un clic-droit sur le dossier, puis choisissez <gui>Propriétés</gui>."
 
-#. (itstool) path: item/p
-#: C/mail-working-offline.page:36
+#: C/mail-working-offline.page:36(item/p)
 msgid "Click <gui>Copy folder content locally for offline operation</gui>."
 msgstr ""
 "Cliquez sur <gui>Copier localement le contenu du dossier pour les opérations "
 "hors ligne</gui>."
 
-#. (itstool) path: section/title
-#: C/mail-working-offline.page:41
+#: C/mail-working-offline.page:41(section/title)
 msgid "Syncing messages for offline usage"
 msgstr "Synchronisation des messages pour une utilisation hors ligne"
 
-#. (itstool) path: section/p
-#: C/mail-working-offline.page:42
+#: C/mail-working-offline.page:42(section/p)
 msgid ""
 "Your connection status is shown by the small icon in the lower left corner "
 "of the Evolution main window. When you are online, it displays two connected "
@@ -12371,8 +11373,7 @@ msgstr ""
 "travailler hors ligne ou synchroniser les dossiers localement avant d'être "
 "déconnecté."
 
-#. (itstool) path: section/p
-#: C/mail-working-offline.page:43
+#: C/mail-working-offline.page:43(section/p)
 msgid ""
 "To download Messages for Offline Operations without immediately going "
 "offline, select <guiseq><gui>File</gui><gui>Download Messages for Offline "
@@ -12382,13 +11383,11 @@ msgstr ""
 "directement mis hors ligne, sélectionnez <guiseq><gui>Fichier</"
 "gui><gui>Télécharger les messages pour utilisation hors ligne</gui></guiseq>."
 
-#. (itstool) path: section/title
-#: C/mail-working-offline.page:47
+#: C/mail-working-offline.page:47(section/title)
 msgid "Automatic Network State Handling"
 msgstr "Gestion automatique de l'état du réseau"
 
-#. (itstool) path: section/p
-#: C/mail-working-offline.page:48
+#: C/mail-working-offline.page:48(section/p)
 msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
@@ -12399,38 +11398,32 @@ msgstr ""
 "disponible et se remet en ligne dès que le réseau est de nouveau "
 "opérationnel."
 
-#. (itstool) path: info/desc
-#: C/memos-searching.page:5
+#: C/memos-searching.page:5(info/desc)
 msgid "Searching memos."
 msgstr "Rechercher des mémos."
 
-#. (itstool) path: page/title
-#: C/memos-searching.page:28
+#: C/memos-searching.page:28(page/title)
 msgid "Searching Memos"
 msgstr "Recherche de mémos"
 
-#. (itstool) path: section/title
-#: C/memos-searching.page:31
+#: C/memos-searching.page:31(section/title)
 msgid "Searching in a Single Memo"
 msgstr "Recherche dans un seul mémo"
 
-#. (itstool) path: section/p
-#: C/memos-searching.page:32
+#: C/memos-searching.page:32(section/p)
 msgid ""
 "To find text in the displayed memo, select <guiseq><gui>Edit</gui><gui>Find "
-"in Memo…</gui></guiseq> from the main menu."
+"in Memo...</gui></guiseq> from the main menu."
 msgstr ""
 "Pour trouver un texte dans le mémo affiché, sélectionnez "
-"<guiseq><gui>Édition</gui><gui>Rechercher dans le mémo…</gui></guiseq> dans "
+"<guiseq><gui>Édition</gui><gui>Rechercher dans le mémo</gui></guiseq> dans "
 "le menu principal."
 
-#. (itstool) path: section/title
-#: C/memos-searching.page:36
+#: C/memos-searching.page:36(section/title)
 msgid "Searching Across Memos"
 msgstr "Recherche parmi les mémos"
 
-#. (itstool) path: section/p
-#: C/memos-searching.page:40
+#: C/memos-searching.page:40(section/p)
 msgid ""
 "In the Memos view, you can quickly search for memos either by summary or by "
 "category."
@@ -12438,18 +11431,15 @@ msgstr ""
 "Dans la vue des Mémos, vous pouvez faire une recherche rapide de mémos soit "
 "par résumé ou par catégorie."
 
-#. (itstool) path: info/desc
-#: C/memos-usage-add-memo.page:5
+#: C/memos-usage-add-memo.page:5(info/desc)
 msgid "Adding a memo to your memo list."
 msgstr "Ajout d'un mémo à votre liste de mémos."
 
-#. (itstool) path: page/title
-#: C/memos-usage-add-memo.page:23
+#: C/memos-usage-add-memo.page:23(page/title)
 msgid "Adding a Memo"
 msgstr "Ajout d'un mémo"
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:26
+#: C/memos-usage-add-memo.page:26(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Memo</gui></guiseq>, or "
 "press <keyseq><key>Shift</key><key>Ctrl</key><key>O</key></keyseq>."
@@ -12458,19 +11448,16 @@ msgstr ""
 "guiseq> ou utilisez la combinaison de touches <keyseq><key>Maj</"
 "key><key>Ctrl</key><key>O</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:27
+#: C/memos-usage-add-memo.page:27(item/p)
 msgid "Select a memo list in the <gui>List</gui> dropdown list."
 msgstr ""
 "Sélectionnez une liste de mémos dans la liste déroulante <gui>Liste</gui>."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:28
+#: C/memos-usage-add-memo.page:28(item/p)
 msgid "Enter the memo information."
 msgstr "Saisissez les informations du mémo."
 
-#. (itstool) path: page/p
-#: C/memos-usage-add-memo.page:32
+#: C/memos-usage-add-memo.page:32(page/p)
 msgid ""
 "If you just want to quickly add a memo by entering a summary you can "
 "directly enter it in the list of memos."
@@ -12478,8 +11465,7 @@ msgstr ""
 "Si vous voulez juste ajouter rapidement un mémo en saisissant un résumé, "
 "vous pouvez le saisir directement dans la liste des mémos."
 
-#. (itstool) path: page/p
-#: C/memos-usage-add-memo.page:34
+#: C/memos-usage-add-memo.page:34(page/p)
 msgid ""
 "You can also define a <link xref=\"using-categories\">category</link>, or a "
 "<link xref=\"calendar-classifications\">classification</link> for the memo, "
@@ -12489,13 +11475,11 @@ msgstr ""
 "link> ou une <link xref=\"calendar-classifications\">classification</link> "
 "pour le mémo ou ajouter une pièce jointe."
 
-#. (itstool) path: section/title
-#: C/memos-usage-add-memo.page:37
+#: C/memos-usage-add-memo.page:37(section/title)
 msgid "Shared Memos"
 msgstr "Mémos partagés"
 
-#. (itstool) path: section/p
-#: C/memos-usage-add-memo.page:39
+#: C/memos-usage-add-memo.page:39(section/p)
 msgid ""
 "Shared Memos are like mail messages except they are scheduled for a "
 "particular day and appear on the calendar for that date. You can use shared "
@@ -12510,13 +11494,11 @@ msgstr ""
 "dans votre agenda à la date indiquée. Ils n'apparaissent pas dans votre "
 "boîte de messagerie ni dans celle d'autres utilisateurs."
 
-#. (itstool) path: section/p
-#: C/memos-usage-add-memo.page:41
+#: C/memos-usage-add-memo.page:41(section/p)
 msgid "To send a Shared Memo,"
 msgstr "Pour envoyer un mémo partagé,"
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:43
+#: C/memos-usage-add-memo.page:43(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Shared Memo</gui></guiseq>, "
 "or press <keyseq><key>Shift</key><key>Ctrl</key><key>H</key></keyseq>."
@@ -12525,26 +11507,23 @@ msgstr ""
 "gui></guiseq> ou utilisez la combinaison de touches <keyseq><key>Maj</"
 "key><key>Ctrl</key><key>H</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:44
+#: C/memos-usage-add-memo.page:44(item/p)
 msgid ""
 "Select the Organizer's account name from the drop-down list given next to "
-"the <gui>Organizer</gui> field."
+"the Organizer field."
 msgstr ""
 "Sélectionnez le nom du compte de l'organisateur dans la liste déroulante à "
-"côté du champ <gui>Organisateur</gui>."
+"côté du champ « Organisateur »."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:45
+#: C/memos-usage-add-memo.page:45(item/p)
 msgid ""
-"In the <gui>To</gui> field, type a username, then press <key>Enter</key>. "
-"Repeat this for additional users."
+"In the To field, type a username, then press Enter. Repeat this for "
+"additional users."
 msgstr ""
-"Dans le champ <gui>À</gui>, saisissez un nom d'utilisateur, puis appuyez sur "
-"<key>Entrée</key>. Répétez l'opération pour ajouter d'autres utilisateurs."
+"Dans le champ « À », saisissez un nom d'utilisateur, puis appuyez sur "
+"Entrée. Répétez l'opération pour ajouter d'autres utilisateurs."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:46
+#: C/memos-usage-add-memo.page:46(item/p)
 msgid ""
 "Select the task list (under <gui>List</gui>) in which you would like to "
 "create the entry."
@@ -12552,27 +11531,27 @@ msgstr ""
 "Sélectionnez la liste de tâches (sous <gui>Liste</gui>) dans laquelle vous "
 "souhaitez créer l'élément."
 
-#. (itstool) path: item/p
-#: C/memos-usage-add-memo.page:48
+#: C/memos-usage-add-memo.page:47(item/p)
+msgid "Enter a brief summary in the Summary field."
+msgstr "Saisissez un bref résumé dans le champ Résumé."
+
+#: C/memos-usage-add-memo.page:48(item/p)
 msgid ""
-"In the <gui>Start Date</gui> field, type the date this shared memo should "
-"appear in the recipients' calendars."
+"In the Start Date field, type the date this shared memo should appear in the "
+"recipients' calendars."
 msgstr ""
-"Dans le champ <gui>Date de début</gui>, saisissez la date à laquelle ce mémo "
+"Dans le champ « Date de début », saisissez la date à laquelle ce mémo "
 "partagé doit apparaître dans l'agenda des destinataires."
 
-#. (itstool) path: info/desc
-#: C/memos-usage-delete-memo.page:5
+#: C/memos-usage-delete-memo.page:5(info/desc)
 msgid "Deleting a memo from your memo list."
 msgstr "Supprimer un mémo de votre liste de mémos."
 
-#. (itstool) path: page/title
-#: C/memos-usage-delete-memo.page:20
+#: C/memos-usage-delete-memo.page:20(page/title)
 msgid "Deleting a Memo"
 msgstr "Suppression d'un mémo"
 
-#. (itstool) path: page/p
-#: C/memos-usage-delete-memo.page:22
+#: C/memos-usage-delete-memo.page:22(page/p)
 msgid ""
 "If you want to delete a memo in your memo lists, right-click on the memo and "
 "select <gui>Delete</gui>, or click on the memo and click <gui>Delete</gui> "
@@ -12584,23 +11563,19 @@ msgstr ""
 "mémo et cliquez sur <gui>Supprimer</gui> dans la barre d'outils ou cliquez "
 "sur <guiseq><gui>Édition</gui><gui>Supprimer le mémo</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/memos-usage-edit-memo.page:5
+#: C/memos-usage-edit-memo.page:5(info/desc)
 msgid "Editing a memo in your memo list."
 msgstr "Modifier un mémo de votre liste de mémos."
 
-#. (itstool) path: page/title
-#: C/memos-usage-edit-memo.page:20
+#: C/memos-usage-edit-memo.page:20(page/title)
 msgid "Editing a Memo"
 msgstr "Modification d'un mémo"
 
-#. (itstool) path: page/p
-#: C/memos-usage-edit-memo.page:22
+#: C/memos-usage-edit-memo.page:22(page/p)
 msgid "If you want to change a memo that already exists in your memo lists,"
 msgstr "Si vous souhaitez modifier un mémo existant de votre liste de mémos,"
 
-#. (itstool) path: item/p
-#: C/memos-usage-edit-memo.page:25
+#: C/memos-usage-edit-memo.page:25(item/p)
 msgid ""
 "Double-click on the memo that you want to edit in the list of memos, or "
 "right-click on the memo and click <gui>Open Memo</gui>."
@@ -12609,23 +11584,19 @@ msgstr ""
 "mémos ou faites un clic-droit sur le mémo, puis cliquez sur <gui>Ouvrir le "
 "mémo</gui>,"
 
-#. (itstool) path: item/p
-#: C/memos-usage-edit-memo.page:26
+#: C/memos-usage-edit-memo.page:26(item/p)
 msgid "Edit the memo information."
 msgstr "modifiez les informations du mémo,"
 
-#. (itstool) path: info/desc
-#: C/memos-usage.page:5
+#: C/memos-usage.page:5(info/desc)
 msgid "On adding, editing, and deleting memos."
 msgstr "À propos de l'ajout, la modification et la suppression de mémos."
 
-#. (itstool) path: page/title
-#: C/memos-usage.page:20
+#: C/memos-usage.page:20(page/title)
 msgid "Add, Edit and Delete Memos"
 msgstr "Ajout, modification et suppression des mémos"
 
-#. (itstool) path: note/p
-#: C/memos-usage.page:22
+#: C/memos-usage.page:22(note/p)
 msgid ""
 "Currently there is no support for syncing memos with the <app>Tomboy</app> "
 "or <app>Gnote</app> applications."
@@ -12633,18 +11604,56 @@ msgstr ""
 "Actuellement, il n'y a pas de prise en charge de la synchronisation des "
 "mémos avec les applications <app>Tomboy</app> ou <app>Gnote</app>."
 
-#. (itstool) path: info/desc
-#: C/offline.page:5
+#: C/minimize-to-system-tray.page:5(info/desc)
+msgid "On minimizing Evolution to the notification area."
+msgstr "À propos de la minimisation d'Evolution dans la zone de notification."
+
+#: C/minimize-to-system-tray.page:25(page/title)
+msgid "Minimizing Evolution to the system tray"
+msgstr "Minimisation d'Evolution dans la zone de notification"
+
+#: C/minimize-to-system-tray.page:27(page/p)
+msgid ""
+"GNOME, by default, has a <link xref=\"mail-received-notification"
+"\">notification area</link> which includes an applet that informs users of "
+"any system updates, changes, or events. This includes the arrival of email "
+"messages on Evolution. You can refer to this built-in feature of GNOME for "
+"any email notifications."
+msgstr ""
+"Par défaut, GNOME possède une <link xref=\"mail-received-notification\">zone "
+"de notification</link> qui inclut un applet informant les utilisateurs de "
+"n'importe quels mises à jour, modifications ou événements. Cela comprend "
+"l'arrivée de courriels dans Evolution. Vous pouvez faire référence à cette "
+"fonctionnalité intégrée de GNOME pour toutes notifications de courriel."
+
+#: C/minimize-to-system-tray.page:29(page/p)
+msgid ""
+"In GNOME version 2 you may modify the notification area and set it up to "
+"become a system tray by using external applications which might be available "
+"for installation in the software management tool of your distribution. "
+"Available options are for example <link href=\"http://alltray.trausch.us/";
+"\">Alltray</link> or <link href=\"http://code.google.com/p/tint2/\";>Tint2</"
+"link>. This is no longer possible in GNOME 3."
+msgstr ""
+"Dans la version 2 de GNOME, vous pouvez modifier la zone de notification et "
+"la configurer pour qu'elle devienne une zone de notification système en "
+"utilisant des logiciels externes probablement disponibles dans l'outil de "
+"gestion de logiciels de votre distribution. Les options disponibles sont par "
+"exemple  <link href=\"http://alltray.trausch.us/\";>Alltray</link> ou <link "
+"href=\"http://code.google.com/p/tint2/\";>Tint2</link>. Ce n'est plus "
+"possible avec GNOME 3."
+
+#: C/offline.page:5(info/desc)
 msgid "Make Evolution mail be online again."
 msgstr "Faire que le module Courriel d'Evolution soit à nouveau en ligne."
 
-#. (itstool) path: page/title
-#: C/offline.page:27
-msgid "Why is Evolution's mail component offline?"
-msgstr "Pourquoi le module Courriel d'<app>Evolution</app> est-il hors ligne ?"
+#: C/offline.page:23(page/title)
+msgid "Why is Evolution's mail offline when my net connection is working?"
+msgstr ""
+"Pourquoi le module Courriel d'Evolution est-il hors ligne quand ma connexion "
+"réseau fonctionne ?"
 
-#. (itstool) path: page/p
-#: C/offline.page:28
+#: C/offline.page:24(page/p)
 msgid ""
 "You may have started Evolution with the <cmd>--offline</cmd> commandline "
 "option to enforce offline mode."
@@ -12652,8 +11661,7 @@ msgstr ""
 "Peut-être avez-vous démarré Evolution avec l'option de ligne de commande "
 "<cmd>--offline</cmd> ou forcé le mode hors ligne."
 
-#. (itstool) path: page/p
-#: C/offline.page:30
+#: C/offline.page:26(page/p)
 msgid ""
 "If this is not the case and Evolution normally works but has suddenly "
 "stopped connecting to your mail accounts, you may have unintentionally "
@@ -12668,64 +11676,45 @@ msgstr ""
 "cliqué sur l'icône de connexion dans le coin inférieur gauche. En cas de "
 "connexion, l'icône ressemble à une paire de prises de courant reliées entre "
 "elles. Si les prises ne se touchent pas, il n'y a pas de connexion à votre "
-"compte de messagerie (et le bouton <gui style=\"button\">Envoyer/Recevoir</"
+"compte de courriel (et le bouton <gui style=\"button\">Envoyer/Recevoir</"
 "gui> est grisé). Cliquez sur l'icône pour modifier son état."
 
-#. (itstool) path: page/p
-#: C/offline.page:32
+#: C/offline.page:28(page/p)
 msgid ""
 "If the problem persists and you are sure you have not clicked the icon, but "
 "you can still reach the network from other apps on your system (browsers, "
 "FTP, SSH, ping etc.) it may be that your network connection is not properly "
-"configured. For more information please take a look at the <link xref=\"help:"
-"gnome-help/net-problem\" href=\"https://help.gnome.org/users/gnome-help/";
-"stable/net-problem\">Desktop help</link> or seek help from your distribution "
-"support forums, mailing lists etc."
+"configured. For more information please take a look at the <link href=\"help:"
+"gnome-help/net-problem\">Desktop help</link> or seek help from your "
+"distribution support forums, mailing lists etc."
 msgstr ""
 "Si le problème persiste et que vous êtes sûr de ne pas avoir cliqué sur "
 "l'icône mais que vous pouvez toujours atteindre le réseau à partir d'autres "
 "applications sur votre système (navigateurs, FTP, SSH, ping, etc.), il est "
 "possible que votre connexion réseau ne soit pas configurée correctement. "
-"Pour plus d'informations, veuillez consulter <link xref=\"help:gnome-help/"
-"net-problem\" href=\"https://help.gnome.org/users/gnome-help/stable/net-";
-"problem\">Aide du bureau</link> ou demandez de l'aide sur les forums, listes "
-"de diffusion, etc. qui concernent votre distribution."
-
-#. (itstool) path: page/p
-#: C/offline.page:35
-msgid ""
-"If you want to force Evolution to be in online mode, make sure that "
-"Evolution is not running and open a <app>Terminal</app> window and type the "
-"following command:"
-msgstr ""
-"Si vous voulez forcer <app>Evolution</app> à être en mode en-ligne, assure-"
-"vous qu<app>Evolution</app> n'est pas en cours d'exécution, ouvrez une "
-"fenêtre <app>Terminal</gui> et saisissez la commande suivante :"
+"Pour plus d'informations, veuillez consulter <link href=\"help:gnome-help/"
+"net-problem\">l'aide du bureau</link> ou demandez de l'aide sur les forums, "
+"listes de diffusion, etc. qui concernent votre distribution."
 
-#. (itstool) path: info/desc
-#: C/organizing.page:5
+#: C/organizing.page:5(info/desc)
 msgid "On organizing and finding your data in Evolution."
 msgstr ""
 "À propos de l'organisation et la recherche de vos données dans Evolution."
 
-#. (itstool) path: page/title
-#: C/organizing.page:18
+#: C/organizing.page:18(page/title)
 msgid "Sorting and organizing"
 msgstr "Tri et organisation"
 
-#. (itstool) path: info/desc
-#: C/problems-debug-how-to.page:5
+#: C/problems-debug-how-to.page:5(info/desc)
 msgid "How to provide good information when tracking down a problem."
 msgstr ""
 "Comment fournir de bonnes informations lors de la localisation d'un problème."
 
-#. (itstool) path: page/title
-#: C/problems-debug-how-to.page:21
+#: C/problems-debug-how-to.page:21(page/title)
 msgid "How to track down a problem"
 msgstr "Localisation d'un problème"
 
-#. (itstool) path: page/p
-#: C/problems-debug-how-to.page:23
+#: C/problems-debug-how-to.page:23(page/p)
 msgid ""
 "As a first hint, error messages will be either displayed in the statusbar or "
 "between the tool bar and the search bar."
@@ -12733,19 +11722,17 @@ msgstr ""
 "Comme premier indice, les messages d'erreur sont affichés dans la barre "
 "d'état ou entre les barres d'outils et de recherche."
 
-#. (itstool) path: page/p
-#: C/problems-debug-how-to.page:25
+#: C/problems-debug-how-to.page:25(page/p)
 msgid ""
 "To further track down a problem, some debug options are listed on the <link "
-"href=\"https://wiki.gnome.org/Apps/Evolution/Debugging\";>Evolution project "
+"href=\"http://projects.gnome.org/evolution/bugs.shtml\";>Evolution project "
 "website</link>."
 msgstr ""
 "Pour poursuivre la recherche du problème, certaines options de débogage sont "
-"énumérées sur le <link href=\"https://wiki.gnome.org/Apps/Evolution/Debugging";
+"énumérées sur le <link href=\"http://projects.gnome.org/evolution/bugs.shtml";
 "\">site Web du projet Evolution</link>."
 
-#. (itstool) path: page/p
-#: C/problems-debug-how-to.page:27
+#: C/problems-debug-how-to.page:27(page/p)
 msgid ""
 "To contact the Evolution community for help, please see <link xref="
 "\"problems-getting-help\">How to get help</link>."
@@ -12753,48 +11740,40 @@ msgstr ""
 "Pour demander de l'aide à la communauté Evolution, consulter <link xref="
 "\"problems-getting-help\">comment obtenir de l'aide</link>."
 
-#. (itstool) path: info/desc
-#: C/problems-getting-help.page:5
+#: C/problems-getting-help.page:5(info/desc)
 msgid "How to get help for problems."
 msgstr "Comment obtenir de l'aide en cas de problèmes."
 
-#. (itstool) path: page/title
-#: C/problems-getting-help.page:22
+#: C/problems-getting-help.page:22(page/title)
 msgid "How to get help"
 msgstr "Obtention d'aide"
 
-#. (itstool) path: page/p
-#: C/problems-getting-help.page:24
+#: C/problems-getting-help.page:24(page/p)
 msgid ""
 "To receive help on problems you can send an email to the <link href=\"http://";
 "mail.gnome.org/mailman/listinfo/evolution-list\">Evolution mailing list</"
 "link> or talk to developers and other users in the IRC chat channel "
 "#evolution on the server irc.gimp.net. To connect to an IRC server you can "
-"for example <link xref=\"help:empathy/irc-manage\" href=\"https://help.gnome.";
-"org/users/empathy/stable/irc-manage\">use the internet messenger application "
-"<app>Empathy</app></link>."
+"for example <link href=\"help:empathy/irc-manage\">use the internet "
+"messenger application <app>Empathy</app></link>."
 msgstr ""
 "Pour recevoir de l'aide à propos de problèmes, vous pouvez envoyer un "
 "courriel à la <link href=\"http://mail.gnome.org/mailman/listinfo/evolution-";
-"list\">liste de diffusion d'<app>Evolution</app></link> ou discuter avec les "
+"list\">liste de diffusion d'Evolution</link> ou discuter avec les "
 "développeurs et les autres utilisateurs sur le canal de discussion IRC "
 "#evolution sur le serveur irc.gimp.net. Pour vous connecter à un serveur "
-"IRC, vous pouvez par exemple <link xref=\"help:empathy/irc-manage\" href="
-"\"https://help.gnome.org/users/empathy/stable/irc-manage\";> utilisez "
+"IRC, vous pouvez par exemple <link href=\"help:empathy/irc-manage\">utiliser "
 "l'application de messagerie internet <app>Empathy</app></link>."
 
-#. (itstool) path: info/desc
-#: C/problems-reporting-bugs.page:5
+#: C/problems-reporting-bugs.page:5(info/desc)
 msgid "How to report mistakes in the application."
 msgstr "Comment rapporter des anomalies dans l'application."
 
-#. (itstool) path: page/title
-#: C/problems-reporting-bugs.page:21
+#: C/problems-reporting-bugs.page:21(page/title)
 msgid "How to report bugs"
 msgstr "Rapport de bogues"
 
-#. (itstool) path: page/p
-#: C/problems-reporting-bugs.page:23
+#: C/problems-reporting-bugs.page:23(page/p)
 msgid ""
 "If you do not need help for configuration but you are sure that you have "
 "found a mistake or wrong behavior in the Evolution software, or if you want "
@@ -12813,26 +11792,24 @@ msgstr ""
 "d'abord les <link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.";
 "html\">conseils d'écriture de bogues</link>."
 
-#. (itstool) path: page/p
-#: C/problems-reporting-bugs.page:23
+#: C/problems-reporting-bugs.page:23(page/p)
 msgid ""
 "Also note that GNOME distributions sometimes introduce their own changes in "
 "Evolution that are not included in GNOME Evolution. This is hard to "
 "recognize for users but if you are aware of it please file a bug report in "
-"<link href=\"https://wiki.gnome.org/Bugsquad/TriageGuide/";
+"<link href=\"https://live.gnome.org/Bugsquad/TriageGuide/";
 "NonGnome#Bug_trackers_for_distributions\">the bug tracker of your GNOME "
 "distribution</link> instead."
 msgstr ""
 "Notez également que les distributions de GNOME introduisent parfois leurs "
-"propres modifications dans <app>Evolution</app> qui ne sont pas incluses "
-"dans <app>Evolution</app> de GNOME. C'est difficile à détecter pour les "
-"utilisateurs mais si vous êtes au courant de cela, remplissez plutôt un "
-"rapport de bogue dans <link href=\"https://wiki.gnome.org/Bugsquad/";
-"TriageGuide/NonGnome#Bug_trackers_for_distributions\"> le système de suivi "
-"de bogues de votre distribution GNOME</link>."
+"propres modifications dans Evolution qui ne sont pas incluses dans Evolution "
+"de GNOME. C'est difficile à détecter pour les utilisateurs mais si vous êtes "
+"au courant de cela, remplissez plutôt un rapport de bogue dans <link href="
+"\"https://live.gnome.org/Bugsquad/TriageGuide/";
+"NonGnome#Bug_trackers_for_distributions\">le système de suivi de bogues de "
+"votre distribution GNOME</link>."
 
-#. (itstool) path: page/p
-#: C/problems-reporting-bugs.page:25
+#: C/problems-reporting-bugs.page:25(page/p)
 msgid ""
 "When reporting bugs exact information is welcome as it makes it easier for "
 "others to reproduce and fix the issue. If possible please include "
@@ -12851,37 +11828,37 @@ msgstr ""
 "bugzilla.gnome.org/page.cgi?id=bug-writing.html\">conseils d'écriture de "
 "bogues</link> pour plus d'informations."
 
-#. (itstool) path: info/desc
-#: C/searching-items.page:5
+#: C/searching-items.page:5(info/desc)
 msgid "Searching content and data within <app>Evolution</app>."
 msgstr "Rechercher du contenu et des données parmi <app>Evolution</app>."
 
-#. (itstool) path: page/title
-#: C/searching-items.page:18
+#: C/searching-items.page:18(page/title)
 msgid "Searching items"
 msgstr "Recherche d'éléments"
 
-#. (itstool) path: info/desc
-#: C/sync-with-other-devices.page:5
+#: C/sync-with-other-devices.page:5(info/desc)
 msgid "Synchronize Evolution data with handheld devices and mobile phones."
 msgstr ""
 "Synchroniser les données d'Evolution avec les périphériques pris en charge "
 "et les téléphones portables."
 
-#. (itstool) path: page/title
-#: C/sync-with-other-devices.page:20
+#: C/sync-with-other-devices.page:23(page/title)
 msgid "Synchronize <app>Evolution</app> with other devices"
 msgstr "Synchronisation d'<app>Evolution</app> avec les autres périphériques"
 
-#. (itstool) path: page/p
-#: C/sync-with-other-devices.page:22
+#: C/sync-with-other-devices.page:25(page/p)
 msgid "There are currently no \"recommended instructions\" for users."
 msgstr ""
 "Il n'y a actuellement aucune « instructions recommandées » pour les "
 "utilisateurs."
 
-#. (itstool) path: page/p
-#: C/sync-with-other-devices.page:24
+#: C/sync-with-other-devices.page:27(page/p)
+#, fuzzy
+#| msgid ""
+#| "Many distributions provide the application <app><link href=\"http://";
+#| "syncevolution.org/\">SyncEvolution</link></app> that can be used in "
+#| "combination with devices that support <link href=\"https://secure.";
+#| "wikimedia.org/wikipedia/en/wiki/SyncML\">SyncML</link>."
 msgid ""
 "Many distributions provide the application <app><link href=\"http://";
 "syncevolution.org/\">SyncEvolution</link></app> that can be used in "
@@ -12891,10 +11868,17 @@ msgstr ""
 "De nombreuses distributions fournissent l'application <app><link href="
 "\"http://syncevolution.org/\";>SyncEvolution</link></app> qui peut être "
 "utilisée conjointement avec les périphériques qui prennent en charge <link "
-"href=\"https://en.wikipedia.org/wiki/SyncML\";>SyncML</link>."
+"href=\"https://secure.wikimedia.org/wikipedia/en/wiki/SyncML\";>SyncML</link>."
 
-#. (itstool) path: page/p
-#: C/sync-with-other-devices.page:26
+#: C/sync-with-other-devices.page:29(page/p)
+#, fuzzy
+#| msgid ""
+#| "In general it is recommended to use applications and devices that both "
+#| "support the <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/";
+#| "ActiveSync\">ActiveSync protocol</link> (such as <app>SyncEvolution</"
+#| "app>). A <link href=\"https://secure.wikimedia.org/wikipedia/en/wiki/";
+#| "List_of_collaborative_software\">list of collaborative software</link> is "
+#| "available on Wikipedia."
 msgid ""
 "In general it is recommended to use applications and devices that both "
 "support the <link href=\"https://en.wikipedia.org/wiki/ActiveSync";
@@ -12905,12 +11889,11 @@ msgstr ""
 "En général, il est recommandé d'utiliser les applications et les "
 "périphériques qui prennent tous les deux en charge le <link href=\"https://";
 "secure.wikimedia.org/wikipedia/en/wiki/ActiveSync\">protocole ActiveSync</"
-"link> (comme <app>SyncEvolution</app>). Une <link href=\"https://en.";
-"wikipedia.org/wiki/List_of_collaborative_software\">liste de logiciels "
-"collaboratifs</link> est disponible sur Wikipedia."
+"link> (comme <app>SyncEvolution</app>). Une <link href=\"https://secure.";
+"wikimedia.org/wikipedia/en/wiki/List_of_collaborative_software\">liste de "
+"logiciels collaboratifs</link> est disponible sur Wikipedia."
 
-#. (itstool) path: page/p
-#: C/sync-with-other-devices.page:28
+#: C/sync-with-other-devices.page:31(page/p)
 msgid ""
 "If you can provide good practices or more information on this topic feel "
 "free to file a bug report in <link href=\"https://bugzilla.gnome.org/";
@@ -12922,18 +11905,180 @@ msgstr ""
 "bugzilla.gnome.org/enter_bug.cgi?product=evolution&amp;component=User"
 "%20Documentation\">système de suivi de bogues de GNOME</link>."
 
-#. (itstool) path: info/desc
-#: C/tasks-caldav.page:5
+#: C/sync-with-other-devices.page:34(section/title)
+msgid "Palm"
+msgstr "Palm"
+
+#: C/sync-with-other-devices.page:35(section/p)
+msgid ""
+"To synchronize with a Palm OS device like the PalmPilot(TM) and the "
+"Handspring Visor several steps are needed: First, you need to enable "
+"synchronization. Second, your computer needs to recognize and access your "
+"handheld. Third, you should decide what sort of synchronization behavior you "
+"want."
+msgstr ""
+"Pour se synchroniser avec un périphérique Palm OS comme le PalmPilot(TM) et "
+"le Handspring Visor, il y a plusieurs étapes à suivre. Tout d'abord, vous "
+"devez activer la synchronisation. Deuxièmement, votre ordinateur doit "
+"reconnaître le périphérique et pouvoir y accéder. Ensuite, vous devez "
+"définir le type de synchronisation à utiliser."
+
+#: C/sync-with-other-devices.page:37(section/title)
+msgid "Enabling Synchronization"
+msgstr "Activation de la synchronisation"
+
+#: C/sync-with-other-devices.page:38(section/p)
+msgid ""
+"If you have not used a handheld device with your computer before, you need "
+"to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot "
+"Synchronization...</gui></guiseq>. Make sure that you have read and write "
+"permissions on the device, which is normally in <file>/dev/pilot</file>. If "
+"that does not work, check in <file>/dev/ttyS0</file> if you have a serial "
+"connection, or in <file>/dev/ttyUSB1</file> for a USB connection. You can do "
+"this by becoming root user and adding your username to the group that owns "
+"this device node. For a USB device on sync, two device nodes are created, "
+"<file>ttyUSB0</file> and <file>ttyUSB1</file>. The second node is the one to "
+"be used in configuring the device."
+msgstr ""
+"Si vous n'avez jamais utilisé un périphérique portable avec votre "
+"ordinateur, vous devez le configurer en utilisant le menu "
+"<guiseq><gui>Édition</gui><gui>Synchronisation Pilot GNOME...</gui></"
+"guiseq>. Vérifiez que vous disposez des autorisations de lecture et "
+"d'écriture sur le périphérique (dans <file>/dev/pilot</file> normalement). "
+"En cas de problème, faites un essai avec <file>/dev/ttyS0</file> si vous "
+"disposez d'une connexion série ou dans <file>/dev/ttyUSB1</file> si vous "
+"disposez d'une connexion USB. Pour ce faire, vous devez passer en mode "
+"administrateur et ajouter votre nom d'utilisateur au groupe qui a les droits "
+"sur ce nœud de périphérique. Dans le cas d'une synchronisation par USB, deux "
+"nœuds sont créés, <file>ttyUSB0</file> et <file>ttyUSB1</file>. Le second "
+"nœud est celui qui sera utilisé pour configurer le périphérique."
+
+#: C/sync-with-other-devices.page:41(section/title)
+msgid "Selecting Conduits"
+msgstr "Sélection des canaux"
+
+#: C/sync-with-other-devices.page:42(section/p)
+msgid ""
+"After your computer and your Palm OS device are communicating, select the "
+"conduits you want under the <gui>Pilot Conduits</gui> section. You can use "
+"conduits to synchronize data with several applications; the Evolution "
+"conduits are labeled <gui>EAddress</gui> for the contacts in your address "
+"book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for your "
+"task list."
+msgstr ""
+"Lorsque votre ordinateur et le périphérique Palm OS communiquent, "
+"sélectionnez les canaux appropriés dans la section <gui>Pilot Conduits</gui> "
+"(canaux Pilot). Vous pouvez utiliser des canaux pour synchroniser les "
+"données avec plusieurs applications ; les canaux Evolution s'appellent "
+"<gui>EAddress</gui> pour les contacts de votre carnet d'adresses, "
+"<gui>ECalendar</gui> pour votre agenda et <gui>ETodo</gui> pour votre "
+"listede tâches."
+
+#: C/sync-with-other-devices.page:43(section/p)
+msgid ""
+"Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what the "
+"conduit does when activated. Your options can vary depending on the conduit, "
+"but typically they are as follows:"
+msgstr ""
+"Cliquez sur <gui>Activer</gui>, puis sur <gui>Paramètres</gui> pour modifier "
+"le comportement d'un canal lorsqu'il est activé. Les options varient en "
+"fonction du canal, mais en règle générale, vous disposez des options "
+"suivantes :"
+
+#: C/sync-with-other-devices.page:45(item/p)
+msgid "<gui>Disabled</gui>: Do nothing."
+msgstr "<gui>Désactivé</gui> : ne rien faire."
+
+#: C/sync-with-other-devices.page:46(item/p)
+msgid ""
+"<gui>Synchronize</gui>: Copy new data from the computer to the handheld, and "
+"from the handheld to the computer. Remove items that were on both systems "
+"but have been deleted on one."
+msgstr ""
+"<gui>Synchroniser</gui> : copie les nouvelles données de l'ordinateur vers "
+"le périphérique et vice-versa ; supprime les éléments qui figuraient sur les "
+"deux systèmes et qui ont été supprimés de l'un des deux."
+
+#: C/sync-with-other-devices.page:47(item/p)
+msgid ""
+"<gui>Copy From Pilot</gui>: If there is any new data on the handheld device, "
+"copy it to the computer."
+msgstr ""
+"<gui>Copier à partir du Pilot</gui> : si le périphérique portable contient "
+"de nouvelles données, elles sont copiées vers l'ordinateur."
+
+#: C/sync-with-other-devices.page:48(item/p)
+msgid ""
+"<gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld."
+msgstr ""
+"<gui>Copier vers le Pilot</gui> : copier les nouvelles données de "
+"l'ordinateur vers le périphérique portable."
+
+#: C/sync-with-other-devices.page:50(section/p)
+msgid ""
+"Select the behavior you want for each conduit you choose to use. If you're "
+"not sure, use <gui>Synchronize</gui>."
+msgstr ""
+"Sélectionnez le comportement de chacun des canaux à utiliser. Si vous ne "
+"savez pas, utilisez <gui>Synchroniser</gui>."
+
+#: C/sync-with-other-devices.page:54(section/title)
+msgid "Synchronizing Information"
+msgstr "Informations de synchronisation"
+
+#: C/sync-with-other-devices.page:55(section/p)
+msgid ""
+"Use the following procedure to synchronize the data on your Palm OS device "
+"with the data you store in Evolution."
+msgstr ""
+"Procédez comme suit pour synchroniser les données sur le périphérique Palm "
+"OS et les données que vous stockez dans Evolution."
+
+#: C/sync-with-other-devices.page:57(item/p)
+msgid ""
+"If you want to back up your information before synchronizing, make a copy of "
+"the <file>.local/share/evolution</file> directory inside your home directory."
+msgstr ""
+"Si vous voulez sauvegarder les informations avant la synchronisation, faites "
+"une copie du répertoire <file>.local/share/evolution</file> dans votre "
+"dossier personnel."
+
+#: C/sync-with-other-devices.page:58(item/p)
+msgid ""
+"Put your handheld device in its cradle and press the <gui style=\"button"
+"\">HotSync</gui> button."
+msgstr ""
+"Placez le périphérique sur sa station d'accueil et appuyez sur le bouton "
+"<gui style=\"button\">HotSync</gui>."
+
+#: C/sync-with-other-devices.page:59(item/p)
+msgid ""
+"If you use Palm OS version 4.0 and have password protection turned on for "
+"your handheld device, you might encounter trouble synchronizing. If this "
+"happens, try turning off password protection on your handheld, synchronize "
+"it with your desktop computer, and then re-enable password protection on "
+"your handheld."
+msgstr ""
+"Si vous utilisez Palm OS version 4.0 et que la protection par mot de passe "
+"est active sur le périphérique portable, des problèmes de synchronisation "
+"peuvent se produire. Dans ce cas, désactivez la protection par mot de passe "
+"sur votre périphérique portable, synchronisez le périphérique et votre "
+"ordinateur, puis réactivez-la."
+
+#: C/sync-with-other-devices.page:61(section/p)
+msgid "Now your Palm OS device will synchronize data with Evolution."
+msgstr ""
+"Maintenant votre périphérique Palm OS et Evolution devraient se synchroniser."
+
+#: C/tasks-caldav.page:5(info/desc)
 msgid "Using an online CalDAV task list or memo list."
 msgstr "Utilise une liste de tâches ou de mémos en ligne CalDAV."
 
-#. (itstool) path: page/title
-#: C/tasks-caldav.page:20
+#: C/tasks-caldav.page:20(page/title)
 msgid "Using a CalDAV task or memo list"
 msgstr "Utilisation d'une liste de tâches ou de mémos CalDAV"
 
-#. (itstool) path: page/p
-#: C/tasks-caldav.page:22 C/tasks-webdav.page:24
+#: C/tasks-caldav.page:22(page/p) C/tasks-webdav.page:24(page/p)
 msgid ""
 "To add such a task list or memo list to Evolution, perform the following "
 "steps:"
@@ -12941,8 +12086,8 @@ msgstr ""
 "Pour ajouter ce type de liste de tâches ou de mémos à Evolution, suivez les "
 "étapes suivantes :"
 
-#. (itstool) path: item/p
-#: C/tasks-caldav.page:24 C/tasks-local.page:24 C/tasks-webdav.page:26
+#: C/tasks-caldav.page:24(item/p) C/tasks-local.page:24(item/p)
+#: C/tasks-webdav.page:26(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task List</gui></guiseq> or "
 "<guiseq><gui>File</gui><gui>New</gui><gui>Memo List</gui></guiseq>."
@@ -12951,31 +12096,30 @@ msgstr ""
 "tâches</gui></guiseq> ou <guiseq><gui>Fichier</gui><gui>Nouveau</"
 "gui><gui>Liste de mémos</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/tasks-caldav.page:28 C/tasks-webdav.page:30
+#: C/tasks-caldav.page:28(item/p) C/tasks-webdav.page:30(item/p)
 msgid "Choose if you want to be able to view the content also while offline."
 msgstr ""
 "Choisissez si vous souhaitez en voir le contenu quand vous êtes hors-ligne."
 
-#. (itstool) path: page/p
-#: C/tasks-caldav.page:35 C/tasks-local.page:31
+#: C/tasks-caldav.page:29(item/p) C/tasks-webdav.page:31(item/p)
+msgid "Enter the address of the list in the <gui>URL</gui> field."
+msgstr "Saisissez l'adresse de la liste dans le champ <gui>URL</gui>."
+
+#: C/tasks-caldav.page:35(page/p) C/tasks-local.page:31(page/p)
 msgid "The task list will be added to the list of task lists in Evolution."
 msgstr ""
 "La liste de tâche sera ajoutée à la liste des listes de tâches d'Evolution."
 
-#. (itstool) path: info/desc
-#: C/tasks-display-settings.page:5
+#: C/tasks-display-settings.page:5(info/desc)
 msgid "Options for displaying task completion and due dates."
 msgstr ""
 "Options d'affichage de la réalisation et des dates d'échéance des tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-display-settings.page:23
+#: C/tasks-display-settings.page:23(page/title)
 msgid "Displaying of tasks"
 msgstr "Affichage des tâches"
 
-#. (itstool) path: page/p
-#: C/tasks-display-settings.page:27
+#: C/tasks-display-settings.page:27(page/p)
 msgid ""
 "The following task-related options are available under <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Tasks</gui></"
@@ -12985,33 +12129,27 @@ msgstr ""
 "l'onglet <guiseq><gui>Édition</gui><gui>Préférences</gui><gui>Agenda et "
 "tâches</gui><gui>Tâches</gui></guiseq>."
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:31
+#: C/tasks-display-settings.page:31(item/p)
 msgid "Tasks due today:"
 msgstr "Tâches d'aujourd'hui :"
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:32
+#: C/tasks-display-settings.page:32(item/p)
 msgid "Select the color for tasks due today."
 msgstr "Sélectionnez la couleur des tâches du jour."
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:33
+#: C/tasks-display-settings.page:33(item/p)
 msgid "Overdue tasks:"
 msgstr "Tâches en retard :"
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:34
+#: C/tasks-display-settings.page:34(item/p)
 msgid "Select the color for overdue tasks."
 msgstr "Sélectionnez la couleur des tâches échues."
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:35
+#: C/tasks-display-settings.page:35(item/p)
 msgid "Hide completed tasks after:"
 msgstr "Masquer les tâches effectuées après :"
 
-#. (itstool) path: item/p
-#: C/tasks-display-settings.page:36
+#: C/tasks-display-settings.page:36(item/p)
 msgid ""
 "Select this option to have completed tasks hidden after a period of time "
 "measured in days, hours, or minutes. If you do not select this option, "
@@ -13022,67 +12160,56 @@ msgstr ""
 "tâches effectuées restent dans la liste des tâches et sont signalées comme "
 "étant terminées."
 
-#. (itstool) path: info/desc
-#: C/tasks-local.page:5
+#: C/tasks-local.page:5(info/desc)
 msgid "Adding another local task or memo list."
 msgstr "Ajouter une autre liste locale de tâches ou de mémos."
 
-#. (itstool) path: page/title
-#: C/tasks-local.page:20
+#: C/tasks-local.page:20(page/title)
 msgid "Adding another local task or memo list"
 msgstr "Ajout d'une autre liste locale de tâches ou de mémos"
 
-#. (itstool) path: page/p
-#: C/tasks-local.page:22
+#: C/tasks-local.page:22(page/p)
 msgid ""
 "To add another local task list to Evolution, perform the following steps:"
 msgstr ""
 "Pour ajouter une autre liste de tâches locale à Evolution, suivez les étapes "
 "suivantes :"
 
-#. (itstool) path: info/desc
-#: C/tasks-organizing.page:5
+#: C/tasks-organizing.page:5(info/desc)
 msgid "On task and memo lists, searching, and categories."
 msgstr ""
 "À propos des listes, de la recherche et des catégories de tâches et de mémos."
 
-#. (itstool) path: page/title
-#: C/tasks-organizing.page:21
+#: C/tasks-organizing.page:21(page/title)
 msgid "Sorting and organizing tasks and memos"
 msgstr "Tri et organisation des tâches et des mémos"
 
-#. (itstool) path: info/desc
-#: C/tasks-searching.page:5
+#: C/tasks-searching.page:5(info/desc)
 msgid "Searching tasks."
 msgstr "Rechercher des tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-searching.page:28
+#: C/tasks-searching.page:28(page/title)
 msgid "Searching Tasks"
 msgstr "Recherche de tâches"
 
-#. (itstool) path: section/title
-#: C/tasks-searching.page:31
+#: C/tasks-searching.page:31(section/title)
 msgid "Searching in a Single Task"
 msgstr "Recherche dans une seule tâche"
 
-#. (itstool) path: section/p
-#: C/tasks-searching.page:32
+#: C/tasks-searching.page:32(section/p)
 msgid ""
 "To find text in the displayed task, select <guiseq><gui>Edit</gui><gui>Find "
-"in Task…</gui></guiseq> from the main menu."
+"in Task...</gui></guiseq> from the main menu."
 msgstr ""
 "Pour trouver un texte dans la tâche affichée, sélectionnez "
-"<guiseq><gui>Édition</gui><gui>Rechercher dans la tâche…</gui></guiseq> dans "
+"<guiseq><gui>Édition</gui><gui>Rechercher dans la tâche</gui></guiseq> dans "
 "le menu principal."
 
-#. (itstool) path: section/title
-#: C/tasks-searching.page:36
+#: C/tasks-searching.page:36(section/title)
 msgid "Searching Across Tasks"
 msgstr "Recherche parmi les tâches"
 
-#. (itstool) path: section/p
-#: C/tasks-searching.page:40
+#: C/tasks-searching.page:40(section/p)
 msgid ""
 "In the Tasks view, you can quickly search for tasks either by summary or by "
 "category."
@@ -13090,18 +12217,15 @@ msgstr ""
 "Dans la vue de Tâches, vous pouvez faire une recherche rapide de tâches, par "
 "résumé ou par catégorie."
 
-#. (itstool) path: info/desc
-#: C/tasks-usage-add-task.page:5
+#: C/tasks-usage-add-task.page:5(info/desc)
 msgid "Adding a task to your task list."
 msgstr "Ajouter une tâche à votre liste de tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-usage-add-task.page:23
+#: C/tasks-usage-add-task.page:23(page/title)
 msgid "Adding a Task"
 msgstr "Ajout d'une tâche"
 
-#. (itstool) path: item/p
-#: C/tasks-usage-add-task.page:26
+#: C/tasks-usage-add-task.page:26(item/p)
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Task</gui></guiseq>, or "
 "press <keyseq><key>Shift</key><key>Ctrl</key><key>T</key></keyseq>."
@@ -13110,19 +12234,16 @@ msgstr ""
 "guiseq> ou utilisez la combinaison de touches <keyseq><key>Maj</"
 "key><key>Ctrl</key><key>T</key></keyseq>."
 
-#. (itstool) path: item/p
-#: C/tasks-usage-add-task.page:27
+#: C/tasks-usage-add-task.page:27(item/p)
 msgid "Select a task list in the <gui>List</gui> dropdown list."
 msgstr ""
 "Sélectionnez une liste de tâches dans la liste déroulante <gui>Liste</gui>."
 
-#. (itstool) path: item/p
-#: C/tasks-usage-add-task.page:28
+#: C/tasks-usage-add-task.page:28(item/p)
 msgid "Enter the task information."
 msgstr "Saisissez les informations de la tâche."
 
-#. (itstool) path: page/p
-#: C/tasks-usage-add-task.page:32
+#: C/tasks-usage-add-task.page:32(page/p)
 msgid ""
 "If you just want to quickly add a task by entering a summary you can "
 "directly enter it in the list of tasks."
@@ -13130,8 +12251,7 @@ msgstr ""
 "Si vous voulez juste ajouter rapidement une tâche en saisissant un résumé, "
 "vous pouvez le saisir directement dans la liste des tâches."
 
-#. (itstool) path: page/p
-#: C/tasks-usage-add-task.page:34
+#: C/tasks-usage-add-task.page:34(page/p)
 msgid ""
 "You can also define a <link xref=\"calendar-timezones\">time zone</link>, a "
 "<link xref=\"using-categories\">category</link>, or a <link xref=\"calendar-"
@@ -13142,18 +12262,15 @@ msgstr ""
 "<link xref=\"calendar-classifications\">classification</link> pour la tâche "
 "ou ajouter une pièce jointe."
 
-#. (itstool) path: section/title
-#: C/tasks-usage-add-task.page:37
+#: C/tasks-usage-add-task.page:37(section/title)
 msgid "Assigned Tasks"
 msgstr "Tâches attribuées"
 
-#. (itstool) path: section/p
-#: C/tasks-usage-add-task.page:39
+#: C/tasks-usage-add-task.page:39(section/p)
 msgid "Evolution can be used to assign a task to multiple people."
 msgstr "Evolution permet d'attribuer des tâches à plusieurs personnes."
 
-#. (itstool) path: section/p
-#: C/tasks-usage-add-task.page:40
+#: C/tasks-usage-add-task.page:40(section/p)
 msgid ""
 "When you assign a task, you can specify the attendees in several categories, "
 "such as \"chair\" or \"required\". When you save the task, each attendee is "
@@ -13166,8 +12283,7 @@ msgstr ""
 "informations de la tâche, qui leur donnent également la possibilité de "
 "répondre."
 
-#. (itstool) path: section/p
-#: C/tasks-usage-add-task.page:41
+#: C/tasks-usage-add-task.page:41(section/p)
 msgid ""
 "This is similar to <link xref=\"calendar-meetings-sending-invitation"
 "\">meetings</link>."
@@ -13175,8 +12291,7 @@ msgstr ""
 "Il s'agit d'une chose similaire aux <link xref=\"calendar-meetings-sending-"
 "invitation\">réunions</link>."
 
-#. (itstool) path: section/p
-#: C/tasks-usage-add-task.page:42
+#: C/tasks-usage-add-task.page:42(section/p)
 msgid ""
 "To create an Assigned Task, click <guiseq><gui>File</gui><gui>New</"
 "gui><gui>Assigned Task</gui></guiseq>."
@@ -13184,18 +12299,15 @@ msgstr ""
 "Pour créer une tâche attribuée, cliquez sur <guiseq><gui>Fichier</"
 "gui><gui>Nouveau</gui><gui> Tâche attribuée</gui></guiseq>."
 
-#. (itstool) path: info/desc
-#: C/tasks-usage-delete-task.page:5
+#: C/tasks-usage-delete-task.page:5(info/desc)
 msgid "Deleting a task from your task list."
 msgstr "Supprimer une tâche de votre liste de tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-usage-delete-task.page:20
+#: C/tasks-usage-delete-task.page:20(page/title)
 msgid "Deleting a Task"
 msgstr "Suppression d'une tâche"
 
-#. (itstool) path: page/p
-#: C/tasks-usage-delete-task.page:22
+#: C/tasks-usage-delete-task.page:22(page/p)
 msgid ""
 "If you want to delete a task in your task lists, right-click on the task and "
 "select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> "
@@ -13209,59 +12321,49 @@ msgstr ""
 "utilisez le menu <guiseq><gui>Édition</gui><gui>Supprimer la tâche</gui></"
 "guiseq>."
 
-#. (itstool) path: info/desc
-#: C/tasks-usage-edit-task.page:5
+#: C/tasks-usage-edit-task.page:5(info/desc)
 msgid "Editing a task in your task list."
 msgstr "Modifier une tâche de votre liste de tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-usage-edit-task.page:20
+#: C/tasks-usage-edit-task.page:20(page/title)
 msgid "Editing a Task"
 msgstr "Modification d'une tâche"
 
-#. (itstool) path: page/p
-#: C/tasks-usage-edit-task.page:22
+#: C/tasks-usage-edit-task.page:22(page/p)
 msgid "If you want to change a task that already exists in your task lists,"
 msgstr ""
 "Si vous souhaitez modifier une tâche existante de votre liste de tâches,"
 
-#. (itstool) path: item/p
-#: C/tasks-usage-edit-task.page:25
+#: C/tasks-usage-edit-task.page:25(item/p)
 msgid ""
 "Double-click on the task that you want to edit in the list of tasks, or "
-"right-click on the task and click <gui>Open Task</gui>."
+"right-click on the task and click <key>Open Task</key>."
 msgstr ""
-"Faites un double-clic sur la tâche que vous voulez modifier dans la liste de "
+"faites un double-clic sur la tâche que vous voulez modifier dans la liste de "
 "tâches ou faites un clic-droit sur la tâche, puis cliquez sur <key>Ouvrir la "
 "tâche</key>,"
 
-#. (itstool) path: item/p
-#: C/tasks-usage-edit-task.page:26
+#: C/tasks-usage-edit-task.page:26(item/p)
 msgid "Edit the task information."
 msgstr "modifiez les informations de la tâche,"
 
-#. (itstool) path: info/desc
-#: C/tasks-usage.page:5
+#: C/tasks-usage.page:5(info/desc)
 msgid "On adding, editing, and deleting tasks."
 msgstr "À propos de l'ajout, la modification et la suppression de tâches."
 
-#. (itstool) path: page/title
-#: C/tasks-usage.page:20
+#: C/tasks-usage.page:20(page/title)
 msgid "Add, Edit, and Delete Tasks"
 msgstr "Ajout, modification et suppression des tâches"
 
-#. (itstool) path: info/desc
-#: C/tasks-using-several-tasklists.page:5
+#: C/tasks-using-several-tasklists.page:5(info/desc)
 msgid "Adding and using more than one task list or memo list."
 msgstr "Ajouter et utiliser plus d'une liste de tâches ou de mémos."
 
-#. (itstool) path: page/title
-#: C/tasks-using-several-tasklists.page:20
+#: C/tasks-using-several-tasklists.page:20(page/title)
 msgid "Using several task lists or memo lists"
 msgstr "Utilisation de plusieurs listes de tâches ou de mémos"
 
-#. (itstool) path: page/p
-#: C/tasks-using-several-tasklists.page:22
+#: C/tasks-using-several-tasklists.page:22(page/p)
 msgid ""
 "You can have multiple task or memo lists and choose which of your lists get "
 "displayed. For example, you might have tasks for work, tasks for home, and "
@@ -13273,19 +12375,16 @@ msgstr ""
 "lesquelles seront affichées. Par exemple, vous pouvez avoir des tâches pour "
 "le travail, des tâches pour la maison et des tâches pour le club de chant "
 "dont vous êtes membre. La barre latérale affiche ces listes et vous pouvez "
-"cocher ou dé-cocher n'importe quelle case en face de chaque élément de la "
-"liste pour afficher ou masquer les tâches ou mémos correspondants dans la "
-"vue."
+"cocher ou pas n'importe quelle case en face d'elles pour afficher ou masquer "
+"les tâches ou mémos correspondants dans la vue."
 
-#. (itstool) path: page/p
-#: C/tasks-using-several-tasklists.page:24
+#: C/tasks-using-several-tasklists.page:24(page/p)
 msgid "Tasks and memos from each task or memo list appear as different colors."
 msgstr ""
 "Les tâches et les mémos de chaque liste apparaissent dans une couleur "
 "différente."
 
-#. (itstool) path: page/p
-#: C/tasks-using-several-tasklists.page:26
+#: C/tasks-using-several-tasklists.page:26(page/p)
 msgid ""
 "You can also use lists that are not on your computer, such as on the "
 "internet."
@@ -13293,41 +12392,34 @@ msgstr ""
 "Vous pouvez utilisez des listes qui ne sont pas sur votre ordinateur, par "
 "exemple en utilisant une liste sur internet."
 
-#. (itstool) path: info/desc
-#: C/tasks-webdav.page:5
+#: C/tasks-webdav.page:5(info/desc)
 msgid "Using an online WebDAV task list or memo list."
 msgstr "Utiliser une liste de tâches ou de mémos en ligne WebDAV."
 
-#. (itstool) path: page/title
-#: C/tasks-webdav.page:20
+#: C/tasks-webdav.page:20(page/title)
 msgid "Using a WebDAV task or memo list"
 msgstr "Utilisation d'une liste de tâches ou de mémos WebDAV"
 
-#. (itstool) path: page/p
-#: C/tasks-webdav.page:22
+#: C/tasks-webdav.page:22(page/p)
 msgid "Lists of this type are read-only."
 msgstr "Les listes de ce type sont en lecture seule."
 
-#. (itstool) path: page/p
-#: C/tasks-webdav.page:37
+#: C/tasks-webdav.page:37(page/p)
 msgid "The list will be added in Evolution."
 msgstr "La liste sera ajoutée dans Evolution."
 
-#. (itstool) path: info/desc
-#: C/using-categories.page:5
+#: C/using-categories.page:5(info/desc)
 msgid ""
 "Using and managing categories for appointments, contacts, memos and tasks."
 msgstr ""
 "Utilisation et gestion des catégories pour les rendez-vous, les contacts, "
 "les mémos et les tâches."
 
-#. (itstool) path: page/title
-#: C/using-categories.page:25
+#: C/using-categories.page:25(page/title)
 msgid "Using Categories"
 msgstr "Utilisation des catégories"
 
-#. (itstool) path: page/p
-#: C/using-categories.page:27
+#: C/using-categories.page:27(page/p)
 msgid ""
 "Another way to group contacts, appointments, tasks and memos (summarized by "
 "the term \"objects\" in the following text) is to mark them as belonging to "
@@ -13344,8 +12436,7 @@ msgstr ""
 "parce qu'il travaille avec vous et dans la catégorie « Amis » car c'est un "
 "ami."
 
-#. (itstool) path: note/p
-#: C/using-categories.page:29
+#: C/using-categories.page:29(note/p)
 msgid ""
 "To display only the objects in a particular category, select the "
 "corresponding category in the quick <link xref=\"searching-items\">search</"
@@ -13355,35 +12446,30 @@ msgstr ""
 "catégorie correspondante dans la barre de <link xref=\"searching-items"
 "\">recherche</link> rapide."
 
-#. (itstool) path: section/title
-#: C/using-categories.page:32
+#: C/using-categories.page:32(section/title)
 msgid "Setting categories for an object"
 msgstr "Paramétrage des catégories d'un objet"
 
-#. (itstool) path: section/p
-#: C/using-categories.page:34
+#: C/using-categories.page:34(section/p)
 msgid "To mark an object as belonging to a category,"
 msgstr "Pour marquer un objet comme appartenant à une catégorie,"
 
-#. (itstool) path: item/p
-#: C/using-categories.page:36
+#: C/using-categories.page:36(item/p)
 msgid "Double-click the object to bring up the corresponding editor."
 msgstr ""
 "Faites un double-clic sur l'objet pour faire apparaître la fenêtre de "
 "l'éditeur correspondant."
 
-#. (itstool) path: item/p
-#: C/using-categories.page:37 C/using-categories.page:49
+#: C/using-categories.page:37(item/p) C/using-categories.page:49(item/p)
 msgid ""
-"Click <gui style=\"button\">Categories…</gui>. (If this button is not "
+"Click <gui style=\"button\">Categories...</gui>. (If this button is not "
 "available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)"
 msgstr ""
 "Cliquez sur <gui style=\"button\">Catégories...</gui> (si ce bouton n'est "
 "pas disponible, sélectionnez <guiseq><gui>Affichage</gui><gui>Catégories</"
 "gui></guiseq>)."
 
-#. (itstool) path: item/p
-#: C/using-categories.page:38
+#: C/using-categories.page:38(item/p)
 msgid ""
 "Select the category from the list. You can select as many or as few "
 "categories as you like."
@@ -13391,13 +12477,11 @@ msgstr ""
 "Sélectionnez la catégorie dans la liste. Vous pouvez sélectionner autant de "
 "catégories que vous le souhaitez."
 
-#. (itstool) path: section/title
-#: C/using-categories.page:44
+#: C/using-categories.page:44(section/title)
 msgid "Adding and managing categories"
 msgstr "Ajout et gestion des catégories"
 
-#. (itstool) path: section/p
-#: C/using-categories.page:46
+#: C/using-categories.page:46(section/p)
 msgid ""
 "If the default list of categories does not suit your needs, you can add your "
 "own categories either directly via <guiseq><gui>Edit</gui><gui>Available "
@@ -13408,22 +12492,19 @@ msgstr ""
 "<guiseq><gui>Édition</gui><gui>Catégories disponibles</gui></guiseq>, soit "
 "indirectement en éditant un objet :"
 
-#. (itstool) path: item/p
-#: C/using-categories.page:48
+#: C/using-categories.page:48(item/p)
 msgid "Double-click any object to bring up the corresponding editor."
 msgstr ""
 "Faites un double-clic sur l'objet pour faire apparaître la fenêtre de "
 "l'éditeur correspondant."
 
-#. (itstool) path: item/p
-#: C/using-categories.page:50
+#: C/using-categories.page:50(item/p)
 msgid "Enter the new category in the entry box at the top."
 msgstr ""
 "Saisissez le nom de la nouvelle catégorie dans la zone de saisie tout en "
 "haut."
 
-#. (itstool) path: item/p
-#: C/using-categories.page:52
+#: C/using-categories.page:52(item/p)
 msgid ""
 "You can now see the category in the <gui>Categories</gui> text field in the "
 "editor."
@@ -13431,8 +12512,7 @@ msgstr ""
 "Le nom de la catégorie apparaît maintenant dans le champ de texte "
 "<gui>Catégories</gui> de l'éditeur."
 
-#. (itstool) path: section/p
-#: C/using-categories.page:56
+#: C/using-categories.page:56(section/p)
 msgid ""
 "In the <gui>Categories Editor</gui> you can edit or set the color and icon "
 "for each category available by clicking <gui style=\"button\">Edit</gui> at "
@@ -13445,43 +12525,35 @@ msgstr ""
 "<gui>Catégories</gui>. Cliquez sur le bouton <gui style=\"button"
 "\">Supprimer</gui> pour supprimer des catégories de la liste."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:3
+#: C/xinclude-filter-vfolder-conditions.xml:3(item/p)
 msgid "Sender:"
 msgstr "Expéditeur :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:4
+#: C/xinclude-filter-vfolder-conditions.xml:4(item/p)
 msgid "The sender's email address or the name of the sender."
 msgstr "L'adresse électronique de l'expéditeur ou son nom."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:6
+#: C/xinclude-filter-vfolder-conditions.xml:6(item/p)
 msgid "Recipients:"
 msgstr "Destinataires :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:7
+#: C/xinclude-filter-vfolder-conditions.xml:7(item/p)
 msgid "The recipients of the message."
 msgstr "Les destinataires du message."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:9
+#: C/xinclude-filter-vfolder-conditions.xml:9(item/p)
 msgid "CC:"
 msgstr "CC :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:10
+#: C/xinclude-filter-vfolder-conditions.xml:10(item/p)
 msgid "Only the CC recipients of the message."
 msgstr "Seulement les destinataires CC du message."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:12
+#: C/xinclude-filter-vfolder-conditions.xml:12(item/p)
 msgid "BCC:"
 msgstr "Cci :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:13
+#: C/xinclude-filter-vfolder-conditions.xml:13(item/p)
 msgid ""
 "Only the BCC recipients of the message. Obviously this can only be applied "
 "to outgoing filters."
@@ -13489,13 +12561,11 @@ msgstr ""
 "Seulement les destinataires Cci du message. Cela ne peut évidemment "
 "s'appliquer qu'à des filtres sortants."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:15
+#: C/xinclude-filter-vfolder-conditions.xml:15(item/p)
 msgid "Sender or Recipients:"
 msgstr "Expéditeur ou destinataires :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:16
+#: C/xinclude-filter-vfolder-conditions.xml:16(item/p)
 msgid ""
 "The sender's email address or the name of the sender or the recipients of "
 "the message."
@@ -13503,33 +12573,29 @@ msgstr ""
 "L'adresse électronique de l'expéditeur ou son nom ou les destinataires du "
 "message."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:18
+#: C/xinclude-filter-vfolder-conditions.xml:18(item/p)
 msgid "Subject:"
 msgstr "Sujet :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:19
+#: C/xinclude-filter-vfolder-conditions.xml:19(item/p)
 msgid "The subject line of the message."
 msgstr "La ligne sujet du message."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:21
+#: C/xinclude-filter-vfolder-conditions.xml:21(item/p)
 msgid "Specific Header:"
 msgstr "En-tête spécifique :"
 
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:22
+#: C/xinclude-filter-vfolder-conditions.xml:22(p/link)
+#, fuzzy
+#| msgid "Custom Header Lines"
 msgid "custom ones"
-msgstr "les personnalisés"
+msgstr "En-têtes personnalisés"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:22
+#: C/xinclude-filter-vfolder-conditions.xml:22(item/p)
 msgid "Any header including <_:link-1/>."
-msgstr "Tout en-tête incluant <_:link-1/>."
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:23
+#: C/xinclude-filter-vfolder-conditions.xml:23(item/p)
 msgid ""
 "If a message uses a header more than once, Evolution pays attention only to "
 "the first instance, even if the message defines the header differently the "
@@ -13546,61 +12612,41 @@ msgstr ""
 "deuxième déclaration n'existait pas. Pour filtrer sur les messages qui "
 "utilisent des en-têtes plusieurs fois, utilisez une expression régulière."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:25
+#: C/xinclude-filter-vfolder-conditions.xml:25(item/p)
 msgid "Message Body:"
 msgstr "Corps du message :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:26
+#: C/xinclude-filter-vfolder-conditions.xml:26(item/p)
 msgid "Searches in the actual text of the message."
 msgstr "Recherche dans le texte effectif du message."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:28
+#: C/xinclude-filter-vfolder-conditions.xml:28(item/p)
 msgid "Expression:"
 msgstr "Expression :"
 
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:29
+#: C/xinclude-filter-vfolder-conditions.xml:29(p/link)
 msgid "filters"
 msgstr "filtres"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:29
+#: C/xinclude-filter-vfolder-conditions.xml:29(item/p)
+#, fuzzy
+#| msgid ""
+#| "(For programmers only) Match a message according to an expression you "
+#| "write in the Scheme language used to define <link xref=\"mail-filters"
+#| "\">filters</link> in Evolution."
 msgid ""
 "(For programmers only) Match a message according to an expression you write "
 "in the Scheme language used to define <_:link-1/> in Evolution."
 msgstr ""
-"(Uniquement pour les programmeurs) Recherche les messages selon une "
-"expression écrite en langage Scheme, utilisé pour définir les <_:link-1/> "
-"dans Evolution."
+"(uniquement pour les programmeurs) Recherche les messages selon une "
+"expression écrite en langage Scheme, utilisé pour définir les <link xref="
+"\"mail-filters\">filtres</link> dans Evolution."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:31
-msgid "Free Form Expression:"
-msgstr "Free Form Expression :"
-
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:32
-msgid "special syntax"
-msgstr "syntaxe spéciale"
-
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:32
-msgid ""
-"(For advanced users only) Combine numerous conditions by using a <_:link-1/>."
-msgstr ""
-"(Pour utilisateurs avancés uniquement) Combiner plusieurs conditions en "
-"utilisant un <_:link-1/>."
-
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:34
+#: C/xinclude-filter-vfolder-conditions.xml:31(item/p)
 msgid "Date sent:"
 msgstr "Date d'envoi :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:35
+#: C/xinclude-filter-vfolder-conditions.xml:32(item/p)
 msgid ""
 "Filters messages according to the date on which they were sent. First, "
 "choose the conditions you want a message to meet, such as before a given "
@@ -13618,13 +12664,11 @@ msgstr ""
 "demander de vérifier qu'un message soit dans un intervalle de temps relatif "
 "au filtre, comme par exemple entre deux et quatre jours."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:37
+#: C/xinclude-filter-vfolder-conditions.xml:34(item/p)
 msgid "Date received:"
 msgstr "Date de réception :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:38
+#: C/xinclude-filter-vfolder-conditions.xml:35(item/p)
 msgid ""
 "This works the same way as the Date Sent option, except that it compares the "
 "time you received the message with the dates you specify."
@@ -13633,33 +12677,33 @@ msgstr ""
 "la date où vous avez reçu le message est comparée aux dates que vous "
 "indiquez."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:40
+#: C/xinclude-filter-vfolder-conditions.xml:37(item/p)
 msgid "Label:"
 msgstr "Étiquette :"
 
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:41
+#: C/xinclude-filter-vfolder-conditions.xml:38(p/link)
 msgid "labels"
 msgstr "étiquettes"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:41
+#: C/xinclude-filter-vfolder-conditions.xml:38(item/p)
+#, fuzzy
+#| msgid ""
+#| "Messages can have <link xref=\"mail-labels\">labels</link> of Important, "
+#| "Work, Personal, To Do, or Later. You can set labels with other filters or "
+#| "manually."
 msgid ""
 "Messages can have <_:link-1/> of Important, Work, Personal, To Do, or Later. "
 "You can set labels with other filters or manually."
 msgstr ""
-"Les messages peuvent avoir les <_:link-1/> Important, Bureau, Personnel, À "
-"faire ou Plus tard. Vous pouvez placer ces étiquettes avec d'autres filtres "
-"ou à la main."
+"Les messages peuvent avoir les <link xref=\"mail-labels\">étiquettes</link> "
+"Important, Bureau, Personnel, À faire ou Plus tard. Vous pouvez placer ces "
+"étiquettes avec d'autres filtres ou à la main."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:43
+#: C/xinclude-filter-vfolder-conditions.xml:40(item/p)
 msgid "Score:"
 msgstr "Score :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:44
+#: C/xinclude-filter-vfolder-conditions.xml:41(item/p)
 msgid ""
 "Sets the message score to any whole number greater than 0. You can have one "
 "filter set or change a message score, and then set up another filter to move "
@@ -13674,23 +12718,19 @@ msgstr ""
 "nombre que vous pouvez attribuer aux messages afin que d'autres filtres "
 "puissent les traiter."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:46
+#: C/xinclude-filter-vfolder-conditions.xml:43(item/p)
 msgid "Size (kB):"
 msgstr "Taille (Ko) :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:47
+#: C/xinclude-filter-vfolder-conditions.xml:44(item/p)
 msgid "Sorts based on the size of the message in kilobytes."
 msgstr "Trie selon la taille du message en kilooctets."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:49
+#: C/xinclude-filter-vfolder-conditions.xml:46(item/p)
 msgid "Status:"
 msgstr "État :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:50
+#: C/xinclude-filter-vfolder-conditions.xml:47(item/p)
 msgid ""
 "Filters according to the status of a message. The status can be Replied To, "
 "Draft, Important, Read, or Junk."
@@ -13698,44 +12738,38 @@ msgstr ""
 "Filtre selon l'état d'un message. L'état peut être Répondre à, Brouillon, "
 "Important, Lu ou Pourriel."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:52
+#: C/xinclude-filter-vfolder-conditions.xml:49(item/p)
 msgid "Follow Up:"
 msgstr "Donner suite :"
 
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:53
+#: C/xinclude-filter-vfolder-conditions.xml:50(p/link)
 msgid "flagged for follow-up"
-msgstr "marqué pour donner suite"
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:53
+#: C/xinclude-filter-vfolder-conditions.xml:50(item/p)
 msgid "Checks whether the message is <_:link-1/>."
-msgstr "Vérifie si le messages est <_:link-1/>."
+msgstr ""
 
 # « Terminé le » pourrait poser un pb si « hier » était ajouté par exemple (Stéphane)
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:55
+#: C/xinclude-filter-vfolder-conditions.xml:52(item/p)
 msgid "Completed On:"
 msgstr "Terminé :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:58
+#: C/xinclude-filter-vfolder-conditions.xml:55(item/p)
 msgid "Attachments:"
 msgstr "Pièces jointes :"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:59
+#: C/xinclude-filter-vfolder-conditions.xml:56(item/p)
 msgid "Checks whether there is an attachment for the email."
 msgstr "Vérifie s'il y a une pièce jointe au courriel."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:61
+#: C/xinclude-filter-vfolder-conditions.xml:58(item/p)
+#, fuzzy
+#| msgid "Mailing List"
 msgid "Mailing List:"
-msgstr "Liste de diffusion :"
+msgstr "Liste de diffusion"
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:62
+#: C/xinclude-filter-vfolder-conditions.xml:59(item/p)
 msgid ""
 "Filters based on the mailing list the message came from. This filter might "
 "miss messages from some list servers, because it checks for the X-BeenThere "
@@ -13750,56 +12784,56 @@ msgstr ""
 "listes qui ne définissent pas correctement X-BeenThere ne seront pas "
 "interceptés par ces filtres."
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:64
+#: C/xinclude-filter-vfolder-conditions.xml:61(item/p)
 msgid "Regex Match:"
 msgstr "Correspondance Regex :"
 
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:65
+#: C/xinclude-filter-vfolder-conditions.xml:62(p/link)
 msgid "regex"
-msgstr "regex"
+msgstr ""
 
-#. (itstool) path: link/cmd
-#: C/xinclude-filter-vfolder-conditions.xml:65
+#: C/xinclude-filter-vfolder-conditions.xml:62(p/cmd)
 msgid "grep"
-msgstr "grep"
-
-#. (itstool) path: p/link
-#: C/xinclude-filter-vfolder-conditions.xml:65
-msgid "the man page for the <_:cmd-1/>"
-msgstr "la page de manuel pour la commande <_:cmd-1/>"
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/xinclude-filter-vfolder-conditions.xml:65
+#: C/xinclude-filter-vfolder-conditions.xml:62(item/p)
+#, fuzzy
+#| msgid ""
+#| "(For programmers only) If you know your way around a <link href=\"https://";
+#| "secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\">regex</link>, "
+#| "or regular expression, this option allows you to search for complex "
+#| "patterns of letters, so that you can find, for example, all words that "
+#| "start with a and end with m, and are between six and fifteen letters "
+#| "long, or all messages that declare a particular header twice. For "
+#| "information about how to use regular expressions, check the man page for "
+#| "the <cmd>grep</cmd> command."
 msgid ""
 "(For programmers only) If you know your way around a <_:link-1/>, or regular "
 "expression, this option allows you to search for complex patterns of "
 "letters, so that you can find, for example, all words that start with a and "
 "end with m, and are between six and fifteen letters long, or all messages "
 "that declare a particular header twice. For information about how to use "
-"regular expressions, check <_:link-2/> command."
-msgstr ""
-"(Uniquement pour les programmeurs) Si vous maîtrisez une <_:link-1/>, ou "
-"expression régulière, cette option vous permet de rechercher des motifs "
-"complexes de caractères afin de pouvoir trouver, par exemple, tous les mots "
-"commençant par « a » et qui finissent par « m », et qui contiennent entre 6 "
-"et quinze caractères, ou tous les messages qui déclarent deux fois un en-"
-"tête particulier. Pour des informations sur l'utilisation des expressions "
-"régulières, consultez la page de manuel de la commande <_:link-2/>."
-
-#. (itstool) path: section/title
-#: C/xinclude-mail-account-identity.xml:4
+"regular expressions, check the man page for the <_:cmd-2/> command."
+msgstr ""
+"(uniquement pour les programmeurs) Si vous maîtrisez les <link href="
+"\"https://secure.wikimedia.org/wikipedia/en/wiki/Regular_expression\";>regex</"
+"link> ou expression régulière, cette option vous permet de rechercher des "
+"motifs complexes de caractères afin de pouvoir trouver, par exemple, tous "
+"les mots commençant par « a » et qui finissent par « m », et qui contiennent "
+"entre 6 et quinze caractères, ou tous les messages qui déclarent deux fois "
+"un en-tête particulier. Pour des informations sur l'utilisation des "
+"expressions régulières, consultez la page de manuel de la commande "
+"<cmd>grep</cmd>."
+
+#: C/xinclude-mail-account-identity.xml:4(section/title)
 msgid "Identity"
 msgstr "Identité"
 
-#. (itstool) path: section/p
-#: C/xinclude-mail-account-identity.xml:5
+#: C/xinclude-mail-account-identity.xml:5(section/p)
 msgid "Here you define your name and your email address."
 msgstr "Définissez ici votre nom et votre adresse électronique."
 
-#. (itstool) path: section/p
-#: C/xinclude-mail-account-identity.xml:6
+#: C/xinclude-mail-account-identity.xml:6(section/p)
 msgid ""
 "Optionally you can make this account your default account (e.g. when writing "
 "emails), set a Reply-To email address (if you want replies to messages sent "
@@ -13814,36 +12848,45 @@ msgstr ""
 "travaillez ou l'organisation que vous représentez lorsque vous envoyez un "
 "courriel à partir de ce compte)."
 
-#. (itstool) path: section/title
-#. (itstool) path: guiseq/gui
-#: C/xinclude-searching.xml:4 C/xinclude-searching.xml:6
+#: C/xinclude-searching.xml:4(section/title)
+#: C/xinclude-searching.xml:6(guiseq/gui)
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#. (itstool) path: guiseq/gui
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:6 C/xinclude-searching.xml:15
-#: C/xinclude-searching.xml:21 C/xinclude-searching.xml:27
+#: C/xinclude-searching.xml:6(guiseq/gui)
+#: C/xinclude-searching.xml:15(guiseq/gui)
+#: C/xinclude-searching.xml:21(guiseq/gui) C/xinclude-searching.xml:21(p/gui)
+#: C/xinclude-searching.xml:27(guiseq/gui)
 msgid "Search"
 msgstr "Recherche"
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:6
+#: C/xinclude-searching.xml:6(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> "
+#| "menu to open the dialog box."
 msgid "Select the <_:guiseq-1/> menu to open the dialog box."
-msgstr "Sélectionnez le menu <_:guiseq-1/> pour ouvrir la boîte de dialogue."
+msgstr ""
+"Sélectionnez le menu <guiseq><gui>Rechercher</gui><gui>Recherche avancée</"
+"gui></guiseq> pour ouvrir la boîte de dialogue."
 
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:7
+#: C/xinclude-searching.xml:7(p/gui)
+#, fuzzy
+#| msgid "Advanced options"
 msgid "Add Condition"
-msgstr "Ajouter une condition"
+msgstr "Options avancées"
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:7
+#: C/xinclude-searching.xml:7(item/p)
+#, fuzzy
+#| msgid ""
+#| "Click <gui style=\"button\">Add Condition</gui> to add any number of "
+#| "rules."
 msgid "Click <_:gui-1/> to add any number of rules."
-msgstr "Cliquez sur <_:gui-1/> pour ajouter le nombre souhaité de critères."
+msgstr ""
+"Cliquez sur <gui style=\"button\">Ajouter une condition</gui> pour ajouter "
+"le nombre souhaité de critères."
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:8
+#: C/xinclude-searching.xml:8(item/p)
 msgid ""
 "Select the condition from the dropdown list, and then type a search entry in "
 "the field."
@@ -13851,64 +12894,64 @@ msgstr ""
 "Sélectionnez la condition depuis la liste déroulante puis saisissez un terme "
 "de recherche dans le champ correspondant."
 
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:9 C/xinclude-searching.xml:21
-#: C/xinclude-searching.xml:30
+#: C/xinclude-searching.xml:9(p/gui) C/xinclude-searching.xml:21(p/gui)
+#: C/xinclude-searching.xml:30(p/gui)
 msgid "OK"
-msgstr "OK"
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:9
+#: C/xinclude-searching.xml:9(item/p)
+#, fuzzy
+#| msgid ""
+#| "Click <gui style=\"button\">OK</gui> to get the search results displayed."
 msgid "Click <_:gui-1/> to get the search results displayed."
 msgstr ""
-"Cliquez sur <_:gui-1/> pour que les résultats de la recherche soient "
-"affichés."
+"Cliquez sur <gui style=\"button\">Valider</gui> pour que les résultats de la "
+"recherche soient affichés."
 
-#. (itstool) path: section/title
-#: C/xinclude-searching.xml:14
+#: C/xinclude-searching.xml:14(section/title)
 msgid "Clearing the Search results"
 msgstr "Effacement des résultats de la recherche"
 
-#. (itstool) path: p/gui
-#. (itstool) path: guiseq/gui
-#: C/xinclude-searching.xml:15
+#: C/xinclude-searching.xml:15(p/gui) C/xinclude-searching.xml:15(guiseq/gui)
 msgid "Clear"
-msgstr "Effacer"
+msgstr ""
 
-#. (itstool) path: keyseq/key
-#: C/xinclude-searching.xml:15
+#: C/xinclude-searching.xml:15(keyseq/key)
 msgid "Shift"
-msgstr "Maj"
+msgstr ""
 
-#. (itstool) path: keyseq/key
-#: C/xinclude-searching.xml:15
+#: C/xinclude-searching.xml:15(keyseq/key)
 msgid "Ctrl"
-msgstr "Ctrl"
+msgstr ""
 
-#. (itstool) path: keyseq/key
-#: C/xinclude-searching.xml:15
+#: C/xinclude-searching.xml:15(keyseq/key)
 msgid "Q"
-msgstr "Q"
+msgstr ""
 
-#. (itstool) path: section/p
-#: C/xinclude-searching.xml:15
+#: C/xinclude-searching.xml:15(section/p)
+#, fuzzy
+#| msgid ""
+#| "To clear your search view and get back to the default view, click the "
+#| "<gui>Clear</gui> icon in the search string field, or choose "
+#| "<guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You "
+#| "can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></"
+#| "keyseq> to clear the search."
 msgid ""
 "To clear your search view and get back to the default view, click the <_:"
 "gui-1/> icon in the search string field, or choose <_:guiseq-2/> from the "
 "menubar. You can also press <_:keyseq-3/> to clear the search."
 msgstr ""
 "Pour effacer votre recherche et revenir à la vue par défaut, cliquez sur "
-"l'icône <_:gui-1/> dans le champ de recherche ou choisissez <_:gui-2/> dans "
-"la barre de menus. Vous pouvez aussi appuyer sur <_:keyseq-3/> pour effacer "
-"la recherche."
+"l'icône <gui>Effacer</gui> dans le champ de recherche ou choisissez "
+"<guiseq><gui>Recherche</gui><gui>Effacer</gui></guiseq> dans la barre de "
+"menus. Vous pouvez aussi appuyer sur <keyseq><key>Maj</key><key>Ctrl</"
+"key><key>Q</key></keyseq> pour effacer la recherche."
 
-#. (itstool) path: section/title
-#: C/xinclude-searching.xml:19
+#: C/xinclude-searching.xml:19(section/title)
 msgid "Saved Searches"
 msgstr "Enregistrement de recherches"
 
-#. (itstool) path: section/p
-#: C/xinclude-searching.xml:20
+#: C/xinclude-searching.xml:20(section/p)
 msgid ""
 "If you search for something rather often, you will prefer not to type it "
 "many times. In this case you can use saved searches."
@@ -13917,767 +12960,85 @@ msgstr ""
 "pas saisir cette recherche à chaque fois. Dans ce cas, vous pouvez utiliser "
 "les enregistrements de recherche."
 
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:21
+#: C/xinclude-searching.xml:21(p/gui)
 msgid "Save"
-msgstr "Enregistrer"
+msgstr ""
 
-#. (itstool) path: guiseq/gui
-#: C/xinclude-searching.xml:21
+#: C/xinclude-searching.xml:21(guiseq/gui)
+#, fuzzy
+#| msgid "Saved Searches"
 msgid "Save Search"
-msgstr "Enregistrer la recherche"
+msgstr "Enregistrement de recherches"
 
-#. (itstool) path: section/p
-#: C/xinclude-searching.xml:21
+#: C/xinclude-searching.xml:21(section/p)
+#, fuzzy
+#| msgid ""
+#| "To save your search results, either click <gui>Save</gui> instead of "
+#| "<gui>OK</gui> in the Search dialog, or in case the search results are "
+#| "already displayed, select <guiseq><gui>Search</gui><gui>Save Search</"
+#| "gui></guiseq>. From now on this search will be directly available from "
+#| "the <gui>Search</gui> menu."
 msgid ""
 "To save your search results, either click <_:gui-1/> instead of <_:gui-2/> "
 "in the Search dialog, or in case the search results are already displayed, "
 "select <_:guiseq-3/>. From now on this search will be directly available "
 "from the <_:gui-4/> menu."
 msgstr ""
-"Pour enregistrer les résultats de votre recherche, cliquez sur <_:gui-1/> au "
-"lieu de <_:gui-2/> dans la boîte de dialogue Rechercher, ou, au cas où les "
-"résultats de la recherche sont déjà affichés, sélectionnez <_:guiseq-3/>. "
-"Dès lors, cette recherche est directement disponible à partir du menu <_:"
-"gui-4/>."
+"Pour enregistrer les résultats de votre recherche, soit vous cliquez sur "
+"<gui>Enregistrer</gui> au lieu de <gui>Valider</gui> dans la boîte de "
+"dialogue Rechercher, soit, au cas où les résultats de la recherche sont déjà "
+"affichés, vous sélectionnez <guiseq><gui>Recherche</gui><gui>Enregistrer la "
+"recherche</gui></guiseq>. Dès lors, cette recherche sera directement "
+"disponible à partir du menu <gui>Recherche</gui>."
 
-#. (itstool) path: section/title
-#: C/xinclude-searching.xml:25
+#: C/xinclude-searching.xml:25(section/title)
 msgid "Editing a Saved Search"
 msgstr "Modification d'une recherche enregistrée"
 
-#. (itstool) path: guiseq/gui
-#: C/xinclude-searching.xml:27
+#: C/xinclude-searching.xml:27(guiseq/gui)
+#, fuzzy
+#| msgid "Saved Searches"
 msgid "Edit Saved Searches"
-msgstr "Modifier les recherches enregistrées"
+msgstr "Enregistrement de recherches"
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:27
+#: C/xinclude-searching.xml:27(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> "
+#| "from the menu bar to open the window."
 msgid "Select <_:guiseq-1/> from the menu bar to open the window."
 msgstr ""
-"Sélectionnez <_:guiseq-1/> dans la barre de menus pour ouvrir la fenêtre."
+"Sélectionnez <guiseq><gui>Recherche</gui><gui>Modifier les recherches "
+"enregistrées</gui></guiseq> dans la barre de menus pour ouvrir la fenêtre."
 
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:28
+#: C/xinclude-searching.xml:28(p/gui)
 msgid "Edit"
-msgstr "Modifier"
+msgstr ""
 
-#. (itstool) path: p/gui
-#: C/xinclude-searching.xml:28
+#: C/xinclude-searching.xml:28(p/gui)
 msgid "Edit Rule"
-msgstr "Règles de modification"
+msgstr ""
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:28
+#: C/xinclude-searching.xml:28(item/p)
+#, fuzzy
+#| msgid ""
+#| "Click the <gui style=\"button\">Edit</gui> button to open the <gui>Edit "
+#| "Rule</gui> window."
 msgid "Click the <_:gui-1/> button to open the <_:gui-2/> window."
-msgstr "Cliquez sur le bouton <_:gui-1/> pour ouvrir la fenêtre <_:gui-2/>."
+msgstr ""
+"Cliquez sur le bouton <gui style=\"button\">Édition</gui> pour ouvrir la "
+"fenêtre <gui>Éditer la règle</gui>."
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:29
+#: C/xinclude-searching.xml:29(item/p)
 msgid "Edit the title or search conditions from the dialog box."
 msgstr ""
 "Modifiez le titre ou les critères de la recherche dans la boîte de dialogue."
 
-#. (itstool) path: item/p
-#: C/xinclude-searching.xml:30
+#: C/xinclude-searching.xml:30(item/p)
+#, fuzzy
+#| msgid "Click <gui>OK</gui>."
 msgid "Click <_:gui-1/>."
-msgstr "Cliquez sur <_:gui-1/>."
-
-#~ msgid "Evolution"
-#~ msgstr "Evolution"
-
-#~ msgid "Enter the address of the calendar in the <gui>URL</gui> field."
-#~ msgstr "Saisissez l'adresse de l'agenda dans le champ <gui>URL</gui>."
-
-#~ msgid "Aaron Weber"
-#~ msgstr "Aaron Weber"
-
-#~ msgid "Akhil Laddha"
-#~ msgstr "Akhil Laddha"
-
-#~ msgid "Duncan Mak"
-#~ msgstr "Duncan Mak"
-
-#~ msgid "Ettore Perazzoli"
-#~ msgstr "Ettore Perazzoli"
-
-#~ msgid "Francisco Javier F. Serrador"
-#~ msgstr "Francisco Javier F. Serrador"
-
-#~ msgid "Jessica Prabhakar"
-#~ msgstr "Jessica Prabhakar"
-
-#~ msgid "Kevin Breit"
-#~ msgstr "Kevin Breit"
-
-#~ msgid "Mark Moulder"
-#~ msgstr "Mark Moulder"
-
-#~ msgid "Novell, Inc."
-#~ msgstr "Novell, Inc."
-
-#~ msgid "Radhika Nair"
-#~ msgstr "Radhika Nair"
-
-#~ msgid "Srinivasa Ragavan"
-#~ msgstr "Srinivasa Ragavan"
-
-#~ msgid "Emails"
-#~ msgstr "Courriels"
-
-#~ msgid "E-Mail"
-#~ msgstr "Courriel"
-
-#~ msgid ""
-#~ "These steps are very technical. For average users we recommend using the "
-#~ "<link href=\"help:seahorse/index\"><app>Seahorse</app> application</link> "
-#~ "for managing GPG/OpenPGP keys."
-#~ msgstr ""
-#~ "Ces étapes sont très techniques. Pour les utilisateurs moyens, nous "
-#~ "recommandons d'utiliser l'application <link href=\"help:seahorse/index"
-#~ "\"><app>Seahorse</app> pour gérer les clés GPG/OpenPGP."
-
-#~ msgid ""
-#~ "Before you can get or send GPG encrypted mail, you need to generate your "
-#~ "public and private keys with GPG."
-#~ msgstr ""
-#~ "Avant de recevoir ou d'envoyer des courriels chiffrés GPG, vous avez "
-#~ "besoin de générer vos clés publique et privée avec GPG."
-
-#~ msgid ""
-#~ "Open the <app>Terminal</app> application and enter <cmd>gpg --gen-key</"
-#~ "cmd>."
-#~ msgstr ""
-#~ "Ouvrez l'application <app>Terminal</app> et saisissez <cmd>gpg --gen-key</"
-#~ "cmd>."
-
-#~ msgid "Select an algorithm, then press Enter."
-#~ msgstr "Choisissez un algorithme, puis appuyez sur Entrée."
-
-#~ msgid "Select a key length, then press Enter."
-#~ msgstr "Choisissez une longueur de clé, puis appuyez sur Entrée."
-
-#~ msgid "Enter how long your key should be valid for."
-#~ msgstr "Saisissez la durée de validité de votre clé."
-
-#~ msgid "Type your real name, then press Enter."
-#~ msgstr "Saisissez votre nom réel, puis appuyez sur Entrée."
-
-#~ msgid "Type your email address, then press Enter."
-#~ msgstr "Saisissez votre adresse électronique, puis appuyez sur Entrée."
-
-#~ msgid "(Optional) Type a comment, then press Enter."
-#~ msgstr "Saisissez un commentaire (facultatif), puis appuyez sur Entrée."
-
-#~ msgid "Review your selected user ID. If it is correct, press O."
-#~ msgstr ""
-#~ "Relisez l'identifiant utilisateur sélectionné. S'il est correct, appuyez "
-#~ "sur O."
-
-#~ msgid "Type a passphrase, then press Enter."
-#~ msgstr "Saisissez une phrase de passe, puis appuyez sur Entrée."
-
-#~ msgid "Move your mouse randomly to generate the keys."
-#~ msgstr "Déplacez votre souris au hasard pour générer les clés."
-
-#~ msgid ""
-#~ "After the keys are generated, you can view your key information by "
-#~ "entering <cmd>gpg --list-keys</cmd>. You should see something similar to "
-#~ "this: <code> /home/you/.gnupg/pubring.gpg ---------------------------- "
-#~ "pub 1024D/32j38dk2 2001-06-20 you &lt;you example com&gt; sub "
-#~ "1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</code>"
-#~ msgstr ""
-#~ "Lorsque les clés ont été générées, vous pouvez consulter vos informations "
-#~ "de clé en saisissant <cmd>gpg --list-keys</cmd>. Vous devriez voir "
-#~ "apparaître quelque chose comme ceci : <code> /home/vous/.gnupg/pubring."
-#~ "gpg ---------------------------- pub 1024D/32j38dk2 2001-06-20 vous &lt;"
-#~ "vous exemple com&gt; sub 1024g/289sklj3 2011-06-20 [expires: 2012-11-14]</"
-#~ "code>"
-
-#~ msgid ""
-#~ "GPG creates one list, or keyring, for your public keys and one for your "
-#~ "private keys. All the public keys you know are stored in the file "
-#~ "<file>~/.gnupg/pubring.gpg</file>. If you want to give other people your "
-#~ "key, send them that file."
-#~ msgstr ""
-#~ "GPG crée une liste (ou trousseau de clés) pour vos clés publiques et une "
-#~ "autre pour vos clés privées. Toutes les clés publiques que vous "
-#~ "connaissez sont stockées dans le fichier <file>~/.gnupg/pubring.gpg</"
-#~ "file>. Si vous voulez donnez vos clés à d'autres personnes, envoyez-leur "
-#~ "ce fichier."
-
-#~ msgid "If you want, you can upload your keys to a key server:"
-#~ msgstr ""
-#~ "Si vous le souhaitez, vous pouvez placer vos clés sur un serveur de clés :"
-
-#~ msgid ""
-#~ "Check your public key ID with <code>gpg --list-keys</code>. It is the "
-#~ "string after <code>1024D</code> on the line beginning with <code>pub</"
-#~ "code>. In the example above, it is <code>32j38dk2</code>."
-#~ msgstr ""
-#~ "Vérifiez votre identifiant de clé publique avec <code>gpg --list-keys</"
-#~ "code>. C'est la chaîne de caractères après <code>1024D</code> dans la "
-#~ "ligne qui commence par <code>pub</code>. Dans l'exemple ci-dessus, c'est "
-#~ "<code>32j38dk2</code>."
-
-#~ msgid ""
-#~ "Enter the command <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net "
-#~ "32j38dk2</cmd>. Substitute your key ID for <code>32j38dk2</code>. You "
-#~ "need your password to do this."
-#~ msgstr ""
-#~ "Saisissez la commande <cmd>gpg --send-keys --keyserver wwwkeys.pgp.net "
-#~ "32j38dk2</cmd>. Remplacez <code>32j38dk2</code> par votre identifiant de "
-#~ "clé. Vous avez besoin de votre mot de passe pour effectuer cela."
-
-#~ msgid ""
-#~ "Key servers store your public keys for you so that your friends can "
-#~ "decrypt your messages. If you choose not to use a key server, you can "
-#~ "manually send your public key, include it in your signature file, or put "
-#~ "it on your own Web page. However, it is easier to publish a key once, and "
-#~ "then let people download it from a central place when they want."
-#~ msgstr ""
-#~ "Les serveurs de clés stockent vos clés publiques pour vous afin que vos "
-#~ "connaissances puissent déchiffrer vos messages. Si vous préférez ne pas "
-#~ "utiliser de serveur de clés, vous pouvez envoyer manuellement votre clé "
-#~ "publique en l'incluant dans votre fichier de signature ou en la plaçant "
-#~ "sur votre propre page Web. Cependant, il est plus simple de publier une "
-#~ "clé une fois pour toutes, ce qui permet aux autres de la télécharger d'un "
-#~ "endroit centralisé lorsqu'ils en ont besoin."
-
-#~ msgid ""
-#~ "If you don't have a key to unlock or encrypt a message, you can set your "
-#~ "encryption tool to look it up automatically. If it cannot find the key, "
-#~ "an error message appears."
-#~ msgstr ""
-#~ "Si vous ne possédez pas la clé pour déverrouiller ou chiffrer un message, "
-#~ "vous pouvez configurer votre outil de déchiffrement afin qu'il la "
-#~ "recherche automatiquement. S'il ne peut trouver la clé, un message "
-#~ "d'erreur apparaîtra."
-
-#~ msgid ""
-#~ "To get public keys from a public key server, enter the command <cmd>gpg --"
-#~ "recv-keys --keyserver wwwkeys.pgp.net keyid</cmd>, substituting "
-#~ "<code>keyid</code> by your recipient's ID. You need to enter your "
-#~ "password, and the ID is automatically added to your keyring."
-#~ msgstr ""
-#~ "Pour obtenir des clés publiques d'un serveur de clés, saisissez la "
-#~ "commande <cmd>gpg --recv-keys --keyserver wwwkeys.pgp.net id_clé</cmd>, "
-#~ "en remplaçant <code>id_clé</code> par l'identifiant de votre "
-#~ "destinataire. Vous devez saisir votre mot de passe, puis l'identifiant "
-#~ "est automatiquement ajouté à votre trousseau."
-
-#~ msgid ""
-#~ "If someone sends you a public key directly, save it as a plain text file "
-#~ "and enter the command <cmd>gpg --import</cmd> to add it to your keyring."
-#~ msgstr ""
-#~ "Si quelqu'un vous envoie directement une clé publique, enregistrez-la "
-#~ "dans un fichier texte et saisissez la commande <cmd>gpg --import</cmd> "
-#~ "pour l'ajouter à votre trousseau."
-
-#~ msgid ""
-#~ "If you want <link xref=\"mail-filters\">Filters</link> to be "
-#~ "automatically used for new messages in your inbox, enable <gui>Apply "
-#~ "filters to new messages in Inbox on this server</gui>."
-#~ msgstr ""
-#~ "Si vous voulez que des <link xref=\"mail-filters\">filtres</link> soient "
-#~ "automatiquement utilisés pour les nouveaux messages dans votre Boîte de "
-#~ "réception, activez <gui>Appliquer les filtres aux nouveaux messages dans "
-#~ "la boîte de réception sur le serveur</gui>."
-
-#~ msgid ""
-#~ "Select if you want Evolution to use custom commands to connect to the "
-#~ "IMAP server."
-#~ msgstr ""
-#~ "Choisissez si vous voulez qu'Evolution utilise une commande personnalisée "
-#~ "pour se connecter au serveur IMAP."
-
-#~ msgid ""
-#~ "Select if you want Evolution to override server-supplied folder "
-#~ "namespaces."
-#~ msgstr ""
-#~ "Choisissez si vous voulez qu'Evolution outrepasse l'espace de noms de "
-#~ "dossiers fourni par le serveur."
-
-#~ msgid "Checking incoming mail for junk messages."
-#~ msgstr "Détecter les pourriels dans les messages entrants."
-
-#~ msgid "The default junk filter."
-#~ msgstr "Le greffon par défaut pour le traitement des pourriels."
-
-#~ msgid "Bogofilter and SpamAssassin options."
-#~ msgstr "Options de Bogofilter et SpamAssassin."
-
-#~ msgid "Enter a brief summary in the Summary field."
-#~ msgstr "Saisissez un bref résumé dans le champ Résumé."
-
-#~ msgid "On minimizing Evolution to the notification area."
-#~ msgstr ""
-#~ "À propos de la minimisation d'Evolution dans la zone de notification."
-
-#~ msgid "Minimizing Evolution to the system tray"
-#~ msgstr "Minimisation d'Evolution dans la zone de notification"
-
-#~ msgid ""
-#~ "GNOME, by default, has a <link xref=\"mail-received-notification"
-#~ "\">notification area</link> which includes an applet that informs users "
-#~ "of any system updates, changes, or events. This includes the arrival of "
-#~ "email messages on Evolution. You can refer to this built-in feature of "
-#~ "GNOME for any email notifications."
-#~ msgstr ""
-#~ "Par défaut, GNOME possède une <link xref=\"mail-received-notification"
-#~ "\">zone de notification</link> qui inclut un applet informant les "
-#~ "utilisateurs de n'importe quels mises à jour, modifications ou "
-#~ "événements. Cela comprend l'arrivée de courriels dans Evolution. Vous "
-#~ "pouvez faire référence à cette fonctionnalité intégrée de GNOME pour "
-#~ "toutes notifications de courriel."
-
-#~ msgid ""
-#~ "In GNOME version 2 you may modify the notification area and set it up to "
-#~ "become a system tray by using external applications which might be "
-#~ "available for installation in the software management tool of your "
-#~ "distribution. Available options are for example <link href=\"http://code.";
-#~ "google.com/p/tint2/\">Tint2</link>. This is no longer possible in GNOME 3."
-#~ msgstr ""
-#~ "Dans la version 2 de GNOME, vous pouvez modifier la zone de notification "
-#~ "et la configurer pour qu'elle devienne une zone de notification système "
-#~ "en utilisant des logiciels externes probablement disponibles dans l'outil "
-#~ "de gestion de logiciels de votre distribution. Les options disponibles "
-#~ "sont par exemple  <link href=\"http://alltray.trausch.us/\";>Alltray</"
-#~ "link> ou <link href=\"http://code.google.com/p/tint2/\";>Tint2</link>. Ce "
-#~ "n'est plus possible avec GNOME 3."
-
-#~ msgid "Palm"
-#~ msgstr "Palm"
-
-#~ msgid ""
-#~ "To synchronize with a Palm OS device like the PalmPilot(TM) and the "
-#~ "Handspring Visor several steps are needed: First, you need to enable "
-#~ "synchronization. Second, your computer needs to recognize and access your "
-#~ "handheld. Third, you should decide what sort of synchronization behavior "
-#~ "you want."
-#~ msgstr ""
-#~ "Pour se synchroniser avec un périphérique Palm OS comme le PalmPilot(TM) "
-#~ "et le Handspring Visor, il y a plusieurs étapes à suivre. Tout d'abord, "
-#~ "vous devez activer la synchronisation. Deuxièmement, votre ordinateur "
-#~ "doit reconnaître le périphérique et pouvoir y accéder. Ensuite, vous "
-#~ "devez définir le type de synchronisation à utiliser."
-
-#~ msgid "Enabling Synchronization"
-#~ msgstr "Activation de la synchronisation"
-
-#~ msgid ""
-#~ "If you have not used a handheld device with your computer before, you "
-#~ "need to configure it via <guiseq><gui>Edit</gui><gui>GNOME Pilot "
-#~ "Synchronization...</gui></guiseq>. Make sure that you have read and write "
-#~ "permissions on the device, which is normally in <file>/dev/pilot</file>. "
-#~ "If that does not work, check in <file>/dev/ttyS0</file> if you have a "
-#~ "serial connection, or in <file>/dev/ttyUSB1</file> for a USB connection. "
-#~ "You can do this by becoming root user and adding your username to the "
-#~ "group that owns this device node. For a USB device on sync, two device "
-#~ "nodes are created, <file>ttyUSB0</file> and <file>ttyUSB1</file>. The "
-#~ "second node is the one to be used in configuring the device."
-#~ msgstr ""
-#~ "Si vous n'avez jamais utilisé un périphérique portable avec votre "
-#~ "ordinateur, vous devez le configurer en utilisant le menu "
-#~ "<guiseq><gui>Édition</gui><gui>Synchronisation Pilot GNOME...</gui></"
-#~ "guiseq>. Vérifiez que vous disposez des autorisations de lecture et "
-#~ "d'écriture sur le périphérique (dans <file>/dev/pilot</file> "
-#~ "normalement). En cas de problème, faites un essai avec <file>/dev/ttyS0</"
-#~ "file> si vous disposez d'une connexion série ou dans <file>/dev/ttyUSB1</"
-#~ "file> si vous disposez d'une connexion USB. Pour ce faire, vous devez "
-#~ "passer en mode administrateur et ajouter votre nom d'utilisateur au "
-#~ "groupe qui a les droits sur ce nœud de périphérique. Dans le cas d'une "
-#~ "synchronisation par USB, deux nœuds sont créés, <file>ttyUSB0</file> et "
-#~ "<file>ttyUSB1</file>. Le second nœud est celui qui sera utilisé pour "
-#~ "configurer le périphérique."
-
-#~ msgid "Selecting Conduits"
-#~ msgstr "Sélection des canaux"
-
-#~ msgid ""
-#~ "After your computer and your Palm OS device are communicating, select the "
-#~ "conduits you want under the <gui>Pilot Conduits</gui> section. You can "
-#~ "use conduits to synchronize data with several applications; the Evolution "
-#~ "conduits are labeled <gui>EAddress</gui> for the contacts in your address "
-#~ "book; <gui>ECalendar</gui> for your calendar; and <gui>ETodo</gui> for "
-#~ "your task list."
-#~ msgstr ""
-#~ "Lorsque votre ordinateur et le périphérique Palm OS communiquent, "
-#~ "sélectionnez les canaux appropriés dans la section <gui>Pilot Conduits</"
-#~ "gui> (canaux Pilot). Vous pouvez utiliser des canaux pour synchroniser "
-#~ "les données avec plusieurs applications ; les canaux Evolution "
-#~ "s'appellent <gui>EAddress</gui> pour les contacts de votre carnet "
-#~ "d'adresses, <gui>ECalendar</gui> pour votre agenda et <gui>ETodo</gui> "
-#~ "pour votre listede tâches."
-
-#~ msgid ""
-#~ "Click <gui>Enable</gui>, then click <gui>Settings</gui> to change what "
-#~ "the conduit does when activated. Your options can vary depending on the "
-#~ "conduit, but typically they are as follows:"
-#~ msgstr ""
-#~ "Cliquez sur <gui>Activer</gui>, puis sur <gui>Paramètres</gui> pour "
-#~ "modifier le comportement d'un canal lorsqu'il est activé. Les options "
-#~ "varient en fonction du canal, mais en règle générale, vous disposez des "
-#~ "options suivantes :"
-
-#~ msgid "<gui>Disabled</gui>: Do nothing."
-#~ msgstr "<gui>Désactivé</gui> : ne rien faire."
-
-#~ msgid ""
-#~ "<gui>Synchronize</gui>: Copy new data from the computer to the handheld, "
-#~ "and from the handheld to the computer. Remove items that were on both "
-#~ "systems but have been deleted on one."
-#~ msgstr ""
-#~ "<gui>Synchroniser</gui> : copie les nouvelles données de l'ordinateur "
-#~ "vers le périphérique et vice-versa ; supprime les éléments qui figuraient "
-#~ "sur les deux systèmes et qui ont été supprimés de l'un des deux."
-
-#~ msgid ""
-#~ "<gui>Copy From Pilot</gui>: If there is any new data on the handheld "
-#~ "device, copy it to the computer."
-#~ msgstr ""
-#~ "<gui>Copier à partir du Pilot</gui> : si le périphérique portable "
-#~ "contient de nouvelles données, elles sont copiées vers l'ordinateur."
-
-#~ msgid ""
-#~ "<gui>Copy To Pilot</gui>: Copy new data from the computer to the handheld."
-#~ msgstr ""
-#~ "<gui>Copier vers le Pilot</gui> : copier les nouvelles données de "
-#~ "l'ordinateur vers le périphérique portable."
-
-#~ msgid ""
-#~ "Select the behavior you want for each conduit you choose to use. If "
-#~ "you're not sure, use <gui>Synchronize</gui>."
-#~ msgstr ""
-#~ "Sélectionnez le comportement de chacun des canaux à utiliser. Si vous ne "
-#~ "savez pas, utilisez <gui>Synchroniser</gui>."
-
-#~ msgid "Synchronizing Information"
-#~ msgstr "Informations de synchronisation"
-
-#~ msgid ""
-#~ "Use the following procedure to synchronize the data on your Palm OS "
-#~ "device with the data you store in Evolution."
-#~ msgstr ""
-#~ "Procédez comme suit pour synchroniser les données sur le périphérique "
-#~ "Palm OS et les données que vous stockez dans Evolution."
-
-#~ msgid ""
-#~ "If you want to back up your information before synchronizing, make a copy "
-#~ "of the <file>.local/share/evolution</file> directory inside your home "
-#~ "directory."
-#~ msgstr ""
-#~ "Si vous voulez sauvegarder les informations avant la synchronisation, "
-#~ "faites une copie du répertoire <file>.local/share/evolution</file> dans "
-#~ "votre dossier personnel."
-
-#~ msgid ""
-#~ "Put your handheld device in its cradle and press the <gui style=\"button"
-#~ "\">HotSync</gui> button."
-#~ msgstr ""
-#~ "Placez le périphérique sur sa station d'accueil et appuyez sur le bouton "
-#~ "<gui style=\"button\">HotSync</gui>."
-
-#~ msgid ""
-#~ "If you use Palm OS version 4.0 and have password protection turned on for "
-#~ "your handheld device, you might encounter trouble synchronizing. If this "
-#~ "happens, try turning off password protection on your handheld, "
-#~ "synchronize it with your desktop computer, and then re-enable password "
-#~ "protection on your handheld."
-#~ msgstr ""
-#~ "Si vous utilisez Palm OS version 4.0 et que la protection par mot de "
-#~ "passe est active sur le périphérique portable, des problèmes de "
-#~ "synchronisation peuvent se produire. Dans ce cas, désactivez la "
-#~ "protection par mot de passe sur votre périphérique portable, synchronisez "
-#~ "le périphérique et votre ordinateur, puis réactivez-la."
-
-#~ msgid "Now your Palm OS device will synchronize data with Evolution."
-#~ msgstr ""
-#~ "Maintenant votre périphérique Palm OS et Evolution devraient se "
-#~ "synchroniser."
-
-#~ msgid "Enter the address of the list in the <gui>URL</gui> field."
-#~ msgstr "Saisissez l'adresse de la liste dans le champ <gui>URL</gui>."
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='figures/evolutionlogo.png' "
-#~ "md5='4bf469aaba7c368937309e931ba9bdcc'"
-#~ msgstr ""
-#~ "external ref='figures/evolutionlogo.png' "
-#~ "md5='4bf469aaba7c368937309e931ba9bdcc'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='figures/search-icon.png' "
-#~ "md5='cd4b82c84c628bfbbfa39d1e0d1eae89'"
-#~ msgstr ""
-#~ "external ref='figures/search-icon.png' "
-#~ "md5='cd4b82c84c628bfbbfa39d1e0d1eae89'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-c4a000.png' "
-#~ "md5='9db17d2d5e9013501aeab2e165c6a6c9'"
-#~ msgstr ""
-#~ "external ref='./figures/color-c4a000.png' "
-#~ "md5='9db17d2d5e9013501aeab2e165c6a6c9'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-ce5c00.png' "
-#~ "md5='19dae9650e3936312e09198973372a24'"
-#~ msgstr ""
-#~ "external ref='./figures/color-ce5c00.png' "
-#~ "md5='19dae9650e3936312e09198973372a24'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-8f5902.png' "
-#~ "md5='ff5ccb859fe04a004cd67e1c22621dc6'"
-#~ msgstr ""
-#~ "external ref='./figures/color-8f5902.png' "
-#~ "md5='ff5ccb859fe04a004cd67e1c22621dc6'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-4e9a06.png' "
-#~ "md5='b2c2e7b66fb470344c804db396b48b98'"
-#~ msgstr ""
-#~ "external ref='./figures/color-4e9a06.png' "
-#~ "md5='b2c2e7b66fb470344c804db396b48b98'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-204a87.png' "
-#~ "md5='511497260cc4caab69d67814b1ee3b8b'"
-#~ msgstr ""
-#~ "external ref='./figures/color-204a87.png' "
-#~ "md5='511497260cc4caab69d67814b1ee3b8b'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-a40000.png' "
-#~ "md5='19195da020e059dab33aa37788763a97'"
-#~ msgstr ""
-#~ "external ref='./figures/color-a40000.png' "
-#~ "md5='19195da020e059dab33aa37788763a97'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-5c3566.png' "
-#~ "md5='7c001a57237acc2ff61ee61e05ad3168'"
-#~ msgstr ""
-#~ "external ref='./figures/color-5c3566.png' "
-#~ "md5='7c001a57237acc2ff61ee61e05ad3168'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-2e3436.png' "
-#~ "md5='3c796c7aed3044e59f131bea364e8598'"
-#~ msgstr ""
-#~ "external ref='./figures/color-2e3436.png' "
-#~ "md5='3c796c7aed3044e59f131bea364e8598'"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png"
-#~ "\" width=\"10\"/> Menu bar"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-c4a000.png"
-#~ "\" width=\"10\"/> Barre de menu"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png"
-#~ "\" width=\"10\"/> Tool bar"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-ce5c00.png"
-#~ "\" width=\"10\"/> Barre d'outils"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png"
-#~ "\" width=\"10\"/> Folder list"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-8f5902.png"
-#~ "\" width=\"10\"/> Liste des dossiers"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png"
-#~ "\" width=\"10\"/> Search bar"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-4e9a06.png"
-#~ "\" width=\"10\"/> Barre de recherche"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png"
-#~ "\" width=\"10\"/> Message list"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-204a87.png"
-#~ "\" width=\"10\"/> Liste des messages"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png"
-#~ "\" width=\"10\"/> Switcher"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-a40000.png"
-#~ "\" width=\"10\"/> Sélecteur"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png"
-#~ "\" width=\"10\"/> Preview pane"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-5c3566.png"
-#~ "\" width=\"10\"/> Panneau de prévisualisation"
-
-#~ msgid ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png"
-#~ "\" width=\"10\"/> Status bar"
-#~ msgstr ""
-#~ "<media type=\"image\" mime=\"image/png\" src=\"./figures/color-2e3436.png"
-#~ "\" width=\"10\"/> Barre de statut"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
-#~ "Menu bar"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-c4a000.png\" width=\"10\"/> "
-#~ "Barre de menu"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
-#~ "Tool bar"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-ce5c00.png\" width=\"10\"/> "
-#~ "Barre d'outils"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-#~ "Calendar list"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-#~ "Liste des agendas"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
-#~ "Search bar"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-4e9a06.png\" width=\"10\"/> "
-#~ "Barre de recherche"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-#~ "Appointment list"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-#~ "Liste de rendez-vous"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
-#~ "Switcher"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-a40000.png\" width=\"10\"/> "
-#~ "Sélecteur"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
-#~ "Status bar"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-2e3436.png\" width=\"10\"/> "
-#~ "Barre de statut"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-#~ "Address book list"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-8f5902.png\" width=\"10\"/> "
-#~ "Liste des dossiers"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-#~ "Contacts list"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-204a87.png\" width=\"10\"/> "
-#~ "Liste des contacts"
-
-#~ msgid ""
-#~ "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
-#~ "Contact preview"
-#~ msgstr ""
-#~ "<media type=\"image\" src=\"./figures/color-5c3566.png\" width=\"10\"/> "
-#~ "Prévisualisation des contacts"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/html-composer-insert-image.png' "
-#~ "md5='45e231e87c10b3fc61a1bbb0ad50c3f3'"
-#~ msgstr ""
-#~ "external ref='./figures/html-composer-insert-image.png' "
-#~ "md5='45e231e87c10b3fc61a1bbb0ad50c3f3'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/html-composer-insert-link.png' "
-#~ "md5='f143b5dabdc8af72dd68fe7557928893'"
-#~ msgstr ""
-#~ "external ref='./figures/html-composer-insert-link.png' "
-#~ "md5='f143b5dabdc8af72dd68fe7557928893'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/html-composer-insert-rule.png' "
-#~ "md5='d3cda5fa4cf0fc2c911fd1aa14908ff3'"
-#~ msgstr ""
-#~ "external ref='./figures/html-composer-insert-rule.png' "
-#~ "md5='d3cda5fa4cf0fc2c911fd1aa14908ff3'"
-
-#~ msgid ""
-#~ "Alternately, you can also use the <media type=\"image\" src=\"./figures/"
-#~ "html-composer-insert-rule.png\"/> icon in the second bar below the "
-#~ "<gui>Subject</gui> line."
-#~ msgstr ""
-#~ "Vous pouvez aussi recourir à l'icône <media type=\"image\" src=\"./"
-#~ "figures/html-composer-insert-rule.png\"/> dans la seconde barre d'outils "
-#~ "sous la ligne <gui>Sujet</gui>."
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/html-composer-insert-table.png' "
-#~ "md5='d5b54d183ad37488041005964062e7f6'"
-#~ msgstr ""
-#~ "external ref='./figures/html-composer-insert-table.png' "
-#~ "md5='d5b54d183ad37488041005964062e7f6'"
-
-#~ msgid ""
-#~ "Alternately, you can also use the <media type=\"image\" src=\"./figures/"
-#~ "html-composer-insert-table.png\"/> icon in the second bar below the "
-#~ "<gui>Subject</gui> line."
-#~ msgstr ""
-#~ "Vous pouvez aussi recourir à l'icône <media type=\"image\" src=\"./"
-#~ "figures/html-composer-insert-table.png\"/> dans la seconde barre d'outils "
-#~ "sous la ligne <gui>Sujet</gui>."
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/color-000000.png' "
-#~ "md5='2d416af8bfaec805470e5d2980d90a68'"
-#~ msgstr ""
-#~ "external ref='./figures/color-000000.png' "
-#~ "md5='2d416af8bfaec805470e5d2980d90a68'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/plus-icon.png' "
-#~ "md5='57bf83c4ab8585c30897a6cf89c5949c'"
-#~ msgstr ""
-#~ "external ref='./figures/plus-icon.png' "
-#~ "md5='57bf83c4ab8585c30897a6cf89c5949c'"
-
-#~ msgctxt "_"
-#~ msgid ""
-#~ "external ref='./figures/minus-icon.png' "
-#~ "md5='7cef9df0f691c8d6ce67cad29ebceac9'"
-#~ msgstr ""
-#~ "external ref='./figures/minus-icon.png' "
-#~ "md5='7cef9df0f691c8d6ce67cad29ebceac9'"
+msgstr "Cliquez sur <gui>Valider</gui>."
 
 #~ msgid ""
 #~ "<media type=\"image\" src=\"figures/evolutionlogo.png\"> Evolution logo </"


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