Merge branch 'feature/upstream' into develop

1 files changed, 72 insertions, 61 deletions

diff --git a/po/oc.po b/po/oc.po
index 88f1c48..73b3069 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,8 +7,8 @@ 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-03-16 14:49+0100\n"
+"POT-Creation-Date: 2023-01-30 20:25+0000\n"
+"PO-Revision-Date: 2023-02-12 21:08+0100\n"
 "Last-Translator: Quentin PAGÈS\n"
 "Language-Team: Tot En Òc\n"
 "Language: oc\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
@@ -85,8 +85,7 @@ msgstr "Resolucion per de numerizacions de tèxtes"
 
 #: data/org.gnome.SimpleScan.gschema.xml:46
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr ""
-"La resolucion en punts per poce d'utilizar en numerizant de tèxte."
+msgstr "La resolucion en punts per poce d'utilizar en numerizant de tèxte."
 
 #: data/org.gnome.SimpleScan.gschema.xml:50
 msgid "Resolution for image scans"
@@ -186,7 +185,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 "Numerizador de documents"
 
@@ -211,7 +210,7 @@ msgstr ""
 "Simple Scan utiliza l'estructura logiciala de SANE per prene en carga la "
 "màger part dels periferics de numerizacion existents."
 
-#: data/simple-scan.appdata.xml.in:26
+#: data/simple-scan.appdata.xml.in:27
 msgid "The GNOME Project"
 msgstr "Lo projècte GNOME"
 
@@ -310,7 +309,7 @@ msgstr "Tè_xte"
 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éncias"
 
@@ -454,10 +453,15 @@ msgstr "Dobrir lo menú"
 
 #: data/ui/help-overlay.ui:147
 msgctxt "shortcut window"
+msgid "Show preferences"
+msgstr "Afichar las preferéncias"
+
+#: data/ui/help-overlay.ui:154
+msgctxt "shortcut window"
 msgid "Keyboard shortcuts"
 msgstr "Acorchis clavièr"
 
-#: data/ui/help-overlay.ui:154
+#: data/ui/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "Quit"
 msgstr "Quitar"
@@ -577,7 +581,7 @@ msgstr "_Paramètres escript"
 msgid "_Keep original file"
 msgstr "_Gardar lo fichièr original"
 
-#: src/app-window.vala:229 src/app-window.vala:1660
+#: src/app-window.vala:229 src/app-window.vala:1686
 msgid "_Close"
 msgstr "_Tampar"
 
@@ -777,20 +781,30 @@ msgstr "Inversar"
 msgid "Keep unchanged"
 msgstr "Manténer incambiat"
 
+#. 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 "Virar las paginas paras cap aval"
+
+#. 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 "Virar las paginas imparas cap amont"
+
 #. 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 "Impossible de dobrir lo fichièr d'ajuda"
 
-#: src/app-window.vala:1547
+#: src/app-window.vala:1573
 msgid "About Document Scanner"
 msgstr "A prepaus de Numerizador de documents"
 
-#: src/app-window.vala:1549
+#: src/app-window.vala:1575
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: src/app-window.vala:1554
+#: src/app-window.vala:1580
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -798,22 +812,22 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. 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 "Enregistrar lo document abans de quitar ?"
 
 #. 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 "_Quitar sens enregistrar"
 
 #. 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 "Semblariá qu'aguèssetz un scanner 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>."
@@ -822,7 +836,7 @@ msgstr ""
 "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>."
@@ -831,7 +845,7 @@ msgstr ""
 "<a href=\"http://www.sane-project.org/man/sane-pixma.5.html\">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 "
@@ -844,13 +858,13 @@ msgstr ""
 "net/cgi-bin/mailman/listinfo/sane-devel\">lista de difusion</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 "Semblariá qu'aguèssetz un scanner 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)."
@@ -859,7 +873,7 @@ msgstr ""
 "website</a> (HP crompèt los afars d'impression 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 "Semblariá qu'aguèssetz un scanner HP."
 
@@ -867,7 +881,7 @@ msgstr "Semblariá qu'aguèssetz un scanner 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>."
@@ -876,12 +890,12 @@ msgstr ""
 "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 "Semblariá qu'aguèssetz un scanner 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>."
@@ -889,13 +903,13 @@ msgstr ""
 "Los pilòts son disponibles sul <a href=\"http://support.epson.com\">site 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."
-msgstr "Semblariá qu'aguèssetz un scanner Lexmark."
+#. Message to indicate a Lexmark scanner has been detected
+#: src/app-window.vala:1680
+msgid "You appear to have a Lexmark scanner."
+msgstr "Semblariá qu'aguèssetz un numerizador 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>."
@@ -904,103 +918,103 @@ msgstr ""
 "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 "Installar los pilòts"
 
 #. 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 còp installats, vos caldrà reaviar Simple Scan."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1707
+#: src/app-window.vala:1733
 msgid "Installing drivers…"
 msgstr "Installacion dels pilòts…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1715
+#: src/app-window.vala:1741
 msgid "Drivers installed successfully!"
 msgstr "Pilòts installats amb succès !"
 
 #. 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 "Impossible d’installar los pilòts (còdi 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 "Impossible d’installar los pilòts."
 
 #. 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] "Vos cal installar lo paquet %s."
 msgstr[1] "Vos cal installar los paquets %s."
 
-#: src/app-window.vala:1857
+#: src/app-window.vala:1884
 msgid "_Email"
 msgstr "_Corrièl"
 
-#: src/app-window.vala:1858
+#: src/app-window.vala:1885
 msgid "Pri_nt"
 msgstr "I_mprimir"
 
-#: src/app-window.vala:1859
+#: src/app-window.vala:1886
 msgctxt "menu"
 msgid "_Reorder Pages"
 msgstr "_Reorganizar las paginas"
 
-#: src/app-window.vala:1863
+#: src/app-window.vala:1890
 msgid "_Keyboard Shortcuts"
 msgstr "_Acorchis de clavièr"
 
-#: 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 "_A prepaus de Numerizador 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 _novèl"
 
 #. 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 ""
 "Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
 
 #. 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 "Pivotar la pagina cap a dreita (sens de las agulhas d'una mòstra)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1913
+#: src/app-window.vala:1940
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1931
+#: src/app-window.vala:1958
 msgid "Delete the selected page"
 msgstr "Suprimir la pagina seleccionada"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:2107
+#: src/app-window.vala:2134
 msgid "Cancel"
 msgstr "Anullar"
 
-#: 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 "Impossible d’encodar la pagina %i"
@@ -1051,24 +1065,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 "Cap de periferic de numerizacion pas disponible. Connectatz-ne un."
 
 #. Error displayed when cannot connect to scanner
-#: src/scanner.vala:927
+#: src/scanner.vala:931
 msgid "Unable to connect to scanner"
 msgstr "Impossible de se connectar al numerizador"
 
 #. 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 "Cargador de documents void"
 
 #. 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 "
@@ -1081,12 +1095,12 @@ msgstr ""
 "numerizant en qualitat nauta, la talha de la numerizacion es constrencha."
 
 #. Error display when unable to start scan
-#: src/scanner.vala:1378
+#: src/scanner.vala:1382
 msgid "Unable to start scan"
 msgstr "Impossible d'aviar la numerizacion"
 
 #. 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 "Error de comunicacion amb lo numerizador"
 
@@ -1118,7 +1132,7 @@ msgstr "Numerizacion en cors"
 #. Arguments and description for --help text
 #: src/simple-scan.vala:1957
 msgid "[DEVICE…] — Scanning utility"
-msgstr "[DEVICE…] - Aisina de numerizacion"
+msgstr "[DEVICE…] — Aisina de numerizacion"
 
 #. Text printed out when an unknown command-line argument provided
 #: src/simple-scan.vala:1968
@@ -1165,9 +1179,6 @@ msgstr ""
 #~ msgid "Print"
 #~ msgstr "Imprimir"
 
-#~ msgid "Preferences"
-#~ msgstr "Preferéncias"
-
 #~ msgid "Help"
 #~ msgstr "Ajuda"