Merge tag 'upstream/3.19.3'

Upstream version 3.19.3

1 files changed, 17 insertions, 12 deletions

diff --git a/po/fr.po b/po/fr.po
index b649da0..481c396 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-29 11:41+1300\n"
+"POT-Creation-Date: 2015-11-27 09:10+1300\n"
 "PO-Revision-Date: 2015-10-01 05:39+0000\n"
 "Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-10-20 05:15+0000\n"
-"X-Generator: Launchpad (build 17812)\n"
+"X-Launchpad-Export-Date: 2015-11-27 05:13+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -194,7 +194,7 @@ msgstr "Nouveau"
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le numériseur de document"
+msgstr "Numériser une seule page depuis le périphérique de numérisation"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:71
@@ -302,7 +302,7 @@ msgstr "Numériser des documents"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr "numériser;périphérique de numérisation;numériseur;à plat;adf;"
+msgstr "numériser;scanner;numériseur;à plat;adf;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -431,23 +431,23 @@ msgstr ""
 "la plupart des périphériques de numérisation existants."
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:840
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr ""
 "Aucun périphérique de numérisation disponible. Veuillez en connecter un."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:870
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connecter au périphérique de numérisation"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1222
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Impossible de démarrer la numérisation"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1235 ../src/scanner.vala:1332
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Erreur de communication avec le périphérique de numérisation"
 
@@ -756,10 +756,8 @@ msgstr "Il semblerait que vous ayez un scanner Epson."
 #: ../src/ui.vala:1599
 msgid ""
 "Drivers for this are available on the <a "
-"href=\"http://support.epsom.com\">Epson website</a>."
+"href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
-"Les pilotes sont disponibles sur le <a "
-"href=\"http://support.epson.com\">site Web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
 #: ../src/ui.vala:1603
@@ -1022,3 +1020,10 @@ msgstr "Enregistrement de la page %d sur %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
+
+#~ msgid ""
+#~ "Drivers for this are available on the <a "
+#~ "href=\"http://support.epsom.com\">Epson website</a>."
+#~ msgstr ""
+#~ "Les pilotes sont disponibles sur le <a "
+#~ "href=\"http://support.epson.com\">site Web d'Epson</a>."