Merge branch 'feature/upstream' into develop

1 files changed, 116 insertions, 113 deletions

diff --git a/po/kk.po b/po/kk.po
index 7f2eba0..f7db766 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,10 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=simple-scan&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-06-25 08:37+0000\n"
-"PO-Revision-Date: 2017-06-25 19:23+0500\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
+"POT-Creation-Date: 2018-07-01 04:06+0000\n"
+"PO-Revision-Date: 2018-08-21 13:59+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "Language: kk\n"
@@ -17,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 1.8.12\n"
+"X-Generator: Poedit 2.1.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -128,7 +127,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:76 src/app-window.vala:1560
+#: src/app-window.ui:76 src/app-window.vala:1571
 msgid "Simple Scan"
 msgstr ""
 
@@ -165,29 +164,29 @@ msgstr ""
 #. Toolbar scan menu item to scan a single page from the scanner
 #. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:831
 msgid "Single _Page"
 msgstr ""
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:840
 msgid "All Pages From _Feeder"
 msgstr ""
 
 #. Toolbar scan menu item to scan continuously from the flatbed
 #. Scan menu item to scan continuously from the flatbed
 #. Toolbar scan menu item to scan continuously from the flatbed
-#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:849
 msgid "_Multiple Pages From Flatbed"
 msgstr ""
 
-#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864
 msgid "Text"
 msgstr "Мәтін"
 
-#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874
 msgid "Photo"
 msgstr "Фото"
 
@@ -208,7 +207,7 @@ msgstr "Сканерлеуді _тоқтату"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+#: src/app-window.ui:196 src/app-window.vala:978 src/app-window.vala:1586
 msgid "Reorder Pages"
 msgstr ""
 
@@ -272,241 +271,247 @@ msgstr "Le_gal"
 msgid "4×6"
 msgstr "4×6"
 
-#. Radio button for cropping to custom page size
+#. Radio button for cropping page to A3
 #: src/app-window.ui:397
+#| msgid "A_4"
+msgid "A_3"
+msgstr "A_3"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:408
 msgid "_Custom"
 msgstr "Таң_дауыңызша"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:415
+#: src/app-window.ui:426
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:428
+#: src/app-window.ui:439
 msgid "Move Left"
 msgstr "Солға жылжыту"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:437
+#: src/app-window.ui:448
 msgid "Move Right"
 msgstr "Оңға жылжыту"
 
 #. Label on help menu
-#: src/app-window.ui:474
+#: src/app-window.ui:485
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: src/app-window.ui:482
+#: src/app-window.ui:493
 msgid "_Contents"
 msgstr "Құра_масы"
 
 #. Tooltip for scan toolbar button
-#: src/app-window.ui:520 src/app-window.ui:720
+#: src/app-window.ui:531 src/app-window.ui:731
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: src/app-window.ui:522 src/app-window.ui:716
+#: src/app-window.ui:533 src/app-window.ui:727
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: src/app-window.ui:538 src/app-window.ui:787
+#: src/app-window.ui:549 src/app-window.ui:798
 msgid "Save document to a file"
 msgstr "Құжатты файлға сақтау"
 
-#: src/app-window.ui:540
+#: src/app-window.ui:551
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: src/app-window.ui:555 src/app-window.ui:700
+#: src/app-window.ui:566 src/app-window.ui:711
 msgid "Stop the current scan"
 msgstr ""
 
-#: src/app-window.ui:556 src/app-window.ui:697
+#: src/app-window.ui:567 src/app-window.ui:708
 msgid "Stop"
 msgstr "Тоқтау"
 
 #. Label shown when searching for scanners
-#: src/app-window.ui:611
+#: src/app-window.ui:622
 msgid "Searching for Scanners…"
 msgstr ""
 
-#: src/app-window.vala:237 src/app-window.vala:1380
+#: src/app-window.vala:239 src/app-window.vala:1391
 msgid "_Close"
 msgstr "_Жабу"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:246
+#: src/app-window.vala:248
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr ""
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:266 src/app-window.vala:584
+#: src/app-window.vala:268 src/app-window.vala:586
 msgid "Ready to Scan"
 msgstr ""
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:273
+#: src/app-window.vala:275
 msgid "Additional software needed"
 msgstr ""
 
 #. Instructions to install driver software
-#: src/app-window.vala:275
+#: src/app-window.vala:277
 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:281
+#: src/app-window.vala:283
 msgid "No scanners detected"
 msgstr "Сканерлер табылмады"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:283
+#: src/app-window.vala:285
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:298
+#: src/app-window.vala:300
 msgid "Save As…"
 msgstr "Қалайша сақтау…"
 
-#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
+#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554
 msgid "_Cancel"
 msgstr "_Бас тарту"
 
-#: src/app-window.vala:302 src/app-window.vala:553
+#: src/app-window.vala:304 src/app-window.vala:555
 msgid "_Save"
 msgstr "_Сақтау"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:310
+#: src/app-window.vala:312
 msgid "Scanned Document.pdf"
 msgstr "Сканерленген құжат.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:316
+#: src/app-window.vala:318
 msgid "Image Files"
 msgstr "Сурет файлдары"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:326
+#: src/app-window.vala:328
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:335
+#: src/app-window.vala:337
 msgid "PDF (multi-page document)"
 msgstr "PDF (көпбетті құжат)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:341
+#: src/app-window.vala:343
 msgid "JPEG (compressed)"
 msgstr "JPEG (сығылған)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:347
+#: src/app-window.vala:349
 msgid "PNG (lossless)"
 msgstr "PNG (жоғалтусыз)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:354
+#: src/app-window.vala:356
 msgid "WebP (compressed)"
 msgstr "WebP (сығылған)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:364
+#: src/app-window.vala:366
 msgid "File format:"
 msgstr "Файл пішімі:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:376
+#: src/app-window.vala:378
 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:470
+#: src/app-window.vala:472
 #, 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:473
+#: src/app-window.vala:475
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: src/app-window.vala:512
+#: src/app-window.vala:514
 msgid "Saving"
 msgstr "Сақталуда"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:527
+#: src/app-window.vala:529
 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:552
 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:591
+#: src/app-window.vala:593
 msgid "Save current document?"
 msgstr "Ағымдағы құжатты сақтау керек пе?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:593
+#: src/app-window.vala:595
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Label shown when scan started
-#: src/app-window.vala:692
+#: src/app-window.vala:694
 msgid "Contacting scanner…"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:800
+#: src/app-window.vala:804
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:812
+#: src/app-window.vala:816
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:990
+#: src/app-window.vala:1001
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1000
+#: src/app-window.vala:1011
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1010
+#: src/app-window.vala:1021
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1020
+#: src/app-window.vala:1031
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1250
+#: src/app-window.vala:1261
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1271
+#: src/app-window.vala:1282
 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"
@@ -523,16 +528,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: src/app-window.vala:1274
+#: src/app-window.vala:1285
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: src/app-window.vala:1277
+#: src/app-window.vala:1288
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: src/app-window.vala:1286
+#: src/app-window.vala:1297
 msgid "translator-credits"
 msgstr ""
 "Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
@@ -541,149 +546,144 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1308
+#: src/app-window.vala:1319
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1310
+#: src/app-window.vala:1321
 msgid "Quit without Saving"
 msgstr "Сақтамай-ақ шығу"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1357
+#: src/app-window.vala:1368
 msgid "You appear to have a Brother scanner."
 msgstr ""
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1359
+#: src/app-window.vala:1370
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
 msgstr ""
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1363
+#: src/app-window.vala:1374
 msgid "You appear to have a Samsung scanner."
 msgstr ""
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1365
+#: src/app-window.vala:1376
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
 msgstr ""
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1369
+#: src/app-window.vala:1380
 msgid "You appear to have an HP scanner."
 msgstr ""
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1374
+#: src/app-window.vala:1385
 msgid "You appear to have an Epson scanner."
 msgstr ""
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1376
+#: src/app-window.vala:1387
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
 msgstr ""
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1380
+#: src/app-window.vala:1391
 msgid "Install drivers"
 msgstr "Драйверлерді орнату"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1411
+#: src/app-window.vala:1422
 msgid "Once installed you will need to restart Simple Scan."
 msgstr ""
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1423
+#: src/app-window.vala:1434
 msgid "Installing drivers…"
 msgstr "Драйверлерді орнату…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1431
+#: src/app-window.vala:1442
 msgid "Drivers installed successfully!"
 msgstr "Драйверлер сәтті орнатылды!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1441
+#: src/app-window.vala:1452
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr ""
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1447
+#: src/app-window.vala:1458
 msgid "Failed to install drivers."
 msgstr ""
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1454
+#: src/app-window.vala:1465
 #, 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:1585
+msgid "Email"
+msgstr "Эл. пошта"
+
 #. Title of preferences dialog
-#: src/app-window.vala:1568 src/app-window.vala:1591
-#: src/preferences-dialog.ui:53
+#: src/app-window.vala:1589 src/preferences-dialog.ui:53
 msgid "Preferences"
 msgstr "Баптаулары"
 
-#: src/app-window.vala:1572
+#: src/app-window.vala:1590
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: src/app-window.vala:1573
+#: src/app-window.vala:1591
 msgid "Help"
 msgstr "Көмек"
 
-#: src/app-window.vala:1574
+#: src/app-window.vala:1592
 msgid "About"
 msgstr "Осы туралы"
 
-#: src/app-window.vala:1575
-msgid "Quit"
-msgstr "Шығу"
-
-#: src/app-window.vala:1589
-msgid "Email"
-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:1599
+#: src/app-window.vala:1600
 msgid "Start Again…"
 msgstr "Қайтадан бастау…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1616
+#: src/app-window.vala:1617
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1623
+#: src/app-window.vala:1624
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Tooltip for crop button
-#: src/app-window.vala:1633
+#: src/app-window.vala:1634
 msgid "Crop the selected page"
 msgstr ""
 
 #. Tooltip for delete button
-#: src/app-window.vala:1649
+#: src/app-window.vala:1650
 msgid "Delete the selected page"
 msgstr ""
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1814
+#: src/app-window.vala:1815
 msgid "Cancel"
 msgstr "Бас тарту"
 
@@ -760,7 +760,7 @@ msgstr ""
 #: src/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Delete page"
-msgstr ""
+msgstr "Бетті өшіру"
 
 #: src/help-overlay.ui:87
 msgctxt "shortcut window"
@@ -829,7 +829,7 @@ msgstr "Кідіріс"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
 #: src/preferences-dialog.ui:276
-msgid "Multiple page from flatbed"
+msgid "Multiple pages from flatbed"
 msgstr ""
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
@@ -875,7 +875,7 @@ msgstr ""
 #. Label beside scan source combo box
 #: src/preferences-dialog.ui:452
 msgid "_Photo Resolution"
-msgstr ""
+msgstr "_Фото ажыратылымдығы"
 
 #. Label beside brightness scale
 #: src/preferences-dialog.ui:505
@@ -897,42 +897,42 @@ msgstr "Сапасы"
 msgid "Automatic"
 msgstr "Авто"
 
-#: src/preferences-dialog.vala:116
+#: src/preferences-dialog.vala:118
 msgid "Darker"
 msgstr "Қүңгірттеу"
 
-#: src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:120
 msgid "Lighter"
 msgstr "Ашықтау"
 
-#: src/preferences-dialog.vala:126
+#: src/preferences-dialog.vala:128
 msgid "Less"
-msgstr ""
+msgstr "Азырақ"
 
-#: src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:130
 msgid "More"
 msgstr "Көбірек"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:442
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:445
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:448
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: src/preferences-dialog.vala:449
+#: src/preferences-dialog.vala:451
 #, c-format
 msgid "%d dpi"
 msgstr ""
@@ -953,7 +953,7 @@ msgid "Unable to start scan"
 msgstr ""
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1240 src/scanner.vala:1340
+#: src/scanner.vala:1240 src/scanner.vala:1347
 msgid "Error communicating with scanner"
 msgstr ""
 
@@ -974,12 +974,12 @@ msgstr ""
 #. Title of error dialog when scan failed
 #: src/simple-scan.vala:392
 msgid "Failed to scan"
-msgstr ""
+msgstr "Сканерлеу сәтсіз аяқталды"
 
 #. Attempt to inhibit the screensaver when scanning
 #: src/simple-scan.vala:407
 msgid "Scan in progress"
-msgstr ""
+msgstr "Сканерлеу жүріп жатыр"
 
 #. Arguments and description for --help text
 #: src/simple-scan.vala:584
@@ -993,6 +993,9 @@ msgid "Run “%s --help” to see a full list of available command line options.
 msgstr ""
 "Командалық жолдың барлық опцияларын қарау үшін \"%s --help\" енгізіңіз."
 
+#~ msgid "Quit"
+#~ msgstr "Шығу"
+
 #~ msgid "New"
 #~ msgstr "Жаңа"