Merge tag 'upstream/3.13.4.2'

Upstream version 3.13.4.2

1 files changed, 137 insertions, 93 deletions

diff --git a/po/hy.po b/po/hy.po
index be981c2..822effc 100644
--- a/po/hy.po
+++ b/po/hy.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-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@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-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 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:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 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"
@@ -561,104 +587,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""