Merge tag 'upstream/3.19.3'

Upstream version 3.19.3

1 files changed, 15 insertions, 10 deletions

diff --git a/po/fi.po b/po/fi.po
index b8fe63a..e051be9 100644
--- a/po/fi.po
+++ b/po/fi.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: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@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
@@ -420,22 +420,22 @@ msgid ""
 msgstr ""
 
 #. 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 "Kuvanlukijoita ei löydy. Yhdistä kuvanlukija."
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:870
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Kuvanlukijaan ei voi yhdistää"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1222
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Kuvanluvun käynnistäminen ei onnistu"
 
 #. 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 "Virhe viestinnässä kuvanlukijan kanssa"
 
@@ -709,10 +709,8 @@ msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 #: ../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 ""
-"Sen ajurit voi ladata <a href=\"http://support.epsom.com\">Epsonin "
-"verkkosivustolta</a>."
 
 #. Title of dialog giving instructions on how to install drivers
 #: ../src/ui.vala:1603
@@ -972,3 +970,10 @@ msgstr "Tallennetaan sivua %d/%d"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Skannerin kulkusuunta skannattavan sivun suhteen."
+
+#~ msgid ""
+#~ "Drivers for this are available on the <a "
+#~ "href=\"http://support.epsom.com\">Epson website</a>."
+#~ msgstr ""
+#~ "Sen ajurit voi ladata <a href=\"http://support.epsom.com\">Epsonin "
+#~ "verkkosivustolta</a>."