Merge tag 'upstream/3.15.4'

Upstream version 3.15.4

1 files changed, 54 insertions, 46 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 6486d3b..6ecd935 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-18 17:31+1200\n"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:39+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Reorder Pages"
 
@@ -205,7 +205,7 @@ msgstr "Scan"
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Save"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Quality:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Scan Documents"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
@@ -441,12 +449,12 @@ msgid "Scanned Document"
 msgstr "Scanned Document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -456,7 +464,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Close"
 
@@ -477,7 +485,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Save As..."
 
@@ -530,52 +538,52 @@ msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Combine sides"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Combine sides (reverse)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "Reverse"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Keep unchanged"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 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"
@@ -604,16 +612,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -628,106 +636,106 @@ msgstr ""
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "New Document"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "E-mail..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Print..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Help"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "About"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Quit"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"