Update upstream source from tag 'upstream/1.0.29'

Update to upstream version '1.0.29'
with Debian dir 2d358af604988ebe4348e38096245d66036fe5ed

1 files changed, 786 insertions, 733 deletions

diff --git a/po/fi.po b/po/fi.po
index c314712..27117bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.11\n"
 "Report-Msgid-Bugs-To: sane-devel@alioth-lists.debian.net\n"
-"POT-Creation-Date: 2019-07-23 12:14+0000\n"
+"POT-Creation-Date: 2020-01-12 07:09+0000\n"
 "PO-Revision-Date: 2007-12-17 23:00+0100\n"
 "Last-Translator: Harri Järvi <harri.jarvi@tut.fi>\n"
 "Language-Team: Debian l10n Finnish <debian-l10n-finnish@lists.debian."
@@ -27,31 +27,31 @@ msgid "Standard"
 msgstr ""
 
 #: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
-#: backend/epson.c:3298 backend/epson2.c:1290 backend/genesys.cc:5294
-#: backend/gt68xx.c:696 backend/hp3500.c:1019 backend/hp-option.c:3300
-#: backend/kvs1025_opt.c:639 backend/kvs20xx_opt.c:285
-#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
-#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
-#: backend/mustek.c:4373 backend/mustek_usb.c:301 backend/mustek_usb2.c:465
-#: backend/pixma_sane_options.c:160 backend/plustek.c:808
-#: backend/plustek_pp.c:747 backend/sceptre.c:702
+#: backend/epson.c:3298 backend/epson2.c:1290 backend/epsonds.c:677
+#: backend/genesys/genesys.cpp:4034 backend/gt68xx.c:696
+#: backend/hp-option.c:3300 backend/hp3500.c:1019 backend/kvs1025_opt.c:639
+#: backend/kvs20xx_opt.c:285 backend/kvs40xx_opt.c:506 backend/leo.c:823
+#: backend/lexmark.c:199 backend/ma1509.c:551 backend/matsushita.c:1135
+#: backend/microtek2.h:599 backend/mustek.c:4373 backend/mustek_usb.c:301
+#: backend/mustek_usb2.c:465 backend/pixma/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:702
 #: backend/snapscan-options.c:550 backend/teco1.c:1095 backend/teco2.c:1910
 #: backend/teco3.c:920 backend/test.c:647 backend/u12.c:546
-#: backend/umax.c:5176 backend/umax_pp.c:580
+#: backend/umax.c:5176 backend/umax_pp.c:570
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
 #: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
-#: backend/canon.c:1493 backend/genesys.cc:5354 backend/gt68xx.c:665
-#: backend/hp-option.c:2956 backend/kvs1025_opt.c:703 backend/leo.c:871
-#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
-#: backend/mustek.c:4421 backend/mustek_usb.c:349 backend/mustek_usb2.c:431
-#: backend/niash.c:754 backend/plustek.c:854 backend/plustek_pp.c:793
-#: backend/sceptre.c:750 backend/snapscan-options.c:617
-#: backend/stv680.c:1067 backend/teco1.c:1143 backend/teco2.c:1958
-#: backend/teco3.c:968 backend/u12.c:592 backend/umax.c:5226
-#: backend/umax_pp.c:629
+#: backend/canon.c:1493 backend/genesys/genesys.cpp:4077
+#: backend/gt68xx.c:665 backend/hp-option.c:2956 backend/kvs1025_opt.c:703
+#: backend/leo.c:871 backend/ma1509.c:599 backend/matsushita.c:1189
+#: backend/microtek2.h:600 backend/mustek.c:4421 backend/mustek_usb.c:349
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:750
+#: backend/snapscan-options.c:617 backend/stv680.c:1067
+#: backend/teco1.c:1143 backend/teco2.c:1958 backend/teco3.c:968
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:619
 #, no-c-format
 msgid "Enhancement"
 msgstr "Parannus"
@@ -85,7 +85,7 @@ msgid "Bit depth"
 msgstr "Bittisyvyys"
 
 #: include/sane/saneopts.h:165 backend/canon.c:1140 backend/leo.c:781
-#: backend/pixma_sane_options.c:47
+#: backend/pixma/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Lukutapa"
@@ -126,7 +126,7 @@ msgid "Bottom-right y"
 msgstr "Oikea alakulma y"
 
 #: include/sane/saneopts.h:173 backend/canon.c:1216
-#: backend/pixma_sane_options.c:300
+#: backend/pixma/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "Kuvanluvun tarkkuus"
@@ -281,7 +281,7 @@ msgstr "Tiedostonimi"
 msgid "Halftone pattern size"
 msgstr "Rasterikuvion koko"
 
-#: include/sane/saneopts.h:204 backend/fujitsu.c:3233
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3237
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Rasterikuvio"
@@ -291,10 +291,10 @@ msgstr "Rasterikuvio"
 msgid "Bind X and Y resolution"
 msgstr "Sido X- ja Y-tarkkuus"
 
-#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
-#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
-#: backend/hp-option.c:3238 backend/mustek_usb2.c:121 backend/plustek.c:236
-#: backend/plustek_pp.c:205 backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp-option.c:3238
+#: backend/hp3900_sane.c:428 backend/hp3900_sane.c:1021
+#: backend/hp3900_sane.c:1421 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr "Negatiivi"
@@ -415,9 +415,9 @@ msgid "Lamp off at exit"
 msgstr "Valo pois lopetettaessa"
 
 #: include/sane/saneopts.h:245
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Read-only option that specifies how many options a specific devices "
+"Read-only option that specifies how many options a specific device "
 "supports."
 msgstr "Asetus, joka määrää kuinka monta asetusta tietty laite tukee."
 
@@ -741,8 +741,8 @@ msgid "Analog gamma-correction for blue"
 msgstr "Analoginen gamma-korjaus siniselle"
 
 #: include/sane/saneopts.h:415
-#, no-c-format
-msgid "Warmup lamp before scanning"
+#, fuzzy, no-c-format
+msgid "Warm up lamp before scanning"
 msgstr "Lämmitä lamppu ennen kuvanlukua"
 
 #: include/sane/saneopts.h:417
@@ -892,7 +892,7 @@ msgstr "Rasterointi ei ole tuettu"
 
 #: backend/sane_strstatus.c:65
 #, no-c-format
-msgid "Operation was cancelled"
+msgid "Operation was canceled"
 msgstr ""
 
 #: backend/sane_strstatus.c:68
@@ -985,10 +985,10 @@ msgid "Only perform shading-correction"
 msgstr "Vain sävykorjaus"
 
 #: backend/artec_eplus48u.c:2956
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If enabled, only the shading correction is performed during calibration. "
-"The default values for gain, offset and exposure time, either build-in "
+"The default values for gain, offset and exposure time, either built-in "
 "or from the configuration file, are used."
 msgstr ""
 "Jos asetus on päällä, kalibroinnissa suoritetaan vain sävykorjaus. "
@@ -1018,80 +1018,40 @@ msgstr "Kaksipuolinen"
 #: backend/avision.h:783
 #, no-c-format
 msgid ""
-"Duplex scan provide a scan of the front and back side of the document"
+"Duplex scan provides a scan of the front and back side of the document"
 msgstr ""
 
-#: backend/canon630u.c:159
+#: backend/canon-sane.c:674 backend/canon.c:171
 #, no-c-format
-msgid "Calibrate Scanner"
-msgstr "Kalibroi kuvanlukija"
-
-#: backend/canon630u.c:160
-#, no-c-format
-msgid "Force scanner calibration before scan"
-msgstr "Pakottaa kalibroinnin ennen kuvanlukua."
-
-#: backend/canon630u.c:259 backend/umax1220u.c:208
-#, no-c-format
-msgid "Grayscale scan"
-msgstr "Harmaasävy"
-
-#: backend/canon630u.c:260 backend/umax1220u.c:209
-#, no-c-format
-msgid "Do a grayscale rather than color scan"
-msgstr "Lue harmaasävykuva värikuvan sijaan"
-
-#: backend/canon630u.c:306
-#, no-c-format
-msgid "Analog Gain"
-msgstr "Analoginen vahvistus"
-
-#: backend/canon630u.c:307
-#, no-c-format
-msgid "Increase or decrease the analog gain of the CCD array"
-msgstr "Kasvattaa tai vähentää analogista vahvistusta CCD-kennossa."
-
-#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
-#, no-c-format
-msgid "Gamma Correction"
-msgstr "Gamma-korjaus"
-
-#: backend/canon630u.c:348
-#, no-c-format
-msgid "Selects the gamma corrected transfer curve"
-msgstr "Valitsee gamma-korjauskäyrän"
+msgid "Correction according to transparency ratio"
+msgstr ""
 
-#: backend/canon.c:149 backend/canon-sane.c:1318
+#: backend/canon-sane.c:680 backend/canon.c:170
 #, no-c-format
-msgid "Raw"
+msgid "Correction according to film type"
 msgstr ""
 
-#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:732 backend/canon-sane.c:940
 #: backend/canon-sane.c:1076 backend/canon-sane.c:1314
-#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643 backend/canon.c:157
 #, no-c-format
 msgid "Fine color"
 msgstr ""
 
-#: backend/canon.c:169
+#: backend/canon-sane.c:776 backend/canon.c:176
 #, fuzzy, no-c-format
-msgid "No transparency correction"
-msgstr "Värikorjaus"
-
-#: backend/canon.c:170 backend/canon-sane.c:680
-#, no-c-format
-msgid "Correction according to film type"
-msgstr ""
+msgid "Negatives"
+msgstr "Negatiivi"
 
-#: backend/canon.c:171 backend/canon-sane.c:674
+#: backend/canon-sane.c:1318 backend/canon.c:149
 #, no-c-format
-msgid "Correction according to transparency ratio"
+msgid "Raw"
 msgstr ""
 
-#: backend/canon.c:176 backend/canon-sane.c:776
+#: backend/canon.c:169
 #, fuzzy, no-c-format
-msgid "Negatives"
-msgstr "Negatiivi"
+msgid "No transparency correction"
+msgstr "Värikorjaus"
 
 #: backend/canon.c:176
 #, fuzzy, no-c-format
@@ -1226,9 +1186,9 @@ msgid "invalid bit IDENTIFY message"
 msgstr ""
 
 #: backend/canon.c:460
-#, no-c-format
-msgid "option not connect"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "option not correct"
+msgstr "Rasterointi ei ole tuettu"
 
 #: backend/canon.c:474
 #, no-c-format
@@ -1515,133 +1475,184 @@ msgstr "Filmin tyyppi"
 msgid "Select the film type"
 msgstr "Valitsee rasterin"
 
-#: backend/canon_dr.c:411 backend/epjitsu.c:233 backend/epson.c:501
-#: backend/epson2.c:115 backend/fujitsu.c:675 backend/gt68xx.c:148
+#: backend/canon630u.c:159
+#, no-c-format
+msgid "Calibrate Scanner"
+msgstr "Kalibroi kuvanlukija"
+
+#: backend/canon630u.c:160
+#, no-c-format
+msgid "Force scanner calibration before scan"
+msgstr "Pakottaa kalibroinnin ennen kuvanlukua."
+
+#: backend/canon630u.c:259 backend/umax1220u.c:208
+#, no-c-format
+msgid "Grayscale scan"
+msgstr "Harmaasävy"
+
+#: backend/canon630u.c:260 backend/umax1220u.c:209
+#, no-c-format
+msgid "Do a grayscale rather than color scan"
+msgstr "Lue harmaasävykuva värikuvan sijaan"
+
+#: backend/canon630u.c:306
+#, no-c-format
+msgid "Analog Gain"
+msgstr "Analoginen vahvistus"
+
+#: backend/canon630u.c:307
+#, no-c-format
+msgid "Increase or decrease the analog gain of the CCD array"
+msgstr "Kasvattaa tai vähentää analogista vahvistusta CCD-kennossa."
+
+#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
+#, no-c-format
+msgid "Gamma Correction"
+msgstr "Gamma-korjaus"
+
+#: backend/canon630u.c:348
+#, no-c-format
+msgid "Selects the gamma corrected transfer curve"
+msgstr "Valitsee gamma-korjauskäyrän"
+
+#: backend/canon_dr.c:413 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2-ops.c:101 backend/epson2.c:115 backend/epsonds-ops.c:32
+#: backend/epsonds.c:95 backend/epsonds.h:62 backend/fujitsu.c:677
+#: backend/genesys/genesys.h:78 backend/gt68xx.c:148
 #: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
-#: backend/hp3900_sane.c:1017 backend/hp5590.c:92 backend/ma1509.c:108
-#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
-#: backend/mustek.c:164 backend/pixma.c:920 backend/pixma_sane_options.c:92
-#: backend/snapscan-options.c:86 backend/test.c:192 backend/umax.c:181
+#: backend/hp3900_sane.c:1017 backend/hp5590.c:92 backend/kodakaio.c:617
+#: backend/ma1509.c:108 backend/magicolor.c:181 backend/mustek.c:156
+#: backend/mustek.c:160 backend/mustek.c:164 backend/pixma/pixma.c:920
+#: backend/pixma/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:192 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr "Taso"
 
-#: backend/canon_dr.c:412 backend/epjitsu.c:234 backend/fujitsu.c:676
+#: backend/canon_dr.c:414 backend/epjitsu.c:234 backend/fujitsu.c:678
 #: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: backend/canon_dr.c:413 backend/epjitsu.c:235 backend/fujitsu.c:677
+#: backend/canon_dr.c:415 backend/epjitsu.c:235 backend/fujitsu.c:679
 #: backend/kodak.c:141
 #, fuzzy, no-c-format
 msgid "ADF Back"
 msgstr "ADF"
 
-#: backend/canon_dr.c:414 backend/epjitsu.c:236 backend/fujitsu.c:678
-#: backend/hp5590.c:94 backend/kodak.c:142 backend/pixma.c:931
+#: backend/canon_dr.c:416 backend/epjitsu.c:236 backend/fujitsu.c:680
+#: backend/hp5590.c:94 backend/kodak.c:142 backend/pixma/pixma.c:931
 #, fuzzy, no-c-format
 msgid "ADF Duplex"
 msgstr "Kaksipuolinen"
 
-#: backend/canon_dr.c:415
+#: backend/canon_dr.c:417
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Tulosta"
 
-#: backend/canon_dr.c:416
+#: backend/canon_dr.c:418
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: backend/canon_dr.c:417
+#: backend/canon_dr.c:419
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Kaksipuolinen"
 
-#: backend/canon_dr.c:424 backend/epson.c:599 backend/epson.c:3096
-#: backend/epson2.c:201 backend/fujitsu.c:695 backend/genesys.cc:89
-#: backend/genesys.cc:96 backend/gt68xx_low.h:136 backend/hp-option.c:3096
+#: backend/canon_dr.c:426 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:697
+#: backend/genesys/genesys.cpp:120 backend/genesys/genesys.cpp:127
+#: backend/gt68xx_low.h:136 backend/hp-option.c:3096
 #, no-c-format
 msgid "Red"
 msgstr "Punainen"
 
-#: backend/canon_dr.c:425 backend/epson.c:600 backend/epson.c:3092
-#: backend/epson2.c:202 backend/fujitsu.c:696 backend/genesys.cc:90
-#: backend/genesys.cc:97 backend/gt68xx_low.h:137 backend/hp-option.c:3097
+#: backend/canon_dr.c:427 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:698
+#: backend/genesys/genesys.cpp:121 backend/genesys/genesys.cpp:128
+#: backend/gt68xx_low.h:137 backend/hp-option.c:3097
 #, no-c-format
 msgid "Green"
 msgstr "Vihreä"
 
-#: backend/canon_dr.c:426 backend/epson.c:601 backend/epson.c:3100
-#: backend/epson2.c:203 backend/fujitsu.c:697 backend/genesys.cc:91
-#: backend/genesys.cc:98 backend/gt68xx_low.h:138 backend/hp-option.c:3098
+#: backend/canon_dr.c:428 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:699
+#: backend/genesys/genesys.cpp:122 backend/genesys/genesys.cpp:129
+#: backend/gt68xx_low.h:138 backend/hp-option.c:3098
 #, no-c-format
 msgid "Blue"
 msgstr "Sininen"
 
-#: backend/canon_dr.c:427
+#: backend/canon_dr.c:429
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:428
+#: backend/canon_dr.c:430
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:429
+#: backend/canon_dr.c:431
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:431 backend/epson.c:556 backend/epson.c:564
+#: backend/canon_dr.c:433 backend/epson.c:556 backend/epson.c:564
 #: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
 #: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
-#: backend/epson2.c:214 backend/fujitsu.c:701 backend/genesys.cc:99
-#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
+#: backend/epson2.c:214 backend/fujitsu.c:703
+#: backend/genesys/genesys.cpp:130 backend/leo.c:109
+#: backend/matsushita.c:138 backend/matsushita.c:159
 #: backend/matsushita.c:191 backend/matsushita.c:213
 #: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr "Ei mikään"
 
-#: backend/canon_dr.c:432 backend/fujitsu.c:702
+#: backend/canon_dr.c:434 backend/fujitsu.c:704
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: backend/canon_dr.c:2477 backend/fujitsu.c:4113 backend/genesys.cc:5445
-#: backend/kvs1025_opt.c:910
+#: backend/canon_dr.c:2479 backend/fujitsu.c:4117
+#: backend/genesys/genesys.cpp:4168 backend/kvs1025_opt.c:910
 #, no-c-format
 msgid "Software blank skip percentage"
 msgstr ""
 
-#: backend/canon_dr.c:2478 backend/fujitsu.c:4114
+#: backend/canon_dr.c:2480 backend/fujitsu.c:4118
 #, no-c-format
 msgid "Request driver to discard pages with low percentage of dark pixels"
 msgstr ""
 
-#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
+#: backend/epson.c:491 backend/epson2.c:108 backend/epsonds.c:88
+#: backend/kodakaio.c:611 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr "Yksipuolinen"
 
-#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
-#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353
-#: backend/magicolor.c:175 backend/matsushita.h:218
+#: backend/epson.c:492 backend/epson2.c:109 backend/epsonds.c:89
+#: backend/kodakaio.c:612 backend/kvs1025.h:50 backend/kvs20xx_opt.c:204
+#: backend/kvs40xx_opt.c:353 backend/magicolor.c:175
+#: backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr "Kaksipuolinen"
 
-#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:937
+#: backend/epson.c:502 backend/epson2-ops.c:102 backend/epson2.c:116
+#: backend/epsonds-ops.c:33 backend/epsonds.h:63 backend/pixma/pixma.c:937
 #, no-c-format
 msgid "Transparency Unit"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
-#: backend/mustek.c:160 backend/pixma.c:925 backend/test.c:192
-#: backend/umax.c:183
+#: backend/epson.c:503 backend/epson2-ops.c:104 backend/epson2.c:118
+#: backend/epsonds-ops.c:34 backend/epsonds.c:96 backend/epsonds.h:64
+#: backend/kodakaio.c:618 backend/magicolor.c:182 backend/mustek.c:160
+#: backend/pixma/pixma.c:925 backend/test.c:192 backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr "Automaattinen syöttö"
@@ -1753,7 +1764,7 @@ msgstr "Mustesuihkutulostimet"
 msgid "CRT monitors"
 msgstr "Loisteputkinäytöt"
 
-#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:685
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:687
 #: backend/hp-option.c:3229 backend/test.c:143
 #, no-c-format
 msgid "Default"
@@ -1817,8 +1828,9 @@ msgstr "A4"
 msgid "Max"
 msgstr "Koko alue"
 
-#: backend/epson.c:2813 backend/epson2.c:976 backend/genesys.cc:5207
-#: backend/gt68xx.c:451 backend/hp-option.c:2917 backend/kvs1025_opt.c:521
+#: backend/epson.c:2813 backend/epson2.c:976 backend/epsonds.c:629
+#: backend/genesys/genesys.cpp:3965 backend/gt68xx.c:451
+#: backend/hp-option.c:2917 backend/kvs1025_opt.c:521
 #: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320 backend/ma1509.c:501
 #: backend/matsushita.c:1084 backend/microtek2.h:598 backend/mustek.c:4215
 #: backend/mustek_usb.c:256 backend/mustek_usb2.c:344 backend/niash.c:734
@@ -1990,17 +2002,17 @@ msgstr "Määrää kuvanlukijan käyttämän zoom-kertoimen"
 msgid "Quick format"
 msgstr "Nopea formaatti"
 
-#: backend/epson.c:3360 backend/epson2.c:1340
+#: backend/epson.c:3360 backend/epson2.c:1340 backend/epsonds.c:726
 #, no-c-format
 msgid "Optional equipment"
 msgstr "Lisävaruste"
 
-#: backend/epson.c:3431 backend/epson2.c:1393
+#: backend/epson.c:3431 backend/epson2.c:1393 backend/epsonds.c:742
 #, no-c-format
 msgid "Eject"
 msgstr "Poista"
 
-#: backend/epson.c:3432 backend/epson2.c:1394
+#: backend/epson.c:3432 backend/epson2.c:1394 backend/epsonds.c:743
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr "Poista kohde syöttölaitteesta"
@@ -2015,12 +2027,14 @@ msgstr "Automaattinen poisto"
 msgid "Eject document after scanning"
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: backend/epson.c:3457 backend/epson2.c:1416 backend/magicolor.c:2420
+#: backend/epson.c:3457 backend/epson2.c:1416 backend/epsonds.c:758
+#: backend/kodakaio.c:2855 backend/magicolor.c:2420
 #, no-c-format
 msgid "ADF Mode"
 msgstr "Syötttapa"
 
-#: backend/epson.c:3459 backend/epson2.c:1418 backend/magicolor.c:2422
+#: backend/epson.c:3459 backend/epson2.c:1418 backend/epsonds.c:760
+#: backend/kodakaio.c:2857 backend/magicolor.c:2422
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr "Valitsee syöttötavan (yksi-/kaksipuolinen)"
@@ -2069,14 +2083,14 @@ msgstr ""
 "Kuvanlukukomennon lähettämisen jälkeen, odota kunnes kuvanlukijan "
 "painiketta todella painetaan, ennen kuvanluvun aloittamista."
 
-#: backend/epson2.c:102 backend/pixma.c:409
+#: backend/epson2-ops.c:103 backend/epson2.c:117
 #, no-c-format
-msgid "Infrared"
+msgid "TPU8x10"
 msgstr ""
 
-#: backend/epson2.c:117
+#: backend/epson2.c:102 backend/pixma/pixma.c:409
 #, no-c-format
-msgid "TPU8x10"
+msgid "Infrared"
 msgstr ""
 
 #: backend/epson2.c:136
@@ -2099,492 +2113,512 @@ msgstr ""
 msgid "User defined CCT profile"
 msgstr "Käyttäjän määrittelemä"
 
-#: backend/fujitsu.c:686 backend/hp-option.c:3330 backend/hp-option.c:3343
+#: backend/epsonds.c:750
+#, no-c-format
+msgid "Load"
+msgstr ""
+
+#: backend/epsonds.c:751
+#, fuzzy, no-c-format
+msgid "Load a sheet in the ADF"
+msgstr "Poista kohde syöttölaitteesta"
+
+#: backend/epsonds.c:771
+#, fuzzy, no-c-format
+msgid "ADF Skew Correction"
+msgstr "Ei korjausta"
+
+#: backend/epsonds.c:773
+#, fuzzy, no-c-format
+msgid "Enables ADF skew correction"
+msgstr "Analoginen gammakorjaus"
+
+#: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
 msgid "On"
 msgstr "Päällä"
 
-#: backend/fujitsu.c:687 backend/hp-option.c:3162 backend/hp-option.c:3329
+#: backend/fujitsu.c:689 backend/hp-option.c:3162 backend/hp-option.c:3329
 #: backend/hp-option.c:3342
 #, no-c-format
 msgid "Off"
 msgstr "Poissa"
 
-#: backend/fujitsu.c:689
+#: backend/fujitsu.c:691
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: backend/fujitsu.c:690
+#: backend/fujitsu.c:692
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: backend/fujitsu.c:692 backend/teco1.c:1152 backend/teco1.c:1153
+#: backend/fujitsu.c:694 backend/teco1.c:1152 backend/teco1.c:1153
 #: backend/teco2.c:1967 backend/teco2.c:1968 backend/teco3.c:977
 #: backend/teco3.c:978
 #, no-c-format
 msgid "Dither"
 msgstr "Rasteri"
 
-#: backend/fujitsu.c:693
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: backend/fujitsu.c:698
+#: backend/fujitsu.c:700
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Valkotaso"
 
-#: backend/fujitsu.c:699
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Mustataso"
 
-#: backend/fujitsu.c:704
+#: backend/fujitsu.c:706
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Ehdollinen"
 
-#: backend/fujitsu.c:705
+#: backend/fujitsu.c:707
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: backend/fujitsu.c:707
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: backend/fujitsu.c:708
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: backend/fujitsu.c:709
+#: backend/fujitsu.c:711
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: backend/fujitsu.c:711 backend/hp-option.c:3048
+#: backend/fujitsu.c:713 backend/hp-option.c:3048
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:712
+#: backend/fujitsu.c:714
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:713
+#: backend/fujitsu.c:715
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:714 backend/hp-option.c:3047
+#: backend/fujitsu.c:716 backend/hp-option.c:3047
 #, no-c-format
 msgid "Vertical"
 msgstr "Pysty"
 
-#: backend/fujitsu.c:715
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Pysty"
 
-#: backend/fujitsu.c:717
+#: backend/fujitsu.c:719
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: backend/fujitsu.c:718
+#: backend/fujitsu.c:720
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: backend/fujitsu.c:720
+#: backend/fujitsu.c:722
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Tulosta"
 
-#: backend/fujitsu.c:721
+#: backend/fujitsu.c:723
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: backend/fujitsu.c:3144 backend/pixma_sane_options.c:145
+#: backend/fujitsu.c:3148 backend/pixma/pixma_sane_options.c:145
 #, no-c-format
 msgid "Gamma function exponent"
 msgstr ""
 
-#: backend/fujitsu.c:3145 backend/pixma_sane_options.c:146
+#: backend/fujitsu.c:3149 backend/pixma/pixma_sane_options.c:146
 #, no-c-format
 msgid "Changes intensity of midtones"
 msgstr ""
 
-#: backend/fujitsu.c:3194
+#: backend/fujitsu.c:3198
 #, no-c-format
 msgid "RIF"
 msgstr ""
 
-#: backend/fujitsu.c:3195
+#: backend/fujitsu.c:3199
 #, no-c-format
 msgid "Reverse image format"
 msgstr ""
 
-#: backend/fujitsu.c:3212
+#: backend/fujitsu.c:3216
 #, fuzzy, no-c-format
 msgid "Halftone type"
 msgstr "Rasteri"
 
-#: backend/fujitsu.c:3213
+#: backend/fujitsu.c:3217
 #, no-c-format
 msgid "Control type of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3234
+#: backend/fujitsu.c:3238
 #, no-c-format
 msgid "Control pattern of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3256
+#: backend/fujitsu.c:3260
 #, no-c-format
 msgid "Outline"
 msgstr ""
 
-#: backend/fujitsu.c:3257
+#: backend/fujitsu.c:3261
 #, fuzzy, no-c-format
 msgid "Perform outline extraction"
 msgstr "Raakakalibrointi"
 
-#: backend/fujitsu.c:3268
+#: backend/fujitsu.c:3272
 #, fuzzy, no-c-format
 msgid "Emphasis"
 msgstr "Kuvan korostus"
 
-#: backend/fujitsu.c:3269
+#: backend/fujitsu.c:3273
 #, no-c-format
 msgid "Negative to smooth or positive to sharpen image"
 msgstr ""
 
-#: backend/fujitsu.c:3287
+#: backend/fujitsu.c:3291
 #, fuzzy, no-c-format
 msgid "Separation"
 msgstr "Kylläisyys"
 
-#: backend/fujitsu.c:3288
+#: backend/fujitsu.c:3292
 #, fuzzy, no-c-format
 msgid "Enable automatic separation of image and text"
 msgstr "Aseta automaattinen kynnysarvon päättely viivapiirrosta varten."
 
-#: backend/fujitsu.c:3299
+#: backend/fujitsu.c:3303
 #, fuzzy, no-c-format
 msgid "Mirroring"
 msgstr "Peilikuva"
 
-#: backend/fujitsu.c:3300
+#: backend/fujitsu.c:3304
 #, fuzzy, no-c-format
 msgid "Reflect output image horizontally"
 msgstr "Peilaa kuvan vaakasuunnassa"
 
-#: backend/fujitsu.c:3317
+#: backend/fujitsu.c:3321
 #, fuzzy, no-c-format
 msgid "White level follower"
 msgstr "Sinisen valkotaso"
 
-#: backend/fujitsu.c:3318
+#: backend/fujitsu.c:3322
 #, fuzzy, no-c-format
 msgid "Control white level follower"
 msgstr "Määrää punaisen määrän"
 
-#: backend/fujitsu.c:3336
+#: backend/fujitsu.c:3340
 #, fuzzy, no-c-format
 msgid "BP filter"
 msgstr "Väriviivapiirros"
 
-#: backend/fujitsu.c:3337
+#: backend/fujitsu.c:3341
 #, no-c-format
 msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: backend/fujitsu.c:3353 backend/hp-option.h:73
+#: backend/fujitsu.c:3357 backend/hp-option.h:73
 #, no-c-format
 msgid "Smoothing"
 msgstr "Pehmennys"
 
-#: backend/fujitsu.c:3354
+#: backend/fujitsu.c:3358
 #, no-c-format
 msgid "Enable smoothing for improved OCR"
 msgstr ""
 
-#: backend/fujitsu.c:3370
+#: backend/fujitsu.c:3374
 #, fuzzy, no-c-format
 msgid "Gamma curve"
 msgstr "Gamma"
 
-#: backend/fujitsu.c:3371
+#: backend/fujitsu.c:3375
 #, no-c-format
 msgid "Gamma curve, from light to dark, but upper two may not work"
 msgstr ""
 
-#: backend/fujitsu.c:3393 backend/genesys.cc:5505
-#: backend/pixma_sane_options.c:335
+#: backend/fujitsu.c:3397 backend/genesys/genesys.cpp:4229
+#: backend/pixma/pixma_sane_options.c:335
 #, fuzzy, no-c-format
 msgid "Threshold curve"
 msgstr "Kynnys"
 
-#: backend/fujitsu.c:3394
+#: backend/fujitsu.c:3398
 #, no-c-format
 msgid ""
 "Threshold curve, from light to dark, but upper two may not be linear"
 msgstr ""
 
-#: backend/fujitsu.c:3416
+#: backend/fujitsu.c:3420
 #, fuzzy, no-c-format
 msgid "Threshold white"
 msgstr "Kynnys"
 
-#: backend/fujitsu.c:3417
+#: backend/fujitsu.c:3421
 #, no-c-format
 msgid "Set pixels equal to threshold to white instead of black"
 msgstr ""
 
-#: backend/fujitsu.c:3433 backend/fujitsu.c:3434
+#: backend/fujitsu.c:3437 backend/fujitsu.c:3438
 #, fuzzy, no-c-format
 msgid "Noise removal"
 msgstr "Kohinan poisto"
 
-#: backend/fujitsu.c:3450
+#: backend/fujitsu.c:3454
 #, no-c-format
 msgid "Matrix 5x5"
 msgstr ""
 
-#: backend/fujitsu.c:3451
+#: backend/fujitsu.c:3455
 #, no-c-format
 msgid "Remove 5 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3467
+#: backend/fujitsu.c:3471
 #, no-c-format
 msgid "Matrix 4x4"
 msgstr ""
 
-#: backend/fujitsu.c:3468
+#: backend/fujitsu.c:3472
 #, no-c-format
 msgid "Remove 4 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3484
+#: backend/fujitsu.c:3488
 #, no-c-format
 msgid "Matrix 3x3"
 msgstr ""
 
-#: backend/fujitsu.c:3485
+#: backend/fujitsu.c:3489
 #, no-c-format
 msgid "Remove 3 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3501
+#: backend/fujitsu.c:3505
 #, no-c-format
 msgid "Matrix 2x2"
 msgstr ""
 
-#: backend/fujitsu.c:3502
+#: backend/fujitsu.c:3506
 #, no-c-format
 msgid "Remove 2 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3521
+#: backend/fujitsu.c:3525
 #, no-c-format
 msgid "Variance"
 msgstr ""
 
-#: backend/fujitsu.c:3522
+#: backend/fujitsu.c:3526
 #, no-c-format
 msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: backend/fujitsu.c:3555
+#: backend/fujitsu.c:3559
 #, fuzzy, no-c-format
 msgid "Auto width detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3556
+#: backend/fujitsu.c:3560
 #, no-c-format
 msgid "Scanner detects paper sides. May reduce scanning speed."
 msgstr ""
 
-#: backend/fujitsu.c:3573
+#: backend/fujitsu.c:3577
 #, fuzzy, no-c-format
 msgid "Auto length detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3574
+#: backend/fujitsu.c:3578
 #, no-c-format
 msgid "Scanner detects paper lower edge. May confuse some frontends."
 msgstr ""
 
-#: backend/fujitsu.c:3600
+#: backend/fujitsu.c:3604
 #, no-c-format
 msgid "Compression"
 msgstr ""
 
-#: backend/fujitsu.c:3601
+#: backend/fujitsu.c:3605
 #, no-c-format
 msgid "Enable compressed data. May crash your front-end program"
 msgstr ""
 
-#: backend/fujitsu.c:3621
+#: backend/fujitsu.c:3625
 #, no-c-format
 msgid "Compression argument"
 msgstr ""
 
-#: backend/fujitsu.c:3622
+#: backend/fujitsu.c:3626
 #, no-c-format
 msgid ""
 "Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) "
 "is same as 4"
 msgstr ""
 
-#: backend/fujitsu.c:3652
+#: backend/fujitsu.c:3656
 #, no-c-format
 msgid "DF action"
 msgstr ""
 
-#: backend/fujitsu.c:3653
+#: backend/fujitsu.c:3657
 #, no-c-format
 msgid "Action following double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3669
+#: backend/fujitsu.c:3673
 #, no-c-format
 msgid "DF skew"
 msgstr ""
 
-#: backend/fujitsu.c:3670
+#: backend/fujitsu.c:3674
 #, no-c-format
 msgid "Enable double feed error due to skew"
 msgstr ""
 
-#: backend/fujitsu.c:3688
+#: backend/fujitsu.c:3692
 #, no-c-format
 msgid "DF thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3689
+#: backend/fujitsu.c:3693
 #, no-c-format
 msgid "Enable double feed error due to paper thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3707
+#: backend/fujitsu.c:3711
 #, no-c-format
 msgid "DF length"
 msgstr ""
 
-#: backend/fujitsu.c:3708
+#: backend/fujitsu.c:3712
 #, no-c-format
 msgid "Enable double feed error due to paper length"
 msgstr ""
 
-#: backend/fujitsu.c:3731
+#: backend/fujitsu.c:3735
 #, no-c-format
 msgid "DF length difference"
 msgstr ""
 
-#: backend/fujitsu.c:3732
+#: backend/fujitsu.c:3736
 #, no-c-format
 msgid "Difference in page length to trigger double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3755
+#: backend/fujitsu.c:3759
 #, fuzzy, no-c-format
 msgid "DF recovery mode"
 msgstr "Syöttötapa"
 
-#: backend/fujitsu.c:3756
+#: backend/fujitsu.c:3760
 #, no-c-format
 msgid "Request scanner to reverse feed on paper jam"
 msgstr ""
 
-#: backend/fujitsu.c:3775
+#: backend/fujitsu.c:3779
 #, no-c-format
 msgid "Paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3776
+#: backend/fujitsu.c:3780
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3795
+#: backend/fujitsu.c:3799
 #, fuzzy, no-c-format
 msgid "Advanced paper protection"
 msgstr "Päivitä asetukset"
 
-#: backend/fujitsu.c:3796
+#: backend/fujitsu.c:3800
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF using improved sensors"
 msgstr ""
 
-#: backend/fujitsu.c:3815
+#: backend/fujitsu.c:3819
 #, fuzzy, no-c-format
 msgid "Staple detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3816
+#: backend/fujitsu.c:3820
 #, no-c-format
 msgid "Request scanner to detect jams in the ADF caused by staples"
 msgstr ""
 
-#: backend/fujitsu.c:3835
+#: backend/fujitsu.c:3839
 #, no-c-format
 msgid "Background color"
 msgstr ""
 
-#: backend/fujitsu.c:3836
+#: backend/fujitsu.c:3840
 #, no-c-format
 msgid ""
 "Set color of background for scans. May conflict with overscan option"
 msgstr ""
 
-#: backend/fujitsu.c:3856
+#: backend/fujitsu.c:3860
 #, fuzzy, no-c-format
 msgid "Dropout color"
 msgstr "Valo päälle"
 
-#: backend/fujitsu.c:3857
+#: backend/fujitsu.c:3861
 #, no-c-format
 msgid ""
 "One-pass scanners use only one color during gray or binary scanning, "
 "useful for colored paper or ink"
 msgstr ""
 
-#: backend/fujitsu.c:3880
+#: backend/fujitsu.c:3884
 #, fuzzy, no-c-format
 msgid "Buffer mode"
 msgstr "Syöttötapa"
 
-#: backend/fujitsu.c:3881
+#: backend/fujitsu.c:3885
 #, no-c-format
 msgid "Request scanner to read pages quickly from ADF into internal memory"
 msgstr ""
 
-#: backend/fujitsu.c:3900
+#: backend/fujitsu.c:3904
 #, no-c-format
 msgid "Prepick"
 msgstr ""
 
-#: backend/fujitsu.c:3901
+#: backend/fujitsu.c:3905
 #, no-c-format
 msgid "Request scanner to grab next page from ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3920
+#: backend/fujitsu.c:3924
 #, no-c-format
 msgid "Overscan"
 msgstr ""
 
-#: backend/fujitsu.c:3921
+#: backend/fujitsu.c:3925
 #, no-c-format
 msgid ""
 "Collect a few mm of background on top side of scan, before paper enters "
@@ -2592,65 +2626,65 @@ msgid ""
 "collection on remaining sides. May conflict with bgcolor option"
 msgstr ""
 
-#: backend/fujitsu.c:3939
+#: backend/fujitsu.c:3943
 #, no-c-format
 msgid "Sleep timer"
 msgstr ""
 
-#: backend/fujitsu.c:3940
+#: backend/fujitsu.c:3944
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches to sleep mode"
 msgstr ""
 
-#: backend/fujitsu.c:3958
+#: backend/fujitsu.c:3962
 #, fuzzy, no-c-format
 msgid "Off timer"
 msgstr "Valo pois"
 
-#: backend/fujitsu.c:3959
+#: backend/fujitsu.c:3963
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches the scanner "
 "off. Will be rounded to nearest 15 minutes. Zero means never power off."
 msgstr ""
 
-#: backend/fujitsu.c:3977
+#: backend/fujitsu.c:3981
 #, fuzzy, no-c-format
 msgid "Duplex offset"
 msgstr "Sinisen siirtymä"
 
-#: backend/fujitsu.c:3978
+#: backend/fujitsu.c:3982
 #, no-c-format
 msgid "Adjust front/back offset"
 msgstr ""
 
-#: backend/fujitsu.c:3995 backend/plustek.c:1025 backend/umax_pp.c:804
+#: backend/fujitsu.c:3999 backend/plustek.c:1025 backend/umax_pp.c:794
 #, no-c-format
 msgid "Green offset"
 msgstr "Vihreän siirtymä"
 
-#: backend/fujitsu.c:3996
+#: backend/fujitsu.c:4000
 #, fuzzy, no-c-format
 msgid "Adjust green/red offset"
 msgstr "Vihreän siirtymä"
 
-#: backend/fujitsu.c:4013 backend/plustek.c:1041 backend/umax_pp.c:816
+#: backend/fujitsu.c:4017 backend/plustek.c:1041 backend/umax_pp.c:806
 #, no-c-format
 msgid "Blue offset"
 msgstr "Sinisen siirtymä"
 
-#: backend/fujitsu.c:4014
+#: backend/fujitsu.c:4018
 #, fuzzy, no-c-format
 msgid "Adjust blue/red offset"
 msgstr "Asettaa sinisen kanavan siirtymän"
 
-#: backend/fujitsu.c:4027
+#: backend/fujitsu.c:4031
 #, no-c-format
 msgid "Low Memory"
 msgstr ""
 
-#: backend/fujitsu.c:4028
+#: backend/fujitsu.c:4032
 #, no-c-format
 msgid ""
 "Limit driver memory usage for use in embedded systems. Causes some "
@@ -2659,507 +2693,514 @@ msgid ""
 "only be used with custom front-end software."
 msgstr ""
 
-#: backend/fujitsu.c:4043
+#: backend/fujitsu.c:4047
 #, fuzzy, no-c-format
 msgid "Duplex side"
 msgstr "Kaksipuolinen"
 
-#: backend/fujitsu.c:4044
+#: backend/fujitsu.c:4048
 #, no-c-format
 msgid ""
 "Tells which side (0=front, 1=back) of a duplex scan the next call to "
 "sane_read will return."
 msgstr ""
 
-#: backend/fujitsu.c:4055
+#: backend/fujitsu.c:4059
 #, no-c-format
 msgid "Hardware deskew and crop"
 msgstr ""
 
-#: backend/fujitsu.c:4056
+#: backend/fujitsu.c:4060
 #, no-c-format
 msgid "Request scanner to rotate and crop pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4067 backend/kvs1025_opt.c:871
+#: backend/fujitsu.c:4071 backend/kvs1025_opt.c:871
 #, no-c-format
 msgid "Software deskew"
 msgstr ""
 
-#: backend/fujitsu.c:4068
+#: backend/fujitsu.c:4072
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4080 backend/kvs1025_opt.c:880
+#: backend/fujitsu.c:4084 backend/kvs1025_opt.c:880
 #, no-c-format
 msgid "Software despeckle diameter"
 msgstr ""
 
-#: backend/fujitsu.c:4081
+#: backend/fujitsu.c:4085
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: backend/fujitsu.c:4100 backend/genesys.cc:5436
+#: backend/fujitsu.c:4104 backend/genesys/genesys.cpp:4159
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: backend/fujitsu.c:4101
+#: backend/fujitsu.c:4105
 #, no-c-format
 msgid "Request driver to remove border from pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4130
+#: backend/fujitsu.c:4134
 #, no-c-format
 msgid "Halt on Cancel"
 msgstr ""
 
-#: backend/fujitsu.c:4131
+#: backend/fujitsu.c:4135
 #, no-c-format
 msgid ""
 "Request driver to halt the paper feed instead of eject during a cancel."
 msgstr ""
 
-#: backend/fujitsu.c:4142
+#: backend/fujitsu.c:4146
 #, fuzzy, no-c-format
 msgid "Endorser Options"
 msgstr "Päivitä asetukset"
 
-#: backend/fujitsu.c:4143
+#: backend/fujitsu.c:4147
 #, no-c-format
 msgid "Controls for endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4154
+#: backend/fujitsu.c:4158
 #, no-c-format
 msgid "Endorser"
 msgstr ""
 
-#: backend/fujitsu.c:4155
+#: backend/fujitsu.c:4159
 #, no-c-format
 msgid "Enable endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4170
+#: backend/fujitsu.c:4174
 #, no-c-format
 msgid "Endorser bits"
 msgstr ""
 
-#: backend/fujitsu.c:4171
+#: backend/fujitsu.c:4175
 #, no-c-format
 msgid "Determines maximum endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4196
+#: backend/fujitsu.c:4200
 #, no-c-format
 msgid "Endorser value"
 msgstr ""
 
-#: backend/fujitsu.c:4197
+#: backend/fujitsu.c:4201
 #, no-c-format
 msgid "Initial endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4220
+#: backend/fujitsu.c:4224
 #, no-c-format
 msgid "Endorser step"
 msgstr ""
 
-#: backend/fujitsu.c:4221
+#: backend/fujitsu.c:4225
 #, no-c-format
 msgid "Change endorser counter value by this much for each page."
 msgstr ""
 
-#: backend/fujitsu.c:4244
+#: backend/fujitsu.c:4248
 #, no-c-format
 msgid "Endorser Y"
 msgstr ""
 
-#: backend/fujitsu.c:4245
+#: backend/fujitsu.c:4249
 #, no-c-format
 msgid "Endorser print offset from top of paper."
 msgstr ""
 
-#: backend/fujitsu.c:4270
+#: backend/fujitsu.c:4274
 #, no-c-format
 msgid "Endorser font"
 msgstr ""
 
-#: backend/fujitsu.c:4271
+#: backend/fujitsu.c:4275
 #, no-c-format
 msgid "Endorser printing font."
 msgstr ""
 
-#: backend/fujitsu.c:4300
+#: backend/fujitsu.c:4304
 #, fuzzy, no-c-format
 msgid "Endorser direction"
 msgstr "Kohinan poisto"
 
-#: backend/fujitsu.c:4301
+#: backend/fujitsu.c:4305
 #, no-c-format
 msgid "Endorser printing direction."
 msgstr ""
 
-#: backend/fujitsu.c:4325
+#: backend/fujitsu.c:4329
 #, no-c-format
 msgid "Endorser side"
 msgstr ""
 
-#: backend/fujitsu.c:4326
+#: backend/fujitsu.c:4330
 #, no-c-format
 msgid "Endorser printing side, requires hardware support to change"
 msgstr ""
 
-#: backend/fujitsu.c:4351
+#: backend/fujitsu.c:4355
 #, no-c-format
 msgid "Endorser string"
 msgstr ""
 
-#: backend/fujitsu.c:4352
+#: backend/fujitsu.c:4356
 #, no-c-format
 msgid ""
 "Endorser alphanumeric print format. %05ud or %08ud at the end will be "
 "replaced by counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4379
+#: backend/fujitsu.c:4383
 #, no-c-format
 msgid "Top edge"
 msgstr ""
 
-#: backend/fujitsu.c:4380
+#: backend/fujitsu.c:4384
 #, no-c-format
-msgid "Paper is pulled partly into adf"
+msgid "Paper is pulled partly into ADF"
 msgstr ""
 
-#: backend/fujitsu.c:4391
+#: backend/fujitsu.c:4395
 #, fuzzy, no-c-format
 msgid "A3 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4392
+#: backend/fujitsu.c:4396
 #, no-c-format
 msgid "A3 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4403
+#: backend/fujitsu.c:4407
 #, fuzzy, no-c-format
 msgid "B4 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4404
+#: backend/fujitsu.c:4408
 #, no-c-format
 msgid "B4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4415
+#: backend/fujitsu.c:4419
 #, fuzzy, no-c-format
 msgid "A4 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4416
+#: backend/fujitsu.c:4420
 #, no-c-format
 msgid "A4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4427
+#: backend/fujitsu.c:4431
 #, fuzzy, no-c-format
 msgid "B5 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4428
+#: backend/fujitsu.c:4432
 #, no-c-format
 msgid "B5 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4451
+#: backend/fujitsu.c:4455
 #, no-c-format
 msgid "OMR or DF"
 msgstr ""
 
-#: backend/fujitsu.c:4452
+#: backend/fujitsu.c:4456
 #, no-c-format
 msgid "OMR or double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4475
+#: backend/fujitsu.c:4479
 #, no-c-format
 msgid "Power saving"
 msgstr ""
 
-#: backend/fujitsu.c:4476
+#: backend/fujitsu.c:4480
 #, no-c-format
 msgid "Scanner in power saving mode"
 msgstr ""
 
-#: backend/fujitsu.c:4499
+#: backend/fujitsu.c:4503
 #, fuzzy, no-c-format
 msgid "Manual feed"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/fujitsu.c:4500
+#: backend/fujitsu.c:4504
 #, fuzzy, no-c-format
 msgid "Manual feed selected"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/fujitsu.c:4523
+#: backend/fujitsu.c:4527
 #, no-c-format
 msgid "Function"
 msgstr ""
 
-#: backend/fujitsu.c:4524
+#: backend/fujitsu.c:4528
 #, no-c-format
 msgid "Function character on screen"
 msgstr ""
 
-#: backend/fujitsu.c:4535
+#: backend/fujitsu.c:4539
 #, no-c-format
 msgid "Ink low"
 msgstr ""
 
-#: backend/fujitsu.c:4536
+#: backend/fujitsu.c:4540
 #, no-c-format
 msgid "Imprinter ink running low"
 msgstr ""
 
-#: backend/fujitsu.c:4547
+#: backend/fujitsu.c:4551
 #, no-c-format
 msgid "Double feed"
 msgstr ""
 
-#: backend/fujitsu.c:4548
+#: backend/fujitsu.c:4552
 #, no-c-format
 msgid "Double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4559
+#: backend/fujitsu.c:4563
 #, no-c-format
 msgid "Error code"
 msgstr ""
 
-#: backend/fujitsu.c:4560
+#: backend/fujitsu.c:4564
 #, fuzzy, no-c-format
 msgid "Hardware error code"
 msgstr "Kuvanluvun tarkkuus"
 
-#: backend/fujitsu.c:4571
+#: backend/fujitsu.c:4575
 #, no-c-format
 msgid "Skew angle"
 msgstr ""
 
-#: backend/fujitsu.c:4572
+#: backend/fujitsu.c:4576
 #, no-c-format
 msgid "Requires black background for scanning"
 msgstr ""
 
-#: backend/fujitsu.c:4583
+#: backend/fujitsu.c:4587
 #, no-c-format
 msgid "Ink remaining"
 msgstr ""
 
-#: backend/fujitsu.c:4584
+#: backend/fujitsu.c:4588
 #, fuzzy, no-c-format
 msgid "Imprinter ink level"
 msgstr "Valkotaso"
 
-#: backend/fujitsu.c:4595
+#: backend/fujitsu.c:4599
 #, fuzzy, no-c-format
 msgid "Density"
 msgstr "Punaisen voimakkuus"
 
-#: backend/fujitsu.c:4596
+#: backend/fujitsu.c:4600
 #, no-c-format
 msgid "Density dial"
 msgstr ""
 
-#: backend/fujitsu.c:4607 backend/fujitsu.c:4608
+#: backend/fujitsu.c:4611 backend/fujitsu.c:4612
 #, fuzzy, no-c-format
 msgid "Duplex switch"
 msgstr "Kaksipuolinen"
 
-#: backend/genesys.cc:5437
+#: backend/genesys/genesys.cpp:4160
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: backend/genesys.cc:5446 backend/kvs1025_opt.c:912
+#: backend/genesys/genesys.cpp:4169 backend/kvs1025_opt.c:912
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: backend/genesys.cc:5456 backend/kvs1025_opt.c:892
+#: backend/genesys/genesys.cpp:4179 backend/kvs1025_opt.c:892
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: backend/genesys.cc:5457 backend/kvs1025_opt.c:894
+#: backend/genesys/genesys.cpp:4180 backend/kvs1025_opt.c:894
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: backend/genesys.cc:5486 backend/pixma_sane_options.c:314
+#: backend/genesys/genesys.cpp:4210 backend/pixma/pixma_sane_options.c:314
 #, fuzzy, no-c-format
 msgid "Extras"
 msgstr "Hyvin nopea"
 
-#: backend/genesys.cc:5506 backend/pixma_sane_options.c:336
+#: backend/genesys/genesys.cpp:4230 backend/pixma/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
 
-#: backend/genesys.cc:5515
-#, no-c-format
-msgid "Disable dynamic lineart"
-msgstr ""
-
-#: backend/genesys.cc:5517
-#, no-c-format
-msgid ""
-"Disable use of a software adaptive algorithm to generate lineart relying "
-"instead on hardware lineart."
-msgstr ""
-
-#: backend/genesys.cc:5533
+#: backend/genesys/genesys.cpp:4240
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Poista peruutus."
 
-#: backend/genesys.cc:5536
+#: backend/genesys/genesys.cpp:4243
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller "
 "than the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: backend/genesys.cc:5545
+#: backend/genesys/genesys.cpp:4252
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Väriviivapiirros"
 
-#: backend/genesys.cc:5548
+#: backend/genesys/genesys.cpp:4255
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: backend/genesys.cc:5574
+#: backend/genesys/genesys.cpp:4279
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrointi"
 
-#: backend/genesys.cc:5575
+#: backend/genesys/genesys.cpp:4280
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Määrää kalibraatiotavan"
 
-#: backend/genesys.cc:5592
+#: backend/genesys/genesys.cpp:4297
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibrointitila"
 
-#: backend/genesys.cc:5593
+#: backend/genesys/genesys.cpp:4298
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 "
 "means cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: backend/genesys.cc:5603
+#: backend/genesys/genesys.cpp:4308
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Valo pois"
 
-#: backend/genesys.cc:5606
+#: backend/genesys/genesys.cpp:4311
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value "
 "of 0 means, that the lamp won't be turned off."
 msgstr ""
 
-#: backend/genesys.cc:5616
+#: backend/genesys/genesys.cpp:4321
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.cc:5617
+#: backend/genesys/genesys.cpp:4322
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: backend/genesys.cc:5643 backend/genesys.cc:5644
+#: backend/genesys/genesys.cpp:4349 backend/genesys/genesys.cpp:4350
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.cc:5688 backend/genesys.cc:5689
+#: backend/genesys/genesys.cpp:4394 backend/genesys/genesys.cpp:4395
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: backend/genesys.cc:5700 backend/genesys.cc:5701
+#: backend/genesys/genesys.cpp:4406 backend/genesys/genesys.cpp:4407
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.cc:5712 backend/genesys.cc:5713
+#: backend/genesys/genesys.cpp:4418 backend/genesys/genesys.cpp:4419
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.cc:5724 backend/gt68xx.c:755
+#: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
 #, fuzzy, no-c-format
-msgid "Need calibration"
+msgid "Needs calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.cc:5725 backend/gt68xx.c:756
+#: backend/genesys/genesys.cpp:4431 backend/gt68xx.c:756 backend/p5.c:1928
 #, fuzzy, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr "Pakottaa kalibroinnin ennen kuvanlukua."
 
-#: backend/genesys.cc:5735 backend/gt68xx.c:780 backend/gt68xx.c:781
-#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
+#: backend/genesys/genesys.cpp:4442 backend/gt68xx.c:780
+#: backend/gt68xx.c:781 backend/p5.c:1937 backend/p5.c:1938
+#: backend/pixma/pixma_sane_options.c:226 backend/plustek.c:1080
 #, fuzzy, no-c-format
 msgid "Buttons"
 msgstr "Painikkeen tila"
 
-#: backend/genesys.cc:5744 backend/gt68xx.c:787 backend/hp5400_sane.c:392
-#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
+#: backend/genesys/genesys.cpp:4451 backend/gt68xx.c:787
+#: backend/hp-option.h:97 backend/hp5400_sane.c:392 backend/niash.c:726
+#: backend/p5.c:1945 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: backend/genesys.cc:5746 backend/gt68xx.c:789
+#: backend/genesys/genesys.cpp:4453 backend/gt68xx.c:789 backend/p5.c:1947
 #, fuzzy, no-c-format
 msgid "Start calibration using special sheet"
 msgstr "Aloita kalibrointi."
 
-#: backend/genesys.cc:5758 backend/gt68xx.c:802
+#: backend/genesys/genesys.cpp:4465 backend/gt68xx.c:802 backend/p5.c:1958
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.cc:5759 backend/gt68xx.c:803
+#: backend/genesys/genesys.cpp:4466 backend/gt68xx.c:803 backend/p5.c:1960
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Kalibrointitila"
 
-#: backend/genesys.cc:5769
+#: backend/genesys/genesys.cpp:4476
 #, fuzzy, no-c-format
 msgid "Force calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.cc:5770
+#: backend/genesys/genesys.cpp:4477
 #, no-c-format
 msgid "Force calibration ignoring all and any calibration caches"
 msgstr ""
 
-#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
-#: backend/snapscan-options.c:87 backend/umax.c:182
+#: backend/genesys/genesys.cpp:4487
+#, fuzzy, no-c-format
+msgid "Ignore internal offsets"
+msgstr "Vihreän siirtymä"
+
+#: backend/genesys/genesys.cpp:4489
+#, no-c-format
+msgid ""
+"Acquires the image including the internal calibration areas of the "
+"scanner"
+msgstr ""
+
+#: 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
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr "Läpinäkyvyysyksikkö"
 
+#: backend/genesys/genesys.h:80
+#, fuzzy, no-c-format
+msgid "Transparency Adapter Infrared"
+msgstr "Läpinäkyvyysyksikkö"
+
 #: backend/gt68xx.c:470
 #, no-c-format
 msgid "Gray mode color"
@@ -3261,6 +3302,311 @@ msgstr "Gamma"
 msgid "Sets the gamma value of all channels."
 msgstr "Asettaa gamma-arvon kaikille kanaville."
 
+#: backend/hp-option.c:2987
+#, fuzzy, no-c-format
+msgid "Advanced Options"
+msgstr "Päivitä asetukset"
+
+#: backend/hp-option.c:3044
+#, no-c-format
+msgid "Coarse"
+msgstr "Raaka"
+
+#: backend/hp-option.c:3045
+#, no-c-format
+msgid "Fine"
+msgstr "Hieno"
+
+#: backend/hp-option.c:3046
+#, no-c-format
+msgid "Bayer"
+msgstr "Bayer"
+
+#: backend/hp-option.c:3049 backend/hp-option.c:3100
+#, no-c-format
+msgid "Custom"
+msgstr "Oma"
+
+#: backend/hp-option.c:3090 backend/hp-option.c:3146
+#: backend/hp-option.c:3161
+#, no-c-format
+msgid "Auto"
+msgstr "Automaattinen"
+
+#: backend/hp-option.c:3091
+#, no-c-format
+msgid "NTSC RGB"
+msgstr "NTSC-RGB"
+
+#: backend/hp-option.c:3092
+#, no-c-format
+msgid "XPA RGB"
+msgstr "XPA-RGB"
+
+#: backend/hp-option.c:3093
+#, no-c-format
+msgid "Pass-through"
+msgstr ""
+
+#: backend/hp-option.c:3094
+#, no-c-format
+msgid "NTSC Gray"
+msgstr "NTSC-harmaa"
+
+#: backend/hp-option.c:3095
+#, no-c-format
+msgid "XPA Gray"
+msgstr "XPA-harmaa"
+
+#: backend/hp-option.c:3147
+#, no-c-format
+msgid "Slow"
+msgstr "Hidas"
+
+#: backend/hp-option.c:3148 backend/hp-option.c:3255
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
+#, no-c-format
+msgid "Normal"
+msgstr "Normaali"
+
+#: backend/hp-option.c:3149
+#, no-c-format
+msgid "Fast"
+msgstr "Nopea"
+
+#: backend/hp-option.c:3150
+#, no-c-format
+msgid "Extra Fast"
+msgstr "Hyvin nopea"
+
+#: backend/hp-option.c:3163
+#, no-c-format
+msgid "2-pixel"
+msgstr "2 pikseliä"
+
+#: backend/hp-option.c:3164
+#, no-c-format
+msgid "4-pixel"
+msgstr "4 pikseliä"
+
+#: backend/hp-option.c:3165
+#, no-c-format
+msgid "8-pixel"
+msgstr "8 pikseliä"
+
+#: backend/hp-option.c:3176
+#, no-c-format
+msgid "Print"
+msgstr "Tulosta"
+
+#: backend/hp-option.c:3177 backend/hp3900_sane.c:427
+#: backend/hp3900_sane.c:1019
+#, no-c-format
+msgid "Slide"
+msgstr "Dia"
+
+#: backend/hp-option.c:3178
+#, no-c-format
+msgid "Film-strip"
+msgstr "Filmiliuska"
+
+#: backend/hp-option.c:3256 backend/hp5590.c:93
+#, no-c-format
+msgid "ADF"
+msgstr "ADF"
+
+#: backend/hp-option.c:3257
+#, no-c-format
+msgid "XPA"
+msgstr "XPA"
+
+#: backend/hp-option.c:3331 backend/hp-option.c:3344
+#, no-c-format
+msgid "Conditional"
+msgstr "Ehdollinen"
+
+#: backend/hp-option.c:3417
+#, fuzzy, no-c-format
+msgid "Experiment"
+msgstr "Valotusaika"
+
+#: backend/hp-option.h:60
+#, no-c-format
+msgid "Sharpening"
+msgstr "Terävöinti"
+
+#: backend/hp-option.h:61
+#, no-c-format
+msgid "Set sharpening value."
+msgstr "Aseta terävöintiarvo."
+
+#: backend/hp-option.h:66
+#, no-c-format
+msgid "Auto Threshold"
+msgstr "Automaatinen kynnys"
+
+#: backend/hp-option.h:68
+#, no-c-format
+msgid "Enable automatic determination of threshold for line-art scans."
+msgstr "Aseta automaattinen kynnysarvon päättely viivapiirrosta varten."
+
+#: backend/hp-option.h:74
+#, no-c-format
+msgid "Select smoothing filter."
+msgstr "Valitse pehmennyssuodatin."
+
+#: backend/hp-option.h:79
+#, no-c-format
+msgid "Unload media after scan"
+msgstr "Poista media kuvanluvun jälkeen"
+
+#: backend/hp-option.h:80
+#, no-c-format
+msgid "Unloads the media after a scan."
+msgstr "Poistaa median kuvanluvun jälkeen."
+
+#: backend/hp-option.h:85
+#, no-c-format
+msgid "Change document"
+msgstr "Vaihda kohde"
+
+#: backend/hp-option.h:86
+#, no-c-format
+msgid "Change Document."
+msgstr "Vaihda kohde."
+
+#: backend/hp-option.h:91
+#, no-c-format
+msgid "Unload"
+msgstr "Poista"
+
+#: backend/hp-option.h:92
+#, no-c-format
+msgid "Unload Document."
+msgstr "Poista kohde."
+
+#: backend/hp-option.h:98
+#, no-c-format
+msgid "Start calibration process."
+msgstr "Aloita kalibrointi."
+
+#: backend/hp-option.h:103
+#, no-c-format
+msgid "Media"
+msgstr "Media"
+
+#: backend/hp-option.h:104
+#, no-c-format
+msgid "Set type of media."
+msgstr "Valitse media"
+
+#: backend/hp-option.h:109
+#, no-c-format
+msgid "Exposure time"
+msgstr "Valotusaika"
+
+#: backend/hp-option.h:111
+#, no-c-format
+msgid ""
+"A longer exposure time lets the scanner collect more light. Suggested "
+"use is 175% for prints, 150% for normal slides and \"Negative\" for "
+"negative film. For dark (underexposed) images you can increase this "
+"value."
+msgstr ""
+"Pidempi valotusaika antaa kuvanlukijan kerätä enemmän valoa. Ehdotetut "
+"arvot ovat 175% painotuotteille, 150% normaaleille dioille ja \"Negatiivi"
+"\" negatiivifilmeille. Tummille (alivalottuneille) kuville, voit "
+"kasvattaa tätä arvoa."
+
+#: backend/hp-option.h:119 backend/hp-option.h:126
+#, no-c-format
+msgid "Color Matrix"
+msgstr "Värimatriisi"
+
+#: backend/hp-option.h:121
+#, fuzzy, no-c-format
+msgid "Set the scanner's color matrix."
+msgstr "Aseta kuvanlukijan värimatriisi."
+
+#: backend/hp-option.h:127
+#, no-c-format
+msgid "Custom color matrix."
+msgstr "Oma värimatriisi."
+
+#: backend/hp-option.h:132
+#, no-c-format
+msgid "Mono Color Matrix"
+msgstr "Yksivärinen matriisi"
+
+#: backend/hp-option.h:133
+#, no-c-format
+msgid "Custom color matrix for grayscale scans."
+msgstr "Oma värimatriisi harmaasävy lukua varten."
+
+#: backend/hp-option.h:138
+#, no-c-format
+msgid "Mirror horizontal"
+msgstr "Peilaa vaakasuunnassa"
+
+#: backend/hp-option.h:139
+#, no-c-format
+msgid "Mirror image horizontally."
+msgstr "Peilaa kuvan vaakasuunnassa"
+
+#: backend/hp-option.h:144
+#, no-c-format
+msgid "Mirror vertical"
+msgstr "Peilaa pystysuunnassa"
+
+#: backend/hp-option.h:145
+#, no-c-format
+msgid "Mirror image vertically."
+msgstr "Peilaa kuvan pystysuunnassa."
+
+#: backend/hp-option.h:150
+#, no-c-format
+msgid "Update options"
+msgstr "Päivitä asetukset"
+
+#: backend/hp-option.h:151
+#, no-c-format
+msgid "Update options."
+msgstr "Päivittää asetukset."
+
+#: backend/hp-option.h:156
+#, no-c-format
+msgid "8 bit output"
+msgstr "8-bittinen tulos"
+
+#: backend/hp-option.h:158
+#, no-c-format
+msgid "Use bit depth greater eight internally, but output only eight bits."
+msgstr ""
+"Käyttää sisäisesti kahdeksaa bittiä syvempää esitystä, mutta antaa "
+"tuloksen vain kahdeksanbittisenä."
+
+#: backend/hp-option.h:164
+#, no-c-format
+msgid "Front button wait"
+msgstr "Odota painiketta"
+
+#: backend/hp-option.h:165
+#, no-c-format
+msgid "Wait to scan for front-panel button push."
+msgstr ""
+"Odottaa kuvanlukijan painikkeen painamista ennen kuvanluvun alkamista."
+
+#: backend/hp-option.h:172
+#, no-c-format
+msgid "Shut off lamp"
+msgstr "Sulje lamppu"
+
+#: backend/hp-option.h:173
+#, no-c-format
+msgid "Shut off scanner lamp."
+msgstr "Sulkee kuvanlukijan lampun."
+
 #: backend/hp3500.c:1020
 #, fuzzy, no-c-format
 msgid "Geometry Group"
@@ -3271,12 +3617,6 @@ msgstr "Geometria"
 msgid "Scan Mode Group"
 msgstr "Lukutapa"
 
-#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
-#: backend/hp-option.c:3177
-#, no-c-format
-msgid "Slide"
-msgstr "Dia"
-
 #: backend/hp3900_sane.c:1405
 #, fuzzy, no-c-format
 msgid "Scanner model"
@@ -3284,12 +3624,12 @@ msgstr "Lukutapa"
 
 #: backend/hp3900_sane.c:1408
 #, no-c-format
-msgid "Allows one to test device behaviour with other supported models"
+msgid "Allows one to test device behavior with other supported models"
 msgstr ""
 
 #: backend/hp3900_sane.c:1422
 #, no-c-format
-msgid "Image colours will be inverted"
+msgid "Image colors will be inverted"
 msgstr ""
 
 #: backend/hp3900_sane.c:1436
@@ -3470,11 +3810,6 @@ msgstr "Asettaa valon päälle/pois"
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: backend/hp5590.c:93 backend/hp-option.c:3256
-#, no-c-format
-msgid "ADF"
-msgstr "ADF"
-
 #: backend/hp5590.c:95
 #, fuzzy, no-c-format
 msgid "TMA Slides"
@@ -3585,300 +3920,6 @@ msgid ""
 "r*65536+256*g+b or gray value (default=violet or gray)"
 msgstr ""
 
-#: backend/hp-option.c:2987
-#, fuzzy, no-c-format
-msgid "Advanced Options"
-msgstr "Päivitä asetukset"
-
-#: backend/hp-option.c:3044
-#, no-c-format
-msgid "Coarse"
-msgstr "Raaka"
-
-#: backend/hp-option.c:3045
-#, no-c-format
-msgid "Fine"
-msgstr "Hieno"
-
-#: backend/hp-option.c:3046
-#, no-c-format
-msgid "Bayer"
-msgstr "Bayer"
-
-#: backend/hp-option.c:3049 backend/hp-option.c:3100
-#, no-c-format
-msgid "Custom"
-msgstr "Oma"
-
-#: backend/hp-option.c:3090 backend/hp-option.c:3146
-#: backend/hp-option.c:3161
-#, no-c-format
-msgid "Auto"
-msgstr "Automaattinen"
-
-#: backend/hp-option.c:3091
-#, no-c-format
-msgid "NTSC RGB"
-msgstr "NTSC-RGB"
-
-#: backend/hp-option.c:3092
-#, no-c-format
-msgid "XPA RGB"
-msgstr "XPA-RGB"
-
-#: backend/hp-option.c:3093
-#, no-c-format
-msgid "Pass-through"
-msgstr ""
-
-#: backend/hp-option.c:3094
-#, no-c-format
-msgid "NTSC Gray"
-msgstr "NTSC-harmaa"
-
-#: backend/hp-option.c:3095
-#, no-c-format
-msgid "XPA Gray"
-msgstr "XPA-harmaa"
-
-#: backend/hp-option.c:3147
-#, no-c-format
-msgid "Slow"
-msgstr "Hidas"
-
-#: backend/hp-option.c:3148 backend/hp-option.c:3255
-#: backend/kvs40xx_opt.c:230 backend/matsushita.c:244 backend/mustek.c:149
-#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
-#, no-c-format
-msgid "Normal"
-msgstr "Normaali"
-
-#: backend/hp-option.c:3149
-#, no-c-format
-msgid "Fast"
-msgstr "Nopea"
-
-#: backend/hp-option.c:3150
-#, no-c-format
-msgid "Extra Fast"
-msgstr "Hyvin nopea"
-
-#: backend/hp-option.c:3163
-#, no-c-format
-msgid "2-pixel"
-msgstr "2 pikseliä"
-
-#: backend/hp-option.c:3164
-#, no-c-format
-msgid "4-pixel"
-msgstr "4 pikseliä"
-
-#: backend/hp-option.c:3165
-#, no-c-format
-msgid "8-pixel"
-msgstr "8 pikseliä"
-
-#: backend/hp-option.c:3176
-#, no-c-format
-msgid "Print"
-msgstr "Tulosta"
-
-#: backend/hp-option.c:3178
-#, no-c-format
-msgid "Film-strip"
-msgstr "Filmiliuska"
-
-#: backend/hp-option.c:3257
-#, no-c-format
-msgid "XPA"
-msgstr "XPA"
-
-#: backend/hp-option.c:3331 backend/hp-option.c:3344
-#, no-c-format
-msgid "Conditional"
-msgstr "Ehdollinen"
-
-#: backend/hp-option.c:3417
-#, fuzzy, no-c-format
-msgid "Experiment"
-msgstr "Valotusaika"
-
-#: backend/hp-option.h:60
-#, no-c-format
-msgid "Sharpening"
-msgstr "Terävöinti"
-
-#: backend/hp-option.h:61
-#, no-c-format
-msgid "Set sharpening value."
-msgstr "Aseta terävöintiarvo."
-
-#: backend/hp-option.h:66
-#, no-c-format
-msgid "Auto Threshold"
-msgstr "Automaatinen kynnys"
-
-#: backend/hp-option.h:68
-#, no-c-format
-msgid "Enable automatic determination of threshold for line-art scans."
-msgstr "Aseta automaattinen kynnysarvon päättely viivapiirrosta varten."
-
-#: backend/hp-option.h:74
-#, no-c-format
-msgid "Select smoothing filter."
-msgstr "Valitse pehmennyssuodatin."
-
-#: backend/hp-option.h:79
-#, no-c-format
-msgid "Unload media after scan"
-msgstr "Poista media kuvanluvun jälkeen"
-
-#: backend/hp-option.h:80
-#, no-c-format
-msgid "Unloads the media after a scan."
-msgstr "Poistaa median kuvanluvun jälkeen."
-
-#: backend/hp-option.h:85
-#, no-c-format
-msgid "Change document"
-msgstr "Vaihda kohde"
-
-#: backend/hp-option.h:86
-#, no-c-format
-msgid "Change Document."
-msgstr "Vaihda kohde."
-
-#: backend/hp-option.h:91
-#, no-c-format
-msgid "Unload"
-msgstr "Poista"
-
-#: backend/hp-option.h:92
-#, no-c-format
-msgid "Unload Document."
-msgstr "Poista kohde."
-
-#: backend/hp-option.h:98
-#, no-c-format
-msgid "Start calibration process."
-msgstr "Aloita kalibrointi."
-
-#: backend/hp-option.h:103
-#, no-c-format
-msgid "Media"
-msgstr "Media"
-
-#: backend/hp-option.h:104
-#, no-c-format
-msgid "Set type of media."
-msgstr "Valitse media"
-
-#: backend/hp-option.h:109
-#, no-c-format
-msgid "Exposure time"
-msgstr "Valotusaika"
-
-#: backend/hp-option.h:111
-#, no-c-format
-msgid ""
-"A longer exposure time lets the scanner collect more light. Suggested "
-"use is 175% for prints, 150% for normal slides and \"Negative\" for "
-"negative film. For dark (underexposed) images you can increase this "
-"value."
-msgstr ""
-"Pidempi valotusaika antaa kuvanlukijan kerätä enemmän valoa. Ehdotetut "
-"arvot ovat 175% painotuotteille, 150% normaaleille dioille ja \"Negatiivi"
-"\" negatiivifilmeille. Tummille (alivalottuneille) kuville, voit "
-"kasvattaa tätä arvoa."
-
-#: backend/hp-option.h:119 backend/hp-option.h:126
-#, no-c-format
-msgid "Color Matrix"
-msgstr "Värimatriisi"
-
-#: backend/hp-option.h:121
-#, no-c-format
-msgid "Set the scanners color matrix."
-msgstr "Aseta kuvanlukijan värimatriisi."
-
-#: backend/hp-option.h:127
-#, no-c-format
-msgid "Custom color matrix."
-msgstr "Oma värimatriisi."
-
-#: backend/hp-option.h:132
-#, no-c-format
-msgid "Mono Color Matrix"
-msgstr "Yksivärinen matriisi"
-
-#: backend/hp-option.h:133
-#, no-c-format
-msgid "Custom color matrix for grayscale scans."
-msgstr "Oma värimatriisi harmaasävy lukua varten."
-
-#: backend/hp-option.h:138
-#, no-c-format
-msgid "Mirror horizontal"
-msgstr "Peilaa vaakasuunnassa"
-
-#: backend/hp-option.h:139
-#, no-c-format
-msgid "Mirror image horizontally."
-msgstr "Peilaa kuvan vaakasuunnassa"
-
-#: backend/hp-option.h:144
-#, no-c-format
-msgid "Mirror vertical"
-msgstr "Peilaa pystysuunnassa"
-
-#: backend/hp-option.h:145
-#, no-c-format
-msgid "Mirror image vertically."
-msgstr "Peilaa kuvan pystysuunnassa."
-
-#: backend/hp-option.h:150
-#, no-c-format
-msgid "Update options"
-msgstr "Päivitä asetukset"
-
-#: backend/hp-option.h:151
-#, no-c-format
-msgid "Update options."
-msgstr "Päivittää asetukset."
-
-#: backend/hp-option.h:156
-#, no-c-format
-msgid "8 bit output"
-msgstr "8-bittinen tulos"
-
-#: backend/hp-option.h:158
-#, no-c-format
-msgid "Use bit depth greater eight internally, but output only eight bits."
-msgstr ""
-"Käyttää sisäisesti kahdeksaa bittiä syvempää esitystä, mutta antaa "
-"tuloksen vain kahdeksanbittisenä."
-
-#: backend/hp-option.h:164
-#, no-c-format
-msgid "Front button wait"
-msgstr "Odota painiketta"
-
-#: backend/hp-option.h:165
-#, no-c-format
-msgid "Wait to scan for front-panel button push."
-msgstr ""
-"Odottaa kuvanlukijan painikkeen painamista ennen kuvanluvun alkamista."
-
-#: backend/hp-option.h:172
-#, no-c-format
-msgid "Shut off lamp"
-msgstr "Sulje lamppu"
-
-#: backend/hp-option.h:173
-#, no-c-format
-msgid "Shut off scanner lamp."
-msgstr "Sulkee kuvanlukijan lampun."
-
 #: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295 backend/kvs40xx_opt.c:516
 #: backend/matsushita.h:219
 #, no-c-format
@@ -3977,7 +4018,7 @@ msgid "single"
 msgstr ""
 
 #: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
-#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx.c:705 backend/kvs40xx.c:723 backend/kvs40xx_opt.c:102
 #: backend/kvs40xx_opt.c:1087
 #, fuzzy, no-c-format
 msgid "continuous"
@@ -4145,9 +4186,9 @@ msgid "crt"
 msgstr ""
 
 #: backend/kvs1025_opt.c:229
-#, no-c-format
-msgid "linier"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "linear"
+msgstr "Viivapiirros"
 
 #: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
@@ -4276,7 +4317,7 @@ msgstr "Asettaa kuvan korostuksen"
 
 #: backend/kvs1025_opt.c:807 backend/kvs1025_opt.c:808
 #: backend/matsushita.c:1300 backend/matsushita.c:1301
-#: backend/pixma_sane_options.c:112
+#: backend/pixma/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr "Gamma"
@@ -4343,11 +4384,11 @@ msgstr ""
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
 
-#: backend/kvs20xx_opt.c:233 backend/kvs40xx_opt.c:396
+#: backend/kvs20xx_opt.c:233
 #, no-c-format
 msgid ""
-"Length Control Mode is a mode that the scanner reads up to the shorter "
-"length of actual paper or logical document length."
+"Length Control Mode causes the scanner to read the shorter of either the "
+"length of the actual paper or logical document length."
 msgstr ""
 
 #: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
@@ -4379,12 +4420,12 @@ msgstr ""
 
 #: backend/kvs40xx_opt.c:231
 #, fuzzy, no-c-format
-msgid "High sensivity"
+msgid "High sensitivity"
 msgstr "Korkeatarkkuuksinen tulostus"
 
 #: backend/kvs40xx_opt.c:232
 #, fuzzy, no-c-format
-msgid "Low sensivity"
+msgid "Low sensitivity"
 msgstr "Matalatarkkuuksinen tulostus"
 
 #: backend/kvs40xx_opt.c:243
@@ -4407,6 +4448,13 @@ msgstr "Normaali"
 msgid "Enhanced mode"
 msgstr "Parannus"
 
+#: backend/kvs40xx_opt.c:396
+#, 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 ""
+
 #: backend/kvs40xx_opt.c:405
 #, no-c-format
 msgid ""
@@ -4466,7 +4514,7 @@ msgstr ""
 
 #: backend/kvs40xx_opt.c:718
 #, no-c-format
-msgid "JPEG compression (yours application must be able to uncompress)"
+msgid "JPEG compression (your application must be able to uncompress)"
 msgstr ""
 
 #: backend/kvs40xx_opt.c:737 backend/kvs40xx_opt.c:738
@@ -4501,12 +4549,12 @@ msgstr ""
 
 #: backend/kvs40xx_opt.c:808
 #, no-c-format
-msgid "Stop scanner when a paper have been skewed"
+msgid "Stop scanner if a sheet is skewed"
 msgstr ""
 
 #: backend/kvs40xx_opt.c:809
 #, no-c-format
-msgid "Scanner will be stop  when a paper have been skewed"
+msgid "Scanner will stop if a sheet is skewed"
 msgstr ""
 
 #: backend/kvs40xx_opt.c:816
@@ -4516,13 +4564,13 @@ msgstr ""
 
 #: backend/kvs40xx_opt.c:817
 #, no-c-format
-msgid "Scanner automatically detect image area and crop it"
+msgid "Scanner will automatically detect image area and crop to it"
 msgstr ""
 
 #: backend/kvs40xx_opt.c:827
-#, no-c-format
-msgid "It is right and left reversing"
-msgstr ""
+#, fuzzy, no-c-format
+msgid "Left/right mirror image"
+msgstr "Peilikuva"
 
 #: backend/kvs40xx_opt.c:834 backend/kvs40xx_opt.c:835
 #, no-c-format
@@ -4559,52 +4607,52 @@ msgstr "8x8 Bayer"
 msgid "8x8 Vertical Line"
 msgstr "8x8 pystyviiva"
 
-#: backend/lexmark.c:273 backend/umax_pp.c:715
+#: backend/lexmark.c:273 backend/umax_pp.c:705
 #, no-c-format
 msgid "Gain"
 msgstr "Vahvistus"
 
-#: backend/lexmark.c:274 backend/umax_pp.c:716
+#: backend/lexmark.c:274 backend/umax_pp.c:706
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr "Värikanavien vahvistus"
 
-#: backend/lexmark.c:283 backend/umax_pp.c:723
+#: backend/lexmark.c:283 backend/umax_pp.c:713
 #, no-c-format
 msgid "Gray gain"
 msgstr "Harmaan vahvistus"
 
-#: backend/lexmark.c:284 backend/umax_pp.c:724
+#: backend/lexmark.c:284 backend/umax_pp.c:714
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr "Asettaa harmaan kanavan vahvistusta"
 
-#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
+#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:725
 #, no-c-format
 msgid "Red gain"
 msgstr "Punaisen vahvistus"
 
-#: backend/lexmark.c:298 backend/umax_pp.c:736
+#: backend/lexmark.c:298 backend/umax_pp.c:726
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr "Asettaa punaisen kanavan vahvistusta"
 
-#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
+#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:737
 #, no-c-format
 msgid "Green gain"
 msgstr "Vihreän vahvistus"
 
-#: backend/lexmark.c:312 backend/umax_pp.c:748
+#: backend/lexmark.c:312 backend/umax_pp.c:738
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr "Asettaa vihreän kanavan vahvistusta"
 
-#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
+#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:749
 #, no-c-format
 msgid "Blue gain"
 msgstr "Sinisen vahvistus"
 
-#: backend/lexmark.c:326 backend/umax_pp.c:760
+#: backend/lexmark.c:326 backend/umax_pp.c:750
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr "Asettaa sinisen kanavan vahvistusta"
@@ -4690,7 +4738,7 @@ msgstr "Yksi sivu"
 msgid "All pages"
 msgstr "Kaikki sivut"
 
-#: backend/matsushita.c:1034 backend/plustek.c:1333
+#: backend/matsushita.c:1034 backend/p5_device.c:8 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr "arkkisyöttöinen"
@@ -5188,39 +5236,44 @@ msgstr ""
 "Lämmittää kunnes lampun kirkkaus tasaantuu. Muuten lämmitetään 40 "
 "sekuntia."
 
-#: backend/pixma.c:397
+#: backend/p5.c:1926
+#, fuzzy, no-c-format
+msgid "Need calibration"
+msgstr "Raakakalibrointi"
+
+#: backend/pixma/pixma.c:397
 #, fuzzy, no-c-format
 msgid "Negative color"
 msgstr "Negatiivifilmi"
 
-#: backend/pixma.c:402
+#: backend/pixma/pixma.c:402
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negatiivi"
 
-#: backend/pixma.c:415
+#: backend/pixma/pixma.c:415
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: backend/pixma.c:420
+#: backend/pixma/pixma.c:420
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: backend/pixma_sane_options.c:84
+#: backend/pixma/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before "
 "mode and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: backend/pixma_sane_options.c:98
+#: backend/pixma/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:99
+#: backend/pixma/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -5228,40 +5281,40 @@ msgid ""
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: backend/pixma_sane_options.c:232
+#: backend/pixma/pixma_sane_options.c:232
 #, fuzzy, no-c-format
 msgid "Update button state"
 msgstr "Painikkeen tila"
 
-#: backend/pixma_sane_options.c:244
+#: backend/pixma/pixma_sane_options.c:244
 #, fuzzy, no-c-format
 msgid "Button 1"
 msgstr "Painikkeen tila"
 
-#: backend/pixma_sane_options.c:258
+#: backend/pixma/pixma_sane_options.c:258
 #, fuzzy, no-c-format
 msgid "Button 2"
 msgstr "Painikkeen tila"
 
-#: backend/pixma_sane_options.c:272
+#: backend/pixma/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:286
+#: backend/pixma/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: backend/pixma_sane_options.c:348
+#: backend/pixma/pixma_sane_options.c:348
 #, no-c-format
 msgid "ADF Waiting Time"
 msgstr ""
 
-#: backend/pixma_sane_options.c:349
+#: backend/pixma/pixma_sane_options.c:349
 #, no-c-format
 msgid ""
-"When set, the scanner searches the waiting time in seconds for a new "
+"When set, the scanner waits upto the specified time in seconds for a new "
 "document inserted into the automatic document feeder."
 msgstr ""
 
@@ -5350,7 +5403,7 @@ msgstr "Analoginen gamma (punainen)"
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: backend/plustek.c:1009 backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:782
 #, no-c-format
 msgid "Red offset"
 msgstr "Punaisen siirtymä"
@@ -5624,7 +5677,7 @@ msgstr ""
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:629
 #, no-c-format
 msgid "Lamp on"
 msgstr "Valo päälle"
@@ -5634,12 +5687,12 @@ msgstr "Valo päälle"
 msgid "Turn on scanner lamp"
 msgstr "Laittaa kuvanlukijan valon päälle"
 
-#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax.c:5812 backend/umax1220u.c:248
 #, no-c-format
 msgid "Lamp off"
 msgstr "Valo pois"
 
-#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax.c:5813 backend/umax1220u.c:249
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr "Sammuttaa kuvanlukijan valon"
@@ -5783,13 +5836,13 @@ msgid "Focus point"
 msgstr "Kohdistuspiste"
 
 #: backend/snapscan-options.c:930
-#, no-c-format
-msgid "Colour lines per read"
+#, fuzzy, no-c-format
+msgid "Color lines per read"
 msgstr "Väririvejä / luku"
 
 #: backend/snapscan-options.c:942
-#, no-c-format
-msgid "Greyscale lines per read"
+#, fuzzy, no-c-format
+msgid "Grayscale lines per read"
 msgstr "Harmaasävyrivejä / luku"
 
 #: backend/stv680.c:974
@@ -6425,52 +6478,52 @@ msgstr "Kalibrointitila"
 msgid "Define calibration mode"
 msgstr "Määrää kalibraatiotavan"
 
-#: backend/umax_pp.c:640
+#: backend/umax_pp.c:630
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr "Asettaa valon päälle/pois"
 
-#: backend/umax_pp.c:649
+#: backend/umax_pp.c:639
 #, no-c-format
 msgid "UTA on"
 msgstr "UTA päällä"
 
-#: backend/umax_pp.c:650
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr "Asettaa UTAN päälle/pois"
 
-#: backend/umax_pp.c:771
+#: backend/umax_pp.c:761
 #, no-c-format
 msgid "Offset"
 msgstr "Siirtymä"
 
-#: backend/umax_pp.c:773
+#: backend/umax_pp.c:763
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr "Värikanavien siirtymä"
 
-#: backend/umax_pp.c:780
+#: backend/umax_pp.c:770
 #, no-c-format
 msgid "Gray offset"
 msgstr "Harmaan siirtymä"
 
-#: backend/umax_pp.c:781
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr "Asettaa harmaan kanavan siirtymän"
 
-#: backend/umax_pp.c:793
+#: backend/umax_pp.c:783
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr "Asettaa punaisen kanavan siirtymän"
 
-#: backend/umax_pp.c:805
+#: backend/umax_pp.c:795
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr "Asettaa vihreän kanavan siirtymän"
 
-#: backend/umax_pp.c:817
+#: backend/umax_pp.c:807
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr "Asettaa sinisen kanavan siirtymän"