From 76084da1108725640fc5d5998bb0891a8bbbd89e Mon Sep 17 00:00:00 2001 From: Rolf Bensch Date: Wed, 27 Jun 2012 10:49:09 +0200 Subject: [PATCH] new scan modes for 48 bit flatbed scanners - PIXMA_SCAN_MODE_COLOR_48 for 48 bit color scans - PIXMA_SCAN_MODE_GRAY_16 for 24 bit grayscale scans --- backend/pixma.c | 64 +++++++++++---- backend/pixma.h | 3 + backend/pixma_sane_options.c | 2 +- po/de.po | 154 ++++++++++++++++++++--------------- 4 files changed, 141 insertions(+), 82 deletions(-) diff --git a/backend/pixma.c b/backend/pixma.c index 5f770dc4b..4677e4d7a 100644 --- a/backend/pixma.c +++ b/backend/pixma.c @@ -104,8 +104,8 @@ typedef struct pixma_sane_t option_descriptor_t opt[opt_last]; SANE_Range xrange, yrange; SANE_Word dpi_list[9]; /* up to 9600 dpi */ - SANE_String_Const mode_list[5]; - pixma_scan_mode_t mode_map[5]; + SANE_String_Const mode_list[6]; + pixma_scan_mode_t mode_map[6]; uint8_t gamma_table[4096]; SANE_String_Const source_list[4]; pixma_paper_source_t source_map[4]; @@ -364,6 +364,18 @@ create_mode_list (pixma_sane_t * ss, SANE_Bool tpu) i++; } } + if (!tpu && cfg->cap & PIXMA_CAP_48BIT) + { + ss->mode_list[i] = SANE_I18N ("48 bits color"); + ss->mode_map[i] = PIXMA_SCAN_MODE_COLOR_48; + i++; + if (cfg->cap & PIXMA_CAP_GRAY) + { + ss->mode_list[i] = SANE_I18N ("16 bits gray"); + ss->mode_map[i] = PIXMA_SCAN_MODE_GRAY_16; + i++; + } + } if (!tpu && cfg->cap & PIXMA_CAP_LINEART) { ss->mode_list[i] = SANE_VALUE_SCAN_MODE_LINEART; @@ -375,16 +387,19 @@ create_mode_list (pixma_sane_t * ss, SANE_Bool tpu) ss->mode_map[i] = 0; } -/* create ss->dpi_list +/* create dynamic dpi_list * ss: scanner device * ext = 0: min = 75 dpi; max = cfg->xdpi * ext = 1: use settings for ADF/TPU + * overrides hires * cfg->ext_min_dpi and cfg->ext_max_dpi not set: min = 75 dpi; max = cfg->xdpi * only cfg->ext_min_dpi set: min = cfg->ext_min_dpi; max = cfg->xdpi * only cfg->ext_max_dpi set: min = 75 dpi; max = cfg->ext_max_dpi - * both cfg->ext_min_dpi and cfg->ext_max_dpi set: min = cfg->ext_min_dpi; cfg->ext_max_dpi */ + * both cfg->ext_min_dpi and cfg->ext_max_dpi set: min = cfg->ext_min_dpi; cfg->ext_max_dpi + * hires = 0: normal usage + * hires = 1: min = 150 dpi; max = use calculation from ext */ static void -create_dpi_list (pixma_sane_t * ss, SANE_Bool ext) +create_dpi_list (pixma_sane_t * ss, SANE_Bool ext, SANE_Bool hires) { const pixma_config_t *cfg; int i, j; @@ -398,7 +413,7 @@ create_dpi_list (pixma_sane_t * ss, SANE_Bool ext) * 300 dpi: j = 2 |--> from cfg->ext_min_dpi for ADF/TPU * ... / * */ - j = 0; + j = (hires ? 1 : 0); if (ext && cfg->ext_min_dpi) { j = -1; @@ -664,14 +679,23 @@ control_option (pixma_sane_t * ss, SANE_Int n, case opt_mode: if (cfg->cap & (PIXMA_CAP_LINEART) && (a == SANE_ACTION_SET_VALUE || a == SANE_ACTION_SET_AUTO)) - { + { /* new mode selected: Color, Gray, ... */ + /* PDBG (pixma_dbg (4, "*control_option***** mode = %u *\n", + ss->mode_map[OVAL (opt_mode).w])); */ + if (ss->source_map[OVAL (opt_source).w] != PIXMA_SOURCE_TPU) + { /* ADF or flatbed*/ + /* recreate dynamic dpi_list */ + create_dpi_list (ss, SANE_FALSE, + (ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_COLOR_48 + || ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_GRAY_16)); + } if (ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_LINEART) - { + { /* lineart */ enable_option (ss, opt_threshold, SANE_TRUE); enable_option (ss, opt_threshold_curve, SANE_TRUE); } else - { + { /* all other modes */ enable_option (ss, opt_threshold, SANE_FALSE); enable_option (ss, opt_threshold_curve, SANE_FALSE); } @@ -686,18 +710,30 @@ control_option (pixma_sane_t * ss, SANE_Int n, if (ss->source_map[OVAL (opt_source).w] == PIXMA_SOURCE_TPU) { /* TPU mode */ create_mode_list (ss, SANE_TRUE); - create_dpi_list (ss, SANE_TRUE); + create_dpi_list (ss, SANE_TRUE, SANE_FALSE); } else if (ss->source_map[OVAL (opt_source).w] == PIXMA_SOURCE_ADF || ss->source_map[OVAL (opt_source).w] == PIXMA_SOURCE_ADFDUP) { /* ADF mode */ create_mode_list (ss, SANE_FALSE); - create_dpi_list (ss, SANE_TRUE); + create_dpi_list (ss, SANE_TRUE, SANE_FALSE); } else { /* flatbed mode */ create_mode_list (ss, SANE_FALSE); - create_dpi_list (ss, SANE_FALSE); + create_dpi_list (ss, SANE_FALSE, + (ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_COLOR_48 + || ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_GRAY_16)); + } + if (ss->mode_map[OVAL (opt_mode).w] == PIXMA_SCAN_MODE_LINEART) + { /* lineart */ + enable_option (ss, opt_threshold, SANE_TRUE); + enable_option (ss, opt_threshold_curve, SANE_TRUE); + } + else + { /* all other modes */ + enable_option (ss, opt_threshold, SANE_FALSE); + enable_option (ss, opt_threshold_curve, SANE_FALSE); } /* to avoid fatal errors, * select first entry of dynamic dpi_list @@ -801,7 +837,7 @@ init_option_descriptors (pixma_sane_t * ss) ss->yrange.quant = SANE_FIX (0); /* setup dpi up to the value supported by the scanner. */ - create_dpi_list (ss, SANE_FALSE); + create_dpi_list (ss, SANE_FALSE, SANE_FALSE); /* mode_list and source_list were already NULL-terminated, * because the whole pixma_sane_t was cleared during allocation. */ @@ -1599,7 +1635,7 @@ type int resolution cap soft_select soft_detect automatic info reload_params -type string mode[10] +type string mode[30] constraint @string_list = ss->mode_list default @s = SANE_I18N(ss->mode_list[0]) title @SANE_TITLE_SCAN_MODE diff --git a/backend/pixma.h b/backend/pixma.h index 1b40e0dfa..14646491c 100644 --- a/backend/pixma.h +++ b/backend/pixma.h @@ -208,6 +208,9 @@ typedef enum pixma_scan_mode_t /* TPU scan modes for negatives */ PIXMA_SCAN_MODE_NEGATIVE_COLOR, PIXMA_SCAN_MODE_NEGATIVE_GRAY, + /* extended scan modes for 48 bit flatbed scanners */ + PIXMA_SCAN_MODE_COLOR_48, + PIXMA_SCAN_MODE_GRAY_16, /* 1 bit lineart scan mode */ PIXMA_SCAN_MODE_LINEART } pixma_scan_mode_t; diff --git a/backend/pixma_sane_options.c b/backend/pixma_sane_options.c index d66218bb4..e15bbdb2d 100644 --- a/backend/pixma_sane_options.c +++ b/backend/pixma_sane_options.c @@ -65,7 +65,7 @@ build_option_descriptors (struct pixma_sane_t *ss) sod->desc = SANE_DESC_SCAN_MODE; sod->name = "mode"; sod->unit = SANE_UNIT_NONE; - sod->size = 11; + sod->size = 31; sod->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_AUTOMATIC; sod->constraint_type = SANE_CONSTRAINT_STRING_LIST; sod->constraint.string_list = ss->mode_list; diff --git a/po/de.po b/po/de.po index 4b921f952..c0d648f77 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: sane-backends\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-17 10:56+0200\n" +"POT-Creation-Date: 2012-06-27 10:43+0200\n" "PO-Revision-Date: 2010-08-06 17:17+0100\n" "Last-Translator: Rolf Bensch \n" "Language-Team: German \n" @@ -37,7 +37,7 @@ msgstr "Standard" #: ../include/sane/saneopts.h:157 ../backend/artec_eplus48u.c:2884 #: ../backend/epson.c:3284 ../backend/epson2.c:1269 -#: ../backend/genesys.c:5770 ../backend/gt68xx.c:703 +#: ../backend/genesys.c:5607 ../backend/gt68xx.c:703 #: ../backend/hp3500.c:1003 ../backend/hp-option.c:3297 #: ../backend/kvs1025_opt.c:640 ../backend/kvs20xx_opt.c:284 #: ../backend/kvs40xx_opt.c:505 ../backend/leo.c:823 @@ -55,7 +55,7 @@ msgid "Geometry" msgstr "Scanbereich" #: ../include/sane/saneopts.h:158 ../backend/artec_eplus48u.c:2805 -#: ../backend/canon.c:1492 ../backend/genesys.c:5830 +#: ../backend/canon.c:1492 ../backend/genesys.c:5667 #: ../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 @@ -1569,12 +1569,12 @@ msgid "Select the film type" msgstr "Wählt den Filmtyp aus" #: ../backend/canon_dr.c:338 ../backend/epjitsu.c:203 -#: ../backend/epson.c:501 ../backend/epson2.c:114 ../backend/fujitsu.c:566 +#: ../backend/epson.c:501 ../backend/epson2.c:114 ../backend/fujitsu.c:579 #: ../backend/gt68xx.c:148 ../backend/hp3900_sane.c:418 #: ../backend/hp3900_sane.c:427 ../backend/hp3900_sane.c:1017 #: ../backend/hp5590.c:82 ../backend/ma1509.c:108 #: ../backend/magicolor.c:167 ../backend/mustek.c:156 -#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:814 +#: ../backend/mustek.c:160 ../backend/mustek.c:164 ../backend/pixma.c:850 #: ../backend/pixma_sane_options.c:88 ../backend/snapscan-options.c:82 #: ../backend/test.c:192 ../backend/umax.c:181 #, no-c-format @@ -1582,27 +1582,27 @@ msgid "Flatbed" msgstr "Flachbett" #: ../backend/canon_dr.c:339 ../backend/epjitsu.c:204 -#: ../backend/fujitsu.c:567 ../backend/kodak.c:135 +#: ../backend/fujitsu.c:580 ../backend/kodak.c:135 #, no-c-format msgid "ADF Front" msgstr "Automatischer Dokumenteneinzug vorne" #: ../backend/canon_dr.c:340 ../backend/epjitsu.c:205 -#: ../backend/fujitsu.c:568 ../backend/kodak.c:136 +#: ../backend/fujitsu.c:581 ../backend/kodak.c:136 #, no-c-format msgid "ADF Back" msgstr "Automatischer Dokumenteneinzug hinten" #: ../backend/canon_dr.c:341 ../backend/epjitsu.c:206 -#: ../backend/fujitsu.c:569 ../backend/hp5590.c:84 ../backend/kodak.c:137 -#: ../backend/pixma.c:825 +#: ../backend/fujitsu.c:582 ../backend/hp5590.c:84 ../backend/kodak.c:137 +#: ../backend/pixma.c:861 #, no-c-format msgid "ADF Duplex" msgstr "ADF-Duplex" #: ../backend/canon_dr.c:348 ../backend/epson.c:599 #: ../backend/epson.c:3082 ../backend/epson2.c:200 -#: ../backend/fujitsu.c:586 ../backend/genesys.c:89 +#: ../backend/fujitsu.c:599 ../backend/genesys.c:89 #: ../backend/genesys.c:96 ../backend/gt68xx_low.h:136 #: ../backend/hp-option.c:3093 #, no-c-format @@ -1611,7 +1611,7 @@ msgstr "Rot" #: ../backend/canon_dr.c:349 ../backend/epson.c:600 #: ../backend/epson.c:3078 ../backend/epson2.c:201 -#: ../backend/fujitsu.c:587 ../backend/genesys.c:90 +#: ../backend/fujitsu.c:600 ../backend/genesys.c:90 #: ../backend/genesys.c:97 ../backend/gt68xx_low.h:137 #: ../backend/hp-option.c:3094 #, no-c-format @@ -1620,7 +1620,7 @@ msgstr "Grün" #: ../backend/canon_dr.c:350 ../backend/epson.c:601 #: ../backend/epson.c:3086 ../backend/epson2.c:202 -#: ../backend/fujitsu.c:588 ../backend/genesys.c:91 +#: ../backend/fujitsu.c:601 ../backend/genesys.c:91 #: ../backend/genesys.c:98 ../backend/gt68xx_low.h:138 #: ../backend/hp-option.c:3095 #, no-c-format @@ -1645,7 +1645,7 @@ msgstr "Blau verstärken" #: ../backend/canon_dr.c:355 ../backend/epson.c:556 ../backend/epson.c:564 #: ../backend/epson.c:576 ../backend/epson.c:598 ../backend/epson2.c:164 #: ../backend/epson2.c:172 ../backend/epson2.c:184 ../backend/epson2.c:199 -#: ../backend/epson2.c:213 ../backend/fujitsu.c:592 +#: ../backend/epson2.c:213 ../backend/fujitsu.c:605 #: ../backend/genesys.c:99 ../backend/leo.c:109 #: ../backend/matsushita.c:138 ../backend/matsushita.c:159 #: ../backend/matsushita.c:191 ../backend/matsushita.c:213 @@ -1654,7 +1654,7 @@ msgstr "Blau verstärken" msgid "None" msgstr "Kein" -#: ../backend/canon_dr.c:356 ../backend/fujitsu.c:593 +#: ../backend/canon_dr.c:356 ../backend/fujitsu.c:606 #, no-c-format msgid "JPEG" msgstr "JPEG" @@ -1672,14 +1672,14 @@ msgstr "Einseitig" msgid "Duplex" msgstr "Duplex" -#: ../backend/epson.c:502 ../backend/epson2.c:115 ../backend/pixma.c:831 +#: ../backend/epson.c:502 ../backend/epson2.c:115 ../backend/pixma.c:867 #, no-c-format msgid "Transparency Unit" msgstr "Durchlichtaufsatz" #: ../backend/epson.c:503 ../backend/epson2.c:117 #: ../backend/magicolor.c:168 ../backend/mustek.c:160 -#: ../backend/pixma.c:819 ../backend/test.c:192 ../backend/umax.c:183 +#: ../backend/pixma.c:855 ../backend/test.c:192 ../backend/umax.c:183 #, no-c-format msgid "Automatic Document Feeder" msgstr "Autom. Dokumenteneinzug" @@ -1791,7 +1791,7 @@ msgstr "Tintenstrahldrucker" msgid "CRT monitors" msgstr "CRT-Monitore" -#: ../backend/epson.c:656 ../backend/epson2.c:253 ../backend/fujitsu.c:576 +#: ../backend/epson.c:656 ../backend/epson2.c:253 ../backend/fujitsu.c:589 #: ../backend/hp-option.c:3226 ../backend/test.c:143 #, no-c-format msgid "Default" @@ -1858,7 +1858,7 @@ msgid "Max" msgstr "Maximal" #: ../backend/epson.c:2799 ../backend/epson2.c:954 -#: ../backend/genesys.c:5687 ../backend/gt68xx.c:458 +#: ../backend/genesys.c:5524 ../backend/gt68xx.c:458 #: ../backend/hp-option.c:2914 ../backend/kvs1025_opt.c:522 #: ../backend/kvs20xx_opt.c:170 ../backend/kvs40xx_opt.c:319 #: ../backend/ma1509.c:501 ../backend/matsushita.c:1084 @@ -2146,172 +2146,172 @@ msgstr "Eingebautes CCT-Profil" msgid "User defined CCT profile" msgstr "Benutzerdefiniertes CCT-Profil" -#: ../backend/fujitsu.c:577 ../backend/hp-option.c:3327 +#: ../backend/fujitsu.c:590 ../backend/hp-option.c:3327 #: ../backend/hp-option.c:3340 #, no-c-format msgid "On" msgstr "An" -#: ../backend/fujitsu.c:578 ../backend/hp-option.c:3159 +#: ../backend/fujitsu.c:591 ../backend/hp-option.c:3159 #: ../backend/hp-option.c:3326 ../backend/hp-option.c:3339 #, no-c-format msgid "Off" msgstr "Aus" -#: ../backend/fujitsu.c:580 +#: ../backend/fujitsu.c:593 #, no-c-format msgid "DTC" msgstr "DTC" -#: ../backend/fujitsu.c:581 +#: ../backend/fujitsu.c:594 #, no-c-format msgid "SDTC" msgstr "SDTC" -#: ../backend/fujitsu.c:583 ../backend/teco1.c:1152 +#: ../backend/fujitsu.c:596 ../backend/teco1.c:1152 #: ../backend/teco1.c:1153 ../backend/teco2.c:1971 ../backend/teco2.c:1972 #: ../backend/teco3.c:977 ../backend/teco3.c:978 #, no-c-format msgid "Dither" msgstr "Halbton" -#: ../backend/fujitsu.c:584 +#: ../backend/fujitsu.c:597 #, no-c-format msgid "Diffusion" msgstr "Diffusion" -#: ../backend/fujitsu.c:589 +#: ../backend/fujitsu.c:602 #, no-c-format msgid "White" msgstr "Weiß" -#: ../backend/fujitsu.c:590 +#: ../backend/fujitsu.c:603 #, no-c-format msgid "Black" msgstr "Schwarz" -#: ../backend/fujitsu.c:595 +#: ../backend/fujitsu.c:608 #, no-c-format msgid "Continue" msgstr "Fortfahren" -#: ../backend/fujitsu.c:596 +#: ../backend/fujitsu.c:609 #, no-c-format msgid "Stop" msgstr "Stopp" -#: ../backend/fujitsu.c:598 +#: ../backend/fujitsu.c:611 #, no-c-format msgid "10mm" msgstr "10mm" -#: ../backend/fujitsu.c:599 +#: ../backend/fujitsu.c:612 #, no-c-format msgid "15mm" msgstr "15mm" -#: ../backend/fujitsu.c:600 +#: ../backend/fujitsu.c:613 #, no-c-format msgid "20mm" msgstr "20mm" -#: ../backend/fujitsu.c:602 ../backend/hp-option.c:3045 +#: ../backend/fujitsu.c:615 ../backend/hp-option.c:3045 #, no-c-format msgid "Horizontal" msgstr "Horizontal" -#: ../backend/fujitsu.c:603 +#: ../backend/fujitsu.c:616 #, no-c-format msgid "Horizontal bold" msgstr "horizontal breit" -#: ../backend/fujitsu.c:604 +#: ../backend/fujitsu.c:617 #, no-c-format msgid "Horizontal narrow" msgstr "horizontal schmal" -#: ../backend/fujitsu.c:605 ../backend/hp-option.c:3044 +#: ../backend/fujitsu.c:618 ../backend/hp-option.c:3044 #, no-c-format msgid "Vertical" msgstr "Vertikal" -#: ../backend/fujitsu.c:606 +#: ../backend/fujitsu.c:619 #, no-c-format msgid "Vertical bold" msgstr "vertikal breit" -#: ../backend/fujitsu.c:608 +#: ../backend/fujitsu.c:621 #, no-c-format msgid "Top to bottom" msgstr "Oben nach unten" -#: ../backend/fujitsu.c:609 +#: ../backend/fujitsu.c:622 #, no-c-format msgid "Bottom to top" msgstr "Unten nach oben" -#: ../backend/fujitsu.c:611 +#: ../backend/fujitsu.c:624 #, no-c-format msgid "Front" msgstr "Vorne" -#: ../backend/fujitsu.c:612 +#: ../backend/fujitsu.c:625 #, no-c-format msgid "Back" msgstr "Hinten" -#: ../backend/genesys.c:5912 +#: ../backend/genesys.c:5749 #, no-c-format msgid "Software crop" msgstr "" -#: ../backend/genesys.c:5913 +#: ../backend/genesys.c:5750 #, no-c-format msgid "Request backend to remove border from pages digitally" msgstr "" -#: ../backend/genesys.c:5921 ../backend/kvs1025_opt.c:911 +#: ../backend/genesys.c:5758 ../backend/kvs1025_opt.c:911 #, no-c-format msgid "Software blank skip percentage" msgstr "" -#: ../backend/genesys.c:5922 ../backend/kvs1025_opt.c:913 +#: ../backend/genesys.c:5759 ../backend/kvs1025_opt.c:913 #, no-c-format msgid "Request driver to discard pages with low numbers of dark pixels" msgstr "" -#: ../backend/genesys.c:5932 ../backend/kvs1025_opt.c:893 +#: ../backend/genesys.c:5769 ../backend/kvs1025_opt.c:893 #, no-c-format msgid "Software derotate" msgstr "" -#: ../backend/genesys.c:5933 ../backend/kvs1025_opt.c:895 +#: ../backend/genesys.c:5770 ../backend/kvs1025_opt.c:895 #, no-c-format msgid "Request driver to detect and correct 90 degree image rotation" msgstr "" -#: ../backend/genesys.c:5940 ../backend/pixma_sane_options.c:271 +#: ../backend/genesys.c:5777 ../backend/pixma_sane_options.c:271 #, no-c-format msgid "Extras" msgstr "Extras" -#: ../backend/genesys.c:5959 ../backend/pixma_sane_options.c:293 +#: ../backend/genesys.c:5796 ../backend/pixma_sane_options.c:293 #, no-c-format msgid "Threshold curve" msgstr "Schwellwertkurve" -#: ../backend/genesys.c:5960 ../backend/pixma_sane_options.c:294 +#: ../backend/genesys.c:5797 ../backend/pixma_sane_options.c:294 #, no-c-format msgid "Dynamic threshold curve, from light to dark, normally 50-65" msgstr "" "Dynamische Schwellwertkurve, von hell zu dunkel, nomalerweise 50-65" -#: ../backend/genesys.c:5969 +#: ../backend/genesys.c:5806 #, no-c-format msgid "Disable dynamic lineart" msgstr "dynamische Strichzeichnung abschalten" -#: ../backend/genesys.c:5971 +#: ../backend/genesys.c:5808 #, fuzzy, no-c-format msgid "" "Disable use of a software adaptive algorithm to generate lineart relying " @@ -2320,12 +2320,12 @@ msgstr "" "Abschalten um einen Software angepassten Algorithmus zur Erstellung von " "Strichzeichnungen zu verwenden anstatt die Hardwarefunktion zu nutzen" -#: ../backend/genesys.c:5986 +#: ../backend/genesys.c:5823 #, no-c-format msgid "Disable interpolation" msgstr "Interpolation abschalten" -#: ../backend/genesys.c:5989 +#: ../backend/genesys.c:5826 #, no-c-format msgid "" "When using high resolutions where the horizontal resolution is smaller " @@ -2335,24 +2335,24 @@ msgstr "" "kleiner ist als die vertikale, schaltet dies die horizontale " "Interpolation aus" -#: ../backend/genesys.c:5998 +#: ../backend/genesys.c:5835 #, no-c-format msgid "Color Filter" msgstr "Farbfilter" -#: ../backend/genesys.c:6001 +#: ../backend/genesys.c:5838 #, no-c-format msgid "When using gray or lineart this option selects the used color." msgstr "" "Wenn Graustufen oder Strichzeichnung verwendet wird, wählt diese Option " "die Farbe" -#: ../backend/genesys.c:6027 +#: ../backend/genesys.c:5864 #, no-c-format msgid "Lamp off time" msgstr "Lampenausschaltzeit" -#: ../backend/genesys.c:6030 +#: ../backend/genesys.c:5867 #, no-c-format msgid "" "The lamp will be turned off after the given time (in minutes). A value " @@ -2361,57 +2361,67 @@ msgstr "" "Die Lampe wird nach der angegebenen Zeit (in Minuten) ausgeschaltet. Ein " "Wert von 0 bedeutet, dass die Lampe nich ausgeschaltet wird." -#: ../backend/genesys.c:6059 ../backend/genesys.c:6060 +#: ../backend/genesys.c:5877 +#, fuzzy, no-c-format +msgid "Lamp off during scan" +msgstr "Lampe aus während Schwarzkalibrierung" + +#: ../backend/genesys.c:5878 +#, fuzzy, no-c-format +msgid "The lamp will be turned off during scan. " +msgstr "Anzahl der Minuten, bis die Lampe nach dem Scan ausgeschaltet wird" + +#: ../backend/genesys.c:5905 ../backend/genesys.c:5906 #, no-c-format msgid "File button" msgstr "Datei-Knopf" -#: ../backend/genesys.c:6112 ../backend/genesys.c:6113 +#: ../backend/genesys.c:5958 ../backend/genesys.c:5959 #, no-c-format msgid "OCR button" msgstr "OCR-Knopf" -#: ../backend/genesys.c:6126 ../backend/genesys.c:6127 +#: ../backend/genesys.c:5972 ../backend/genesys.c:5973 #, no-c-format msgid "Power button" msgstr "Einschaltknopf" -#: ../backend/genesys.c:6140 ../backend/gt68xx.c:762 +#: ../backend/genesys.c:5986 ../backend/gt68xx.c:762 #, no-c-format msgid "Need calibration" msgstr "benötigt Kalibirierung" -#: ../backend/genesys.c:6141 ../backend/gt68xx.c:763 +#: ../backend/genesys.c:5987 ../backend/gt68xx.c:763 #, no-c-format msgid "The scanner needs calibration for the current settings" msgstr "" "Der Scanner benötigt eine Kalibrierung für die momentanen Einstellungen" -#: ../backend/genesys.c:6154 ../backend/gt68xx.c:787 +#: ../backend/genesys.c:6000 ../backend/gt68xx.c:787 #: ../backend/gt68xx.c:788 ../backend/pixma_sane_options.c:225 #: ../backend/plustek.c:1080 #, no-c-format msgid "Buttons" msgstr "Knöpfe" -#: ../backend/genesys.c:6161 ../backend/gt68xx.c:794 +#: ../backend/genesys.c:6007 ../backend/gt68xx.c:794 #: ../backend/hp5400_sane.c:392 ../backend/hp-option.h:97 #: ../backend/niash.c:728 ../backend/plustek.c:941 #, no-c-format msgid "Calibrate" msgstr "Kalibrierung" -#: ../backend/genesys.c:6163 ../backend/gt68xx.c:796 +#: ../backend/genesys.c:6009 ../backend/gt68xx.c:796 #, no-c-format msgid "Start calibration using special sheet" msgstr "Starte den Kalibrierungsprozess mit einem Spezialblatt" -#: ../backend/genesys.c:6177 ../backend/gt68xx.c:809 +#: ../backend/genesys.c:6023 ../backend/gt68xx.c:809 #, no-c-format msgid "Clear calibration" msgstr "Kalibrierung zurücksetzen" -#: ../backend/genesys.c:6178 ../backend/gt68xx.c:810 +#: ../backend/genesys.c:6024 ../backend/gt68xx.c:810 #, no-c-format msgid "Clear calibration cache" msgstr "Löscht den Kalibrierungsspeicher" @@ -4445,6 +4455,16 @@ msgstr "Negativfilm Farbe" msgid "Negative gray" msgstr "Negativfilm Graustufen" +#: ../backend/pixma.c:369 +#, no-c-format +msgid "48 bits color" +msgstr "48 Bit Farbe" + +#: ../backend/pixma.c:374 +#, no-c-format +msgid "16 bits gray" +msgstr "16 Bit Graustufen" + #: ../backend/pixma_sane_options.c:80 #, no-c-format msgid ""