diff --git a/ChangeLog b/ChangeLog index dc5f1e784..089364513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-15 Nicolas Martin + * doc/sane-pixma.man, + * backend/pixma.c, backend/pixma_mp150.c, backend/pixma_sane_options.c + * sane-backends/po/sane-backends.??.po: + Remove "experimental" in pixma buttons options and text. + Fix some French translation typos, and update man page. + 2008-06-10 Stéphane Voltz * backend/sanei_constrain_value.c: add support for arrays of SANE_Word in sanei_constrain_value diff --git a/backend/pixma.c b/backend/pixma.c index 9b0a0d9e5..8865ba0ea 100644 --- a/backend/pixma.c +++ b/backend/pixma.c @@ -640,13 +640,19 @@ init_option_descriptors (pixma_sane_t * ss) ss->source_map[i] = PIXMA_SOURCE_ADF; i++; } -#if 1 if ((cfg->cap & PIXMA_CAP_ADFDUP) == PIXMA_CAP_ADFDUP) { ss->source_list[i] = SANE_I18N ("ADF Duplex"); ss->source_map[i] = PIXMA_SOURCE_ADFDUP; i++; } +#if 0 + if (cfg->cap & PIXMA_CAP_TPU) + { + ss->source_list[i] = SANE_I18N ("Transparency Unit"); + ss->source_map[i] = PIXMA_SOURCE_TPU; + i++; + } #endif build_option_descriptors (ss); @@ -718,7 +724,7 @@ reader_loop (pixma_sane_t * ss) int start = 0; #ifndef NDEBUG pixma_dbg (1, "==== Button-controlled scan mode is enabled.\n"); - pixma_dbg (1, "==== To proceed, presse 'SCAN' or 'COLOR' button. " + pixma_dbg (1, "==== To proceed, press 'SCAN' or 'COLOR' button. " "To cancel, press 'GRAY' button.\n"); #endif while (pixma_wait_event (ss->s, 10) != 0) @@ -739,7 +745,7 @@ reader_loop (pixma_sane_t * ss) start = 1; break; case PIXMA_EV_BUTTON2: - count = PIXMA_ENO_PAPER; + count = PIXMA_ECANCELED; goto done; } } @@ -1394,7 +1400,7 @@ type string source[30] cap soft_select soft_detect type bool button-controlled - title Button-controlled scan (experimental) + title Button-controlled scan desc When enabled, scan process will not start immediately. To proceed, press \"SCAN\" button (for MP150) or \"COLOR\" button (for other models). To cancel, press \"GRAY\" button. default SANE_FALSE cap soft_select soft_detect inactive diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index f7c2aff8f..08d2d13a1 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -104,7 +104,7 @@ #define MP520_PID 0x1724 #define MP610_PID 0x1725 #define MP970_PID 0x1726 -#define MX300_PID 0x1727 /* untested */ +#define MX300_PID 0x1727 #define MX310_PID 0x1728 #define MX700_PID 0x1729 diff --git a/backend/pixma_sane_options.c b/backend/pixma_sane_options.c index 3d5da8256..285c8b81f 100644 --- a/backend/pixma_sane_options.c +++ b/backend/pixma_sane_options.c @@ -88,7 +88,7 @@ build_option_descriptors (struct pixma_sane_t *ss) opt = &(OPT_IN_CTX[opt_button_controlled]); sod = &opt->sod; sod->type = SANE_TYPE_BOOL; - sod->title = SANE_I18N ("Button-controlled scan (experimental)"); + sod->title = SANE_I18N ("Button-controlled scan"); sod->desc = SANE_I18N ("When enabled, scan process will not start immediately. To proceed, press \"SCAN\" button (for MP150) or \"COLOR\" button (for other models). To cancel, press \"GRAY\" button."); diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index da8b25618..bbca1dcc3 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -79,7 +79,7 @@ Users feedback is essential to help improve features and performances. .SH OPTIONS Besides "well-known" options (e.g. resolution, mode etc.) pixma backend also provides the following -.B experimental +\#.B experimental options for button handling, i.e. the options might change in the future. .TP .I button-controlled diff --git a/po/sane-backends.bg.po b/po/sane-backends.bg.po index ccce94728..0bc69d980 100644 --- a/po/sane-backends.bg.po +++ b/po/sane-backends.bg.po @@ -2651,7 +2651,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.cs.po b/po/sane-backends.cs.po index 8c862106c..54c867e95 100644 --- a/po/sane-backends.cs.po +++ b/po/sane-backends.cs.po @@ -2639,7 +2639,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.da.po b/po/sane-backends.da.po index ecf7094f6..4d891b5ab 100644 --- a/po/sane-backends.da.po +++ b/po/sane-backends.da.po @@ -2661,7 +2661,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.de.po b/po/sane-backends.de.po index 96e90d512..c6176d994 100644 --- a/po/sane-backends.de.po +++ b/po/sane-backends.de.po @@ -2686,7 +2686,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.eo.po b/po/sane-backends.eo.po index 90c59c8c6..42f610825 100644 --- a/po/sane-backends.eo.po +++ b/po/sane-backends.eo.po @@ -2672,8 +2672,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "Skanado mastrumita de butono (eksperimenta)" +msgid "Button-controlled scan" +msgstr "Skanado mastrumita de butono" #: .tmp/pixma_sane_options.c:94 #, no-c-format diff --git a/po/sane-backends.es.po b/po/sane-backends.es.po index aeb52b3cb..89b9122f0 100644 --- a/po/sane-backends.es.po +++ b/po/sane-backends.es.po @@ -2678,8 +2678,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "Escaneo controlado por botĂłn (experimental)" +msgid "Button-controlled scan" +msgstr "Escaneo controlado por botĂłn" #: .tmp/pixma_sane_options.c:94 #, no-c-format diff --git a/po/sane-backends.fi.po b/po/sane-backends.fi.po index b166bab92..7a1b60e98 100644 --- a/po/sane-backends.fi.po +++ b/po/sane-backends.fi.po @@ -2646,7 +2646,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.fr.po b/po/sane-backends.fr.po index 1cee88a5d..fe0f755a8 100644 --- a/po/sane-backends.fr.po +++ b/po/sane-backends.fr.po @@ -1911,7 +1911,7 @@ msgstr "SĂ©lectionne la matrice de couleurs du scanner." #: .tmp/hp-option.h:127 #, no-c-format msgid "Custom color matrix." -msgstr "Matrice personalisĂ©e." +msgstr "Matrice personnalisĂ©e." #: .tmp/hp-option.h:132 #, no-c-format @@ -1921,7 +1921,7 @@ msgstr "Matrice monochrome" #: .tmp/hp-option.h:133 #, no-c-format msgid "Custom color matrix for grayscale scans." -msgstr "Matrice personalisĂ©e pour numĂ©risation en niveaux de gris." +msgstr "Matrice personnalisĂ©e pour numĂ©risation en niveaux de gris." #: .tmp/hp-option.h:138 #, no-c-format @@ -2734,8 +2734,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "NumĂ©risation controllĂ©e par le bouton (expĂ©rimental)" +msgid "Button-controlled scan" +msgstr "NumĂ©risation controllĂ©e par le bouton" #: .tmp/pixma_sane_options.c:94 #, no-c-format @@ -3198,7 +3198,7 @@ msgstr "Echantillonnage Y" #: .tmp/saneopts.h:149 #, no-c-format msgid "Use custom gamma table" -msgstr "Utilise une table gamma personalisĂ©e" +msgstr "Utilise une table gamma personnalisĂ©e" #: .tmp/saneopts.h:150 #, no-c-format diff --git a/po/sane-backends.it.po b/po/sane-backends.it.po index 328f15138..b1b284a20 100644 --- a/po/sane-backends.it.po +++ b/po/sane-backends.it.po @@ -2686,8 +2686,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "Scansione controllata da pulsante (sperimentale)" +msgid "Button-controlled scan" +msgstr "Scansione controllata da pulsante" #: .tmp/pixma_sane_options.c:94 #, no-c-format diff --git a/po/sane-backends.nb.po b/po/sane-backends.nb.po index c82339d60..f22c32d09 100644 --- a/po/sane-backends.nb.po +++ b/po/sane-backends.nb.po @@ -2615,7 +2615,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.nl.po b/po/sane-backends.nl.po index 3285845ba..d3756e9eb 100644 --- a/po/sane-backends.nl.po +++ b/po/sane-backends.nl.po @@ -2665,7 +2665,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.pl.po b/po/sane-backends.pl.po index cd40f1379..6249313d6 100644 --- a/po/sane-backends.pl.po +++ b/po/sane-backends.pl.po @@ -2675,8 +2675,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "Skanowanie sterowane przyciskiem (eksperymentalne)" +msgid "Button-controlled scan" +msgstr "Skanowanie sterowane przyciskiem" #: .tmp/pixma_sane_options.c:94 #, no-c-format diff --git a/po/sane-backends.ru.po b/po/sane-backends.ru.po index 21af1f4d9..a4217c13c 100644 --- a/po/sane-backends.ru.po +++ b/po/sane-backends.ru.po @@ -2691,7 +2691,7 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" +msgid "Button-controlled scan" msgstr "" #: .tmp/pixma_sane_options.c:94 diff --git a/po/sane-backends.sv.po b/po/sane-backends.sv.po index 8b28d12cc..c1248d6c6 100644 --- a/po/sane-backends.sv.po +++ b/po/sane-backends.sv.po @@ -2677,8 +2677,8 @@ msgstr "" #: .tmp/pixma_sane_options.c:91 #, no-c-format -msgid "Button-controlled scan (experimental)" -msgstr "Knappkontrollerad inläsning (experimentellt)" +msgid "Button-controlled scan" +msgstr "Knappkontrollerad inläsning" #: .tmp/pixma_sane_options.c:94 #, no-c-format