Merge branch 'feature/upstrem' into develop

1 files changed, 228 insertions, 184 deletions

diff --git a/po/ca.po b/po/ca.po
index 413f1fd..161fef0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2019-08-04 22:16+0000\n"
+"POT-Creation-Date: 2020-01-05 23:13+0000\n"
 "PO-Revision-Date: 2018-01-01 20:22+0100\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -98,12 +98,12 @@ msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "La resolució en punts per polzada quan s'escanegi text."
 
 #: data/org.gnome.SimpleScan.gschema.xml:50
-msgid "Resolution for photo scans"
-msgstr "Resolució per l'escaneig de fotos"
+msgid "Resolution for image scans"
+msgstr "Resolució per als escaneigs d'imatges"
 
 #: data/org.gnome.SimpleScan.gschema.xml:51
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+msgid "The resolution in dots-per-inch to use when scanning images."
+msgstr "La resolució en punts per polzada quan s'escanegin imatges."
 
 #: data/org.gnome.SimpleScan.gschema.xml:55
 msgid "Page side to scan"
@@ -145,7 +145,7 @@ msgstr "Retard en mil·lisegons entre pàgines."
 #. 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:181 src/app-window.vala:1302 src/app-window.vala:1556
+#: src/app-window.ui:498 src/app-window.vala:1475 src/app-window.vala:1729
 msgid "Document Scanner"
 msgstr "Escàner de documents"
 
@@ -155,12 +155,11 @@ msgstr "Escanegeu documents"
 
 #: data/simple-scan.appdata.xml.in:9
 msgid ""
-"A really easy way to scan both documents and photos. You can crop out the "
-"bad parts of a photo and rotate it if it is the wrong way round. You can "
-"print your scans, export them to pdf, or save them in a range of image "
-"formats."
+"A really easy way to scan both text and images. You can crop out the bad "
+"parts of an image and rotate it if it is the wrong way round. You can print "
+"your scans, export them to pdf, or save them in a range of image formats."
 msgstr ""
-"Una manera realment senzilla d'escanejar tant documents com fotos. Podeu "
+"Una manera realment senzilla d'escanejar tant documents com imatges. Podeu "
 "retallar les parts dolentes d'una foto o girar-la si està en la posició "
 "incorrecta.  Podeu imprimir els vostres escanejos, exportar-los a pdf, o "
 "desar-los en diversos formats d'imatge."
@@ -168,8 +167,12 @@ msgstr ""
 #: data/simple-scan.appdata.xml.in:14
 msgid "This app uses the SANE framework to support most existing scanners."
 msgstr ""
-"Aquesta aplicació utilitza el marc de treball SANE per donar suport a la majoria "
-"dels escàners existents."
+"Aquesta aplicació utilitza el marc de treball SANE per donar suport a la "
+"majoria dels escàners existents."
+
+#: data/simple-scan.appdata.xml.in:24
+msgid "The GNOME Project"
+msgstr "El projecte GNOME"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: data/simple-scan.desktop.in:6
@@ -177,151 +180,154 @@ msgid "scan;scanner;flatbed;adf;"
 msgstr "escanejar;escàner;pla;adf;"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: src/app-window.ui:10
+#: src/app-window.ui:12
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: src/app-window.ui:19
+#: src/app-window.ui:22
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: src/app-window.ui:28
+#: src/app-window.ui:32
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: src/app-window.ui:36
+#: src/app-window.ui:42
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: src/app-window.ui:46
+#: src/app-window.ui:53
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: src/app-window.ui:56
+#: src/app-window.ui:64
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: src/app-window.ui:66
+#: src/app-window.ui:75
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: src/app-window.ui:76
+#: src/app-window.ui:86
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: src/app-window.ui:86
+#: src/app-window.ui:97
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: src/app-window.ui:96
+#: src/app-window.ui:108
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping page to A3
-#: src/app-window.ui:106
+#: src/app-window.ui:119
 msgid "A_3"
 msgstr "A_3"
 
 #. Radio button for cropping to custom page size
-#: src/app-window.ui:116
+#: src/app-window.ui:130
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: src/app-window.ui:132
+#: src/app-window.ui:148
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: src/app-window.ui:144
+#: src/app-window.ui:161
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: src/app-window.ui:152
+#: src/app-window.ui:170
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
-#: src/app-window.ui:272
-msgid "Stop"
-msgstr "Atura"
-
-#. Tooltip for stop button
-#: src/app-window.ui:274
-msgid "Stop the current scan"
-msgstr "Atura l'escaneig actual"
-
-#. Label on scan toolbar item
-#: src/app-window.ui:285
-msgid "Scan"
-msgstr "Escaneja"
-
-#. Tooltip for scan toolbar button
-#: src/app-window.ui:288
-msgid "Scan a single page from the scanner"
-msgstr "Escaneja una sola pàgina de l'escàner"
-
-#. Tooltip for save toolbar button
-#: src/app-window.ui:352
-msgid "Save document to a file"
-msgstr "Desa el document en un fitxer"
-
-#: src/app-window.ui:405
+#: src/app-window.ui:252
 msgid "_Single Page"
 msgstr "Pàgina _individual"
 
-#: src/app-window.ui:436
+#: src/app-window.ui:303
 msgid "All Pages From _Feeder"
 msgstr "Totes les pàgines de l'a_limentador"
 
-#: src/app-window.ui:467
+#: src/app-window.ui:354
 msgid "_Multiple Pages From Flatbed"
 msgstr "_Múltiples pàgines des d'un escàner pla"
 
-#: src/app-window.ui:498
+#: src/app-window.ui:405
 msgid "_Text"
 msgstr "_Text"
 
-#: src/app-window.ui:529
+#: src/app-window.ui:456
 msgid "_Image"
 msgstr "_Imatge"
 
-#: src/app-window.vala:225 src/app-window.vala:1389
+#: src/app-window.ui:476
+msgid "_Preferences"
+msgstr "_Preferències"
+
+#. Tooltip for stop button
+#: src/app-window.ui:516
+msgid "Stop the current scan"
+msgstr "Atura l'escaneig actual"
+
+#: src/app-window.ui:540
+msgid "S_top"
+msgstr "_Atura"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:569
+msgid "Scan a single page from the scanner"
+msgstr "Escaneja una sola pàgina de l'escàner"
+
+#: src/app-window.ui:594
+msgid "_Scan"
+msgstr "_Escaneja"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:696
+msgid "Save document to a file"
+msgstr "Desa el document en un fitxer"
+
+#: src/app-window.vala:220 src/app-window.vala:1562
 msgid "_Close"
 msgstr "_Tanca"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:234
+#: src/app-window.vala:229
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:250
+#: src/app-window.vala:245
 msgid "Searching for Scanners…"
 msgstr "S'estan cercant escànners…"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:256
+#: src/app-window.vala:252
 msgid "Ready to Scan"
 msgstr "A punt per escanejar"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:263
+#: src/app-window.vala:260
 msgid "Additional software needed"
 msgstr "Cal un programari addicional"
 
 #. Instructions to install driver software
-#: src/app-window.vala:265
+#: src/app-window.vala:262
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
@@ -330,156 +336,161 @@ msgstr ""
 "per al vostre escàner."
 
 #. Warning displayed when no scanners are detected
-#: src/app-window.vala:271
+#: src/app-window.vala:269
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:273
+#: src/app-window.vala:271
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
+#. Contents of dialog that shows if autosaved book should be loaded.
+#: src/app-window.vala:373
+msgid "An autosaved book exists. Do you want to open it?"
+msgstr "Ja existeix un llibre desat automàticament. Voleu reemplaçar-lo?"
+
 #. Save dialog: Dialog title
-#: src/app-window.vala:296
+#: src/app-window.vala:447
 msgid "Save As…"
 msgstr "Anomena i desa…"
 
-#: src/app-window.vala:299 src/app-window.vala:553
+#: src/app-window.vala:450 src/app-window.vala:704
 msgid "_Save"
 msgstr "De_sa"
 
-#: src/app-window.vala:300 src/app-window.vala:468 src/app-window.vala:552
+#: src/app-window.vala:451 src/app-window.vala:619 src/app-window.vala:703
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:307
+#: src/app-window.vala:458
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:313
+#: src/app-window.vala:464
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:323
+#: src/app-window.vala:474
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:332
+#: src/app-window.vala:483
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:338
+#: src/app-window.vala:489
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:344
+#: src/app-window.vala:495
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:351
+#: src/app-window.vala:502
 msgid "WebP (compressed)"
 msgstr "WebP (comprimit)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:361
+#: src/app-window.vala:512
 msgid "File format:"
 msgstr "Format del fitxer:"
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:373
+#: src/app-window.vala:524
 msgid "Compression:"
 msgstr "Compressió:"
 
 #. 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:467
+#: src/app-window.vala:618
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "Ja existeix un fitxer amb el nom «%s». Voleu reemplaçar-lo?"
 
 #. 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:470
+#: src/app-window.vala:621
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: src/app-window.vala:509
+#: src/app-window.vala:660
 msgid "Saving"
 msgstr "Desament"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:526
+#: src/app-window.vala:677
 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/app-window.vala:550
+#: src/app-window.vala:701
 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/app-window.vala:586
+#: src/app-window.vala:737
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:588
+#: src/app-window.vala:739
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Label shown when scan started
-#: src/app-window.vala:620
+#: src/app-window.vala:771
 msgid "Contacting scanner…"
 msgstr "S'està contactant l'e_scàner…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:836
+#: src/app-window.vala:1009
 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/app-window.vala:848
+#: src/app-window.vala:1021
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:1010
+#: src/app-window.vala:1183
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:1033
+#: src/app-window.vala:1206
 msgid "Combine sides"
 msgstr "Combina els costats"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1043
+#: src/app-window.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "Combina els costats (invers)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1053
+#: src/app-window.vala:1226
 msgid "Reverse"
 msgstr "Inverteix"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1063
+#: src/app-window.vala:1236
 msgid "Keep unchanged"
 msgstr "Mantingues sense canvi"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1277
+#: src/app-window.vala:1450
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1292
+#: src/app-window.vala:1465
 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"
@@ -511,38 +522,38 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: src/app-window.vala:1295 src/app-window.vala:1581
+#: src/app-window.vala:1468 src/app-window.vala:1756
 msgid "About Document Scanner"
 msgstr "Quant a l'Escàner de documents"
 
 #. Description of program
-#: src/app-window.vala:1298
+#: src/app-window.vala:1471
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: src/app-window.vala:1307
+#: src/app-window.vala:1480
 msgid "translator-credits"
 msgstr ""
 "Jordi Mas i Hernàndez (2017-2019)\n"
 "Contribuïdors del LaunchPad (2010-2016)"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1323
+#: src/app-window.vala:1496
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1325
+#: src/app-window.vala:1498
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1366
+#: src/app-window.vala:1539
 msgid "You appear to have a Brother scanner."
 msgstr "Sembla que teniu un escàner Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1368
+#: src/app-window.vala:1541
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -551,12 +562,12 @@ msgstr ""
 "\">pàgina web de Brother</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1372
+#: src/app-window.vala:1545
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembla que teniu un escàner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1374
+#: src/app-window.vala:1547
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -565,17 +576,17 @@ msgstr ""
 "\">pàgina web de Samsung</a>."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1378
+#: src/app-window.vala:1551
 msgid "You appear to have an HP scanner."
 msgstr "Sembla que teniu un escàner HP."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1383
+#: src/app-window.vala:1556
 msgid "You appear to have an Epson scanner."
 msgstr "Sembla que teniu un escàner Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1385
+#: src/app-window.vala:1558
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -584,95 +595,99 @@ msgstr ""
 "\">pàgina web d'Epson</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1389
+#: src/app-window.vala:1562
 msgid "Install drivers"
 msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1422
+#: src/app-window.vala:1595
 msgid "Once installed you will need to restart this app."
 msgstr "Un cop instal·lat haureu de reiniciar aquesta aplicació."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1435
+#: src/app-window.vala:1608
 msgid "Installing drivers…"
 msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1443
+#: src/app-window.vala:1616
 msgid "Drivers installed successfully!"
 msgstr "La instal·lació dels controladors ha estat reeixida!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1453
+#: src/app-window.vala:1626
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Ha fallat la instal·lació dels controladors (codi d'error %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1459
+#: src/app-window.vala:1632
 msgid "Failed to install drivers."
 msgstr "No s'han pogut instal·lar els controladors."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1466
+#: src/app-window.vala:1639
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "Heu d'instal·lar el paquet %s."
 msgstr[1] "Heu d'instal·lar els paquets %s."
 
-#: src/app-window.vala:1574
+#: src/app-window.vala:1748
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: src/app-window.vala:1575
+#: src/app-window.vala:1749
+msgid "Print"
+msgstr "Imprimeix"
+
+#: src/app-window.vala:1750
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "Reordena les pàgines"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1578 src/preferences-dialog.ui:52
+#: src/app-window.vala:1751 src/preferences-dialog.ui:44
 msgid "Preferences"
 msgstr "Preferències"
 
-#: src/app-window.vala:1579
+#: src/app-window.vala:1754
 msgid "Keyboard Shortcuts"
 msgstr "Dreceres de teclat"
 
-#: src/app-window.vala:1580
+#: src/app-window.vala:1755
 msgid "Help"
 msgstr "Ajuda"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1589
+#: src/app-window.vala:1764
 msgid "Start Again…"
 msgstr "Comença de nou…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1608
+#: src/app-window.vala:1783
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1617
+#: src/app-window.vala:1792
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1629
+#: src/app-window.vala:1804
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1647
+#: src/app-window.vala:1822
 msgid "Delete the selected page"
 msgstr "Suprimeix la pàgina seleccionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1791
+#: src/app-window.vala:1996
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -781,168 +796,188 @@ msgctxt "shortcut window"
 msgid "Copy current page to clipboard"
 msgstr "Copia la pàgina actual al porta-retalls"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:80
-msgid "_Scanner"
-msgstr "_Escàner"
+#: src/help-overlay.ui:128
+msgctxt "shortcut window"
+msgid "General"
+msgstr "General"
+
+#: src/help-overlay.ui:133
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "Mostra l'ajuda"
+
+#: src/help-overlay.ui:140
+msgctxt "shortcut window"
+msgid "Keyboard shortcuts"
+msgstr "Dreceres de teclat"
+
+#: src/help-overlay.ui:147
+msgctxt "shortcut window"
+msgid "Quit"
+msgstr "Surt"
 
 #. Label beside scan side combo box
-#: src/preferences-dialog.ui:108
-msgid "Scan Sides"
-msgstr "Cares a escanejar"
+#: src/preferences-dialog.ui:72
+msgid "Scan _Sides"
+msgstr "_Cares a escanejar"
 
 #. Label beside page size combo box
-#: src/preferences-dialog.ui:124
-msgid "Page Size"
-msgstr "Mida de la pàgina"
+#: src/preferences-dialog.ui:88
+msgid "_Page Size"
+msgstr "_Mida de la pàgina"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:153
+#: src/preferences-dialog.ui:118
 msgid "Front"
 msgstr "Anvers de la pàgina"
 
 #. Preferences Dialog: Toggle button to select scanning on the back side of a page
-#: src/preferences-dialog.ui:163
+#: src/preferences-dialog.ui:128
 msgid "Back"
 msgstr "Revers de la pàgina"
 
 #. Preferences Dialog: Toggle button to select scanning on both sides of a page
-#: src/preferences-dialog.ui:173
+#: src/preferences-dialog.ui:138
 msgid "Both"
 msgstr "Ambdues"
 
 #. Label beside page delay scale
-#: src/preferences-dialog.ui:200
-msgid "Delay"
-msgstr "Espera"
+#: src/preferences-dialog.ui:165
+msgid "_Delay"
+msgstr "_Espera"
 
 #. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
-#: src/preferences-dialog.ui:215
+#: src/preferences-dialog.ui:181
 msgid "Multiple pages from flatbed"
 msgstr "Múltiples pàgines des d'un escàner pla"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:233
+#: src/preferences-dialog.ui:199
 msgid "3"
 msgstr "3"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:243
+#: src/preferences-dialog.ui:209
 msgid "5"
 msgstr "5"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:254
+#: src/preferences-dialog.ui:220
 msgid "7"
 msgstr "7"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:265
+#: src/preferences-dialog.ui:231
 msgid "10"
 msgstr "10"
 
 #. Preferences Dialog: Toggle button to select scanning on front side of a page
-#: src/preferences-dialog.ui:276
+#: src/preferences-dialog.ui:242
 msgid "15"
 msgstr "15"
 
 #. Label after page delay radio buttons
-#: src/preferences-dialog.ui:297
+#: src/preferences-dialog.ui:263
 msgid "Seconds"
 msgstr "Segons"
 
 #. Preferences Dialog: Tab label for scanning settings
-#: src/preferences-dialog.ui:319
-msgid "Scanning"
-msgstr "Escaneig"
+#: src/preferences-dialog.ui:285
+msgid "_Scanning"
+msgstr "_Escaneig"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:339
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:306
 msgid "_Text Resolution"
 msgstr "_Resolució de text"
 
-#. Label beside scan source combo box
-#: src/preferences-dialog.ui:354
-msgid "_Photo Resolution"
-msgstr "_Resolució fotogràfica"
+#. Label beside scan resolution combo box
+#: src/preferences-dialog.ui:322
+msgid "_Image Resolution"
+msgstr "_Resolució de la imatge"
 
 #. Label beside brightness scale
-#: src/preferences-dialog.ui:398
-msgid "Brightness"
-msgstr "Brillantor"
+#: src/preferences-dialog.ui:367
+msgid "_Brightness"
+msgstr "_Brillantor"
 
 #. Label beside contrast scale
-#: src/preferences-dialog.ui:413
-msgid "Contrast"
-msgstr "Contrast"
+#: src/preferences-dialog.ui:383
+msgid "_Contrast"
+msgstr "_Contrast"
 
 #. Preferences Dialog: Tab for quality settings
-#: src/preferences-dialog.ui:461
-msgid "Quality"
-msgstr "Qualitat"
+#: src/preferences-dialog.ui:432
+msgid "_Quality"
+msgstr "_Qualitat"
 
 #. Combo box value for automatic paper size
-#: src/preferences-dialog.vala:72
+#: src/preferences-dialog.vala:65
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: src/preferences-dialog.vala:113
+#: src/preferences-dialog.vala:102
 msgid "Darker"
 msgstr "Més fosc"
 
-#: src/preferences-dialog.vala:115
+#: src/preferences-dialog.vala:104
 msgid "Lighter"
 msgstr "Més clar"
 
-#: src/preferences-dialog.vala:123
+#: src/preferences-dialog.vala:112
 msgid "Less"
 msgstr "Menys"
 
-#: src/preferences-dialog.vala:125
+#: src/preferences-dialog.vala:114
 msgid "More"
 msgstr "Més"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: src/preferences-dialog.vala:437
+#: src/preferences-dialog.vala:285
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:288
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:291
 #, 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/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:294
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Error displayed when no scanners to scan with
-#: src/scanner.vala:844
+#: src/scanner.vala:866
 msgid "No scanners available.  Please connect a scanner."
 msgstr "No hi ha cap escàner disponible. Connecteu-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: src/scanner.vala:874
+#: src/scanner.vala:896
 msgid "Unable to connect to scanner"
 msgstr "No s'ha pogut connectar a l'escàner"
 
+#. Error displayed when no documents at the start of scanning
+#: src/scanner.vala:1300
+msgid "Document feeder empty"
+msgstr ""
+
 #. Error display when unable to start scan
-#: src/scanner.vala:1251
+#: src/scanner.vala:1307
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1264 src/scanner.vala:1371
+#: src/scanner.vala:1320 src/scanner.vala:1427
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
@@ -984,6 +1019,21 @@ msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
+#~ msgid "Resolution for photo scans"
+#~ msgstr "Resolució per l'escaneig de fotos"
+
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "La resolució en punts per polzada quan s'escanegin fotos."
+
+#~ msgid "Stop"
+#~ msgstr "Atura"
+
+#~ msgid "_Scanner"
+#~ msgstr "_Escàner"
+
+#~ msgid "_Photo Resolution"
+#~ msgstr "_Resolució fotogràfica"
+
 #~ msgid "Simple Scan"
 #~ msgstr "Escaneig senzill"
 
@@ -1023,9 +1073,6 @@ msgstr ""
 #~ msgid "About"
 #~ msgstr "Quant a"
 
-#~ msgid "Quit"
-#~ msgstr "Surt"
-
 #~ msgid "Front and Back"
 #~ msgstr "Ambdues cares"
 
@@ -1053,9 +1100,6 @@ msgstr ""
 #~ msgid "Email..."
 #~ msgstr "Envia per correu electrònic..."
 
-#~ msgid "Print..."
-#~ msgstr "Imprimeix..."
-
 #~ msgid "_Install Drivers"
 #~ msgstr "_Instal·la els controladors"