mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove 'experimental' in pixma buttons options and text, fix some French translation typos, update man page.

merge-requests/1/head
Nicolas Martin 2008-06-15 20:05:14 +00:00
rodzic 777c8f4f6d
commit 1a23d9be8c
19 zmienionych plików z 43 dodań i 30 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2008-06-15 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* 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 <stef.dev@free.fr>
* backend/sanei_constrain_value.c: add support for arrays of SANE_Word
in sanei_constrain_value

14
backend/pixma.c
Wyświetl plik

@ -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

2
backend/pixma_mp150.c
Wyświetl plik

@ -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

2
backend/pixma_sane_options.c
Wyświetl plik

@ -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.");

2
doc/sane-pixma.man
Wyświetl plik

@ -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

2
po/sane-backends.bg.po
Wyświetl plik

@ -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

2
po/sane-backends.cs.po
Wyświetl plik

@ -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

2
po/sane-backends.da.po
Wyświetl plik

@ -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

2
po/sane-backends.de.po
Wyświetl plik

@ -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

4
po/sane-backends.eo.po
Wyświetl plik

@ -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

4
po/sane-backends.es.po
Wyświetl plik

@ -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

2
po/sane-backends.fi.po
Wyświetl plik

@ -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

10
po/sane-backends.fr.po
Wyświetl plik

@ -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

4
po/sane-backends.it.po
Wyświetl plik

@ -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

2
po/sane-backends.nb.po
Wyświetl plik

@ -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

2
po/sane-backends.nl.po
Wyświetl plik

@ -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

4
po/sane-backends.pl.po
Wyświetl plik

@ -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

2
po/sane-backends.ru.po
Wyświetl plik

@ -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

4
po/sane-backends.sv.po
Wyświetl plik

@ -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