Merge tag 'upstream/3.19.4'

Upstream version 3.19.4

1 files changed, 6 insertions, 12 deletions

diff --git a/po/fr.po b/po/fr.po
index 481c396..1d41bdc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2015-10-01 05:39+0000\n"
+"PO-Revision-Date: 2016-01-10 16:58+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-11-27 05:13+0000\n"
-"X-Generator: Launchpad (build 17850)\n"
+"X-Launchpad-Export-Date: 2016-01-11 04:43+0000\n"
+"X-Generator: Launchpad (build 17881)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -150,7 +150,7 @@ msgstr "_Legal (US)"
 #. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:52
 msgid "4×6"
-msgstr "4×6"
+msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:54
@@ -668,7 +668,6 @@ msgstr ""
 "  Alexandre Franke https://launchpad.net/~afranke\n"
 "  Alexandre Pliarchopoulos https://launchpad.net/~al-pliar\n"
 "  Anne https://launchpad.net/~anneonyme017\n"
-"  Anthony Harrington https://launchpad.net/~untaintableangel\n"
 "  Antoine Pernot https://launchpad.net/~antoinepernot\n"
 "  Bruno Patri https://launchpad.net/~bruno666-deactivatedaccount\n"
 "  Christophe Herot https://launchpad.net/~tictoc-free\n"
@@ -758,6 +757,8 @@ msgid ""
 "Drivers for this are available on the <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
@@ -1020,10 +1021,3 @@ 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>."