Merge branch 'release/1.0.29'

INSTALL.linux

@@ -22,6 +22,8 @@ $ make install
          - libusb-1.0.0-dev or similar
          - libjpeg-dev or libjpeg8-dev or libjpeg-turbo-devel or turbojpeg-devel
          - libpng-dev or similar
+         - libcurl4-gnutls-dev or similar
+         - libxml2-dev or similar
 
 2.2. Get the latest SANE backend from git:
       You can download "daily git snapshot" from here:

NEWS

@@ -1,5 +1,41 @@
 <!-- -*- Mode: markdown -*- -->
 
+## New with 1.0.29 (upcoming release)
+
+### Backends
+
+- adds an `escl` backend (theoretically supporting *all* AirPrint
+  devices with a scan unit)
+- adds support for 23 new scanner models via existing backends
+- significantly changes `genesys` and `pixma` backends
+- fixes bugs in `canon_dr`, `fujitsu`, `hp3900`, `mustek_usb2`,
+  `plustek` and `xerox_mfp` backends
+- fixes *all* compiler warnings on Debian 10 (#120)
+- fixes portability issues for uClibc-ng and MacOS builds
+- adds support to record and replay USB I/O traffic
+- adds timestamps to debug logs
+
+### Frontends
+
+- fixes a 32-bit arithmetic overflow issue in `scanimage`
+
+### Documentation
+
+- updates translations for British English, Catalan, German,
+  Ukrainian, Valencian
+- adds `scangearmp2` external backend descriptions
+- updates `hpaio` and `utsushi` external backend descriptions
+- adds the `ChangeLogs/` directory to the source tarball (#103)
+
+### Build
+
+- additionally requires `libcurl` and `libxml2` to build the `escl`
+  backend
+- requires `libxml2` for USB I/O recording and replay functionality
+- re-enables pthread support for backends that use its API directly,
+  irrespective of the `pthread_t` type (#153)
+- moves the `genesys` and `pixma` backends to a directory of their own
+
 ## New with 1.0.28 (released 2019-07-31)
 
 ### Backends

po/ca.po

@@ -1,13 +1,13 @@
-# Copyright (C) 2018 The SANE developers
+# Copyright (C) 2018-2020 The SANE developers
 # This file is distributed under the same license as the sane-backends package.
 #
-# Antoni Bella Pérez <antonibella5@yahoo.com>, 2018.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2018, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: sane-backends 1.0.27git\n"
+"Project-Id-Version: sane-backends 1.0.29\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
 "POT-Creation-Date: 2020-01-12 07:09+0000\n"
-"PO-Revision-Date: 2018-09-10 00:37+0100\n"
+"PO-Revision-Date: 2020-01-17 11:40+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -15,7 +15,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: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 
 #: include/sane/saneopts.h:154
 #, no-c-format
@@ -416,7 +416,7 @@ msgid "Lamp off at exit"
 msgstr "Apaga la làmpada en sortir"
 
 #: include/sane/saneopts.h:245
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific device "
 "supports."
@@ -768,7 +768,7 @@ msgid "Analog gamma-correction for blue"
 msgstr "Correcció de la gamma analògica per al blau"
 
 #: include/sane/saneopts.h:415
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Warm up lamp before scanning"
 msgstr "Escalfament de la làmpada abans d'escanejar"
 
@@ -918,9 +918,9 @@ msgid "Operation not supported"
 msgstr "Operació no admesa"
 
 #: backend/sane_strstatus.c:65
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Operation was canceled"
-msgstr "L'operació ha estat cancel·lada"
+msgstr "S'ha cancel·lat l'operació"
 
 #: backend/sane_strstatus.c:68
 #, no-c-format
@@ -1013,7 +1013,7 @@ msgid "Only perform shading-correction"
 msgstr "Realitza només la correcció de les ombres"
 
 #: backend/artec_eplus48u.c:2956
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
 "The default values for gain, offset and exposure time, either built-in "
@@ -1045,7 +1045,7 @@ msgid "Duplex scan"
 msgstr "Escaneja a dues cares"
 
 #: backend/avision.h:783
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Duplex scan provides a scan of the front and back side of the document"
 msgstr ""
@@ -1219,9 +1219,9 @@ msgid "invalid bit IDENTIFY message"
 msgstr "Missatge «IDENTIFY» del bit no vàlid"
 
 #: backend/canon.c:460
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "option not correct"
-msgstr "L'opció no connectar"
+msgstr "Opció no correcta"
 
 #: backend/canon.c:474
 #, no-c-format
@@ -2170,22 +2170,22 @@ msgstr "Perfil CCT definit per l'usuari"
 #: backend/epsonds.c:750
 #, no-c-format
 msgid "Load"
-msgstr ""
+msgstr "Carrega"
 
 #: backend/epsonds.c:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Load a sheet in the ADF"
-msgstr "Expulsa el full de l'ADF"
+msgstr "Carrega un full a l'ADF"
 
 #: backend/epsonds.c:771
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ADF Skew Correction"
-msgstr "Sense correcció"
+msgstr "Correcció de la inclinació a l'ADF"
 
 #: backend/epsonds.c:773
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Enables ADF skew correction"
-msgstr "Inhabilita la correcció de la gamma"
+msgstr "Habilita la correcció de la inclinació a l'ADF"
 
 #: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
@@ -2979,7 +2979,7 @@ msgid "Top edge"
 msgstr "Vora superior"
 
 #: backend/fujitsu.c:4384
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Paper is pulled partly into ADF"
 msgstr "El paper s'ha retirat parcialment dins de l'ADF"
 
@@ -3263,7 +3263,7 @@ msgid "Extra button"
 msgstr "Botó extra"
 
 #: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Needs calibration"
 msgstr "Necessita calibratge"
 
@@ -3302,19 +3302,21 @@ msgid "Clear calibration cache"
 msgstr "Neteja la memòria cau del calibratge"
 
 #: backend/genesys/genesys.cpp:4476
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Force calibration"
-msgstr "Calibratge tosc"
+msgstr "Força el calibratge"
 
 #: backend/genesys/genesys.cpp:4477
 #, no-c-format
 msgid "Force calibration ignoring all and any calibration caches"
 msgstr ""
+"Força el calibratge ignorant-ho tot i qualsevol memòria cau del "
+"calibratge"
 
 #: backend/genesys/genesys.cpp:4487
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Ignore internal offsets"
-msgstr "Desplaçament del verd"
+msgstr "Ignora els desplaçaments interns"
 
 #: backend/genesys/genesys.cpp:4489
 #, no-c-format
@@ -3322,6 +3324,7 @@ msgid ""
 "Acquires the image including the internal calibration areas of the "
 "scanner"
 msgstr ""
+"Adquireix la imatge, incloses les àrees de calibratge intern de l'escàner"
 
 #: backend/genesys/genesys.h:79 backend/gt68xx.c:149 backend/ma1509.c:108
 #: backend/mustek.c:164 backend/snapscan-options.c:87 backend/umax.c:182
@@ -3330,9 +3333,9 @@ msgid "Transparency Adapter"
 msgstr "Adaptador de transparència"
 
 #: backend/genesys/genesys.h:80
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Transparency Adapter Infrared"
-msgstr "Adaptador de transparència"
+msgstr "Adaptador infraroig de transparència"
 
 #: backend/gt68xx.c:470
 #, no-c-format
@@ -3670,9 +3673,9 @@ msgid "Color Matrix"
 msgstr "Matriu de color"
 
 #: backend/hp-option.h:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Set the scanner's color matrix."
-msgstr "Estableix la matriu de color dels escàners."
+msgstr "Estableix la matriu de color de l'escàner."
 
 #: backend/hp-option.h:127
 #, no-c-format
@@ -3767,14 +3770,14 @@ msgid "Scanner model"
 msgstr "Model de l'escàner"
 
 #: backend/hp3900_sane.c:1408
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Allows one to test device behavior with other supported models"
 msgstr ""
 "Permet comprovar el comportament del dispositiu amb els altres models "
 "admesos"
 
 #: backend/hp3900_sane.c:1422
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Image colors will be inverted"
 msgstr "Els colors de la imatge seran invertits"
 
@@ -4012,34 +4015,36 @@ msgid "Get ID of last button pressed (read only)"
 msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
 
 #: backend/hp5590.c:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "LCD counter"
-msgstr "Comptador d'escaneigs"
+msgstr "Comptador LCD"
 
 #: backend/hp5590.c:122
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Get value of LCD counter (read only)"
-msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
+msgstr "Obtén el valor del comptador LCD (només lectura)"
 
 #: backend/hp5590.c:124
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Color LED indicator"
-msgstr "Color per a l'art lineal"
+msgstr "Indicador LED del color"
 
 #: backend/hp5590.c:125
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Get value of LED indicator (read only)"
-msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
+msgstr "Obtén el valor del comptador LED (només lectura)"
 
 #: backend/hp5590.c:127
 #, no-c-format
 msgid "Document available in ADF"
-msgstr ""
+msgstr "Document disponible a l'ADF"
 
 #: backend/hp5590.c:128
 #, no-c-format
 msgid "Get state of document-available indicator in ADF (read only)"
 msgstr ""
+"Obtén l'estat de l'indicador de document disponible a l'ADF (només "
+"lectura)"
 
 #: backend/hp5590.c:130
 #, no-c-format
@@ -4351,9 +4356,9 @@ msgid "crt"
 msgstr "CRT"
 
 #: backend/kvs1025_opt.c:229
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "linear"
-msgstr "Art lineal"
+msgstr "Lineal"
 
 #: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
@@ -4559,13 +4564,13 @@ msgstr ""
 "digital"
 
 #: backend/kvs20xx_opt.c:233
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length."
 msgstr ""
-"El mode control de la longitud és un mode on l'escàner llegirà fins a la "
-"longitud més curta del paper real o la longitud lògica del document."
+"El mode control de la longitud fa que l'escàner llegeixi la longitud més "
+"curta real del paper o la longitud lògica del document."
 
 #: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
 #: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
@@ -4595,14 +4600,14 @@ msgid "B4"
 msgstr "B4"
 
 #: backend/kvs40xx_opt.c:231
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "High sensitivity"
-msgstr "Alta sensibilitat"
+msgstr "Sensibilitat alta"
 
 #: backend/kvs40xx_opt.c:232
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Low sensitivity"
-msgstr "Baixa sensibilitat"
+msgstr "Sensibilitat baixa"
 
 #: backend/kvs40xx_opt.c:243
 #, no-c-format
@@ -4625,13 +4630,13 @@ msgid "Enhanced mode"
 msgstr "Mode millorat"
 
 #: backend/kvs40xx_opt.c:396
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length"
 msgstr ""
-"El mode control de la longitud és un mode on l'escàner llegirà fins a la "
-"longitud més curta del paper real o la longitud lògica del document."
+"El mode control de la longitud fa que l'escàner llegeixi la longitud més "
+"curta real del paper o la longitud lògica del document"
 
 #: backend/kvs40xx_opt.c:405
 #, no-c-format
@@ -4694,10 +4699,10 @@ msgid "JPEG compression"
 msgstr "Compressió del JPEG"
 
 #: backend/kvs40xx_opt.c:718
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "JPEG compression (your application must be able to uncompress)"
 msgstr ""
-"Compressió del JPEG (l'aplicació vostra l'haurà de poder descomprimir)"
+"Compressió del JPEG (la vostra aplicació haurà de poder descomprimir)"
 
 #: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
@@ -4730,12 +4735,12 @@ msgid "Skew adjustment"
 msgstr "Ajustament de la inclinació"
 
 #: backend/kvs40xx_opt.c:808
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Stop scanner if a sheet is skewed"
 msgstr "Atura l'escàner quan un paper estigui inclinat"
 
 #: backend/kvs40xx_opt.c:809
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will stop if a sheet is skewed"
 msgstr "S'aturarà l'escàner quan un paper estigui inclinat"
 
@@ -4745,15 +4750,15 @@ msgid "Crop actual image area"
 msgstr "Escapça una àrea de la imatge real"
 
 #: backend/kvs40xx_opt.c:817
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will automatically detect image area and crop to it"
 msgstr ""
 "L'escàner detectarà automàticament l'àrea de la imatge i l'escapçarà"
 
 #: backend/kvs40xx_opt.c:827
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Left/right mirror image"
-msgstr "Emmiralla la imatge"
+msgstr "Emmiralla la imatge d'esquerra/dreta"
 
 #: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
@@ -5445,7 +5450,7 @@ msgstr ""
 "d'insistir en el temps d'escalfament de 40 segons."
 
 #: backend/p5.c:1926
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Need calibration"
 msgstr "Necessita calibratge"
 
@@ -5526,12 +5531,12 @@ msgid "ADF Waiting Time"
 msgstr "Temps d'espera per a l'ADF"
 
 #: backend/pixma/pixma_sane_options.c:349
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "When set, the scanner waits upto the specified time in seconds for a new "
 "document inserted into the automatic document feeder."
 msgstr ""
-"Quan s'estableix, l'escàner cerca el temps d'espera en segons perquè "
+"Quan s'estableix, l'escàner espera el temps especificat en segons perquè "
 "s'insereixi un document nou a l'alimentador automàtic de documents."
 
 #: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
@@ -6058,12 +6063,12 @@ msgid "Focus point"
 msgstr "Punt d'enfocament"
 
 #: backend/snapscan-options.c:930
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Color lines per read"
 msgstr "Línies de color per a la lectura"
 
 #: backend/snapscan-options.c:942
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Grayscale lines per read"
 msgstr "Línies en escala de grisos per a la lectura"
 

po/ca@valencia.po

@@ -1,13 +1,13 @@
-# Copyright (C) 2018 The SANE developers
+# Copyright (C) 2018-2020 The SANE developers
 # This file is distributed under the same license as the sane-backends package.
 #
-# Antoni Bella Pérez <antonibella5@yahoo.com>, 2018.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2018, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: sane-backends 1.0.27git\n"
+"Project-Id-Version: sane-backends 1.0.29\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
 "POT-Creation-Date: 2020-01-12 07:09+0000\n"
-"PO-Revision-Date: 2018-09-10 00:37+0100\n"
+"PO-Revision-Date: 2020-01-17 11:40+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -15,7 +15,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: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 
 #: include/sane/saneopts.h:154
 #, no-c-format
@@ -416,7 +416,7 @@ msgid "Lamp off at exit"
 msgstr "Apaga la làmpada en eixir"
 
 #: include/sane/saneopts.h:245
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific device "
 "supports."
@@ -768,7 +768,7 @@ msgid "Analog gamma-correction for blue"
 msgstr "Correcció de la gamma analògica per al blau"
 
 #: include/sane/saneopts.h:415
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Warm up lamp before scanning"
 msgstr "Escalfament de la làmpada abans d'escanejar"
 
@@ -918,9 +918,9 @@ msgid "Operation not supported"
 msgstr "Operació no admesa"
 
 #: backend/sane_strstatus.c:65
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Operation was canceled"
-msgstr "L'operació ha estat cancel·lada"
+msgstr "S'ha cancel·lat l'operació"
 
 #: backend/sane_strstatus.c:68
 #, no-c-format
@@ -1013,7 +1013,7 @@ msgid "Only perform shading-correction"
 msgstr "Realitza només la correcció de les ombres"
 
 #: backend/artec_eplus48u.c:2956
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
 "The default values for gain, offset and exposure time, either built-in "
@@ -1045,7 +1045,7 @@ msgid "Duplex scan"
 msgstr "Escaneja a dues cares"
 
 #: backend/avision.h:783
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Duplex scan provides a scan of the front and back side of the document"
 msgstr ""
@@ -1219,9 +1219,9 @@ msgid "invalid bit IDENTIFY message"
 msgstr "Missatge «IDENTIFY» del bit no vàlid"
 
 #: backend/canon.c:460
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "option not correct"
-msgstr "L'opció no connectar"
+msgstr "Opció no correcta"
 
 #: backend/canon.c:474
 #, no-c-format
@@ -2170,22 +2170,22 @@ msgstr "Perfil CCT definit per l'usuari"
 #: backend/epsonds.c:750
 #, no-c-format
 msgid "Load"
-msgstr ""
+msgstr "Carrega"
 
 #: backend/epsonds.c:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Load a sheet in the ADF"
-msgstr "Expulsa el full de l'ADF"
+msgstr "Carrega un full a l'ADF"
 
 #: backend/epsonds.c:771
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ADF Skew Correction"
-msgstr "Sense correcció"
+msgstr "Correcció de la inclinació a l'ADF"
 
 #: backend/epsonds.c:773
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Enables ADF skew correction"
-msgstr "Inhabilita la correcció de la gamma"
+msgstr "Habilita la correcció de la inclinació a l'ADF"
 
 #: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
@@ -2979,7 +2979,7 @@ msgid "Top edge"
 msgstr "Vora superior"
 
 #: backend/fujitsu.c:4384
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Paper is pulled partly into ADF"
 msgstr "El paper s'ha retirat parcialment dins de l'ADF"
 
@@ -3263,7 +3263,7 @@ msgid "Extra button"
 msgstr "Botó extra"
 
 #: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Needs calibration"
 msgstr "Necessita calibratge"
 
@@ -3302,19 +3302,21 @@ msgid "Clear calibration cache"
 msgstr "Neteja la memòria cau del calibratge"
 
 #: backend/genesys/genesys.cpp:4476
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Force calibration"
-msgstr "Calibratge tosc"
+msgstr "Força el calibratge"
 
 #: backend/genesys/genesys.cpp:4477
 #, no-c-format
 msgid "Force calibration ignoring all and any calibration caches"
 msgstr ""
+"Força el calibratge ignorant-ho tot i qualsevol memòria cau del "
+"calibratge"
 
 #: backend/genesys/genesys.cpp:4487
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Ignore internal offsets"
-msgstr "Desplaçament del verd"
+msgstr "Ignora els desplaçaments interns"
 
 #: backend/genesys/genesys.cpp:4489
 #, no-c-format
@@ -3322,6 +3324,7 @@ msgid ""
 "Acquires the image including the internal calibration areas of the "
 "scanner"
 msgstr ""
+"Adquireix la imatge, incloses les àrees de calibratge intern de l'escàner"
 
 #: backend/genesys/genesys.h:79 backend/gt68xx.c:149 backend/ma1509.c:108
 #: backend/mustek.c:164 backend/snapscan-options.c:87 backend/umax.c:182
@@ -3330,9 +3333,9 @@ msgid "Transparency Adapter"
 msgstr "Adaptador de transparència"
 
 #: backend/genesys/genesys.h:80
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Transparency Adapter Infrared"
-msgstr "Adaptador de transparència"
+msgstr "Adaptador infraroig de transparència"
 
 #: backend/gt68xx.c:470
 #, no-c-format
@@ -3670,9 +3673,9 @@ msgid "Color Matrix"
 msgstr "Matriu de color"
 
 #: backend/hp-option.h:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Set the scanner's color matrix."
-msgstr "Estableix la matriu de color dels escàners."
+msgstr "Estableix la matriu de color de l'escàner."
 
 #: backend/hp-option.h:127
 #, no-c-format
@@ -3767,14 +3770,14 @@ msgid "Scanner model"
 msgstr "Model de l'escàner"
 
 #: backend/hp3900_sane.c:1408
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Allows one to test device behavior with other supported models"
 msgstr ""
 "Permet comprovar el comportament del dispositiu amb els altres models "
 "admesos"
 
 #: backend/hp3900_sane.c:1422
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Image colors will be inverted"
 msgstr "Els colors de la imatge seran invertits"
 
@@ -4012,34 +4015,36 @@ msgid "Get ID of last button pressed (read only)"
 msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
 
 #: backend/hp5590.c:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "LCD counter"
-msgstr "Comptador d'escaneigs"
+msgstr "Comptador LCD"
 
 #: backend/hp5590.c:122
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Get value of LCD counter (read only)"
-msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
+msgstr "Obtén el valor del comptador LCD (només lectura)"
 
 #: backend/hp5590.c:124
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Color LED indicator"
-msgstr "Color per a l'art lineal"
+msgstr "Indicador LED del color"
 
 #: backend/hp5590.c:125
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Get value of LED indicator (read only)"
-msgstr "Obtén l'ID de l'últim botó premut (només lectura)"
+msgstr "Obtén el valor del comptador LED (només lectura)"
 
 #: backend/hp5590.c:127
 #, no-c-format
 msgid "Document available in ADF"
-msgstr ""
+msgstr "Document disponible a l'ADF"
 
 #: backend/hp5590.c:128
 #, no-c-format
 msgid "Get state of document-available indicator in ADF (read only)"
 msgstr ""
+"Obtén l'estat de l'indicador de document disponible a l'ADF (només "
+"lectura)"
 
 #: backend/hp5590.c:130
 #, no-c-format
@@ -4351,9 +4356,9 @@ msgid "crt"
 msgstr "CRT"
 
 #: backend/kvs1025_opt.c:229
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "linear"
-msgstr "Art lineal"
+msgstr "Lineal"
 
 #: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
@@ -4559,13 +4564,13 @@ msgstr ""
 "digital"
 
 #: backend/kvs20xx_opt.c:233
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length."
 msgstr ""
-"El mode control de la longitud és un mode on l'escàner llegirà fins a la "
-"longitud més curta del paper real o la longitud lògica del document."
+"El mode control de la longitud fa que l'escàner llija la longitud més "
+"curta real del paper o la longitud lògica del document."
 
 #: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
 #: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
@@ -4595,14 +4600,14 @@ msgid "B4"
 msgstr "B4"
 
 #: backend/kvs40xx_opt.c:231
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "High sensitivity"
-msgstr "Alta sensibilitat"
+msgstr "Sensibilitat alta"
 
 #: backend/kvs40xx_opt.c:232
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Low sensitivity"
-msgstr "Baixa sensibilitat"
+msgstr "Sensibilitat baixa"
 
 #: backend/kvs40xx_opt.c:243
 #, no-c-format
@@ -4625,13 +4630,13 @@ msgid "Enhanced mode"
 msgstr "Mode millorat"
 
 #: backend/kvs40xx_opt.c:396
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length"
 msgstr ""
-"El mode control de la longitud és un mode on l'escàner llegirà fins a la "
-"longitud més curta del paper real o la longitud lògica del document."
+"El mode control de la longitud fa que l'escàner llija la longitud més "
+"curta real del paper o la longitud lògica del document"
 
 #: backend/kvs40xx_opt.c:405
 #, no-c-format
@@ -4694,10 +4699,10 @@ msgid "JPEG compression"
 msgstr "Compressió del JPEG"
 
 #: backend/kvs40xx_opt.c:718
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "JPEG compression (your application must be able to uncompress)"
 msgstr ""
-"Compressió del JPEG (l'aplicació vostra l'haurà de poder descomprimir)"
+"Compressió del JPEG (la vostra aplicació haurà de poder descomprimir)"
 
 #: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
@@ -4730,12 +4735,12 @@ msgid "Skew adjustment"
 msgstr "Ajustament de la inclinació"
 
 #: backend/kvs40xx_opt.c:808
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Stop scanner if a sheet is skewed"
 msgstr "Atura l'escàner quan un paper estiga inclinat"
 
 #: backend/kvs40xx_opt.c:809
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will stop if a sheet is skewed"
 msgstr "S'aturarà l'escàner quan un paper estiga inclinat"
 
@@ -4745,15 +4750,15 @@ msgid "Crop actual image area"
 msgstr "Escapça una àrea de la imatge real"
 
 #: backend/kvs40xx_opt.c:817
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will automatically detect image area and crop to it"
 msgstr ""
 "L'escàner detectarà automàticament l'àrea de la imatge i l'escapçarà"
 
 #: backend/kvs40xx_opt.c:827
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Left/right mirror image"
-msgstr "Emmiralla la imatge"
+msgstr "Emmiralla la imatge d'esquerra/dreta"
 
 #: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
@@ -5444,7 +5449,7 @@ msgstr ""
 "d'insistir en el temps d'escalfament de 40 segons."
 
 #: backend/p5.c:1926
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Need calibration"
 msgstr "Necessita calibratge"
 
@@ -5525,12 +5530,12 @@ msgid "ADF Waiting Time"
 msgstr "Temps d'espera per a l'ADF"
 
 #: backend/pixma/pixma_sane_options.c:349
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "When set, the scanner waits upto the specified time in seconds for a new "
 "document inserted into the automatic document feeder."
 msgstr ""
-"Quan s'estableix, l'escàner cerca el temps d'espera en segons perquè "
+"Quan s'estableix, l'escàner espera el temps especificat en segons perquè "
 "s'inserisca un document nou a l'alimentador automàtic de documents."
 
 #: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
@@ -6057,12 +6062,12 @@ msgid "Focus point"
 msgstr "Punt d'enfocament"
 
 #: backend/snapscan-options.c:930
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Color lines per read"
 msgstr "Línies de color per a la lectura"
 
 #: backend/snapscan-options.c:942
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Grayscale lines per read"
 msgstr "Línies en escala de grisos per a la lectura"
 

po/de.po

@@ -12,11 +12,11 @@
 # Rolf Bensch <rolf at bensch hyphen online dot de>, 2012-2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: sane-backends\n"
+"Project-Id-Version: sane-backends 1.0.29\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
 "POT-Creation-Date: 2020-01-12 07:09+0000\n"
-"PO-Revision-Date: 2019-08-09 20:08+0200\n"
-"Last-Translator: Rolf Bensch <rolf@bensch-online.de>\n"
+"PO-Revision-Date: 2020-01-26 16:29+0900\n"
+"Last-Translator: Ulf Zibis <Ulf.Zibis@CoSoCo.de>\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -2157,22 +2157,22 @@ msgstr "Benutzerdefiniertes CCT-Profil"
 #: backend/epsonds.c:750
 #, no-c-format
 msgid "Load"
-msgstr ""
+msgstr "Lade"
 
 #: backend/epsonds.c:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Load a sheet in the ADF"
-msgstr "Wirft das Blatt aus dem automatischen Dokumenteneinzug aus"
+msgstr "Lade ein Blatt im automatischen Dokumenteneinzug"
 
 #: backend/epsonds.c:771
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ADF Skew Correction"
-msgstr "Keine Korrektur"
+msgstr "ADF-Schräglaufkorrektur"
 
 #: backend/epsonds.c:773
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Enables ADF skew correction"
-msgstr "Gammakorrektur abschalten"
+msgstr "aktiviert ADF-Schräglaufkorrektur"
 
 #: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
@@ -3216,7 +3216,7 @@ msgstr "Zusatztaste"
 #: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
 #, no-c-format
 msgid "Needs calibration"
-msgstr "Benötigt Kalibirierung"
+msgstr "Benötigt Kalibrierung"
 
 #: backend/genesys/genesys.cpp:4431 backend/gt68xx.c:756 backend/p5.c:1928
 #, no-c-format
@@ -3282,9 +3282,9 @@ msgid "Transparency Adapter"
 msgstr "Durchlichteinheit"
 
 #: backend/genesys/genesys.h:80
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Transparency Adapter Infrared"
-msgstr "Durchlichteinheit"
+msgstr "Infrarot-Durchlichteinheit"
 
 #: backend/gt68xx.c:470
 #, no-c-format
@@ -5368,9 +5368,9 @@ msgstr ""
 "40 Sekunden zu warten."
 
 #: backend/p5.c:1926
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Need calibration"
-msgstr "Benötigt Kalibirierung"
+msgstr "Benötigt Kalibrierung"
 
 #: backend/pixma/pixma.c:397
 #, no-c-format

po/en_GB.po

@@ -4,10 +4,10 @@
 # Andrew Coles <andrew_coles@yahoo.co.uk>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: sane-backends 1.0.29\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
 "POT-Creation-Date: 2020-01-12 07:09+0000\n"
-"PO-Revision-Date: 2019-08-05 18:15-0700\n"
+"PO-Revision-Date: 2020-01-26 16:27+0900\n"
 "Last-Translator: Ralph Little <littlesincanada@yahoo.co.uk>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -416,12 +416,12 @@ msgid "Lamp off at exit"
 msgstr "Lamp off at exit"
 
 #: include/sane/saneopts.h:245
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Read-only option that specifies how many options a specific device "
 "supports."
 msgstr ""
-"Read-only option that specifies how many options a specific devices "
+"Read-only option that specifies how many options a specific device "
 "supports."
 
 #: include/sane/saneopts.h:248
@@ -745,7 +745,7 @@ msgid "Analog gamma-correction for blue"
 msgstr "Analogue gamma-correction for blue"
 
 #: include/sane/saneopts.h:415
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Warm up lamp before scanning"
 msgstr "Warm up lamp before scanning"
 
@@ -895,7 +895,7 @@ msgid "Operation not supported"
 msgstr "Operation not supported"
 
 #: backend/sane_strstatus.c:65
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Operation was canceled"
 msgstr "Operation was cancelled"
 
@@ -989,7 +989,7 @@ msgid "Only perform shading-correction"
 msgstr "Only perform shading-correction"
 
 #: backend/artec_eplus48u.c:2956
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
 "The default values for gain, offset and exposure time, either built-in "
@@ -1020,7 +1020,7 @@ msgid "Duplex scan"
 msgstr "Duplex scan"
 
 #: backend/avision.h:783
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Duplex scan provides a scan of the front and back side of the document"
 msgstr ""
@@ -1190,9 +1190,8 @@ msgstr "medium not present"
 msgid "invalid bit IDENTIFY message"
 msgstr "invalid bit IDENTIFY message"
 
-# Check this text. Does it make sense?
 #: backend/canon.c:460
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "option not correct"
 msgstr "option not correct"
 
@@ -2124,22 +2123,22 @@ msgstr "User defined CCT profile"
 #: backend/epsonds.c:750
 #, no-c-format
 msgid "Load"
-msgstr ""
+msgstr "Load"
 
 #: backend/epsonds.c:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Load a sheet in the ADF"
-msgstr "Eject the sheet in the ADF"
+msgstr "Load a sheet in the ADF"
 
 #: backend/epsonds.c:771
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ADF Skew Correction"
-msgstr "No Correction"
+msgstr "ADF Skew Correction"
 
 #: backend/epsonds.c:773
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Enables ADF skew correction"
-msgstr "Disable gamma correction"
+msgstr "Enables ADF skew correction"
 
 #: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
@@ -2894,7 +2893,7 @@ msgid "Top edge"
 msgstr "Top edge"
 
 #: backend/fujitsu.c:4384
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Paper is pulled partly into ADF"
 msgstr "Paper is pulled partly into ADF"
 
@@ -3166,7 +3165,7 @@ msgid "Extra button"
 msgstr "Extra button"
 
 #: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Needs calibration"
 msgstr "Needs calibration"
 
@@ -3215,9 +3214,9 @@ msgid "Force calibration ignoring all and any calibration caches"
 msgstr "Force calibration ignoring all and any calibration caches"
 
 #: backend/genesys/genesys.cpp:4487
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Ignore internal offsets"
-msgstr "Green offset"
+msgstr "Ignore internal offsets"
 
 #: backend/genesys/genesys.cpp:4489
 #, no-c-format
@@ -3225,6 +3224,8 @@ msgid ""
 "Acquires the image including the internal calibration areas of the "
 "scanner"
 msgstr ""
+"Acquires the image including the internal calibration areas of the "
+"scanner"
 
 #: backend/genesys/genesys.h:79 backend/gt68xx.c:149 backend/ma1509.c:108
 #: backend/mustek.c:164 backend/snapscan-options.c:87 backend/umax.c:182
@@ -3233,9 +3234,9 @@ msgid "Transparency Adapter"
 msgstr "Transparency Adapter"
 
 #: backend/genesys/genesys.h:80
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Transparency Adapter Infrared"
-msgstr "Transparency Adapter"
+msgstr "Transparency Adapter Infrared"
 
 #: backend/gt68xx.c:470
 #, no-c-format
@@ -3564,7 +3565,7 @@ msgid "Color Matrix"
 msgstr "Colour Matrix"
 
 #: backend/hp-option.h:121
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Set the scanner's color matrix."
 msgstr "Set the scanner's colour matrix."
 
@@ -3660,12 +3661,12 @@ msgid "Scanner model"
 msgstr "Scanner model"
 
 #: backend/hp3900_sane.c:1408
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Allows one to test device behavior with other supported models"
 msgstr "Allows one to test device behaviour with other supported models"
 
 #: backend/hp3900_sane.c:1422
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Image colors will be inverted"
 msgstr "Image colours will be inverted"
 
@@ -4237,9 +4238,9 @@ msgid "crt"
 msgstr "crt"
 
 #: backend/kvs1025_opt.c:229
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "linear"
-msgstr "Lineart"
+msgstr "linear"
 
 #: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
@@ -4436,7 +4437,7 @@ msgid "Request driver to remove border from pages digitally"
 msgstr "Request driver to remove border from pages digitally"
 
 #: backend/kvs20xx_opt.c:233
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length."
@@ -4472,12 +4473,12 @@ msgid "B4"
 msgstr "B4"
 
 #: backend/kvs40xx_opt.c:231
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "High sensitivity"
 msgstr "High sensitivity"
 
 #: backend/kvs40xx_opt.c:232
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Low sensitivity"
 msgstr "Low sensitivity"
 
@@ -4502,13 +4503,13 @@ msgid "Enhanced mode"
 msgstr "Enhanced mode"
 
 #: backend/kvs40xx_opt.c:396
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Length Control Mode causes the scanner to read the shorter of either the "
 "length of the actual paper or logical document length"
 msgstr ""
 "Length Control Mode causes the scanner to read the shorter of either the "
-"length of the actual paper or logical document length."
+"length of the actual paper or logical document length"
 
 # The grammar is a bit suspect here.
 #: backend/kvs40xx_opt.c:405
@@ -4571,7 +4572,7 @@ msgid "JPEG compression"
 msgstr "JPEG compression"
 
 #: backend/kvs40xx_opt.c:718
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "JPEG compression (your application must be able to uncompress)"
 msgstr "JPEG compression (your application must be able to uncompress)"
 
@@ -4606,14 +4607,14 @@ msgid "Skew adjustment"
 msgstr "Skew adjustment"
 
 #: backend/kvs40xx_opt.c:808
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Stop scanner if a sheet is skewed"
 msgstr "Stop scanner if a sheet is skewed"
 
 #: backend/kvs40xx_opt.c:809
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will stop if a sheet is skewed"
-msgstr "Scanner will be stopped if sheet is skewed"
+msgstr "Scanner will stop if a sheet is skewed"
 
 #: backend/kvs40xx_opt.c:816
 #, no-c-format
@@ -4621,14 +4622,14 @@ msgid "Crop actual image area"
 msgstr "Crop actual image area"
 
 #: backend/kvs40xx_opt.c:817
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Scanner will automatically detect image area and crop to it"
-msgstr "Scanner automatically detects image area and crops it"
+msgstr "Scanner will automatically detect image area and crop to it"
 
 #: backend/kvs40xx_opt.c:827
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Left/right mirror image"
-msgstr "Mirror image"
+msgstr "Left/right mirror image"
 
 #: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
@@ -5298,8 +5299,9 @@ msgstr ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
 "40 seconds warm-up time."
 
+# Original would be better as "Needs calibration". "Need calibration" is a command rather than a statement of fact which is what is required here, as in "You must need calibration, or else"
 #: backend/p5.c:1926
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Need calibration"
 msgstr "Needs calibration"
 
@@ -5379,13 +5381,13 @@ msgid "ADF Waiting Time"
 msgstr "ADF Waiting Time"
 
 #: backend/pixma/pixma_sane_options.c:349
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "When set, the scanner waits upto the specified time in seconds for a new "
 "document inserted into the automatic document feeder."
 msgstr ""
-"When set, the scanner waits the specified time in seconds for a new "
-"document to be inserted into the automatic document feeder."
+"When set, the scanner waits upto the specified time in seconds for a new "
+"document inserted into the automatic document feeder."
 
 #: backend/plustek.c:235 backend/plustek_pp.c:204 backend/u12.c:156
 #, no-c-format
@@ -5906,12 +5908,12 @@ msgid "Focus point"
 msgstr "Focus point"
 
 #: backend/snapscan-options.c:930
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Color lines per read"
 msgstr "Colour lines per read"
 
 #: backend/snapscan-options.c:942
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Grayscale lines per read"
 msgstr "Greyscale lines per read"
 

po/uk.po

@@ -1,13 +1,13 @@
 # Copyright (C) 2009
 # This file is distributed under the same license as the sane-backends package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2019.
+# Yuri Chornoivan <yurchor@ukr.net>, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2019, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: sane-backends\n"
+"Project-Id-Version: sane-backends 1.0.29\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
 "POT-Creation-Date: 2020-01-12 07:09+0000\n"
-"PO-Revision-Date: 2019-12-02 16:41+0200\n"
+"PO-Revision-Date: 2020-01-26 16:30+0900\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "Language: uk\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 20.03.70\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&"
+" n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: include/sane/saneopts.h:154
 #, no-c-format
@@ -532,7 +532,8 @@ msgstr ""
 #: include/sane/saneopts.h:298
 #, no-c-format
 msgid "Sets the vertical resolution of the scanned image."
-msgstr "Визначає вертикальну роздільну здатність засканованого зображення."
+msgstr ""
+"Визначає вертикальну роздільну здатність засканованого зображення."
 
 #: include/sane/saneopts.h:301
 #, no-c-format
@@ -726,7 +727,8 @@ msgstr "Використовувати лінзу, яка подвоює опт
 #: include/sane/saneopts.h:401 include/sane/saneopts.h:413
 #, no-c-format
 msgid "In RGB-mode use same values for each color"
-msgstr "У режимі RGB використовувати однакові значення для кожного кольору"
+msgstr ""
+"У режимі RGB використовувати однакові значення для кожного кольору"
 
 #: include/sane/saneopts.h:403
 #, no-c-format
@@ -2147,22 +2149,22 @@ msgstr "Визначений користувачем профіль CCT"
 #: backend/epsonds.c:750
 #, no-c-format
 msgid "Load"
-msgstr ""
+msgstr "Завантажити"
 
 #: backend/epsonds.c:751
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Load a sheet in the ADF"
-msgstr "Виштовхнути аркуш з протяжного пристрою"
+msgstr "Завантажити аркуш до протяжного пристрою"
 
 #: backend/epsonds.c:771
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "ADF Skew Correction"
-msgstr "Без виправлення"
+msgstr "Виправлення нахилу у протяжному пристрої"
 
 #: backend/epsonds.c:773
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Enables ADF skew correction"
-msgstr "Вимкнути виправлення гами"
+msgstr "Вмикає виправлення нахилу у протяжному пристрої"
 
 #: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
@@ -2529,7 +2531,8 @@ msgstr "Дія ПП"
 #: backend/fujitsu.c:3657
 #, no-c-format
 msgid "Action following double feed error"
-msgstr "Дія, яку буде виконано у відповідь на помилку подвійного подавання"
+msgstr ""
+"Дія, яку буде виконано у відповідь на помилку подвійного подавання"
 
 #: backend/fujitsu.c:3673
 #, no-c-format
@@ -2651,7 +2654,8 @@ msgstr "Режим буферизації"
 
 #: backend/fujitsu.c:3885
 #, no-c-format
-msgid "Request scanner to read pages quickly from ADF into internal memory"
+msgid ""
+"Request scanner to read pages quickly from ADF into internal memory"
 msgstr ""
 "Наказати сканеру швидко читати сторінки з протяжного пристрою до "
 "внутрішньої пам’яті"
@@ -2664,7 +2668,8 @@ msgstr "Попереднє захоплення"
 #: backend/fujitsu.c:3905
 #, no-c-format
 msgid "Request scanner to grab next page from ADF"
-msgstr "Наказати сканеру захопити наступну сторінку із протяжного пристрою"
+msgstr ""
+"Наказати сканеру захопити наступну сторінку із протяжного пристрою"
 
 #: backend/fujitsu.c:3924
 #, no-c-format
@@ -3303,9 +3308,9 @@ msgid "Transparency Adapter"
 msgstr "Адаптер плівок"
 
 #: backend/genesys/genesys.h:80
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Transparency Adapter Infrared"
-msgstr "Адаптер плівок"
+msgstr "Адаптер плівок для інфрачервоного сканування"
 
 #: backend/gt68xx.c:470
 #, no-c-format
@@ -3696,7 +3701,8 @@ msgstr "8-бітовий вивід"
 
 #: backend/hp-option.h:158
 #, no-c-format
-msgid "Use bit depth greater eight internally, but output only eight bits."
+msgid ""
+"Use bit depth greater eight internally, but output only eight bits."
 msgstr ""
 "Для внутрішньої обробки використовувати глибини кольорів, більші за 8-"
 "бітові, але виводити дані лише у 8-бітовому форматі."
@@ -4664,7 +4670,8 @@ msgstr "Стискання JPEG"
 #: backend/kvs40xx_opt.c:718
 #, no-c-format
 msgid "JPEG compression (your application must be able to uncompress)"
-msgstr "Стискання JPEG (ваша програма повинна мати змогу розпакувати дані)"
+msgstr ""
+"Стискання JPEG (ваша програма повинна мати змогу розпакувати дані)"
 
 #: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
 #, no-c-format
@@ -5051,7 +5058,8 @@ msgstr "Скалярна гама синього"
 #: backend/microtek2.h:665
 #, no-c-format
 msgid "Selects a value for scalar gamma correction (blue channel)"
-msgstr "Визначає значення для скалярного виправлення гами (канал синього)."
+msgstr ""
+"Визначає значення для скалярного виправлення гами (канал синього)."
 
 #: backend/microtek2.h:669
 #, no-c-format
@@ -5318,7 +5326,8 @@ msgstr "Яскравість зеленого"
 
 #: backend/mustek.c:4457
 #, no-c-format
-msgid "Controls the brightness of the green channel of the acquired image."
+msgid ""
+"Controls the brightness of the green channel of the acquired image."
 msgstr "Керує яскравістю каналу зеленого у отриманому зображенні."
 
 #: backend/mustek.c:4469
@@ -5401,7 +5410,7 @@ msgstr ""
 "секундному розігріві."
 
 #: backend/p5.c:1926
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Need calibration"
 msgstr "Потребує калібрування"
 
@@ -6183,7 +6192,8 @@ msgstr "Границя читання"
 
 #: backend/test.c:485
 #, no-c-format
-msgid "Limit the amount of data transferred with each call to sane_read()."
+msgid ""
+"Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 "Обмежити об’єм даних, що передаються під час кожного виклику sane_read()."
 
@@ -6730,19 +6740,3 @@ msgstr "Визначає зсув каналу зеленого"
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Визначає зсув каналу синього"
-
-#~ msgid "Disable dynamic lineart"
-#~ msgstr "Вимкнути динамічне штрихування"
-
-#~ msgid ""
-#~ "Disable use of a software adaptive algorithm to generate lineart "
-#~ "relying instead on hardware lineart."
-#~ msgstr ""
-#~ "Вимкнути використання адаптивного програмного алгоритму для створення "
-#~ "штрихування замість апаратного алгоритму штрихування."
-
-#~ msgid "linier"
-#~ msgstr "лінійна"
-
-#~ msgid "It is right and left reversing"
-#~ msgstr "Перевертання ліворуч і праворуч"

testsuite/backend/genesys/minigtest.h

@@ -96,11 +96,11 @@ inline void check_raises_raised_unexpected(const char* function, const char* pat
 #define ASSERT_FALSE(x)  do { check_true(!bool(x), __func__, __FILE__, __LINE__); } \
                          while (false)
 
-#define ASSERT_RAISES(x, e) \
+#define ASSERT_RAISES(x, T) \
     do { try { \
         x; \
         check_raises_did_not_raise(__func__, __FILE__, __LINE__); \
-    } catch (e) { \
+    } catch (const T&) { \
         check_raises_success(__func__, __FILE__, __LINE__); \
     } catch (...) { \
         check_raises_raised_unexpected(__func__, __FILE__, __LINE__); \

testsuite/backend/genesys/session_config_test.cpp

@@ -30,7 +30,7 @@
 #include "../../../backend/genesys/test_settings.h"
 #include "../../../backend/genesys/test_scanner_interface.h"
 #include "../../../backend/genesys/utilities.h"
-#include "../../include/sane/saneopts.h"
+#include "../../../include/sane/saneopts.h"
 #include "sys/stat.h"
 #include <cstdio>
 #include <cstring>