Merge branch 'feature/upstream' into develop

2 files changed, 16 insertions, 20 deletions

diff --git a/help/fr/figures/preferences.png b/help/fr/figures/preferences.png
index a1dcb17..cf6b4df 100644
--- a/help/fr/figures/preferences.png
+++ b/help/fr/figures/preferences.png
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 40e2676..71e1706 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -9,15 +9,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"POT-Creation-Date: 2020-03-19 20:28+0000\n"
-"PO-Revision-Date: 2020-03-19 13:44+0100\n"
+"POT-Creation-Date: 2020-09-04 13:45+0000\n"
+"PO-Revision-Date: 2020-09-05 14:18+0200\n"
 "Last-Translator: Charles Monzat <charles.monzat@free.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 3.34.0\n"
+"X-Generator: Gtranslator 3.36.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -100,7 +100,7 @@ msgstr ""
 "périphérique le permet. Pour numériser uniquement une seule face :"
 
 #. (itstool) path: item/p
-#: C/adf.page:49 C/brightness-contrast.page:28 C/dpi.page:28 C/scanner.page:26
+#: C/adf.page:49 C/brightness-contrast.page:28 C/dpi.page:28
 msgid ""
 "Press the menu button in the top-right corner of the window and select <gui "
 "style=\"menuitem\">Preferences</gui>."
@@ -109,7 +109,7 @@ msgstr ""
 "fenêtre et sélectionnez <gui style=\"menuitem\">Préférences</gui>."
 
 #. (itstool) path: item/p
-#: C/adf.page:53 C/scanner.page:30
+#: C/adf.page:53
 msgid "Select <gui style=\"tab\">Scanning</gui>."
 msgstr "Sélectionnez <gui style=\"tab\">Numérisation</gui>."
 
@@ -119,22 +119,21 @@ msgid "Change the <gui>Scan Sides</gui> value."
 msgstr "Modifiez la valeur <gui>Faces à numériser</gui>."
 
 #. (itstool) path: item/p
-#: C/adf.page:59 C/brightness-contrast.page:38 C/dpi.page:38 C/scanner.page:36
+#: C/adf.page:59 C/brightness-contrast.page:38 C/dpi.page:38
 msgid "Close the dialog."
 msgstr "Fermez la boîte de dialogue."
 
 #. (itstool) path: item/media
-#. (itstool) path: page/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/adf.page:60 C/scanner.page:41
+#: C/adf.page:60
 msgctxt "_"
 msgid ""
-"external ref='figures/preferences.png' md5='b1e0d97b547076f20a7d34b0dc4fba57'"
+"external ref='figures/preferences.png' md5='6b6b3b901e59567fba3a758f9ae64193'"
 msgstr ""
-"external ref='figures/preferences.png' md5='b9f6350ad552c954e8538596c7b42ac5'"
+"external ref='figures/preferences.png' md5='183b08f15d245067eabedc5d85ec1f9e'"
 
 #. (itstool) path: page/title
 #: C/brightness-contrast.page:19
@@ -402,8 +401,7 @@ msgstr "Utilisation du document"
 #: C/legal.xml:4
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
 msgstr ""
-"Licence Creative Commons Paternité - Partage à l’Identique 3.0 non transcrit "
-"(CC BY-SA 3.0)"
+"Licence Creative Commons Paternité - Partage à l’Identique 3.0 non transposé"
 
 #. (itstool) path: license/p
 #: C/legal.xml:3
@@ -737,18 +735,13 @@ msgstr "Sélection d’un périphérique de numérisation"
 #. (itstool) path: page/p
 #: C/scanner.page:21
 msgid ""
-"If you have multiple scanning devices you can change the selected device:"
+"If you have multiple scanning devices you can change device on main page."
 msgstr ""
 "Si vous possédez plusieurs périphériques de numérisation, vous pouvez "
-"changer le périphérique sélectionné :"
-
-#. (itstool) path: item/p
-#: C/scanner.page:33
-msgid "Change the <gui>Scanner</gui> value."
-msgstr "Modifiez la valeur <gui>Numériseur</gui>."
+"changer de périphérique sur la page principale."
 
 #. (itstool) path: page/p
-#: C/scanner.page:42
+#: C/scanner.page:25
 msgid ""
 "Local scanners are automatically detected each time <app>Document Scanner</"
 "app> starts and each time you plug in a USB scanner. If you connect a "
@@ -823,3 +816,6 @@ msgid "To change the quality of a scanned page, see <link xref=\"dpi\"/>."
 msgstr ""
 "Pour modifier la qualité d’une page numérisée, consultez <link xref=\"dpi\"/"
 ">."
+
+#~ msgid "Change the <gui>Scanner</gui> value."
+#~ msgstr "Modifiez la valeur <gui>Numériseur</gui>."