Merge branch 'feature/upstrem' into develop

1 files changed, 231 insertions, 181 deletions

diff --git a/po/sr.po b/po/sr.po
index 85fdfa4..24ea37e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2019-08-04 22:16+0000\n"
-"PO-Revision-Date: 2019-08-21 21:29+0200\n"
+"POT-Creation-Date: 2020-02-10 13:50+0000\n"
+"PO-Revision-Date: 2020-02-16 11:36+0100\n"
 "Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
 "Language-Team: Serbian\n"
 "Language: sr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.3\n"
+"X-Generator: Poedit 2.3\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
@@ -88,11 +88,11 @@ msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "Резолуција у тачкама по инчу за пробно скенирање."
 
 #: data/org.gnome.SimpleScan.gschema.xml:50
-msgid "Resolution for photo scans"
+msgid "Resolution for image scans"
 msgstr "Резолуција скенирања слика"
 
 #: data/org.gnome.SimpleScan.gschema.xml:51
-msgid "The resolution in dots-per-inch to use when scanning photos."
+msgid "The resolution in dots-per-inch to use when scanning images."
 msgstr "Резолуција у тачкама по инчу за скенирање слика."
 
 #: data/org.gnome.SimpleScan.gschema.xml:55
@@ -135,22 +135,21 @@ msgstr "Размак у милисекундама између страница
 #. 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:1511 src/app-window.vala:1765
 msgid "Document Scanner"
 msgstr "Скенер за документе"
 
 #: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
-msgid "Scan Documents"
-msgstr "Скенирајте документе"
+msgid "Make a digital copy of your photos and documents"
+msgstr "Направите дигиталне копије ваших фотографија и докумената"
 
 #: 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 ""
-"Веома једноставан начин за скенирање докумената и слика. Можете исећи лоше "
+"Веома једноставан начин за скенирање текста и слика. Можете исећи лоше "
 "делове слике и ротирати је ако је окренута на погрешну страну. Можете "
 "штампати скениране датотеке, сачувати их у формату ПДФ или у великом избору "
 "осталих формата."
@@ -160,6 +159,10 @@ msgid "This app uses the SANE framework to support most existing scanners."
 msgstr ""
 "Овај програм користи САНЕ радни оквир као подршку за велики број скенера."
 
+#: data/simple-scan.appdata.xml.in:24
+msgid "The GNOME Project"
+msgstr "Гномов пројекат"
+
 #. 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;"
@@ -168,151 +171,154 @@ msgstr ""
 "kopiranje;"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:10
+#: src/app-window.ui:12
 msgid "Rotate _Left"
 msgstr "Ротирај на_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:19
+#: src/app-window.ui:22
 msgid "Rotate _Right"
 msgstr "Ротирај на_десно"
 
 #. Label for page crop submenu
-#: src/app-window.ui:28
+#: src/app-window.ui:32
 msgid "_Crop"
 msgstr "_Исеци"
 
 #. Radio button for no crop
-#: src/app-window.ui:36
+#: src/app-window.ui:42
 msgid "_None"
 msgstr "_Ништа"
 
 #. 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 "_Писмо"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:86
+#: src/app-window.ui:97
 msgid "Le_gal"
 msgstr "_УС легал"
 
 #. 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 "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:132
+#: src/app-window.ui:148
 msgid "_Rotate Crop"
 msgstr "Ро_тирај исечак"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:144
+#: src/app-window.ui:161
 msgid "Move Left"
 msgstr "Помери налево"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:152
+#: src/app-window.ui:170
 msgid "Move Right"
 msgstr "Помери надесно"
 
-#: src/app-window.ui:272
-msgid "Stop"
-msgstr "Заустави"
-
-#. Tooltip for stop button
-#: src/app-window.ui:274
-msgid "Stop the current scan"
-msgstr "Заустави скенирање"
-
-#. Label on scan toolbar item
-#: src/app-window.ui:285
-msgid "Scan"
-msgstr "Скенирај"
-
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:288
-msgid "Scan a single page from the scanner"
-msgstr "Скенирај једну стану са скенера"
-
-#. Tooltip for save toolbar button
-#: src/app-window.ui:352
-msgid "Save document to a file"
-msgstr "Сачувај документ у датотеку"
-
-#: src/app-window.ui:405
+#: src/app-window.ui:252
 msgid "_Single Page"
 msgstr "Једоно_страно"
 
-#: src/app-window.ui:436
+#: src/app-window.ui:303
 msgid "All Pages From _Feeder"
 msgstr "Све странице из _фиоке скенера"
 
-#: src/app-window.ui:467
+#: src/app-window.ui:354
 msgid "_Multiple Pages From Flatbed"
 msgstr "_Више страница са положеног скенера"
 
-#: src/app-window.ui:498
+#: src/app-window.ui:405
 msgid "_Text"
 msgstr "_Текст"
 
-#: src/app-window.ui:529
+#: src/app-window.ui:456
 msgid "_Image"
 msgstr "Сл_ика"
 
-#: src/app-window.vala:225 src/app-window.vala:1389
+#: src/app-window.ui:476
+msgid "_Preferences"
+msgstr "_Поставке"
+
+#. Tooltip for stop button
+#: src/app-window.ui:516
+msgid "Stop the current scan"
+msgstr "Заустави скенирање"
+
+#: src/app-window.ui:540
+msgid "S_top"
+msgstr "Зау_стави"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:569
+msgid "Scan a single page from the scanner"
+msgstr "Скенирај једну стану са скенера"
+
+#: src/app-window.ui:594
+msgid "_Scan"
+msgstr "_Скенирај"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:696
+msgid "Save document to a file"
+msgstr "Сачувај документ у датотеку"
+
+#: src/app-window.vala:226 src/app-window.vala:1598
 msgid "_Close"
 msgstr "_Затвори"
 
 #. 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 "Име налога и лозинка који су потребни за приступ “%s”"
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:250
+#: src/app-window.vala:251
 msgid "Searching for Scanners…"
 msgstr "Тражење скенера…"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:256
+#: src/app-window.vala:258
 msgid "Ready to Scan"
 msgstr "Спреман за скенирање"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:263
+#: src/app-window.vala:266
 msgid "Additional software needed"
 msgstr "Потребан је додатни софтвер"
 
 #. Instructions to install driver software
-#: src/app-window.vala:265
+#: src/app-window.vala:268
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -321,156 +327,161 @@ msgstr ""
 "Ваш скенер."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:271
+#: src/app-window.vala:275
 msgid "No scanners detected"
 msgstr "Ниједан скенер није пронађен"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:273
+#: src/app-window.vala:277
 msgid "Please check your scanner is connected and powered on"
 msgstr "Провери да ли је скенер повезан и укључен"
 
+#. Contents of dialog that shows if autosaved book should be loaded.
+#: src/app-window.vala:379
+msgid "An autosaved book exists. Do you want to open it?"
+msgstr "Самостално сачувана књига већ постоји. Да ли желите да је отворите?"
+
 #. Save dialog: Dialog title
-#: src/app-window.vala:296
+#: src/app-window.vala:453
 msgid "Save As…"
 msgstr "Сачувај као…"
 
-#: src/app-window.vala:299 src/app-window.vala:553
+#: src/app-window.vala:456 src/app-window.vala:710
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: src/app-window.vala:300 src/app-window.vala:468 src/app-window.vala:552
+#: src/app-window.vala:457 src/app-window.vala:625 src/app-window.vala:709
 msgid "_Cancel"
 msgstr "_Откажи"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:307
+#: src/app-window.vala:464
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:313
+#: src/app-window.vala:470
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:323
+#: src/app-window.vala:480
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:332
+#: src/app-window.vala:489
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:338
+#: src/app-window.vala:495
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (компримовани)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:344
+#: src/app-window.vala:501
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:351
+#: src/app-window.vala:508
 msgid "WebP (compressed)"
 msgstr "ВебП (компримовани)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:361
+#: src/app-window.vala:518
 msgid "File format:"
 msgstr "Формат датотеке:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:373
+#: src/app-window.vala:530
 msgid "Compression:"
 msgstr "Компресија:"
 
 #. 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:624
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Датотека са називом “%s” већ постоји.  Да ли желите да је замените?"
 
 #. 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:627
 msgid "_Replace"
 msgstr "_Замени"
 
-#: src/app-window.vala:509
+#: src/app-window.vala:666
 msgid "Saving"
 msgstr "Чување"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:526
+#: src/app-window.vala:683
 msgid "Failed to save file"
 msgstr "Чување датотеке није успело"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:550
+#: src/app-window.vala:707
 msgid "If you don’t save, changes will be permanently lost."
 msgstr "Ако не сачувате измене ће бити изгубљене заувек."
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:586
+#: src/app-window.vala:743
 msgid "Save current document?"
 msgstr "Сачувати тренутни документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:588
+#: src/app-window.vala:745
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Label shown when scan started
-#: src/app-window.vala:620
+#: src/app-window.vala:777
 msgid "Contacting scanner…"
 msgstr "Контактирање скенера…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:836
+#: src/app-window.vala:1045
 msgid "Unable to save image for preview"
 msgstr "Чување пробне слике није успело"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:848
+#: src/app-window.vala:1057
 msgid "Unable to open image preview application"
 msgstr "Покретање програма за приказ слике није успело"
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:1010
+#: src/app-window.vala:1219
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "Промена распореда страница"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1033
+#: src/app-window.vala:1242
 msgid "Combine sides"
 msgstr "Комбинуј странице"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1043
+#: src/app-window.vala:1252
 msgid "Combine sides (reverse)"
 msgstr "Комбинуј странице (уназад)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1053
+#: src/app-window.vala:1262
 msgid "Reverse"
 msgstr "Изокрени"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1063
+#: src/app-window.vala:1272
 msgid "Keep unchanged"
 msgstr "Без измена"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1277
+#: src/app-window.vala:1486
 msgid "Unable to open help file"
 msgstr "Није могуће отворити датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1292
+#: src/app-window.vala:1501
 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"
@@ -499,16 +510,16 @@ msgstr ""
 "уз овај програм. Ако нисте посетите <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1295 src/app-window.vala:1581
+#: src/app-window.vala:1504 src/app-window.vala:1798
 msgid "About Document Scanner"
 msgstr "О Скенеру докумената"
 
 #. Description of program
-#: src/app-window.vala:1298
+#: src/app-window.vala:1507
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: src/app-window.vala:1307
+#: src/app-window.vala:1516
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -522,22 +533,22 @@ msgstr ""
 "  Борисав Живановић <borisavzivanovic@gmail.com>"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1323
+#: src/app-window.vala:1532
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1325
+#: src/app-window.vala:1534
 msgid "Quit without Saving"
 msgstr "Затвори без чувања"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1366
+#: src/app-window.vala:1575
 msgid "You appear to have a Brother scanner."
 msgstr "Изгледа да имате Брадеров скенер."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1368
+#: src/app-window.vala:1577
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -546,12 +557,12 @@ msgstr ""
 "\">вебсајту Брадера</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1372
+#: src/app-window.vala:1581
 msgid "You appear to have a Samsung scanner."
 msgstr "Изгледа да имате Самсунгов скенер."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1374
+#: src/app-window.vala:1583
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -560,17 +571,17 @@ msgstr ""
 "\">вебсајту Самсунга</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1378
+#: src/app-window.vala:1587
 msgid "You appear to have an HP scanner."
 msgstr "Изгледа да имате ХП-ов скенер."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1383
+#: src/app-window.vala:1592
 msgid "You appear to have an Epson scanner."
 msgstr "Изгледа да имате Епсонов скенер."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1385
+#: src/app-window.vala:1594
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -579,38 +590,38 @@ msgstr ""
 "\">вебсајту Епсона</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1389
+#: src/app-window.vala:1598
 msgid "Install drivers"
 msgstr "Инталирај управљачки програм"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1631
 msgid "Once installed you will need to restart this app."
 msgstr "Након инсталирања, биће потребно да поново покренете овај програм."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1435
+#: src/app-window.vala:1644
 msgid "Installing drivers…"
 msgstr "Инсталација управљачког програма у току…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1443
+#: src/app-window.vala:1652
 msgid "Drivers installed successfully!"
 msgstr "Управљачки програм успешно инсталиран!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1453
+#: src/app-window.vala:1662
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Инсталација управљачког програма није успела (код грешке  %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1459
+#: src/app-window.vala:1668
 msgid "Failed to install drivers."
 msgstr "Инсталација управљачког програма није успела."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1466
+#: src/app-window.vala:1675
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -618,57 +629,61 @@ msgstr[0] "Морате инсталирати %s пакет"
 msgstr[1] "Морате инсталирати %s пакетa"
 msgstr[2] "Морате инсталирати %s пакетa"
 
-#: src/app-window.vala:1574
+#: src/app-window.vala:1790
 msgid "Email"
 msgstr "Е-пошта"
 
-#: src/app-window.vala:1575
+#: src/app-window.vala:1791
+msgid "Print"
+msgstr "Одштампај"
+
+#: src/app-window.vala:1792
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "Промени распоред страница"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1578 src/preferences-dialog.ui:52
+#: src/app-window.vala:1793 src/preferences-dialog.ui:44
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/app-window.vala:1579
+#: src/app-window.vala:1796
 msgid "Keyboard Shortcuts"
 msgstr "Пречице на тастатури"
 
-#: src/app-window.vala:1580
+#: src/app-window.vala:1797
 msgid "Help"
 msgstr "Помоћ"
 
 #. 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:1806
 msgid "Start Again…"
 msgstr "_Поново покрени…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1608
+#: src/app-window.vala:1825
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ротирај страницу налево (супротно казаљци на сату)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1834
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ротирај страницу надесно (смер казаљке на сату)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1629
+#: src/app-window.vala:1846
 msgid "Crop the selected page"
 msgstr "Исеци означену страницу"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1647
+#: src/app-window.vala:1864
 msgid "Delete the selected page"
 msgstr "Обриши означену страницу"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1791
+#: src/app-window.vala:2038
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -777,168 +792,188 @@ msgctxt "shortcut window"
 msgid "Copy current page to clipboard"
 msgstr "Копирање тренутне странице на оставу"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:80
-msgid "_Scanner"
-msgstr "_Скенер"
+#: src/help-overlay.ui:128
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Опште"
+
+#: src/help-overlay.ui:133
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Прикажи помоћ"
+
+#: src/help-overlay.ui:140
+msgctxt "shortcut window"
+msgid "Keyboard shortcuts"
+msgstr "Пречице на тастатури"
+
+#: src/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Излазак"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:108
-msgid "Scan Sides"
-msgstr "Странице за скенирање"
+#: src/preferences-dialog.ui:72
+msgid "Scan _Sides"
+msgstr "Скенирање _страница"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:124
-msgid "Page Size"
-msgstr "Величина странице"
+#: src/preferences-dialog.ui:88
+msgid "_Page Size"
+msgstr "Величина ст_ранице"
 
 #. 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 "Предња страна"
 
 #. 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 "Задња страна"
 
 #. 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 "Обе стране"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:200
-msgid "Delay"
-msgstr "Временски размак"
+#: src/preferences-dialog.ui:165
+msgid "_Delay"
+msgstr "Зас_тој"
 
 #. 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 "Више страна са положеног скенера"
 
 #. 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 "секунди"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:319
-msgid "Scanning"
-msgstr "Скенирање"
+#: src/preferences-dialog.ui:285
+msgid "_Scanning"
+msgstr "_Скенирање"
 
-#. 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 "Резолуција _текста"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:354
-msgid "_Photo Resolution"
-msgstr "Резолуција _слике"
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:322
+msgid "_Image Resolution"
+msgstr "Резолуција сл_ике"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:398
-msgid "Brightness"
-msgstr "Осветљење"
+#: src/preferences-dialog.ui:367
+msgid "_Brightness"
+msgstr "_Осветљеност"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:413
-msgid "Contrast"
-msgstr "Контраст"
+#: src/preferences-dialog.ui:383
+msgid "_Contrast"
+msgstr "_Контраст"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:461
-msgid "Quality"
-msgstr "Квалитет"
+#: src/preferences-dialog.ui:432
+msgid "_Quality"
+msgstr "_Квалитет"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:72
+#: src/preferences-dialog.vala:65
 msgid "Automatic"
 msgstr "Аутоматски"
 
-#: src/preferences-dialog.vala:113
+#: src/preferences-dialog.vala:102
 msgid "Darker"
 msgstr "Тамније"
 
-#: src/preferences-dialog.vala:115
+#: src/preferences-dialog.vala:104
 msgid "Lighter"
 msgstr "Светлије"
 
-#: src/preferences-dialog.vala:123
+#: src/preferences-dialog.vala:112
 msgid "Less"
 msgstr "Мање"
 
-#: src/preferences-dialog.vala:125
+#: src/preferences-dialog.vala:114
 msgid "More"
 msgstr "Више"
 
 #. 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 тачака по инчу (подразумевано)"
 
 #. 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 тачака по инчу (белешка)"
 
 #. 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 тачака по инчу (висока резолуција)"
 
 #. 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 тачака по инчу"
 
 #. 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 "Ниједан скенер није доступан. Повежи скенер."
 
 #. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
+#: src/scanner.vala:896
 msgid "Unable to connect to scanner"
 msgstr "Није могуће контактирати скенер"
 
+#. Error displayed when no documents at the start of scanning
+#: src/scanner.vala:1300
+msgid "Document feeder empty"
+msgstr "Држач папира је празан"
+
 #. Error display when unable to start scan
-#: src/scanner.vala:1251
+#: src/scanner.vala:1307
 msgid "Unable to start scan"
 msgstr "Није могуће почети скенирање"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1264 src/scanner.vala:1371
+#: src/scanner.vala:1320 src/scanner.vala:1427
 msgid "Error communicating with scanner"
 msgstr "Грешка у комуникацији са скенером"
 
@@ -978,6 +1013,24 @@ msgid "Run “%s --help” to see a full list of available command line options.
 msgstr ""
 "Покрените “%s --help” да бисте видели листу свих опција командне линије."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Резолуција скенирања слика"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "Резолуција у тачкама по инчу за скенирање слика."
+
+#~ msgid "Scan Documents"
+#~ msgstr "Скенирајте документе"
+
+#~ msgid "Stop"
+#~ msgstr "Заустави"
+
+#~ msgid "_Scanner"
+#~ msgstr "_Скенер"
+
+#~ msgid "_Photo Resolution"
+#~ msgstr "Резолуција _слике"
+
 #~ msgid "Simple Scan"
 #~ msgstr "Једноставно cкенирање"
 
@@ -1016,6 +1069,3 @@ msgstr ""
 
 #~ msgid "About"
 #~ msgstr "О програму"
-
-#~ msgid "Quit"
-#~ msgstr "Излаз"