Merge tag 'upstream/3.13.4.2'

Upstream version 3.13.4.2

1 files changed, 146 insertions, 96 deletions

diff --git a/po/ca.po b/po/ca.po
index 7089933..5ca5994 100644
--- a/po/ca.po
+++ b/po/ca.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-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@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 "Totes les pàgines de l'a_limentador"
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
+#. 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 "_Envia per correu"
 
 #. 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 "_Pàgina"
 
 #. 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 "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Cap"
 
 #. 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 "_Carta EUA"
 
 #. 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 "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. 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 "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nou"
 
 #. 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 "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Atura"
 
 #. 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 "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. 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 "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualitat:"
 
@@ -440,122 +446,142 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. 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 ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Tanca"
 
 #. 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 "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. 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 "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "De_sa"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
 #. 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 "Si no ho deseu, els canvis es perdran per sempre més."
 
 #. 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 "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. 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 "No s'ha pogut desar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
+#. 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 "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. 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"
@@ -587,20 +613,20 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Adolfo Jayme https://launchpad.net/~fitoschido\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n"
 "  David Planella https://launchpad.net/~dpm\n"
 "  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
 "  J. Gregpori Raya https://launchpad.net/~gregori\n"
@@ -611,88 +637,106 @@ msgstr ""
 "  pancake https://launchpad.net/~pancake"
 
 #. 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 "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. 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 "%d ppp (alta resolució)"
 
 #. 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 "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Manquen fitxers"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Comproveu la vostra instal·lació"
+#: ../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 ""
+
+#: ../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 "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
@@ -730,6 +774,12 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Comproveu la vostra instal·lació"
+
+#~ msgid "Files missing"
+#~ msgstr "Manquen fitxers"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"