Merge tag 'upstream/3.23.2'

Upstream version 3.23.2

1 files changed, 144 insertions, 86 deletions

diff --git a/po/sk.po b/po/sk.po
index f40a194..d17acca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 "Language: sk\n"
 
 #. Button to submit authorization dialog
@@ -90,8 +90,8 @@ msgstr "Text"
 msgid "Photo"
 msgstr "Fotografia"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "Zmeniť poradie stránok"
 
@@ -209,7 +209,7 @@ msgstr "Skenovať"
 msgid "Save document to a file"
 msgstr "Uloží dokument do súboru"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "Uložiť"
 
@@ -251,8 +251,7 @@ msgstr "Oreže vybratú stránku"
 msgid "Crop"
 msgstr "Orezanie"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -331,161 +330,195 @@ msgstr ""
 "Aplikácia Jednoduché skenovanie využíva rozhranie SANE, kvôli podpore "
 "väčšiny existujúcich skenerov."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "Nie sú dostupné žiadne skenery. Prosím, pripojte skener."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "Nie je možné pripojiť sa ku skeneru"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "Nie je možné začať skenovať"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "Chyba v komunikácii so skenerom"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "Zobrazí verziu vydania"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "Vypíše správy ladenia"
 
-#: src/simple-scan.vala:26
+#: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 "Opraviť .pdf súbory vytvorené staršími verziami programu Jednoduché "
 "skenovanie"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "Skenovanie zlyhalo"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
-#: src/simple-scan.vala:632
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/ui.vala:327
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "Nezistili sa žiadne skenery"
 
-#: src/ui.vala:377
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím, skontrolujte, či je skener pripojený a zapnutý"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "Vyžaduje sa dodatočný softvér"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "Musíte nainštalovať softvér ovládača pre váš skener."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "Z_rušiť"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "Súbory obrázkov"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument s viacerými stránkami)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratový)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "Formát súboru:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
-#: src/ui.vala:673
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ak dokument neuložíte, zmeny budú natrvalo stratené."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "Uložiť aktuálny dokument?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "Zahodiť zmeny"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "Nie je možné otvoriť aplikáciu na náhľad obrázku"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "Kombinovať strany"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Kombinovať strany (obrátene)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "Obrátiť"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "Ponechať nezmenené"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "Nie je možné otvoriť súbor pomocníka"
 
-#: src/ui.vala:1472
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1472
 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"
@@ -514,15 +547,17 @@ msgstr ""
 "Spolu s týmto programom by ste mali obdržať kópiu Všeobecnej verejnej "
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -534,19 +569,23 @@ msgstr ""
 "  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "Uložiť dokument pred ukončením?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "Ukončiť bez uloženia"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Zdá sa, že máte skener značky Brother."
 
-#: src/ui.vala:1581
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
@@ -555,11 +594,13 @@ msgstr ""
 "href=\"http://support.brother.com/g/b/countrytop.aspx?c=cz&lang=cs\">Brother "
 "website</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "Zdá sa, že máte skener značky Samsung."
 
-#: src/ui.vala:1587
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
@@ -567,15 +608,18 @@ msgstr ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/sk/support\">Samsung website</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "Zdá sa, že máte skener značky HP."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Zdá sa, že máte skener značky Epson."
 
-#: src/ui.vala:1598
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
@@ -584,126 +628,140 @@ msgstr ""
 "href=\"http://www.epson.sk/sk/sk/viewcon/corporatesite/support\">webovej "
 "stránke výrobcu Epson</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "Inštalácia ovládačov"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 "Po inštalácii budete musieť aplikáciu Jednoduché skenovanie reštartovať."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "Inštalujú sa ovládače..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "Ovládače boli úspešne nainštalované!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Zlyhala inštalácia ovládačov (kód chyby %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "Zlyhala inštalácia ovládačov."
 
-#: src/ui.vala:1676
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "Musíte nainštalovať balík(y) %s."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predvolené)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (koncept)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlíšenie)"
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "Nový dokument"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "Dokument"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "Email..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "Pomocník"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "O programe"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "Na_inštalovať ovládače"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "Automatická"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "Tmavší"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "Svetlejší"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "Menší"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "Väčší"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "Minimálna"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "Maximálna"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. stránka z %d"