Merge branch 'feature/upstream' into develop

1 files changed, 165 insertions, 92 deletions

diff --git a/po/kk.po b/po/kk.po
index 0fc1e80..18a6e0a 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,8 +7,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: 2020-05-27 12:08+0000\n"
-"PO-Revision-Date: 2020-06-25 20:12+0500\n"
+"POT-Creation-Date: 2020-09-02 14:04+0000\n"
+"PO-Revision-Date: 2020-09-12 18:46+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "Language: kk\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -106,19 +106,29 @@ msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
 
+#: data/org.gnome.SimpleScan.gschema.xml:65
+msgid "File format that is used for saving image files"
+msgstr ""
+
 #: data/org.gnome.SimpleScan.gschema.xml:66
+msgid ""
+"MIME type that is used for saving image files. Examples of supported MIME "
+"types: image/jpeg, image/png, application/pdf"
+msgstr ""
+
+#: data/org.gnome.SimpleScan.gschema.xml:71
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні"
 
-#: data/org.gnome.SimpleScan.gschema.xml:67
+#: data/org.gnome.SimpleScan.gschema.xml:72
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG сығуы үшін үнсіз келісім бойынша мәні."
 
-#: data/org.gnome.SimpleScan.gschema.xml:72
+#: data/org.gnome.SimpleScan.gschema.xml:77
 msgid "Delay in millisecond between pages"
 msgstr "Беттер арасындағы кідіріс уақыты, миллисекунд"
 
-#: data/org.gnome.SimpleScan.gschema.xml:73
+#: data/org.gnome.SimpleScan.gschema.xml:78
 msgid "Delay in millisecond between pages."
 msgstr "Беттер арасындағы кідіріс уақыты, миллисекунд."
 
@@ -127,7 +137,7 @@ 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:498 src/app-window.vala:1509 src/app-window.vala:1763
+#: src/app-window.ui:498 src/app-window.vala:1571 src/app-window.vala:1847
 msgid "Document Scanner"
 msgstr "Құжат сканері"
 
@@ -269,203 +279,211 @@ msgid "Scan a single page from the scanner"
 msgstr ""
 
 #: src/app-window.ui:594
-#| msgid "Scan"
 msgid "_Scan"
 msgstr "_Сканерлеу"
 
 #. Tooltip for save toolbar button
-#: src/app-window.ui:696
+#: src/app-window.ui:697
 msgid "Save document to a file"
 msgstr "Құжатты файлға сақтау"
 
-#: src/app-window.vala:226 src/app-window.vala:1596
+#: src/app-window.vala:227 src/app-window.vala:1679
 msgid "_Close"
 msgstr "_Жабу"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:235
+#: src/app-window.vala:236
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr ""
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:252
+#: src/app-window.vala:253
 msgid "Searching for Scanners…"
 msgstr ""
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:260
+#: src/app-window.vala:261
 msgid "Ready to Scan"
 msgstr "Сканерлеуге дайын"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:268
+#: src/app-window.vala:270
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: src/app-window.vala:270
+#: src/app-window.vala:272
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:277
+#: src/app-window.vala:279
 msgid "No scanners detected"
 msgstr "Сканерлер табылмады"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:279
+#: src/app-window.vala:281
 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:381
+#: src/app-window.vala:383
 msgid "An autosaved book exists. Do you want to open it?"
 msgstr "Автоматты түрде сақталған кітап бар. Оны ашуды қалайсыз ба?"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:455
+#: src/app-window.vala:457
 msgid "Save As…"
 msgstr "Қалайша сақтау…"
 
-#: src/app-window.vala:458 src/app-window.vala:708
+#: src/app-window.vala:460 src/app-window.vala:756
 msgid "_Save"
 msgstr "_Сақтау"
 
-#: src/app-window.vala:459 src/app-window.vala:623 src/app-window.vala:707
+#: src/app-window.vala:461 src/app-window.vala:643 src/app-window.vala:755
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
-#. Default filename to use when saving document
-#: src/app-window.vala:466
-msgid "Scanned Document.pdf"
-msgstr "Сканерленген құжат.pdf"
+#. Default filename to use when saving document.
+#. To that filename the extension will be added, eg. "Scanned Document.pdf"
+#: src/app-window.vala:471
+msgid "Scanned Document"
+msgstr "Сканерленген құжат"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:472
+#: src/app-window.vala:477
 msgid "Image Files"
 msgstr "Сурет файлдары"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:482
+#: src/app-window.vala:487
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:491
+#: src/app-window.vala:496
 msgid "PDF (multi-page document)"
 msgstr "PDF (көпбетті құжат)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:497
+#: src/app-window.vala:502
 msgid "JPEG (compressed)"
 msgstr "JPEG (сығылған)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:503
+#: src/app-window.vala:508
 msgid "PNG (lossless)"
 msgstr "PNG (жоғалтусыз)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:510
+#: src/app-window.vala:515
 msgid "WebP (compressed)"
 msgstr "WebP (сығылған)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:520
+#: src/app-window.vala:526
 msgid "File format:"
 msgstr "Файл пішімі:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:532
+#: src/app-window.vala:549
 msgid "Compression:"
 msgstr "Сығу:"
 
+#: src/app-window.vala:556
+msgid "Minimum size"
+msgstr "Минималды өлшемі"
+
+#: src/app-window.vala:560
+msgid "Full detail"
+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:622
+#: src/app-window.vala:642
 #, 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:625
+#: src/app-window.vala:645
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: src/app-window.vala:664
+#: src/app-window.vala:712
 msgid "Saving"
 msgstr "Сақталуда"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:681
+#: src/app-window.vala:729
 msgid "Failed to save file"
 msgstr "Файлды сақтау сәтсіз аяқталды"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:705
+#: src/app-window.vala:753
 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:741
+#: src/app-window.vala:789
 msgid "Save current document?"
 msgstr "Ағымдағы құжатты сақтау керек пе?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:743
+#: src/app-window.vala:791
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Label shown when scan started
-#: src/app-window.vala:775
+#: src/app-window.vala:826
 msgid "Contacting scanner…"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:1043
+#: src/app-window.vala:1095
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:1055
+#: src/app-window.vala:1107
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:1217
+#: src/app-window.vala:1269
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "Беттерді қайта ретке келтіру"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1240
+#: src/app-window.vala:1292
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1250
+#: src/app-window.vala:1302
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1260
+#: src/app-window.vala:1312
 msgid "Reverse"
 msgstr "Кері"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1270
+#: src/app-window.vala:1322
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1484
+#: src/app-window.vala:1546
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1499
+#: src/app-window.vala:1561
 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"
@@ -482,16 +500,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: src/app-window.vala:1502 src/app-window.vala:1796
+#: src/app-window.vala:1564 src/app-window.vala:1880
 msgid "About Document Scanner"
 msgstr ""
 
 #. Description of program
-#: src/app-window.vala:1505
+#: src/app-window.vala:1567
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/app-window.vala:1514
+#: src/app-window.vala:1576
 msgid "translator-credits"
 msgstr ""
 "Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
@@ -500,149 +518,188 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1530
+#: src/app-window.vala:1592
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1532
+#: src/app-window.vala:1594
 msgid "Quit without Saving"
 msgstr "Сақтамай-ақ шығу"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1573
+#: src/app-window.vala:1635
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1575
+#: src/app-window.vala:1637
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
 msgstr ""
 
+#. Message to indicate a Canon Pixma scanner has been detected
+#: src/app-window.vala:1641
+msgid ""
+"You appear to have a Canon scanner, which is supported by the <a href="
+"\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixma SANE backend</a>."
+msgstr ""
+
+#. Instructions on how to resolve issue with SANE scanner drivers
+#: src/app-window.vala:1643
+msgid ""
+"Please check if your <a href=\"http://www.sane-project.org/sane-supported-"
+"devices.html\">scanner is supported by SANE</a>, otherwise report the issue "
+"to the <a href=\"https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/"
+"sane-devel\">SANE mailing list</a>."
+msgstr ""
+
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1579
+#: src/app-window.vala:1647
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
-#. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1581
+#. Instructions on how to install Samsung scanner drivers.
+#. Because HP acquired Samsung's global printing business in 2017, the support is made on HP site.
+#: src/app-window.vala:1650
 msgid ""
-"Drivers for this are available on the <a href=\"http://samsung.com/support"
-"\">Samsung website</a>."
+"Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
+"website</a> (HP acquired Samsung's printing business)."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1585
+#: src/app-window.vala:1655
 msgid "You appear to have an HP scanner."
 msgstr ""
 
+#. Instructions on how to install HP scanner drivers.
+#. smfp is rebranded and slightly modified Samsung devices,
+#. for example: HP Laser MFP 135a is rebranded Samsung Xpress SL-M2070.
+#. It require custom drivers, not available in hpaio package
+#: src/app-window.vala:1663
+msgid ""
+"Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
+"website</a>."
+msgstr ""
+
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1590
+#: src/app-window.vala:1667
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1592
+#: src/app-window.vala:1669
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
 msgstr ""
 
+#. Message to indicate an Lexmark scanner has been detected
+#: src/app-window.vala:1673
+msgid "You appear to have an Lexmark scanner."
+msgstr ""
+
+#. Instructions on how to install Linux scanner drivers
+#: src/app-window.vala:1675
+msgid ""
+"Drivers for this are available on the <a href=\"http://support.lexmark.com"
+"\">Lexmark website</a>."
+msgstr ""
+
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1596
+#: src/app-window.vala:1679
 msgid "Install drivers"
 msgstr "Драйверлерді орнату"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1629
+#: src/app-window.vala:1713
 msgid "Once installed you will need to restart this app."
 msgstr ""
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1642
+#: src/app-window.vala:1726
 msgid "Installing drivers…"
 msgstr "Драйверлерді орнату…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1650
+#: src/app-window.vala:1734
 msgid "Drivers installed successfully!"
 msgstr "Драйверлер сәтті орнатылды!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1660
+#: src/app-window.vala:1744
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1666
+#: src/app-window.vala:1750
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1673
+#: src/app-window.vala:1757
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] ""
 
-#: src/app-window.vala:1788
+#: src/app-window.vala:1872
 msgid "Email"
 msgstr "Эл. пошта"
 
-#: src/app-window.vala:1789
+#: src/app-window.vala:1873
 msgid "Print"
 msgstr "Баспаға шығару"
 
-#: src/app-window.vala:1790
+#: src/app-window.vala:1874
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "Беттерді қайта ретке келтіру"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1791 src/preferences-dialog.ui:44
+#: src/app-window.vala:1875 src/preferences-dialog.ui:44
 msgid "Preferences"
 msgstr "Баптаулары"
 
-#: src/app-window.vala:1794
+#: src/app-window.vala:1878
 msgid "Keyboard Shortcuts"
 msgstr "Пернетақта жарлықтары"
 
-#: src/app-window.vala:1795
+#: src/app-window.vala:1879
 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:1804
+#: src/app-window.vala:1888
 msgid "Start Again…"
 msgstr "Қайтадан бастау…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1823
+#: src/app-window.vala:1907
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1832
+#: src/app-window.vala:1916
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Tooltip for crop button
-#: src/app-window.vala:1844
+#: src/app-window.vala:1928
 msgid "Crop the selected page"
 msgstr ""
 
 #. Tooltip for delete button
-#: src/app-window.vala:1862
+#: src/app-window.vala:1946
 msgid "Delete the selected page"
 msgstr ""
 
 #. Text of button for cancelling save
-#: src/app-window.vala:2036
+#: src/app-window.vala:2120
 msgid "Cancel"
 msgstr "Бас тарту"
 
@@ -763,10 +820,15 @@ msgstr "Көмекті көрсету"
 
 #: src/help-overlay.ui:140
 msgctxt "shortcut window"
+msgid "Open menu"
+msgstr "Мәзірді ашу"
+
+#: src/help-overlay.ui:147
+msgctxt "shortcut window"
 msgid "Keyboard shortcuts"
 msgstr "Пернетақта жарлықтары"
 
-#: src/help-overlay.ui:147
+#: src/help-overlay.ui:154
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "Шығу"
@@ -922,17 +984,28 @@ msgid "Unable to connect to scanner"
 msgstr "Сканерге байланысу мүмкін болмады"
 
 #. Error displayed when no documents at the start of scanning
-#: src/scanner.vala:1294
+#: src/scanner.vala:1293
 msgid "Document feeder empty"
 msgstr "Құжат бергіші бос"
 
+#. Out of memory error message with help instruction.
+#. Message written in Pango text markup language,
+#. A carriage return makes a line break, <tt> tag makes a monospace font
+#: src/scanner.vala:1301
+msgid ""
+"Insufficient memory to perform scan.\n"
+"Try to decrease <tt>Resolution</tt> or <tt>Page Size</tt> in "
+"<tt>Preferences</tt> menu. For some scanners when scanning in high "
+"resolution, the scan size is restricted."
+msgstr ""
+
 #. Error display when unable to start scan
-#: src/scanner.vala:1305
+#: src/scanner.vala:1314
 msgid "Unable to start scan"
 msgstr "Сканерлеуді бастау мүмкін емес"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1318 src/scanner.vala:1425
+#: src/scanner.vala:1327 src/scanner.vala:1434
 msgid "Error communicating with scanner"
 msgstr "Сканермен байланысу қатесі"
 
@@ -951,22 +1024,22 @@ msgid "Fix PDF files generated with older versions of this app"
 msgstr "Бұл қолданбаның ескі нұсқаларымен жасалған PDF файлдарын жөндеу"
 
 #. Title of error dialog when scan failed
-#: src/simple-scan.vala:1474
+#: src/simple-scan.vala:1755
 msgid "Failed to scan"
 msgstr "Сканерлеу сәтсіз аяқталды"
 
 #. Attempt to inhibit the screensaver when scanning
-#: src/simple-scan.vala:1489
+#: src/simple-scan.vala:1770
 msgid "Scan in progress"
 msgstr "Сканерлеу жүріп жатыр"
 
 #. Arguments and description for --help text
-#: src/simple-scan.vala:1667
+#: src/simple-scan.vala:1954
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[ҚҰРЫЛҒЫ…] — Сканерлеу утилитасы"
 
 #. Text printed out when an unknown command-line argument provided
-#: src/simple-scan.vala:1678
+#: src/simple-scan.vala:1965
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr ""