Merge branch 'feature/upstream' into develop

1 files changed, 70 insertions, 115 deletions

diff --git a/po/ca.po b/po/ca.po
index d322c6c..df347fb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2022-02-05 10:47+0000\n"
-"PO-Revision-Date: 2022-02-11 20:07+0100\n"
-"Last-Translator: maite guix <maite.guix@me.com>\n"
+"POT-Creation-Date: 2023-01-30 20:25+0000\n"
+"PO-Revision-Date: 2023-03-16 20:07+0100\n"
+"Last-Translator: Jordi Mas i Heranàndez <jmas@softcatala.org>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -194,7 +194,7 @@ msgstr ""
 #. 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
-#: data/ui/app-window.ui:454 src/app-window.vala:1558 src/app-window.vala:1832
+#: data/ui/app-window.ui:454 src/app-window.vala:1584 src/app-window.vala:1858
 msgid "Document Scanner"
 msgstr "Escàner de documents"
 
@@ -219,7 +219,7 @@ msgstr ""
 "Aquesta aplicació utilitza el marc de treball SANE per a donar suport a la "
 "majoria dels escàners existents."
 
-#: data/simple-scan.appdata.xml.in:26
+#: data/simple-scan.appdata.xml.in:27
 msgid "The GNOME Project"
 msgstr "El projecte GNOME"
 
@@ -318,7 +318,7 @@ msgstr "_Text"
 msgid "_Image"
 msgstr "_Imatge"
 
-#: data/ui/app-window.ui:433 src/app-window.vala:1862
+#: data/ui/app-window.ui:433 src/app-window.vala:1889
 msgid "_Preferences"
 msgstr "_Preferències"
 
@@ -462,10 +462,15 @@ msgstr "Obre el menú"
 
 #: data/ui/help-overlay.ui:147
 msgctxt "shortcut window"
+msgid "Show preferences"
+msgstr "Mostra les preferències"
+
+#: data/ui/help-overlay.ui:154
+msgctxt "shortcut window"
 msgid "Keyboard shortcuts"
 msgstr "Dreceres del teclat"
 
-#: data/ui/help-overlay.ui:154
+#: data/ui/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "Surt"
@@ -585,7 +590,7 @@ msgstr "Arguments de l_script"
 msgid "_Keep original file"
 msgstr "_Manté el fitxer original"
 
-#: src/app-window.vala:229 src/app-window.vala:1660
+#: src/app-window.vala:229 src/app-window.vala:1686
 msgid "_Close"
 msgstr "_Tanca"
 
@@ -785,45 +790,55 @@ msgstr "Inverteix"
 msgid "Keep unchanged"
 msgstr "Manté sense canvi"
 
+#. Label on button for keeping the ordering, but flip every second upside down
+#: src/app-window.vala:1347
+msgid "Flip even pages upside-down"
+msgstr "Capgira les pàgines parelles cap per avall"
+
+#. Label on button for keeping the ordering, but flip every second upside down
+#: src/app-window.vala:1358
+msgid "Flip odd pages upside-down"
+msgstr "Capgira les pàgines senars cap per avall"
+
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1533
+#: src/app-window.vala:1559
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
-#: src/app-window.vala:1547
+#: src/app-window.vala:1573
 msgid "About Document Scanner"
 msgstr "Quant a l'Escàner de documents"
 
-#: src/app-window.vala:1549
+#: src/app-window.vala:1575
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: src/app-window.vala:1554
+#: src/app-window.vala:1580
 msgid "translator-credits"
 msgstr ""
 "equip de traducció:\n"
-"Jordi Mas i Hernàndez (2017-2019)\n"
+"Jordi Mas i Hernàndez (2017-2022)\n"
 "Contribuïdors del LaunchPad (2010-2016)\n"
 "Miquel-Àngel Burgos i Fradeja (2020)\n"
 "Maite Guix <maite.guix@me.com> (2021)"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1573
+#: src/app-window.vala:1599
 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:1575
+#: src/app-window.vala:1601
 msgid "_Quit without Saving"
 msgstr "_Surt sense desar"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1616
+#: src/app-window.vala:1642
 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:1618
+#: src/app-window.vala:1644
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -832,7 +847,7 @@ msgstr ""
 "\">pàgina web de Brother</a>."
 
 #. Message to indicate a Canon Pixma scanner has been detected
-#: src/app-window.vala:1622
+#: src/app-window.vala:1648
 msgid ""
 "You appear to have a Canon scanner, which is supported by the <a href="
 "\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixma SANE backend</a>."
@@ -841,7 +856,7 @@ msgstr ""
 "www.sane-project.org/man/sane-pixma.5.html\">dorsal Pixma SANE</a>."
 
 #. Instructions on how to resolve issue with SANE scanner drivers
-#: src/app-window.vala:1624
+#: src/app-window.vala:1650
 msgid ""
 "Please check if your <a href=\"http://www.sane-project.org/sane-supported-"
 "devices.html\">scanner is supported by SANE</a>, otherwise report the issue "
@@ -854,13 +869,13 @@ msgstr ""
 "listinfo/sane-devel\">Llista de correu SANE</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1628
+#: src/app-window.vala:1654
 msgid "You appear to have a Samsung scanner."
 msgstr "Sembla que teniu un escàner Samsung."
 
 #. Instructions on how to install Samsung scanner drivers.
 #. Because HP acquired Samsung's global printing business in 2017, the support is made on HP site.
-#: src/app-window.vala:1631
+#: src/app-window.vala:1657
 msgid ""
 "Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
 "website</a> (HP acquired Samsung's printing business)."
@@ -869,7 +884,7 @@ msgstr ""
 "\">pàgina web d'HP</a> (HP va adquirir el negoci d'impressió de Samsung)."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1636
+#: src/app-window.vala:1662
 msgid "You appear to have an HP scanner."
 msgstr "Sembla que teniu un escàner HP."
 
@@ -877,7 +892,7 @@ msgstr "Sembla que teniu un escàner HP."
 #. smfp is rebranded and slightly modified Samsung devices,
 #. for example: HP Laser MFP 135a is rebranded Samsung Xpress SL-M2070.
 #. It require custom drivers, not available in hpaio package
-#: src/app-window.vala:1644
+#: src/app-window.vala:1670
 msgid ""
 "Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
 "website</a>."
@@ -886,12 +901,12 @@ msgstr ""
 "\">pàgina web d'HP</a>."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1648
+#: src/app-window.vala:1674
 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:1650
+#: src/app-window.vala:1676
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -899,13 +914,13 @@ msgstr ""
 "Hi ha controladors disponibles a la <a href=\"http://samsung.com/support"
 "\">pàgina web d'Epson</a>."
 
-#. Message to indicate an Lexmark scanner has been detected
-#: src/app-window.vala:1654
-msgid "You appear to have an Lexmark scanner."
+#. Message to indicate a Lexmark scanner has been detected
+#: src/app-window.vala:1680
+msgid "You appear to have a Lexmark scanner."
 msgstr "Sembla que teniu un escàner Lexmark."
 
 #. Instructions on how to install Lexmark scanner drivers
-#: src/app-window.vala:1656
+#: src/app-window.vala:1682
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.lexmark.com"
 "\">Lexmark website</a>."
@@ -914,102 +929,102 @@ msgstr ""
 "\">pàgina web de Lexmark</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1660
+#: src/app-window.vala:1686
 msgid "Install drivers"
 msgstr "Instal·la els controladors"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1694
+#: src/app-window.vala:1720
 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:1707
+#: src/app-window.vala:1733
 msgid "Installing drivers…"
 msgstr "S'estan instal·lant els controladors…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1715
+#: src/app-window.vala:1741
 msgid "Drivers installed successfully!"
 msgstr "La instal·lació dels controladors ha estat reeixida!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1725
+#: src/app-window.vala:1751
 #, 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:1731
+#: src/app-window.vala:1757
 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:1738
+#: src/app-window.vala:1764
 #, 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:1857
+#: src/app-window.vala:1884
 msgid "_Email"
 msgstr "_Correu electrònic"
 
-#: src/app-window.vala:1858
+#: src/app-window.vala:1885
 msgid "Pri_nt"
 msgstr "Imp_rimeix"
 
-#: src/app-window.vala:1859
+#: src/app-window.vala:1886
 msgctxt "menu"
 msgid "_Reorder Pages"
 msgstr "_Reordena les pàgines"
 
-#: src/app-window.vala:1863
+#: src/app-window.vala:1890
 msgid "_Keyboard Shortcuts"
 msgstr "_Dreceres del teclat"
 
-#: src/app-window.vala:1864
+#: src/app-window.vala:1891
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/app-window.vala:1865
+#: src/app-window.vala:1892
 msgid "_About Document Scanner"
 msgstr "_Quant a l'Escàner de documents"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1873
+#: src/app-window.vala:1900
 msgid "_New Document"
 msgstr "_Document nou"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1892
+#: src/app-window.vala:1919
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gira la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1901
+#: src/app-window.vala:1928
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gira la pàgina cap a la dreta (en sentit horari)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1913
+#: src/app-window.vala:1940
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1931
+#: src/app-window.vala:1958
 msgid "Delete the selected page"
 msgstr "Suprimeix la pàgina seleccionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:2107
+#: src/app-window.vala:2134
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/book.vala:355 src/book.vala:361
+#: src/book.vala:381 src/book.vala:387
 #, c-format
 msgid "Unable to encode page %i"
 msgstr "No s'ha pogut codificar la pàgina %i"
@@ -1060,24 +1075,24 @@ msgid "%d dpi"
 msgstr "%d ppp"
 
 #. Error displayed when no scanners to scan with
-#: src/scanner.vala:897
+#: src/scanner.vala:901
 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:927
+#: src/scanner.vala:931
 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:1357 src/scanner.vala:1492
+#: src/scanner.vala:1361 src/scanner.vala:1495
 msgid "Document feeder empty"
 msgstr "L'alimentador de documents està buit"
 
 #. Out of memory error message with help instruction.
 #. Message written in Pango text markup language,
 #. A carriage return makes a line break, <tt> tag makes a monospace font
-#: src/scanner.vala:1365
+#: src/scanner.vala:1369
 msgid ""
 "Insufficient memory to perform scan.\n"
 "Try to decrease <tt>Resolution</tt> or <tt>Page Size</tt> in "
@@ -1090,12 +1105,12 @@ msgstr ""
 "resolució la mida de l'escaneig està restringida."
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1378
+#: src/scanner.vala:1382
 msgid "Unable to start scan"
 msgstr "No s'ha pogut iniciar l'escaneig"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1391 src/scanner.vala:1502
+#: src/scanner.vala:1395 src/scanner.vala:1505
 msgid "Error communicating with scanner"
 msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
@@ -1137,63 +1152,3 @@ msgstr ""
 "Executeu «%s --help» per a veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#~ 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"
-#~ "the Free Software Foundation, either version 3 of the License, or\n"
-#~ "(at your option) any later version.\n"
-#~ "\n"
-#~ "This program is distributed in the hope that it will be useful,\n"
-#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-#~ "GNU General Public License for more details.\n"
-#~ "\n"
-#~ "You should have received a copy of the GNU General Public License\n"
-#~ "along with this program.  If not, see <http://www.gnu.org/licenses/>."
-#~ msgstr ""
-#~ "Aquest programa és programari lliure: podeu redistribuir-lo i/o modificar-"
-#~ "lo\n"
-#~ "sota els termes de la Llicència Pública General GNU (GNU GPL) segons "
-#~ "publica la \n"
-#~ "Fundació de Programari Lliure, qualsevol versió 3 de la Llicència, o \n"
-#~ "(si ho trieu) qualsevol versió més recent. \n"
-#~ "\n"
-#~ "Aquest programa és distribuït en l'esperança que serà útil, \n"
-#~ "però SENSE CAP GARANTIA; fins i tot sense la garantia implicada de \n"
-#~ "MERCANDABILITAT o ADEQUAT PER UN PROPÒSIT PARTICULAR.\n"
-#~ "Vegeu la Llicència Pública General GNU (GNU GPL) per més detalls. \n"
-#~ "\n"
-#~ "Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU (GNU "
-#~ "GPL)\n"
-#~ "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/"
-#~ ">."
-
-#~ msgid "A_6"
-#~ msgstr "A_6"
-
-#~ msgid "Print"
-#~ msgstr "Imprimeix"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferències"
-
-#~ msgid "_Delay"
-#~ msgstr "_Espera"
-
-#~ msgid "Multiple pages from flatbed"
-#~ msgstr "Múltiples pàgines des d'un escàner pla"
-
-#~ msgid "Seconds"
-#~ msgstr "Segons"
-
-#~ msgid "_Scanning"
-#~ msgstr "_Escaneig"
-
-#~ msgid "Start Again…"
-#~ msgstr "Comença de nou…"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "7"
-#~ msgstr "7"