Merge branch 'feature/upstream' into develop

1 files changed, 89 insertions, 90 deletions

diff --git a/po/fi.po b/po/fi.po
index 39ccdf4..d703d13 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2019-02-07 15:48+0000\n"
-"PO-Revision-Date: 2019-02-08 21:00+0200\n"
+"POT-Creation-Date: 2019-08-04 22:16+0000\n"
+"PO-Revision-Date: 2019-08-17 15:42+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
@@ -135,11 +135,11 @@ msgstr "Viive millisekunneissa sivujen välillä."
 #. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
 #: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
-#: src/app-window.ui:181 src/app-window.vala:1265 src/app-window.vala:1519
-msgid "Simple Scan"
-msgstr "Kuvanluku"
+#: src/app-window.ui:181 src/app-window.vala:1302 src/app-window.vala:1556
+msgid "Document Scanner"
+msgstr "Asiakirjojen kuvanlukuohjelma"
 
-#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
 msgid "Scan Documents"
 msgstr "Lue asiakirjoja kuvanlukijalta"
 
@@ -155,25 +155,16 @@ msgstr ""
 "viedä PDF-muotoon tai tallentaa eri kuvamuodoissa."
 
 #: data/simple-scan.appdata.xml.in:14
-msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgid "This app uses the SANE framework to support most existing scanners."
 msgstr ""
 "Tämä sovellus käyttää SANE-kehystä tukeakseen useimpia olemassa olevia "
 "kuvanlukijoita."
 
-#: data/simple-scan.desktop.in:4
-msgid "Document Scanner"
-msgstr "Asiakirjojen kuvanlukuohjelma"
-
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: data/simple-scan.desktop.in:7
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "kuvanluku;skanneri;scan;scanner;flatbed;adf;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: data/simple-scan.desktop.in:10
-msgid "scanner"
-msgstr "scanner"
-
 #. Menu item to rotate page to left (anti-clockwise)
 #: src/app-window.ui:10
 msgid "Rotate _Left"
@@ -293,33 +284,33 @@ msgstr "_Teksti"
 msgid "_Image"
 msgstr "_Kuva"
 
-#: src/app-window.vala:223 src/app-window.vala:1352
+#: src/app-window.vala:225 src/app-window.vala:1389
 msgid "_Close"
 msgstr "_Sulje"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:232
+#: src/app-window.vala:234
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteen “%s” käyttämiseksi"
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:248
+#: src/app-window.vala:250
 msgid "Searching for Scanners…"
 msgstr "Etsitään kuvanlukijoita…"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:254
+#: src/app-window.vala:256
 msgid "Ready to Scan"
 msgstr "Valmiina lukemaan"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:261
+#: src/app-window.vala:263
 msgid "Additional software needed"
 msgstr "Lisäohjelmistoja vaaditaan"
 
 #. Instructions to install driver software
-#: src/app-window.vala:263
+#: src/app-window.vala:265
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -328,156 +319,156 @@ msgstr ""
 "ajuri</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:269
+#: src/app-window.vala:271
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:271
+#: src/app-window.vala:273
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:294
+#: src/app-window.vala:296
 msgid "Save As…"
 msgstr "Tallenna nimellä…"
 
-#: src/app-window.vala:297 src/app-window.vala:548
+#: src/app-window.vala:299 src/app-window.vala:553
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+#: src/app-window.vala:300 src/app-window.vala:468 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "_Peru"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:305
+#: src/app-window.vala:307
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:311
+#: src/app-window.vala:313
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:321
+#: src/app-window.vala:323
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:330
+#: src/app-window.vala:332
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:336
+#: src/app-window.vala:338
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:342
+#: src/app-window.vala:344
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:349
+#: src/app-window.vala:351
 msgid "WebP (compressed)"
 msgstr "WebP (pakattu)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:359
+#: src/app-window.vala:361
 msgid "File format:"
 msgstr "Tiedostomuoto:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:371
+#: src/app-window.vala:373
 msgid "Compression:"
 msgstr "Pakkaus:"
 
 #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
-#: src/app-window.vala:465
+#: src/app-window.vala:467
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Tiedosto nimeltä “%s” on jo olemassa. Haluatko korvata sen?"
 
 #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
-#: src/app-window.vala:468
+#: src/app-window.vala:470
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: src/app-window.vala:507
+#: src/app-window.vala:509
 msgid "Saving"
 msgstr "Tallennetaan"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:522
+#: src/app-window.vala:526
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:545
+#: src/app-window.vala:550
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:581
+#: src/app-window.vala:586
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:583
+#: src/app-window.vala:588
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Label shown when scan started
-#: src/app-window.vala:716
+#: src/app-window.vala:620
 msgid "Contacting scanner…"
 msgstr "Yhdistetään kuvanlukijaan…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:799
+#: src/app-window.vala:836
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:811
+#: src/app-window.vala:848
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:973
+#: src/app-window.vala:1010
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:996
+#: src/app-window.vala:1033
 msgid "Combine sides"
 msgstr "Yhdistä puolet"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1006
+#: src/app-window.vala:1043
 msgid "Combine sides (reverse)"
 msgstr "Yhdistä puolet (käänteinen)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1016
+#: src/app-window.vala:1053
 msgid "Reverse"
 msgstr "Käänteinen"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1026
+#: src/app-window.vala:1063
 msgid "Keep unchanged"
 msgstr "Säilytä muuttumattomana"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1240
+#: src/app-window.vala:1277
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1255
+#: src/app-window.vala:1292
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -508,16 +499,16 @@ msgstr ""
 "www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1258 src/app-window.vala:1540
-msgid "About Simple Scan"
-msgstr "Tietoja sovelluksesta"
+#: src/app-window.vala:1295 src/app-window.vala:1581
+msgid "About Document Scanner"
+msgstr "Tietoja - Asiakirjojen kuvanlukuohjelma"
 
 #. Description of program
-#: src/app-window.vala:1261
+#: src/app-window.vala:1298
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: src/app-window.vala:1270
+#: src/app-window.vala:1307
 msgid "translator-credits"
 msgstr ""
 "Jiri Grönroos\n"
@@ -533,22 +524,22 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1286
+#: src/app-window.vala:1323
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1288
+#: src/app-window.vala:1325
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1329
+#: src/app-window.vala:1366
 msgid "You appear to have a Brother scanner."
 msgstr "Käytössäsi vaikuttaa olevan Brother-kuvanlukija."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1331
+#: src/app-window.vala:1368
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -557,12 +548,12 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1335
+#: src/app-window.vala:1372
 msgid "You appear to have a Samsung scanner."
 msgstr "Käytössäsi vaikuttaa olevan Samsung-kuvanlukija."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1337
+#: src/app-window.vala:1374
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -571,17 +562,17 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1341
+#: src/app-window.vala:1378
 msgid "You appear to have an HP scanner."
 msgstr "Käytössäsi vaikuttaa olevan HP-kuvanlukija."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1346
+#: src/app-window.vala:1383
 msgid "You appear to have an Epson scanner."
 msgstr "Käytössäsi vaikuttaa olevan Epson-kuvanlukija."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1348
+#: src/app-window.vala:1385
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -590,96 +581,95 @@ msgstr ""
 "verkkosivustolta</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1352
+#: src/app-window.vala:1389
 msgid "Install drivers"
 msgstr "Asenna ajurit"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1385
-msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
-"Kun ajurit on asennettu, kuvanlukusovellus on käynnistettävä uudelleen."
+#: src/app-window.vala:1422
+msgid "Once installed you will need to restart this app."
+msgstr "Asennuksen jälkeen kuvanlukusovellus on käynnistettävä uudelleen."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1398
+#: src/app-window.vala:1435
 msgid "Installing drivers…"
 msgstr "Asennetaan ajureita…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1406
+#: src/app-window.vala:1443
 msgid "Drivers installed successfully!"
 msgstr "Ajurit asennettiin onnistuneesti!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1416
+#: src/app-window.vala:1453
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ajurien asentaminen epäonnistui (virhekoodi %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1422
+#: src/app-window.vala:1459
 msgid "Failed to install drivers."
 msgstr "Ajurien asentaminen epäonnistui."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1429
+#: src/app-window.vala:1466
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "%s paketti/paketit tulee asentaa."
 msgstr[1] "%s paketti/paketit tulee asentaa."
 
-#: src/app-window.vala:1533
+#: src/app-window.vala:1574
 msgid "Email"
 msgstr "Sähköposti"
 
-#: src/app-window.vala:1534
+#: src/app-window.vala:1575
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "Järjestä sivut"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1537 src/preferences-dialog.ui:52
+#: src/app-window.vala:1578 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/app-window.vala:1538
+#: src/app-window.vala:1579
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: src/app-window.vala:1539
+#: src/app-window.vala:1580
 msgid "Help"
 msgstr "Ohje"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1548
+#: src/app-window.vala:1589
 msgid "Start Again…"
 msgstr "Aloita uudelleen…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1567
+#: src/app-window.vala:1608
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1576
+#: src/app-window.vala:1617
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1588
+#: src/app-window.vala:1629
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1606
+#: src/app-window.vala:1647
 msgid "Delete the selected page"
 msgstr "Poista valittu sivu"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1750
+#: src/app-window.vala:1791
 msgid "Cancel"
 msgstr "Peru"
 
@@ -964,7 +954,7 @@ msgid "Print debugging messages"
 msgstr "Tulosta virheenjäljitysviestit"
 
 #: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
+msgid "Fix PDF files generated with older versions of this app"
 msgstr "Korjaa vanhemmilla Kuvanlukijan versioilla luodut PDF-tiedostot"
 
 #. Title of error dialog when scan failed
@@ -988,6 +978,15 @@ msgstr "[LAITE...] — Kuvanlukusovellus"
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla “%s --help”."
 
+#~ msgid "Simple Scan"
+#~ msgstr "Kuvanluku"
+
+#~ msgid "scanner"
+#~ msgstr "scanner"
+
+#~ msgid "About Simple Scan"
+#~ msgstr "Tietoja sovelluksesta"
+
 #~ msgid "Photo"
 #~ msgstr "Valokuva"