Merge branch 'feature/upstream' into develop

1 files changed, 253 insertions, 206 deletions

diff --git a/po/sl.po b/po/sl.po
index 0016cc4..efeb393 100644
--- a/po/sl.po
+++ b/po/sl.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-08-24 14:51+0000\n"
-"PO-Revision-Date: 2019-08-24 18:54+0200\n"
+"POT-Creation-Date: 2020-06-03 00:16+0000\n"
+"PO-Revision-Date: 2020-06-11 17:06+0200\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 
@@ -88,12 +88,12 @@ msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
 
 #: data/org.gnome.SimpleScan.gschema.xml:50
-msgid "Resolution for photo scans"
-msgstr "Ločljivost za optično branje fotografij"
+msgid "Resolution for image scans"
+msgstr "Ločljivost za optično branje"
 
 #: data/org.gnome.SimpleScan.gschema.xml:51
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
+msgid "The resolution in dots-per-inch to use when scanning images."
+msgstr "Ločljivost optičnega branja v točkah na palec (dpi)"
 
 #: data/org.gnome.SimpleScan.gschema.xml:55
 msgid "Page side to scan"
@@ -134,25 +134,24 @@ msgstr "Zakasnitev med branjem strani v milisekundah."
 #. 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:1302 src/app-window.vala:1556
+#: src/app-window.ui:498 src/app-window.vala:1509 src/app-window.vala:1763
 msgid "Document Scanner"
 msgstr "Optični bralnik dokumentov"
 
 #: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
-msgid "Scan Documents"
-msgstr "Optično preberi dokumente"
+msgid "Make a digital copy of your photos and documents"
+msgstr "Priprava digitalnih kopij fotografij in dokumentov."
 
 #: data/simple-scan.appdata.xml.in:9
 msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
+"A really easy way to scan both text and images. You can crop out the bad "
+"parts of an image and rotate it if it is the wrong way round. You can print "
+"your scans, export them to pdf, or save them in a range of image formats."
 msgstr ""
-"Zelo enostaven način za optično branje tako dokumentov kot fotografij. "
-"Posamezne dele fotografije je mogoče obrezati in fotografijo zavrteti, če je "
-"napačno obrnjena. Prebrane dokumente je nato mogoče natisniti, izvoziti v "
-"datoteke PDF ali shraniti v enega od podprtih zapisov."
+"Zelo enostaven način za optično branje dokumentov in fotografij. Posamezne "
+"dele fotografije je mogoče obrezati in fotografijo zavrteti, če je napačno "
+"obrnjena. Prebrane dokumente je nato mogoče natisniti, izvoziti v datoteke "
+"PDF, ali shraniti v enega od podprtih zapisov."
 
 #: data/simple-scan.appdata.xml.in:14
 msgid "This app uses the SANE framework to support most existing scanners."
@@ -160,157 +159,164 @@ msgstr ""
 "Enostavno optično branje zahteva ogrodje SANE, s katerim bo omogočena "
 "podpora večine optičnih bralnikov."
 
+#: data/simple-scan.appdata.xml.in:24
+msgid "The GNOME Project"
+msgstr "Projekt GNOME"
+
 #. 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:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "optični bralnik;adf;podajalnik;skener;"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:10
+#: src/app-window.ui:12
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:19
+#: src/app-window.ui:22
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: src/app-window.ui:28
+#: src/app-window.ui:32
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: src/app-window.ui:36
+#: src/app-window.ui:42
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:46
+#: src/app-window.ui:53
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:56
+#: src/app-window.ui:64
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:66
+#: src/app-window.ui:75
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:76
+#: src/app-window.ui:86
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:86
+#: src/app-window.ui:97
 msgid "Le_gal"
 msgstr "Podaljšana stran"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:96
+#: src/app-window.ui:108
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:106
+#: src/app-window.ui:119
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:116
+#: src/app-window.ui:130
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:132
+#: src/app-window.ui:148
 msgid "_Rotate Crop"
 msgstr "_Zavrti obrezano polje"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:144
+#: src/app-window.ui:161
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:152
+#: src/app-window.ui:170
 msgid "Move Right"
 msgstr "Premakni desno"
 
-#: src/app-window.ui:272
-msgid "Stop"
-msgstr "Zaustavi"
-
-#. Tooltip for stop button
-#: src/app-window.ui:274
-msgid "Stop the current scan"
-msgstr "Zaustavi trenutno optično branje"
-
-#. Label on scan toolbar item
-#: src/app-window.ui:285
-msgid "Scan"
-msgstr "Optično branje"
-
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:288
-msgid "Scan a single page from the scanner"
-msgstr "Optično branje ene strani iz optičnega bralnika"
-
-#. Tooltip for save toolbar button
-#: src/app-window.ui:352
-msgid "Save document to a file"
-msgstr "Shrani dokument v datoteko"
-
-#: src/app-window.ui:405
+#: src/app-window.ui:252
 msgid "_Single Page"
 msgstr "Ena _stran"
 
-#: src/app-window.ui:436
+#: src/app-window.ui:303
 msgid "All Pages From _Feeder"
 msgstr "Vse strani iz _podajalnika"
 
-#: src/app-window.ui:467
+#: src/app-window.ui:354
 msgid "_Multiple Pages From Flatbed"
 msgstr "_Več strani z namiznim optičnim bralnikom"
 
-#: src/app-window.ui:498
+#: src/app-window.ui:405
 msgid "_Text"
 msgstr "_Besedilo"
 
-#: src/app-window.ui:529
+#: src/app-window.ui:456
 msgid "_Image"
 msgstr "_Slika"
 
-#: src/app-window.vala:225 src/app-window.vala:1389
+#: src/app-window.ui:476
+msgid "_Preferences"
+msgstr "_Možnosti"
+
+#. Tooltip for stop button
+#: src/app-window.ui:516
+msgid "Stop the current scan"
+msgstr "Zaustavi trenutno optično branje"
+
+#: src/app-window.ui:540
+msgid "S_top"
+msgstr "_Zaustavi"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:569
+msgid "Scan a single page from the scanner"
+msgstr "Optično branje ene strani iz optičnega bralnika"
+
+#: src/app-window.ui:594
+msgid "_Scan"
+msgstr "_Optično branje"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:696
+msgid "Save document to a file"
+msgstr "Shrani dokument v datoteko"
+
+#: src/app-window.vala:226 src/app-window.vala:1596
 msgid "_Close"
 msgstr "_Zapri"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:234
+#: src/app-window.vala:235
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Za dostop do »%s« sta zahtevana uporabniško ime in geslo"
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:250
+#: src/app-window.vala:252
 msgid "Searching for Scanners…"
 msgstr "Poteka iskanje optičnega bralnika …"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:256
+#: src/app-window.vala:260
 msgid "Ready to Scan"
 msgstr "Naprava je pripravljena za optično branje"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:263
+#: src/app-window.vala:268
 msgid "Additional software needed"
 msgstr "Zahtevana je dodatna programska oprema"
 
 #. Instructions to install driver software
-#: src/app-window.vala:265
+#: src/app-window.vala:270
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -319,156 +325,161 @@ msgstr ""
 "programski gonilnik</a>."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:271
+#: src/app-window.vala:277
 msgid "No scanners detected"
 msgstr "Ni zaznanega optičnega bralnika"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:273
+#: src/app-window.vala:279
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, ali je optični bralnik priklopljen in vklopljen"
 
+#. Contents of dialog that shows if autosaved book should be loaded.
+#: src/app-window.vala:381
+msgid "An autosaved book exists. Do you want to open it?"
+msgstr "Samodejno shranjena datoteka že obstaja. Ali jo želite odpreti?"
+
 #. Save dialog: Dialog title
-#: src/app-window.vala:296
+#: src/app-window.vala:455
 msgid "Save As…"
 msgstr "Shrani kot …"
 
-#: src/app-window.vala:299 src/app-window.vala:553
+#: src/app-window.vala:458 src/app-window.vala:708
 msgid "_Save"
 msgstr "_Shrani"
 
-#: src/app-window.vala:300 src/app-window.vala:468 src/app-window.vala:552
+#: src/app-window.vala:459 src/app-window.vala:623 src/app-window.vala:707
 msgid "_Cancel"
 msgstr "_Prekliči"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:307
+#: src/app-window.vala:466
 msgid "Scanned Document.pdf"
 msgstr "Optično prebran dokument.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:313
+#: src/app-window.vala:472
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:323
+#: src/app-window.vala:482
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:332
+#: src/app-window.vala:491
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:338
+#: src/app-window.vala:497
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:344
+#: src/app-window.vala:503
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:351
+#: src/app-window.vala:510
 msgid "WebP (compressed)"
 msgstr "WebP (stisnjen)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:361
+#: src/app-window.vala:520
 msgid "File format:"
 msgstr "Vrsta datoteke:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:373
+#: src/app-window.vala:532
 msgid "Compression:"
 msgstr "Stiskanje:"
 
 #. 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:467
+#: src/app-window.vala:622
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?"
 
 #. 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:470
+#: src/app-window.vala:625
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: src/app-window.vala:509
+#: src/app-window.vala:664
 msgid "Saving"
 msgstr "Poteka shranjevanje"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:526
+#: src/app-window.vala:681
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:550
+#: src/app-window.vala:705
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "V kolikor sprememb ne shranite, bodo te trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:586
+#: src/app-window.vala:741
 msgid "Save current document?"
 msgstr "Ali želite dokument shraniti?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:588
+#: src/app-window.vala:743
 msgid "Discard Changes"
 msgstr "Zavrzi spremembe"
 
 #. Label shown when scan started
-#: src/app-window.vala:620
+#: src/app-window.vala:775
 msgid "Contacting scanner…"
 msgstr "Poteka povezovanje optičnega bralnika …"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:836
+#: src/app-window.vala:1043
 msgid "Unable to save image for preview"
 msgstr "Ni mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:848
+#: src/app-window.vala:1055
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:1010
+#: src/app-window.vala:1217
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "Prerazporejevanje strani"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1033
+#: src/app-window.vala:1240
 msgid "Combine sides"
 msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1043
+#: src/app-window.vala:1250
 msgid "Combine sides (reverse)"
 msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1053
+#: src/app-window.vala:1260
 msgid "Reverse"
 msgstr "Obrnjeno"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1063
+#: src/app-window.vala:1270
 msgid "Keep unchanged"
 msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1277
+#: src/app-window.vala:1484
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1292
+#: src/app-window.vala:1499
 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"
@@ -500,16 +511,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1295 src/app-window.vala:1581
+#: src/app-window.vala:1502 src/app-window.vala:1796
 msgid "About Document Scanner"
 msgstr "O programu"
 
 #. Description of program
-#: src/app-window.vala:1298
+#: src/app-window.vala:1505
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: src/app-window.vala:1307
+#: src/app-window.vala:1514
 msgid "translator-credits"
 msgstr ""
 "Matej Urbančič <mateju@svn@gnome.org>\n"
@@ -525,22 +536,22 @@ msgstr ""
 "  grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1323
+#: src/app-window.vala:1530
 msgid "Save document before quitting?"
 msgstr "Ali želite dokument končanjem programa shraniti?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1325
+#: src/app-window.vala:1532
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1366
+#: src/app-window.vala:1573
 msgid "You appear to have a Brother scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1368
+#: src/app-window.vala:1575
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -549,12 +560,12 @@ msgstr ""
 "com\">Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1372
+#: src/app-window.vala:1579
 msgid "You appear to have a Samsung scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1374
+#: src/app-window.vala:1581
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -563,17 +574,17 @@ msgstr ""
 "support\">Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1378
+#: src/app-window.vala:1585
 msgid "You appear to have an HP scanner."
 msgstr "Videti je, da je priklopljen optični bralnik HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1383
+#: src/app-window.vala:1590
 msgid "You appear to have an Epson scanner."
 msgstr "Videti je, da je priklopljen optični bralnik Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1385
+#: src/app-window.vala:1592
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -582,38 +593,38 @@ msgstr ""
 "com\">Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1389
+#: src/app-window.vala:1596
 msgid "Install drivers"
 msgstr "Namesti gonilnike"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1629
 msgid "Once installed you will need to restart this app."
 msgstr "Ko bodo paketi nameščeni, je treba program ponovno zagnati."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1435
+#: src/app-window.vala:1642
 msgid "Installing drivers…"
 msgstr "Poteka nameščanje gonilnikov …"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1443
+#: src/app-window.vala:1650
 msgid "Drivers installed successfully!"
 msgstr "Gonilniki so uspešno nameščeni!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1453
+#: src/app-window.vala:1660
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Namestitev gonilnikov je spodletela (koda napake %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1459
+#: src/app-window.vala:1666
 msgid "Failed to install drivers."
 msgstr "Namestitev gonilnikov je spodletela."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1466
+#: src/app-window.vala:1673
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -622,57 +633,61 @@ msgstr[1] "Namestiti je treba %s paket."
 msgstr[2] "Namestiti je treba %s paketa."
 msgstr[3] "Namestiti je treba %s pakete."
 
-#: src/app-window.vala:1574
+#: src/app-window.vala:1788
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: src/app-window.vala:1575
+#: src/app-window.vala:1789
+msgid "Print"
+msgstr "Natisni"
+
+#: src/app-window.vala:1790
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "Prerazporedi strani"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1578 src/preferences-dialog.ui:52
+#: src/app-window.vala:1791 src/preferences-dialog.ui:44
 msgid "Preferences"
 msgstr "Možnosti"
 
-#: src/app-window.vala:1579
+#: src/app-window.vala:1794
 msgid "Keyboard Shortcuts"
 msgstr "Tipkovne bližnjice"
 
-#: src/app-window.vala:1580
+#: src/app-window.vala:1795
 msgid "Help"
 msgstr "Pomoč"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1589
+#: src/app-window.vala:1804
 msgid "Start Again…"
 msgstr "Začni znova …"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1608
+#: src/app-window.vala:1823
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1832
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obrni stran v desno (smer urinega kazalca)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1629
+#: src/app-window.vala:1844
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1647
+#: src/app-window.vala:1862
 msgid "Delete the selected page"
 msgstr "Izbriši izbrano stran"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1791
+#: src/app-window.vala:2036
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -699,22 +714,22 @@ msgstr "Ni mogoče kodirati strani %i"
 #: src/help-overlay.ui:12
 msgctxt "shortcut window"
 msgid "Scanning"
-msgstr "Poteka optično branje"
+msgstr "Optično branje"
 
 #: src/help-overlay.ui:17
 msgctxt "shortcut window"
 msgid "Scan a single page"
-msgstr "Optično preberi eno stran"
+msgstr "Optično prebere eno stran"
 
 #: src/help-overlay.ui:24
 msgctxt "shortcut window"
 msgid "Scan all pages from document feeder"
-msgstr "Zaporedno optično branje iz podajalnika dokumentov"
+msgstr "Optično prebere vse iz podajalnika"
 
 #: src/help-overlay.ui:31
 msgctxt "shortcut window"
 msgid "Scan continuously from a flatbed scanner"
-msgstr "Zaporedno optično branje z namiznim bralnikom"
+msgstr "Optično prebere pre namiznega bralnika"
 
 #: src/help-overlay.ui:38
 msgctxt "shortcut window"
@@ -729,27 +744,27 @@ msgstr "Spremembe dokumenta"
 #: src/help-overlay.ui:51
 msgctxt "shortcut window"
 msgid "Move page left"
-msgstr "Premakni stran levo"
+msgstr "Premakne stran levo"
 
 #: src/help-overlay.ui:58
 msgctxt "shortcut window"
 msgid "Move page right"
-msgstr "Premakni stran desno"
+msgstr "Premakne stran desno"
 
 #: src/help-overlay.ui:65
 msgctxt "shortcut window"
 msgid "Rotate page to the left (anti-clockwise)"
-msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
+msgstr "Obrne stran v levo (nasprotna smer urinega kazalca)"
 
 #: src/help-overlay.ui:72
 msgctxt "shortcut window"
 msgid "Rotate page to the right (clockwise)"
-msgstr "Obrni stran v desno (smer urinega kazalca)"
+msgstr "Obrne stran v desno (smer urinega kazalca)"
 
 #: src/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Delete page"
-msgstr "Izbriši stran"
+msgstr "Izbriše stran"
 
 #: src/help-overlay.ui:87
 msgctxt "shortcut window"
@@ -759,7 +774,7 @@ msgstr "Upravljanje dokumentov"
 #: src/help-overlay.ui:92
 msgctxt "shortcut window"
 msgid "Start new document"
-msgstr "Začni nov dokument"
+msgstr "Začne nov dokument"
 
 #: src/help-overlay.ui:99
 msgctxt "shortcut window"
@@ -769,180 +784,200 @@ msgstr "Shrani optično prebran dokument"
 #: src/help-overlay.ui:106
 msgctxt "shortcut window"
 msgid "Email scanned document"
-msgstr "Pošlji optično prebran dokument"
+msgstr "Pošlje optično prebran dokument"
 
 #: src/help-overlay.ui:113
 msgctxt "shortcut window"
 msgid "Print scanned document"
-msgstr "Natisni optično prebran dokument"
+msgstr "Natisne optično prebran dokument"
 
 #: src/help-overlay.ui:120
 msgctxt "shortcut window"
 msgid "Copy current page to clipboard"
-msgstr "Kopiraj trenutno stran v odložišče"
+msgstr "Kopira trenutno stran v odložišče"
+
+#: src/help-overlay.ui:128
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Splošno"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:80
-msgid "_Scanner"
-msgstr "_Optični bralnik"
+#: src/help-overlay.ui:133
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Pokaže pomoč"
+
+#: src/help-overlay.ui:140
+msgctxt "shortcut window"
+msgid "Keyboard shortcuts"
+msgstr "Tipkovne bližnjice‫"
+
+#: src/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Konča program"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:108
-msgid "Scan Sides"
-msgstr "Branje nasprotnih strani"
+#: src/preferences-dialog.ui:72
+msgid "Scan _Sides"
+msgstr "Branje _nasprotnih strani"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:124
-msgid "Page Size"
-msgstr "Velikost strani"
+#: src/preferences-dialog.ui:88
+msgid "_Page Size"
+msgstr "_Velikost strani"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:153
+#: src/preferences-dialog.ui:118
 msgid "Front"
 msgstr "Prednja stran"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:163
+#: src/preferences-dialog.ui:128
 msgid "Back"
 msgstr "Hrbtna stran"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:173
+#: src/preferences-dialog.ui:138
 msgid "Both"
 msgstr "Obe strani"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:200
-msgid "Delay"
-msgstr "Zakasnitev"
+#: src/preferences-dialog.ui:165
+msgid "_Delay"
+msgstr "_Zakasnitev"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:215
+#: src/preferences-dialog.ui:181
 msgid "Multiple pages from flatbed"
 msgstr "Več strani z namiznim optičnim bralnikom"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:233
+#: src/preferences-dialog.ui:199
 msgid "3"
 msgstr "3"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:243
+#: src/preferences-dialog.ui:209
 msgid "5"
 msgstr "5"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:254
+#: src/preferences-dialog.ui:220
 msgid "7"
 msgstr "7"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:265
+#: src/preferences-dialog.ui:231
 msgid "10"
 msgstr "10"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:242
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:297
+#: src/preferences-dialog.ui:263
 msgid "Seconds"
 msgstr "Sekunde"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:319
-msgid "Scanning"
-msgstr "Optično branje"
+#: src/preferences-dialog.ui:285
+msgid "_Scanning"
+msgstr "_Optično branje"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:339
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:306
 msgid "_Text Resolution"
 msgstr "_Ločljivost besedila"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:354
-msgid "_Photo Resolution"
-msgstr "_Ločljivost fotografije"
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:322
+msgid "_Image Resolution"
+msgstr "_Ločljivost besedila"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:398
-msgid "Brightness"
-msgstr "Svetlost"
+#: src/preferences-dialog.ui:367
+msgid "_Brightness"
+msgstr "_Svetlost"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:413
-msgid "Contrast"
-msgstr "Kontrast"
+#: src/preferences-dialog.ui:383
+msgid "_Contrast"
+msgstr "_Kontrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:461
-msgid "Quality"
-msgstr "Kakovost"
+#: src/preferences-dialog.ui:432
+msgid "_Quality"
+msgstr "_Kakovost"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:72
+#: src/preferences-dialog.vala:65
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: src/preferences-dialog.vala:113
+#: src/preferences-dialog.vala:102
 msgid "Darker"
 msgstr "Temenjše"
 
-#: src/preferences-dialog.vala:115
+#: src/preferences-dialog.vala:104
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: src/preferences-dialog.vala:123
+#: src/preferences-dialog.vala:112
 msgid "Less"
 msgstr "Manj"
 
-#: src/preferences-dialog.vala:125
+#: src/preferences-dialog.vala:114
 msgid "More"
 msgstr "Več"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:437
+#: src/preferences-dialog.vala:285
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:288
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:291
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:294
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
 #. Error displayed when no scanners to scan with
-#: src/scanner.vala:844
+#: src/scanner.vala:866
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Ni zaznanega optičnega bralnika. Priklopite in vklopite ga."
 
 #. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
+#: src/scanner.vala:896
 msgid "Unable to connect to scanner"
 msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
+#. Error displayed when no documents at the start of scanning
+#: src/scanner.vala:1294
+msgid "Document feeder empty"
+msgstr "Podajalnik dokumentov je prazen"
+
 #. Error display when unable to start scan
-#: src/scanner.vala:1251
+#: src/scanner.vala:1305
 msgid "Unable to start scan"
 msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1264 src/scanner.vala:1371
+#: src/scanner.vala:1318 src/scanner.vala:1425
 msgid "Error communicating with scanner"
 msgstr "Napaka med povezovanjem optičnim bralnikom"
 
@@ -961,26 +996,44 @@ msgid "Fix PDF files generated with older versions of this app"
 msgstr "Popravki datotek PDF, ustvarjeni s starejšimi različicami programa"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:393
+#: src/simple-scan.vala:1474
 msgid "Failed to scan"
 msgstr "Optično branje je spodletelo"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:408
+#: src/simple-scan.vala:1489
 msgid "Scan in progress"
 msgstr "Poteka optično branje dokumenta"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:585
+#: src/simple-scan.vala:1667
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[NAPRAVA ...] – orodje za optično branje"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:596
+#: src/simple-scan.vala:1678
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite »%s --help«."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Ločljivost za optično branje fotografij"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
+
+#~ msgid "Scan Documents"
+#~ msgstr "Optično preberi dokumente"
+
+#~ msgid "Stop"
+#~ msgstr "Zaustavi"
+
+#~ msgid "_Scanner"
+#~ msgstr "_Optični bralnik"
+
+#~ msgid "_Photo Resolution"
+#~ msgstr "_Ločljivost fotografije"
+
 #~ msgid "Simple Scan"
 #~ msgstr "Enostavno optično branje"
 
@@ -1020,9 +1073,6 @@ msgstr "Za popoln seznam možnosti ukazne vrstice zaženite »%s --help«."
 #~ msgid "About"
 #~ msgstr "O programu"
 
-#~ msgid "Quit"
-#~ msgstr "Izhod"
-
 #~ msgid "Front and Back"
 #~ msgstr "Prednja in hrbtna stran"
 
@@ -1050,9 +1100,6 @@ msgstr "Za popoln seznam možnosti ukazne vrstice zaženite »%s --help«."
 #~ msgid "Email..."
 #~ msgstr "Elektronska pošta ..."
 
-#~ msgid "Print..."
-#~ msgstr "Natisni ..."
-
 #~ msgid "_Install Drivers"
 #~ msgstr "_Namesti gonilnike"