Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

1 files changed, 1040 insertions, 909 deletions

diff --git a/po/fi.po b/po/fi.po
index 7aeae26..27117bf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sane-backends 1.0.11\n"
-"Report-Msgid-Bugs-To: sane-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2017-05-22 11:18-0400\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: 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,36 +27,36 @@ msgid "Standard"
 msgstr ""
 
 #: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
-#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
-#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
-#: backend/kvs1025_opt.c:640 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:4361 backend/mustek_usb.c:305
-#: backend/mustek_usb2.c:465 backend/pixma_sane_options.c:160
+#: 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:1914 backend/teco3.c:920 backend/test.c:647
-#: backend/u12.c:546 backend/umax.c:5176 backend/umax_pp.c:580
+#: 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:570
 #, no-c-format
 msgid "Geometry"
 msgstr "Geometria"
 
 #: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
-#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
-#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
-#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
-#: backend/mustek.c:4409 backend/mustek_usb.c:353
+#: 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:1962 backend/teco3.c:968
-#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
+#: 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"
 
-#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1215
 #: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
 #: backend/rts8891.c:2831 backend/snapscan-options.c:923
 #: backend/umax.c:5565
@@ -84,8 +84,8 @@ msgstr "Pakota yksiväriset esikatselut"
 msgid "Bit depth"
 msgstr "Bittisyvyys"
 
-#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
-#: backend/pixma_sane_options.c:47
+#: include/sane/saneopts.h:165 backend/canon.c:1140 backend/leo.c:781
+#: backend/pixma/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "Lukutapa"
@@ -125,8 +125,8 @@ msgstr "Oikea alakulma x"
 msgid "Bottom-right y"
 msgstr "Oikea alakulma y"
 
-#: include/sane/saneopts.h:173 backend/canon.c:1221
-#: backend/pixma_sane_options.c:300
+#: include/sane/saneopts.h:173 backend/canon.c:1216
+#: 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:3186
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3237
 #, no-c-format
 msgid "Halftone pattern"
 msgstr "Rasterikuvio"
@@ -291,9 +291,9 @@ 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:3235 backend/mustek_usb2.c:121
+#: 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"
@@ -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
@@ -960,7 +960,7 @@ msgstr "Oletukset"
 msgid "Set default values for enhancement controls."
 msgstr "Aseta oletusasetukset parantimille."
 
-#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1611
 #, no-c-format
 msgid "Calibration"
 msgstr "Kalibrointi"
@@ -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,87 +1018,47 @@ 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
-#, 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
+#: backend/canon-sane.c:674 backend/canon.c:171
 #, 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
 msgid "Slides"
 msgstr "Dia"
 
-#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
+#: backend/canon.c:186 backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:273
 #: backend/matsushita.c:178
 #, no-c-format
 msgid "Automatic"
@@ -1119,530 +1079,580 @@ msgstr "2x2 normaali"
 msgid "1/3 normal speed"
 msgstr "3x3 normaali"
 
-#: backend/canon.c:365
+#: backend/canon.c:360
 #, fuzzy, no-c-format
 msgid "rounded parameter"
 msgstr "Epämääräiset parametrit"
 
-#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
-#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
+#: backend/canon.c:363 backend/canon.c:379 backend/canon.c:414
+#: backend/canon.c:464 backend/canon.c:482 backend/canon.c:525
 #, no-c-format
 msgid "unknown"
 msgstr ""
 
-#: backend/canon.c:378
+#: backend/canon.c:373
 #, fuzzy, no-c-format
 msgid "ADF jam"
 msgstr "ADF"
 
-#: backend/canon.c:381
+#: backend/canon.c:376
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: backend/canon.c:394
+#: backend/canon.c:389
 #, fuzzy, no-c-format
 msgid "lamp failure"
 msgstr "Gamma"
 
-#: backend/canon.c:397
+#: backend/canon.c:392
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: backend/canon.c:400
+#: backend/canon.c:395
 #, no-c-format
 msgid "CPU check error"
 msgstr ""
 
-#: backend/canon.c:403
+#: backend/canon.c:398
 #, no-c-format
 msgid "RAM check error"
 msgstr ""
 
-#: backend/canon.c:406
+#: backend/canon.c:401
 #, no-c-format
 msgid "ROM check error"
 msgstr ""
 
-#: backend/canon.c:409
+#: backend/canon.c:404
 #, no-c-format
 msgid "hardware check error"
 msgstr ""
 
-#: backend/canon.c:412
+#: backend/canon.c:407
 #, fuzzy, no-c-format
 msgid "transparency unit lamp failure"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: backend/canon.c:415
+#: backend/canon.c:410
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: backend/canon.c:429
+#: backend/canon.c:424
 #, no-c-format
 msgid "parameter list length error"
 msgstr ""
 
-#: backend/canon.c:433
+#: backend/canon.c:428
 #, no-c-format
 msgid "invalid command operation code"
 msgstr ""
 
-#: backend/canon.c:437
+#: backend/canon.c:432
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: backend/canon.c:441
+#: backend/canon.c:436
 #, no-c-format
 msgid "unsupported LUN"
 msgstr ""
 
-#: backend/canon.c:445
+#: backend/canon.c:440
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: backend/canon.c:449
+#: backend/canon.c:444
 #, no-c-format
 msgid "command sequence error"
 msgstr ""
 
-#: backend/canon.c:453
+#: backend/canon.c:448
 #, no-c-format
 msgid "too many windows specified"
 msgstr ""
 
-#: backend/canon.c:457
+#: backend/canon.c:452
 #, no-c-format
 msgid "medium not present"
 msgstr ""
 
-#: backend/canon.c:461
+#: backend/canon.c:456
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
 
-#: backend/canon.c:465
-#, no-c-format
-msgid "option not connect"
-msgstr ""
+#: backend/canon.c:460
+#, fuzzy, no-c-format
+msgid "option not correct"
+msgstr "Rasterointi ei ole tuettu"
 
-#: backend/canon.c:479
+#: backend/canon.c:474
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: backend/canon.c:483
+#: backend/canon.c:478
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: backend/canon.c:497
+#: backend/canon.c:492
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: backend/canon.c:501
+#: backend/canon.c:496
 #, no-c-format
 msgid "reselect failure"
 msgstr ""
 
-#: backend/canon.c:505
+#: backend/canon.c:500
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: backend/canon.c:509
+#: backend/canon.c:504
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: backend/canon.c:514
+#: backend/canon.c:509
 #, no-c-format
 msgid "invalid message error"
 msgstr ""
 
-#: backend/canon.c:518
+#: backend/canon.c:513
 #, no-c-format
 msgid "timeout error"
 msgstr ""
 
-#: backend/canon.c:522
+#: backend/canon.c:517
 #, fuzzy, no-c-format
 msgid "transparency unit shading error"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: backend/canon.c:526
+#: backend/canon.c:521
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: backend/canon.c:852 backend/canon.c:867
+#: backend/canon.c:847 backend/canon.c:862
 #, fuzzy, no-c-format
 msgid "film scanner"
 msgstr "Tasokuvanlukija"
 
-#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
-#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
-#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/canon.c:877 backend/canon.c:892 backend/canon.c:907
+#: backend/canon.c:922 backend/hp3900_sane.c:1683 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1832
 #: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr "Tasokuvanlukija"
 
-#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
+#: backend/canon.c:1178 backend/epson.c:3386 backend/epson2.c:1364
 #, no-c-format
 msgid "Film type"
 msgstr "Filmin tyyppi"
 
-#: backend/canon.c:1184
+#: backend/canon.c:1179
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: backend/canon.c:1196
+#: backend/canon.c:1191
 #, fuzzy, no-c-format
 msgid "Negative film type"
 msgstr "Negatiivifilmi"
 
-#: backend/canon.c:1197
+#: backend/canon.c:1192
 #, fuzzy, no-c-format
 msgid "Selects the negative film type"
 msgstr "Valitse koekuva"
 
-#: backend/canon.c:1236
+#: backend/canon.c:1231
 #, fuzzy, no-c-format
 msgid "Hardware resolution"
 msgstr "Kuvanluvun tarkkuus"
 
-#: backend/canon.c:1237
+#: backend/canon.c:1232
 #, fuzzy, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "Näyttää lyhyen tarkkuuslistan"
 
-#: backend/canon.c:1318
+#: backend/canon.c:1313
 #, no-c-format
 msgid "Focus"
 msgstr ""
 
-#: backend/canon.c:1328
+#: backend/canon.c:1323
 #, fuzzy, no-c-format
 msgid "Auto focus"
 msgstr "Automaattinen poisto"
 
-#: backend/canon.c:1329
+#: backend/canon.c:1324
 #, fuzzy, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "Poista esitarkennus"
 
-#: backend/canon.c:1336
+#: backend/canon.c:1331
 #, no-c-format
 msgid "Auto focus only once"
 msgstr ""
 
-#: backend/canon.c:1337
+#: backend/canon.c:1332
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: backend/canon.c:1345
+#: backend/canon.c:1340
 #, fuzzy, no-c-format
 msgid "Manual focus position"
 msgstr "Korjaa tarkennuspiste"
 
-#: backend/canon.c:1346
+#: backend/canon.c:1341
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: backend/canon.c:1356
+#: backend/canon.c:1351
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: backend/canon.c:1403
+#: backend/canon.c:1398
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/canon.c:1533 backend/epson.c:3205 backend/epson2.c:1254
 #: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr "Peilikuva"
 
-#: backend/canon.c:1539
+#: backend/canon.c:1534
 #, fuzzy, no-c-format
 msgid "Mirror the image horizontally"
 msgstr "Peilaa kuvan vaakasuunnassa"
 
-#: backend/canon.c:1608
+#: backend/canon.c:1603
 #, fuzzy, no-c-format
 msgid "Auto exposure"
 msgstr "Aseta valotusaika"
 
-#: backend/canon.c:1609
+#: backend/canon.c:1604
 #, fuzzy, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr "Valotusajan asettaminen"
 
-#: backend/canon.c:1625
+#: backend/canon.c:1620
 #, fuzzy, no-c-format
 msgid "Calibration now"
 msgstr "Kalibrointi"
 
-#: backend/canon.c:1626
+#: backend/canon.c:1621
 #, fuzzy, no-c-format
 msgid "Execute calibration *now*"
 msgstr "Määrää kalibraatiotavan"
 
-#: backend/canon.c:1636
+#: backend/canon.c:1631
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1637
+#: backend/canon.c:1632
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1648
+#: backend/canon.c:1643
 #, fuzzy, no-c-format
 msgid "Reset scanner"
 msgstr "arkkisyöttöinen"
 
-#: backend/canon.c:1649
+#: backend/canon.c:1644
 #, fuzzy, no-c-format
 msgid "Reset the scanner"
 msgstr "arkkisyöttöinen"
 
-#: backend/canon.c:1659
+#: backend/canon.c:1654
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: backend/canon.c:1668
+#: backend/canon.c:1663
 #, fuzzy, no-c-format
 msgid "Eject film after each scan"
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: backend/canon.c:1669
+#: backend/canon.c:1664
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: backend/canon.c:1680
+#: backend/canon.c:1675
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: backend/canon.c:1681
+#: backend/canon.c:1676
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: backend/canon.c:1690
+#: backend/canon.c:1685
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: backend/canon.c:1691
+#: backend/canon.c:1686
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: backend/canon.c:1700
+#: backend/canon.c:1695
 #, fuzzy, no-c-format
 msgid "Document feeder extras"
 msgstr "Asiakirjan syöttäjä"
 
-#: backend/canon.c:1707
+#: backend/canon.c:1702
 #, fuzzy, no-c-format
 msgid "Flatbed only"
 msgstr "Taso"
 
-#: backend/canon.c:1708
+#: backend/canon.c:1703
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: backend/canon.c:1718 backend/canon.c:1728
+#: backend/canon.c:1713 backend/canon.c:1723
 #, fuzzy, no-c-format
 msgid "Transparency unit"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: backend/canon.c:1729
+#: backend/canon.c:1724
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: backend/canon.c:1739
+#: backend/canon.c:1734
 #, fuzzy, no-c-format
 msgid "Negative film"
 msgstr "Negatiivifilmi"
 
-#: backend/canon.c:1740
+#: backend/canon.c:1735
 #, fuzzy, no-c-format
 msgid "Positive or negative film"
 msgstr "Positiivifilmi"
 
-#: backend/canon.c:1749
+#: backend/canon.c:1744
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: backend/canon.c:1750
+#: backend/canon.c:1745
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: backend/canon.c:1761
+#: backend/canon.c:1756
 #, fuzzy, no-c-format
 msgid "Transparency ratio"
 msgstr "Läpinäkyvyysyksikkö"
 
-#: backend/canon.c:1775
+#: backend/canon.c:1770
 #, fuzzy, no-c-format
 msgid "Select film type"
 msgstr "Filmin tyyppi"
 
-#: backend/canon.c:1776
+#: backend/canon.c:1771
 #, fuzzy, no-c-format
 msgid "Select the film type"
 msgstr "Valitsee rasterin"
 
-#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
-#: backend/epson2.c:115 backend/fujitsu.c:672 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:85 backend/ma1509.c:108
-#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
-#: backend/mustek.c:164 backend/pixma.c:901
-#: backend/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: 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:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: 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:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: 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:411 backend/epjitsu.c:236 backend/fujitsu.c:675
-#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
+#: 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:412
+#: backend/canon_dr.c:417
 #, fuzzy, no-c-format
 msgid "Card Front"
 msgstr "Tulosta"
 
-#: backend/canon_dr.c:413
+#: backend/canon_dr.c:418
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: backend/canon_dr.c:414
+#: backend/canon_dr.c:419
 #, fuzzy, no-c-format
 msgid "Card Duplex"
 msgstr "Kaksipuolinen"
 
-#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
-#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
-#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
+#: 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:422 backend/epson.c:600 backend/epson.c:3092
-#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
-#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
+#: 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:423 backend/epson.c:601 backend/epson.c:3100
-#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
-#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
+#: 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:424
+#: backend/canon_dr.c:429
 #, fuzzy, no-c-format
 msgid "Enhance Red"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:425
+#: backend/canon_dr.c:430
 #, fuzzy, no-c-format
 msgid "Enhance Green"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:426
+#: backend/canon_dr.c:431
 #, fuzzy, no-c-format
 msgid "Enhance Blue"
 msgstr "Parannus"
 
-#: backend/canon_dr.c:428 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:698 backend/genesys.c: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:429 backend/fujitsu.c:699
+#: backend/canon_dr.c:434 backend/fujitsu.c:704
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
-#: backend/kvs1025_opt.c:911
+#: 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:2450 backend/fujitsu.c:4067
+#: 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:918
+#: 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:906 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ö"
@@ -1754,8 +1764,8 @@ msgstr "Mustesuihkutulostimet"
 msgid "CRT monitors"
 msgstr "Loisteputkinäytöt"
 
-#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
-#: backend/hp-option.c:3226 backend/test.c:143
+#: 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"
 msgstr "Oletus"
@@ -1818,51 +1828,51 @@ msgstr "A4"
 msgid "Max"
 msgstr "Koko alue"
 
-#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
-#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
-#: 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:4203 backend/mustek_usb.c:260
-#: backend/mustek_usb2.c:344 backend/niash.c:734 backend/plustek.c:721
-#: backend/plustek_pp.c:658 backend/sceptre.c:673
+#: 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
+#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:673
 #: backend/snapscan-options.c:354 backend/stv680.c:1030
-#: backend/teco2.c:1886 backend/test.c:306 backend/u12.c:473
+#: backend/teco2.c:1882 backend/test.c:306 backend/u12.c:473
 #: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr "Lukutapa"
 
-#: backend/epson.c:2845 backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1011
 #, no-c-format
 msgid "Selects the halftone."
 msgstr "Valitsee rasterin"
 
-#: backend/epson.c:2867 backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1032
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: backend/epson.c:2868 backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1033
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: backend/epson.c:2880 backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1045
 #, no-c-format
 msgid "Selects the brightness."
 msgstr "Valitsee kirkkauden."
 
-#: backend/epson.c:2895 backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1058
 #, no-c-format
 msgid "Sharpness"
 msgstr "Terävyys"
 
-#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1174 backend/epson2.c:1221
 #, no-c-format
 msgid "Color correction"
 msgstr "Värikorjaus"
 
-#: backend/epson.c:3034 backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1176
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr "Valitsee värikorjaustaulukon valitulle tuloslaitteelle."
@@ -1952,17 +1962,17 @@ msgstr "Lisää punaista sinisen määrän perusteella"
 msgid "Controls blue level"
 msgstr "Määrää sinisen määrän"
 
-#: backend/epson.c:3206 backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1255
 #, no-c-format
 msgid "Mirror the image."
 msgstr "Peilaa kuvan."
 
-#: backend/epson.c:3232 backend/mustek.c:4332
+#: backend/epson.c:3232 backend/mustek.c:4344
 #, no-c-format
 msgid "Fast preview"
 msgstr "Nopea esikatselu"
 
-#: backend/epson.c:3245 backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1265
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr "Automaattinen osittelu"
@@ -1992,47 +2002,49 @@ msgstr "Määrää kuvanlukijan käyttämän zoom-kertoimen"
 msgid "Quick format"
 msgstr "Nopea formaatti"
 
-#: backend/epson.c:3360 backend/epson2.c:1341
+#: 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:1394
+#: 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:1395
+#: 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"
 
-#: backend/epson.c:3444 backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1404
 #, no-c-format
 msgid "Auto eject"
 msgstr "Automaattinen poisto"
 
-#: backend/epson.c:3445 backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1406
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr "Poista kohde kuvanluvun jälkeen"
 
-#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
+#: 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:1419 backend/magicolor.c:2421
+#: 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)"
 
-#: backend/epson.c:3473 backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1430
 #, no-c-format
 msgid "Bay"
 msgstr "Taso"
 
-#: backend/epson.c:3474 backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1431
 #, no-c-format
 msgid "Select bay to scan"
 msgstr "Valitsee kuvanluvun tasolta"
@@ -2071,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:390
+#: 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
@@ -2101,492 +2113,512 @@ msgstr ""
 msgid "User defined CCT profile"
 msgstr "Käyttäjän määrittelemä"
 
-#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
+#: 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:684 backend/hp-option.c:3159 backend/hp-option.c:3326
-#: backend/hp-option.c:3339
+#: 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:686
+#: backend/fujitsu.c:691
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: backend/fujitsu.c:687
+#: backend/fujitsu.c:692
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
-#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
+#: 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:690
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: backend/fujitsu.c:695
+#: backend/fujitsu.c:700
 #, fuzzy, no-c-format
 msgid "White"
 msgstr "Valkotaso"
 
-#: backend/fujitsu.c:696
+#: backend/fujitsu.c:701
 #, fuzzy, no-c-format
 msgid "Black"
 msgstr "Mustataso"
 
-#: backend/fujitsu.c:701
+#: backend/fujitsu.c:706
 #, fuzzy, no-c-format
 msgid "Continue"
 msgstr "Ehdollinen"
 
-#: backend/fujitsu.c:702
+#: backend/fujitsu.c:707
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: backend/fujitsu.c:704
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: backend/fujitsu.c:705
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: backend/fujitsu.c:706
+#: backend/fujitsu.c:711
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: backend/fujitsu.c:708 backend/hp-option.c:3045
+#: backend/fujitsu.c:713 backend/hp-option.c:3048
 #, no-c-format
 msgid "Horizontal"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:709
+#: backend/fujitsu.c:714
 #, fuzzy, no-c-format
 msgid "Horizontal bold"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:710
+#: backend/fujitsu.c:715
 #, fuzzy, no-c-format
 msgid "Horizontal narrow"
 msgstr "Vaaka"
 
-#: backend/fujitsu.c:711 backend/hp-option.c:3044
+#: backend/fujitsu.c:716 backend/hp-option.c:3047
 #, no-c-format
 msgid "Vertical"
 msgstr "Pysty"
 
-#: backend/fujitsu.c:712
+#: backend/fujitsu.c:717
 #, fuzzy, no-c-format
 msgid "Vertical bold"
 msgstr "Pysty"
 
-#: backend/fujitsu.c:714
+#: backend/fujitsu.c:719
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: backend/fujitsu.c:715
+#: backend/fujitsu.c:720
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: backend/fujitsu.c:717
+#: backend/fujitsu.c:722
 #, fuzzy, no-c-format
 msgid "Front"
 msgstr "Tulosta"
 
-#: backend/fujitsu.c:718
+#: backend/fujitsu.c:723
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: backend/fujitsu.c:3097 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:3098 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:3147
+#: backend/fujitsu.c:3198
 #, no-c-format
 msgid "RIF"
 msgstr ""
 
-#: backend/fujitsu.c:3148
+#: backend/fujitsu.c:3199
 #, no-c-format
 msgid "Reverse image format"
 msgstr ""
 
-#: backend/fujitsu.c:3165
+#: backend/fujitsu.c:3216
 #, fuzzy, no-c-format
 msgid "Halftone type"
 msgstr "Rasteri"
 
-#: backend/fujitsu.c:3166
+#: backend/fujitsu.c:3217
 #, no-c-format
 msgid "Control type of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3187
+#: backend/fujitsu.c:3238
 #, no-c-format
 msgid "Control pattern of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3209
+#: backend/fujitsu.c:3260
 #, no-c-format
 msgid "Outline"
 msgstr ""
 
-#: backend/fujitsu.c:3210
+#: backend/fujitsu.c:3261
 #, fuzzy, no-c-format
 msgid "Perform outline extraction"
 msgstr "Raakakalibrointi"
 
-#: backend/fujitsu.c:3221
+#: backend/fujitsu.c:3272
 #, fuzzy, no-c-format
 msgid "Emphasis"
 msgstr "Kuvan korostus"
 
-#: backend/fujitsu.c:3222
+#: backend/fujitsu.c:3273
 #, no-c-format
 msgid "Negative to smooth or positive to sharpen image"
 msgstr ""
 
-#: backend/fujitsu.c:3240
+#: backend/fujitsu.c:3291
 #, fuzzy, no-c-format
 msgid "Separation"
 msgstr "Kylläisyys"
 
-#: backend/fujitsu.c:3241
+#: 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:3252
+#: backend/fujitsu.c:3303
 #, fuzzy, no-c-format
 msgid "Mirroring"
 msgstr "Peilikuva"
 
-#: backend/fujitsu.c:3253
+#: backend/fujitsu.c:3304
 #, fuzzy, no-c-format
 msgid "Reflect output image horizontally"
 msgstr "Peilaa kuvan vaakasuunnassa"
 
-#: backend/fujitsu.c:3270
+#: backend/fujitsu.c:3321
 #, fuzzy, no-c-format
 msgid "White level follower"
 msgstr "Sinisen valkotaso"
 
-#: backend/fujitsu.c:3271
+#: backend/fujitsu.c:3322
 #, fuzzy, no-c-format
 msgid "Control white level follower"
 msgstr "Määrää punaisen määrän"
 
-#: backend/fujitsu.c:3289
+#: backend/fujitsu.c:3340
 #, fuzzy, no-c-format
 msgid "BP filter"
 msgstr "Väriviivapiirros"
 
-#: backend/fujitsu.c:3290
+#: backend/fujitsu.c:3341
 #, no-c-format
 msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#: backend/fujitsu.c:3357 backend/hp-option.h:73
 #, no-c-format
 msgid "Smoothing"
 msgstr "Pehmennys"
 
-#: backend/fujitsu.c:3307
+#: backend/fujitsu.c:3358
 #, no-c-format
 msgid "Enable smoothing for improved OCR"
 msgstr ""
 
-#: backend/fujitsu.c:3323
+#: backend/fujitsu.c:3374
 #, fuzzy, no-c-format
 msgid "Gamma curve"
 msgstr "Gamma"
 
-#: backend/fujitsu.c:3324
+#: backend/fujitsu.c:3375
 #, no-c-format
 msgid "Gamma curve, from light to dark, but upper two may not work"
 msgstr ""
 
-#: backend/fujitsu.c:3346 backend/genesys.c:5832
-#: 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:3347
+#: 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:3369
+#: backend/fujitsu.c:3420
 #, fuzzy, no-c-format
 msgid "Threshold white"
 msgstr "Kynnys"
 
-#: backend/fujitsu.c:3370
+#: backend/fujitsu.c:3421
 #, no-c-format
 msgid "Set pixels equal to threshold to white instead of black"
 msgstr ""
 
-#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#: backend/fujitsu.c:3437 backend/fujitsu.c:3438
 #, fuzzy, no-c-format
 msgid "Noise removal"
 msgstr "Kohinan poisto"
 
-#: backend/fujitsu.c:3403
+#: backend/fujitsu.c:3454
 #, no-c-format
 msgid "Matrix 5x5"
 msgstr ""
 
-#: backend/fujitsu.c:3404
+#: backend/fujitsu.c:3455
 #, no-c-format
 msgid "Remove 5 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3420
+#: backend/fujitsu.c:3471
 #, no-c-format
 msgid "Matrix 4x4"
 msgstr ""
 
-#: backend/fujitsu.c:3421
+#: backend/fujitsu.c:3472
 #, no-c-format
 msgid "Remove 4 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3437
+#: backend/fujitsu.c:3488
 #, no-c-format
 msgid "Matrix 3x3"
 msgstr ""
 
-#: backend/fujitsu.c:3438
+#: backend/fujitsu.c:3489
 #, no-c-format
 msgid "Remove 3 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3454
+#: backend/fujitsu.c:3505
 #, no-c-format
 msgid "Matrix 2x2"
 msgstr ""
 
-#: backend/fujitsu.c:3455
+#: backend/fujitsu.c:3506
 #, no-c-format
 msgid "Remove 2 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3474
+#: backend/fujitsu.c:3525
 #, no-c-format
 msgid "Variance"
 msgstr ""
 
-#: backend/fujitsu.c:3475
+#: backend/fujitsu.c:3526
 #, no-c-format
 msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: backend/fujitsu.c:3508
+#: backend/fujitsu.c:3559
 #, fuzzy, no-c-format
 msgid "Auto width detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3509
+#: backend/fujitsu.c:3560
 #, no-c-format
 msgid "Scanner detects paper sides. May reduce scanning speed."
 msgstr ""
 
-#: backend/fujitsu.c:3526
+#: backend/fujitsu.c:3577
 #, fuzzy, no-c-format
 msgid "Auto length detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3527
+#: backend/fujitsu.c:3578
 #, no-c-format
 msgid "Scanner detects paper lower edge. May confuse some frontends."
 msgstr ""
 
-#: backend/fujitsu.c:3553
+#: backend/fujitsu.c:3604
 #, no-c-format
 msgid "Compression"
 msgstr ""
 
-#: backend/fujitsu.c:3554
+#: backend/fujitsu.c:3605
 #, no-c-format
 msgid "Enable compressed data. May crash your front-end program"
 msgstr ""
 
-#: backend/fujitsu.c:3574
+#: backend/fujitsu.c:3625
 #, no-c-format
 msgid "Compression argument"
 msgstr ""
 
-#: backend/fujitsu.c:3575
+#: 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:3605
+#: backend/fujitsu.c:3656
 #, no-c-format
 msgid "DF action"
 msgstr ""
 
-#: backend/fujitsu.c:3606
+#: backend/fujitsu.c:3657
 #, no-c-format
 msgid "Action following double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3622
+#: backend/fujitsu.c:3673
 #, no-c-format
 msgid "DF skew"
 msgstr ""
 
-#: backend/fujitsu.c:3623
+#: backend/fujitsu.c:3674
 #, no-c-format
 msgid "Enable double feed error due to skew"
 msgstr ""
 
-#: backend/fujitsu.c:3641
+#: backend/fujitsu.c:3692
 #, no-c-format
 msgid "DF thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3642
+#: backend/fujitsu.c:3693
 #, no-c-format
 msgid "Enable double feed error due to paper thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3660
+#: backend/fujitsu.c:3711
 #, no-c-format
 msgid "DF length"
 msgstr ""
 
-#: backend/fujitsu.c:3661
+#: backend/fujitsu.c:3712
 #, no-c-format
 msgid "Enable double feed error due to paper length"
 msgstr ""
 
-#: backend/fujitsu.c:3684
+#: backend/fujitsu.c:3735
 #, no-c-format
 msgid "DF length difference"
 msgstr ""
 
-#: backend/fujitsu.c:3685
+#: backend/fujitsu.c:3736
 #, no-c-format
 msgid "Difference in page length to trigger double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3708
+#: backend/fujitsu.c:3759
 #, fuzzy, no-c-format
 msgid "DF recovery mode"
 msgstr "Syöttötapa"
 
-#: backend/fujitsu.c:3709
+#: backend/fujitsu.c:3760
 #, no-c-format
 msgid "Request scanner to reverse feed on paper jam"
 msgstr ""
 
-#: backend/fujitsu.c:3728
+#: backend/fujitsu.c:3779
 #, no-c-format
 msgid "Paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3729
+#: backend/fujitsu.c:3780
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3748
+#: backend/fujitsu.c:3799
 #, fuzzy, no-c-format
 msgid "Advanced paper protection"
 msgstr "Päivitä asetukset"
 
-#: backend/fujitsu.c:3749
+#: backend/fujitsu.c:3800
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF using improved sensors"
 msgstr ""
 
-#: backend/fujitsu.c:3768
+#: backend/fujitsu.c:3819
 #, fuzzy, no-c-format
 msgid "Staple detection"
 msgstr "Ei korjausta"
 
-#: backend/fujitsu.c:3769
+#: backend/fujitsu.c:3820
 #, no-c-format
 msgid "Request scanner to detect jams in the ADF caused by staples"
 msgstr ""
 
-#: backend/fujitsu.c:3788
+#: backend/fujitsu.c:3839
 #, no-c-format
 msgid "Background color"
 msgstr ""
 
-#: backend/fujitsu.c:3789
+#: backend/fujitsu.c:3840
 #, no-c-format
 msgid ""
 "Set color of background for scans. May conflict with overscan option"
 msgstr ""
 
-#: backend/fujitsu.c:3809
+#: backend/fujitsu.c:3860
 #, fuzzy, no-c-format
 msgid "Dropout color"
 msgstr "Valo päälle"
 
-#: backend/fujitsu.c:3810
+#: 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:3833
+#: backend/fujitsu.c:3884
 #, fuzzy, no-c-format
 msgid "Buffer mode"
 msgstr "Syöttötapa"
 
-#: backend/fujitsu.c:3834
+#: backend/fujitsu.c:3885
 #, no-c-format
 msgid "Request scanner to read pages quickly from ADF into internal memory"
 msgstr ""
 
-#: backend/fujitsu.c:3853
+#: backend/fujitsu.c:3904
 #, no-c-format
 msgid "Prepick"
 msgstr ""
 
-#: backend/fujitsu.c:3854
+#: backend/fujitsu.c:3905
 #, no-c-format
 msgid "Request scanner to grab next page from ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3873
+#: backend/fujitsu.c:3924
 #, no-c-format
 msgid "Overscan"
 msgstr ""
 
-#: backend/fujitsu.c:3874
+#: backend/fujitsu.c:3925
 #, no-c-format
 msgid ""
 "Collect a few mm of background on top side of scan, before paper enters "
@@ -2594,65 +2626,65 @@ msgid ""
 "collection on remaining sides. May conflict with bgcolor option"
 msgstr ""
 
-#: backend/fujitsu.c:3892
+#: backend/fujitsu.c:3943
 #, no-c-format
 msgid "Sleep timer"
 msgstr ""
 
-#: backend/fujitsu.c:3893
+#: backend/fujitsu.c:3944
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches to sleep mode"
 msgstr ""
 
-#: backend/fujitsu.c:3911
+#: backend/fujitsu.c:3962
 #, fuzzy, no-c-format
 msgid "Off timer"
 msgstr "Valo pois"
 
-#: backend/fujitsu.c:3912
+#: 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:3930
+#: backend/fujitsu.c:3981
 #, fuzzy, no-c-format
 msgid "Duplex offset"
 msgstr "Sinisen siirtymä"
 
-#: backend/fujitsu.c:3931
+#: backend/fujitsu.c:3982
 #, no-c-format
 msgid "Adjust front/back offset"
 msgstr ""
 
-#: backend/fujitsu.c:3948 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:3949
+#: backend/fujitsu.c:4000
 #, fuzzy, no-c-format
 msgid "Adjust green/red offset"
 msgstr "Vihreän siirtymä"
 
-#: backend/fujitsu.c:3966 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:3967
+#: backend/fujitsu.c:4018
 #, fuzzy, no-c-format
 msgid "Adjust blue/red offset"
 msgstr "Asettaa sinisen kanavan siirtymän"
 
-#: backend/fujitsu.c:3980
+#: backend/fujitsu.c:4031
 #, no-c-format
 msgid "Low Memory"
 msgstr ""
 
-#: backend/fujitsu.c:3981
+#: backend/fujitsu.c:4032
 #, no-c-format
 msgid ""
 "Limit driver memory usage for use in embedded systems. Causes some "
@@ -2661,519 +2693,536 @@ msgid ""
 "only be used with custom front-end software."
 msgstr ""
 
-#: backend/fujitsu.c:3996
+#: backend/fujitsu.c:4047
 #, fuzzy, no-c-format
 msgid "Duplex side"
 msgstr "Kaksipuolinen"
 
-#: backend/fujitsu.c:3997
+#: 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:4008
+#: backend/fujitsu.c:4059
 #, no-c-format
 msgid "Hardware deskew and crop"
 msgstr ""
 
-#: backend/fujitsu.c:4009
+#: backend/fujitsu.c:4060
 #, no-c-format
 msgid "Request scanner to rotate and crop pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#: backend/fujitsu.c:4071 backend/kvs1025_opt.c:871
 #, no-c-format
 msgid "Software deskew"
 msgstr ""
 
-#: backend/fujitsu.c:4021
+#: backend/fujitsu.c:4072
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#: backend/fujitsu.c:4084 backend/kvs1025_opt.c:880
 #, no-c-format
 msgid "Software despeckle diameter"
 msgstr ""
 
-#: backend/fujitsu.c:4034
+#: backend/fujitsu.c:4085
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: backend/fujitsu.c:4053 backend/genesys.c:5760
+#: backend/fujitsu.c:4104 backend/genesys/genesys.cpp:4159
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: backend/fujitsu.c:4054
+#: backend/fujitsu.c:4105
 #, no-c-format
 msgid "Request driver to remove border from pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4083
+#: backend/fujitsu.c:4134
 #, no-c-format
 msgid "Halt on Cancel"
 msgstr ""
 
-#: backend/fujitsu.c:4084
+#: 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:4095
+#: backend/fujitsu.c:4146
 #, fuzzy, no-c-format
 msgid "Endorser Options"
 msgstr "Päivitä asetukset"
 
-#: backend/fujitsu.c:4096
+#: backend/fujitsu.c:4147
 #, no-c-format
 msgid "Controls for endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4107
+#: backend/fujitsu.c:4158
 #, no-c-format
 msgid "Endorser"
 msgstr ""
 
-#: backend/fujitsu.c:4108
+#: backend/fujitsu.c:4159
 #, no-c-format
 msgid "Enable endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4123
+#: backend/fujitsu.c:4174
 #, no-c-format
 msgid "Endorser bits"
 msgstr ""
 
-#: backend/fujitsu.c:4124
+#: backend/fujitsu.c:4175
 #, no-c-format
 msgid "Determines maximum endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4149
+#: backend/fujitsu.c:4200
 #, no-c-format
 msgid "Endorser value"
 msgstr ""
 
-#: backend/fujitsu.c:4150
+#: backend/fujitsu.c:4201
 #, no-c-format
 msgid "Initial endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4173
+#: backend/fujitsu.c:4224
 #, no-c-format
 msgid "Endorser step"
 msgstr ""
 
-#: backend/fujitsu.c:4174
+#: backend/fujitsu.c:4225
 #, no-c-format
 msgid "Change endorser counter value by this much for each page."
 msgstr ""
 
-#: backend/fujitsu.c:4197
+#: backend/fujitsu.c:4248
 #, no-c-format
 msgid "Endorser Y"
 msgstr ""
 
-#: backend/fujitsu.c:4198
+#: backend/fujitsu.c:4249
 #, no-c-format
 msgid "Endorser print offset from top of paper."
 msgstr ""
 
-#: backend/fujitsu.c:4223
+#: backend/fujitsu.c:4274
 #, no-c-format
 msgid "Endorser font"
 msgstr ""
 
-#: backend/fujitsu.c:4224
+#: backend/fujitsu.c:4275
 #, no-c-format
 msgid "Endorser printing font."
 msgstr ""
 
-#: backend/fujitsu.c:4253
+#: backend/fujitsu.c:4304
 #, fuzzy, no-c-format
 msgid "Endorser direction"
 msgstr "Kohinan poisto"
 
-#: backend/fujitsu.c:4254
+#: backend/fujitsu.c:4305
 #, no-c-format
 msgid "Endorser printing direction."
 msgstr ""
 
-#: backend/fujitsu.c:4278
+#: backend/fujitsu.c:4329
 #, no-c-format
 msgid "Endorser side"
 msgstr ""
 
-#: backend/fujitsu.c:4279
+#: backend/fujitsu.c:4330
 #, no-c-format
 msgid "Endorser printing side, requires hardware support to change"
 msgstr ""
 
-#: backend/fujitsu.c:4304
+#: backend/fujitsu.c:4355
 #, no-c-format
 msgid "Endorser string"
 msgstr ""
 
-#: backend/fujitsu.c:4305
+#: 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:4332
+#: backend/fujitsu.c:4383
 #, no-c-format
 msgid "Top edge"
 msgstr ""
 
-#: backend/fujitsu.c:4333
+#: 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:4344
+#: backend/fujitsu.c:4395
 #, fuzzy, no-c-format
 msgid "A3 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4345
+#: backend/fujitsu.c:4396
 #, no-c-format
 msgid "A3 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4356
+#: backend/fujitsu.c:4407
 #, fuzzy, no-c-format
 msgid "B4 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4357
+#: backend/fujitsu.c:4408
 #, no-c-format
 msgid "B4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4368
+#: backend/fujitsu.c:4419
 #, fuzzy, no-c-format
 msgid "A4 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4369
+#: backend/fujitsu.c:4420
 #, no-c-format
 msgid "A4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4380
+#: backend/fujitsu.c:4431
 #, fuzzy, no-c-format
 msgid "B5 paper"
 msgstr "Paperilta"
 
-#: backend/fujitsu.c:4381
+#: backend/fujitsu.c:4432
 #, no-c-format
 msgid "B5 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4404
+#: backend/fujitsu.c:4455
 #, no-c-format
 msgid "OMR or DF"
 msgstr ""
 
-#: backend/fujitsu.c:4405
+#: backend/fujitsu.c:4456
 #, no-c-format
 msgid "OMR or double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4428
+#: backend/fujitsu.c:4479
 #, no-c-format
 msgid "Power saving"
 msgstr ""
 
-#: backend/fujitsu.c:4429
+#: backend/fujitsu.c:4480
 #, no-c-format
 msgid "Scanner in power saving mode"
 msgstr ""
 
-#: backend/fujitsu.c:4452
+#: backend/fujitsu.c:4503
 #, fuzzy, no-c-format
 msgid "Manual feed"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/fujitsu.c:4453
+#: backend/fujitsu.c:4504
 #, fuzzy, no-c-format
 msgid "Manual feed selected"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/fujitsu.c:4476
+#: backend/fujitsu.c:4527
 #, no-c-format
 msgid "Function"
 msgstr ""
 
-#: backend/fujitsu.c:4477
+#: backend/fujitsu.c:4528
 #, no-c-format
 msgid "Function character on screen"
 msgstr ""
 
-#: backend/fujitsu.c:4488
+#: backend/fujitsu.c:4539
 #, no-c-format
 msgid "Ink low"
 msgstr ""
 
-#: backend/fujitsu.c:4489
+#: backend/fujitsu.c:4540
 #, no-c-format
 msgid "Imprinter ink running low"
 msgstr ""
 
-#: backend/fujitsu.c:4500
+#: backend/fujitsu.c:4551
 #, no-c-format
 msgid "Double feed"
 msgstr ""
 
-#: backend/fujitsu.c:4501
+#: backend/fujitsu.c:4552
 #, no-c-format
 msgid "Double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4512
+#: backend/fujitsu.c:4563
 #, no-c-format
 msgid "Error code"
 msgstr ""
 
-#: backend/fujitsu.c:4513
+#: backend/fujitsu.c:4564
 #, fuzzy, no-c-format
 msgid "Hardware error code"
 msgstr "Kuvanluvun tarkkuus"
 
-#: backend/fujitsu.c:4524
+#: backend/fujitsu.c:4575
 #, no-c-format
 msgid "Skew angle"
 msgstr ""
 
-#: backend/fujitsu.c:4525
+#: backend/fujitsu.c:4576
 #, no-c-format
 msgid "Requires black background for scanning"
 msgstr ""
 
-#: backend/fujitsu.c:4536
+#: backend/fujitsu.c:4587
 #, no-c-format
 msgid "Ink remaining"
 msgstr ""
 
-#: backend/fujitsu.c:4537
+#: backend/fujitsu.c:4588
 #, fuzzy, no-c-format
 msgid "Imprinter ink level"
 msgstr "Valkotaso"
 
-#: backend/fujitsu.c:4548
+#: backend/fujitsu.c:4599
 #, fuzzy, no-c-format
 msgid "Density"
 msgstr "Punaisen voimakkuus"
 
-#: backend/fujitsu.c:4549
+#: backend/fujitsu.c:4600
 #, no-c-format
 msgid "Density dial"
 msgstr ""
 
-#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#: backend/fujitsu.c:4611 backend/fujitsu.c:4612
 #, fuzzy, no-c-format
 msgid "Duplex switch"
 msgstr "Kaksipuolinen"
 
-#: backend/genesys.c:5761
+#: backend/genesys/genesys.cpp:4160
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
+#: 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.c:5781 backend/kvs1025_opt.c:893
+#: backend/genesys/genesys.cpp:4179 backend/kvs1025_opt.c:892
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
+#: 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.c:5813 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.c:5833 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.c:5842
-#, no-c-format
-msgid "Disable dynamic lineart"
-msgstr ""
-
-#: backend/genesys.c:5844
-#, no-c-format
-msgid ""
-"Disable use of a software adaptive algorithm to generate lineart relying "
-"instead on hardware lineart."
-msgstr ""
-
-#: backend/genesys.c:5860
+#: backend/genesys/genesys.cpp:4240
 #, fuzzy, no-c-format
 msgid "Disable interpolation"
 msgstr "Poista peruutus."
 
-#: backend/genesys.c:5863
+#: 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.c:5872
+#: backend/genesys/genesys.cpp:4252
 #, fuzzy, no-c-format
 msgid "Color filter"
 msgstr "Väriviivapiirros"
 
-#: backend/genesys.c:5875
+#: backend/genesys/genesys.cpp:4255
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: backend/genesys.c:5901
+#: backend/genesys/genesys.cpp:4279
 #, fuzzy, no-c-format
 msgid "Calibration file"
 msgstr "Kalibrointi"
 
-#: backend/genesys.c:5902
+#: backend/genesys/genesys.cpp:4280
 #, fuzzy, no-c-format
 msgid "Specify the calibration file to use"
 msgstr "Määrää kalibraatiotavan"
 
-#: backend/genesys.c:5919
+#: backend/genesys/genesys.cpp:4297
 #, fuzzy, no-c-format
 msgid "Calibration cache expiration time"
 msgstr "Kalibrointitila"
 
-#: backend/genesys.c:5920
+#: 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.c:5930
+#: backend/genesys/genesys.cpp:4308
 #, fuzzy, no-c-format
 msgid "Lamp off time"
 msgstr "Valo pois"
 
-#: backend/genesys.c:5933
+#: 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.c:5943
+#: backend/genesys/genesys.cpp:4321
 #, fuzzy, no-c-format
 msgid "Lamp off during scan"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.c:5944
+#: backend/genesys/genesys.cpp:4322
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: backend/genesys.c:5972 backend/genesys.c:5973
+#: backend/genesys/genesys.cpp:4349 backend/genesys/genesys.cpp:4350
 #, fuzzy, no-c-format
 msgid "File button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.c:6025 backend/genesys.c:6026
+#: backend/genesys/genesys.cpp:4394 backend/genesys/genesys.cpp:4395
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: backend/genesys.c:6039 backend/genesys.c:6040
+#: backend/genesys/genesys.cpp:4406 backend/genesys/genesys.cpp:4407
 #, fuzzy, no-c-format
 msgid "Power button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.c:6053 backend/genesys.c:6054
+#: backend/genesys/genesys.cpp:4418 backend/genesys/genesys.cpp:4419
 #, fuzzy, no-c-format
 msgid "Extra button"
 msgstr "Odota painiketta"
 
-#: backend/genesys.c:6067 backend/gt68xx.c:762
+#: backend/genesys/genesys.cpp:4430 backend/gt68xx.c:755
 #, fuzzy, no-c-format
-msgid "Need calibration"
+msgid "Needs calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.c:6068 backend/gt68xx.c:763
+#: 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.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
-#: 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.c:6089 backend/gt68xx.c:794 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.c:6091 backend/gt68xx.c:796
+#: 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.c:6105 backend/gt68xx.c:809
+#: backend/genesys/genesys.cpp:4465 backend/gt68xx.c:802 backend/p5.c:1958
 #, fuzzy, no-c-format
 msgid "Clear calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/genesys.c:6106 backend/gt68xx.c:810
+#: backend/genesys/genesys.cpp:4466 backend/gt68xx.c:803 backend/p5.c:1960
 #, fuzzy, no-c-format
 msgid "Clear calibration cache"
 msgstr "Kalibrointitila"
 
-#: 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:4476
+#, fuzzy, no-c-format
+msgid "Force calibration"
+msgstr "Raakakalibrointi"
+
+#: backend/genesys/genesys.cpp:4477
+#, no-c-format
+msgid "Force calibration ignoring all and any calibration caches"
+msgstr ""
+
+#: 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/gt68xx.c:477
+#: 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"
 msgstr ""
 
-#: backend/gt68xx.c:479
+#: backend/gt68xx.c:472
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392
+#: backend/gt68xx.c:553 backend/hp3900_sane.c:1392
 #: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr "Debug-asetukset"
 
-#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
+#: backend/gt68xx.c:564 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr "Automaattinen lämmitys"
 
-#: backend/gt68xx.c:573
+#: backend/gt68xx.c:566
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on "
@@ -3182,12 +3231,12 @@ msgstr ""
 "Lämmittää kunnes lampun kirkkaus tasaantuu. Muuten lämmitetään 60 "
 "sekuntia."
 
-#: backend/gt68xx.c:585
+#: backend/gt68xx.c:578
 #, no-c-format
 msgid "Full scan"
 msgstr "Koko alue"
 
-#: backend/gt68xx.c:587
+#: backend/gt68xx.c:580
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
@@ -3196,12 +3245,12 @@ msgstr ""
 "Lukee koko alueen, mukaan lukien kalibrointinauha. Ole varovainen. Älä "
 "valitse täyttä korkeutta. Tämä asetus on vain testausta varten."
 
-#: backend/gt68xx.c:598
+#: backend/gt68xx.c:591
 #, no-c-format
 msgid "Coarse calibration"
 msgstr "Raakakalibrointi"
 
-#: backend/gt68xx.c:600
+#: backend/gt68xx.c:593
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -3212,12 +3261,12 @@ msgstr ""
 "poissa, voit asettaa analogia-asetukset manuaalisesti. Asetus on "
 "oletuksena päällä. Tämä asetus on vain testausta varten."
 
-#: backend/gt68xx.c:619
+#: backend/gt68xx.c:612
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr "Raakakalibrointi vain ensimmäisellä kuvanluvulla"
 
-#: backend/gt68xx.c:621
+#: backend/gt68xx.c:614
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most "
@@ -3229,12 +3278,12 @@ msgstr ""
 "kirkkaus on eri joka kerralla, poista tämä asetus. Tämä asetus on "
 "testausta varten."
 
-#: backend/gt68xx.c:654
+#: backend/gt68xx.c:647
 #, fuzzy, no-c-format
 msgid "Backtrack lines"
 msgstr "Käytä jäljitystä"
 
-#: backend/gt68xx.c:656
+#: backend/gt68xx.c:649
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. "
@@ -3243,379 +3292,141 @@ msgid ""
 "omitting lines."
 msgstr ""
 
-#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
+#: backend/gt68xx.c:674 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr "Gamma"
 
-#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
+#: backend/gt68xx.c:676 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr "Asettaa gamma-arvon kaikille kanaville."
 
-#: backend/hp3500.c:1020
-#, fuzzy, no-c-format
-msgid "Geometry Group"
-msgstr "Geometria"
-
-#: backend/hp3500.c:1073 backend/hp3500.c:1074
-#, fuzzy, no-c-format
-msgid "Scan Mode Group"
-msgstr "Lukutapa"
-
-#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
-#: backend/hp-option.c:3174
-#, no-c-format
-msgid "Slide"
-msgstr "Dia"
-
-#: backend/hp3900_sane.c:1405
-#, fuzzy, no-c-format
-msgid "Scanner model"
-msgstr "Lukutapa"
-
-#: backend/hp3900_sane.c:1408
-#, no-c-format
-msgid "Allows one to test device behaviour with other supported models"
-msgstr ""
-
-#: backend/hp3900_sane.c:1422
-#, no-c-format
-msgid "Image colours will be inverted"
-msgstr ""
-
-#: backend/hp3900_sane.c:1436
-#, fuzzy, no-c-format
-msgid "Disable gamma correction"
-msgstr "Analoginen gammakorjaus"
-
-#: backend/hp3900_sane.c:1437
-#, fuzzy, no-c-format
-msgid "Gamma correction will be disabled"
-msgstr "Gammakorjaus"
-
-#: backend/hp3900_sane.c:1451
-#, fuzzy, no-c-format
-msgid "Disable white shading correction"
-msgstr "Vain sävykorjaus"
-
-#: backend/hp3900_sane.c:1453
-#, no-c-format
-msgid "White shading correction will be disabled"
-msgstr ""
-
-#: backend/hp3900_sane.c:1467
-#, no-c-format
-msgid "Skip warmup process"
-msgstr ""
-
-#: backend/hp3900_sane.c:1468
-#, no-c-format
-msgid "Warmup process will be disabled"
-msgstr ""
-
-#: backend/hp3900_sane.c:1482
-#, no-c-format
-msgid "Force real depth"
-msgstr ""
-
-#: backend/hp3900_sane.c:1485
-#, no-c-format
-msgid ""
-"If gamma is enabled, scans are always made in 16 bits depth to improve "
-"image quality and then converted to the selected depth. This option "
-"avoids depth emulation."
-msgstr ""
-
-#: backend/hp3900_sane.c:1499
-#, fuzzy, no-c-format
-msgid "Emulate Grayscale"
-msgstr "Harmaasävy"
-
-#: backend/hp3900_sane.c:1502
-#, no-c-format
-msgid ""
-"If enabled, image will be scanned in color mode and then converted to "
-"grayscale by software. This may improve image quality in some "
-"circumstances."
-msgstr ""
-
-#: backend/hp3900_sane.c:1516
-#, no-c-format
-msgid "Save debugging images"
-msgstr ""
-
-#: backend/hp3900_sane.c:1519
-#, no-c-format
-msgid ""
-"If enabled, some images involved in scanner processing are saved to "
-"analyze them."
-msgstr ""
-
-#: backend/hp3900_sane.c:1533
-#, fuzzy, no-c-format
-msgid "Reset chipset"
-msgstr "arkkisyöttöinen"
-
-#: backend/hp3900_sane.c:1534
-#, no-c-format
-msgid "Resets chipset data"
-msgstr ""
-
-#: backend/hp3900_sane.c:1547
-#, fuzzy, no-c-format
-msgid "Information"
-msgstr "Jätä kalibrointi huomiotta"
-
-#: backend/hp3900_sane.c:1560
-#, fuzzy, no-c-format
-msgid "Chipset name"
-msgstr "Tiedostonimi"
-
-#: backend/hp3900_sane.c:1561
-#, no-c-format
-msgid "Shows chipset name used in device."
-msgstr ""
-
-#: backend/hp3900_sane.c:1565
-#, no-c-format
-msgid "Unknown"
-msgstr ""
-
-#: backend/hp3900_sane.c:1571
-#, no-c-format
-msgid "Chipset ID"
-msgstr ""
-
-#: backend/hp3900_sane.c:1572
-#, fuzzy, no-c-format
-msgid "Shows the chipset ID"
-msgstr "arkkisyöttöinen"
-
-#: backend/hp3900_sane.c:1582
-#, fuzzy, no-c-format
-msgid "Scan counter"
-msgstr "Lähde"
-
-#: backend/hp3900_sane.c:1584
-#, fuzzy, no-c-format
-msgid "Shows the number of scans made by scanner"
-msgstr "Valitsee luettavan kehyksen numeron"
-
-#: backend/hp3900_sane.c:1594
-#, fuzzy, no-c-format
-msgid "Update information"
-msgstr "Päivitä asetukset"
-
-#: backend/hp3900_sane.c:1595
-#, no-c-format
-msgid "Updates information about device"
-msgstr ""
-
-#: backend/hp3900_sane.c:1635
-#, no-c-format
-msgid "This option reflects a front panel scanner button"
-msgstr ""
-
-#: backend/hp5400_sane.c:313 backend/niash.c:678
-#, no-c-format
-msgid "Image"
-msgstr ""
-
-#: backend/hp5400_sane.c:352 backend/niash.c:709
-#, no-c-format
-msgid "Miscellaneous"
-msgstr ""
-
-#: backend/hp5400_sane.c:358
-#, fuzzy, no-c-format
-msgid "offset X"
-msgstr "Siirtymä"
-
-#: backend/hp5400_sane.c:359
-#, fuzzy, no-c-format
-msgid "Hardware internal X position of the scanning area."
-msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
-
-#: backend/hp5400_sane.c:368
-#, fuzzy, no-c-format
-msgid "offset Y"
-msgstr "Siirtymä"
-
-#: backend/hp5400_sane.c:369
-#, fuzzy, no-c-format
-msgid "Hardware internal Y position of the scanning area."
-msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
-
-#: backend/hp5400_sane.c:381 backend/niash.c:716
-#, no-c-format
-msgid "Lamp status"
-msgstr ""
-
-#: backend/hp5400_sane.c:382 backend/niash.c:717
-#, fuzzy, no-c-format
-msgid "Switches the lamp on or off."
-msgstr "Asettaa valon päälle/pois"
-
-#: backend/hp5400_sane.c:393 backend/niash.c:727
-#, no-c-format
-msgid "Calibrates for black and white level."
-msgstr ""
-
-#: backend/hp5590.c:86 backend/hp-option.c:3253
-#, no-c-format
-msgid "ADF"
-msgstr "ADF"
-
-#: backend/hp5590.c:88
-#, fuzzy, no-c-format
-msgid "TMA Slides"
-msgstr "Dia"
-
-#: backend/hp5590.c:89
-#, fuzzy, no-c-format
-msgid "TMA Negatives"
-msgstr "Negatiivi"
-
-#: backend/hp5590.c:92
-#, fuzzy, no-c-format
-msgid "Color (48 bits)"
-msgstr "Väri 48"
-
-#: backend/hp5590.c:95
-#, fuzzy, no-c-format
-msgid "Extend lamp timeout"
-msgstr "Valo pois"
-
-#: backend/hp5590.c:96
-#, no-c-format
-msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
-msgstr ""
-
-#: backend/hp5590.c:98
-#, no-c-format
-msgid "Wait for button"
-msgstr "Odota painiketta"
-
-#: backend/hp5590.c:99
-#, fuzzy, no-c-format
-msgid "Waits for button before scanning"
-msgstr "Lämmitä lamppu ennen kuvanlukua"
-
-#: backend/hp-option.c:2984
+#: backend/hp-option.c:2987
 #, fuzzy, no-c-format
 msgid "Advanced Options"
 msgstr "Päivitä asetukset"
 
-#: backend/hp-option.c:3041
+#: backend/hp-option.c:3044
 #, no-c-format
 msgid "Coarse"
 msgstr "Raaka"
 
-#: backend/hp-option.c:3042
+#: backend/hp-option.c:3045
 #, no-c-format
 msgid "Fine"
 msgstr "Hieno"
 
-#: backend/hp-option.c:3043
+#: backend/hp-option.c:3046
 #, no-c-format
 msgid "Bayer"
 msgstr "Bayer"
 
-#: backend/hp-option.c:3046 backend/hp-option.c:3097
+#: backend/hp-option.c:3049 backend/hp-option.c:3100
 #, no-c-format
 msgid "Custom"
 msgstr "Oma"
 
-#: backend/hp-option.c:3087 backend/hp-option.c:3143
-#: backend/hp-option.c:3158
+#: 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:3088
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC RGB"
 msgstr "NTSC-RGB"
 
-#: backend/hp-option.c:3089
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA RGB"
 msgstr "XPA-RGB"
 
-#: backend/hp-option.c:3090
+#: backend/hp-option.c:3093
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: backend/hp-option.c:3091
+#: backend/hp-option.c:3094
 #, no-c-format
 msgid "NTSC Gray"
 msgstr "NTSC-harmaa"
 
-#: backend/hp-option.c:3092
+#: backend/hp-option.c:3095
 #, no-c-format
 msgid "XPA Gray"
 msgstr "XPA-harmaa"
 
-#: backend/hp-option.c:3144
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Slow"
 msgstr "Hidas"
 
-#: backend/hp-option.c:3145 backend/hp-option.c:3252
+#: 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:3146
+#: backend/hp-option.c:3149
 #, no-c-format
 msgid "Fast"
 msgstr "Nopea"
 
-#: backend/hp-option.c:3147
+#: backend/hp-option.c:3150
 #, no-c-format
 msgid "Extra Fast"
 msgstr "Hyvin nopea"
 
-#: backend/hp-option.c:3160
+#: backend/hp-option.c:3163
 #, no-c-format
 msgid "2-pixel"
 msgstr "2 pikseliä"
 
-#: backend/hp-option.c:3161
+#: backend/hp-option.c:3164
 #, no-c-format
 msgid "4-pixel"
 msgstr "4 pikseliä"
 
-#: backend/hp-option.c:3162
+#: backend/hp-option.c:3165
 #, no-c-format
 msgid "8-pixel"
 msgstr "8 pikseliä"
 
-#: backend/hp-option.c:3173
+#: backend/hp-option.c:3176
 #, no-c-format
 msgid "Print"
 msgstr "Tulosta"
 
-#: backend/hp-option.c:3175
+#: 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:3254
+#: 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:3328 backend/hp-option.c:3341
+#: backend/hp-option.c:3331 backend/hp-option.c:3344
 #, no-c-format
 msgid "Conditional"
 msgstr "Ehdollinen"
 
-#: backend/hp-option.c:3414
+#: backend/hp-option.c:3417
 #, fuzzy, no-c-format
 msgid "Experiment"
 msgstr "Valotusaika"
@@ -3714,8 +3525,8 @@ msgid "Color Matrix"
 msgstr "Värimatriisi"
 
 #: backend/hp-option.h:121
-#, no-c-format
-msgid "Set the scanners color matrix."
+#, fuzzy, no-c-format
+msgid "Set the scanner's color matrix."
 msgstr "Aseta kuvanlukijan värimatriisi."
 
 #: backend/hp-option.h:127
@@ -3796,8 +3607,321 @@ msgstr "Sulje lamppu"
 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
+#: backend/hp3500.c:1020
+#, fuzzy, no-c-format
+msgid "Geometry Group"
+msgstr "Geometria"
+
+#: backend/hp3500.c:1073 backend/hp3500.c:1074
+#, fuzzy, no-c-format
+msgid "Scan Mode Group"
+msgstr "Lukutapa"
+
+#: backend/hp3900_sane.c:1405
+#, fuzzy, no-c-format
+msgid "Scanner model"
+msgstr "Lukutapa"
+
+#: backend/hp3900_sane.c:1408
+#, no-c-format
+msgid "Allows one to test device behavior with other supported models"
+msgstr ""
+
+#: backend/hp3900_sane.c:1422
+#, no-c-format
+msgid "Image colors will be inverted"
+msgstr ""
+
+#: backend/hp3900_sane.c:1436
+#, fuzzy, no-c-format
+msgid "Disable gamma correction"
+msgstr "Analoginen gammakorjaus"
+
+#: backend/hp3900_sane.c:1437
+#, fuzzy, no-c-format
+msgid "Gamma correction will be disabled"
+msgstr "Gammakorjaus"
+
+#: backend/hp3900_sane.c:1451
+#, fuzzy, no-c-format
+msgid "Disable white shading correction"
+msgstr "Vain sävykorjaus"
+
+#: backend/hp3900_sane.c:1453
+#, no-c-format
+msgid "White shading correction will be disabled"
+msgstr ""
+
+#: backend/hp3900_sane.c:1467
+#, no-c-format
+msgid "Skip warmup process"
+msgstr ""
+
+#: backend/hp3900_sane.c:1468
+#, no-c-format
+msgid "Warmup process will be disabled"
+msgstr ""
+
+#: backend/hp3900_sane.c:1482
+#, no-c-format
+msgid "Force real depth"
+msgstr ""
+
+#: backend/hp3900_sane.c:1485
+#, no-c-format
+msgid ""
+"If gamma is enabled, scans are always made in 16 bits depth to improve "
+"image quality and then converted to the selected depth. This option "
+"avoids depth emulation."
+msgstr ""
+
+#: backend/hp3900_sane.c:1499
+#, fuzzy, no-c-format
+msgid "Emulate Grayscale"
+msgstr "Harmaasävy"
+
+#: backend/hp3900_sane.c:1502
+#, no-c-format
+msgid ""
+"If enabled, image will be scanned in color mode and then converted to "
+"grayscale by software. This may improve image quality in some "
+"circumstances."
+msgstr ""
+
+#: backend/hp3900_sane.c:1516
+#, no-c-format
+msgid "Save debugging images"
+msgstr ""
+
+#: backend/hp3900_sane.c:1519
+#, no-c-format
+msgid ""
+"If enabled, some images involved in scanner processing are saved to "
+"analyze them."
+msgstr ""
+
+#: backend/hp3900_sane.c:1533
+#, fuzzy, no-c-format
+msgid "Reset chipset"
+msgstr "arkkisyöttöinen"
+
+#: backend/hp3900_sane.c:1534
+#, no-c-format
+msgid "Resets chipset data"
+msgstr ""
+
+#: backend/hp3900_sane.c:1547
+#, fuzzy, no-c-format
+msgid "Information"
+msgstr "Jätä kalibrointi huomiotta"
+
+#: backend/hp3900_sane.c:1560
+#, fuzzy, no-c-format
+msgid "Chipset name"
+msgstr "Tiedostonimi"
+
+#: backend/hp3900_sane.c:1561
+#, no-c-format
+msgid "Shows chipset name used in device."
+msgstr ""
+
+#: backend/hp3900_sane.c:1565
+#, no-c-format
+msgid "Unknown"
+msgstr ""
+
+#: backend/hp3900_sane.c:1571
+#, no-c-format
+msgid "Chipset ID"
+msgstr ""
+
+#: backend/hp3900_sane.c:1572
+#, fuzzy, no-c-format
+msgid "Shows the chipset ID"
+msgstr "arkkisyöttöinen"
+
+#: backend/hp3900_sane.c:1582
+#, fuzzy, no-c-format
+msgid "Scan counter"
+msgstr "Lähde"
+
+#: backend/hp3900_sane.c:1584
+#, fuzzy, no-c-format
+msgid "Shows the number of scans made by scanner"
+msgstr "Valitsee luettavan kehyksen numeron"
+
+#: backend/hp3900_sane.c:1594
+#, fuzzy, no-c-format
+msgid "Update information"
+msgstr "Päivitä asetukset"
+
+#: backend/hp3900_sane.c:1595
+#, no-c-format
+msgid "Updates information about device"
+msgstr ""
+
+#: backend/hp3900_sane.c:1635
+#, no-c-format
+msgid "This option reflects a front panel scanner button"
+msgstr ""
+
+#: backend/hp5400_sane.c:313 backend/niash.c:678
+#, no-c-format
+msgid "Image"
+msgstr ""
+
+#: backend/hp5400_sane.c:352 backend/niash.c:709
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: backend/hp5400_sane.c:358
+#, fuzzy, no-c-format
+msgid "offset X"
+msgstr "Siirtymä"
+
+#: backend/hp5400_sane.c:359
+#, fuzzy, no-c-format
+msgid "Hardware internal X position of the scanning area."
+msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
+
+#: backend/hp5400_sane.c:368
+#, fuzzy, no-c-format
+msgid "offset Y"
+msgstr "Siirtymä"
+
+#: backend/hp5400_sane.c:369
+#, fuzzy, no-c-format
+msgid "Hardware internal Y position of the scanning area."
+msgstr "Kuva-alueen vasemman yläkulman x-koordinaatti."
+
+#: backend/hp5400_sane.c:381 backend/niash.c:716
+#, no-c-format
+msgid "Lamp status"
+msgstr ""
+
+#: backend/hp5400_sane.c:382 backend/niash.c:717
+#, fuzzy, no-c-format
+msgid "Switches the lamp on or off."
+msgstr "Asettaa valon päälle/pois"
+
+#: backend/hp5400_sane.c:393 backend/niash.c:727
+#, no-c-format
+msgid "Calibrates for black and white level."
+msgstr ""
+
+#: backend/hp5590.c:95
+#, fuzzy, no-c-format
+msgid "TMA Slides"
+msgstr "Dia"
+
+#: backend/hp5590.c:96
+#, fuzzy, no-c-format
+msgid "TMA Negatives"
+msgstr "Negatiivi"
+
+#: backend/hp5590.c:108
+#, fuzzy, no-c-format
+msgid "Color (48 bits)"
+msgstr "Väri 48"
+
+#: backend/hp5590.c:112
+#, fuzzy, no-c-format
+msgid "Extend lamp timeout"
+msgstr "Valo pois"
+
+#: backend/hp5590.c:113
+#, no-c-format
+msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
+msgstr ""
+
+#: backend/hp5590.c:115
+#, no-c-format
+msgid "Wait for button"
+msgstr "Odota painiketta"
+
+#: backend/hp5590.c:116
+#, fuzzy, no-c-format
+msgid "Waits for button before scanning"
+msgstr "Lämmitä lamppu ennen kuvanlukua"
+
+#: backend/hp5590.c:118
+#, fuzzy, no-c-format
+msgid "Last button pressed"
+msgstr "Painikkeen tila"
+
+#: backend/hp5590.c:119
+#, no-c-format
+msgid "Get ID of last button pressed (read only)"
+msgstr ""
+
+#: backend/hp5590.c:121
+#, fuzzy, no-c-format
+msgid "LCD counter"
+msgstr "Lähde"
+
+#: backend/hp5590.c:122
+#, no-c-format
+msgid "Get value of LCD counter (read only)"
+msgstr ""
+
+#: backend/hp5590.c:124
+#, fuzzy, no-c-format
+msgid "Color LED indicator"
+msgstr "Väriviivapiirros"
+
+#: backend/hp5590.c:125
+#, no-c-format
+msgid "Get value of LED indicator (read only)"
+msgstr ""
+
+#: backend/hp5590.c:127
+#, no-c-format
+msgid "Document available in ADF"
+msgstr ""
+
+#: backend/hp5590.c:128
+#, no-c-format
+msgid "Get state of document-available indicator in ADF (read only)"
+msgstr ""
+
+#: backend/hp5590.c:130
+#, no-c-format
+msgid "Hide end-of-page pixel"
+msgstr ""
+
+#: backend/hp5590.c:131
+#, no-c-format
+msgid ""
+"Hide end-of-page indicator pixels and overwrite with neighbor pixels"
+msgstr ""
+
+#: backend/hp5590.c:133
+#, no-c-format
+msgid "Filling mode of trailing lines after scan data (ADF)"
+msgstr ""
+
+#: backend/hp5590.c:134
+#, no-c-format
+msgid ""
+"raw = raw scan data, last = repeat last scan line, raster = b/w raster, "
+"white = white color, black = black color, color = RGB or gray color value"
+msgstr ""
+
+#: backend/hp5590.c:137
+#, no-c-format
+msgid "RGB or gray color value for filling mode 'color'"
+msgstr ""
+
+#: backend/hp5590.c:138
+#, no-c-format
+msgid ""
+"Color value for trailing lines filling mode 'color'. RGB color as "
+"r*65536+256*g+b or gray value (default=violet or gray)"
+msgstr ""
+
+#: backend/kvs1025.h:51 backend/kvs20xx_opt.c:295 backend/kvs40xx_opt.c:516
+#: backend/matsushita.h:219
 #, no-c-format
 msgid "Paper size"
 msgstr "Paperin koko"
@@ -3808,8 +3932,7 @@ msgstr "Paperin koko"
 msgid "Automatic separation"
 msgstr "Automaattinen osiointi"
 
-#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307
-#: backend/kvs40xx_opt.c:531
+#: backend/kvs1025.h:53 backend/kvs20xx_opt.c:307 backend/kvs40xx_opt.c:531
 #, fuzzy, no-c-format
 msgid "Landscape"
 msgstr "A5 vaaka"
@@ -3824,38 +3947,34 @@ msgstr ""
 msgid "Long paper mode"
 msgstr ""
 
-#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230
-#: backend/kvs40xx_opt.c:393
+#: backend/kvs1025.h:57 backend/kvs20xx_opt.c:230 backend/kvs40xx_opt.c:393
 #, no-c-format
 msgid "Length control mode"
 msgstr ""
 
-#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242
-#: backend/kvs40xx_opt.c:416
+#: backend/kvs1025.h:58 backend/kvs20xx_opt.c:242 backend/kvs40xx_opt.c:416
 #, fuzzy, no-c-format
 msgid "Manual feed mode"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254
-#: backend/kvs40xx_opt.c:428
+#: backend/kvs1025.h:59 backend/kvs20xx_opt.c:254 backend/kvs40xx_opt.c:428
 #, fuzzy, no-c-format
 msgid "Manual feed timeout"
 msgstr "Manuaalinen esitarkennus"
 
-#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267
-#: backend/kvs40xx_opt.c:441
+#: backend/kvs1025.h:60 backend/kvs20xx_opt.c:267 backend/kvs40xx_opt.c:441
 #, no-c-format
 msgid "Double feed detection"
 msgstr ""
 
-#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205
-#: backend/kvs40xx_opt.c:354 backend/matsushita.h:223
+#: backend/kvs1025.h:63 backend/kvs20xx_opt.c:205 backend/kvs40xx_opt.c:354
+#: backend/matsushita.h:223
 #, no-c-format
 msgid "Enable Duplex (Dual-Sided) Scanning"
 msgstr "Kaksipuolinen kuvanluku"
 
-#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296
-#: backend/kvs40xx_opt.c:517 backend/matsushita.h:225
+#: backend/kvs1025.h:65 backend/kvs20xx_opt.c:296 backend/kvs40xx_opt.c:517
+#: backend/matsushita.h:225
 #, no-c-format
 msgid "Physical size of the paper in the ADF"
 msgstr "Paperin koko syöttölaitteessa"
@@ -3899,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"
@@ -3971,199 +4090,199 @@ msgstr ""
 msgid "Legal"
 msgstr ""
 
-#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:148 backend/kvs40xx_opt.c:239
 #, fuzzy, no-c-format
 msgid "bayer_64"
 msgstr "Bayer"
 
-#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:240
 #, fuzzy, no-c-format
 msgid "bayer_16"
 msgstr "Bayer"
 
-#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:241
 #, fuzzy, no-c-format
 msgid "halftone_32"
 msgstr "Rasteri"
 
-#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:242
 #, fuzzy, no-c-format
 msgid "halftone_64"
 msgstr "Rasteri"
 
-#: backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:152
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
-#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs1025_opt.c:165 backend/kvs1025_opt.c:227
+#: backend/kvs1025_opt.c:240 backend/kvs20xx_opt.c:129
 #: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
 #: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, fuzzy, no-c-format
 msgid "normal"
 msgstr "Normaali"
 
-#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:166 backend/kvs40xx_opt.c:259
 #, fuzzy, no-c-format
 msgid "light"
 msgstr "Korostus"
 
-#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
+#: backend/kvs1025_opt.c:178 backend/kvs40xx_opt.c:271
 #, fuzzy, no-c-format
 msgid "From scanner"
 msgstr "Tasokuvanlukija"
 
-#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:272
 #: backend/matsushita.c:177
 #, no-c-format
 msgid "From paper"
 msgstr "Paperilta"
 
-#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
+#: backend/kvs1025_opt.c:191 backend/kvs40xx_opt.c:284
 #, fuzzy, no-c-format
 msgid "default"
 msgstr "Oletus"
 
-#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs1025_opt.c:210 backend/kvs20xx_opt.c:123
 #: backend/kvs40xx_opt.c:209
 #, fuzzy, no-c-format
 msgid "smooth"
 msgstr "Pehmeä"
 
-#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:119
 #: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:120
 #: backend/kvs40xx_opt.c:206
 #, fuzzy, no-c-format
 msgid "low"
 msgstr "Hidas"
 
-#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs1025_opt.c:213 backend/kvs1025_opt.c:803
 #: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, fuzzy, no-c-format
 msgid "medium"
 msgstr "Keskitaso"
 
-#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs1025_opt.c:214 backend/kvs20xx_opt.c:122
 #: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs1025_opt.c:228 backend/kvs20xx_opt.c:130
 #: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
 msgstr ""
 
-#: backend/kvs1025_opt.c:230
-#, no-c-format
-msgid "linier"
-msgstr ""
+#: backend/kvs1025_opt.c:229
+#, fuzzy, no-c-format
+msgid "linear"
+msgstr "Viivapiirros"
 
-#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
 #, fuzzy, no-c-format
 msgid "red"
 msgstr "Punainen"
 
-#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:139
 #: backend/kvs40xx_opt.c:225
 #, fuzzy, no-c-format
 msgid "green"
 msgstr "Vihreä"
 
-#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:140
 #: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:561
 #, fuzzy, no-c-format
 msgid "Sets the scan source"
 msgstr "Lähde"
 
-#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
+#: backend/kvs1025_opt.c:572 backend/kvs20xx_opt.c:218
 #: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
 #, no-c-format
 msgid "Feeder mode"
 msgstr "Syöttötapa"
 
-#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:219
 #: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr "Asettaa syöttötavan"
 
-#: backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:583
 #, fuzzy, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr "Poista esitarkennus"
 
-#: backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:592
 #, fuzzy, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr "Poista esitarkennus"
 
-#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs1025_opt.c:600 backend/kvs20xx_opt.c:243
 #: backend/kvs40xx_opt.c:417
 #, fuzzy, no-c-format
 msgid "Sets the manual feed mode"
 msgstr "Asettaa syöttötavan"
 
-#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs1025_opt.c:611 backend/kvs20xx_opt.c:255
 #: backend/kvs40xx_opt.c:429
 #, fuzzy, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr "Asettaa syöttötavan"
 
-#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs1025_opt.c:624 backend/kvs20xx_opt.c:268
 #: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs1025_opt.c:630 backend/kvs20xx_opt.c:276
 #: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:277
 #: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs1025_opt.c:633 backend/kvs20xx_opt.c:278
 #: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs1025_opt.c:660 backend/kvs20xx_opt.c:309
 #: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:734 backend/matsushita.c:1224
 #, no-c-format
 msgid "Automatic threshold"
 msgstr "Automaattinen kynnys"
 
-#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:737 backend/matsushita.c:1227
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise "
@@ -4172,104 +4291,104 @@ msgstr ""
 "Asettaa automaattisesti kirkkauden, kontrastin, valkotasapainon, gamman, "
 "kohinan poiston ja korostuksen"
 
-#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
+#: backend/kvs1025_opt.c:782 backend/kvs40xx_opt.c:764
 #: backend/matsushita.c:1275
 #, no-c-format
 msgid "Noise reduction"
 msgstr "Kohinan poisto"
 
-#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
+#: backend/kvs1025_opt.c:784 backend/kvs40xx_opt.c:765
 #: backend/matsushita.c:1277
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr "Vähentää yksittäistä pistekohinaa"
 
-#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
+#: backend/kvs1025_opt.c:795 backend/kvs20xx_opt.c:412
 #: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
 #, no-c-format
 msgid "Image emphasis"
 msgstr "Kuvan korostus"
 
-#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:413
 #: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr "Asettaa kuvan korostuksen"
 
-#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
+#: 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"
 
-#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs1025_opt.c:817 backend/kvs20xx_opt.c:436
 #: backend/kvs40xx_opt.c:681
 #, fuzzy, no-c-format
 msgid "Lamp color"
 msgstr "Valo päälle"
 
-#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:437
 #: backend/kvs40xx_opt.c:682
 #, fuzzy, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr "Asettaa valon päälle/pois"
 
-#: backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:831
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:839
 #, fuzzy, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr "Peilaa kuvan pystysuunnassa."
 
-#: backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:846
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:849
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:859
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:861
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:873
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:882
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:901
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:903
 #, no-c-format
 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
@@ -4301,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
@@ -4329,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 ""
@@ -4388,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
@@ -4423,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
@@ -4438,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
@@ -4481,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"
@@ -4612,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"
@@ -4972,17 +5098,17 @@ msgstr "3x3 oma"
 msgid "2x2 custom"
 msgstr "2x2 oma"
 
-#: backend/mustek.c:4235
+#: backend/mustek.c:4247
 #, no-c-format
 msgid "Fast gray mode"
 msgstr "Nopea harmaa"
 
-#: backend/mustek.c:4236
+#: backend/mustek.c:4248
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr "Lue nopeassa harmaassa tilassa (huonompi laatu)."
 
-#: backend/mustek.c:4333
+#: backend/mustek.c:4345
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. "
@@ -4991,82 +5117,82 @@ msgstr ""
 "Kaikki esikatselut luetaan nopeimmalla tavalla (huonoimmalla laadulla). "
 "Tämä voi olla väritön matalatarkkuuksinen tila."
 
-#: backend/mustek.c:4341
+#: backend/mustek.c:4353
 #, fuzzy, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr "Valo pois lopetettaessa"
 
-#: backend/mustek.c:4342
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: backend/mustek.c:4353
+#: backend/mustek.c:4365
 #, fuzzy, no-c-format
 msgid "Turn lamp off"
 msgstr "Asettaa valon päälle/pois"
 
-#: backend/mustek.c:4354
+#: backend/mustek.c:4366
 #, fuzzy, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr "Asettaa kuvanlukijan valon päälle/pois"
 
-#: backend/mustek.c:4431
+#: backend/mustek.c:4443
 #, no-c-format
 msgid "Red brightness"
 msgstr "Punaisen kirkkaus"
 
-#: backend/mustek.c:4432
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr "Asettaa punaisen kanavan kirkkauden."
 
-#: backend/mustek.c:4444
+#: backend/mustek.c:4456
 #, no-c-format
 msgid "Green brightness"
 msgstr "Vihreän kirkkaus"
 
-#: backend/mustek.c:4445
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr "Asettaa vihreän kanavan kirkkauden."
 
-#: backend/mustek.c:4457
+#: backend/mustek.c:4469
 #, no-c-format
 msgid "Blue brightness"
 msgstr "Sinisen kirkkaus"
 
-#: backend/mustek.c:4458
+#: backend/mustek.c:4470
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr "Asettaa sinisen kanavan kirkkauden."
 
-#: backend/mustek.c:4483
+#: backend/mustek.c:4495
 #, no-c-format
 msgid "Contrast red channel"
 msgstr "Punaisen kontrasti"
 
-#: backend/mustek.c:4484
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr "Asettaa punaisen kanavan kontrastin."
 
-#: backend/mustek.c:4496
+#: backend/mustek.c:4508
 #, no-c-format
 msgid "Contrast green channel"
 msgstr "Vihreän kontrasti"
 
-#: backend/mustek.c:4497
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr "Asettaa vihreän kanavan kontrastin."
 
-#: backend/mustek.c:4509
+#: backend/mustek.c:4521
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr "Sinisen kontrasti"
 
-#: backend/mustek.c:4510
+#: backend/mustek.c:4522
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr "Asettaa sinisen kanavan kontrastin."
@@ -5110,39 +5236,44 @@ msgstr ""
 "Lämmittää kunnes lampun kirkkaus tasaantuu. Muuten lämmitetään 40 "
 "sekuntia."
 
-#: backend/pixma.c:378
+#: 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:383
+#: backend/pixma/pixma.c:402
 #, fuzzy, no-c-format
 msgid "Negative gray"
 msgstr "Negatiivi"
 
-#: backend/pixma.c:396
+#: backend/pixma/pixma.c:415
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: backend/pixma.c:401
+#: 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 "
@@ -5150,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 ""
 
@@ -5272,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ä"
@@ -5546,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"
@@ -5556,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"
@@ -5705,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
@@ -6347,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"