From afc0dc6ed37c4422949251aae1d2ab0be259794d Mon Sep 17 00:00:00 2001 From: "m. allan noah" Date: Thu, 30 Apr 2009 13:58:35 +0000 Subject: [PATCH] * acinclude.m4, backend/gphoto2.c, configure, include/sane/config.h.in: deal with upcoming gphoto2 interface change (patch by Chris Bagwell) * po/sane-backends.nl.po: updates from Martin Kho --- ChangeLog | 5 ++ acinclude.m4 | 3 + backend/gphoto2.c | 8 ++ configure | 149 ++++++++++++++++++++++++++++------ include/sane/config.h.in | 3 + po/sane-backends.nl.po | 167 +++++++++++++++++---------------------- 6 files changed, 219 insertions(+), 116 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1d18ead4..1965bcc5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-30 m. allan noah + * acinclude.m4, backend/gphoto2.c, configure, include/sane/config.h.in: + deal with upcoming gphoto2 interface change (patch by Chris Bagwell) + * po/sane-backends.nl.po: updates from Martin Kho + 2009-04-29 m. allan noah * po/sane-backends.nl.po: updates from Martin Kho * po/sane-backends.de.po: updates from Burkhard Luck diff --git a/acinclude.m4 b/acinclude.m4 index 77ea71b37..6413b60b5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -442,6 +442,9 @@ AC_DEFUN([SANE_CHECK_GPHOTO2], LIBS="${LIBS} ${GPHOTO2_LIBS}" # Make sure we an really use the library AC_CHECK_FUNCS(gp_camera_init, HAVE_GPHOTO2=true, HAVE_GPHOTO2=false) + if test "${HAVE_GPHOTO2}" = "true"; then + AC_CHECK_FUNCS(gp_port_info_get_path) + fi CPPFLAGS="${saved_CPPFLAGS}" LIBS="${saved_LIBS}" else diff --git a/backend/gphoto2.c b/backend/gphoto2.c index 75745c2c4..438b9e85a 100644 --- a/backend/gphoto2.c +++ b/backend/gphoto2.c @@ -728,13 +728,21 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize) } for (n = 0; n < entries; n++) { +#ifdef HAVE_GP_PORT_INFO_GET_PATH + char *info_path = NULL; +#endif result = gp_port_info_list_get_info (list, n, &info); if (result < 0) { gp_port_info_list_free (list); return SANE_STATUS_INVAL; } +#ifdef HAVE_GP_PORT_INFO_GET_PATH + gp_port_info_get_path (info, &info_path); + if (strcmp (Cam_data.port, info_path) == 0) +#else if (strcmp (Cam_data.port, info.path) == 0) +#endif { break; } diff --git a/configure b/configure index 4ac323056..119131d46 100755 --- a/configure +++ b/configure @@ -12100,6 +12100,109 @@ else fi done + if test "${HAVE_GPHOTO2}" = "true"; then + +for ac_func in gp_port_info_get_path +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + fi CPPFLAGS="${saved_CPPFLAGS}" LIBS="${saved_LIBS}" else @@ -18674,7 +18777,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 18677 "configure"' > conftest.$ac_ext + echo '#line 18780 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -21554,11 +21657,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21557: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21660: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21561: \$? = $ac_status" >&5 + echo "$as_me:21664: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -21844,11 +21947,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21847: $lt_compile\"" >&5) + (eval echo "\"\$as_me:21950: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:21851: \$? = $ac_status" >&5 + echo "$as_me:21954: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -21948,11 +22051,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:21951: $lt_compile\"" >&5) + (eval echo "\"\$as_me:22054: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:21955: \$? = $ac_status" >&5 + echo "$as_me:22058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -24350,7 +24453,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:26969: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:26870: \$? = $ac_status" >&5 + echo "$as_me:26973: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -26967,11 +27070,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:26970: $lt_compile\"" >&5) + (eval echo "\"\$as_me:27073: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:26974: \$? = $ac_status" >&5 + echo "$as_me:27077: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -28552,11 +28655,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:28555: $lt_compile\"" >&5) + (eval echo "\"\$as_me:28658: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:28559: \$? = $ac_status" >&5 + echo "$as_me:28662: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -28656,11 +28759,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:28659: $lt_compile\"" >&5) + (eval echo "\"\$as_me:28762: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:28663: \$? = $ac_status" >&5 + echo "$as_me:28766: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -30877,11 +30980,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:30880: $lt_compile\"" >&5) + (eval echo "\"\$as_me:30983: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:30884: \$? = $ac_status" >&5 + echo "$as_me:30987: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -31167,11 +31270,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:31170: $lt_compile\"" >&5) + (eval echo "\"\$as_me:31273: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:31174: \$? = $ac_status" >&5 + echo "$as_me:31277: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -31271,11 +31374,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:31274: $lt_compile\"" >&5) + (eval echo "\"\$as_me:31377: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:31278: \$? = $ac_status" >&5 + echo "$as_me:31381: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 4e6c1aed0..2ecfaeb1b 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -100,6 +100,9 @@ /* Define to 1 if you have the `gp_camera_init' function. */ #undef HAVE_GP_CAMERA_INIT +/* Define to 1 if you have the `gp_port_info_get_path' function. */ +#undef HAVE_GP_PORT_INFO_GET_PATH + /* Define to 1 if you have the `i386_set_ioperm' function. */ #undef HAVE_I386_SET_IOPERM diff --git a/po/sane-backends.nl.po b/po/sane-backends.nl.po index 9147469b9..4cab7779d 100644 --- a/po/sane-backends.nl.po +++ b/po/sane-backends.nl.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sane-backends.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-29 21:03-0400\n" -"PO-Revision-Date: 2009-04-29 18:51+0200\n" +"PO-Revision-Date: 2009-04-30 11:29+0200\n" "Last-Translator: Martin Kho \n" "Language-Team: American English \n" "MIME-Version: 1.0\n" @@ -1232,20 +1232,18 @@ msgstr "" "De lamp wordt uitgeschakeld na de opgegeven tijd (in minuten). Een " "waarde van 0 betekent, dat de lamp niet wordt uitgeschakeld." -#: .tmp/genesys.c:5128 .tmp/genesys.c:5129 -#, fuzzy, no-c-format +#: .tmp/genesys.c:5128 .tmp/genesys.c:5129, no-c-format msgid "File button" -msgstr "Wacht op een druk op de knop" +msgstr "Bestand-knop" #: .tmp/genesys.c:5181 .tmp/genesys.c:5182 #, no-c-format msgid "OCR button" -msgstr "" +msgstr "OCR-knop" -#: .tmp/genesys.c:5195 .tmp/genesys.c:5196 -#, fuzzy, no-c-format +#: .tmp/genesys.c:5195 .tmp/genesys.c:5196, no-c-format msgid "Power button" -msgstr "Wacht op een druk op de knop" +msgstr "Power-knop" #: .tmp/genesys.c:5209 .tmp/genesys.c:5210 .tmp/pixma_sane_options.c:210 #: .tmp/plustek.c:1079 @@ -1259,20 +1257,17 @@ msgstr "Knoppen" msgid "Calibrate" msgstr "Kalibreren" -#: .tmp/genesys.c:5217 -#, fuzzy, no-c-format +#: .tmp/genesys.c:5217, no-c-format msgid "Start calibration using special sheet" -msgstr "Begin het kalibreer proces" +msgstr "Gebruik een speciale transparant voor het kalibreer proces" -#: .tmp/genesys.c:5229 -#, fuzzy, no-c-format +#: .tmp/genesys.c:5229, no-c-format msgid "Clear calibration" -msgstr "Grof kalibreren" +msgstr "Reset kalibratie" -#: .tmp/genesys.c:5230 -#, fuzzy, no-c-format +#: .tmp/genesys.c:5230, no-c-format msgid "Clear calibration cache" -msgstr "Kalibratie gegevensbewaarplaats" +msgstr "Reset kalibratiecache" #: .tmp/gt68xx.c:474 #, no-c-format @@ -1807,7 +1802,7 @@ msgstr "" #: .tmp/hp3900_sane.c:1515 #, no-c-format msgid "Save debugging images" -msgstr "Bewaar testbeelden" +msgstr "Bewaar foutzoekbeelden" #: .tmp/hp3900_sane.c:1518 #, no-c-format @@ -2786,12 +2781,12 @@ msgstr "Schakel altijd de lamp uit tijdens donker kalibreren." #: .tmp/plustek.c:934 #, no-c-format msgid "Calibration data cache" -msgstr "Kalibratie gegevensbewaarplaats" +msgstr "Kalibratie gegevenscache" #: .tmp/plustek.c:935 #, no-c-format msgid "Enables or disables calibration data cache." -msgstr "Schakelt kalibratie gegevensbewaarplaats in/uit" +msgstr "Schakelt kalibratiecache in/uit" #: .tmp/plustek.c:941 #, no-c-format @@ -2801,12 +2796,11 @@ msgstr "Voert kalibratie uit" #: .tmp/plustek.c:958 #, no-c-format msgid "Speedup sensor" -msgstr "Sensor versnelling" +msgstr "Snellere sensor beweging" -#: .tmp/plustek.c:959 -#, fuzzy, no-c-format +#: .tmp/plustek.c:959, no-c-format msgid "Enables or disables speeding up sensor movement." -msgstr "Schakelt versnelde sensor beweging in/uit" +msgstr "Schakelt snellere sensor beweging in/uit" #: .tmp/plustek.c:973 #, no-c-format @@ -2828,10 +2822,9 @@ msgstr "Lamp uit tijd" msgid "Lampoff-time in seconds." msgstr "Lamp uit tijd in seconden." -#: .tmp/plustek.c:994 -#, fuzzy, no-c-format +#: .tmp/plustek.c:994, no-c-format msgid "Analog frontend" -msgstr "Analoge frontend" +msgstr "Analoge \"frontend\"" #: .tmp/plustek.c:1001 #, no-c-format @@ -2886,7 +2879,7 @@ msgstr "Rode lamp uit" #: .tmp/plustek.c:1049 #, no-c-format msgid "Defines red lamp off parameter" -msgstr "Definieert de rode lamp uit parameter" +msgstr "Bepaalt de rode lamp uit parameter" #: .tmp/plustek.c:1056 #, no-c-format @@ -2896,7 +2889,7 @@ msgstr "Groene lamp uit" #: .tmp/plustek.c:1057 #, no-c-format msgid "Defines green lamp off parameter" -msgstr "Definieert de groene lamp uit parameter" +msgstr "Bepaalt de groene lamp uit parameter" #: .tmp/plustek.c:1064 #, no-c-format @@ -2906,7 +2899,7 @@ msgstr "Blauwe lamp uit" #: .tmp/plustek.c:1065 #, no-c-format msgid "Defines blue lamp off parameter" -msgstr "Definieert de blauwe lamp uit parameter" +msgstr "Bepaalt de blauwe lamp uit parameter" #: .tmp/plustek.c:1095 #, no-c-format @@ -3120,10 +3113,9 @@ msgstr "" "Dwing de \"backend\", na een aanroep van sane_read() het " "statusberichtSANE_STATUS_ACCESS_DENIED terug te geven." -#: .tmp/rts8891.c:2744 -#, fuzzy, no-c-format +#: .tmp/rts8891.c:2744, no-c-format msgid "This option reflects the status of a scanner button." -msgstr "Deze optie geeft de status weer van de sannerknoppen." +msgstr "Deze optie geeft de status weer van een scannerknop." #: .tmp/rts8891.c:2775 .tmp/umax.c:5796 .tmp/umax_pp.c:637 #, no-c-format @@ -3148,72 +3140,68 @@ msgstr "Schakelt de scannerlamp uit" #: .tmp/sane_strstatus.c:59 #, no-c-format msgid "Success" -msgstr "" +msgstr "Succes" -#: .tmp/sane_strstatus.c:62 -#, fuzzy, no-c-format +#: .tmp/sane_strstatus.c:62, no-c-format msgid "Operation not supported" -msgstr "Halftoon niet ondersteund" +msgstr "Handeling niet ondersteund" #: .tmp/sane_strstatus.c:65 #, no-c-format msgid "Operation was cancelled" -msgstr "" +msgstr "Handeling was geannuleerd" #: .tmp/sane_strstatus.c:68 #, no-c-format msgid "Device busy" -msgstr "" +msgstr "Apparaat is bezet" #: .tmp/sane_strstatus.c:71 #, no-c-format msgid "Invalid argument" -msgstr "" +msgstr "Ongeldige aanname" #: .tmp/sane_strstatus.c:74 #, no-c-format msgid "End of file reached" -msgstr "" +msgstr "Eind van bestand bereikt" -#: .tmp/sane_strstatus.c:77 -#, fuzzy, no-c-format +#: .tmp/sane_strstatus.c:77, no-c-format msgid "Document feeder jammed" -msgstr "Extra's van de documentendoorvoer" +msgstr "Opstopping in documentendoorvoer" -#: .tmp/sane_strstatus.c:80 -#, fuzzy, no-c-format +#: .tmp/sane_strstatus.c:80, no-c-format msgid "Document feeder out of documents" -msgstr "Extra's van de documentendoorvoer" +msgstr "Documentendoorvoer leeg" -#: .tmp/sane_strstatus.c:83 -#, fuzzy, no-c-format +#: .tmp/sane_strstatus.c:83, no-c-format msgid "Scanner cover is open" -msgstr "Deksel van ADF open" +msgstr "Deksel van de scanner is open" #: .tmp/sane_strstatus.c:86 #, no-c-format msgid "Error during device I/O" -msgstr "" +msgstr "Fout tijdens apparaat I/O" #: .tmp/sane_strstatus.c:89 #, no-c-format msgid "Out of memory" -msgstr "" +msgstr "Geheugen vol" #: .tmp/sane_strstatus.c:92 #, no-c-format msgid "Access to resource has been denied" -msgstr "" +msgstr "Toegang tot bron gewijgerd" #: .tmp/sane_strstatus.c:96 #, no-c-format msgid "Lamp not ready, please retry" -msgstr "" +msgstr "Lamp niet klaar, probeer opnieuw" #: .tmp/sane_strstatus.c:101 #, no-c-format msgid "Scanner mechanism locked for transport" -msgstr "" +msgstr "Scannerwagen geblokkeerd (in transportstand)" #: .tmp/saneopts.h:154 #, no-c-format @@ -3223,12 +3211,12 @@ msgstr "Aantal opties" #: .tmp/saneopts.h:156 #, no-c-format msgid "Standard" -msgstr "" +msgstr "Standaard" #: .tmp/saneopts.h:160 #, no-c-format msgid "Sensors" -msgstr "" +msgstr "Sensoren" #: .tmp/saneopts.h:162 #, no-c-format @@ -3293,12 +3281,11 @@ msgstr "Y-resolutie" #: .tmp/saneopts.h:176 #, no-c-format msgid "Page width" -msgstr "" +msgstr "Pagina breedte" -#: .tmp/saneopts.h:177 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:177, no-c-format msgid "Page height" -msgstr "Contrast" +msgstr "Pagina hoogte" #: .tmp/saneopts.h:178 #, no-c-format @@ -3563,30 +3550,27 @@ msgid "" msgstr "" "Alleen-lezen optie, die aangeeft hoeveel opties een apparaat ondersteund." -#: .tmp/saneopts.h:248 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:248, no-c-format msgid "Source, mode and resolution options" -msgstr "Korte oplossingenlijst" +msgstr "Opties voor bron, modus en resolutie" #: .tmp/saneopts.h:249 #, no-c-format msgid "Scan area and media size options" -msgstr "" +msgstr "Opties voor scanoppervlak en origineelgrootte" -#: .tmp/saneopts.h:250 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:250, no-c-format msgid "Image modification options" -msgstr "Aantal opties" +msgstr "Opties voor beeldaanpassing" -#: .tmp/saneopts.h:251 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:251, no-c-format msgid "Hardware specific options" -msgstr "hardware resolutie" +msgstr "Hardware-opties" #: .tmp/saneopts.h:252 #, no-c-format msgid "Scanner sensors and buttons" -msgstr "" +msgstr "Scannersensoren en -knoppen" #: .tmp/saneopts.h:255 #, no-c-format @@ -3675,11 +3659,12 @@ msgid "" "Specifies the width of the media. Required for automatic centering of " "sheet-fed scans." msgstr "" +"Bepaalt de breedte van het origineel. Nodig om doorvoerscans automatisch " +"te kunnen centreren." -#: .tmp/saneopts.h:305 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:305, no-c-format msgid "Specifies the height of the media." -msgstr "Stelt de resolutie in van het gescande beeld." +msgstr "Bepaalt de hoogte van het origineel." #: .tmp/saneopts.h:308 #, no-c-format @@ -3972,45 +3957,40 @@ msgstr "Schakelt de keuze van de lichthoeveelheid in" msgid "Turn off lamp when program exits" msgstr "Schakel de lamp uit als het programma wordt verlaten" -#: .tmp/saneopts.h:444 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:444, no-c-format msgid "Scan button" -msgstr "Scanresolutie" +msgstr "Scannerknop" -#: .tmp/saneopts.h:445 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:445, no-c-format msgid "Email button" -msgstr "Wacht op een druk op de knop" +msgstr "E-mail-knop" -#: .tmp/saneopts.h:446 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:446, no-c-format msgid "Fax button" -msgstr "Wacht op een druk op de knop" +msgstr "Fax-knop" -#: .tmp/saneopts.h:447 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:447, no-c-format msgid "Copy button" -msgstr "Wacht op een druk op de knop" +msgstr "Kopieer-knop" #: .tmp/saneopts.h:448 #, no-c-format msgid "PDF button" -msgstr "" +msgstr "PDF-knop" #: .tmp/saneopts.h:449 #, no-c-format msgid "Cancel button" -msgstr "" +msgstr "Annuleer-knop" #: .tmp/saneopts.h:450 #, no-c-format msgid "Page loaded" -msgstr "" +msgstr "Pagina geladen" -#: .tmp/saneopts.h:451 -#, fuzzy, no-c-format +#: .tmp/saneopts.h:451, no-c-format msgid "Cover open" -msgstr "Deksel van ADF open" +msgstr "Deksel open" #: .tmp/sm3840.c:758 #, no-c-format @@ -4834,3 +4814,4 @@ msgstr "Stelt het offset in van het groene kanaal" #, no-c-format msgid "Sets blue channel offset" msgstr "Stelt het offset in van het blauwe kanaal" +