Merge tag 'upstream/3.18.0'

Upstream version 3.18.0

1 files changed, 62 insertions, 60 deletions

diff --git a/po/ce.po b/po/ce.po
index 9c54371..647a01a 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-08-11 05:39+0000\n"
-"X-Generator: Launchpad (build 17686)\n"
+"X-Launchpad-Export-Date: 2015-09-15 05:14+0000\n"
+"X-Generator: Launchpad (build 17737)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/appdata/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -87,7 +88,7 @@ msgstr ""
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1826
 msgid "Reorder Pages"
 msgstr ""
 
@@ -205,7 +206,7 @@ msgstr ""
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1827
 msgid "Save"
 msgstr ""
 
@@ -247,7 +248,7 @@ msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1834
 msgid "Preferences"
 msgstr ""
 
@@ -295,7 +296,7 @@ msgstr ""
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:2
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr ""
 
@@ -446,7 +447,7 @@ msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:297
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr ""
 
@@ -456,60 +457,61 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:188
+#. Default filename to use when saving document
+#: ../src/ui.vala:515
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:316 ../src/ui.vala:1745
+#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1872
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:324
+#: ../src/ui.vala:326
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:369
+#: ../src/ui.vala:374
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:371
+#: ../src/ui.vala:376
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1695
+#: ../src/ui.vala:505 ../src/ui.vala:1828
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:510 ../src/ui.vala:672
+#: ../src/ui.vala:508 ../src/ui.vala:674
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:511 ../src/ui.vala:673
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: ../src/ui.vala:520
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: ../src/ui.vala:526
 msgid "All Files"
 msgstr ""
 
@@ -519,77 +521,77 @@ msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:546
+#: ../src/ui.vala:535
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:552
+#: ../src/ui.vala:541
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:558
+#: ../src/ui.vala:547
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:647
+#: ../src/ui.vala:649
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:670
+#: ../src/ui.vala:672
 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/ui.vala:705
+#: ../src/ui.vala:707
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:707
+#: ../src/ui.vala:709
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:989
+#: ../src/ui.vala:991
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1001
+#: ../src/ui.vala:1003
 msgid "Unable to open image preview application"
 msgstr ""
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1203
+#: ../src/ui.vala:1205
 msgid "Combine sides"
 msgstr ""
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1213
+#: ../src/ui.vala:1215
 msgid "Combine sides (reverse)"
 msgstr ""
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1223
+#: ../src/ui.vala:1225
 msgid "Reverse"
 msgstr ""
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1233
+#: ../src/ui.vala:1235
 msgid "Keep unchanged"
 msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1448
+#: ../src/ui.vala:1450
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1469
+#: ../src/ui.vala:1471
 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"
@@ -606,120 +608,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1472
+#: ../src/ui.vala:1474
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1475
+#: ../src/ui.vala:1477
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1484
+#: ../src/ui.vala:1486
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1506
+#: ../src/ui.vala:1508
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1510
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1632
+#: ../src/ui.vala:1769
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1635
+#: ../src/ui.vala:1772
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1638
+#: ../src/ui.vala:1775
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1641
+#: ../src/ui.vala:1778
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#: ../src/ui.vala:1687
+#: ../src/ui.vala:1820
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1825
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1696
+#: ../src/ui.vala:1829
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1830
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1705
+#: ../src/ui.vala:1838
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1839
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1840
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1747
+#: ../src/ui.vala:1874
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1753
+#: ../src/ui.vala:1882
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1932
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1934
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1942
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1944
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1823
+#: ../src/ui.vala:1952
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1825
+#: ../src/ui.vala:1954
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1866
+#: ../src/ui.vala:1988
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:2016
+#: ../src/ui.vala:2151
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""